Merge remote-tracking branch 'upstream/master' into staging-next

This commit is contained in:
annalee 2024-03-17 07:18:11 +00:00
commit 8ead81a60f
No known key found for this signature in database
72 changed files with 447 additions and 437 deletions

View file

@ -11,7 +11,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.2.2"; version = "2.2.3";
pname = "jacktrip"; pname = "jacktrip";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
repo = "jacktrip"; repo = "jacktrip";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-idfetMiMqjl9Qrun4hlFhQaGWcvasgjojTts+0F3GGE="; sha256 = "sha256-uUmaTqUiih4nVt4Cba77WDt4xGQixsBe3WNavBDanx0=";
}; };
preConfigure = '' preConfigure = ''

View file

@ -8593,6 +8593,18 @@ final: prev:
meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
}; };
outline-nvim = buildVimPlugin {
pname = "outline.nvim";
version = "2024-01-22";
src = fetchFromGitHub {
owner = "hedyhli";
repo = "outline.nvim";
rev = "a8d40aecb799196303ff3521c0e31c87bba57198";
sha256 = "1xhqrgjj37d1wq7vrcw9vwmrvzl5a3vyz4k0dglvgjq5z2g5zb0x";
};
meta.homepage = "https://github.com/hedyhli/outline.nvim/";
};
overseer-nvim = buildVimPlugin { overseer-nvim = buildVimPlugin {
pname = "overseer.nvim"; pname = "overseer.nvim";
version = "2024-03-07"; version = "2024-03-07";

View file

@ -722,6 +722,7 @@ https://github.com/salkin-mada/openscad.nvim/,HEAD,
https://github.com/nvim-orgmode/orgmode/,, https://github.com/nvim-orgmode/orgmode/,,
https://github.com/rgroli/other.nvim/,HEAD, https://github.com/rgroli/other.nvim/,HEAD,
https://github.com/jmbuhr/otter.nvim/,, https://github.com/jmbuhr/otter.nvim/,,
https://github.com/hedyhli/outline.nvim/,HEAD,
https://github.com/stevearc/overseer.nvim/,HEAD, https://github.com/stevearc/overseer.nvim/,HEAD,
https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD, https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD,
https://github.com/vuki656/package-info.nvim/,, https://github.com/vuki656/package-info.nvim/,,

View file

@ -22,16 +22,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "oculante"; pname = "oculante";
version = "0.8.13"; version = "0.8.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "woelper"; owner = "woelper";
repo = "oculante"; repo = "oculante";
rev = version; rev = version;
hash = "sha256-RbRvV3OkRZXc0n7qGzqbBtbU81wFc+/Ohg9pbVqdsw4="; hash = "sha256-C8USTDW5C+mjj/fr242is/42RpmUvcK3lUeaq0/BSGA=";
}; };
cargoHash = "sha256-qt4bHCHpiP6yOce9hquVVlLFF906ADwhss4xAP9E0fA="; cargoHash = "sha256-w8k0QG509PRHHB1e4WThYnM6R0PwWMbSBxs2B0zQ0ww=";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake

View file

@ -32,11 +32,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "calibre"; pname = "calibre";
version = "7.6.0"; version = "7.7.0";
src = fetchurl { src = fetchurl {
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
hash = "sha256-fD2kTwH692x6Nm93NrUQvmbcXiX9hHBpo4wvUvBqLAM="; hash = "sha256-+kz3Fz1RDQ+ROgv7y0WNAWvIESKvHKID8UnSeCh8yA4=";
}; };
patches = [ patches = [

View file

@ -23,13 +23,13 @@
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
pname = "corectrl"; pname = "corectrl";
version = "1.3.10"; version = "1.3.11";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "corectrl"; owner = "corectrl";
repo = "corectrl"; repo = "corectrl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-fN4dX0Ya2DvPEkuwtKIw1zT+JEbC2zyJKtcGwLVdAUs="; sha256 = "sha256-yca9qzYJlOQak6IMNewgUe+KSUUypj/lLUGGw6R90Ws=";
}; };
patches = [ patches = [
./polkit-dir.patch ./polkit-dir.patch

View file

@ -6,13 +6,13 @@
mkDerivation rec { mkDerivation rec {
pname = "pure-maps"; pname = "pure-maps";
version = "3.2.1"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rinigus"; owner = "rinigus";
repo = "pure-maps"; repo = "pure-maps";
rev = version; rev = version;
hash = "sha256-AZt0JcNegHkUkWy+NW5CNLZfxjjFyKWBrhLJgSTv3to="; hash = "sha256-TeFolD3jXRdLGfXdy+QcwtOcQQVUB5fn8PwoYfRLaPQ=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -34,7 +34,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "calls"; pname = "calls";
version = "45.0"; version = "46.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-NIQFKVpZSxY2QOb73WfYsCzMQwB9XySoADCL7IlmGe8="; hash = "sha256-ZUVMK0Ex77EQKTGM0gBDHt8W9l4rHspihYduMcwMGho=";
}; };
outputs = [ "out" "devdoc" ]; outputs = [ "out" "devdoc" ];

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "atmos"; pname = "atmos";
version = "1.65.0"; version = "1.66.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudposse"; owner = "cloudposse";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-KhWi5zxPyBe0xJuJjTROwFIyMPqgUvDeRRIOVowKVxc="; sha256 = "sha256-8cEJw4gCyh3aosck70vdLVYGOL3zR0AOpAMNv/j6rEM=";
}; };
vendorHash = "sha256-imMIxEmMdW8nAsQC4q7TID+c7J8LbdtAWFj8qvPGtyA="; vendorHash = "sha256-k03pRrUzHvVjKt6w40JEiJTvbwhKa/0rjkZQsnmfe68=";
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "popeye"; pname = "popeye";
version = "0.20.5"; version = "0.21.0";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "derailed"; owner = "derailed";
repo = "popeye"; repo = "popeye";
sha256 = "sha256-e3ANhF2g1YpCipnHej2ZegoAq20MOyTIjxgNMs3qGbk="; sha256 = "sha256-wEOmG15h3YRO/MmMj5QZxmc0itZJeIQs3LuB3GXWWQw=";
}; };
ldflags = [ ldflags = [
@ -17,7 +17,7 @@ buildGoModule rec {
"-X github.com/derailed/popeye/cmd.commit=${version}" "-X github.com/derailed/popeye/cmd.commit=${version}"
]; ];
vendorHash = "sha256-lRm3cS+VYP9vptr6ixmkni7DpNnexrhyccKDV7TWKg0="; vendorHash = "sha256-qrw/7fauMVb3Ai5E5MXL84yXHcReJZZ1oioB/Cv32Is=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -12,25 +12,25 @@ in {
guiStable = mkGui { guiStable = mkGui {
channel = "stable"; channel = "stable";
version = "2.2.45"; version = "2.2.46";
hash = "sha256-SMnhPz5zTPtidy/BIvauDM60WgDLG+NIr9rdUrQhz0A="; hash = "sha256-i/Eq66dYDGR4RLJ76ZlKruhU0KC9KlMMf8Wb91ZoyY0=";
}; };
guiPreview = mkGui { guiPreview = mkGui {
channel = "stable"; channel = "stable";
version = "2.2.45"; version = "2.2.46";
hash = "sha256-SMnhPz5zTPtidy/BIvauDM60WgDLG+NIr9rdUrQhz0A="; hash = "sha256-i/Eq66dYDGR4RLJ76ZlKruhU0KC9KlMMf8Wb91ZoyY0=";
}; };
serverStable = mkServer { serverStable = mkServer {
channel = "stable"; channel = "stable";
version = "2.2.45"; version = "2.2.46";
hash = "sha256-1GwhZEPfRW1e+enJipy7YOnA4QzeqZ7aCG92GrsZhms="; hash = "sha256-A6rAhc/EGvbqVdg1jXxNX3bKQLcGurqa7hKh9LvH+es=";
}; };
serverPreview = mkServer { serverPreview = mkServer {
channel = "stable"; channel = "stable";
version = "2.2.45"; version = "2.2.46";
hash = "sha256-1GwhZEPfRW1e+enJipy7YOnA4QzeqZ7aCG92GrsZhms="; hash = "sha256-A6rAhc/EGvbqVdg1jXxNX3bKQLcGurqa7hKh9LvH+es=";
}; };
} }

View file

@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
inherit hash; inherit hash;
owner = "GNS3"; owner = "GNS3";
repo = pname; repo = pname;
rev = "v${version}"; rev = "refs/tags/v${version}";
}; };
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [

View file

@ -13,16 +13,16 @@ let
common = { stname, target, postInstall ? "" }: common = { stname, target, postInstall ? "" }:
buildGoModule rec { buildGoModule rec {
pname = stname; pname = stname;
version = "1.27.2"; version = "1.27.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "syncthing"; owner = "syncthing";
repo = "syncthing"; repo = "syncthing";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-CDOWN2b7DCRqhbJmiz4zp+q03GwmuVKv1MZT3NaO7lI="; hash = "sha256-TXkZJAN72Qa3Mo2TYvCHNOl3BWfRxu78XXHW48Jjj0M=";
}; };
vendorHash = "sha256-3MWVx0N17YgvFira56gvqMJlR1o/udtmWBn9oEVEp04="; vendorHash = "sha256-ALdmETpEmvA3bTfBRK6LaO7bnlH03fljX1P7rqzskG4=";
nativeBuildInputs = lib.optionals stdenv.isDarwin [ nativeBuildInputs = lib.optionals stdenv.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when # Recent versions of macOS seem to require binaries to be signed when

View file

@ -33,14 +33,14 @@ let
}.${system} or throwSystem; }.${system} or throwSystem;
hash = { hash = {
x86_64-linux = "sha256-MtSpyPj2PX8K2e4ZLAmvn0T5bJvPtBbzmn6/cTXGlbc="; x86_64-linux = "sha256-5AxEkGmThLEEw1XGrWuabRcVgYH8OT2cXxyeFrYeBOI=";
}.${system} or throwSystem; }.${system} or throwSystem;
displayname = "XPipe"; displayname = "XPipe";
in stdenvNoCC.mkDerivation rec { in stdenvNoCC.mkDerivation rec {
pname = "xpipe"; pname = "xpipe";
version = "8.0.1"; version = "8.3";
src = fetchzip { src = fetchzip {
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mafft"; pname = "mafft";
version = "7.520"; version = "7.525";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "sysimm"; owner = "sysimm";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-H+EcKahJWwidAx+IUT4uCZEty+S8hUeMSB8VbTu5SmQ="; sha256 = "sha256-ckBmvFssYAmYcBHAEftjQqBV0MB0theGfemaPx3XUws=";
}; };
preBuild = '' preBuild = ''

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "getdp"; pname = "getdp";
version = "3.5.0"; version = "3.6.0";
src = fetchurl { src = fetchurl {
url = "http://getdp.info/src/getdp-${version}-source.tgz"; url = "http://getdp.info/src/getdp-${version}-source.tgz";
sha256 = "sha256-C/dsSe+puIQBpFfBL3qr2XWXrUnvYy0/uTCKqOpDe9w="; sha256 = "sha256-N1cb72W77Dr+TzeHpLgv5FuFb+SJqyGcfn+kOfEvZgA=";
}; };
inherit (petsc) mpiSupport; inherit (petsc) mpiSupport;

View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "delta"; pname = "delta";
version = "0.16.5"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dandavison"; owner = "dandavison";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-W6XtfXfOP8QfQ0t5hquFdYvCO9muE50N1fQsNtnOzfM="; hash = "sha256-r0ED9o2UP91fe6Bng5ioJra5S1bg+UEXMLeSQPkMswI=";
}; };
cargoHash = "sha256-SNKbgEyelJCHKCaBRfCGc3RECGABtZzMC2rCbhzqZtU="; cargoHash = "sha256-3CxRNhcjfDK/xUuM3w+GwqE0+X6WT92/LGj/qRp0TwA=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

View file

@ -300,7 +300,7 @@ in
let let
unwrapped = writeShellScriptBin "apptainer-cuda-saxpy" unwrapped = writeShellScriptBin "apptainer-cuda-saxpy"
'' ''
${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.tests.image-saxpy} saxpy ${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.gpuChecks.image-saxpy} saxpy
''; '';
in in
runCommand "run-apptainer-cuda-saxpy" runCommand "run-apptainer-cuda-saxpy"

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "evilwm"; pname = "evilwm";
version = "1.4.2"; version = "1.4.3";
src = fetchurl { src = fetchurl {
url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz"; url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz";
sha256 = "sha256-QhLW2QywBbLMiIFLyFN3NrSVCrWCZLu2W4gHrGO9xLk="; sha256 = "sha256-1ZRbILEskdskEvrA29o/ucPsjeu44bEJg4mSsrG75dQ=";
}; };
buildInputs = [ buildInputs = [

View file

@ -53,6 +53,10 @@
, gccForLibs ? if useCcForLibs then cc else null , gccForLibs ? if useCcForLibs then cc else null
, fortify-headers ? null , fortify-headers ? null
, includeFortifyHeaders ? null , includeFortifyHeaders ? null
# https://github.com/NixOS/nixpkgs/issues/295322
# should -march flag be used
, disableMarch ? false
}: }:
assert nativeTools -> !propagateDoc && nativePrefix != ""; assert nativeTools -> !propagateDoc && nativePrefix != "";
@ -629,7 +633,7 @@ stdenv.mkDerivation {
# TODO: aarch64-darwin has mcpu incompatible with gcc # TODO: aarch64-darwin has mcpu incompatible with gcc
+ optionalString ((targetPlatform ? gcc.arch) && !isClang && !(stdenv.isDarwin && stdenv.isAarch64) && + optionalString ((targetPlatform ? gcc.arch) && !isClang && !(stdenv.isDarwin && stdenv.isAarch64) &&
isGccArchSupported targetPlatform.gcc.arch) '' isGccArchSupported targetPlatform.gcc.arch && !disableMarch) ''
echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before
'' ''
@ -725,7 +729,7 @@ stdenv.mkDerivation {
+ optionalString isClang '' + optionalString isClang ''
# Escape twice: once for this script, once for the one it gets substituted into. # Escape twice: once for this script, once for the one it gets substituted into.
export march=${escapeShellArg export march=${escapeShellArg
(optionalString (targetPlatform ? gcc.arch) (optionalString (targetPlatform ? gcc.arch && !disableMarch)
(escapeShellArg "-march=${targetPlatform.gcc.arch}"))} (escapeShellArg "-march=${targetPlatform.gcc.arch}"))}
export defaultTarget=${targetPlatform.config} export defaultTarget=${targetPlatform.config}
substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh

View file

@ -1,33 +1,35 @@
{ lib { lib
, stdenv
, fetchurl , fetchurl
, gettext
, python3
, wrapQtAppsHook
, fsuae , fsuae
, gettext
, python3Packages
, stdenv
, libsForQt5
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "fs-uae-launcher"; pname = "fs-uae-launcher";
version = "3.1.68"; version = "3.1.70";
src = fetchurl { src = fetchurl {
url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${finalAttrs.version}/fs-uae-launcher-${finalAttrs.version}.tar.xz"; url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${finalAttrs.version}/fs-uae-launcher-${finalAttrs.version}.tar.xz";
hash = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA="; hash = "sha256-yvJ8sa44V13SEUJ6C9SgS+N2ZFH5+20TTL2ICY9A36c=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
gettext gettext
python3 python3Packages.python
wrapQtAppsHook libsForQt5.wrapQtAppsHook
]; ];
buildInputs = with python3.pkgs; [ buildInputs = with python3Packages; [
pyqt5 pyqt5
requests requests
setuptools setuptools
]; ];
strictDeps = true;
makeFlags = [ "prefix=$(out)" ]; makeFlags = [ "prefix=$(out)" ];
dontWrapQtApps = true; dontWrapQtApps = true;
@ -47,8 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://fs-uae.net"; homepage = "https://fs-uae.net";
description = "Graphical front-end for the FS-UAE emulator"; description = "Graphical front-end for the FS-UAE emulator";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
mainProgram = "fs-uae-launcher";
maintainers = with lib.maintainers; [ sander AndersonTorres ]; maintainers = with lib.maintainers; [ sander AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = with lib.systems.inspect;
patternLogicalAnd patterns.isx86 patterns.isLinux;
}; };
}) })

View file

@ -1,8 +1,7 @@
{ lib { lib
, stdenv
, fetchFromGitHub
, SDL2 , SDL2
, autoreconfHook , autoreconfHook
, fetchFromGitHub
, freetype , freetype
, gettext , gettext
, glib , glib
@ -13,6 +12,7 @@
, lua , lua
, openal , openal
, pkg-config , pkg-config
, stdenv
, zip , zip
, zlib , zlib
}: }:
@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs:{
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
pkg-config pkg-config
zip
]; ];
buildInputs = [ buildInputs = [
@ -44,10 +45,11 @@ stdenv.mkDerivation (finalAttrs:{
libmpeg2 libmpeg2
lua lua
openal openal
zip
zlib zlib
]; ];
strictDeps = true;
meta = { meta = {
homepage = "https://fs-uae.net"; homepage = "https://fs-uae.net";
description = "An accurate, customizable Amiga Emulator"; description = "An accurate, customizable Amiga Emulator";
@ -58,7 +60,9 @@ stdenv.mkDerivation (finalAttrs:{
Amigas. Amigas.
''; '';
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
mainProgram = "fs-uae";
maintainers = with lib.maintainers; [ AndersonTorres ]; maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = with lib.systems.inspect;
patternLogicalAnd patterns.isx86 patterns.isLinux;
}; };
}) })

View file

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.123.8"; version = "0.124.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gohugoio"; owner = "gohugoio";
repo = "hugo"; repo = "hugo";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-sL/LiQwbn3nD2eDFNuAbDHRGemTiBhTfb5IaugYL9dM="; hash = "sha256-LLjIKkNtrnnpIUjdJZJlrsyP4O634/B+cyn8DEYfRdk=";
}; };
vendorHash = "sha256-V7YRrC+6fOIjXOu7E0kIOZZt++4oFLPhmHeWmOVU3Xw="; vendorHash = "sha256-xl3X9AjlDcmjMExHvzgMp2mXJnt3jae6WNQSklHWKPQ=";
doCheck = false; doCheck = false;

View file

@ -10,16 +10,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "igir"; pname = "igir";
version = "2.5.0"; version = "2.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emmercm"; owner = "emmercm";
repo = "igir"; repo = "igir";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-7gK3NTjirlaraUWGixDdeQrCip9W3X/18mbzXYOizRs="; hash = "sha256-z70oPKUTVKWQ/BME2ourQZWNmFYRTvSRs+2mKVfoIh8=";
}; };
npmDepsHash = "sha256-2X0zCCHKFps3fN5X7rnOdD//D7RU9m4V9cyr3CgoXOE="; npmDepsHash = "sha256-lTqAUtUv0WmS/TUkPZQyCOYhY5BFz4ZCXqJN5I6l/cI=";
# I have no clue why I have to do this # I have no clue why I have to do this
postPatch = '' postPatch = ''

View file

@ -0,0 +1,63 @@
{
lib,
stdenv,
buildBazelPackage,
fetchFromGitHub,
fetchpatch,
bazel_6,
jdk,
elfutils,
libcap,
}:
buildBazelPackage rec {
pname = "perf_data_converter";
version = "0-unstable-2024-03-12";
src = fetchFromGitHub {
owner = "google";
repo = "perf_data_converter";
rev = "e1cfe1e7e5d8cf3b728a166bf02d4227c82801eb";
hash = "sha256-Y3tBLH2jf1f28o6RK2inq9FulKc66qcqwKmxYdFC5tA=";
};
bazel = bazel_6;
bazelFlags = [
"--java_runtime_version=local_jdk"
"--tool_java_runtime_version=local_jdk"
];
fetchAttrs = {
sha256 = "sha256-IauQ4zEn9YHppLgW+4XjPv4N5IZlEkp//tE/Dy7k28s=";
};
nativeBuildInputs = [ jdk ];
buildInputs = [
elfutils
libcap
];
removeRulesCC = false;
bazelBuildFlags = [ "-c opt" ];
bazelTargets = [ "src:perf_to_profile" ];
bazelTestTargets = [ "src:all" ];
buildAttrs = {
installPhase = ''
runHook preInstall
install -Dm555 -t "$out/bin" bazel-bin/src/perf_to_profile
runHook postInstall
'';
};
meta = with lib; {
description = "Tool to convert Linux perf files to the profile.proto format used by pprof";
homepage = "https://github.com/google/perf_data_converter";
license = licenses.bsd3;
maintainers = with maintainers; [ hzeller ];
platforms = platforms.linux;
};
}

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wslu"; pname = "wslu";
version = "4.1.1"; version = "4.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wslutilities"; owner = "wslutilities";
repo = "wslu"; repo = "wslu";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc="; hash = "sha256-rmNGKayg8Y872yICilveMpDFBLkDZ6Ox8rqtWrK2om8=";
}; };
nativeBuildInputs = [ copyDesktopItems ]; nativeBuildInputs = [ copyDesktopItems ];

View file

@ -24,15 +24,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "appcenter"; pname = "appcenter";
version = "7.4.0-unstable-2023-12-04"; version = "7.4.0-unstable-2024-02-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
# Add support for AppStream 1.0. # Add support for AppStream 1.0.
# https://github.com/elementary/appcenter/pull/2099 # https://github.com/elementary/appcenter/pull/2099
rev = "d93e135a0b0c9a6e0fbad18fe90d46425823a42c"; rev = "fce55d9373bfb82953191b32e276a2129ffcb8c1";
hash = "sha256-b7xux6MuvYZFxufQ5T7DoDNBlsJ/fDR0aUY2Hk/xJoY="; hash = "sha256-7VYiE1RkaqN1Yg4pFUBs6k8QjoljYFDgQ9jCTLG3uyk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -13,6 +13,7 @@
, elementary-default-settings , elementary-default-settings
, gnome-settings-daemon , gnome-settings-daemon
, runtimeShell , runtimeShell
, systemd
, writeText , writeText
, meson , meson
, ninja , ninja
@ -90,13 +91,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-session-settings"; pname = "elementary-session-settings";
version = "6.0.0"; version = "6.0.0-unstable-2023-09-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = "session-settings"; repo = "session-settings";
rev = version; rev = "3476c89bbb66564a72c6495ac0c61f8f9ed7a3ec";
sha256 = "1faglpa7q3a4335gnd074a3lnsdspyjdnskgy4bfnf6xmwjx7kjx"; sha256 = "sha256-Z1qW6m0XDkB92ZZVKx98JOMXiBDbGpQ0cAXgWdqK27c=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -111,6 +112,7 @@ stdenv.mkDerivation rec {
gnome-settings-daemon gnome-settings-daemon
onboard onboard
orca orca
systemd
]; ];
mesonFlags = [ mesonFlags = [

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ciao"; pname = "ciao";
version = "1.22.0-m7"; version = "1.23.0-m1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ciao-lang"; owner = "ciao-lang";
repo = "ciao"; repo = "ciao";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-5LX+NVDAtdffQeLTD4Camp5aNm0K3Cwmavh7OF5XcZU="; sha256 = "sha256-JMHln0nYveEEfEr4AMyrEL9KlCDiqV53BWRNMUL8nN0=";
}; };
configurePhase = '' configurePhase = ''

View file

@ -25,9 +25,13 @@ let
# #
# The following selects the correct Clang version, matching the version # The following selects the correct Clang version, matching the version
# used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`. # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`.
clang = if pkgs.stdenv.isDarwin clang = let
# https://github.com/NixOS/nixpkgs/issues/295322
clangNoMarch = swiftLlvmPackages.clang.override { disableMarch = true; };
in
if pkgs.stdenv.isDarwin
then then
swiftLlvmPackages.clang.override rec { clangNoMarch.override rec {
libc = apple_sdk.Libsystem; libc = apple_sdk.Libsystem;
bintools = pkgs.bintools.override { inherit libc; }; bintools = pkgs.bintools.override { inherit libc; };
# Ensure that Swifts internal clang uses the same libc++ and libc++abi as the # Ensure that Swifts internal clang uses the same libc++ and libc++abi as the
@ -37,7 +41,7 @@ let
inherit (llvmPackages) libcxx; inherit (llvmPackages) libcxx;
} }
else else
swiftLlvmPackages.clang; clangNoMarch;
# Overrides that create a useful environment for swift packages, allowing # Overrides that create a useful environment for swift packages, allowing
# packaging with `swiftPackages.callPackage`. These are similar to # packaging with `swiftPackages.callPackage`. These are similar to

View file

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "wazero"; pname = "wazero";
version = "1.6.0"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tetratelabs"; owner = "tetratelabs";
repo = "wazero"; repo = "wazero";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-s01NoliiS8SqoHUjEUUsFcK82nt3xQgmAQZdrEtrOS0="; hash = "sha256-TBGRO+5PHPna2dNSeNktxALEc6TvJzV+kEiynYqvhgY=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "yaegi"; pname = "yaegi";
version = "0.15.1"; version = "0.16.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "traefik"; owner = "traefik";
repo = "yaegi"; repo = "yaegi";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ZV1HidHJvwum18QIIwQiCcRcitZdHk5+FxkPs6YgDac="; hash = "sha256-AplNd9+Z+bVC4/2aFKwhabMvumF9IPcSX8X8H0z/ADA=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -0,0 +1,57 @@
{ stdenv
, lib
, fetchzip
, php
}:
let
phpVersion = lib.versions.majorMinor php.version;
variant = {
"aarch64-darwin" = {
url = "https://web.archive.org/web/20240209234707/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_dar_arm64.tar.gz";
sha256 = "sha256-J6+bOXX9uRdrGouMAxt7nROjjfH4P2txb1hmPoHUmdM=";
prefix = "dar";
};
"aarch64-linux" = {
url = "https://web.archive.org/web/20240209234617/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_aarch64.tar.gz";
sha256 = "sha256-oOO4zr0CssxVGIUIfmAujILqOfQf8dJPADkr03a8HAs=";
prefix = "lin";
};
"x86_64-linux" = {
url = "https://web.archive.org/web/20240209052345if_/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz";
sha256 = "sha256-rsXKgxKHldBKDjJTsOdJP4SxfxLmMPDY+GizBpuDeyw=";
prefix = "lin";
};
"x86_64-darwin" = {
url = "https://web.archive.org/web/20240209234406/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_mac_x86-64.tar.gz";
sha256 = "sha256-bz2hQOaFbXePa8MhAZHESpZMRjjBH51IgvbR2EfBYMg=";
prefix = "mac";
};
};
in
stdenv.mkDerivation {
version = "13.0.2";
pname = "ioncube-loader";
extensionName = "ioncube-loader";
src = fetchzip {
url = variant.${stdenv.hostPlatform.system}.url;
sha256 = variant.${stdenv.hostPlatform.system}.sha256;
};
installPhase = ''
mkdir -p $out/lib/php/extensions
cp $src/ioncube_loader_${variant.${stdenv.hostPlatform.system}.prefix}_${phpVersion}.so $out/lib/php/extensions/ioncube-loader.so
'';
meta = with lib; {
description = "Use ionCube-encoded files on a web server";
changelog = "https://www.ioncube.com/loaders.php";
homepage = "https://www.ioncube.com";
sourceProvenance = [ sourceTypes.binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ neverbehave ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}

View file

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiodhcpwatcher"; pname = "aiodhcpwatcher";
version = "0.8.0"; version = "0.8.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bdraco"; owner = "bdraco";
repo = "aiodhcpwatcher"; repo = "aiodhcpwatcher";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-zZigXYUDSbXjlH810CgLa56xWYKcStBeKUbgsZ5WjOw="; hash = "sha256-t0roU91WblymcY69ieRq9zjlCq+gdJ0eDCkIoNQNjsc=";
}; };
postPatch = '' postPatch = ''

View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "airthings-ble"; pname = "airthings-ble";
version = "0.7.0"; version = "0.7.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "vincegio"; owner = "vincegio";
repo = "airthings-ble"; repo = "airthings-ble";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-A7Nrg0O+WVoHP+m8pz6idnNcxulwPYmMt9DfhKTHG24="; hash = "sha256-BeOrGRVxvfQR1xqIpOp4tOTvlqTKCZHUjVKDqVjVnYM=";
}; };
postPatch = '' postPatch = ''

View file

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fake-useragent"; pname = "fake-useragent";
version = "1.5.0"; version = "1.5.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fake-useragent"; owner = "fake-useragent";
repo = "fake-useragent"; repo = "fake-useragent";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-EzSofIHNwn7GPhnTNbo/451szB759w5T8poXj8XVNUU="; hash = "sha256-BDXJJeT29GWkN9DoVl8sxXFpV/eMqu3mqlvMr2lzJM8=";
}; };
postPatch = '' postPatch = ''

View file

@ -14,7 +14,7 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "GPy"; pname = "gpy";
version = "1.13.0"; version = "1.13.0";
pyproject = true; pyproject = true;

View file

@ -17,14 +17,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pysnmp-lextudio"; pname = "pysnmp-lextudio";
version = "6.0.6"; version = "6.0.10";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lextudio"; owner = "lextudio";
repo = "pysnmp"; repo = "pysnmp";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Mbzpe2wVoW4m7hnfsdcSO/8uOgWl5f1sLLqvdpQP2gU="; hash = "sha256-zxv/+IhIAnnn6gTyulPCuKainUcGMwRqw6ktYXR+d4Q=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -32,7 +32,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyunifiprotect"; pname = "pyunifiprotect";
version = "4.23.4"; version = "5.0.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = "briis"; owner = "briis";
repo = "pyunifiprotect"; repo = "pyunifiprotect";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-sBdu4XJkEtHf6dlHgJKFQvONp1x89NiS2EgxMiJFX7A="; hash = "sha256-19Ne8Jk0O1DjFVr286wpn9gdheNXOHHrIE9EgQNNB4w=";
}; };
env.SETUPTOOLS_SCM_PRETEND_VERSION = version; env.SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "s3fs"; pname = "s3fs";
version = "2024.2.0"; version = "2024.3.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-+AZPUirQiLVrBDBHyCVzSEfAJp3xnyYTyVbUwg3hW2I="; hash = "sha256-pmMjXIrbfmu8RadSksk5Ww+9WAuzlK3EztnorUvYZNo=";
}; };
postPatch = '' postPatch = ''

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "biome"; pname = "biome";
version = "1.5.3"; version = "1.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "biomejs"; owner = "biomejs";
repo = "biome"; repo = "biome";
rev = "cli/v${version}"; rev = "cli/v${version}";
hash = "sha256-70LHsmS01ssD4yCbHfBouV+NyhMIlBbX0jcHFu8aLMw="; hash = "sha256-JApGz2vDGU1IFmhyaT1noCRIP0YoucVvHq395/CJ1zA=";
}; };
cargoHash = "sha256-wf6X6aY1O9EABQ6sDNAb3XsVrC0lgUtpgoieiPZ7r3k="; cargoHash = "sha256-4m2xtj3FHd8DTS3BeUMVoo8Pzjkol96B6tvNyzqPhEo=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p=biome_cli" ]; cargoBuildFlags = [ "-p=biome_cli" ];
cargoTestFlags = cargoBuildFlags ++ cargoTestFlags = cargoBuildFlags ++
# skip a broken test from v1.5.3 release # skip a broken test from v1.6.1 release
# this will be removed on the next version # this will be removed on the next version
[ "-- --skip=diagnostics::test::termination_diagnostic_size" ]; [ "-- --skip=diagnostics::test::termination_diagnostic_size" ];

View file

@ -3,12 +3,12 @@
buildGraalvmNativeImage rec { buildGraalvmNativeImage rec {
pname = "clj-kondo"; pname = "clj-kondo";
version = "2024.02.12"; version = "2024.03.13";
src = fetchurl { src = fetchurl {
url = url =
"https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-up98q1/GWP9wZP95lHNE1z2xhzGzb8ZyTeuhP7a+qHw="; sha256 = "sha256-4V0YtGRbSzebxGYkoyCJEA4e1vtYWNbIHyXOlTfvGTU=";
}; };
graalvmDrv = graalvmCEPackages.graalvm-ce; graalvmDrv = graalvmCEPackages.graalvm-ce;

View file

@ -5,15 +5,15 @@
buildGoModule rec { buildGoModule rec {
pname = "goa"; pname = "goa";
version = "3.15.0"; version = "3.15.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "goadesign"; owner = "goadesign";
repo = "goa"; repo = "goa";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-F5ynJn3uuKSNZYZy+S6OV0AGv9HMpp4oo7lacQ+q3bw="; hash = "sha256-jzhvElHOBzekW3cyXf7wJG+8E1GObWVtPbBw18/dpCk=";
}; };
vendorHash = "sha256-SvNuSSLL/zj7rg+k0wNiJazQgZBWrUrpGgumbADkHQY="; vendorHash = "sha256-Z31hTOMmxFM0zmHoZRJaIz7ka2adV0crdhou6EudDWw=";
subPackages = [ "cmd/goa" ]; subPackages = [ "cmd/goa" ];

View file

@ -1,12 +1,12 @@
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.114.0"; version = "0.115.0";
pname = "jbang"; pname = "jbang";
src = fetchzip { src = fetchzip {
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
sha256 = "sha256-pLikm68JPG42XE5LCU/PB5rTUywWoQxtmHXYBDPASNE="; sha256 = "sha256-JTyMX3120h+xtXnkTW313zc7OkWMB4DayeRW6hNc4/A=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -5,13 +5,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "minizinc-ide"; pname = "minizinc-ide";
version = "2.8.2"; version = "2.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MiniZinc"; owner = "MiniZinc";
repo = "MiniZincIDE"; repo = "MiniZincIDE";
rev = version; rev = version;
hash = "sha256-3L/hulNI7e2wE9gMt2h3mS0ubHZ4kcVpwALCmWQtv7A="; hash = "sha256-/x4mWjAk24s6Ax22Q15WUPLLwm7YrzwaoMIINjQr5zU=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -2,16 +2,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "terser"; pname = "terser";
version = "5.28.1"; version = "5.29.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terser"; owner = "terser";
repo = "terser"; repo = "terser";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-iThO12jPzwCyfi69Z0YpttRxhVnSVirKbttN6R5iqRg="; hash = "sha256-1E5sXNKekkxv40FwGBR20LEWbM63SyKOZ7h1pcCqLKA=";
}; };
npmDepsHash = "sha256-CptJkwC0A03v2CeYSCKXq7fOhPdLWPrVJYpayzKbdkQ="; npmDepsHash = "sha256-X37hDDyi0eEWdVoy3vU6+efXgEaLRK81LjfDEWqSFC0=";
meta = with lib; { meta = with lib; {
description = "JavaScript parser, mangler and compressor toolkit for ES6+"; description = "JavaScript parser, mangler and compressor toolkit for ES6+";

View file

@ -23,13 +23,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mold"; pname = "mold";
version = "2.4.1"; version = "2.30.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rui314"; owner = "rui314";
repo = "mold"; repo = "mold";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-wwlpYAWP8sAsEkTq0w3s2jAWGayW3v9QcaVRKWHTlGE="; hash = "sha256-VVgJDKf21V7Mkfalh8tJ0Tx73VG1ong+8C6uPC23154=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "oxlint"; pname = "oxlint";
version = "0.2.12"; version = "0.2.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "web-infra-dev"; owner = "web-infra-dev";
repo = "oxc"; repo = "oxc";
rev = "oxlint_v${version}"; rev = "oxlint_v${version}";
hash = "sha256-uI+zzRRsRaO3OpDhhrp4VW7mHjwmOENHkPl5htYJ2dA="; hash = "sha256-R6RKAOmLjPO1vsM/YMQZpggO98GtecNb+nUf3jC2/+o=";
}; };
cargoHash = "sha256-FV79CORqCXj24CCgGLKew5/tpnjMgVEek0cL2FTFq1A="; cargoHash = "sha256-+bbTPbCKWN+iJkbtDfEE2CuRdLJNAIoAB0+sSd0kgR4=";
buildInputs = [ buildInputs = [
rust-jemalloc-sys rust-jemalloc-sys

View file

@ -1,13 +1,13 @@
{ buildPackages, cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }: { buildPackages, cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }:
let let
version = "3.1.0"; version = "3.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "quick-lint"; owner = "quick-lint";
repo = "quick-lint-js"; repo = "quick-lint-js";
rev = version; rev = version;
hash = "sha256-bgyjpFYGU+uZLVBJ3gpl8UOrRzvz+7qibQD2RllSY38="; hash = "sha256-L2LCRm1Fsg+xRdPc8YmgxDnuXJo92nxs862ewzObZ3I=";
}; };
quick-lint-js-build-tools = buildPackages.stdenv.mkDerivation { quick-lint-js-build-tools = buildPackages.stdenv.mkDerivation {

View file

@ -26,13 +26,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "naev"; pname = "naev";
version = "0.11.3"; version = "0.11.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "naev"; owner = "naev";
repo = "naev"; repo = "naev";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-2n7i5qCFdpjBpjeMv6aCd0zyD4c60FciHmSafbArnms="; sha256 = "sha256-Cyun9BxIcv5V3HbMuFEhbYZnAuneTUwztc+ZlNaTp70=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -1,100 +0,0 @@
diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
index c23afce4..12ac12f4 100644
--- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
+++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
@@ -365,13 +365,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 2FEA0CFF2490381A00EEF3AD;
- remoteInfo = "MoltenVKSPIRVToMSLConverter-tvOS";
- };
2FEA0D1B249040CA00EEF3AD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
@@ -400,27 +393,6 @@
remoteGlobalIDString = A93903C71C57E9ED00FE90DC;
remoteInfo = "MVKSPIRVToMSLConverter-macOS";
};
- A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = A93903B81C57E9D700FE90DC;
- remoteInfo = "MVKSPIRVToMSLConverter-iOS";
- };
- A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = A9092A8C1A81717B00051823;
- remoteInfo = MoltenVKShaderConverter;
- };
- DCA2CEAE2A45DFD400FB75B6 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = DCFD7F6F2A45BDA0007BBBF7;
- remoteInfo = "MoltenVKShaderConverter-xrOS";
- };
DCBC41212A45DB1000F49BD1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
@@ -1019,7 +998,6 @@
buildRules = (
);
dependencies = (
- 2F21D82F24983488009BEA5F /* PBXTargetDependency */,
);
name = "MoltenVK-tvOS";
productName = MoltenVK;
@@ -1039,7 +1017,6 @@
buildRules = (
);
dependencies = (
- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */,
);
name = "MoltenVK-iOS";
productName = MoltenVK;
@@ -1059,7 +1036,6 @@
buildRules = (
);
dependencies = (
- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */,
);
name = "MoltenVK-macOS";
productName = MoltenVK;
@@ -1476,29 +1452,6 @@
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 2F21D82F24983488009BEA5F /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "MoltenVKSPIRVToMSLConverter-tvOS";
- targetProxy = 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */;
- };
- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "MVKSPIRVToMSLConverter-iOS";
- targetProxy = A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */;
- };
- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = MoltenVKShaderConverter;
- targetProxy = A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */;
- };
- DCA2CEAF2A45DFD400FB75B6 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "MoltenVKShaderConverter-xrOS";
- targetProxy = DCA2CEAE2A45DFD400FB75B6 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin XCBuildConfiguration section */
2FEA0AB824902F9F00EEF3AD /* Debug */ = {
isa = XCBuildConfiguration;

View file

@ -1,84 +0,0 @@
diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
index c7842b63..d55f73ed 100644
--- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
+++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 54;
+ objectVersion = 48;
objects = {
/* Begin PBXBuildFile section */
@@ -33,9 +33,6 @@
A920A8AC251B75B70076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
A920A8AD251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
A920A8AE251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
A925B71B1C78DEB2006E7ECD /* libMoltenVKShaderConverter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; };
A928C9191D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; };
A928C91A1D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; };
@@ -55,12 +52,6 @@
A97CC7411C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A97CC73E1C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp */; };
A98149681FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; };
A98149691FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; };
- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
A9A14E332244388700C080F3 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A14E322244388700C080F3 /* Metal.framework */; };
A9B51BDD225E98BB00AC74D2 /* MVKOSExtensions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B51BDB225E98BB00AC74D2 /* MVKOSExtensions.mm */; };
A9F042B21FB4D060009FCCB8 /* MVKCommonEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = A9F042AA1FB4D060009FCCB8 /* MVKCommonEnvironment.h */; };
@@ -115,9 +106,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -134,9 +122,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -144,9 +129,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -313,7 +295,7 @@
A925B71D1C78DEBF006E7ECD /* PBXTargetDependency */,
);
name = MoltenVKShaderConverter;
- productName = MetalGLShaderConverterTool;
+ productName = MoltenVKShaderConverter;
productReference = A964BD5F1C57EFBD00D930D8 /* MoltenVKShaderConverter */;
productType = "com.apple.product-type.tool";
};
@@ -349,7 +331,7 @@
dependencies = (
);
name = "MoltenVKShaderConverter-macOS";
- productName = "MetalGLShaderConverter-macOS";
+ productName = MoltenVKShaderConverter;
productReference = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */;
productType = "com.apple.product-type.library.static";
};

View file

@ -1,26 +1,31 @@
{ lib {
, overrideCC lib,
, stdenv stdenv,
, fetchFromGitHub fetchFromGitHub,
, gitUpdater gitUpdater,
, cctools cereal,
, sigtool libcxx,
, cereal glslang,
, libcxx simd,
, glslang spirv-cross,
, spirv-cross spirv-headers,
, spirv-headers spirv-tools,
, spirv-tools vulkan-headers,
, vulkan-headers xcbuild,
, xcbuild AppKit,
, AppKit Foundation,
, Foundation Metal,
, Libsystem QuartzCore,
, MacOSX-SDK # MoltenVK supports using private APIs to implement some Vulkan functionality.
, Metal # Applications that use private APIs cant be distributed on the App Store,
, QuartzCore # but thats not really a concern for nixpkgs, so use them by default.
# See: https://github.com/KhronosGroup/MoltenVK/blob/main/README.md#metal_private_api
enablePrivateAPIUsage ? true,
}: }:
let
inherit (stdenv.hostPlatform) isStatic;
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "MoltenVK"; pname = "MoltenVK";
version = "1.2.7"; version = "1.2.7";
@ -32,15 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
QuartzCore QuartzCore
cereal cereal
glslang glslang
simd
spirv-cross spirv-cross
spirv-headers spirv-headers
spirv-tools spirv-tools
vulkan-headers vulkan-headers
]; ];
nativeBuildInputs = [ cctools sigtool xcbuild ]; nativeBuildInputs = [ xcbuild ];
outputs = [ "out" "bin" "dev" ]; outputs = [
"out"
"bin"
"dev"
];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
@ -49,106 +59,142 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-0+S/kueV+AEVt+oFnh4cgcDRVtEbUH1QiHFPhGhimCA="; hash = "sha256-0+S/kueV+AEVt+oFnh4cgcDRVtEbUH1QiHFPhGhimCA=";
}; };
patches = [
# Fix the Xcode projects to play nicely with `xcbuild`.
./MoltenVKShaderConverter.xcodeproj.patch
./MoltenVK.xcodeproj.patch
];
postPatch = '' postPatch = ''
# Move `mvkGitRevDerived.h` to a stable location # Move `mvkGitRevDerived.h` to a stable location
substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \ substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \
--replace-fail '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \ --replace-fail '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \
--replace-fail '$(git rev-parse HEAD)' ${finalAttrs.src.rev} --replace-fail '$(git rev-parse HEAD)' ${finalAttrs.src.rev}
# Use the SPIRV-Cross packaged in nixpkgs instead of one built specifically for MoltenVK.
substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \ # Modify MoltenVK Xcode projects to build with xcbuild and dependencies from nixpkgs.
for proj in MoltenVK MoltenVKShaderConverter; do
# Remove xcframework dependencies from the Xcode projects. The basic format is:
# (children|files) = (
# DCFD7F822A45BDA0007BBBF7 /* SPIRVCross.xcframework in Frameworks */,
# etc
# )
# This regex will only remove lines matching `xcframework` that are in these blocks
# to avoid accidentally corrupting the project.
sed -E -e '/(children|files) = /,/;/{/xcframework/d}' \
-i "$proj/$proj.xcodeproj/project.pbxproj"
# Ensure the namespace used is consistent with the spirv-cross package in nixpkgs.
substituteInPlace "$proj/$proj.xcodeproj/project.pbxproj" \
--replace-fail SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross --replace-fail SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross
done
substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \ substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \
--replace-fail SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross --replace-fail MetalGLShaderConverterTool MoltenVKShaderConverter \
# Adding all of `usr/include` from the SDK results in header conflicts with `libcxx.dev`. --replace-fail MetalGLShaderConverter-macOS MoltenVKShaderConverter
# Work around it by symlinking just the SIMD stuff needed by MoltenVK.
# Dont try to build `xcframework`s because `xcbuild` cant build them.
sed -e '/xcframework/d' -i Scripts/package_all.sh
# Remove vendored dependency links.
find . -lname '*/External/*' -delete
# The library will be linked in the install phase regardless of version,
# so truncate it if it exists to avoid link failures.
test -f Scripts/create_dylib.sh && truncate --size 0 Scripts/create_dylib.sh
# Link glslang source because MoltenVK needs non-public headers to build.
mkdir -p build/include mkdir -p build/include
ln -s "${MacOSX-SDK}/usr/include/simd" "build/include"
ln -s "${glslang.src}" "build/include/glslang" ln -s "${glslang.src}" "build/include/glslang"
''; '';
dontConfigure = true; env.NIX_CFLAGS_COMPILE = toString (
[
env.NIX_CFLAGS_COMPILE = toString [
"-isystem ${lib.getDev libcxx}/include/c++/v1" "-isystem ${lib.getDev libcxx}/include/c++/v1"
"-I${lib.getDev spirv-cross}/include/spirv_cross" "-I${lib.getDev spirv-cross}/include/spirv_cross"
"-I${lib.getDev spirv-headers}/include/spirv/unified1/" "-I${lib.getDev spirv-headers}/include/spirv/unified1"
]
++ lib.optional enablePrivateAPIUsage "-DMVK_USE_METAL_PRIVATE_API=1"
);
env.NIX_LDFLAGS = toString [
"-lMachineIndependent"
"-lGenericCodeGen"
"-lglslang"
"-lOSDependent"
"-lSPIRV"
"-lSPIRV-Tools"
"-lSPIRV-Tools-opt"
"-lspirv-cross-msl"
"-lspirv-cross-core"
"-lspirv-cross-glsl"
"-lspirv-cross-reflect"
]; ];
buildPhase = '' buildPhase = ''
runHook preBuild
NIX_CFLAGS_COMPILE+=" \ NIX_CFLAGS_COMPILE+=" \
-I$NIX_BUILD_TOP/$sourceRoot/build/include \ -I$NIX_BUILD_TOP/$sourceRoot/build/include \
-I$NIX_BUILD_TOP/$sourceRoot/Common" -I$NIX_BUILD_TOP/$sourceRoot/Common"
NIX_LDFLAGS+=" -L$NIX_BUILD_TOP/$sourceRoot/build/lib"
# Build each project on its own because `xcbuild` fails to build `MoltenVKPackaging.xcodeproj`.
build=$NIX_BUILD_TOP/$sourceRoot/build
mkdir -p "$build/bin" "$build/lib"
NIX_LDFLAGS+=" \
-lMachineIndependent \
-lGenericCodeGen \
-lglslang \
-lOSDependent \
-lSPIRV \
-lSPIRV-Tools \
-lSPIRV-Tools-opt \
-lspirv-cross-msl \
-lspirv-cross-core \
-lspirv-cross-glsl"
pushd MoltenVKShaderConverter
xcodebuild build \ xcodebuild build \
SYMROOT=$PWD/Products OBJROOT=$PWD/Intermedates \
-jobs $NIX_BUILD_CORES \ -jobs $NIX_BUILD_CORES \
-configuration Release \ -configuration Release \
-project MoltenVKShaderConverter.xcodeproj \ -project MoltenVKPackaging.xcodeproj \
-scheme MoltenVKShaderConverter \ -scheme 'MoltenVK Package (macOS only)' \
-destination generic/platform=macOS \
-arch ${stdenv.hostPlatform.darwinArch} -arch ${stdenv.hostPlatform.darwinArch}
declare -A products=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib )
for product in "''${!products[@]}"; do
cp MoltenVKShaderConverter-*/Build/Products/Release/$product "$build/''${products[$product]}/$product"
done
popd
NIX_LDFLAGS+=" \ runHook postBuild
'';
postBuild =
if isStatic then
''
mkdir -p Package/Release/MoltenVK/static
cp Products/Release/libMoltenVK.a Package/Release/MoltenVK/static
''
else
''
# MoltenVKs Xcode project builds the dylib, but it doesnt seem to work with
# xcbuild. This is based on the script versions prior to 1.2.8 used.
mkdir -p Package/Release/MoltenVK/dynamic/dylib
clang++ -Wl,-all_load -Wl,-w \
-dynamiclib \
-compatibility_version 1.0.0 -current_version 1.0.0 \
-LProducts/Release \
-framework AppKit \
-framework CoreGraphics \
-framework Foundation \
-framework IOKit \
-framework IOSurface \
-framework Metal \
-framework QuartzCore \
-lobjc \ -lobjc \
-lMoltenVKShaderConverter \ -lMoltenVKShaderConverter \
-lspirv-cross-reflect" -lspirv-cross-reflect \
-install_name "$out/lib/libMoltenVK.dylib" \
pushd MoltenVK -o Package/Release/MoltenVK/dynamic/dylib/libMoltenVK.dylib \
xcodebuild build \ -force_load Products/Release/libMoltenVK.a
-jobs $NIX_BUILD_CORES \
-configuration Release \
-project MoltenVK.xcodeproj \
-scheme MoltenVK-macOS \
-arch ${stdenv.hostPlatform.darwinArch}
cp MoltenVK-*/Build/Products/Release/dynamic/libMoltenVK.dylib "$build/lib/libMoltenVK.dylib"
popd
''; '';
installPhase = '' installPhase = ''
mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" "$dev/include/MoltenVK" runHook preInstall
cp build/bin/MoltenVKShaderConverter "$bin/bin/"
cp build/lib/libMoltenVK.dylib "$out/lib/"
cp MoltenVK/MoltenVK/API/* "$dev/include/MoltenVK"
install -m644 MoltenVK/icd/MoltenVK_icd.json "$out/share/vulkan/icd.d/MoltenVK_icd.json"
substituteInPlace $out/share/vulkan/icd.d/MoltenVK_icd.json \
--replace-fail ./libMoltenVK.dylib "$out/lib/libMoltenVK.dylib"
'';
postFixup = '' libraryExtension=${if isStatic then ".a" else ".dylib"}
install_name_tool -id "$out/lib/libMoltenVK.dylib" "$out/lib/libMoltenVK.dylib" packagePath=${if isStatic then "static" else "dynamic/dylib"}
codesign -s - -f "$out/lib/libMoltenVK.dylib"
codesign -s - -f "$bin/bin/MoltenVKShaderConverter" mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" "$dev"
cp Package/Release/MoltenVKShaderConverter/Tools/MoltenVKShaderConverter "$bin/bin"
cp -r Package/Release/MoltenVK/include "$dev"
cp Package/Release/MoltenVK/$packagePath/libMoltenVK$libraryExtension "$out/lib"
# Install ICD definition for use with vulkan-loader.
install -m644 MoltenVK/icd/MoltenVK_icd.json \
"$out/share/vulkan/icd.d/MoltenVK_icd.json"
substituteInPlace "$out/share/vulkan/icd.d/MoltenVK_icd.json" \
--replace-fail ./libMoltenVK.dylib "$out/lib/libMoltenVK.dylib"
runHook postInstall
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
rev-prefix = "v"; rev-prefix = "v";
ignoredVersions = ".*-(beta|rc).*";
}; };
meta = { meta = {

View file

@ -36,13 +36,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "prl-tools"; pname = "prl-tools";
version = "19.2.1-54832"; version = "19.3.0-54924";
# We download the full distribution to extract prl-tools-lin.iso from # We download the full distribution to extract prl-tools-lin.iso from
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
src = fetchurl { src = fetchurl {
url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
hash = "sha256-PmQSGoJbB0+Q7t56FOFxOVQ86CJLqAa6PTnWLx5CzpA="; hash = "sha256-Hj1manQSZHiht6mmWes44RVk2Bdqp6QdNCdK322bzWc=";
}; };
hardeningDisable = [ "pic" "format" ]; hardeningDisable = [ "pic" "format" ];

View file

@ -13,8 +13,8 @@ let
aspnetcore_6_0 aspnetcore_6_0
]; ];
version = "2.10.1"; version = "2.11.0";
hash = "sha256-7F/Hgt0p73QY5Sa3MRP//x7EpfcHCbnAPKDf00XzUbw="; hash = "sha256-Q2nRljBl+rnf3Q7WFgPJ9b0xDkUTS9DJ7MpvnwV+cMM=";
in in
stdenv.mkDerivation { stdenv.mkDerivation {

View file

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2024.3.0"; version = "2024.3.1";
components = { components = {
"3_day_blinds" = ps: with ps; [ "3_day_blinds" = ps: with ps; [
]; ];
@ -2430,6 +2430,7 @@
"joaoapps_join" = ps: with ps; [ "joaoapps_join" = ps: with ps; [
]; # missing inputs: python-join-api ]; # missing inputs: python-join-api
"juicenet" = ps: with ps; [ "juicenet" = ps: with ps; [
python-juicenet
]; ];
"justnimbus" = ps: with ps; [ "justnimbus" = ps: with ps; [
justnimbus justnimbus

View file

@ -536,7 +536,7 @@ let
extraBuildInputs = extraPackages python.pkgs; extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2024.3.0"; hassVersion = "2024.3.1";
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -554,13 +554,13 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-/DCE2IHdS+oImpzwIaFgXotAsoiPPbe3X3HG7RXbv9g="; hash = "sha256-cvzoia2zzqXSDnPQdevfs73H4qITPBpEpzpFKM9jRKs=";
}; };
# Secondary source is pypi sdist for translations # Secondary source is pypi sdist for translations
sdist = fetchPypi { sdist = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-G9M1WV+s4zu9BY10RWmJ71ghafAOHMjnCR6BOlggguM="; hash = "sha256-WK2PTTFDnQMwiXAtxjNOo9u5KVXWnqUXqd286hq0VEc=";
}; };
nativeBuildInputs = with python.pkgs; [ nativeBuildInputs = with python.pkgs; [

View file

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here # the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend"; pname = "home-assistant-frontend";
version = "20240306.0"; version = "20240307.0";
format = "wheel"; format = "wheel";
src = fetchPypi { src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend"; pname = "home_assistant_frontend";
dist = "py3"; dist = "py3";
python = "py3"; python = "py3";
hash = "sha256-eDuJC23PJbjaKC9TBCLg5ML3XR6admKrT9RVgfUQCw8="; hash = "sha256-Wy5TzJ6+Dbkk51TMt9zGIfjI7gMrT4mK0IIRnl4byVE=";
}; };
# there is nothing to strip in this package # there is nothing to strip in this package

View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "home-assistant-intents"; pname = "home-assistant-intents";
version = "2024.2.28"; version = "2024.3.12";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-EmnaYc+L1PHOv6M7odYDl+UBZkLJRtP86xPoqdbuOqU="; hash = "sha256-9oMn5ogHcuopAnXgATu9xlBBBMeWJ9RT5C//xJ5FOBI=";
}; };
postPatch = '' postPatch = ''

View file

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "mox"; pname = "mox";
version = "0.0.9"; version = "0.0.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mjl-"; owner = "mjl-";
repo = "mox"; repo = "mox";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-QDDNWGuDWxUBdoYEHQC7Ug0i8NyaqqGVsmFtTWfiM0M="; hash = "sha256-BigxFlMkagw82Lkz1xMMSwAJyfSdSbeQr6G6rCaomNg=";
}; };
# set the version during buildtime # set the version during buildtime

View file

@ -12,13 +12,13 @@
mkDerivation rec { mkDerivation rec {
pname = "antimicrox"; pname = "antimicrox";
version = "3.3.4"; version = "3.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AntiMicroX"; owner = "AntiMicroX";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-WEtKeQKRZcYpZ4mnFdj4ZRApBuD8fByf11Uu6ylbAcY="; sha256 = "sha256-zBIEuZdmcyA99YdwC6tn0I3Ori8VyBOw50ablb/Lmvs=";
}; };
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ];

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "steampipe"; pname = "steampipe";
version = "0.21.8"; version = "0.22.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "turbot"; owner = "turbot";
repo = "steampipe"; repo = "steampipe";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-PY2CpieY1kTuT3Yd6i5hiRjVEwYNHn1GF+E0g6u8BP0="; hash = "sha256-Qmb4dBLtztrhnm8fKEkaxX2tJAXsQ+/C8cweQbRc7uk=";
}; };
vendorHash = "sha256-yS2FiTnK65LAY3tGSlMy0LMg6691tS/9yQ4w7HrW/pw="; vendorHash = "sha256-2p/D/sycx78BXBe+WHeYP4hLz1aX33cCRQ/AbwKkidM=";
proxyVendor = true; proxyVendor = true;
patchPhase = '' patchPhase = ''

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "oha"; pname = "oha";
version = "1.4.0"; version = "1.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hatoo"; owner = "hatoo";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-mjQyeotXKF1hohSmPisshR8Cap9K/IEE55cYSk/QxQE="; hash = "sha256-r5jYHs+oVflgFTQZpKvdNs56TmZtyljZKDJMVP+iUNY=";
}; };
cargoHash = "sha256-JZIuKUky8D9Q+1JZQ4Vg8GF6Qkh9hG/FebpqyRzPOcA="; cargoHash = "sha256-Q3ixlB/P/99h6ZuT37KrM9fxyBzcmlmM5jw6xDT2lPE=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ nativeBuildInputs = lib.optionals stdenv.isLinux [
pkg-config pkg-config

View file

@ -14,14 +14,14 @@ let
}.${system} or throwSystem; }.${system} or throwSystem;
hash = { hash = {
x86_64-linux = "sha256-17RtPUuFmIwxh+9mEsR9vwUHQHnXLIHEEhpV05Q9Ssw="; x86_64-linux = "sha256-XzMd2NgMY8AUSjdYDyOEcK3HlZ5hl+L/ulHgy2iDtKg=";
aarch64-linux = "sha256-bJjhKf8dkOsVaaPikDrPLe+zF5CFvxvEALuzmiQuINY="; aarch64-linux = "sha256-ypjg73ciUhXIyiNSLzim8AZV0ByU27WRc3PJqTyTllg=";
armv7l-linux = "sha256-m/Ncr/+5kkC4p1/DhEfWermdsOAuekVECzR7SI1KpIQ="; armv7l-linux = "sha256-VgVn5NsGpvGpkLQRZDphOgeZFQzhR2rVfcwi/EkJ/y4=";
}.${system} or throwSystem; }.${system} or throwSystem;
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "zrok"; pname = "zrok";
version = "0.4.24"; version = "0.4.26";
src = fetchzip { src = fetchzip {
url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz";

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cfssl"; pname = "cfssl";
version = "1.6.4"; version = "1.6.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = "cfssl"; repo = "cfssl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-QVKgfwyHzN6n8CnvGT9gg2ncfaDo+Pe4IAQhm4gNiz4="; sha256 = "sha256-Xczpv6tLJiy2dXoGJ0QUmXwOn0p6S+lm2oz61oytQec=";
}; };
subPackages = [ subPackages = [

View file

@ -12,13 +12,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "tessen"; pname = "tessen";
version = "2.2.1"; version = "2.2.3";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~ayushnix"; owner = "~ayushnix";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-8hhYOd5h55kl7ChqdyRzsaxzWLpX41aqG8LfznmbFWw="; sha256 = "sha256-mVGsI1JBG7X8J7gqocdfxWuTVSZpxS23QPGHCUofvV8=";
}; };
nativeBuildInputs = [ makeWrapper installShellFiles scdoc ]; nativeBuildInputs = [ makeWrapper installShellFiles scdoc ];

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stress-ng"; pname = "stress-ng";
version = "0.17.05"; version = "0.17.06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ColinIanKing"; owner = "ColinIanKing";
repo = pname; repo = pname;
rev = "V${version}"; rev = "V${version}";
hash = "sha256-TlMLCDwFJGEEttdP9Wc0KAtj9Na1NC5E5e2VsTQugG4="; hash = "sha256-69Ckl3n09J25Y0hzkH/RV9hJNlSfYfoxTdWiD5gBlQQ=";
}; };
postPatch = '' postPatch = ''

View file

@ -3785,7 +3785,7 @@ texlive-scripts-69407={run="12y5mpwin93asvl0anqs170zixvb29vjakwgagvylhg1ns27lrdc
texlive-scripts-extra-62517={run="193v0r4i3p4psn5b4q0ggpgaazwn6jadjlzh5gjm3igg9k73i1wj";doc="1izzy295pmxrg0sf2szxxahxm6s8bfi960mbs9z6vy7m5j1szxwl";}; texlive-scripts-extra-62517={run="193v0r4i3p4psn5b4q0ggpgaazwn6jadjlzh5gjm3igg9k73i1wj";doc="1izzy295pmxrg0sf2szxxahxm6s8bfi960mbs9z6vy7m5j1szxwl";};
texlive-sr-54594={doc="0icavs9jkcr5b5cx5kv202k95j0ydgby9lqrw8wm9h936mbn9bkj";}; texlive-sr-54594={doc="0icavs9jkcr5b5cx5kv202k95j0ydgby9lqrw8wm9h936mbn9bkj";};
texlive-zh-cn-54490={doc="1r8n9k1cy7798g1rg1hyj6g945j9649c5hhqf8hm7a7abzx7w6ll";}; texlive-zh-cn-54490={doc="1r8n9k1cy7798g1rg1hyj6g945j9649c5hhqf8hm7a7abzx7w6ll";};
"texlive.infra-68903.tlpdb69413"={run="1ig9nsyhhgv9vr5hhvzj3asqz75fdjrvgyj1s2z8rbng0y45x8nv";doc="0d6ij3bgna15i5fkg4xwi7155wz891625sy6qh4jfjmi9sda9p2n";tlpkg="07qvyhgbbl4cddhn4wqh1ivp1ifpw5hwv05xywl62zc1swag317x";}; "texlive.infra-68903.tlpdb69413"={run="1ig9nsyhhgv9vr5hhvzj3asqz75fdjrvgyj1s2z8rbng0y45x8nv";doc="0d6ij3bgna15i5fkg4xwi7155wz891625sy6qh4jfjmi9sda9p2n";tlpkg="141qqpf1kg65kr5rw2rrzspcyhgp9dgndz2md9snqpbspmd92jws";};
texliveonfly-55777={run="03i9pzqv2dz4z9nlq60kzwiyfvzhhaalhczqa9146jp4wvcib9l3";doc="1fsabzkbcrk42rsp8ssx0kvap31y1rqnkq582129946q3njvmylx";}; texliveonfly-55777={run="03i9pzqv2dz4z9nlq60kzwiyfvzhhaalhczqa9146jp4wvcib9l3";doc="1fsabzkbcrk42rsp8ssx0kvap31y1rqnkq582129946q3njvmylx";};
texloganalyser-54526={run="0icav63nll0lj85cqlbg1lx1r6ysjf1lyv5bydxr3flr1c7yqx2r";doc="1s7952n2brrz3s1qca9r5qk8fnjlmrmrn8b06dhjxdb7wdqis6g0";}; texloganalyser-54526={run="0icav63nll0lj85cqlbg1lx1r6ysjf1lyv5bydxr3flr1c7yqx2r";doc="1s7952n2brrz3s1qca9r5qk8fnjlmrmrn8b06dhjxdb7wdqis6g0";};
texlogfilter-62792={run="19sxpfyfp2knv8q13sgka5kw74vplr0fnf5c9m599h5kb7v4pcys";doc="1wwhdm7b2rwp9qjpivj3wflwf6q4lcxbc3r52g9c68w7d492v7al";}; texlogfilter-62792={run="19sxpfyfp2knv8q13sgka5kw74vplr0fnf5c9m599h5kb7v4pcys";doc="1wwhdm7b2rwp9qjpivj3wflwf6q4lcxbc3r52g9c68w7d492v7al";};

View file

@ -417,7 +417,7 @@ in lib.recursiveUpdate orig rec {
# add minimal texlive.tlpdb # add minimal texlive.tlpdb
postUnpack = '' postUnpack = ''
if [[ "$tlType" == "tlpkg" ]] ; then if [[ -d "$out"/TeXLive ]] ; then
xzcat "${tlpdbxz}" | sed -n -e '/^name \(00texlive.config\|00texlive.installation\)$/,/^$/p' > "$out"/texlive.tlpdb xzcat "${tlpdbxz}" | sed -n -e '/^name \(00texlive.config\|00texlive.installation\)$/,/^$/p' > "$out"/texlive.tlpdb
fi fi
''; '';

View file

@ -2692,10 +2692,6 @@ with pkgs;
fsrx = callPackage ../tools/misc/fsrx { }; fsrx = callPackage ../tools/misc/fsrx { };
fsuae = callPackage ../applications/emulators/fs-uae { };
fsuae-launcher = libsForQt5.callPackage ../applications/emulators/fs-uae/launcher.nix { };
fuc = callPackage ../tools/misc/fuc { }; fuc = callPackage ../tools/misc/fuc { };
fuse-emulator = callPackage ../applications/emulators/fuse-emulator { }; fuse-emulator = callPackage ../applications/emulators/fuse-emulator { };

View file

@ -172,8 +172,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
moltenvk = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/moltenvk { moltenvk = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/moltenvk {
inherit (apple_sdk_11_0.frameworks) AppKit Foundation Metal QuartzCore; inherit (apple_sdk_11_0.frameworks) AppKit Foundation Metal QuartzCore;
inherit (apple_sdk_11_0) MacOSX-SDK Libsystem; inherit (apple_sdk_11_0.libs) simd;
inherit (pkgs.darwin) cctools sigtool;
}; };
opencflite = callPackage ../os-specific/darwin/opencflite { }; opencflite = callPackage ../os-specific/darwin/opencflite { };

View file

@ -259,6 +259,8 @@ lib.makeScope pkgs.newScope (self: with self; {
inotify = callPackage ../development/php-packages/inotify { }; inotify = callPackage ../development/php-packages/inotify { };
ioncube-loader = callPackage ../development/php-packages/ioncube-loader { };
mailparse = callPackage ../development/php-packages/mailparse { }; mailparse = callPackage ../development/php-packages/mailparse { };
maxminddb = callPackage ../development/php-packages/maxminddb { }; maxminddb = callPackage ../development/php-packages/maxminddb { };