From 1234cd4ca401c9f8f06b0e29ec13f02359c2bec8 Mon Sep 17 00:00:00 2001 From: Mugahed Izzeldin Date: Thu, 2 Apr 2026 10:37:52 -0600 Subject: [PATCH 01/51] maintainers: add mugaizzo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 08392e400e6e..3704b6b81401 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18465,6 +18465,12 @@ githubId = 220262; name = "Ion Mudreac"; }; + mugaizzo = { + email = "mugahedman@hotmail.com"; + github = "mugaizzo"; + githubId = 15838537; + name = "Mugahed Izzeldin"; + }; mulatta = { email = "seungwon@mulatta.io"; github = "mulatta"; From 61875ed0e53d68b194207a187af195cd91f59b28 Mon Sep 17 00:00:00 2001 From: Ricardo Campos Date: Sun, 19 Apr 2026 02:03:31 +0100 Subject: [PATCH 02/51] maintainers: add layzyoldman --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 787280f1b699..c4b6d3b23669 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15037,6 +15037,12 @@ githubId = 632767; name = "Guillaume Maudoux"; }; + layzyoldman = { + email = "ricardopaivacampos@gmail.com"; + github = "layzyoldman"; + githubId = 193278607; + name = "Ricardo Campos"; + }; LazilyStableProton = { email = "LazilyStable@proton.me"; github = "LazyStability"; From 8230ad42940f15bf730bbbd1285fb400e8f10870 Mon Sep 17 00:00:00 2001 From: Ricardo Campos Date: Sun, 19 Apr 2026 02:13:52 +0100 Subject: [PATCH 03/51] vesta-viewer: fix file save/export crash from missing GSettings --- pkgs/by-name/ve/vesta-viewer/package.nix | 29 ++++++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix index ebf984923f23..ddc228aecf83 100644 --- a/pkgs/by-name/ve/vesta-viewer/package.nix +++ b/pkgs/by-name/ve/vesta-viewer/package.nix @@ -6,9 +6,10 @@ makeDesktopItem, copyDesktopItems, autoPatchelfHook, + wrapGAppsHook3, _7zz, - glib, + gsettings-desktop-schemas, libGL, libGLU, libgcc, @@ -32,7 +33,10 @@ let "x86_64-linux" "x86_64-darwin" ]; - maintainers = with lib.maintainers; [ ulysseszhan ]; + maintainers = with lib.maintainers; [ + ulysseszhan + layzyoldman + ]; mainProgram = "VESTA"; }; @@ -40,9 +44,11 @@ let nativeBuildInputs = [ copyDesktopItems autoPatchelfHook + wrapGAppsHook3 ]; buildInputs = [ glib + gsettings-desktop-schemas libGL libGLU libgcc @@ -67,6 +73,15 @@ let mkdir -p $out/bin ln -s $out/lib/VESTA/VESTA{,-core,-gui} -t $out/bin + # VESTA resolves resources (img/, *.ini, *.dat) relative to argv[0]. + # wrapProgram replaces the binary with a wrapper script, changing argv[0]. + # Symlinking data files into $out/bin/ ensures they are found correctly. + for f in $out/lib/VESTA/*.ini $out/lib/VESTA/*.dat $out/lib/VESTA/asfdc; do + ln -s $f $out/bin/$(basename $f) + done + + ln -s $out/lib/VESTA/img $out/bin/img + mkdir -p $out/share/icons/hicolor/{128x128,256x256}/apps ln -s $out/lib/VESTA/img/logo.png $out/share/icons/hicolor/128x128/apps/VESTA.png ln -s $out/lib/VESTA/img/logo@2x.png $out/share/icons/hicolor/256x256/apps/VESTA.png @@ -83,14 +98,18 @@ let exec = "VESTA %u"; icon = "VESTA"; categories = [ "Science" ]; - mimeTypes = [ "application/x-vesta" ]; + mimeTypes = [ + "chemical/x-cif" + "chemical/x-pdb" + "chemical/x-xyz" + ]; }) ]; }; darwinArgs = { nativeBuildInputs = [ - _7zz # instead of undmg because of APFS + _7zz ]; src = fetchurl { url = "https://jp-minerals.org/vesta/archives/${version}/VESTA.dmg"; @@ -111,7 +130,7 @@ stdenvNoCC.mkDerivation ( { inherit pname version meta; # I could've written an update script here, - # but I didn't bother because the stable version hasn't been updated for years. + # but I didn't bother because the stable version hasn't been updated foryears. } // { "x86_64-linux" = linuxArgs; From 1b3a9c7c2ac0339a7e73a2790c63a15a3a4635ae Mon Sep 17 00:00:00 2001 From: Gautham Venkataraman Date: Thu, 14 May 2026 09:19:44 +0200 Subject: [PATCH 04/51] nixos/jellyfin: fix hevc10bit decoding toggle being silently ignored The hevc10bit option was written as a string entry inside , which Jellyfin ignores - that element only accepts ffmpeg codec names (h264, hevc, vp9, ...). The actual gate for 10-bit HEVC hardware decoding is the boolean EnableDecodingColorDepth10Hevc element, which the module never emitted. Mirror the existing hevcRExt10bit / hevcRExt12bit handling: exclude hevc10bit from the codec string list and emit the dedicated XML element. --- nixos/modules/services/misc/jellyfin.nix | 7 ++++++- nixos/tests/jellyfin.nix | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index d9e76154f0a8..7a6c5dae8536 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -33,7 +33,11 @@ let ; cfg = config.services.jellyfin; filteredDecodingCodecs = builtins.filter ( - c: c != "hevcRExt10bit" && c != "hevcRExt12bit" && cfg.transcoding.hardwareDecodingCodecs.${c} + c: + c != "hevc10bit" + && c != "hevcRExt10bit" + && c != "hevcRExt12bit" + && cfg.transcoding.hardwareDecodingCodecs.${c} ) (builtins.attrNames cfg.transcoding.hardwareDecodingCodecs); encodingXmlText = '' @@ -58,6 +62,7 @@ let ${boolToString cfg.transcoding.hardwareEncodingCodecs.av1} ${boolToString cfg.transcoding.enableIntelLowPowerEncoding} ${boolToString cfg.transcoding.enableIntelLowPowerEncoding} + ${boolToString cfg.transcoding.hardwareDecodingCodecs.hevc10bit} ${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt10bit} ${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt12bit} diff --git a/nixos/tests/jellyfin.nix b/nixos/tests/jellyfin.nix index 4896c13d4eca..7463b920727e 100644 --- a/nixos/tests/jellyfin.nix +++ b/nixos/tests/jellyfin.nix @@ -33,6 +33,7 @@ hardwareDecodingCodecs = { h264 = true; hevc = true; + hevc10bit = true; vp9 = true; hevcRExt10bit = true; hevcRExt12bit = true; @@ -174,7 +175,8 @@ assert config.get("EnableIntelLowPowerH264HwEncoder") == True, f"Intel low power H264: expected True, got '{config.get('EnableIntelLowPowerH264HwEncoder')}'" assert config.get("EnableIntelLowPowerHevcHwEncoder") == True, f"Intel low power HEVC: expected True, got '{config.get('EnableIntelLowPowerHevcHwEncoder')}'" - # HEVC RExt color depth verification + # HEVC color depth verification + assert config.get("EnableDecodingColorDepth10Hevc") == True, f"HEVC 10bit: expected True, got '{config.get('EnableDecodingColorDepth10Hevc')}'" assert config.get("EnableDecodingColorDepth10HevcRext") == True, f"HEVC RExt 10bit: expected True, got '{config.get('EnableDecodingColorDepth10HevcRext')}'" assert config.get("EnableDecodingColorDepth12HevcRext") == True, f"HEVC RExt 12bit: expected True, got '{config.get('EnableDecodingColorDepth12HevcRext')}'" From e9feb05aafb373a2fa392e4d2f7f99a9d2d3760c Mon Sep 17 00:00:00 2001 From: Ricardo Campos Date: Mon, 29 Jun 2026 19:32:06 +0100 Subject: [PATCH 05/51] vesta-viewer: use makeWrapper instead of symlinks for GSettings on KDE --- pkgs/by-name/ve/vesta-viewer/package.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix index ddc228aecf83..ba26315b11fe 100644 --- a/pkgs/by-name/ve/vesta-viewer/package.nix +++ b/pkgs/by-name/ve/vesta-viewer/package.nix @@ -7,6 +7,7 @@ copyDesktopItems, autoPatchelfHook, wrapGAppsHook3, + makeWrapper, _7zz, glib, gsettings-desktop-schemas, @@ -45,6 +46,7 @@ let copyDesktopItems autoPatchelfHook wrapGAppsHook3 + makeWrapper ]; buildInputs = [ glib @@ -59,6 +61,9 @@ let libxtst ]; + # Prevent wrapGAppsHook3 from auto-wrapping binaries. + dontWrapGApps = true; + src = fetchzip { url = "https://jp-minerals.org/vesta/archives/${version}/VESTA-gtk3.tar.bz2"; hash = "sha256-Dm4exMUgNZ6Sh8dVhsvLZGS38UXxe9t+9s3ttBQajGg="; @@ -71,16 +76,7 @@ let cp -r * $out/lib/VESTA mkdir -p $out/bin - ln -s $out/lib/VESTA/VESTA{,-core,-gui} -t $out/bin - - # VESTA resolves resources (img/, *.ini, *.dat) relative to argv[0]. - # wrapProgram replaces the binary with a wrapper script, changing argv[0]. - # Symlinking data files into $out/bin/ ensures they are found correctly. - for f in $out/lib/VESTA/*.ini $out/lib/VESTA/*.dat $out/lib/VESTA/asfdc; do - ln -s $f $out/bin/$(basename $f) - done - - ln -s $out/lib/VESTA/img $out/bin/img + ln -s $out/lib/VESTA/VESTA{-core,-gui} -t $out/bin mkdir -p $out/share/icons/hicolor/{128x128,256x256}/apps ln -s $out/lib/VESTA/img/logo.png $out/share/icons/hicolor/128x128/apps/VESTA.png @@ -89,6 +85,11 @@ let runHook postInstall ''; + # Wrap GSettings/XDG_DATA_DIRS into a single wrapper. + postFixup = '' + makeWrapper $out/lib/VESTA/VESTA $out/bin/VESTA "''${gappsWrapperArgs[@]}" + ''; + desktopItems = [ (makeDesktopItem { name = "vesta"; @@ -130,7 +131,7 @@ stdenvNoCC.mkDerivation ( { inherit pname version meta; # I could've written an update script here, - # but I didn't bother because the stable version hasn't been updated foryears. + # but I didn't bother because the stable version hasn't been updated for years. } // { "x86_64-linux" = linuxArgs; From 72c659e45032533aed2ad6b7081aaff98f7ac848 Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 13 Jul 2026 16:12:41 +0200 Subject: [PATCH 06/51] gitlab-runner: 19.0.0 -> 19.1.1 Diff: https://gitlab.com/gitlab-org/gitlab-runner/-/compare/v19.0.0...v19.1.1 Changelog: https://gitlab.com/gitlab-org/gitlab-runner/blob/v19.1.1/CHANGELOG.md --- pkgs/by-name/gi/gitlab-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index 9dba84a426c7..709ab371c729 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "gitlab-runner"; - version = "19.0.0"; + version = "19.1.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-uScTzj4pSRtSFCMxoOR5KqipCbPknwnydPYG6xU5dOo="; + hash = "sha256-QKiHd4UFTuAZElQ/793Tyid983RnfU9TeNpe1gFwChA="; }; - vendorHash = "sha256-QqqTkIgR9ca1dYQ32SG7C+SpEIA07Hlf8x3lVhZ5vRQ="; + vendorHash = "sha256-Ed2PrEkkqZEWhFLtT1BJavWiacLuv4U7kIAcscMDQgM="; # For patchShebangs buildInputs = [ bash ]; From 9b735fd27dcb06e453397490fff2aae588981ec2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 14 Jul 2026 18:45:40 +0200 Subject: [PATCH 07/51] python3Packages.wirerope: unbreak with setuptools_80 fixes https://hydra.nixos.org/build/336812490 --- pkgs/development/python-modules/wirerope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wirerope/default.nix b/pkgs/development/python-modules/wirerope/default.nix index 95b991b40cd3..daa9872baf62 100644 --- a/pkgs/development/python-modules/wirerope/default.nix +++ b/pkgs/development/python-modules/wirerope/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + setuptools_80, six, nix-update-script, pytestCheckHook, @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-oojnv+2+nwL/TJhN+QZ5eiV6WGHC3SCxBQrCri0aHQc="; }; - build-system = [ setuptools ]; + build-system = [ setuptools_80 ]; dependencies = [ six ]; From 36563fbe3252d0ed21afc66a959684a5e9080d50 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 14 Jul 2026 19:44:56 +0200 Subject: [PATCH 08/51] python3Packages.remi: unbreak with patch from upstream fixes https://hydra.nixos.org/build/336807445 --- pkgs/development/python-modules/remi/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix index 0db323c1c46a..c609f0a8db2a 100644 --- a/pkgs/development/python-modules/remi/default.nix +++ b/pkgs/development/python-modules/remi/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, setuptools, pytestCheckHook, matplotlib, @@ -22,6 +23,14 @@ buildPythonPackage rec { hash = "sha256-VQn+Uzp6oGSit8ot0e8B0C2N41Q8+J+o91skyVN1gDA="; }; + patches = [ + (fetchpatch { + name = "remote-pkg_resources-dependency.patch"; + url = "https://github.com/rawpython/remi/commit/54b253ccd9d7e9626d8236ec4a8a32631ff2fca2.patch"; + hash = "sha256-VyTc5jFmNRWnAQqEupBB87Xw86+e7VgMoQeUrBcY+mg="; + }) + ]; + preCheck = '' # for some reason, REMI already deal with these using try blocks, but they fail substituteInPlace test/test_widget.py \ @@ -45,7 +54,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - setuptools # pkg_resources is referenced at runtime legacy-cgi ]; From db57eb8799c0c958aeb8ae96e2496a6c3af53ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 14 Jul 2026 17:41:59 +0000 Subject: [PATCH 09/51] pocket-id: 2.10.0 -> 2.11.0 --- pkgs/by-name/po/pocket-id/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 9ddd5193ac3a..8c9561b0618f 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -14,18 +14,18 @@ }: buildGo127Module (finalAttrs: { pname = "pocket-id"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-ad8YlWwWeGEwsrx29qpq1asEr4UNN7BueGTBPfFrRuE="; + hash = "sha256-keib2ebju6hKlH1XJQRBmXwxBsUnVZOIs+djvYkXYqU="; }; sourceRoot = "${finalAttrs.src.name}/backend"; - vendorHash = "sha256-bQNeocRCmhiV7gwCJppjsNw7K5MnsJMK9M18jf0X/oM="; + vendorHash = "sha256-/5lXAnb2FHeGBgrpU4Jpt2KX+sgGyYH61odppTaulbs="; env.CGO_ENABLED = 0; ldflags = [ @@ -67,7 +67,7 @@ buildGo127Module (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 4; - hash = "sha256-LVhTS3ertpGqLMsoodaoEgDb7sK3kTRTVB3KOyvJwpE="; + hash = "sha256-aJq5yLeeHY7zlOgSr1bOJCL8e1HBwCmoL7nTD2a06tg="; }; env.BUILD_OUTPUT_PATH = "dist"; From 1df300f0f37820d6f2e93ce56d43c1596db493e8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 17 Jul 2026 10:24:26 +0200 Subject: [PATCH 10/51] =?UTF-8?q?gecode:=206.2.0=20=E2=86=92=206.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ge/gecode/package.nix | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ge/gecode/package.nix b/pkgs/by-name/ge/gecode/package.nix index d07198f78125..78fa99afcb21 100644 --- a/pkgs/by-name/ge/gecode/package.nix +++ b/pkgs/by-name/ge/gecode/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, bison, flex, perl, @@ -12,26 +11,17 @@ enableGist ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gecode"; - version = "6.2.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "Gecode"; repo = "gecode"; - rev = "release-${version}"; - sha256 = "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk"; + tag = "release-${finalAttrs.version}"; + hash = "sha256-i1geBYMO+edZJekKe/zO+kkgd/S4jSiSZnDLfSRlXwc="; }; - patches = [ - # https://github.com/Gecode/gecode/pull/74 - (fetchpatch { - name = "fix-const-weights-clang.patch"; - url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch"; - sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc"; - }) - ]; - enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ @@ -52,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) From ad0d10ea6e0d786815ca17200ba56bdbce5656cf Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 17 Jul 2026 10:33:03 +0200 Subject: [PATCH 11/51] minizinc: use default gecode --- pkgs/by-name/mi/minizinc/package.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/by-name/mi/minizinc/package.nix b/pkgs/by-name/mi/minizinc/package.nix index 4747ebe471fa..22ed68a2228d 100644 --- a/pkgs/by-name/mi/minizinc/package.nix +++ b/pkgs/by-name/mi/minizinc/package.nix @@ -13,22 +13,6 @@ zlib, }: -let - gecode_6_3_0 = gecode.overrideAttrs (_: { - version = "6.3.0"; - src = fetchFromGitHub { - owner = "gecode"; - repo = "gecode"; - rev = "f7f0d7c273d6844698f01cec8229ebe0b66a016a"; - hash = "sha256-skf2JEtNkRqEwfHb44WjDGedSygxVuqUixskTozi/5k="; - }; - patches = [ ]; - }); -in -let - gecode = gecode_6_3_0; -in - stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; version = "2.9.7"; From c79cf74bd25be6aa6e6fb4a31dfdddd1d4564a1e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 17 Jul 2026 10:50:40 +0200 Subject: [PATCH 12/51] =?UTF-8?q?gecode:=206.3.0=20=E2=86=92=206.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ge/gecode/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gecode/package.nix b/pkgs/by-name/ge/gecode/package.nix index 78fa99afcb21..d325f2501a3f 100644 --- a/pkgs/by-name/ge/gecode/package.nix +++ b/pkgs/by-name/ge/gecode/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, bison, + cmake, flex, perl, gmp, @@ -13,19 +14,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "gecode"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "Gecode"; repo = "gecode"; tag = "release-${finalAttrs.version}"; - hash = "sha256-i1geBYMO+edZJekKe/zO+kkgd/S4jSiSZnDLfSRlXwc="; + hash = "sha256-WhMN7QC+VQfvHUV1LLaW7I7fG++/fznh1ZDUY/Q8zD8="; }; enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ bison + cmake flex ]; buildInputs = [ From f9023b3aea897f0cac2807523440fc4a41f8a8b4 Mon Sep 17 00:00:00 2001 From: Marcel Date: Fri, 17 Jul 2026 22:24:48 +0200 Subject: [PATCH 13/51] rustfs: 1.0.0-beta.9 -> 1.0.0-beta.10 Diff: https://github.com/rustfs/rustfs/compare/1.0.0-beta.9...1.0.0-beta.10 --- pkgs/by-name/ru/rustfs/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ru/rustfs/package.nix b/pkgs/by-name/ru/rustfs/package.nix index bd1f974cf4f6..af8a4991e755 100644 --- a/pkgs/by-name/ru/rustfs/package.nix +++ b/pkgs/by-name/ru/rustfs/package.nix @@ -15,7 +15,7 @@ let console = stdenv.mkDerivation (finalAttrs: { pname = "rustfs-console"; - version = "0.1.13"; + version = "0.1.16"; __structuredAttrs = true; __darwinAllowLocalNetworking = true; @@ -23,7 +23,7 @@ let owner = "rustfs"; repo = "console"; tag = "v${finalAttrs.version}"; - hash = "sha256-pxpT3kV30qA+Ob/RWi11rsapGyNc6h1EN79fcPi1e1E="; + hash = "sha256-WZ1vROBZJltcaXdwIuTsRmOY2iZxIoi7yW8lapZcaHo="; }; pnpmDeps = fetchPnpmDeps { @@ -51,14 +51,14 @@ let in rustPlatform.buildRustPackage rec { pname = "rustfs"; - version = "1.0.0-beta.9"; + version = "1.0.0-beta.10"; __structuredAttrs = true; src = fetchFromGitHub { owner = "rustfs"; repo = "rustfs"; tag = version; - hash = "sha256-aNbicnNHaJn05k5EffgPEURf/Uj2A8PjOHiH2UGPz4M="; + hash = "sha256-lBkfaTH36MhWHk39Ie2uQqcU+yf76uImPdV91C8kWV8="; }; postPatch = '' @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { cp -rL ${console} ./rustfs/static ''; - cargoHash = "sha256-abbsElP4dSSZnL4UfQEoHUtiEW8B/p6Y81UA7EbqbD4="; + cargoHash = "sha256-PMgC4+/n/UOpBa5oiZ1F17oht5YmN1RzoFIA0qE+h6M="; nativeBuildInputs = [ protobuf @@ -84,10 +84,11 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = "-p rustfs"; checkFlags = [ - # failing since 1.0.0-beta.9, seem like upstream issues + # require real disks "--skip=app::capacity_dirty_scope_test" "--skip=app::delete_objects_stat_gating_test" "--skip=app::put_prelookup_gating_test" + # non-deterministically panics "--skip=two_embedded_servers_isolate_auth_and_data_planes" ]; From a0d022d0f46c99ebc925ae629ae75e61d6b3dd63 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 18 Jul 2026 18:15:40 +0200 Subject: [PATCH 14/51] treewide: use finalAttrs.finalPackage.doCheck --- pkgs/applications/emulators/wibo/default.nix | 2 +- .../networking/instant-messengers/profanity/default.nix | 2 +- pkgs/by-name/ap/apparmor-parser/package.nix | 2 +- pkgs/by-name/ar/ardour/package.nix | 2 +- pkgs/by-name/bi/bitcoin-knots/package.nix | 2 +- pkgs/by-name/bi/bitcoin/package.nix | 2 +- pkgs/by-name/br/brlcad/package.nix | 2 +- pkgs/by-name/cm/cmocka/package.nix | 2 +- pkgs/by-name/el/elements/package.nix | 2 +- pkgs/by-name/fe/feedbackd-device-themes/package.nix | 2 +- pkgs/by-name/fe/fex/package.nix | 2 +- pkgs/by-name/fl/flatpak/package.nix | 2 +- pkgs/by-name/ft/ftxui/package.nix | 2 +- pkgs/by-name/fw/fwup/package.nix | 2 +- pkgs/by-name/gs/gsl-lite/package.nix | 2 +- pkgs/by-name/gz/gz-cmake/package.nix | 4 ++-- pkgs/by-name/in/iniparser/package.nix | 2 +- pkgs/by-name/ja/jasterix/package.nix | 2 +- pkgs/by-name/js/json-tui/package.nix | 2 +- pkgs/by-name/li/libmemcached/package.nix | 2 +- pkgs/by-name/li/libpointmatcher/package.nix | 2 +- pkgs/by-name/li/libvncserver/package.nix | 2 +- pkgs/by-name/li/libxmp/package.nix | 2 +- pkgs/by-name/ma/mathic/package.nix | 2 +- pkgs/by-name/ma/mathicgb/package.nix | 2 +- pkgs/by-name/ma/mayo/package.nix | 2 +- pkgs/by-name/me/memtailor/package.nix | 2 +- pkgs/by-name/mi/mimalloc/package.nix | 2 +- pkgs/by-name/mi/minizip-ng/package.nix | 4 ++-- pkgs/by-name/mo/mosquitto/package.nix | 2 +- pkgs/by-name/mu/mu/package.nix | 2 +- pkgs/by-name/mu/muon/package.nix | 8 ++++---- pkgs/by-name/ne/nexusmods-app/package.nix | 2 +- pkgs/by-name/nl/nlopt/package.nix | 2 +- pkgs/by-name/ns/ns-3/package.nix | 2 +- pkgs/by-name/on/onnx/package.nix | 2 +- pkgs/by-name/on/onnxruntime/package.nix | 2 +- pkgs/by-name/pa/particl-core/package.nix | 2 +- pkgs/by-name/pi/picolibc/package.nix | 2 +- pkgs/by-name/po/pocket-id/package.nix | 2 +- pkgs/by-name/pr/prevail/package.nix | 2 +- pkgs/by-name/ra/radiotray-ng/package.nix | 2 +- pkgs/by-name/so/sobjectizer/package.nix | 2 +- pkgs/by-name/sy/syncthingtray/package.nix | 2 +- pkgs/by-name/tp/tpm2-pkcs11/package.nix | 4 ++-- pkgs/by-name/tt/tt-umd/package.nix | 2 +- pkgs/by-name/wi/wireguard-go/package.nix | 2 +- pkgs/by-name/z3/z3/package.nix | 2 +- pkgs/development/compilers/sbcl/default.nix | 2 +- pkgs/development/cuda-modules/packages/cutlass.nix | 8 ++++---- pkgs/development/ocaml-modules/graphql/cohttp.nix | 2 +- pkgs/development/ocaml-modules/uucp/default.nix | 2 +- .../rocm-modules/rocprof-trace-decoder/default.nix | 2 +- pkgs/os-specific/linux/iputils/default.nix | 2 +- pkgs/tools/system/nvtop/build-nvtop.nix | 2 +- 55 files changed, 64 insertions(+), 64 deletions(-) diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix index f982374e6b73..7a5b0ad8e937 100644 --- a/pkgs/applications/emulators/wibo/default.nix +++ b/pkgs/applications/emulators/wibo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta.license = lib.licenses.unfree; }; in - lib.optionalString finalAttrs.doCheck '' + lib.optionalString finalAttrs.finalPackage.doCheck '' MWCIncludes=../test ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c file test.o | grep "ELF 32-bit" ''; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 008b7b574509..117a95f4e476 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { # see also: https://profanity-im.github.io/guide/latest/build.html#expl mesonFlags = [ - (lib.mesonBool "tests" finalAttrs.doCheck) + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) (lib.mesonEnable "notifications" notifySupport) (lib.mesonEnable "python-plugins" pythonPluginSupport) (lib.mesonEnable "c-plugins" true) diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix index 8844ca83b316..ca7d56dca48f 100644 --- a/pkgs/by-name/ap/apparmor-parser/package.nix +++ b/pkgs/by-name/ap/apparmor-parser/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { "POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}" "MANDIR=share/man" ] - ++ lib.optional finalAttrs.doCheck "PROVE=${lib.getExe' perl "prove"}"; + ++ lib.optional finalAttrs.finalPackage.doCheck "PROVE=${lib.getExe' perl "prove"}"; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/by-name/ar/ardour/package.nix b/pkgs/by-name/ar/ardour/package.nix index e5924ad03e4b..0659af469370 100644 --- a/pkgs/by-name/ar/ardour/package.nix +++ b/pkgs/by-name/ar/ardour/package.nix @@ -193,7 +193,7 @@ let # https://discourse.ardour.org/t/ardour-8-2-released/109615/8 # "--use-external-libs" ] - ++ lib.optional finalAttrs.doCheck "--test" + ++ lib.optional finalAttrs.finalPackage.doCheck "--test" ++ lib.optional optimize "--optimize"; env = { diff --git a/pkgs/by-name/bi/bitcoin-knots/package.nix b/pkgs/by-name/bi/bitcoin-knots/package.nix index ee766f027c6e..1c6a88d022de 100644 --- a/pkgs/by-name/bi/bitcoin-knots/package.nix +++ b/pkgs/by-name/bi/bitcoin-knots/package.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_USDT" enableTracing) (lib.cmakeFeature "RDTS_CONSENT" "RUNTIME_WARN") ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ (lib.cmakeBool "BUILD_TESTS" false) (lib.cmakeBool "BUILD_FUZZ_BINARY" false) (lib.cmakeBool "BUILD_GUI_TESTS" false) diff --git a/pkgs/by-name/bi/bitcoin/package.nix b/pkgs/by-name/bi/bitcoin/package.nix index e84c04887ac6..c7ecbabceeef 100644 --- a/pkgs/by-name/bi/bitcoin/package.nix +++ b/pkgs/by-name/bi/bitcoin/package.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_ZMQ" true) (lib.cmakeBool "WITH_USDT" enableTracing) ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ (lib.cmakeBool "BUILD_TESTS" false) (lib.cmakeBool "BUILD_FUZZ_BINARY" false) (lib.cmakeBool "BUILD_GUI_TESTS" false) diff --git a/pkgs/by-name/br/brlcad/package.nix b/pkgs/by-name/br/brlcad/package.nix index 9629fc86897e..fde53331be81 100644 --- a/pkgs/by-name/br/brlcad/package.nix +++ b/pkgs/by-name/br/brlcad/package.nix @@ -227,7 +227,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BRLCAD_ENABLE_STRICT" false) - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "BRLCAD_ENABLE_QT" enableQt) (lib.cmakeFeature "GTE_INCLUDE_DIR" "${gtmathematics}/include/gtmathematics") (lib.cmakeFeature "LMDB_LIBRARY" "${lmdb.out}/lib/liblmdb${stdenv.hostPlatform.extensions.sharedLibrary}") diff --git a/pkgs/by-name/cm/cmocka/package.nix b/pkgs/by-name/cm/cmocka/package.nix index cae6effbbfbd..f2e4e6a38955 100644 --- a/pkgs/by-name/cm/cmocka/package.nix +++ b/pkgs/by-name/cm/cmocka/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; cmakeFlags = - lib.optional finalAttrs.doCheck "-DUNIT_TESTING=ON" + lib.optional finalAttrs.finalPackage.doCheck "-DUNIT_TESTING=ON" ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; doCheck = true; diff --git a/pkgs/by-name/el/elements/package.nix b/pkgs/by-name/el/elements/package.nix index 2bdac00f7537..6d0385633609 100644 --- a/pkgs/by-name/el/elements/package.nix +++ b/pkgs/by-name/el/elements/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-boost-libdir=${boost.out}/lib" "--disable-bench" ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "--disable-tests" "--disable-gui-tests" ] diff --git a/pkgs/by-name/fe/feedbackd-device-themes/package.nix b/pkgs/by-name/fe/feedbackd-device-themes/package.nix index 78deacafd2a5..02cd3b68cc7b 100644 --- a/pkgs/by-name/fe/feedbackd-device-themes/package.nix +++ b/pkgs/by-name/fe/feedbackd-device-themes/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - (lib.mesonOption "validate" (if finalAttrs.doCheck then "enabled" else "disabled")) + (lib.mesonOption "validate" (if finalAttrs.finalPackage.doCheck then "enabled" else "disabled")) ]; doCheck = true; diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index ea2f4eece6da..0a9c395988f8 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -233,7 +233,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { cmakeFlagsArray+=("-DBUILD_TESTING:BOOL=FALSE") else echo "Keeping checkPhase as-is" - cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck}") + cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck}") fi ''; diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 54f07a4a6c8b..7f909e0960d0 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ # Hardcode paths used by tests and change test runtime generation to use files from Nix store. # https://github.com/flatpak/flatpak/issues/1460 (replaceVars ./fix-test-paths.patch { diff --git a/pkgs/by-name/ft/ftxui/package.nix b/pkgs/by-name/ft/ftxui/package.nix index 70bfe592bc97..cc659187d2f4 100644 --- a/pkgs/by-name/ft/ftxui/package.nix +++ b/pkgs/by-name/ft/ftxui/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "FTXUI_BUILD_EXAMPLES" false) (lib.cmakeBool "FTXUI_BUILD_DOCS" true) - (lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; meta = { diff --git a/pkgs/by-name/fw/fwup/package.nix b/pkgs/by-name/fw/fwup/package.nix index 3ecaa0d8bf8e..3eddac5d52dc 100644 --- a/pkgs/by-name/fw/fwup/package.nix +++ b/pkgs/by-name/fw/fwup/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { unzip zip ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ mtools dosfstools ]; diff --git a/pkgs/by-name/gs/gsl-lite/package.nix b/pkgs/by-name/gs/gsl-lite/package.nix index 7b53ae8762ee..07e497660fd5 100644 --- a/pkgs/by-name/gs/gsl-lite/package.nix +++ b/pkgs/by-name/gs/gsl-lite/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; # Building tests is broken on Darwin. diff --git a/pkgs/by-name/gz/gz-cmake/package.nix b/pkgs/by-name/gz/gz-cmake/package.nix index 34d9fefd9806..40210a44177b 100644 --- a/pkgs/by-name/gz/gz-cmake/package.nix +++ b/pkgs/by-name/gz/gz-cmake/package.nix @@ -45,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: { doBuildExamples = false; cmakeFlags = [ - (lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.doCheck) - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "BUILD_EXAMPLES" finalAttrs.doBuildExamples) ]; diff --git a/pkgs/by-name/in/iniparser/package.nix b/pkgs/by-name/in/iniparser/package.nix index 260dfdf1887f..3d1a5af3a3f4 100644 --- a/pkgs/by-name/in/iniparser/package.nix +++ b/pkgs/by-name/in/iniparser/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-z10S9ODLprd7CbL5Ecgh7H4eOwTetYwFXiWBUm6fIr4="; }; - patches = lib.optional finalAttrs.doCheck ( + patches = lib.optional finalAttrs.finalPackage.doCheck ( # 1. Do not fetch the Unity GitHub repository # 2. Lookup the Unity pkgconfig file # 3. Get the generate_test_runner.rb file from the Unity share directory diff --git a/pkgs/by-name/ja/jasterix/package.nix b/pkgs/by-name/ja/jasterix/package.nix index 9b804aaabd26..2d95eb370e55 100644 --- a/pkgs/by-name/ja/jasterix/package.nix +++ b/pkgs/by-name/ja/jasterix/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic) - (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; buildInputs = [ diff --git a/pkgs/by-name/js/json-tui/package.nix b/pkgs/by-name/js/json-tui/package.nix index 852dba711ead..6dcac51bbb47 100644 --- a/pkgs/by-name/js/json-tui/package.nix +++ b/pkgs/by-name/js/json-tui/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Wno-dev" # suppress cmake warning about deprecated usage - (lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}") ]; diff --git a/pkgs/by-name/li/libmemcached/package.nix b/pkgs/by-name/li/libmemcached/package.nix index 0da1dfeb7ebf..67d989f18483 100644 --- a/pkgs/by-name/li/libmemcached/package.nix +++ b/pkgs/by-name/li/libmemcached/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) "-DENABLE_SASL=ON" ]; diff --git a/pkgs/by-name/li/libpointmatcher/package.nix b/pkgs/by-name/li/libpointmatcher/package.nix index aa099a0cd540..66d2c094807e 100644 --- a/pkgs/by-name/li/libpointmatcher/package.nix +++ b/pkgs/by-name/li/libpointmatcher/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "EIGEN_INCLUDE_DIR" "${eigen}/include/eigen3") - (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; doCheck = true; diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix index 29ce2959e878..1cc1489c93d9 100644 --- a/pkgs/by-name/li/libvncserver/package.nix +++ b/pkgs/by-name/li/libvncserver/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_SYSTEMD" withSystemd) (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) (lib.cmakeBool "WITH_EXAMPLES" buildExamples) - (lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck) ]; # This test checks if using the **installed** headers works. diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix index c170f837e902..327c21205901 100644 --- a/pkgs/by-name/li/libxmp/package.nix +++ b/pkgs/by-name/li/libxmp/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic) - (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/by-name/ma/mathic/package.nix b/pkgs/by-name/ma/mathic/package.nix index fe2330fd28da..9d90e17fa8f5 100644 --- a/pkgs/by-name/ma/mathic/package.nix +++ b/pkgs/by-name/ma/mathic/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; __structuredAttrs = true; diff --git a/pkgs/by-name/ma/mathicgb/package.nix b/pkgs/by-name/ma/mathicgb/package.nix index cf88e8024712..f6cbbdcf9fbd 100644 --- a/pkgs/by-name/ma/mathicgb/package.nix +++ b/pkgs/by-name/ma/mathicgb/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/ma/mayo/package.nix b/pkgs/by-name/ma/mayo/package.nix index 5baaa54006e6..3da00353fe45 100644 --- a/pkgs/by-name/ma/mayo/package.nix +++ b/pkgs/by-name/ma/mayo/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeOptionType "string" "Mayo_VersionMajor" (lib.versions.major finalAttrs.version)) (lib.cmakeOptionType "string" "Mayo_VersionMinor" (lib.versions.minor finalAttrs.version)) (lib.cmakeOptionType "string" "Mayo_VersionPatch" (lib.versions.patch finalAttrs.version)) - (lib.cmakeBool "Mayo_BuildTests" finalAttrs.doCheck) + (lib.cmakeBool "Mayo_BuildTests" finalAttrs.finalPackage.doCheck) ] ++ lib.optional withAssimp "-DMayo_BuildPluginAssimp=ON"; diff --git a/pkgs/by-name/me/memtailor/package.nix b/pkgs/by-name/me/memtailor/package.nix index a70d33ecf38d..ddfb329286af 100644 --- a/pkgs/by-name/me/memtailor/package.nix +++ b/pkgs/by-name/me/memtailor/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/mi/mimalloc/package.nix b/pkgs/by-name/mi/mimalloc/package.nix index ed8ba80d66e5..6f4c2362a33e 100644 --- a/pkgs/by-name/mi/mimalloc/package.nix +++ b/pkgs/by-name/mi/mimalloc/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { MI_SECURE = secureBuild; MI_BUILD_SHARED = stdenv.hostPlatform.hasSharedLibraries; MI_LIBC_MUSL = stdenv.hostPlatform.libc == "musl"; - MI_BUILD_TESTS = finalAttrs.doCheck; + MI_BUILD_TESTS = finalAttrs.finalPackage.doCheck; # MI_OPT_ARCH is inaccurate (e.g. it assumes aarch64 == armv8.1-a). # Nixpkgs's native platform configuration does a better job. diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index d7dd9bee6845..624d7e9b8d43 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "MZ_OPENSSL" true) (lib.cmakeBool "MZ_PPMD" false) # PPMD support requres internet access to make a git clone (lib.cmakeBool "MZ_LIBCOMP" false) # builds only on Darwin by default where it fails due to mising headers - (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.doCheck) - (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "MZ_COMPAT" enableCompat) ] ++ lib.optionals stdenv.hostPlatform.isi686 [ diff --git a/pkgs/by-name/mo/mosquitto/package.nix b/pkgs/by-name/mo/mosquitto/package.nix index b295de57ed23..56621743f089 100644 --- a/pkgs/by-name/mo/mosquitto/package.nix +++ b/pkgs/by-name/mo/mosquitto/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_BUNDLED_DEPS" false) (lib.cmakeBool "WITH_WEBSOCKETS" true) (lib.cmakeBool "WITH_SYSTEMD" withSystemd) - (lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck) ]; postFixup = '' diff --git a/pkgs/by-name/mu/mu/package.nix b/pkgs/by-name/mu/mu/package.nix index f2f59b52606c..0187936e152d 100644 --- a/pkgs/by-name/mu/mu/package.nix +++ b/pkgs/by-name/mu/mu/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.strings.mesonEnable "guile" false) (lib.strings.mesonEnable "scm" false) (lib.strings.mesonEnable "readline" false) - (lib.strings.mesonEnable "tests" finalAttrs.doCheck) + (lib.strings.mesonEnable "tests" finalAttrs.finalPackage.doCheck) (lib.strings.mesonOption "lispdir" "${placeholder "mu4e"}/share/emacs/site-lisp") ]; diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index dd760d4519f4..f20d61af19b8 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals buildDocs [ scdoc ] - ++ lib.optionals (buildDocs || finalAttrs.doCheck) [ + ++ lib.optionals (buildDocs || finalAttrs.finalPackage.doCheck) [ (python3.withPackages (ps: [ ps.pyyaml ])) ]; @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -name "*.py" -exec chmod +x {} \; patchShebangs subprojects '' - + lib.optionalString finalAttrs.doCheck '' + + lib.optionalString finalAttrs.finalPackage.doCheck '' substituteInPlace \ "subprojects/meson-tests/common/14 configure file/test.py.in" \ "subprojects/meson-tests/common/274 customtarget exe for test/generate.py" \ @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { (muonBool "static" stdenv.targetPlatform.isStatic) (muonEnable "man-pages" buildDocs) (muonEnable "meson-docs" buildDocs) - (muonEnable "meson-tests" finalAttrs.doCheck) + (muonEnable "meson-tests" finalAttrs.finalPackage.doCheck) (muonEnable "samurai" embedSamurai) (muonEnable "tracy" false) (muonEnable "website" false) @@ -177,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "muon-build"; rev = "db92588773a24f67cda2f331b945825ca3a63fa7"; hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM="; - passthru.use = finalAttrs.doCheck; + passthru.use = finalAttrs.finalPackage.doCheck; }; }; diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 0f60677bb40c..62f7b4fce9e4 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -70,7 +70,7 @@ buildDotnetModule (finalAttrs: { substituteInPlace src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj \ --replace-fail '$(BaseIntermediateOutputPath)games.json' ${./vendored/games.json} - ${lib.optionalString finalAttrs.doCheck '' + ${lib.optionalString finalAttrs.finalPackage.doCheck '' # For some reason these tests fail (intermittently?) with a zero timestamp touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png ''} diff --git a/pkgs/by-name/nl/nlopt/package.nix b/pkgs/by-name/nl/nlopt/package.nix index e6b9f8cd3a38..753837da46ac 100644 --- a/pkgs/by-name/nl/nlopt/package.nix +++ b/pkgs/by-name/nl/nlopt/package.nix @@ -88,7 +88,7 @@ clangStdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "NLOPT_MATLAB" false) (lib.cmakeBool "NLOPT_GUILE" false) (lib.cmakeBool "NLOPT_LUKSAN" (!withoutLuksanSolvers)) - (lib.cmakeBool "NLOPT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "NLOPT_TESTS" finalAttrs.finalPackage.doCheck) ] ++ lib.optional withPython ( lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}" diff --git a/pkgs/by-name/ns/ns-3/package.nix b/pkgs/by-name/ns/ns-3/package.nix index 39aeb72c4e1d..91bf292685e0 100644 --- a/pkgs/by-name/ns/ns-3/package.nix +++ b/pkgs/by-name/ns/ns-3/package.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { "-DNS3_GTK3=ON" "-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ] - ++ lib.optional finalAttrs.doCheck "-DNS3_TESTS=ON"; + ++ lib.optional finalAttrs.finalPackage.doCheck "-DNS3_TESTS=ON"; # strictoverflow prevents clang from discovering pyembed when bindings hardeningDisable = [ diff --git a/pkgs/by-name/on/onnx/package.nix b/pkgs/by-name/on/onnx/package.nix index 31adc3753a6c..fcab2143a192 100644 --- a/pkgs/by-name/on/onnx/package.nix +++ b/pkgs/by-name/on/onnx/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { # NOTE: Darwin requires a static build; otherwise, tests fail in the Python package. BUILD_SHARED_LIBS = if stdenv.hostPlatform.isDarwin then "0" else "1"; ONNX_BUILD_PYTHON = "1"; - ONNX_BUILD_TESTS = if finalAttrs.doCheck then "1" else "0"; + ONNX_BUILD_TESTS = if finalAttrs.finalPackage.doCheck then "1" else "0"; # ONNX_ML is enabled by default. # See: https://github.com/onnx/onnx/blob/b751946c3d59a3c8358abcc0569b59e6ddb08cdd/CMakeLists.txt#L66-L73 ONNX_ML = "1"; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 01b8ee43df55..e046025f50b0 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -295,7 +295,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { # fails to find protoc on darwin, so specify it (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe buildPackages.protobuf)) (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true) - (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf) (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) (lib.cmakeBool "onnxruntime_USE_NCCL" ncclSupport) diff --git a/pkgs/by-name/pa/particl-core/package.nix b/pkgs/by-name/pa/particl-core/package.nix index d018c782d470..9b9d090995a2 100644 --- a/pkgs/by-name/pa/particl-core/package.nix +++ b/pkgs/by-name/pa/particl-core/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-bench" "--with-boost-libdir=${boost.out}/lib" ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "--enable-tests=no" ]; diff --git a/pkgs/by-name/pi/picolibc/package.nix b/pkgs/by-name/pi/picolibc/package.nix index 0243c1e0f797..aa5aaf9c170d 100644 --- a/pkgs/by-name/pi/picolibc/package.nix +++ b/pkgs/by-name/pi/picolibc/package.nix @@ -185,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: { (mesonBool "want-math-errno" want-math-errno) ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ (mesonBool "tests" true) # Something is broken with this and I'm not sure what. (mesonOption "tests-cdefs" "false") diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 9ddd5193ac3a..e17a1716a78e 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -43,7 +43,7 @@ buildGo127Module (finalAttrs: { ]; # required for TestIsURLPrivate - __darwinAllowLocalNetworking = finalAttrs.doCheck; + __darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck; preFixup = '' mv $out/bin/cmd $out/bin/pocket-id diff --git a/pkgs/by-name/pr/prevail/package.nix b/pkgs/by-name/pr/prevail/package.nix index dc0228506381..7246c9749cb6 100644 --- a/pkgs/by-name/pr/prevail/package.nix +++ b/pkgs/by-name/pr/prevail/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "prevail_ENABLE_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "prevail_ENABLE_TESTS" finalAttrs.finalPackage.doCheck) ]; installPhase = '' diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix index fd13e9e97291..12c9744e29fc 100644 --- a/pkgs/by-name/ra/radiotray-ng/package.nix +++ b/pkgs/by-name/ra/radiotray-ng/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; # 'wxFont::wxFont(int, int, int, int, bool, const wxString&, wxFontEncoding)' is deprecated diff --git a/pkgs/by-name/so/sobjectizer/package.nix b/pkgs/by-name/so/sobjectizer/package.nix index e46c47baafab..965db134ad98 100644 --- a/pkgs/by-name/so/sobjectizer/package.nix +++ b/pkgs/by-name/so/sobjectizer/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SOBJECTIZER_BUILD_STATIC" withStatic) (lib.cmakeBool "SOBJECTIZER_BUILD_SHARED" withShared) (lib.cmakeBool "BUILD_EXAMPLES" (buildExamples && withStatic)) - (lib.cmakeBool "BUILD_TESTS" (finalAttrs.doCheck && withShared)) + (lib.cmakeBool "BUILD_TESTS" (finalAttrs.finalPackage.doCheck && withShared)) ]; # The tests require the shared library thanks to the patch. diff --git a/pkgs/by-name/sy/syncthingtray/package.nix b/pkgs/by-name/sy/syncthingtray/package.nix index 888359d44cbf..43b82684ef26 100644 --- a/pkgs/by-name/sy/syncthingtray/package.nix +++ b/pkgs/by-name/sy/syncthingtray/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "QT_PACKAGE_PREFIX" "Qt${lib.versions.major kdePackages.qtbase.version}") (lib.cmakeFeature "KF_PACKAGE_PREFIX" "KF${lib.versions.major kdePackages.qtbase.version}") - (lib.cmakeBool "BUILD_TESTING" (finalAttrs.doCheck or false)) + (lib.cmakeBool "BUILD_TESTING" (finalAttrs.finalPackage.doCheck or false)) # See https://github.com/Martchus/syncthingtray/issues/208 (lib.cmakeBool "EXCLUDE_TESTS_FROM_ALL" false) (lib.cmakeFeature "AUTOSTART_EXEC_PATH" autostartExecPath) diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix index 08cb74052dce..f0ccd27b4c54 100644 --- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix +++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix @@ -84,8 +84,8 @@ chosenStdenv.mkDerivation (finalAttrs: { ''; configureFlags = [ - (lib.enableFeature finalAttrs.doCheck "unit") - (lib.enableFeature finalAttrs.doCheck "integration") + (lib.enableFeature finalAttrs.finalPackage.doCheck "unit") + (lib.enableFeature finalAttrs.finalPackage.doCheck "integration") # Strangely, it uses --with-fapi=yes|no instead of a normal configure flag. "--with-fapi=${lib.boolToYesNo fapiSupport}" diff --git a/pkgs/by-name/tt/tt-umd/package.nix b/pkgs/by-name/tt/tt-umd/package.nix index 1baef8f79876..23b2e44c2cf8 100644 --- a/pkgs/by-name/tt/tt-umd/package.nix +++ b/pkgs/by-name/tt/tt-umd/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-g+ZPKBUhBGlgvce8uTkuR983unD2kbQKgoddko7x+fk="; }) )) - (lib.cmakeBool "TT_UMD_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "TT_UMD_BUILD_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "TT_UMD_BUILD_STATIC" stdenv.hostPlatform.isStatic) (lib.cmakeBool "TT_UMD_BUILD_PYTHON" true) (lib.cmakeFeature "nanobind_DIR" "${python3.pkgs.nanobind}/${python3.sitePackages}/nanobind/cmake") diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index 438aacec0e10..be4c6d6746bd 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { ''; # Tests require networking. - __darwinAllowLocalNetworking = finalAttrs.doCheck; + __darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck; postInstall = '' mv $out/bin/wireguard $out/bin/wireguard-go diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix index 30a177ebc7a4..1a943e5d0a04 100644 --- a/pkgs/by-name/z3/z3/package.nix +++ b/pkgs/by-name/z3/z3/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "Z3_SINGLE_THREADED" (!finalAttrs.enableParallelBuilding)) (lib.cmakeBool "Z3_BUILD_LIBZ3_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out")) - (lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.doCheck) + (lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "Z3_ENABLE_EXAMPLE_TARGETS" false) ] ++ lib.optionals pythonBindings [ diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 6748970eec43..4a7497107750 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ texinfo ] - ++ lib.optionals finalAttrs.doCheck ( + ++ lib.optionals finalAttrs.finalPackage.doCheck ( [ which writableTmpDirAsHomeHook diff --git a/pkgs/development/cuda-modules/packages/cutlass.nix b/pkgs/development/cuda-modules/packages/cutlass.nix index 1866bba22a03..cc3185bfe846 100644 --- a/pkgs/development/cuda-modules/packages/cutlass.nix +++ b/pkgs/development/cuda-modules/packages/cutlass.nix @@ -152,8 +152,8 @@ backendStdenv.mkDerivation (finalAttrs: { (cmakeBool "CUTLASS_ENABLE_EXAMPLES" false) # Tests. - (cmakeBool "CUTLASS_ENABLE_TESTS" finalAttrs.doCheck) - (cmakeBool "CUTLASS_ENABLE_GTEST_UNIT_TESTS" finalAttrs.doCheck) + (cmakeBool "CUTLASS_ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (cmakeBool "CUTLASS_ENABLE_GTEST_UNIT_TESTS" finalAttrs.finalPackage.doCheck) (cmakeBool "CUTLASS_USE_SYSTEM_GOOGLETEST" true) # NOTE: Both CUDNN and CUBLAS can be used by the examples and the profiler. Since they are large dependencies, they @@ -189,12 +189,12 @@ backendStdenv.mkDerivation (finalAttrs: { # NOTE: Because the test cases immediately create and try to run the binaries, we don't have an opportunity # to patch them with autoAddDriverRunpath. To get around this, we add the driver runpath to the environment. # TODO: This would break Jetson when using cuda_compat, as it must come first. - preCheck = optionalString finalAttrs.doCheck '' + preCheck = optionalString finalAttrs.finalPackage.doCheck '' export LD_LIBRARY_PATH="$(readlink -mnv "${addDriverRunpath.driverLink}/lib")" ''; # This is *not* a derivation you want to build on a small machine. - requiredSystemFeatures = optionals finalAttrs.doCheck [ + requiredSystemFeatures = optionals finalAttrs.finalPackage.doCheck [ "big-parallel" "cuda" ]; diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix index cd326bdde201..a5aea393f5da 100644 --- a/pkgs/development/ocaml-modules/graphql/cohttp.nix +++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix @@ -28,7 +28,7 @@ buildDunePackage (finalAttrs: { ocplib-endian ]; - checkInputs = lib.optionals finalAttrs.doCheck [ + checkInputs = lib.optionals finalAttrs.finalPackage.doCheck [ alcotest cohttp-lwt-unix graphql-lwt diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 66e1a3fc5726..43f29e738079 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString finalAttrs.doCheck} + ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString finalAttrs.finalPackage.doCheck} runHook postBuild ''; diff --git a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix index bac33aa72990..3ab1bb644688 100644 --- a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix +++ b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; nativeCheckInputs = [ diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 498a1255761d..898782104398 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" "-DINSTALL_SYSTEMD_UNITS=true" - "-DSKIP_TESTS=${lib.boolToString (!finalAttrs.doCheck)}" + "-DSKIP_TESTS=${lib.boolToString (!finalAttrs.finalPackage.doCheck)}" ] # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index 7662dc24e943..0063e1e4a086 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ gtest ] ++ lib.optional nvidia addDriverRunpath; From 6d7c9bc250a850750579547301f7ecd214bf03c0 Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Tue, 7 Jul 2026 18:56:50 +0200 Subject: [PATCH 15/51] closure-compiler: Add $NIX_JAVA_ARGS breakout to tweak the JVM --- pkgs/by-name/cl/closurecompiler/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/closurecompiler/package.nix b/pkgs/by-name/cl/closurecompiler/package.nix index d7d84b3d6eb0..938b6a425f27 100644 --- a/pkgs/by-name/cl/closurecompiler/package.nix +++ b/pkgs/by-name/cl/closurecompiler/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/java $out/bin cp ${finalAttrs.src} $out/share/java/closure-compiler-v${finalAttrs.version}.jar makeWrapper ${jre}/bin/java $out/bin/closure-compiler \ - --add-flags "-jar $out/share/java/closure-compiler-v${finalAttrs.version}.jar" + --add-flags "\$NIX_JAVA_ARGS -jar $out/share/java/closure-compiler-v${finalAttrs.version}.jar" ''; meta = { From f6a8fdbda25d37c304b7b9765e9b71e9532a19ef Mon Sep 17 00:00:00 2001 From: James Ward Date: Mon, 6 Jul 2026 08:43:21 -0600 Subject: [PATCH 16/51] kiro-cli: fix wayland clipboard access On Wayland, kiro-cli shells out to wl-clipboard (wl-copy/wl-paste) for clipboard access. Wrap the binaries with makeBinaryWrapper to put wl-clipboard on the runtime PATH so clipboard support works out of the box under Wayland sessions. Co-authored-by: Horu <73709188+HigherOrderLogic@users.noreply.github.com> Co-authored-by: Peder Bergebakken Sundt --- pkgs/by-name/ki/kiro-cli/package.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix index 3e41ce545e9c..b2a468be6fea 100644 --- a/pkgs/by-name/ki/kiro-cli/package.nix +++ b/pkgs/by-name/ki/kiro-cli/package.nix @@ -3,10 +3,17 @@ stdenv, fetchurl, autoPatchelfHook, + makeBinaryWrapper, undmg, versionCheckHook, xz, bzip2, + wl-clipboard, + # On Wayland, kiro-cli shells out to wl-clipboard (wl-copy/wl-paste) for + # clipboard access. Enabling this puts wl-clipboard on the runtime PATH so + # clipboard support works out of the box under Wayland sessions. Has no + # effect on Darwin. + waylandSupport ? stdenv.hostPlatform.isLinux, }: let @@ -41,6 +48,9 @@ stdenv.mkDerivation (finalAttrs: { lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && waylandSupport) [ + makeBinaryWrapper + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg ]; @@ -65,6 +75,12 @@ stdenv.mkDerivation (finalAttrs: { install -Dm755 bin/kiro-cli-chat $out/bin/kiro-cli-chat install -Dm755 bin/kiro-cli-term $out/bin/kiro-cli-term '' + + lib.optionalString (stdenv.hostPlatform.isLinux && waylandSupport) '' + for bin in kiro-cli kiro-cli-chat kiro-cli-term; do + wrapProgram $out/bin/$bin \ + --suffix PATH : ${lib.makeBinPath [ wl-clipboard ]} + done + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin $out/Applications cp -r "../Kiro CLI.app" "$out/Applications/" From 519c17452599517e8cfa6f4e5c45729ccdbed961 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jul 2026 03:30:18 +0000 Subject: [PATCH 17/51] docker: 29.6.1 -> 29.6.2 --- pkgs/applications/virtualization/docker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c953bf906617..91be307654fe 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -420,18 +420,18 @@ in docker_29 = let - version = "29.6.1"; + version = "29.6.2"; in callPackage dockerGen { inherit version; cliRev = "v${version}"; - cliHash = "sha256-cpK2UMRP/WXHsehG9Sq5UJAjhMesmXTrhe00y4RMRZc="; + cliHash = "sha256-WpPSePMCfWAVxCkX1nZyI+sra/Vug009ZPmnVKDaX0I="; mobyRev = "docker-v${version}"; - mobyHash = "sha256-gv+mea9X5TYDWN3IBRpmw0+R2waGxCiubdatNTeUQZI="; + mobyHash = "sha256-zrvrZCRUuiZ2vixZNOUFeGmDehHzSI+FzDMzV1gMqMc="; runcRev = "v1.3.6"; runcHash = "sha256-cBMYZOElWHQ4OkF2NlYJSZrlW4833WD8CRJRkkXeKJc="; - containerdRev = "v2.2.5"; - containerdHash = "sha256-3ui+0AjEU6H4VHYwF3G85ggVMUdONCLJ5KfciFasmkk="; + containerdRev = "v2.2.6"; + containerdHash = "sha256-Ngo9x847cXFYPnj/0I+g7BeV7e1/5T2YXfA1zkIdiPg="; tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828"; tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw="; }; From 6617623b017c6a9e05595b1054dae2a54cd26650 Mon Sep 17 00:00:00 2001 From: Cal Date: Tue, 21 Jul 2026 11:42:35 +0100 Subject: [PATCH 18/51] phpantom-lsp: 0.8.0 -> 0.9.0 --- pkgs/by-name/ph/phpantom-lsp/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ph/phpantom-lsp/package.nix b/pkgs/by-name/ph/phpantom-lsp/package.nix index 3958930ba315..f025969d93c8 100644 --- a/pkgs/by-name/ph/phpantom-lsp/package.nix +++ b/pkgs/by-name/ph/phpantom-lsp/package.nix @@ -6,19 +6,17 @@ _experimental-update-script-combinators, nix-update-script, }: - let stubsSrc = fetchFromGitHub { owner = "JetBrains"; repo = "phpstorm-stubs"; - rev = "517b9ad1adaf2c5453c00ec2fbb02d192a4a9b6c"; - hash = "sha256-IDWAuy301avfTF/E7Mby2JQQtIr/gnN5flZ3uctUpus="; + rev = "f6dd2dd35d99fb774251a83555fe07bf2109d57e"; + hash = "sha256-H9Td/yi9Um0Z9ifxZdh74bvGCMVSC+MA1OHrtbGD8vE="; }; in - rustPlatform.buildRustPackage (finalAttrs: { pname = "phpantom-lsp"; - version = "0.8.0"; + version = "0.9.0"; __structuredAttrs = true; @@ -26,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "AJenbo"; repo = "phpantom_lsp"; tag = finalAttrs.version; - hash = "sha256-00NAiPm3qqxyS1u1GPpJlgnBlUjDx9VmjK6oOwH8kcU="; + hash = "sha256-euWaFH40VHefZewUcKvsLwwHZP+GwfTN8kfuAkaABB8="; }; postPatch = '' @@ -38,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { > stubs/jetbrains/phpstorm-stubs/.commit ''; - cargoHash = "sha256-FyMI8Kb3QUD8Jui9k7vayMcQC+KWL8sZi3A05NPbXsg="; + cargoHash = "sha256-2MIJxVRqyCv5HzCwY1s+rCp1A4vFRsyAEEuyIEegZMA="; checkFlags = [ "--test" From bdfc9a4cdece46df891933991047427ed0fc0499 Mon Sep 17 00:00:00 2001 From: Nuno David Date: Wed, 22 Jul 2026 00:38:46 +0100 Subject: [PATCH 19/51] maintainers: add ndavd --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7e4c54b1362a..fd09c1ae5cba 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19785,6 +19785,12 @@ githubId = 364510; name = "Tobias Geerinckx-Rice"; }; + ndavd = { + email = "email@ndavd.com"; + github = "ndavd"; + githubId = 74260683; + name = "Nuno David"; + }; ndl = { email = "ndl@endl.ch"; github = "ndl"; From a2ecb16d6f65a0ccfcee87a9f3c4e22756103aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= <23130178+ShadowRZ@users.noreply.github.com> Date: Wed, 22 Jul 2026 09:15:37 +0800 Subject: [PATCH 20/51] ocamlPackages.ocamlfuse: drop --- .../ocaml-modules/ocamlfuse/default.nix | 40 ------------------- pkgs/top-level/ocaml-packages.nix | 3 +- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/ocamlfuse/default.nix diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix deleted file mode 100644 index 977bf64866e2..000000000000 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildDunePackage, - fetchFromGitHub, - camlidl, - fuse, - dune-configurator, -}: - -buildDunePackage (finalAttrs: { - pname = "ocamlfuse"; - version = "2.7.1_cvs13"; - - src = fetchFromGitHub { - owner = "astrada"; - repo = "ocamlfuse"; - rev = "v${finalAttrs.version}"; - hash = "sha256-h1ExohTlr1gP2DwHKQW3PTwz6d3pust5gdeyTHJ2KBk="; - }; - - postPatch = '' - substituteInPlace lib/Fuse_main.c \ - --replace-warn "" "" - ''; - - nativeBuildInputs = [ camlidl ]; - buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ - camlidl - fuse - ]; - - meta = { - homepage = "https://sourceforge.net/projects/ocamlfuse"; - description = "OCaml bindings for FUSE"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ bennofs ]; - }; -}) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7e85b77a462a..ba3abf469dce 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1574,8 +1574,6 @@ let callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix { }; - ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; - ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { }; @@ -2394,6 +2392,7 @@ let ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom"; ocaml_lwt = throw "ocamlPackages.ocaml_lwt has been renamed to ocamlPackages.lwt"; # Added 2025-12-05 ocaml_mysql = throw "ocamlPackages.ocaml_mysql is not maintained, use ocamlPackages.mariadb instead"; + ocamlfuse = throw "ocamlPackages.ocamlfuse has been removed as it depends on fuse2"; torch = throw "ocamlPackages.torch has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 } )).overrideScope From 22f4db51c8a51348ecdc8d7fe443413f4a5c6678 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 22 Jul 2026 08:54:42 +0200 Subject: [PATCH 21/51] matrix-authentication-service: 1.20.0 -> 1.21.0 ChangeLog: https://github.com/element-hq/matrix-authentication-service/releases/tag/v1.21.0 --- pkgs/by-name/ma/matrix-authentication-service/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index 6c9cffa76f22..618351a33b61 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -20,21 +20,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-0fvGhBxwXhSzWvNhflreEFoCBycM10vMkMf4sj95vfY="; + hash = "sha256-4z+u1IM2pclccv9+IH8IWjCodDxWZmffbqWPC726sIg="; }; - cargoHash = "sha256-3V50qNvg24WZvQ9z7IZJAnPXHTibZ6o3EzUoinLU6Gw="; + cargoHash = "sha256-HQU0zaK7rLJnTX5WVZrqNEaT5HfFLDzs+pHRxx5XTaA="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 4; - hash = "sha256-j2A2VCKQPfoyrNDtazu8hzUHpS130Ju/Cy3yfu9tC5I="; + hash = "sha256-9a62WlBQW8lgXluMh+DM21CkFCqFYd7yUz220G1uTIY="; }; pnpmRoot = "frontend"; From 3a03d1b84cf6affdb53e4aafa6fdfc1c55faa110 Mon Sep 17 00:00:00 2001 From: Nuno David Date: Wed, 22 Jul 2026 10:16:36 +0100 Subject: [PATCH 22/51] zellijPlugins.cb: init at 0.2.0 --- pkgs/by-name/ze/zellij/plugins/rust/cb.nix | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/by-name/ze/zellij/plugins/rust/cb.nix diff --git a/pkgs/by-name/ze/zellij/plugins/rust/cb.nix b/pkgs/by-name/ze/zellij/plugins/rust/cb.nix new file mode 100644 index 000000000000..b0a05441d3f4 --- /dev/null +++ b/pkgs/by-name/ze/zellij/plugins/rust/cb.nix @@ -0,0 +1,26 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "zellij-cb"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "ndavd"; + repo = "zellij-cb"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wXUwtjMsSbReU6YFZkk3CUYKetvicEQChBOa8cDBzN4="; + }; + + cargoHash = "sha256-IUYl5lclnlfO9ftFF0KDqAle9afHzhBcl6GWOIUHRWA="; + + meta = { + description = "Customizable compact bar plugin for Zellij"; + homepage = "https://github.com/ndavd/zellij-cb"; + changelog = "https://github.com/ndavd/zellij-cb/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ndavd ]; + }; +}) From cb61121b52d7bfbfeafa516498404f959bb712e4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 22 Jul 2026 13:53:16 +0200 Subject: [PATCH 23/51] afew: use versionCheckHook Suugested in https://github.com/NixOS/nixpkgs/pull/544256#issuecomment-5036216052. --- pkgs/by-name/af/afew/package.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/af/afew/package.nix b/pkgs/by-name/af/afew/package.nix index 88fe95b65f27..b05832844862 100644 --- a/pkgs/by-name/af/afew/package.nix +++ b/pkgs/by-name/af/afew/package.nix @@ -3,8 +3,7 @@ python3Packages, fetchPypi, pkgs, - testers, - afew, + versionCheckHook, }: python3Packages.buildPythonApplication (finalAttrs: { @@ -39,6 +38,7 @@ python3Packages.buildPythonApplication (finalAttrs: { nativeCheckInputs = [ pkgs.notmuch + versionCheckHook ] ++ (with python3Packages; [ freezegun @@ -55,12 +55,6 @@ python3Packages.buildPythonApplication (finalAttrs: { "man" ]; - passthru.tests = { - version = testers.testVersion { - package = afew; - }; - }; - meta = { homepage = "https://github.com/afewmail/afew"; description = "Initial tagging script for notmuch mail"; From a90eb28543d35394a5fbca0fed700dbfd8b85a58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jul 2026 12:51:30 +0000 Subject: [PATCH 24/51] pvetui: 1.4.2 -> 1.4.3 --- pkgs/by-name/pv/pvetui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pv/pvetui/package.nix b/pkgs/by-name/pv/pvetui/package.nix index a2c37fd5ef31..382ac333e214 100644 --- a/pkgs/by-name/pv/pvetui/package.nix +++ b/pkgs/by-name/pv/pvetui/package.nix @@ -7,7 +7,7 @@ buildGoModule (finalAttrs: { pname = "pvetui"; - version = "1.4.2"; + version = "1.4.3"; __structuredAttrs = true; @@ -15,10 +15,10 @@ buildGoModule (finalAttrs: { owner = "devnullvoid"; repo = "pvetui"; tag = "v${finalAttrs.version}"; - hash = "sha256-yYYGXb+CriDRZcV8e/7MN4Pq8GKP35JdMrcxozWVBpE="; + hash = "sha256-8mfp5bfROqT6DcxByaHZRTkDHJpfclCpeaJaINLKmlk="; }; - vendorHash = "sha256-JOo/7/3J9LqefIYuRl9efSlSfzLvQ/B8Jpy2e5cdEio="; + vendorHash = "sha256-7Tuh9T3uTlNxdSlSL7gQIYXpfpNbCkQrRWj/FoU8fbU="; subPackages = [ "cmd/pvetui" ]; From 09eee1bc25cac42cbae6c481e9afdf46d59d1a6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jul 2026 13:51:19 +0000 Subject: [PATCH 25/51] nelm: 1.25.2 -> 1.25.3 --- pkgs/by-name/ne/nelm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix index 5ed5dcfd2bbd..3c919c1f0a53 100644 --- a/pkgs/by-name/ne/nelm/package.nix +++ b/pkgs/by-name/ne/nelm/package.nix @@ -9,13 +9,13 @@ }: buildGoModule (finalAttrs: { pname = "nelm"; - version = "1.25.2"; + version = "1.25.3"; src = fetchFromGitHub { owner = "werf"; repo = "nelm"; tag = "v${finalAttrs.version}"; - hash = "sha256-2YIxnuHbY9zCVZer+b7JD0fbmUC/ZYyaWmHts7s5ldw="; + hash = "sha256-b0gO1V7yv8RMjIxwnqFX9CPRcRFm/j8u2PwNzyA7jtc="; }; vendorHash = "sha256-rIiphGjE/a5IwF6Fkk3Ffq36AfEkfAZb12ZljlYP6X4="; From 392ae092e65dba70d9af864efd6ac3f485cde9af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jul 2026 14:30:13 +0000 Subject: [PATCH 26/51] schemat: 0.5.2 -> 0.5.3 --- pkgs/by-name/sc/schemat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/schemat/package.nix b/pkgs/by-name/sc/schemat/package.nix index 909d11dd52fc..6cb69aa4d36b 100644 --- a/pkgs/by-name/sc/schemat/package.nix +++ b/pkgs/by-name/sc/schemat/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "schemat"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "raviqqe"; repo = "schemat"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ij7JigbXhE2o0Z61uZ3W/pK7zcQyrX+SMpF0iKsVx30="; + hash = "sha256-vA5J76wU2FlKz1fxTgv8jVuV4RIOML+tI5Y/dXyc9f0="; }; - cargoHash = "sha256-oaET2IGU78TUC98HKsiQnbg7R262ugrn8oiLeKC767s="; + cargoHash = "sha256-LGZE3r9n+KtnCiCxc/3K981wq4fN6ZR/KD8b638DmeM="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From 62993a3a8f583cc5e1b3eabb48cf7cc64de67ee2 Mon Sep 17 00:00:00 2001 From: Mugahed Izzeldin Date: Thu, 2 Apr 2026 10:38:06 -0600 Subject: [PATCH 27/51] pomo: init at 1.2.1 pomo: init at 1.2.1 apply suggestion Update pkgs/by-name/po/pomo/package.nix Co-authored-by: Arne Keller fmt fmt --- pkgs/by-name/po/pomo/package.nix | 39 ++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/po/pomo/package.nix diff --git a/pkgs/by-name/po/pomo/package.nix b/pkgs/by-name/po/pomo/package.nix new file mode 100644 index 000000000000..869588b34639 --- /dev/null +++ b/pkgs/by-name/po/pomo/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + iana-etc, + libredirect, + stdenvNoCC, +}: +buildGoModule (finalAttrs: { + pname = "pomo"; + version = "1.2.1"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Bahaaio"; + repo = "pomo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-gQ7bHQGaQPujpOwVdcwKgiYQjUECi/Pjt5LKwa1v1J8="; + }; + + vendorHash = "sha256-kbTYq4Xc86bcmNMhInq1rwYTbGRmu2TEXT2e7bqT5YY="; + + nativeCheckInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ libredirect.hook ]; + + preCheck = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services + ''; + + meta = { + description = "Customizable TUI Pomodoro timer with ASCII art, progress bar, notifications, and stats"; + homepage = "https://github.com/Bahaaio/pomo"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + mugaizzo + ]; + mainProgram = "pomo"; + }; +}) From 749fccb89e692e7bcffdc7aa29b2fd8e60255e2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jul 2026 21:46:08 +0000 Subject: [PATCH 28/51] cargo-edit: 0.13.11 -> 0.13.13 --- pkgs/by-name/ca/cargo-edit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix index 314d7c62b8ec..b9714260fc49 100644 --- a/pkgs/by-name/ca/cargo-edit/package.nix +++ b/pkgs/by-name/ca/cargo-edit/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-edit"; - version = "0.13.11"; + version = "0.13.13"; src = fetchFromGitHub { owner = "killercup"; repo = "cargo-edit"; rev = "v${finalAttrs.version}"; - hash = "sha256-u4mjbIs9rLZOZ4MUITc4QYnfEcTyZT5aXt6U7fwefoo="; + hash = "sha256-yaY6krZ+kt2g3Wnnzsw4P3xnpsaZuNwFfRk9GLvwps8="; }; - cargoHash = "sha256-1PCncmiY+olGGMOT2AfIbGY5sup4ysPVqdBmuecDWk0="; + cargoHash = "sha256-Q4GDA81w0JR9rcpKSPe9Y+9HPpFdAvYP2RI+91R4NWE="; nativeBuildInputs = [ pkg-config ]; From befc32eff451f1d7744c02a3a191c8aa78b5e295 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 22 Jul 2026 22:57:41 -0400 Subject: [PATCH 29/51] python3Packages.pinecone-client: fix build due to bad pname --- pkgs/development/python-modules/pinecone-client/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index cd4f3df84388..871903f66127 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -13,7 +13,7 @@ }: buildPythonPackage rec { - pname = "pinecone-client"; + pname = "pinecone"; version = "8.1.2"; pyproject = true; From 6ffbccf57ae6d3465abc9f434cd38087c5b2e128 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 22 Jul 2026 23:03:12 -0400 Subject: [PATCH 30/51] python3Packages.pinecone: rename from pinecone-client Match the attribute and directory to pname. Keep pinecone-client as a deprecated alias. --- pkgs/by-name/op/open-webui/package.nix | 2 +- pkgs/development/python-modules/haystack-ai/default.nix | 4 ++-- .../python-modules/{pinecone-client => pinecone}/default.nix | 0 pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/{pinecone-client => pinecone}/default.nix (100%) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 2a402879ce3f..258878ce0b3e 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -214,7 +214,7 @@ python3Packages.buildPythonApplication (finalAttrs: { gcp-storage-emulator moto oracledb - pinecone-client + pinecone playwright pymilvus pymongo diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index fd9700dd0579..1b4509671c42 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -71,7 +71,7 @@ pytesseract, faiss-cpu, # , faiss-gpu - pinecone-client, + pinecone, onnxruntime, onnxruntime-tools, # , onnxruntime-gpu @@ -209,7 +209,7 @@ buildPythonPackage rec { # only-faiss-gpu = [ # faiss-gpu # ]; - only-pinecone = [ pinecone-client ]; + only-pinecone = [ pinecone ]; onnx = [ onnxruntime onnxruntime-tools diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone/default.nix similarity index 100% rename from pkgs/development/python-modules/pinecone-client/default.nix rename to pkgs/development/python-modules/pinecone/default.nix diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0f137fc7e207..26fba2adfa2c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -437,6 +437,7 @@ mapAliases { percol = throw "percol has been removed because it hasn't been updated since 2019"; # added 2025-05-25 pilight = throw "'pilight' has been removed, because it is unmaintained since 2019 and the integration was removed from Home Assistant."; # added 2026-05-06 pillow-avif-plugin = throw "'pillow-avif-plugin' has been removed because 'pillow' has native avif support since 11.3"; # added 2025-11-26 + pinecone-client = warnAlias "'pinecone-client' has been renamed to 'pinecone'" pinecone; # added 2026-07-22 pizzapi = throw "pizzapi was removed because it no longer works"; # added 2025-12-03 pkuseg = throw "'pkuseg' has been removed because it was not supported on newer versions of Python"; # added 2026-01-20 ploomber-extension = throw "'ploomber-extension' has been removed since the upstream repo was archived"; # added 2026-02-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59611c41a313..ae521dc418d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13189,7 +13189,7 @@ self: super: with self; { pinboard = callPackage ../development/python-modules/pinboard { }; - pinecone-client = callPackage ../development/python-modules/pinecone-client { }; + pinecone = callPackage ../development/python-modules/pinecone { }; pinecone-plugin-assistant = callPackage ../development/python-modules/pinecone-plugin-assistant { }; From 4118577436ddbf364af610a9473a9e4a66f44e0f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 23 Jul 2026 13:52:27 +1000 Subject: [PATCH 31/51] python3Packages.mkdocs-awesome-nav: fix build > https://hydra.nixos.org/build/338761733/nixlog/1 > Use the pyprojectVersionPatchHook --- .../python-modules/mkdocs-awesome-nav/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix index 035de58d6efb..b31ee7c5e869 100644 --- a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix +++ b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix @@ -3,6 +3,7 @@ gitMinimal, buildPythonPackage, fetchFromGitHub, + pyprojectVersionPatchHook, flit-core, mkdocs, mkdocs-exclude, @@ -25,6 +26,10 @@ buildPythonPackage rec { hash = "sha256-guv+c4QwaATYEZ6XcWVZaOcZ7U9oLsW+RdWBtB1Xrnc="; }; + nativeBuildInputs = [ + pyprojectVersionPatchHook + ]; + build-system = [ flit-core ]; dependencies = [ From 19dfff970b4fbcd344abd9abb4124f17724a73a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jul 2026 04:38:52 +0000 Subject: [PATCH 32/51] zensical: 0.0.50 -> 0.0.51 --- pkgs/by-name/ze/zensical/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix index 3a8d0de45d54..2392cd490f0f 100644 --- a/pkgs/by-name/ze/zensical/package.nix +++ b/pkgs/by-name/ze/zensical/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "zensical"; - version = "0.0.50"; + version = "0.0.51"; pyproject = true; # We fetch from PyPi, because GitHub repo does not contain all sources. @@ -16,12 +16,12 @@ python3Packages.buildPythonApplication (finalAttrs: { # We could combine sources, but then nix-update won't work. src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-cEDlLr5eaideTt6zUb8rwxTQB/P7V1DxeKONhAcj5pw="; + hash = "sha256-3iXeBnvt+hj5FtfzZv1kp/vwm/zGFbRNHdvjtf4Cq0k="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-4f2nd+amOD6A8XX1470Z7PFXXpd+xFQdx7iepCKzTq0="; + hash = "sha256-QalP0MW52BOyoh4AlUbUM3OvVXyBFaywM7ST46hqQv0="; }; nativeBuildInputs = with rustPlatform; [ From ec3b2759fa48ed2efb45352967696f03f4fe1016 Mon Sep 17 00:00:00 2001 From: eljamm Date: Wed, 22 Jul 2026 17:42:23 +0200 Subject: [PATCH 33/51] vivliostyle: init at 11.1.0 Assisted-by: nix-init Assisted-by: "DeepSeek V4 Flash Free" in adding the browser env var --- ...-specifying-browser-path-via-env-var.patch | 20 ++++ pkgs/by-name/vi/vivliostyle/package.nix | 99 +++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 pkgs/by-name/vi/vivliostyle/0001-allow-specifying-browser-path-via-env-var.patch create mode 100644 pkgs/by-name/vi/vivliostyle/package.nix diff --git a/pkgs/by-name/vi/vivliostyle/0001-allow-specifying-browser-path-via-env-var.patch b/pkgs/by-name/vi/vivliostyle/0001-allow-specifying-browser-path-via-env-var.patch new file mode 100644 index 000000000000..7bde073218b0 --- /dev/null +++ b/pkgs/by-name/vi/vivliostyle/0001-allow-specifying-browser-path-via-env-var.patch @@ -0,0 +1,20 @@ +--- + src/browser.ts | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/browser.ts b/src/browser.ts +index 8e653e2..ae57d2f 100644 +--- a/src/browser.ts ++++ b/src/browser.ts +@@ -355,6 +355,8 @@ export async function getExecutableBrowserPath({ + type, + tag, + }: ResolvedTaskConfig['browser']): Promise { ++ const envPath = process.env.VIVLIOSTYLE_BROWSER_PATH; ++ if (envPath && fs.existsSync(envPath)) return envPath; + const browsers = await importNodeModule('@puppeteer/browsers'); + const buildId = await resolveBuildId({ type, tag, browsers }); + return browsers.computeExecutablePath({ +-- +2.54.0 + diff --git a/pkgs/by-name/vi/vivliostyle/package.nix b/pkgs/by-name/vi/vivliostyle/package.nix new file mode 100644 index 000000000000..ce6cc9feee04 --- /dev/null +++ b/pkgs/by-name/vi/vivliostyle/package.nix @@ -0,0 +1,99 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchPnpmDeps, + nix-update-script, + + # build-time + makeBinaryWrapper, + nodejs, + pnpmBuildHook, + pnpmConfigHook, + pnpm_10, + + chromium, + defaultBrowser ? chromium, +}: + +let + pnpm = pnpm_10; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "vivliostyle"; + version = "11.1.0"; + + src = fetchFromGitHub { + owner = "vivliostyle"; + repo = "vivliostyle-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-rbb/av3amlLit7OjTc+S/pf1SrxEnsENQOArgnc7k3s="; + }; + + patches = [ + ./0001-allow-specifying-browser-path-via-env-var.patch + ]; + + __structuredAttrs = true; + strictDeps = true; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-WPTCLAEWmD1TY84281TJCzp+mcjMFM5Xwf02s7U+M4U="; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + nodejs + pnpm + pnpmBuildHook + pnpmConfigHook + ]; + + pnpmBuildFlags = [ + "--mode" + "production" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + mv {node_modules,dist,examples,packages,package.json} $out/lib + + runHook postInstall + ''; + + postFixup = '' + chmod +x $out/lib/dist/cli.js + patchShebangs $out/usr/lib/dist/cli.js + + makeWrapper $out/lib/dist/cli.js $out/bin/vivliostyle \ + --prefix PATH : ${lib.makeBinPath [ nodejs ]} \ + --set VIVLIOSTYLE_BROWSER_PATH ${lib.getExe defaultBrowser} + + ln -s $out/bin/vivliostyle $out/bin/vs + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "CLI tool for typesetting HTML and Markdown documents"; + longDescription = '' + Vivliostyle is a CSS typesetting ecosystem for creating beautifully + formatted documents using web technologies. + ''; + homepage = "https://github.com/vivliostyle/vivliostyle-cli"; + changelog = "https://github.com/vivliostyle/vivliostyle-cli/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + mainProgram = "vivliostyle"; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ eljamm ]; + teams = with lib.teams; [ ngi ]; + }; +}) From 5d66e6eae56b30860e1ebdfa90755135da118266 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jul 2026 06:07:10 +0000 Subject: [PATCH 34/51] gitte: 0.9.0 -> 0.9.1 --- pkgs/by-name/gi/gitte/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitte/package.nix b/pkgs/by-name/gi/gitte/package.nix index a1f8f3f5ba65..157a276ca285 100644 --- a/pkgs/by-name/gi/gitte/package.nix +++ b/pkgs/by-name/gi/gitte/package.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gitte"; - version = "0.9.0"; + version = "0.9.1"; __structuredAttrs = true; @@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "ckruse"; repo = "Gitte"; tag = finalAttrs.version; - hash = "sha256-k10Rqpf9fhcG+PU6WGr7Q2nVwZb0tLp2B2r3BNeicoI="; + hash = "sha256-/vVNWYuTsFf9SsL/PvM5hOJfULeibRn+9ukAbTs5rXk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-eK8o/psq0eHwUlbfD0I/TwIqoA40Ay0eJ9CtZypZCi4="; + hash = "sha256-oz8pX33jua+bOBEmI87p4rkUxYrhzagBLcQvSHPOkp0="; }; strictDeps = true; From 5fcb4c336ca07923c43d104d140176130c9f3651 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jul 2026 06:33:40 +0000 Subject: [PATCH 35/51] ku: 0.8.2 -> 0.9.0 --- pkgs/by-name/ku/ku/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/ku/package.nix b/pkgs/by-name/ku/ku/package.nix index 60d613cc5158..ee24a471399a 100644 --- a/pkgs/by-name/ku/ku/package.nix +++ b/pkgs/by-name/ku/ku/package.nix @@ -8,14 +8,14 @@ buildGo126Module (finalAttrs: { pname = "ku"; - version = "0.8.2"; + version = "0.9.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "bjarneo"; repo = "ku"; tag = "v${finalAttrs.version}"; - hash = "sha256-vUv4eKTCucJ/ol76z0Q3jOigYBSwM823ZxjvBFqv1yY="; + hash = "sha256-4z4lPvmkEqC7YBEaAa8cUyB42hkFkTFRkHGaA58/Vpg="; }; vendorHash = "sha256-x7O2/uKnIIFDr8WK0ej3FJiIGxN5Fq5Czqrv4OJ5A44="; From 0a43fea4d70ec237aee8372fc3141e399a8cb947 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jul 2026 06:47:44 +0000 Subject: [PATCH 36/51] terraform-providers.yandex-cloud_yandex: 0.215.0 -> 0.218.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 03117d356b57..67feaab99f3b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1508,12 +1508,12 @@ "vendorHash": "sha256-8p6dJwGyTK+qtgplSLtIRKxnNAQAgHfs4z/EsBcg/iY=" }, "yandex-cloud_yandex": { - "hash": "sha256-YiUARVEsGfD4IUuTFSrkAIAD6kOyFUoLebSaZtW9FcE=", + "hash": "sha256-0155GXJMfoCnyqaJiF5SJIA1Qz1q2AYe/BB0AYODG/0=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.215.0", + "rev": "v0.218.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-YNCd1i2HDa0aToZ0vEr6tRugXnBXE+zymhLM+rmRNPI=" + "vendorHash": "sha256-FfZvuC/XXhKS03E+l4/9KCLSwx+uTP1LzywckZqX6pA=" } } From 4958cbdb484db669325e855df283a8436deb9d87 Mon Sep 17 00:00:00 2001 From: Gerhard Schwanzer Date: Fri, 26 Jun 2026 21:04:28 +0200 Subject: [PATCH 37/51] caesura: 0.27.2 -> 0.31.0 https://github.com/RogueOneEcho/caesura/releases/tag/v0.31.0 Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol) --- pkgs/by-name/ca/caesura/package.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/caesura/package.nix b/pkgs/by-name/ca/caesura/package.nix index d78a643d4778..ff1ef9060abe 100644 --- a/pkgs/by-name/ca/caesura/package.nix +++ b/pkgs/by-name/ca/caesura/package.nix @@ -1,7 +1,10 @@ { lib, fetchFromGitHub, + fetchpatch2, rustPlatform, + cacert, + writableTmpDirAsHomeHook, flac, lame, makeBinaryWrapper, @@ -16,24 +19,37 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "caesura"; - version = "0.27.2"; + version = "0.31.0"; src = fetchFromGitHub { owner = "RogueOneEcho"; repo = "caesura"; tag = "v${finalAttrs.version}"; - hash = "sha256-ifaZ+rmMmWhn8HM25sRPXJKuXvWE5VG+5hFMi9hqxA0="; + hash = "sha256-+REt+MKImO7fnYWJ32P6mKzulGJTnxc+9ednVF5aCJU="; }; - cargoHash = "sha256-g8Duhl5nZ6umIrAafW7s4vtDS+f06CWnFLoLSw0wa4o="; + patches = [ + (fetchpatch2 { + name = "normalize-sox-dependent-full-spectrogram-widths.patch"; + url = "https://github.com/RogueOneEcho/caesura/commit/3af818ae35a3e18f444c889d9d3b88294f4f110f.patch?full_index=1"; + hash = "sha256-znAbk6hFVj198BUUwwDo76SWei0cKINeXzlYEFvTwHA="; + }) + ]; + + cargoHash = "sha256-0+vZma8AC44XqVHzmJT/roV7sy8w6DYhujRK9N91J5c="; nativeBuildInputs = [ makeBinaryWrapper ]; - nativeCheckInputs = runtimeDeps; + nativeCheckInputs = [ + cacert + writableTmpDirAsHomeHook + ] + ++ runtimeDeps; env = { CAESURA_NIX = "1"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; }; postPatch = '' From 47b388f4d31b0e068ebbcd2c829472cb47228cbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jul 2026 07:35:22 +0000 Subject: [PATCH 38/51] python3Packages.osmnx: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/osmnx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index b5660833f762..3c172224d708 100644 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "osmnx"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "gboeing"; repo = "osmnx"; tag = "v${version}"; - hash = "sha256-3uLgc6zptmXlPg93qtsWbqNxXiBD/SEnXBL/IM/1m2c="; + hash = "sha256-PX4Vhf3R9UGKMYp636+tJ5NV/oURd3Zzxfvj7LLCaPM="; }; build-system = [ uv-build ]; From 3f4d020c897c7541e1d798800265b3601a92d8bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jul 2026 08:19:09 +0000 Subject: [PATCH 39/51] nil: 2025-06-13 -> 2026-07-23 --- pkgs/by-name/ni/nil/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix index 1cb2324dae1f..1df0684af385 100644 --- a/pkgs/by-name/ni/nil/package.nix +++ b/pkgs/by-name/ni/nil/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nil"; - version = "2025-06-13"; + version = "2026-07-23"; src = fetchFromGitHub { owner = "oxalica"; repo = "nil"; rev = finalAttrs.version; - hash = "sha256-oxvVAFUO9husnRk6XZcLFLjLWL9z0pW25Fk6kVKwt1c="; + hash = "sha256-upJVI2pq9sOKgF2AILt8l6O4/3GNcMtT/s0rmnbO5UA="; }; - cargoHash = "sha256-OZIajxv8xNfCGalVw/FUAwWdQzPqfGuDoeRg2E2RR7s="; + cargoHash = "sha256-ZyTrxGX0mRdskxp4o5ssDCyZzNn36rIgP9fDaA1fDws="; nativeBuildInputs = [ nix ]; From ce97561d94f7c3eeb9cecfb402824a11c7b50b6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jul 2026 08:31:41 +0000 Subject: [PATCH 40/51] cargo-expand: 1.0.123 -> 1.0.124 --- pkgs/by-name/ca/cargo-expand/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 1c4dc8cbbc02..cfbc7a4b2abf 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-expand"; - version = "1.0.123"; + version = "1.0.124"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cargo-expand"; tag = finalAttrs.version; - hash = "sha256-vd63DpKLZpE+fIdfy4gp9PDSSLICPXZdrjk7hMB9L0A="; + hash = "sha256-deGIcij3Tczsqc0HTBGUbncdUXKP+FGj5R+2fevQULA="; }; - cargoHash = "sha256-mLpihgQ5PNRE72xWRHgcA8KxujR7Pi4bGnwahOQJ4qo="; + cargoHash = "sha256-MYaKNoz8h5bt0/Z+8PwLKZDvIWUUCfsvB5vibMaDmf4="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 1782deba0dbc7e6efd590bec2aaaab8a8c4a195b Mon Sep 17 00:00:00 2001 From: klea Date: Thu, 23 Jul 2026 08:38:38 +0000 Subject: [PATCH 41/51] wlr-protocols: modernize As part of https://github.com/NixOS/nixpkgs/issues/356002, https://github.com/NixOS/nixpkgs/issues/541820 --- pkgs/development/libraries/wlroots/protocols.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wlroots/protocols.nix b/pkgs/development/libraries/wlroots/protocols.nix index b3ec30a0618f..a99566333c3a 100644 --- a/pkgs/development/libraries/wlroots/protocols.nix +++ b/pkgs/development/libraries/wlroots/protocols.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "wlr-protocols"; - version = "unstable-2022-09-05"; + version = "0-unstable-2022-09-05"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { patchPhase = '' substituteInPlace wlr-protocols.pc.in \ - --replace '=''${pc_sysrootdir}' "=" \ - --replace '=@prefix@' "=$out" + --replace-fail '=''${pc_sysrootdir}' "=" \ + --replace-fail '=@prefix@' "=$out" ''; doCheck = true; From 9fe6062074901e4ad951d44e74a13d0caa1e7995 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jul 2026 09:15:49 +0000 Subject: [PATCH 42/51] azure-cli-extensions.vm-repair: 2.2.0 -> 2.2.1 --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index b19475fac5dd..92d95ced7137 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -345,9 +345,9 @@ vm-repair = mkAzExtension rec { pname = "vm-repair"; - version = "2.2.0"; + version = "2.2.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; - hash = "sha256-ppsK4rJa/nFFkO2XJvjnK0PIRp9/haVwWfqfF7oN5WQ="; + hash = "sha256-k/6ATtYT2YXaHm5nbb0Tf7xE98Oz9svRlbjodCOOuo8="; description = "Support for repairing Azure Virtual Machines"; propagatedBuildInputs = with python3Packages; [ opencensus ]; meta.maintainers = [ ]; From 59e8a8cf215c3ef2db5220a46ad93ae7ea5bd733 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jul 2026 09:47:20 +0000 Subject: [PATCH 43/51] rustywind: 0.25.2 -> 0.26.0 --- pkgs/by-name/ru/rustywind/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix index a48ee1a7133a..5eec1a568907 100644 --- a/pkgs/by-name/ru/rustywind/package.nix +++ b/pkgs/by-name/ru/rustywind/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustywind"; - version = "0.25.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "avencera"; repo = "rustywind"; tag = "v${finalAttrs.version}"; - hash = "sha256-PeYKBLTQ7/fmNuWtIQiqC47omrdGuIlB55OPxBQJQiM="; + hash = "sha256-uxgp8cwOswrhDLtx5ZAxsdy96/+UjYhzNKwvt0DBmhk="; }; - cargoHash = "sha256-76gC+nw/eV4j68O74XsJDaDFYAEdqZB9EzsRj5vdOvs="; + cargoHash = "sha256-W5dPMSkihxWryLEpQhqt9IpiwyAYSsIgQLbwjnXVjEk="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From 7ad020afbda2442cf20972d3faf298b3b9ae0dc2 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 22 Jul 2026 16:14:30 +0200 Subject: [PATCH 44/51] coqPackages.multinomials: 2.4.0 -> 2.5.0 --- pkgs/development/coq-modules/coqeal/default.nix | 16 +++++++++++----- .../coq-modules/multinomials/default.nix | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 5e6eced48824..23f721b6bb00 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -30,8 +30,9 @@ let lib.switch [ coq.coq-version mathcomp.version ] [ - (case (range "8.20" "9.1") (isGe "2.3.0") "2.1.1") - (case (range "8.20" "9.1") (isGe "2.3.0") "2.1.0") + (case (range "9.0" "9.2") (isGe "2.5.0") "2.1.2") + (case (range "8.20" "9.1") (range "2.3.0" "2.5.0") "2.1.1") + (case (range "8.20" "9.1") (range "2.3.0" "2.5.0") "2.1.0") (case (range "8.16" "8.20") (isGe "2.1.0") "2.0.3") (case (range "8.16" "8.20") (isGe "2.0.0") "2.0.1") (case (range "8.16" "8.17") (isGe "2.0.0") "2.0.0") @@ -44,6 +45,7 @@ let ] null; + release."2.1.2".hash = "sha256-ktoejlxAtbPzWGdW+DXwLSAmxNHDzQTujkY1If4EM8E="; release."2.1.1".hash = "sha256-nAQAX35W9br7dgrT9FqGyHYSzwgMiMsuD1d7SztQDwY="; release."2.1.0".hash = "sha256-UoDxy2BKraDyRsO42GXRo26O74OF51biZQGkIMWLf8Y="; release."2.0.3".hash = "sha256-5lDq7IWlEW0EkNzYPu+dA6KOvRgy53W/alikpDr/Kd0="; @@ -58,7 +60,6 @@ let release."1.0.3".hash = "sha256:0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; propagatedBuildInputs = [ - mathcomp.ssreflect mathcomp.algebra bignums multinomials @@ -74,10 +75,15 @@ let o.propagatedBuildInputs ++ lib.optional (lib.versions.isGe "1.1" o.version || o.version == "dev") mathcomp-real-closed; }); - patched-derivation = patched-derivation1.overrideAttrs (o: { + patched-derivation2 = patched-derivation1.overrideAttrs (o: { propagatedBuildInputs = o.propagatedBuildInputs ++ lib.optional (lib.versions.isLe "2.0.3" o.version && o.version != "dev") paramcoq; }); + patched-derivation3 = patched-derivation2.overrideAttrs (o: { + propagatedBuildInputs = + o.propagatedBuildInputs + ++ lib.optional (lib.versions.isLe "2.1.1" o.version && o.version != "dev") mathcomp.ssreflect; + }); in -patched-derivation +patched-derivation3 diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 5990fde8eb17..4a2b180e370c 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -33,6 +33,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ + (case (range "9.0" "9.2") (range "2.6.0" "2.6.0") "2.5.0") # also works on MC 2.4 and 2.5 but breaks validsdp (case (range "8.18" "9.1") (range "2.1.0" "2.5.0") "2.4.0") (case (range "8.17" "9.0") (range "2.1.0" "2.3.0") "2.3.0") (case (range "8.17" "8.20") (isGe "2.1.0") "2.2.0") @@ -49,6 +50,7 @@ mkCoqDerivation { ] null; release = { + "2.5.0".hash = "sha256-e1C1NfulQV1Ep2XxNjjcxIoY5FGzndiCuwIy3upwO78="; "2.4.0".hash = "sha256-7zfIddRH+Sl4nhEPtS/lMZwRUZI45AVFpcC/UC8Z0Yo="; "2.3.0".hash = "sha256-usIcxHOAuN+f/j3WjVbPrjz8Hl9ac8R6kYeAKi3CEts="; "2.2.0".hash = "sha256-Cie6paweITwPZy6ej9+qIvHFWknVR382uJPW927t/fo="; From b98f9d8352784c00c4a32cb4a5c06eef1a705f37 Mon Sep 17 00:00:00 2001 From: Rasmus Enevoldsen Date: Wed, 17 Jun 2026 10:07:29 +0200 Subject: [PATCH 45/51] xdg-desktop-portal: remove NIX_XDG_DESKTOP_PORTAL_DIR patch xdg-desktop-portal 1.20.1 added support for searching all directories in XDG_DATA_DIRS for portals: https://github.com/flatpak/xdg-desktop-portal/commit/bb37e260db3f91b93227cb559745468922ca29fd This made the NIX_XDG_DESKTOP_PORTAL_DIR patch redundant, since NixOS already ensures /run/current-system/sw/share is on XDG_DATA_DIRS. The patch also does not compose well: it hardcodes a single portal directory, so when both NixOS and home-manager set it, home-manager's value overwrote NixOS's, breaking portal discovery for anything only registered by NixOS (e.g. Cosmic alongside a home-manager-configured Hyprland). --- nixos/doc/manual/release-notes/rl-2611.section.md | 6 ++++++ nixos/modules/config/xdg/portal.nix | 1 - .../xd/xdg-desktop-portal/nix-pkgdatadir-env.patch | 11 ----------- pkgs/by-name/xd/xdg-desktop-portal/package.nix | 5 ----- 4 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 pkgs/by-name/xd/xdg-desktop-portal/nix-pkgdatadir-env.patch diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 4dfb4530656b..2b7750602776 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -77,6 +77,12 @@ - A number of options for `services.llama-cpp` have been removed in favor of the structured [](#opt-services.llama-cpp.settings) option, attributes from which are used as arguments to `llama-server` executable, you can see all available options by running `llama-server --help`. Configuring model presets using Nix attribute set via `services.llama-cpp.modelsPreset` is no longer supported, please use `services.llama-cpp.settings.models-preset` with a path to an INI file containing desired options. +- The `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable is no longer used in the `xdg-desktop-portal` package and is therefore no longer set in `xdg.portal` module. + Instead the `XDG_DATA_DIRS` environment variable is used to find xdg-portals. + + If you were relying on `NIX_XDG_DESKTOP_PORTAL_DIR` to point at custom portal + definitions, add the package providing them to `xdg.portal.extraPortals`. + - Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use. - `security.polkit.enablePkexecWrapper` has been introduced, making the `pkexec` setuid wrapper opt-in. diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 6bc6ce5e33e7..78bae2d49995 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -150,7 +150,6 @@ in sessionVariables = { NIXOS_XDG_OPEN_USE_PORTAL = mkIf cfg.xdgOpenUsePortal "1"; - NIX_XDG_DESKTOP_PORTAL_DIR = "/run/current-system/sw/share/xdg-desktop-portal/portals"; }; etc = lib.concatMapAttrs ( diff --git a/pkgs/by-name/xd/xdg-desktop-portal/nix-pkgdatadir-env.patch b/pkgs/by-name/xd/xdg-desktop-portal/nix-pkgdatadir-env.patch deleted file mode 100644 index 369dd2a860f1..000000000000 --- a/pkgs/by-name/xd/xdg-desktop-portal/nix-pkgdatadir-env.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/xdp-portal-impl.c -+++ b/src/xdp-portal-impl.c -@@ -277,6 +277,8 @@ load_installed_portals (gboolean opt_verbose) - - /* We need to override this in the tests */ - portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR"); -+ if (portal_dir == NULL) -+ portal_dir = g_getenv ("NIX_XDG_DESKTOP_PORTAL_DIR"); - if (portal_dir != NULL) - { - diff --git a/pkgs/by-name/xd/xdg-desktop-portal/package.nix b/pkgs/by-name/xd/xdg-desktop-portal/package.nix index fc618622942a..32c369a0e4a6 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal/package.nix @@ -76,11 +76,6 @@ stdenv.mkDerivation (finalAttrs: { # Allow installing installed tests to a separate output. ./installed-tests-path.patch - # Look for portal definitions under path from `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable. - # While upstream has `XDG_DESKTOP_PORTAL_DIR`, it is meant for tests and actually blocks - # any configs from being loaded from anywhere else. - ./nix-pkgdatadir-env.patch - # test tries to read /proc/cmdline, which is not intended to be accessible in the sandbox ./trash-test.patch ]; From 101df500efd46e6168e377cbbf3d29d766105936 Mon Sep 17 00:00:00 2001 From: whoomee Date: Thu, 23 Jul 2026 13:16:49 +0200 Subject: [PATCH 46/51] esphome: add maintainer tmarkus --- pkgs/by-name/es/esphome/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 936f0caabe46..30c043b0c5b0 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -207,6 +207,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { picnoir thanegill karlbeecken + tmarkus ]; mainProgram = "esphome"; }; From 0f8bcd1f4ea7b8ef7a1e2ae896a35a7eeb4343ac Mon Sep 17 00:00:00 2001 From: whoomee Date: Thu, 23 Jul 2026 13:17:07 +0200 Subject: [PATCH 47/51] esphome: remove platformio from dependencies --- pkgs/by-name/es/esphome/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 30c043b0c5b0..7311e4034bdb 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -85,7 +85,6 @@ python.pkgs.buildPythonApplication (finalAttrs: { jinja2 paho-mqtt pillow - platformio puremagic py7zr pyparsing From 0dffc884876e5478b7e7cdd819be6adce3bdcb8f Mon Sep 17 00:00:00 2001 From: whoomee Date: Thu, 23 Jul 2026 13:17:22 +0200 Subject: [PATCH 48/51] esphome: 2026.6.2 -> 2026.6.5 --- pkgs/by-name/es/esphome/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 7311e4034bdb..e153ac83c9b6 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -24,14 +24,14 @@ let in python.pkgs.buildPythonApplication (finalAttrs: { pname = "esphome"; - version = "2026.6.2"; + version = "2026.6.5"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = finalAttrs.version; - hash = "sha256-h7aMPSXmIUutCGMoZlE3Z1wX2xNxdmZsHfBllcFHBHc="; + hash = "sha256-4sbc/X86OWN/Bx2sPk3H2lgzGxdQNS6bIspNLAVqHz8="; }; patches = [ From 9d1bbdedb54e20cb66d18124edf47d28de723896 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jul 2026 11:18:48 +0000 Subject: [PATCH 49/51] prometheus-imap-mailstat-exporter: 0.7.1 -> 0.7.2 --- .../pr/prometheus-imap-mailstat-exporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-imap-mailstat-exporter/package.nix b/pkgs/by-name/pr/prometheus-imap-mailstat-exporter/package.nix index 104b52d01c0f..51562b7b6662 100644 --- a/pkgs/by-name/pr/prometheus-imap-mailstat-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-imap-mailstat-exporter/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "imap-mailstat-exporter"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "bt909"; repo = "imap-mailstat-exporter"; tag = "${version}"; - hash = "sha256-dinHRHoTVc/0Lu+TzzmfoCyoDZQQhXw8AOlgbH46hm0="; + hash = "sha256-Q+Q7Q9zjJlp83FQ65yqi8eWO02+VkCXlYFRA66yptiE="; }; - vendorHash = "sha256-k3FjfIaNm6408I4uqmJpZsGgMiHel+NUtBclbGKTtZ4="; + vendorHash = "sha256-9rxlXhlQ269E6xtreMrDphqscaZj+IrfsNmssF/C78U="; nativeBuildInputs = [ installShellFiles ]; From 7151bf112711a340ad303b2557b7d31b1df4d023 Mon Sep 17 00:00:00 2001 From: whoomee Date: Thu, 23 Jul 2026 13:27:34 +0200 Subject: [PATCH 50/51] esphome: use addBinToPathHook --- pkgs/by-name/es/esphome/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index e153ac83c9b6..69f1b4480ae4 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -9,6 +9,7 @@ esptool, git, versionCheckHook, + addBinToPathHook, nixosTests, }: @@ -137,6 +138,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { ++ [ git versionCheckHook + addBinToPathHook ]; disabledTestPaths = [ @@ -148,10 +150,6 @@ python.pkgs.buildPythonApplication (finalAttrs: { "tests/unit_tests/test_espidf_component.py" ]; - preCheck = '' - export PATH=$PATH:$out/bin - ''; - postInstall = let argcomplete = lib.getExe' python.pkgs.argcomplete "register-python-argcomplete"; @@ -163,8 +161,6 @@ python.pkgs.buildPythonApplication (finalAttrs: { --fish <(${argcomplete} --shell fish esphome) ''; - doInstallCheck = true; - disabledTests = [ # tries to import platformio, which is wrapped in an fhsenv "test_clean_build" From 93cc79ba2ea875700c9b8bf718d4aae607f6d6c1 Mon Sep 17 00:00:00 2001 From: fliiiix Date: Thu, 23 Jul 2026 08:02:11 +0200 Subject: [PATCH 51/51] igprof: 5.9.18 -> 6.0.0 --- pkgs/by-name/ig/igprof/package.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ig/igprof/package.nix b/pkgs/by-name/ig/igprof/package.nix index a0fc1c0a5e58..127d77148346 100644 --- a/pkgs/by-name/ig/igprof/package.nix +++ b/pkgs/by-name/ig/igprof/package.nix @@ -4,32 +4,25 @@ fetchFromGitHub, libunwind, cmake, - pcre, + pcre2, gdb, }: stdenv.mkDerivation (finalAttrs: { - version = "5.9.18"; + version = "6.0.0"; pname = "igprof"; src = fetchFromGitHub { owner = "igprof"; repo = "igprof"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw="; + hash = "sha256-RIDnilCoYlq0D9CBJKMX1zg1DBQ4RPcOlfGcZ2xosUo="; }; - postPatch = '' - substituteInPlace src/igprof \ - --replace-fail libigprof.so $out/lib/libigprof.so - substituteInPlace CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)" - ''; - buildInputs = [ libunwind gdb - pcre + pcre2 ]; nativeBuildInputs = [ cmake ]; @@ -41,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Ignominous Profiler"; longDescription = ''