From 6bafca964df5c0fe6e22d190831a04551d35b93a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Dec 2025 12:28:47 +0000 Subject: [PATCH 001/142] tcpdump: 4.99.5 -> 4.99.6 --- pkgs/by-name/tc/tcpdump/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tc/tcpdump/package.nix b/pkgs/by-name/tc/tcpdump/package.nix index 9ad88b6d7a4f..c7d04ae911ca 100644 --- a/pkgs/by-name/tc/tcpdump/package.nix +++ b/pkgs/by-name/tc/tcpdump/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "tcpdump"; - version = "4.99.5"; + version = "4.99.6"; src = fetchurl { url = "https://www.tcpdump.org/release/tcpdump-${version}.tar.gz"; - hash = "sha256-jHWFbgCt3urfcNrWfJ/z3TaFNrK4Vjq/aFTXx2TNOts="; + hash = "sha256-WDmSGg9n19j6PazZzUHkTInMuGfoptshbWJijH/RSwk="; }; postPatch = '' From 4204cb57715b8d505403656523bbcee8af6e6162 Mon Sep 17 00:00:00 2001 From: Justin Chen <42143810+StarryReverie@users.noreply.github.com> Date: Sat, 3 Jan 2026 00:13:32 +0800 Subject: [PATCH 002/142] gforth: fix build with GCC 15 --- pkgs/by-name/gf/gforth/boot-forth.nix | 5 ++++ .../by-name/gf/gforth/function-pointers.patch | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/by-name/gf/gforth/function-pointers.patch diff --git a/pkgs/by-name/gf/gforth/boot-forth.nix b/pkgs/by-name/gf/gforth/boot-forth.nix index 13c0cd5955e2..5451e7d56382 100644 --- a/pkgs/by-name/gf/gforth/boot-forth.nix +++ b/pkgs/by-name/gf/gforth/boot-forth.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation { sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; }; + patches = [ + # Newer GCC rejects casting between function pointers omitting parameters + ./function-pointers.patch + ]; + buildInputs = [ m4 ]; configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--build=x86_64-apple-darwin" ]; diff --git a/pkgs/by-name/gf/gforth/function-pointers.patch b/pkgs/by-name/gf/gforth/function-pointers.patch new file mode 100644 index 000000000000..77311c0514f8 --- /dev/null +++ b/pkgs/by-name/gf/gforth/function-pointers.patch @@ -0,0 +1,26 @@ +diff --git a/engine/signals.c b/engine/signals.c +index b522f19..7f89bcd 100644 +--- a/engine/signals.c ++++ b/engine/signals.c +@@ -399,7 +399,7 @@ void install_signal_handlers(void) + #endif + }; + int i; +- void (*throw_handler)() = die_on_signal ? graceful_exit : signal_throw; ++ void (*throw_handler)(int) = die_on_signal ? graceful_exit : signal_throw; + #ifdef SIGSTKSZ + stack_t sigstack; + int sas_retval=-1; +diff --git a/engine/support.c b/engine/support.c +index 021fa22..069c32f 100644 +--- a/engine/support.c ++++ b/engine/support.c +@@ -79,7 +79,7 @@ char *tilde_cstr(Char *from, UCell size, int clear) + { + char *s1,*s2; + int s1_len, s2_len; +- struct passwd *getpwnam (), *user_entry; ++ struct passwd *getpwnam (const char *), *user_entry; + + if (size<1 || from[0]!='~') + return cstr(from, size, clear); From 1c61a646c1723dbd21028f6ad8c69553c0d7ef11 Mon Sep 17 00:00:00 2001 From: Justin Chen <42143810+StarryReverie@users.noreply.github.com> Date: Sat, 3 Jan 2026 00:15:32 +0800 Subject: [PATCH 003/142] gforth: 0.7.9_20251001 -> 0.7.9_20251203 --- pkgs/by-name/gf/gforth/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix index 6259606c5cce..54cdecf7fcf1 100644 --- a/pkgs/by-name/gf/gforth/package.nix +++ b/pkgs/by-name/gf/gforth/package.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gforth"; - version = "0.7.9_20251001"; + version = "0.7.9_20251203"; src = fetchFromGitHub { owner = "forthy42"; repo = "gforth"; rev = finalAttrs.version; - hash = "sha256-u9snXcFa/YYvITgMBY8FRYyyLFhHCP6hWA5ljwdKGLk="; + hash = "sha256-d1LU6FGnGOzL5Tdl0VLkYzHH+pUevGNCNwIqudS8emg="; }; patches = [ ./use-nproc-instead-of-fhs.patch ]; From 2510481e9a0c03883c50b29b06238d16b98d805d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jan 2026 18:24:52 +0000 Subject: [PATCH 004/142] python3Packages.aws-lambda-builders: 1.59.0 -> 1.61.0 --- .../python-modules/aws-lambda-builders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 41a6ffba2001..b1f6687aed3d 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.59.0"; + version = "1.61.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; tag = "v${version}"; - hash = "sha256-US8NHNEvYlYJMurXjvlySIdKIgKjAwIws8PmnPF0J6Q="; + hash = "sha256-NdVZrc6996dlV0jSWuZH/dLQdJnXO+BQb8hk3G0oXmw="; }; postPatch = '' From 2bf9652389b791d0423cad761e66066deaed754f Mon Sep 17 00:00:00 2001 From: Raheem Idowu Date: Wed, 7 Jan 2026 14:49:37 +0100 Subject: [PATCH 005/142] nixos/ly: fix brightness default commands ensures brightness can be changed in ly by default --- nixos/modules/services/display-managers/ly.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index d9505c440a43..368a067a4d9a 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -45,6 +45,8 @@ let xauth_cmd = lib.optionalString xcfg.enable "${pkgs.xorg.xauth}/bin/xauth"; x_cmd = lib.optionalString xcfg.enable xserverWrapper; setup_cmd = dmcfg.sessionData.wrapper; + brightness_up_cmd = "${lib.getExe pkgs.brightnessctl} -q -n s +10%"; + brightness_down_cmd = "${lib.getExe pkgs.brightnessctl} -q -n s 10%-"; }; finalConfig = defaultConfig // cfg.settings; From 0b0c1d8437e7aa3d6d8ef7302df038fe07c5068c Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sat, 10 Jan 2026 13:08:50 -0500 Subject: [PATCH 006/142] email: fix compilation with gcc 15 --- pkgs/by-name/em/email/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/em/email/package.nix b/pkgs/by-name/em/email/package.nix index 2b168ad5d111..9aba58c1d25f 100644 --- a/pkgs/by-name/em/email/package.nix +++ b/pkgs/by-name/em/email/package.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation { }) ]; + # opt out of GCC 15's stricter C standards + # https://github.com/NixOS/nixpkgs/issues/475479 + env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu17" ]; + buildInputs = [ openssl ]; unpackPhase = '' From 264741c191a6be7d9a09c35d22dbfdc1457c2a03 Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 12 Jan 2026 15:51:38 +0100 Subject: [PATCH 007/142] gancio: fix build by pinning nodejs --- pkgs/by-name/ga/gancio/package.nix | 14 ++++++++++++-- .../ga/gancio/plugin-telegram-bridge/default.nix | 14 ++++++++++++-- pkgs/by-name/ga/gancio/plugins.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix index a3aa4f975ca3..26447e7ca255 100644 --- a/pkgs/by-name/ga/gancio/package.nix +++ b/pkgs/by-name/ga/gancio/package.nix @@ -4,10 +4,11 @@ fetchFromGitLab, fetchYarnDeps, + yarn, yarnConfigHook, yarnBuildHook, yarnInstallHook, - nodejs, + nodejs_22, pkg-config, vips, @@ -17,6 +18,15 @@ nix-update-script, }: +let + # The latest nodejs is always used in yarn, leading to build issues when it's + # different from the pinned one. + nodejs = nodejs_22; + yarnConfigHook' = yarnConfigHook.override { + yarn = yarn.override { inherit nodejs; }; + }; +in + stdenv.mkDerivation (finalAttrs: { pname = "gancio"; version = "1.28.2"; @@ -35,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - yarnConfigHook + yarnConfigHook' yarnBuildHook yarnInstallHook nodejs diff --git a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix index 3ec2fc9fab2d..52e4c876d4ba 100644 --- a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix +++ b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix @@ -3,12 +3,22 @@ stdenv, fetchFromGitLab, fetchYarnDeps, + yarn, yarnConfigHook, yarnInstallHook, - nodejs, + nodejs_22, nix-update-script, }: +let + # The latest nodejs is always used in yarn, leading to build issues when it's + # different from the pinned one. + nodejs = nodejs_22; + yarnConfigHook' = yarnConfigHook.override { + yarn = yarn.override { inherit nodejs; }; + }; +in + stdenv.mkDerivation rec { pname = "gancio-plugin-telegram-bridge"; version = "1.0.6"; @@ -32,7 +42,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - yarnConfigHook + yarnConfigHook' yarnInstallHook nodejs ]; diff --git a/pkgs/by-name/ga/gancio/plugins.nix b/pkgs/by-name/ga/gancio/plugins.nix index c3816f7e2a5e..cdecfdd0be21 100644 --- a/pkgs/by-name/ga/gancio/plugins.nix +++ b/pkgs/by-name/ga/gancio/plugins.nix @@ -1,4 +1,4 @@ -{ callPackage, nodejs }: +{ callPackage }: { - telegram-bridge = callPackage ./plugin-telegram-bridge { inherit nodejs; }; + telegram-bridge = callPackage ./plugin-telegram-bridge { }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 700ae2629131..98741c8665b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1565,9 +1565,7 @@ with pkgs; gams = callPackage ../tools/misc/gams (config.gams or { }); - gancioPlugins = recurseIntoAttrs ( - callPackage ../by-name/ga/gancio/plugins.nix { inherit (gancio) nodejs; } - ); + gancioPlugins = recurseIntoAttrs (callPackage ../by-name/ga/gancio/plugins.nix { }); github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; From 015415c9ea2e1b432497bb4945b31b6cd4e906a8 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Tue, 13 Jan 2026 13:44:43 +0100 Subject: [PATCH 008/142] python3Packages.aiosql: fix darwin build --- pkgs/development/python-modules/aiosql/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index dae16cb778b2..511466c5c3ad 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pg8000, @@ -50,6 +51,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiosql" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + # Tests that require port binding fail in darwin sandbox + # port_for.exceptions.PortForException: Can't select a port + "tests/test_pg8000.py" + "tests/test_apsycopg3.py" + "tests/test_psycopg3.py" + ]; + meta = { description = "Simple SQL in Python"; homepage = "https://nackjicholson.github.io/aiosql/"; From 7e0fe920e6e21f7f9b45e98eef161fc4b7336dba Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 8 Jan 2026 11:16:40 +0100 Subject: [PATCH 009/142] herbstluftwm: fix build with GCC 15 --- pkgs/by-name/he/herbstluftwm/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/he/herbstluftwm/package.nix b/pkgs/by-name/he/herbstluftwm/package.nix index 44c6d9e08e14..1e569ae5645f 100644 --- a/pkgs/by-name/he/herbstluftwm/package.nix +++ b/pkgs/by-name/he/herbstluftwm/package.nix @@ -78,7 +78,11 @@ stdenv.mkDerivation rec { url = "https://github.com/herbstluftwm/herbstluftwm/commit/1a6e8ee24eac671569f54bfec22ab47ff285a52c.patch"; hash = "sha256-srulWJQ9zTR4Kdxo40AdHND4nexDe2PDSR69yWsOpVA="; }) - + # Fix build with GCC 15 (missing #include ), can be removed with the next release (>0.9.5) + (fetchpatch { + url = "https://github.com/herbstluftwm/herbstluftwm/commit/8ff75588a750704ae06ad59b843eb88138c95653.patch"; + hash = "sha256-mrViVcW3jZes1QMn5It0t2WfLfwl/WNF6k9yz1fm/Gs="; + }) ]; postPatch = '' From 5c603601b15d623b195c7f819cb030443c7de7e3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 14 Jan 2026 06:42:32 +0100 Subject: [PATCH 010/142] ocamlPackages.owl: fix for GCC 15 --- .../ocaml-modules/owl-base/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix index 864a3fa5b870..a9c1b14af8b6 100644 --- a/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -2,17 +2,27 @@ lib, buildDunePackage, fetchurl, + fetchpatch, + applyPatches, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "owl-base"; version = "1.2"; - duneVersion = "3"; + src = applyPatches { + src = fetchurl { + url = "https://github.com/owlbarn/owl/releases/download/${finalAttrs.version}/owl-${finalAttrs.version}.tbz"; + hash = "sha256-OBei5DkZIsiiIltOM8qV2mgJJGmU5r8pGjAMgtjKxsU="; + }; - src = fetchurl { - url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz"; - hash = "sha256-OBei5DkZIsiiIltOM8qV2mgJJGmU5r8pGjAMgtjKxsU="; + patches = [ + # Compatibility with GCC 15 + (fetchpatch { + url = "https://github.com/owlbarn/owl/commit/3e66ccb0b1d21b73fa703f3d3f416ec0107860a4.patch"; + hash = "sha256-0bV0ogTvtDoO8kEvE5QcJFRWqOJ1qiXGjXY9Ekp30M0="; + }) + ]; }; minimalOCamlVersion = "4.10"; @@ -25,4 +35,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.bcdarwin ]; license = lib.licenses.mit; }; -} +}) From 8fc59bef52ad8d5335493be610f895ea741c6559 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 11 Oct 2025 22:11:38 +0200 Subject: [PATCH 011/142] python313Packages.aiorwlock: fix build --- pkgs/development/python-modules/aiorwlock/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/aiorwlock/default.nix b/pkgs/development/python-modules/aiorwlock/default.nix index 9139bd1de4ef..4266a374b7ee 100644 --- a/pkgs/development/python-modules/aiorwlock/default.nix +++ b/pkgs/development/python-modules/aiorwlock/default.nix @@ -5,6 +5,7 @@ pytest-asyncio, pytestCheckHook, poetry-core, + fetchpatch, }: buildPythonPackage rec { @@ -21,6 +22,15 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + patches = [ + # Fix cross-event-loop race condition in lock acquisition + # https://github.com/aio-libs/aiorwlock/pull/503 + (fetchpatch { + url = "https://github.com/aio-libs/aiorwlock/commit/05608d401e4a68c69c6b9f421dd20535a9dbe523.patch?full_index=1"; + hash = "sha256-97c6Li6nq7ViNvUIdPL8f/ATOSsmiAMaJeBFj+jPJcM="; + }) + ]; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook From ee524f569d59ea0b6cec731b8b33abc9de0a3b70 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Wed, 14 Jan 2026 19:33:33 +0100 Subject: [PATCH 012/142] nixosTests.dwl: fix on aarch64-linux e.g. https://hydra.nixos.org/build/318572543/nixlog/1 --- nixos/tests/dwl.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/dwl.nix b/nixos/tests/dwl.nix index 6398ebeba5cf..b46c0f98ee97 100644 --- a/nixos/tests/dwl.nix +++ b/nixos/tests/dwl.nix @@ -23,6 +23,9 @@ services.displayManager.defaultSession = lib.mkForce "dwl"; programs.dwl.enable = true; + + # Need to switch to a different GPU driver than the default one (-vga std) so that dwl works on aarch64-linux + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; }; testScript = '' From dece44ecd739d7c1aee3fdf63be1bc40eec7e78b Mon Sep 17 00:00:00 2001 From: Ilia Date: Thu, 15 Jan 2026 20:13:23 +0300 Subject: [PATCH 013/142] inlyne: fix build with gcc15 --- pkgs/by-name/in/inlyne/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix index 632b8deb8370..d703194effe9 100644 --- a/pkgs/by-name/in/inlyne/package.nix +++ b/pkgs/by-name/in/inlyne/package.nix @@ -11,6 +11,7 @@ wayland, libGL, openssl, + oniguruma, }: rustPlatform.buildRustPackage rec { @@ -42,8 +43,12 @@ rustPlatform.buildRustPackage rec { wayland libxkbcommon openssl + oniguruma ]; + # use system oniguruma since the bundled one fails to build with gcc15 + env.RUSTONIG_SYSTEM_LIBONIG = 1; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # time out on darwin "--skip=interpreter::tests::centered_image_with_size_align_and_link" From 98c791a18b2ea5d4873ef50cd4d41d08987af407 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Thu, 15 Jan 2026 12:24:00 -0500 Subject: [PATCH 014/142] gprolog: Fix with gcc15 and modernize --- pkgs/by-name/gp/gprolog/package.nix | 48 +++++++++++++++++------------ 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/gp/gprolog/package.nix b/pkgs/by-name/gp/gprolog/package.nix index f1bd79a2d17f..759bf35a104b 100644 --- a/pkgs/by-name/gp/gprolog/package.nix +++ b/pkgs/by-name/gp/gprolog/package.nix @@ -4,44 +4,52 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gprolog"; version = "1.5.0"; src = fetchurl { urls = [ - "mirror://gnu/gprolog/gprolog-${version}.tar.gz" - "http://www.gprolog.org/gprolog-${version}.tar.gz" + "mirror://gnu/gprolog/gprolog-${finalAttrs.version}.tar.gz" + "http://www.gprolog.org/gprolog-${finalAttrs.version}.tar.gz" + "https://github.com/didoudiaz/gprolog/archive/refs/tags/v${finalAttrs.version}.tar.gz" ]; - sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; + hash = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; }; + __structuredAttrs = true; + enableParallelBuilding = true; + hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "pic"; patchPhase = '' - sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" src/Pl2Wam/check_boot + sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" Pl2Wam/check_boot ''; - preConfigure = '' - cd src - configureFlagsArray=( - "--with-install-dir=$out" - "--without-links-dir" - "--with-examples-dir=$out/share/gprolog-${version}/examples" - "--with-doc-dir=$out/share/gprolog-${version}/doc" - ) - ''; + sourceRoot = "gprolog-${finalAttrs.version}/src"; - postInstall = '' - mv -v $out/[A-Z]* $out/gprolog.ico $out/share/gprolog-${version}/ - ''; + configureFlags = [ + "--without-links-dir" + "--with-install-dir=${placeholder "out"}" + "--with-examples-dir=${placeholder "out"}/share/gprolog-${finalAttrs.version}/examples" + "--with-doc-dir=${placeholder "out"}/share/gprolog-${finalAttrs.version}/doc" + "--htmldir=${placeholder "out"}/share/gprolog-${finalAttrs.version}/doc" + "--with-c-flags=-std=gnu17" + ]; doCheck = true; + postInstall = '' + mv -v $out/[A-Z]* $out/gprolog.ico $out/share/gprolog-${finalAttrs.version} + ''; + meta = { homepage = "https://www.gnu.org/software/gprolog/"; description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains"; - license = lib.licenses.lgpl3Plus; + license = with lib.licenses; [ + lgpl3Plus # and/or + gpl2Plus + ]; longDescription = '' GNU Prolog is a free Prolog compiler with constraint solving @@ -67,6 +75,6 @@ stdenv.mkDerivation rec { declarativity of logic programming. ''; - platforms = lib.platforms.unix; + platforms = lib.platforms.all; }; -} +}) From a4ef4c189ca6a336cb3e7b7c0e6cc551a6d764c9 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 8 Jan 2026 10:34:42 -0800 Subject: [PATCH 015/142] nixVersions.nix_2_31: 2.31.2 -> 2.31.3 Changelog of fixes: ## Bug fixes (crashes) - Fix segfaults from `toView()` when compiled with newer nixpkgs (NixOS/nix#14154) - Fix use-after-move in `DerivationGoal::repairClosure` and `SampleStack` (NixOS/nix#14086) - Fix assertion failure on partially valid derivation outputs (NixOS/nix#14137) - Fix `RestrictedStore::addDependency` recursion causing crashes (NixOS/nix#14729) - Fix crash on flakerefs containing newlines (NixOS/nix#14450) ## Bug fixes (functionality) - Fix fakeSSH check breaking SSH copies with `user@host` format (NixOS/nix#14150) - Fix `builtins.dirOf` regression from Nix 2.23 (NixOS/nix#14515) - Restore missing `isAllowed` check in `ChrootLinuxDerivationBuilder` (NixOS/nix#14531) - Fix curl with c-ares failing to resolve DNS in sandbox on macOS (NixOS/nix#14792) - Fix tarball percent decoding for `file://` URIs (NixOS/nix#14729) - `exportReferencesGraph`: Handle heterogeneous arrays (NixOS/nix#13861) - Fix filesystem ops in store optimization (NixOS/nix#14676) ## Bug fixes (output) - Fix double-quoting of paths in logs (NixOS/nix#14210) - Include path in world-writable error messages (NixOS/nix#14785) ## Improvements - Better git refnames validation (NixOS/nix#14253) - Use pure/restricted eval for help pages (NixOS/nix#14156) - Improve store-reference compatibility with IPv6 ZoneId literals (NixOS/nix#14134) - Correct `build-dir` error in manual (NixOS/nix#14745) ## Build system - Add mdbook 0.5 support (NixOS/nix#14690) - Drop legacy Apple SDK pattern (NixOS/nix#13976) https://github.com/NixOS/nix/releases/tag/2.31.3 --- .../installer/tools/nix-fallback-paths.nix | 12 +++--- pkgs/tools/package-management/nix/default.nix | 39 ++++++------------- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index f6f99b6218d2..68f6494510cb 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/x30lnlgk1s16rynrfslbf8phr6h6rqf2-nix-2.31.2"; - i686-linux = "/nix/store/ix94q6rrdg6cr4893cjpzdbmibhlm0dv-nix-2.31.2"; - aarch64-linux = "/nix/store/xnybj9lk0kwvmr2va253avanq7m3cpyg-nix-2.31.2"; - riscv64-linux = "/nix/store/33as1vqp8mq36nr5bb5gr7ziw1nf4q1v-nix-riscv64-unknown-linux-gnu-2.31.2"; - x86_64-darwin = "/nix/store/b9dvary8rcljj7ajv1x64hwwch4cvyvp-nix-2.31.2"; - aarch64-darwin = "/nix/store/lvv1j8qbrvlnl3aagcjrhf42d458zgb5-nix-2.31.2"; + x86_64-linux = "/nix/store/mxn3vxpvk2b42kgd08aw4bn27qhf434w-nix-2.31.3"; + i686-linux = "/nix/store/b7d35ifww9683l74ydkb0qhrq6lqcisi-nix-2.31.3"; + aarch64-linux = "/nix/store/ysz7dwmy4zd1zm3wzx5dh9g999xv7pbm-nix-2.31.3"; + riscv64-linux = "/nix/store/avfv2lqbnphj2ap8y5ihg1l0sqhpjll7-nix-riscv64-unknown-linux-gnu-2.31.3"; + x86_64-darwin = "/nix/store/s8lcl6nrd5ia7nr4zx9mg720i9f8qm37-nix-2.31.3"; + aarch64-darwin = "/nix/store/vfjzbcl3kf9jjwh0g2x03cvz2x5hg8py-nix-2.31.3"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b63f6d4d33d0..f9e53596053c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -167,34 +167,17 @@ lib.makeExtensible ( nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything; - nixComponents_2_31 = - (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.31.2"; - inherit (self.nix_2_30.meta) teams; - otherSplices = generateSplicesForNixComponents "nixComponents_2_31"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - tag = version; - hash = "sha256-NLGXPLjENLeKVOg3OZgHXZ+1x6sPIKq9FHH8pxbCrDI="; - }; - }).appendPatches - ( - [ - (fetchpatch2 { - name = "nix-2.31-14692-mdbook-0.5-support.patch"; - url = "https://github.com/NixOS/nix/commit/a4f5f365090980a6eeb2ef483e49c04bdefd71a8.patch"; - hash = "sha256-GOWZtHSzHovnD8iUknr61bo7y85i0BKdw3kVBGDfBX0="; - }) - ] - ++ - # issues on darwin: https://github.com/NixOS/nixpkgs/pull/468208#issuecomment-3626314109 - lib.optional stdenv.isLinux (fetchpatch2 { - name = "nix-2.31-14240-sri-error-message.patch"; - url = "https://github.com/NixOS/nix/commit/56751b1cd2c4700c71c545f2246adf602c97fdf5.patch"; - hash = "sha256-CerSBAI+H2RqPp9jsCP0QIM2rZYx3yBZHVVUAztgc18="; - }) - ); + nixComponents_2_31 = nixDependencies.callPackage ./modular/packages.nix rec { + version = "2.31.3"; + inherit (self.nix_2_30.meta) teams; + otherSplices = generateSplicesForNixComponents "nixComponents_2_31"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + tag = version; + hash = "sha256-oe0YWe8f+pwQH4aYD2XXLW5iEHyXNUddurqJ5CUVCIk="; + }; + }; nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything; From a16b54a4caf11bad18d2b9617e4fb618575f83f7 Mon Sep 17 00:00:00 2001 From: nicknb Date: Thu, 15 Jan 2026 23:18:29 +0100 Subject: [PATCH 016/142] ruff: 0.14.11 -> 0.14.13 --- pkgs/by-name/ru/ruff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index fc50449ca92d..921b894cb3ee 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,18 +16,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.14.11"; + version = "0.14.13"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-W8BYc0m/3WsguchDweUapreLrNp47jzkuldI5yEWgvA="; + hash = "sha256-ComgiY6fvM2f3Ul8kTgykyktvxEHL85X5C1Tudi5ZB4="; }; cargoBuildFlags = [ "--package=ruff" ]; - cargoHash = "sha256-0axyrkSHjBPhv40LvdcRDUqC+j0mUL/VzpgL/I0R5/o="; + cargoHash = "sha256-Vd9y9VQF7d62tjHJ0ikWlvV7+KDs4q61ld9yoJWaqpY="; nativeBuildInputs = [ installShellFiles ]; From fd353d9446bccb49217d466d95bb71727bf5121f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Jan 2026 01:05:36 +0000 Subject: [PATCH 017/142] python3Packages.streamlit: 1.52.2 -> 1.53.0 --- pkgs/development/python-modules/streamlit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index fcb33980d7de..f61467d882d3 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.52.2"; + version = "1.53.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ZKTdqLxc3Te/1JDpO7U9o1qu+Ub8/Cg6eYDazfFlEIs="; + hash = "sha256-ARQRbTRYny5lK/Ssc1o6ymmAfmWfkvmcmOe2INAAg48="; }; build-system = [ From 4d0f785c88a2c0e1de2b20750499b8fc6e63aab8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Jan 2026 06:48:34 +0000 Subject: [PATCH 018/142] mirrord: 3.180.0 -> 3.181.0 --- pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 6be5b07cd1fd..194e1d1c98bd 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.180.0", + "version": "3.181.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_x86_64", - "hash": "sha256-hpmuMhN2HS+4zPlTOh87A1UQvlxVKlzqHKKDm1VBLhg=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_linux_x86_64", + "hash": "sha256-hLTPM7TMoXL1AlPPLYrqCpE3JrfeOISK4RKekQg2GzY=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_aarch64", - "hash": "sha256-dGe0r7ckuKkMzVkGyWaYR2PVkDtGRRhC3ievXzKs5dU=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_linux_aarch64", + "hash": "sha256-LyJxTLWP2TZpGeKVQEhMILBpxik5LuT96en9272Ff0k=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal", - "hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_mac_universal", + "hash": "sha256-E0F6i/irdOKizI558XX9gh9YQ6T9d7H2SKwh4AjzSCk=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal", - "hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_mac_universal", + "hash": "sha256-E0F6i/irdOKizI558XX9gh9YQ6T9d7H2SKwh4AjzSCk=" } } } From 69345b30d2b796efc79c64e5bd9ee79aa9440e66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Jan 2026 07:43:37 +0000 Subject: [PATCH 019/142] gogh: 362 -> 364 --- pkgs/by-name/go/gogh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gogh/package.nix b/pkgs/by-name/go/gogh/package.nix index dff132dd444d..a51792f20d0c 100644 --- a/pkgs/by-name/go/gogh/package.nix +++ b/pkgs/by-name/go/gogh/package.nix @@ -25,13 +25,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "gogh"; - version = "362"; + version = "364"; src = fetchFromGitHub { owner = "Gogh-Co"; repo = "Gogh"; tag = "v${finalAttrs.version}"; - hash = "sha256-FlMf7CzdGcGor+wi293CW2PT14O1VRzQbbxnNMmwFqk="; + hash = "sha256-DVaUmpXWGb+bIdGZqXbiAsiuGTrwvPJdxCyA4g82LFA="; }; postPatch = '' From 326c1b9b1df706d13e9d644b164da02c0d53f230 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 16 Jan 2026 11:19:30 +0100 Subject: [PATCH 020/142] nixos/systemd-initrd: include the right fido_id binary in the initrd --- nixos/modules/system/boot/systemd/fido2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/fido2.nix b/nixos/modules/system/boot/systemd/fido2.nix index c43089f4d7c3..02b4a1389fba 100644 --- a/nixos/modules/system/boot/systemd/fido2.nix +++ b/nixos/modules/system/boot/systemd/fido2.nix @@ -24,7 +24,7 @@ in '') ]; boot.initrd.systemd.storePaths = [ - "${pkgs.systemd}/lib/udev/fido_id" + "${cfg.package}/lib/udev/fido_id" "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so" "${pkgs.libfido2}/lib/libfido2.so.1" ]; From 58ec2660295ed761e9fbd0d164168af3528419a5 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Fri, 26 Dec 2025 09:17:50 -0800 Subject: [PATCH 021/142] makeImpureTest: preserve NIXPKGS_ALLOW_UNFREE env var in sudo call --- pkgs/build-support/make-impure-test.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/make-impure-test.nix b/pkgs/build-support/make-impure-test.nix index 3a462964b3d2..10dd7ef1867e 100644 --- a/pkgs/build-support/make-impure-test.nix +++ b/pkgs/build-support/make-impure-test.nix @@ -92,7 +92,7 @@ let ${prepareRunCommands} - sudo nix-build --option extra-sandbox-paths '${sandboxPathsList}' ${lib.escapeShellArgs nixFlags} -A ${testPath} "$@" + sudo --preserve-env=NIXPKGS_ALLOW_UNFREE nix-build --option extra-sandbox-paths '${sandboxPathsList}' ${lib.escapeShellArgs nixFlags} -A ${testPath} "$@" ''; in # The main output is the run script, inject the derivation for the actual test From fc1f8110e84b7a874826eee147170aee85082390 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Wed, 17 Sep 2025 17:24:38 -0700 Subject: [PATCH 022/142] rocmPackages: 6.4.3 -> 7.0.1 --- .../manual/release-notes/rl-2605.section.md | 2 + .../magma/magma-hipblas-v2-buildflags.patch | 26 +++ pkgs/by-name/ma/magma/package.nix | 47 ++++- .../avoid-extra-host-compile.patch | 40 ---- ...ra-definition-of-hipBinUtilPtr_-in-d.patch | 39 ---- .../6/rccl/enable-mscclpp-on-all-gfx9.diff | 13 -- .../6/rccl/fix-mainline-support-and-ub.diff | 172 ------------------ .../rocm-modules/6/rocm-smi/cmake.patch | 89 --------- .../rocm-modules/{6 => }/amdsmi/default.nix | 9 +- .../rocm-modules/{6 => }/aotriton/default.nix | 0 .../{6 => }/aqlprofile/default.nix | 2 +- .../{6 => }/clr/cmake-find-x11-libgl.patch | 0 .../rocm-modules/{6 => }/clr/default.nix | 25 +-- .../{6 => }/clr/test-opencl-example.nix | 2 +- .../{6 => }/clr/test-rocm-smi.nix | 2 +- .../{6 => }/composable_kernel/base.nix | 51 +++--- .../{6 => }/composable_kernel/ck4inductor.nix | 2 +- .../{6 => }/composable_kernel/default.nix | 35 +++- .../rocm-modules/{6 => }/default.nix | 1 + .../rocm-modules/{6 => }/half/default.nix | 4 +- .../{6 => }/hip-common/default.nix | 4 +- .../{6 => }/hipblas-common/default.nix | 4 +- .../rocm-modules/{6 => }/hipblas/default.nix | 15 +- .../{6 => }/hipblaslt/Tensile-interning.patch | 0 .../TensileCreateLibrary-refactor.patch | 0 .../{6 => }/hipblaslt/default.nix | 2 +- .../messagepack-compression-support.patch | 0 .../parallel-buildSourceCodeObjectFile.diff | 0 .../rocm-modules/{6 => }/hipcc/default.nix | 6 - .../rocm-modules/{6 => }/hipcub/default.nix | 4 +- .../rocm-modules/{6 => }/hipfft/default.nix | 4 +- .../rocm-modules/{6 => }/hipfort/default.nix | 4 +- .../rocm-modules/{6 => }/hipify/default.nix | 6 +- .../rocm-modules/{6 => }/hiprand/default.nix | 4 +- .../rocm-modules/{6 => }/hiprt/default.nix | 0 .../{6 => }/hipsolver/default.nix | 4 +- .../{6 => }/hipsparse/default.nix | 4 +- .../clang-bodge-ignore-systemwide-incls.diff | 0 .../{6 => }/llvm/clang-log-jobs.diff | 0 .../rocm-modules/{6 => }/llvm/default.nix | 72 ++------ .../opt-offload-compress-on-by-default.patch | 0 .../llvm/perf-increase-namestring-size.patch | 0 .../perf-shorten-gcclib-include-paths.patch | 0 .../rocm-modules/{6 => }/migraphx/default.nix | 10 +- .../{6 => }/migraphx/msgpack-6-compat.patch | 0 .../rocm-modules/{6 => }/miopen/default.nix | 6 +- .../{6 => }/miopen/skip-preexisting-dbs.patch | 0 .../test-frugally-deep-model-loading.cpp | 0 .../test-frugally-deep-model-loading.nix | 0 ...ONSTANT_MACROS-to-make-rocAL-compile.patch | 0 .../{6 => }/mivisionx/default.nix | 4 +- .../rocm-modules/{6 => }/mscclpp/default.nix | 0 .../rocm-modules/{6 => }/rccl/default.nix | 8 +- .../rccl/fix_hw_reg_hw_id_gt_gfx10.patch | 0 .../rccl/rccl-test-missing-iomanip.diff | 0 .../rocm-modules/{6 => }/rdc/default.nix | 4 +- .../{6 => }/release-attrPaths-gen.nix | 0 .../{6 => }/release-attrPaths-gen.sh | 0 .../{6 => }/release-attrPaths.json | 0 .../{6 => }/rocalution/default.nix | 4 +- .../rocm-modules/{6 => }/rocblas/default.nix | 24 ++- .../rocblas/hiplaslt-unstable-compat.patch | 0 .../{6 => }/rocdbgapi/default.nix | 4 +- .../rocm-modules/{6 => }/rocfft/default.nix | 4 +- .../{6 => }/rocfft/log-every-n-aot-jobs.patch | 0 .../rocm-modules/{6 => }/rocgdb/default.nix | 4 +- .../{6 => }/rocm-bandwidth-test/default.nix | 0 .../{6 => }/rocm-cmake/default.nix | 4 +- .../{6 => }/rocm-comgr/default.nix | 0 .../{6 => }/rocm-core/default.nix | 4 +- .../{6 => }/rocm-core/env-rocm-path.patch | 0 .../{6 => }/rocm-device-libs/cmake.patch | 0 .../{6 => }/rocm-device-libs/default.nix | 0 .../{6 => }/rocm-docs-core/default.nix | 0 .../{6 => }/rocm-runtime/default.nix | 15 +- .../remove-hsa-aqlprofile-dep.patch | 0 .../rocm-modules/{6 => }/rocm-smi/default.nix | 9 +- .../{6 => }/rocm-tests/default.nix | 0 .../rocm-modules/{6 => }/rocminfo/default.nix | 4 +- .../rocm-modules/{6 => }/rocmlir/default.nix | 4 +- .../rocm-modules/{6 => }/rocprim/default.nix | 4 +- .../{6 => }/rocprofiler-register/default.nix | 10 +- .../{6 => }/rocprofiler/default.nix | 4 +- .../{6 => }/rocr-debug-agent/default.nix | 6 +- .../rocm-modules/{6 => }/rocrand/default.nix | 4 +- .../{6 => }/rocsolver/default.nix | 4 +- .../{6 => }/rocsparse/default.nix | 4 +- .../rocm-modules/{6 => }/rocsparse/deps.nix | 0 .../{6 => }/rocthrust/default.nix | 4 +- .../{6 => }/roctracer/default.nix | 4 +- .../rocwmma/0000-dont-fetch-googletest.patch | 0 .../rocm-modules/{6 => }/rocwmma/default.nix | 4 +- .../rocm-modules/{6 => }/rpp/default.nix | 4 +- .../rocm-modules/{6 => }/tensile/default.nix | 8 +- ...ensile-create-library-dont-copy-twice.diff | 0 .../tensile-solutionstructs-perf-fix.diff | 0 .../rocm-modules/{6 => }/update.nix | 6 +- pkgs/top-level/all-packages.nix | 3 +- 98 files changed, 259 insertions(+), 616 deletions(-) create mode 100644 pkgs/by-name/ma/magma/magma-hipblas-v2-buildflags.patch delete mode 100644 pkgs/development/rocm-modules/6/composable_kernel/avoid-extra-host-compile.patch delete mode 100644 pkgs/development/rocm-modules/6/hipcc/0001-hipcc-Remove-extra-definition-of-hipBinUtilPtr_-in-d.patch delete mode 100644 pkgs/development/rocm-modules/6/rccl/enable-mscclpp-on-all-gfx9.diff delete mode 100644 pkgs/development/rocm-modules/6/rccl/fix-mainline-support-and-ub.diff delete mode 100644 pkgs/development/rocm-modules/6/rocm-smi/cmake.patch rename pkgs/development/rocm-modules/{6 => }/amdsmi/default.nix (88%) rename pkgs/development/rocm-modules/{6 => }/aotriton/default.nix (100%) rename pkgs/development/rocm-modules/{6 => }/aqlprofile/default.nix (96%) rename pkgs/development/rocm-modules/{6 => }/clr/cmake-find-x11-libgl.patch (100%) rename pkgs/development/rocm-modules/{6 => }/clr/default.nix (88%) rename pkgs/development/rocm-modules/{6 => }/clr/test-opencl-example.nix (97%) rename pkgs/development/rocm-modules/{6 => }/clr/test-rocm-smi.nix (91%) rename pkgs/development/rocm-modules/{6 => }/composable_kernel/base.nix (80%) rename pkgs/development/rocm-modules/{6 => }/composable_kernel/ck4inductor.nix (98%) rename pkgs/development/rocm-modules/{6 => }/composable_kernel/default.nix (90%) rename pkgs/development/rocm-modules/{6 => }/default.nix (99%) rename pkgs/development/rocm-modules/{6 => }/half/default.nix (89%) rename pkgs/development/rocm-modules/{6 => }/hip-common/default.nix (90%) rename pkgs/development/rocm-modules/{6 => }/hipblas-common/default.nix (90%) rename pkgs/development/rocm-modules/{6 => }/hipblas/default.nix (83%) rename pkgs/development/rocm-modules/{6 => }/hipblaslt/Tensile-interning.patch (100%) rename pkgs/development/rocm-modules/{6 => }/hipblaslt/TensileCreateLibrary-refactor.patch (100%) rename pkgs/development/rocm-modules/{6 => }/hipblaslt/default.nix (99%) rename pkgs/development/rocm-modules/{6 => }/hipblaslt/messagepack-compression-support.patch (100%) rename pkgs/development/rocm-modules/{6 => }/hipblaslt/parallel-buildSourceCodeObjectFile.diff (100%) rename pkgs/development/rocm-modules/{6 => }/hipcc/default.nix (84%) rename pkgs/development/rocm-modules/{6 => }/hipcub/default.nix (95%) rename pkgs/development/rocm-modules/{6 => }/hipfft/default.nix (96%) rename pkgs/development/rocm-modules/{6 => }/hipfort/default.nix (95%) rename pkgs/development/rocm-modules/{6 => }/hipify/default.nix (88%) rename pkgs/development/rocm-modules/{6 => }/hiprand/default.nix (94%) rename pkgs/development/rocm-modules/{6 => }/hiprt/default.nix (100%) rename pkgs/development/rocm-modules/{6 => }/hipsolver/default.nix (96%) rename pkgs/development/rocm-modules/{6 => }/hipsparse/default.nix (98%) rename pkgs/development/rocm-modules/{6 => }/llvm/clang-bodge-ignore-systemwide-incls.diff (100%) rename pkgs/development/rocm-modules/{6 => }/llvm/clang-log-jobs.diff (100%) rename pkgs/development/rocm-modules/{6 => }/llvm/default.nix (90%) rename pkgs/development/rocm-modules/{6 => }/llvm/opt-offload-compress-on-by-default.patch (100%) rename pkgs/development/rocm-modules/{6 => }/llvm/perf-increase-namestring-size.patch (100%) rename pkgs/development/rocm-modules/{6 => }/llvm/perf-shorten-gcclib-include-paths.patch (100%) rename pkgs/development/rocm-modules/{6 => }/migraphx/default.nix (92%) rename pkgs/development/rocm-modules/{6 => }/migraphx/msgpack-6-compat.patch (100%) rename pkgs/development/rocm-modules/{6 => }/miopen/default.nix (98%) rename pkgs/development/rocm-modules/{6 => }/miopen/skip-preexisting-dbs.patch (100%) rename pkgs/development/rocm-modules/{6 => }/miopen/test-frugally-deep-model-loading.cpp (100%) rename pkgs/development/rocm-modules/{6 => }/miopen/test-frugally-deep-model-loading.nix (100%) rename pkgs/development/rocm-modules/{6 => }/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch (100%) rename pkgs/development/rocm-modules/{6 => }/mivisionx/default.nix (97%) rename pkgs/development/rocm-modules/{6 => }/mscclpp/default.nix (100%) rename pkgs/development/rocm-modules/{6 => }/rccl/default.nix (96%) rename pkgs/development/rocm-modules/{6 => }/rccl/fix_hw_reg_hw_id_gt_gfx10.patch (100%) rename pkgs/development/rocm-modules/{6 => }/rccl/rccl-test-missing-iomanip.diff (100%) rename pkgs/development/rocm-modules/{6 => }/rdc/default.nix (97%) rename pkgs/development/rocm-modules/{6 => }/release-attrPaths-gen.nix (100%) rename pkgs/development/rocm-modules/{6 => }/release-attrPaths-gen.sh (100%) rename pkgs/development/rocm-modules/{6 => }/release-attrPaths.json (100%) rename pkgs/development/rocm-modules/{6 => }/rocalution/default.nix (96%) rename pkgs/development/rocm-modules/{6 => }/rocblas/default.nix (89%) rename pkgs/development/rocm-modules/{6 => }/rocblas/hiplaslt-unstable-compat.patch (100%) rename pkgs/development/rocm-modules/{6 => }/rocdbgapi/default.nix (96%) rename pkgs/development/rocm-modules/{6 => }/rocfft/default.nix (97%) rename pkgs/development/rocm-modules/{6 => }/rocfft/log-every-n-aot-jobs.patch (100%) rename pkgs/development/rocm-modules/{6 => }/rocgdb/default.nix (96%) rename pkgs/development/rocm-modules/{6 => }/rocm-bandwidth-test/default.nix (100%) rename pkgs/development/rocm-modules/{6 => }/rocm-cmake/default.nix (89%) rename pkgs/development/rocm-modules/{6 => }/rocm-comgr/default.nix (100%) rename pkgs/development/rocm-modules/{6 => }/rocm-core/default.nix (97%) rename pkgs/development/rocm-modules/{6 => }/rocm-core/env-rocm-path.patch (100%) rename pkgs/development/rocm-modules/{6 => }/rocm-device-libs/cmake.patch (100%) rename pkgs/development/rocm-modules/{6 => }/rocm-device-libs/default.nix (100%) rename pkgs/development/rocm-modules/{6 => }/rocm-docs-core/default.nix (100%) rename pkgs/development/rocm-modules/{6 => }/rocm-runtime/default.nix (83%) rename pkgs/development/rocm-modules/{6 => }/rocm-runtime/remove-hsa-aqlprofile-dep.patch (100%) rename pkgs/development/rocm-modules/{6 => }/rocm-smi/default.nix (93%) rename pkgs/development/rocm-modules/{6 => }/rocm-tests/default.nix (100%) rename pkgs/development/rocm-modules/{6 => }/rocminfo/default.nix (92%) rename pkgs/development/rocm-modules/{6 => }/rocmlir/default.nix (97%) rename pkgs/development/rocm-modules/{6 => }/rocprim/default.nix (95%) rename pkgs/development/rocm-modules/{6 => }/rocprofiler-register/default.nix (84%) rename pkgs/development/rocm-modules/{6 => }/rocprofiler/default.nix (97%) rename pkgs/development/rocm-modules/{6 => }/rocr-debug-agent/default.nix (85%) rename pkgs/development/rocm-modules/{6 => }/rocrand/default.nix (95%) rename pkgs/development/rocm-modules/{6 => }/rocsolver/default.nix (97%) rename pkgs/development/rocm-modules/{6 => }/rocsparse/default.nix (98%) rename pkgs/development/rocm-modules/{6 => }/rocsparse/deps.nix (100%) rename pkgs/development/rocm-modules/{6 => }/rocthrust/default.nix (95%) rename pkgs/development/rocm-modules/{6 => }/roctracer/default.nix (96%) rename pkgs/development/rocm-modules/{6 => }/rocwmma/0000-dont-fetch-googletest.patch (100%) rename pkgs/development/rocm-modules/{6 => }/rocwmma/default.nix (96%) rename pkgs/development/rocm-modules/{6 => }/rpp/default.nix (95%) rename pkgs/development/rocm-modules/{6 => }/tensile/default.nix (87%) rename pkgs/development/rocm-modules/{6 => }/tensile/tensile-create-library-dont-copy-twice.diff (100%) rename pkgs/development/rocm-modules/{6 => }/tensile/tensile-solutionstructs-perf-fix.diff (100%) rename pkgs/development/rocm-modules/{6 => }/update.nix (85%) diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 534bc7a9a09a..fa13d6c7c4f6 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -67,6 +67,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh - `services.cgit` before always had the git-http-backend and its "export all" setting enabled, which sidestepped any access control configured in cgit's settings. Now you have to make a decision and either enable or disable `services.cgit.gitHttpBackend.checkExportOkFiles` (or disable the git-http-backend). +- `rocmPackages_6` has been removed. `rocmPackages` has been updated to ROCm 7.x. Out of tree packages may rely on obsolete hipblas APIs or compile time constant warp size and need to be updated. + - The Bash implementation of the `nixos-rebuild` program is removed. All switchable systems now use the Python rewrite. Any prior usage of `system.rebuild.enableNg` must now be removed. If you have any outstanding issues with the new implementation, please open an issue on GitHub. - `services.desktopManager.gnome` no longer installs the Geary e-mail client since it is not part of the GNOME [core applications](https://apps.gnome.org/) list. Geary's position in the default favorite apps section has been replaced by GNOME Text Editor. To keep it installed, add `programs.geary.enable = true;` to your configuration. diff --git a/pkgs/by-name/ma/magma/magma-hipblas-v2-buildflags.patch b/pkgs/by-name/ma/magma/magma-hipblas-v2-buildflags.patch new file mode 100644 index 000000000000..0fd6dc80997e --- /dev/null +++ b/pkgs/by-name/ma/magma/magma-hipblas-v2-buildflags.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc61af7..b2b594e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -303,7 +303,7 @@ if (MAGMA_ENABLE_HIP) + set(GPU_ARCH_FLAGS ${DEVCCFLAGS}) + + #add_compile_options(${GPU_ARCH_FLAGS}) +- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__HIP_PLATFORM_AMD__" ) ++ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__HIP_PLATFORM_AMD__ -DHIPBLAS_V2" ) + option(ROCM_CORE "Location of the rocm-core package") + execute_process(COMMAND "${CMAKE_SOURCE_DIR}/tools/get-rocm-version.sh" "${ROCM_CORE}" OUTPUT_VARIABLE ROCM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) + message(STATUS "ROCM_VERSION=${ROCM_VERSION}") +diff --git a/Makefile b/Makefile +index 44880ab..afaab45 100644 +--- a/Makefile ++++ b/Makefile +@@ -846,7 +846,7 @@ ifeq ($(BACKEND),cuda) + d_ext := cu + else ifeq ($(BACKEND),hip) + d_ext := cpp +-CXXFLAGS += -D__HIP_PLATFORM_AMD__ ++CXXFLAGS += -D__HIP_PLATFORM_AMD__ -DHIPBLAS_V2 + CXXFLAGS += -DROCM_VERSION=$(shell ./tools/get-rocm-version.sh) + endif + diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix index 8c1876cc75cd..9aac8699c4c9 100644 --- a/pkgs/by-name/ma/magma/package.nix +++ b/pkgs/by-name/ma/magma/package.nix @@ -4,8 +4,8 @@ cmake, cudaPackages, cudaSupport ? config.cudaSupport, + fetchFromGitHub, fetchpatch, - fetchurl, gfortran, gpuTargets ? [ ], # Non-CUDA targets, that is HIP rocmPackages, @@ -13,6 +13,7 @@ lib, libpthreadstubs, ninja, + perl, python3, config, # At least one back-end has to be enabled, @@ -115,9 +116,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "magma"; version = "2.9.0"; - src = fetchurl { - url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${finalAttrs.version}.tar.gz"; - hash = "sha256-/3f9Nyaz3+w7+1V5CwZICqXMOEOWwts1xW/a5KgsZBw="; + src = fetchFromGitHub { + owner = "icl-utk-edu"; + repo = "magma"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZV50id9qiCrc1K87812Lvv1tmeU/6vhpxFCz8nj61wM="; }; # Magma doesn't have anything which could be run under doCheck, but it does build test suite executables. @@ -134,6 +137,24 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/icl-utk-edu/magma/commit/2fecaf3f0c811344363f713669c1fe30f6879acd.patch"; hash = "sha256-Dfzq2gqoLSByCLWV5xvY/lXZeVa/yQ67lDSoIAa9jUU="; }) + ] + ++ lib.optionals rocmSupport [ + # TODO: Drop both these patches on next magma release + (fetchpatch { + # ROCm 7.0 compat: use HIPBLAS_V2 types and APIs + # Requires building from git w/ make generate call. If applied to release tarball + # pre-generated hipified code will remain unpatched + name = "magma-ROCm-7.0-compat.patch"; + url = "https://github.com/icl-utk-edu/magma/commit/02ecee0ccc56cce85194fdda18c9e0614797b2f9.patch"; + hash = "sha256-vm58X30ZR02sOMsKrvxEcEF27tJYuuyZZrz+GGFNz5Q="; + excludes = [ + "testing/testing_ztrsv_batched.cpp" + "CMakeLists.txt" + "Makefile" + ]; + }) + # Vendored patch with CMakeLists.txt and Makefile hunks from above commit (context differs) + ./magma-hipblas-v2-buildflags.patch ]; postPatch = '' @@ -147,12 +168,25 @@ stdenv.mkDerivation (finalAttrs: { autoPatchelfHook cmake ninja + perl # for make generate gfortran ] ++ lists.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + # README Step 0: generate precision variants and CMake.src.{hip|cuda} when building from git + # GPU_TARGET is a dummy value; CMake vars control target selection and `make generate` + # does not use the target setting, but the main makefile errors without it + preConfigure = '' + cat > make.inc < -Date: Wed, 9 Jul 2025 03:12:39 +0000 -Subject: [PATCH] Avoid compile kernel in host pass - ---- - include/ck_tile/host/kernel_launch.hpp | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/include/ck_tile/host/kernel_launch.hpp b/include/ck_tile/host/kernel_launch.hpp -index 9770e99738..f6ccb6968b 100644 ---- a/include/ck_tile/host/kernel_launch.hpp -+++ b/include/ck_tile/host/kernel_launch.hpp -@@ -4,11 +4,12 @@ - #pragma once - - #include "ck_tile/core/config.hpp" --#include "ck_tile/host/stream_config.hpp" -+#include "ck_tile/core/utility/ignore.hpp" - #include "ck_tile/host/hip_check_error.hpp" -+#include "ck_tile/host/stream_config.hpp" - #include "ck_tile/host/timer.hpp" --#include - #include -+#include - - namespace ck_tile { - -@@ -24,7 +25,11 @@ __launch_bounds__(MaxThreadPerBlock, MinBlockPerCu) - #endif - __global__ void kentry(Args... args) - { -+#if defined(__HIP_DEVICE_COMPILE__) - Kernel{}(args...); -+#else -+ (..., (ignore = args, 0)); -+#endif - } - - // diff --git a/pkgs/development/rocm-modules/6/hipcc/0001-hipcc-Remove-extra-definition-of-hipBinUtilPtr_-in-d.patch b/pkgs/development/rocm-modules/6/hipcc/0001-hipcc-Remove-extra-definition-of-hipBinUtilPtr_-in-d.patch deleted file mode 100644 index bfc386c620cb..000000000000 --- a/pkgs/development/rocm-modules/6/hipcc/0001-hipcc-Remove-extra-definition-of-hipBinUtilPtr_-in-d.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f259eca77c592813e11752a46c4e1f9a74c64091 Mon Sep 17 00:00:00 2001 -From: Luna Nova -Date: Fri, 11 Oct 2024 02:56:22 -0700 -Subject: [PATCH] [hipcc] Remove extra definition of hipBinUtilPtr_ in derived - platforms - -Fixes UB when hipBinUtilPtr_ is used. ---- - amd/hipcc/src/hipBin_amd.h | 1 - - amd/hipcc/src/hipBin_nvidia.h | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/amd/hipcc/src/hipBin_amd.h b/amd/hipcc/src/hipBin_amd.h -index 0a782d1beab9..36cd625ae8bc 100644 ---- a/src/hipBin_amd.h -+++ b/src/hipBin_amd.h -@@ -42,7 +42,6 @@ THE SOFTWARE. - - class HipBinAmd : public HipBinBase { - private: -- HipBinUtil* hipBinUtilPtr_; - string hipClangPath_ = ""; - string roccmPathEnv_, hipRocclrPathEnv_, hsaPathEnv_; - PlatformInfo platformInfoAMD_; -diff --git a/amd/hipcc/src/hipBin_nvidia.h b/amd/hipcc/src/hipBin_nvidia.h -index ff142cc1cea2..09b7b80979c7 100644 ---- a/src/hipBin_nvidia.h -+++ b/src/hipBin_nvidia.h -@@ -31,7 +31,6 @@ THE SOFTWARE. - - class HipBinNvidia : public HipBinBase { - private: -- HipBinUtil* hipBinUtilPtr_; - string cudaPath_ = ""; - PlatformInfo platformInfoNV_; - string hipCFlags_, hipCXXFlags_, hipLdFlags_; --- -2.46.0 - diff --git a/pkgs/development/rocm-modules/6/rccl/enable-mscclpp-on-all-gfx9.diff b/pkgs/development/rocm-modules/6/rccl/enable-mscclpp-on-all-gfx9.diff deleted file mode 100644 index 6fc375921064..000000000000 --- a/pkgs/development/rocm-modules/6/rccl/enable-mscclpp-on-all-gfx9.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/init.cc b/src/init.cc -index 738f756..1b0e4fc 100644 ---- a/src/init.cc -+++ b/src/init.cc -@@ -2049,7 +2049,7 @@ static ncclResult_t ncclCommInitRankFunc(struct ncclAsyncJob* job_) { - if (mscclEnabled() && (comm->topo->mscclEnabled || mscclForceEnabled()) && mscclppCommCompatible(comm)) { - hipDeviceProp_t devProp; - CUDACHECK(hipGetDeviceProperties(&devProp, cudaDev)); -- comm->mscclppCompatible = IsArchMatch(devProp.gcnArchName, "gfx94"); -+ comm->mscclppCompatible = IsArchMatch(devProp.gcnArchName, "gfx9"); - if (comm->mscclppCompatible) { - bool mapContainsId = (mscclpp_uniqueIdMap.count(job->commId) > 0); - auto& mscclppUniqueId = mscclpp_uniqueIdMap[job->commId]; diff --git a/pkgs/development/rocm-modules/6/rccl/fix-mainline-support-and-ub.diff b/pkgs/development/rocm-modules/6/rccl/fix-mainline-support-and-ub.diff deleted file mode 100644 index e65b23940c4c..000000000000 --- a/pkgs/development/rocm-modules/6/rccl/fix-mainline-support-and-ub.diff +++ /dev/null @@ -1,172 +0,0 @@ -diff --git a/src/include/bootstrap.h b/src/include/bootstrap.h -index 8c5f081..9922b79 100644 ---- a/src/include/bootstrap.h -+++ b/src/include/bootstrap.h -@@ -10,11 +10,13 @@ - #include "nccl.h" - #include "comm.h" - -+// this is accessed through unaligned ptrs because ncclUniqueId is a typedef of char[128] - struct ncclBootstrapHandle { - uint64_t magic; - union ncclSocketAddress addr; - }; - static_assert(sizeof(struct ncclBootstrapHandle) <= sizeof(ncclUniqueId), "Bootstrap handle is too large to fit inside NCCL unique ID"); -+static_assert(alignof(struct ncclBootstrapHandle) == alignof(ncclUniqueId), "Bootstrap handle must have same alignment as NCCL unique ID to avoid UB"); - - ncclResult_t bootstrapNetInit(); - ncclResult_t bootstrapCreateRoot(struct ncclBootstrapHandle* handle, bool idFromEnv); -diff --git a/src/misc/rocmwrap.cc b/src/misc/rocmwrap.cc -index b3063d5..464b80d 100644 ---- a/src/misc/rocmwrap.cc -+++ b/src/misc/rocmwrap.cc -@@ -131,9 +131,12 @@ static void initOnceFunc() { - //format and store the kernel conf file location - snprintf(kernel_conf_file, sizeof(kernel_conf_file), "/boot/config-%s", utsname.release); - fp = fopen(kernel_conf_file, "r"); -- if (fp == NULL) INFO(NCCL_INIT,"Could not open kernel conf file"); -+ if (fp == NULL) { -+ INFO(NCCL_INIT,"Could not open kernel conf file, will assume CONFIG_DMABUF_MOVE_NOTIFY and CONFIG_PCI_P2PDMA are enabled"); -+ } - //look for kernel_opt1 and kernel_opt2 in the conf file and check -- while (fgets(buf, sizeof(buf), fp) != NULL) { -+ // FIXME: This check is broken, CONFIG_DMABUF_MOVE_NOTIFY could be across a buf boundary. -+ while (fp && fgets(buf, sizeof(buf), fp) != NULL) { - if (strstr(buf, kernel_opt1) != NULL) { - found_opt1 = 1; - INFO(NCCL_INIT,"CONFIG_DMABUF_MOVE_NOTIFY=y in /boot/config-%s", utsname.release); -@@ -143,11 +146,12 @@ static void initOnceFunc() { - INFO(NCCL_INIT,"CONFIG_PCI_P2PDMA=y in /boot/config-%s", utsname.release); - } - } -- if (!found_opt1 || !found_opt2) { -+ if (fp && (!found_opt1 || !found_opt2)) { - dmaBufSupport = 0; - INFO(NCCL_INIT, "CONFIG_DMABUF_MOVE_NOTIFY and CONFIG_PCI_P2PDMA should be set for DMA_BUF in /boot/config-%s", utsname.release); - INFO(NCCL_INIT, "DMA_BUF_SUPPORT Failed due to OS kernel support"); - } -+ if (fp) fclose(fp); - - if(dmaBufSupport) INFO(NCCL_INIT, "DMA_BUF Support Enabled"); - else goto error; -diff --git a/src/nccl.h.in b/src/nccl.h.in -index 1d127b0..6296073 100644 ---- a/src/nccl.h.in -+++ b/src/nccl.h.in -@@ -39,7 +39,7 @@ typedef struct ncclComm* ncclComm_t; - #define NCCL_UNIQUE_ID_BYTES 128 - /*! @brief Opaque unique id used to initialize communicators - @details The ncclUniqueId must be passed to all participating ranks */ --typedef struct { char internal[NCCL_UNIQUE_ID_BYTES]; /*!< Opaque array>*/} ncclUniqueId; -+typedef struct alignas(int64_t) { char internal[NCCL_UNIQUE_ID_BYTES]; /*!< Opaque array>*/} ncclUniqueId; - - /*! @defgroup rccl_result_code Result Codes - @details The various result codes that RCCL API calls may return -diff --git a/src/proxy.cc b/src/proxy.cc -index 50e5437..51bb401 100644 ---- a/src/proxy.cc -+++ b/src/proxy.cc -@@ -965,7 +965,11 @@ struct ncclProxyConnectionPool { - - static ncclResult_t ncclProxyNewConnection(struct ncclProxyConnectionPool* pool, int* id) { - if (pool->offset == NCCL_PROXY_CONN_POOL_SIZE) { -- NCCLCHECK(ncclRealloc(&pool->pools, pool->banks, pool->banks+1)); -+ if (pool->pools) { -+ NCCLCHECK(ncclRealloc(&pool->pools, pool->banks, pool->banks+1)); -+ } else { -+ NCCLCHECK(ncclCalloc(&pool->pools, pool->banks+1)); -+ } - NCCLCHECK(ncclCalloc(pool->pools+pool->banks, NCCL_PROXY_CONN_POOL_SIZE)); - pool->banks++; - pool->offset = 0; -diff --git a/src/transport/net_ib.cc b/src/transport/net_ib.cc -index 6d77784..49762d3 100644 ---- a/src/transport/net_ib.cc -+++ b/src/transport/net_ib.cc -@@ -573,7 +573,7 @@ ncclResult_t ncclIbGdrSupport() { - // Requires support from NIC driver modules - // Use ONLY for debugging! - moduleLoaded = 1; -- INFO(NCCL_INIT, "RCCL_FORCE_ENABLE_GDRDMA = 1, so explicitly setting moduleLoaded = 1"); -+ INFO(NCCL_INIT, "ncclIbGdrSupport: RCCL_FORCE_ENABLE_GDRDMA = 1, so explicitly setting moduleLoaded = 1"); - } - - if (moduleLoaded == -1) { -@@ -586,9 +586,9 @@ ncclResult_t ncclIbGdrSupport() { - int i = 0; - - while (memory_peers_paths[i]) { - if (access(memory_peers_paths[i], F_OK) == 0) { - moduleLoaded = 1; -- INFO(NCCL_INIT,"Found %s", memory_peers_paths[i]); -+ INFO(NCCL_INIT,"ncclIbGdrSupport: Found %s", memory_peers_paths[i]); - break; - } else { - moduleLoaded = 0; -@@ -612,22 +613,23 @@ ncclResult_t ncclIbGdrSupport() { - if (moduleLoaded == 0) { - // Check for `ib_register_peer_memory_client` symbol in `/proc/kallsyms` - // if your system uses native OS ib_peer module -- char buf[256]; -- FILE *fp = NULL; -- fp = fopen("/proc/kallsyms", "r"); -+ FILE *fp = fopen("/proc/kallsyms", "r"); -+ char *line = NULL; -+ size_t len = 0; - - if (fp == NULL) { -- INFO(NCCL_INIT,"Could not open /proc/kallsyms"); -+ INFO(NCCL_INIT,"ncclIbGdrSupport: Could not open /proc/kallsyms to check for ib_register_peer_memory_client"); - } else { -- while (fgets(buf, sizeof(buf), fp) != NULL) { -- if (strstr(buf, "t ib_register_peer_memory_client") != NULL || -- strstr(buf, "T ib_register_peer_memory_client") != NULL) { -+ while (getline(&line, &len, fp) > 0) { -+ if (line && strstr(line, "ib_register_peer_memory_client") != NULL) { - moduleLoaded = 1; -- INFO(NCCL_INIT,"Found ib_register_peer_memory_client in /proc/kallsyms"); -+ INFO(NCCL_INIT,"ncclIbGdrSupport: Found ib_register_peer_memory_client in /proc/kallsyms"); - break; - } - } - } -+ if (line) free(line); -+ if (fp) fclose(fp); - } - #else - // Check for the nv_peer_mem module being loaded -@@ -637,7 +639,7 @@ ncclResult_t ncclIbGdrSupport() { - #endif - } - if (moduleLoaded == 0) { -- INFO(NCCL_INIT,"GDRDMA not enabled. Could not find memory_peers directory or peer_memory symbol"); -+ INFO(NCCL_INIT,"ncclIbGdrSupport: GDRDMA not enabled. Could not find memory_peers directory or peer_memory symbol"); - return ncclSystemError; - } - return ncclSuccess; -diff --git a/tools/ib-test/include/nccl.h b/tools/ib-test/include/nccl.h -index 2c86c33..5801c61 100755 ---- a/tools/ib-test/include/nccl.h -+++ b/tools/ib-test/include/nccl.h -@@ -31,7 +31,7 @@ extern "C" { - typedef struct ncclComm* ncclComm_t; - - #define NCCL_UNIQUE_ID_BYTES 128 --typedef struct { char internal[NCCL_UNIQUE_ID_BYTES]; } ncclUniqueId; -+typedef struct alignas(int64_t) { char internal[NCCL_UNIQUE_ID_BYTES]; } ncclUniqueId; - - /* Error type */ - typedef enum { ncclSuccess = 0, -diff --git a/tools/topo_expl/include/nccl.h b/tools/topo_expl/include/nccl.h -index 729561b..4e4bdd9 100644 ---- a/tools/topo_expl/include/nccl.h -+++ b/tools/topo_expl/include/nccl.h -@@ -35,7 +35,7 @@ typedef struct ncclComm* ncclComm_t; - #define NCCL_COMM_NULL NULL - - #define NCCL_UNIQUE_ID_BYTES 128 --typedef struct { char internal[NCCL_UNIQUE_ID_BYTES]; } ncclUniqueId; -+typedef struct alignas(int64_t) { char internal[NCCL_UNIQUE_ID_BYTES]; } ncclUniqueId; - - /*! @brief Error type */ - typedef enum { ncclSuccess = 0, diff --git a/pkgs/development/rocm-modules/6/rocm-smi/cmake.patch b/pkgs/development/rocm-modules/6/rocm-smi/cmake.patch deleted file mode 100644 index 2634ea46a1f8..000000000000 --- a/pkgs/development/rocm-modules/6/rocm-smi/cmake.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/rocm_smi-backward-compat.cmake b/rocm_smi-backward-compat.cmake -index aa8fd9c..59afce5 100644 ---- a/rocm_smi-backward-compat.cmake -+++ b/rocm_smi-backward-compat.cmake -@@ -72,7 +72,12 @@ function(generate_wrapper_header) - set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H") - #set #include statement - get_filename_component(file_name ${header_file} NAME) -- set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${ROCM_SMI}/${file_name}\"\n") -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) -+ set(include_dir "${CMAKE_INSTALL_INCLUDEDIR}") -+ else() -+ set(include_dir "../../../${CMAKE_INSTALL_INCLUDEDIR}") -+ endif() -+ set(include_statements "${include_statements}#include \"${include_dir}/${ROCM_SMI}/${file_name}\"\n") - configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${RSMI_WRAPPER_INC_DIR}/${file_name}) - unset(include_guard) - unset(include_statements) -@@ -90,7 +95,12 @@ function(generate_wrapper_header) - set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H") - #set #include statement - get_filename_component(file_name ${header_file} NAME) -- set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${OAM_TARGET_NAME}/${file_name}\"\n") -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) -+ set(include_dir "${CMAKE_INSTALL_INCLUDEDIR}") -+ else() -+ set(include_dir "../../../${CMAKE_INSTALL_INCLUDEDIR}") -+ endif() -+ set(include_statements "${include_statements}#include \"${include_dir}/${OAM_TARGET_NAME}/${file_name}\"\n") - configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${OAM_WRAPPER_INC_DIR}/${file_name}) - unset(include_guard) - unset(include_statements) -@@ -123,11 +133,16 @@ function(create_library_symlink) - set(library_files "${LIB_RSMI}") - endif() - -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) -+ set(install_libdir "${CMAKE_INSTALL_LIBDIR}") -+ else() -+ set(install_libdir "../../${CMAKE_INSTALL_LIBDIR}") -+ endif() - foreach(file_name ${library_files}) - add_custom_target(link_${file_name} ALL - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E create_symlink -- ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${RSMI_WRAPPER_LIB_DIR}/${file_name}) -+ ${install_libdir}/${file_name} ${RSMI_WRAPPER_LIB_DIR}/${file_name}) - endforeach() - - file(MAKE_DIRECTORY ${OAM_WRAPPER_LIB_DIR}) -@@ -151,11 +166,16 @@ function(create_library_symlink) - set(library_files "${LIB_OAM}") - endif() - -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) -+ set(install_libdir "${CMAKE_INSTALL_LIBDIR}") -+ else() -+ set(install_libdir "../../${CMAKE_INSTALL_LIBDIR}") -+ endif() - foreach(file_name ${library_files}) - add_custom_target(link_${file_name} ALL - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E create_symlink -- ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${OAM_WRAPPER_LIB_DIR}/${file_name}) -+ ${install_libdir}/${file_name} ${OAM_WRAPPER_LIB_DIR}/${file_name}) - endforeach() - - endfunction() -diff --git a/rocm_smi/CMakeLists.txt b/rocm_smi/CMakeLists.txt -index c594eeb..d3ed39d 100755 ---- a/rocm_smi/CMakeLists.txt -+++ b/rocm_smi/CMakeLists.txt -@@ -105,10 +105,15 @@ endif () - #file reorganization changes - #rocm_smi.py moved to libexec/rocm_smi. so creating rocm-smi symlink - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) -+if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBEXECDIR}) -+ set(install_libexecdir "${CMAKE_INSTALL_LIBEXECDIR}") -+else() -+ set(install_libexecdir "../${CMAKE_INSTALL_LIBEXECDIR}") -+endif() - add_custom_target(link-rocm-smi ALL - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E create_symlink -- ../${CMAKE_INSTALL_LIBEXECDIR}/${ROCM_SMI}/rocm_smi.py ${CMAKE_CURRENT_BINARY_DIR}/bin/rocm-smi) -+ ${install_libexecdir}/${ROCM_SMI}/rocm_smi.py ${CMAKE_CURRENT_BINARY_DIR}/bin/rocm-smi) - - ## Add the install directives for the runtime library. - install(TARGETS ${ROCM_SMI_TARGET} diff --git a/pkgs/development/rocm-modules/6/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix similarity index 88% rename from pkgs/development/rocm-modules/6/amdsmi/default.nix rename to pkgs/development/rocm-modules/amdsmi/default.nix index df9125aa40c8..692aecccf620 100644 --- a/pkgs/development/rocm-modules/6/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/amdsmi/default.nix @@ -21,12 +21,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amdsmi"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "rocm"; repo = "amdsmi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-9O29O4HGkQxFDglAhHKv5KWA7p97RwMGG2x/fkOS2jE="; + hash = "sha256-66xcdMRcKYyseS+xOt4NPDa2cK4ASAlS6zB5/LUoq9A="; }; postPatch = '' @@ -43,11 +43,6 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = [ - (fetchpatch { - name = "esmi-to-tag-4.2.patch"; - url = "https://github.com/ROCm/amdsmi/commit/49aa2af045a4bc688e6f3ee0545f12afc45c1efe.patch"; - hash = "sha256-5dH9N4m+2mJIGVEB86SvdK3uAYyGFTfbCBJ8e09iQ3w="; - }) (fetchpatch { name = "fix-build-with-gcc15.patch"; url = "https://github.com/ROCm/amdsmi/commit/902667db3cafe72e2009287cb96b160854ab9d81.patch"; diff --git a/pkgs/development/rocm-modules/6/aotriton/default.nix b/pkgs/development/rocm-modules/aotriton/default.nix similarity index 100% rename from pkgs/development/rocm-modules/6/aotriton/default.nix rename to pkgs/development/rocm-modules/aotriton/default.nix diff --git a/pkgs/development/rocm-modules/6/aqlprofile/default.nix b/pkgs/development/rocm-modules/aqlprofile/default.nix similarity index 96% rename from pkgs/development/rocm-modules/6/aqlprofile/default.nix rename to pkgs/development/rocm-modules/aqlprofile/default.nix index d44da400200f..f73fa4760473 100644 --- a/pkgs/development/rocm-modules/6/aqlprofile/default.nix +++ b/pkgs/development/rocm-modules/aqlprofile/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { # pinned to oddly named tag for now owner = "ROCm"; repo = "aqlprofile"; - tag = "rocm-42"; + tag = "rocm-7.0.1"; hash = "sha256-avL78ZfB+rJ1TYaejSUzU6i5L9JeMawMwIxaTQINQdE="; }; diff --git a/pkgs/development/rocm-modules/6/clr/cmake-find-x11-libgl.patch b/pkgs/development/rocm-modules/clr/cmake-find-x11-libgl.patch similarity index 100% rename from pkgs/development/rocm-modules/6/clr/cmake-find-x11-libgl.patch rename to pkgs/development/rocm-modules/clr/cmake-find-x11-libgl.patch diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix similarity index 88% rename from pkgs/development/rocm-modules/6/clr/default.nix rename to pkgs/development/rocm-modules/clr/default.nix index 4b0fad82e7ef..7fbf7710d3ed 100644 --- a/pkgs/development/rocm-modules/6/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -70,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clr"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "clr"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-DOAAuC9TN1//v56GXyUMJwQHgOuctC+WsC5agrgL+QM="; + hash = "sha256-z7qmL7c/0zlB5/rb7zporfeUPM9KIkS1iZf6GmYFxbo="; }; nativeBuildInputs = [ @@ -148,24 +148,13 @@ stdenv.mkDerivation (finalAttrs: { ./cmake-find-x11-libgl.patch (fetchpatch { # [PATCH] improve rocclr isa compatibility check - sha256 = "sha256-oj1loBEuqzuMihOKoN0wR92Wo25AshN5MpBuTq/9TMw="; - url = "https://github.com/GZGavinZhao/clr/commit/f675b9b46d9f7bb8e003f4f47f616fa86a0b7a5e.patch"; + sha256 = "sha256-/QpB3Wqdhcq6lzyO/zOWzwQC0oYpesCICxnVx5CqbWg="; + url = "https://github.com/GZGavinZhao/clr/commit/733ee38ef8ad5c84926970981821f446dfcb00af.patch"; }) (fetchpatch { # [PATCH] improve hipamd isa compatibility check - sha256 = "sha256-E3ERoVjUVWCiYHuE1GaVY5jMrAVx3B1cAVHM4/HPuaQ="; - url = "https://github.com/GZGavinZhao/clr/commit/aec0fc56ee2d10a2bc269c418fa847da2ee9969a.patch"; - }) - (fetchpatch { - # [PATCH] SWDEV-507104 - Removes alignment requirement for Semaphore class to resolve runtime misaligned memory issues - sha256 = "sha256-nStJ22B/CM0fzQTvYjbHDbQt0GlE8DXxVK+UDU9BAx4="; - url = "https://github.com/ROCm/clr/commit/21d764518363d74187deaef2e66c1a127bc5aa64.patch"; - }) - (fetchpatch { - # CMake 4 compat - # [PATCH] SWDEV-509213 - make cmake_minimum_required consistent across clr - url = "https://github.com/ROCm/clr/commit/fcaefe97b862afe12aaac0147f1004e6dc595fce.patch"; - hash = "sha256-hRZXbASbIOOETe+T4mDyyiRWLXd6RDKRieN2ns1w/rs="; + sha256 = "sha256-FvZInw8PqB68ePxAGu45cWT/whD1xmprIA5wZb5OLcE="; + url = "https://github.com/GZGavinZhao/clr/commit/1f0b54ee9b0de08f4dc8cd38b6728928b180048a.patch"; }) ]; @@ -198,7 +187,7 @@ stdenv.mkDerivation (finalAttrs: { cp ${amdclang}/bin/* $out/bin/ cp ${amdclangxx}/bin/* $out/bin/ - for prog in hip{cc,config}{,.pl}; do + for prog in hip{cc,config}; do wrapProgram $out/bin/$prog ${lib.concatStringsSep " " wrapperArgs} done diff --git a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/clr/test-opencl-example.nix similarity index 97% rename from pkgs/development/rocm-modules/6/clr/test-opencl-example.nix rename to pkgs/development/rocm-modules/clr/test-opencl-example.nix index c09093946c67..34b97755a7bf 100644 --- a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/clr/test-opencl-example.nix @@ -61,7 +61,7 @@ let in makeImpureTest { name = "opencl-example"; - testedPackage = "rocmPackages_6.clr"; + testedPackage = "rocmPackages.clr"; sandboxPaths = [ "/sys" diff --git a/pkgs/development/rocm-modules/6/clr/test-rocm-smi.nix b/pkgs/development/rocm-modules/clr/test-rocm-smi.nix similarity index 91% rename from pkgs/development/rocm-modules/6/clr/test-rocm-smi.nix rename to pkgs/development/rocm-modules/clr/test-rocm-smi.nix index acdbc1928d35..e03655907c7b 100644 --- a/pkgs/development/rocm-modules/6/clr/test-rocm-smi.nix +++ b/pkgs/development/rocm-modules/clr/test-rocm-smi.nix @@ -8,7 +8,7 @@ makeImpureTest { name = "rocm-smi"; - testedPackage = "rocmPackages_6.clr"; + testedPackage = "rocmPackages.clr"; nativeBuildInputs = [ clinfo rocm-smi diff --git a/pkgs/development/rocm-modules/6/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix similarity index 80% rename from pkgs/development/rocm-modules/6/composable_kernel/base.nix rename to pkgs/development/rocm-modules/composable_kernel/base.nix index 60127e37eadc..6c9604be5b31 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/composable_kernel/base.nix @@ -15,6 +15,11 @@ zstd, buildTests ? false, buildExamples ? false, + # limits prebuilt kernel selection to those needed for MIOPEN (currently "*conv*") + # Other kernels can still be used if treating CK as a header only library + # and building specific instances, as done with ck4inductor/torch + miOpenReqLibsOnly ? true, + withDeprecatedKernels ? false, gpuTargets ? ( clr.localGpuTargets or [ "gfx900" @@ -22,20 +27,14 @@ "gfx908" "gfx90a" "gfx942" - "gfx1030" - "gfx1100" - "gfx1101" - "gfx1102" - "gfx1200" - "gfx1201" + "gfx950" + "gfx10-3-generic" + "gfx11-generic" + "gfx12-generic" ] ), }: -# TODO: in 7.x CK is likely to gain support for -# a) miopen kernel only build (MIOPEN_REQ_LIBS_ONLY) -# b) header only build (useful for torch) https://github.com/ROCm/composable_kernel/issues/2030 -# that will likely allow us to get rid of this complicated split part build! stdenv.mkDerivation (finalAttrs: { preBuild = '' echo "This derivation isn't intended to be built directly and only exists to be overridden and built in chunks"; @@ -43,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ''; pname = "composable_kernel_base"; - version = "6.4-unstable-2025-05-22"; + version = "7.0.1"; outputs = [ "out" @@ -58,9 +57,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; repo = "composable_kernel"; - # Using a dev snapshot, trying to get MIOpen to work - rev = "bc2551ac3b27edc31f20863e3a873508fb73aad2"; - hash = "sha256-bfmwbgR1ya+zkME3wOyaZX/e+1+ie0sSlugK/kozLsI="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-Wql7PD3kg85AFXn7UaTKxhURyDPfVe/OUbR+udrqDc8="; }; nativeBuildInputs = [ @@ -87,10 +85,14 @@ stdenv.mkDerivation (finalAttrs: { env.ROCM_PATH = clr; cmakeFlags = [ + (lib.cmakeBool "MIOPEN_REQ_LIBS_ONLY" miOpenReqLibsOnly) + (lib.cmakeBool "BUILD_MHA_LIB" (!miOpenReqLibsOnly)) + (lib.cmakeBool "DISABLE_DL_KERNELS" true) + (lib.cmakeBool "DISABLE_DPP_KERNELS" true) + (lib.cmakeBool "CK_TIME_KERNEL" false) "-DCMAKE_MODULE_PATH=${clr}/hip/cmake" - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW" - # "-DDL_KERNELS=ON" # Not needed, slow to build + "-DDL_KERNELS=OFF" # CK_USE_CODEGEN Required for migraphx which uses device_gemm_multiple_d.hpp # but migraphx requires an incompatible fork of CK and fails anyway # "-DCK_USE_CODEGEN=ON" @@ -122,11 +124,6 @@ stdenv.mkDerivation (finalAttrs: { "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names ]; - patches = [ - # Significant build performance improvement - ./avoid-extra-host-compile.patch - ]; - # No flags to build selectively it seems... postPatch = # Reduce configure time by preventing thousands of clang-tidy targets being added @@ -139,12 +136,10 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "add_subdirectory(profiler)" "" substituteInPlace cmake/EnableCompilerWarnings.cmake \ --replace-fail "-Werror" "" - - # Apply equivalent change to https://github.com/ROCm/composable_kernel/pull/2564 - # TODO: Remove after ROCm 7.1 - find include/ck/tensor_operation/ -type f -name "*.hpp" -exec sed -i \ - -e 's/!defined(__HIP_DEVICE_COMPILE__)/false/g' \ - {} + + '' + + lib.optionalString (!withDeprecatedKernels) '' + substituteInPlace include/ck/ck.hpp \ + --replace-fail "CK_BUILD_DEPRECATED 1" "CK_BUILD_DEPRECATED 0" '' # Optionally remove tests + lib.optionalString (!buildTests) '' @@ -170,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - inherit gpuTargets; + inherit gpuTargets miOpenReqLibsOnly; updateScript = rocmUpdateScript { name = finalAttrs.pname; inherit (finalAttrs.src) owner; diff --git a/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix similarity index 98% rename from pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix rename to pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix index 8d12893d2b27..428daae27fa5 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix +++ b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix @@ -14,7 +14,7 @@ buildPythonPackage { setuptools setuptools-scm ]; - version = "6.4.3"; + version = "7.0"; inherit (composable_kernel) src; pythonImportsCheck = [ "ck4inductor" diff --git a/pkgs/development/rocm-modules/6/composable_kernel/default.nix b/pkgs/development/rocm-modules/composable_kernel/default.nix similarity index 90% rename from pkgs/development/rocm-modules/6/composable_kernel/default.nix rename to pkgs/development/rocm-modules/composable_kernel/default.nix index 42c634f0aa94..0a9dac5db87a 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/composable_kernel/default.nix @@ -5,8 +5,10 @@ }: let + inherit (composable_kernel_base) miOpenReqLibsOnly; parts = { _mha = { + enabled = !miOpenReqLibsOnly; # mha takes ~3hrs on 64 cores on an EPYC milan system at ~2.5GHz # big-parallel builders are one gen newer and clocked ~30% higher but only 24 cores # Should be <10h timeout but might be cutting it close @@ -20,6 +22,7 @@ let extraCmakeFlags = [ "-DHIP_CLANG_NUM_PARALLEL_JOBS=2" ]; }; gemm_multiply_multiply = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_multiply_multiply_instance" ]; @@ -30,6 +33,7 @@ let ]; }; gemm_multiply_multiply_wp = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_multiply_multiply_wp_instance" ]; @@ -50,7 +54,8 @@ let targets = [ "device_grouped_conv1d_fwd_instance" "device_grouped_conv2d_fwd_instance" - "device_grouped_conv2d_fwd_bias_relu_instance" + "device_grouped_conv2d_fwd_bias_clamp_instance" + "device_grouped_conv2d_fwd_clamp_instance" "device_grouped_conv2d_fwd_dynamic_op_instance" ]; }; @@ -71,7 +76,8 @@ let grouped_conv_fwd_3d1 = { targets = [ "device_grouped_conv3d_fwd_instance" - "device_grouped_conv3d_fwd_bias_relu_instance" + "device_grouped_conv3d_fwd_clamp_instance" + "device_grouped_conv3d_fwd_bias_clamp_instance" "device_grouped_conv3d_fwd_bilinear_instance" "device_grouped_conv3d_fwd_convinvscale_instance" "device_grouped_conv3d_fwd_convscale_instance" @@ -87,7 +93,13 @@ let "device_grouped_conv3d_fwd_scaleadd_scaleadd_relu_instance" ]; }; + grouped_conv_fwd_nd = { + targets = [ + "device_grouped_convnd_bwd_weight_instance" + ]; + }; batched_gemm1 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_batched_gemm_instance" "device_batched_gemm_b_scale_instance" @@ -100,6 +112,7 @@ let ]; }; batched_gemm2 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_batched_gemm_softmax_gemm_permute_instance" "device_grouped_gemm_instance" @@ -111,18 +124,21 @@ let ]; }; gemm_universal1 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_universal_instance" "device_gemm_universal_batched_instance" ]; }; gemm_universal2 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_universal_reduce_instance" "device_gemm_universal_streamk_instance" ]; }; gemm_other1 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_instance" "device_gemm_b_scale_instance" @@ -135,6 +151,7 @@ let ]; }; gemm_other2 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_add_relu_add_layernorm_instance" "device_gemm_add_silu_instance" @@ -159,6 +176,7 @@ let ]; }; pool = { + enabled = !miOpenReqLibsOnly; targets = [ "device_avg_pool2d_bwd_instance" "device_avg_pool3d_bwd_instance" @@ -167,7 +185,13 @@ let "device_max_pool_bwd_instance" ]; }; + other0 = { + targets = [ + "device_quantization_instance" + ]; + }; other1 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_batchnorm_instance" "device_contraction_bilinear_instance" @@ -177,15 +201,16 @@ let ]; }; other2 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_column_to_image_instance" "device_image_to_column_instance" "device_permute_scale_instance" - "device_quantization_instance" "device_reduce_instance" ]; }; other3 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_normalization_bwd_data_instance" "device_normalization_bwd_gamma_beta_instance" @@ -201,11 +226,13 @@ let targets, extraCmakeFlags ? [ ], requiredSystemFeatures ? [ "big-parallel" ], + enabled ? true, onlyFor ? [ ], }: let supported = - onlyFor == [ ] || (lib.lists.intersectLists composable_kernel_base.gpuTargets onlyFor) != [ ]; + enabled + && (onlyFor == [ ] || (lib.lists.intersectLists composable_kernel_base.gpuTargets onlyFor) != [ ]); in if supported then (composable_kernel_base.overrideAttrs (old: { diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/default.nix similarity index 99% rename from pkgs/development/rocm-modules/6/default.nix rename to pkgs/development/rocm-modules/default.nix index 44454b36958a..cf9e9815eb83 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/default.nix @@ -213,6 +213,7 @@ let ucx = prev.ucx.override { enableCuda = false; enableRocm = true; + rocmPackages = self; }; in { diff --git a/pkgs/development/rocm-modules/6/half/default.nix b/pkgs/development/rocm-modules/half/default.nix similarity index 89% rename from pkgs/development/rocm-modules/6/half/default.nix rename to pkgs/development/rocm-modules/half/default.nix index ca3a3ab58f17..204fd730105e 100644 --- a/pkgs/development/rocm-modules/6/half/default.nix +++ b/pkgs/development/rocm-modules/half/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "half"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "half"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-H8Ogm4nxaxDB0WHx+KhRjUO3vzp3AwCqrIQ6k8R+xkc="; + hash = "sha256-If9O5BEeymsLN+C0drZsPSxEWXpJTxeDBGNHNXSumm4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hip-common/default.nix b/pkgs/development/rocm-modules/hip-common/default.nix similarity index 90% rename from pkgs/development/rocm-modules/6/hip-common/default.nix rename to pkgs/development/rocm-modules/hip-common/default.nix index b915e0b93827..59abcd935032 100644 --- a/pkgs/development/rocm-modules/6/hip-common/default.nix +++ b/pkgs/development/rocm-modules/hip-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hip-common"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "HIP"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-B4Gc119iff3ak9tmpz3rUJBtCk5T1AA8z67K9PshTLQ="; + hash = "sha256-aKR87SZftt5sLuj/TOgwcdg+CZON0Jr2BpPvqA02lw4="; }; dontConfigure = true; diff --git a/pkgs/development/rocm-modules/6/hipblas-common/default.nix b/pkgs/development/rocm-modules/hipblas-common/default.nix similarity index 90% rename from pkgs/development/rocm-modules/6/hipblas-common/default.nix rename to pkgs/development/rocm-modules/hipblas-common/default.nix index 20dc26075c5d..e04581b0f831 100644 --- a/pkgs/development/rocm-modules/6/hipblas-common/default.nix +++ b/pkgs/development/rocm-modules/hipblas-common/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hipblas-common"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "hipBLAS-common"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-eTwoAXH2HGdSAOLTZHJUFHF+c2wWHixqeMqr60KxJrc="; + hash = "sha256-NXSMVtfjei4vIjU9y4o3Px/fplq7C7ziY1R8YqnY2LQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipblas/default.nix b/pkgs/development/rocm-modules/hipblas/default.nix similarity index 83% rename from pkgs/development/rocm-modules/6/hipblas/default.nix rename to pkgs/development/rocm-modules/hipblas/default.nix index e27185ef5b4b..0374630ae61c 100644 --- a/pkgs/development/rocm-modules/6/hipblas/default.nix +++ b/pkgs/development/rocm-modules/hipblas/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, rocmUpdateScript, cmake, rocm-cmake, @@ -25,7 +24,7 @@ # Can also use cuBLAS stdenv.mkDerivation (finalAttrs: { pname = "hipblas"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -44,19 +43,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-lQv8Ik6+0ldqyeJ05CSGB0309nIpzlRL3CRYeQxVfd0="; + hash = "sha256-4y+VPhYikPytY1pXRrhbARh33yEmQDZfVET70Be8e4Q="; }; - patches = [ - (fetchpatch { - # Subject: [PATCH] Add gfx1150, gfx1150, gfx1200, gfx1201 support (#1055) - # This was merged to release/rocm-rel-6.4 but AMD forgot to tag it for 6.4.3 - name = "release-6.4-arch-extra.patch"; - url = "https://github.com/ROCm/hipBLAS/commit/0100b32ccff9a0f12134694315b4e44884e25a8e.patch"; - hash = "sha256-BmktlLJpYaTcogHzEKpZdCnksIIysEO47WMezXoxvCs="; - }) - ]; - postPatch = '' substituteInPlace library/CMakeLists.txt \ --replace-fail "find_package(Git REQUIRED)" "" diff --git a/pkgs/development/rocm-modules/6/hipblaslt/Tensile-interning.patch b/pkgs/development/rocm-modules/hipblaslt/Tensile-interning.patch similarity index 100% rename from pkgs/development/rocm-modules/6/hipblaslt/Tensile-interning.patch rename to pkgs/development/rocm-modules/hipblaslt/Tensile-interning.patch diff --git a/pkgs/development/rocm-modules/6/hipblaslt/TensileCreateLibrary-refactor.patch b/pkgs/development/rocm-modules/hipblaslt/TensileCreateLibrary-refactor.patch similarity index 100% rename from pkgs/development/rocm-modules/6/hipblaslt/TensileCreateLibrary-refactor.patch rename to pkgs/development/rocm-modules/hipblaslt/TensileCreateLibrary-refactor.patch diff --git a/pkgs/development/rocm-modules/6/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix similarity index 99% rename from pkgs/development/rocm-modules/6/hipblaslt/default.nix rename to pkgs/development/rocm-modules/hipblaslt/default.nix index 2c6c5679f817..44a0028a4b3e 100644 --- a/pkgs/development/rocm-modules/6/hipblaslt/default.nix +++ b/pkgs/development/rocm-modules/hipblaslt/default.nix @@ -70,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hipblaslt${clr.gpuArchSuffix}"; - version = "6.5-unstable-2025-08-21"; + version = "7.0-unstable-2025-08-21"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/6/hipblaslt/messagepack-compression-support.patch b/pkgs/development/rocm-modules/hipblaslt/messagepack-compression-support.patch similarity index 100% rename from pkgs/development/rocm-modules/6/hipblaslt/messagepack-compression-support.patch rename to pkgs/development/rocm-modules/hipblaslt/messagepack-compression-support.patch diff --git a/pkgs/development/rocm-modules/6/hipblaslt/parallel-buildSourceCodeObjectFile.diff b/pkgs/development/rocm-modules/hipblaslt/parallel-buildSourceCodeObjectFile.diff similarity index 100% rename from pkgs/development/rocm-modules/6/hipblaslt/parallel-buildSourceCodeObjectFile.diff rename to pkgs/development/rocm-modules/hipblaslt/parallel-buildSourceCodeObjectFile.diff diff --git a/pkgs/development/rocm-modules/6/hipcc/default.nix b/pkgs/development/rocm-modules/hipcc/default.nix similarity index 84% rename from pkgs/development/rocm-modules/6/hipcc/default.nix rename to pkgs/development/rocm-modules/hipcc/default.nix index 1ed7dd6f4271..ac8ab20eb637 100644 --- a/pkgs/development/rocm-modules/6/hipcc/default.nix +++ b/pkgs/development/rocm-modules/hipcc/default.nix @@ -23,12 +23,6 @@ stdenv.mkDerivation (finalAttrs: { llvm.clang-unwrapped ]; - patches = [ - # https://github.com/ROCm/llvm-project/pull/183 - # Fixes always-invoked UB in hipcc - ./0001-hipcc-Remove-extra-definition-of-hipBinUtilPtr_-in-d.patch - ]; - postPatch = '' substituteInPlace src/hipBin_amd.h \ --replace-fail "/usr/bin/lsb_release" "${lsb-release}/bin/lsb_release" diff --git a/pkgs/development/rocm-modules/6/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix similarity index 95% rename from pkgs/development/rocm-modules/6/hipcub/default.nix rename to pkgs/development/rocm-modules/hipcub/default.nix index 6348947d8433..00f45df98bdf 100644 --- a/pkgs/development/rocm-modules/6/hipcub/default.nix +++ b/pkgs/development/rocm-modules/hipcub/default.nix @@ -17,7 +17,7 @@ # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipCUB"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-yRJxhYFZYiKNR2xrn5fif/+vjHKKcKdn0JKPi972g+0="; + hash = "sha256-Vx9h/DTZo7RfQrflVwXOCKiA7rt6dQQw/P/bllgtq8w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix similarity index 96% rename from pkgs/development/rocm-modules/6/hipfft/default.nix rename to pkgs/development/rocm-modules/hipfft/default.nix index 449c9e7c1dc6..e7a4a0a7b7b5 100644 --- a/pkgs/development/rocm-modules/6/hipfft/default.nix +++ b/pkgs/development/rocm-modules/hipfft/default.nix @@ -21,7 +21,7 @@ # Can also use cuFFT stdenv.mkDerivation (finalAttrs: { pname = "hipfft"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-4W93OOKTqNteoQ4GKycr06cjvGy5NF7RR08F+rfn+0o="; + hash = "sha256-dbmCPzvz+xnvAWn610HCvmGzzLEq1IPhX78lJgY87bg="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/6/hipfort/default.nix b/pkgs/development/rocm-modules/hipfort/default.nix similarity index 95% rename from pkgs/development/rocm-modules/6/hipfort/default.nix rename to pkgs/development/rocm-modules/hipfort/default.nix index 7e86a1b0ef12..fe87494b2e48 100644 --- a/pkgs/development/rocm-modules/6/hipfort/default.nix +++ b/pkgs/development/rocm-modules/hipfort/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "hipfort"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Nks1+0X8bLtZ9HqZXJOtrAWQlJquMH+feuu1stf/9Vo="; + hash = "sha256-s/VOaU5IKZYH0Vhtjl/UZTrnpLsJ7zWFTvAJY2x3AcA="; }; patches = [ diff --git a/pkgs/development/rocm-modules/6/hipify/default.nix b/pkgs/development/rocm-modules/hipify/default.nix similarity index 88% rename from pkgs/development/rocm-modules/6/hipify/default.nix rename to pkgs/development/rocm-modules/hipify/default.nix index 15a436814ef0..e27714f20f77 100644 --- a/pkgs/development/rocm-modules/6/hipify/default.nix +++ b/pkgs/development/rocm-modules/hipify/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipify"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "HIPIFY"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-uj25WmGCpwouS1yzW9Oil5Vyrbyj5yRITvWF9WaGozM="; + hash = "sha256-xcWUYfZvbTHs4BvDiXAOLONfLiCq9uEGOHSK/hOWg7c="; }; strictDeps = true; @@ -52,10 +52,12 @@ stdenv.mkDerivation (finalAttrs: { }; postInstall = '' + rm $out/bin/hipify-perl chmod +x $out/bin/* chmod +x $out/libexec/* patchShebangs $out/bin/ patchShebangs $out/libexec/ + ln -s $out/{libexec/hipify,bin}/hipify-perl ''; meta = { diff --git a/pkgs/development/rocm-modules/6/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix similarity index 94% rename from pkgs/development/rocm-modules/6/hiprand/default.nix rename to pkgs/development/rocm-modules/hiprand/default.nix index d72e86b5ef08..49f0ddb41d6c 100644 --- a/pkgs/development/rocm-modules/6/hiprand/default.nix +++ b/pkgs/development/rocm-modules/hiprand/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiprand"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-f/AWDV7vkjt8BnjhLwT2m1Y6dlZy054+z6J0UW9Glg8="; + hash = "sha256-yOLdFQ4/OGGfX75A/ElY1xD+4nkcqT8tZx2bQZgXTx4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hiprt/default.nix b/pkgs/development/rocm-modules/hiprt/default.nix similarity index 100% rename from pkgs/development/rocm-modules/6/hiprt/default.nix rename to pkgs/development/rocm-modules/hiprt/default.nix diff --git a/pkgs/development/rocm-modules/6/hipsolver/default.nix b/pkgs/development/rocm-modules/hipsolver/default.nix similarity index 96% rename from pkgs/development/rocm-modules/6/hipsolver/default.nix rename to pkgs/development/rocm-modules/hipsolver/default.nix index b5f8395be608..028f7e2f5f79 100644 --- a/pkgs/development/rocm-modules/6/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/hipsolver/default.nix @@ -21,7 +21,7 @@ # Can also use cuSOLVER stdenv.mkDerivation (finalAttrs: { pname = "hipsolver"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-YP88fSM27Do0/tZ676Pvv2tr+lnlQa4vr3UnVNaVpLA="; + hash = "sha256-IZAVdu+VpSrJ/EZXymOzvrGnRLBpxUgVeaj1U+ux02M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix similarity index 98% rename from pkgs/development/rocm-modules/6/hipsparse/default.nix rename to pkgs/development/rocm-modules/hipsparse/default.nix index cf96ecfd234e..61ec88a48f5d 100644 --- a/pkgs/development/rocm-modules/6/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/hipsparse/default.nix @@ -19,7 +19,7 @@ # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-fbh9fKlzxuIBTeCV/bEQbUS3lO6O3KoGF7/tTqRaCpE="; + hash = "sha256-hfC+QsOfDNKIZROgTZZsGbAG0yghc27PyVwCDr8MEJ8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/llvm/clang-bodge-ignore-systemwide-incls.diff b/pkgs/development/rocm-modules/llvm/clang-bodge-ignore-systemwide-incls.diff similarity index 100% rename from pkgs/development/rocm-modules/6/llvm/clang-bodge-ignore-systemwide-incls.diff rename to pkgs/development/rocm-modules/llvm/clang-bodge-ignore-systemwide-incls.diff diff --git a/pkgs/development/rocm-modules/6/llvm/clang-log-jobs.diff b/pkgs/development/rocm-modules/llvm/clang-log-jobs.diff similarity index 100% rename from pkgs/development/rocm-modules/6/llvm/clang-log-jobs.diff rename to pkgs/development/rocm-modules/llvm/clang-log-jobs.diff diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/llvm/default.nix similarity index 90% rename from pkgs/development/rocm-modules/6/llvm/default.nix rename to pkgs/development/rocm-modules/llvm/default.nix index c4ee2ce75d10..744b343f6ecf 100644 --- a/pkgs/development/rocm-modules/6/llvm/default.nix +++ b/pkgs/development/rocm-modules/llvm/default.nix @@ -2,7 +2,7 @@ lib, stdenv, # LLVM version closest to ROCm fork to override - llvmPackages_19, + llvmPackages_20, overrideCC, lndir, rocm-device-libs, @@ -11,7 +11,6 @@ symlinkJoin, rdfind, zstd, - zlib, gcc-unwrapped, glibc, replaceVars, @@ -34,12 +33,12 @@ }: let - version = "6.4.3"; + version = "7.0.1"; # major version of this should be the clang version ROCm forked from - rocmLlvmVersion = "19.0.0-rocm"; + rocmLlvmVersion = "20.0.0-rocm"; # llvmPackages_base version should match rocmLlvmVersion # so libllvm's bitcode is compatible with the built toolchain - llvmPackages_base = llvmPackages_19; + llvmPackages_base = llvmPackages_20; llvmPackagesNoBintools = llvmPackages_base.override { bootBintools = null; bootBintoolsNoLibc = null; @@ -116,7 +115,7 @@ let owner = "ROCm"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-12ftH5fMPAsbcEBmhADwW1YY/Yxo/MAK1FafKczITMg="; + hash = "sha256-C6QTDKqjeqExxgBtlCEZmgsEir1uFijgmvKCA/32+/A="; }; llvmMajorVersion = lib.versions.major rocmLlvmVersion; # An llvmPackages (pkgs/development/compilers/llvm/) built from ROCm LLVM's source tree @@ -229,9 +228,8 @@ let commonCmakeFlags = [ llvmTargetsFlag # Compression support is required for compressed offload kernels - # Set FORCE_ON so that failure to find the compression libs will be a build error + # Set FORCE_ON so that failure to find the compression lib will be a build error (lib.cmakeFeature "LLVM_ENABLE_ZSTD" "FORCE_ON") - (lib.cmakeFeature "LLVM_ENABLE_ZLIB" "FORCE_ON") # required for threaded ThinLTO to work (lib.cmakeBool "LLVM_ENABLE_THREADS" true) # LLVM tries to call git to embed VCS info if FORCE_VC_ aren't set @@ -271,6 +269,7 @@ let "-g1" ] ); + inherit (llvmPackagesRocm) libcxx; in overrideLlvmPackagesRocm (s: { libllvm = (s.prev.libllvm.override { }).overrideAttrs (old: { @@ -282,13 +281,6 @@ overrideLlvmPackagesRocm (s: { hash = "sha256-yly93PvGIXOnFeDGZ2W+W6SyhdWFM6iwA+qOeaptrh0="; relative = "llvm"; }) - (fetchpatch { - # fix tools/llvm-exegesis/X86/latency/ failing with glibc 2.4+ - name = "exegesis-latency-glibc-fix.patch"; - sha256 = "sha256-CjKxQlYwHXTM0mVnv8k/ssg5OXuKpJxRvBZGXjrFZAg="; - url = "https://github.com/llvm/llvm-project/commit/1e8df9e85a1ff213e5868bd822877695f27504ad.patch"; - relative = "llvm"; - }) ./perf-increase-namestring-size.patch # TODO: consider reapplying "Don't include aliases in RegisterClassInfo::IgnoreCSRForAllocOrder" # it was reverted as it's a pessimization for non-GPU archs, but this compiler @@ -299,7 +291,6 @@ overrideLlvmPackagesRocm (s: { nativeBuildInputs = old.nativeBuildInputs ++ [ removeReferencesTo ]; buildInputs = old.buildInputs ++ [ zstd - zlib ]; preFixup = '' moveToOutput "lib/lib*.a" "$dev" @@ -329,7 +320,6 @@ overrideLlvmPackagesRocm (s: { ]; buildInputs = old.buildInputs ++ [ zstd - zlib ]; env = (old.env or { }) // { NIX_CFLAGS_COMPILE = "${(old.env or { }).NIX_CFLAGS_COMPILE or ""} ${llvmExtraCflags}"; @@ -351,25 +341,7 @@ overrideLlvmPackagesRocm (s: { passthru = old.passthru // { inherit gcc-prefix; }; - patches = [ - (fetchpatch { - # [PATCH] [clang] Install scan-build-py into plain "lib" directory - # Backported so 19/clang/gnu-install-dirs patch applies to AMD's LLVM fork - hash = "sha256-bOqAjBwRKcERpQkiBpuojGs6ddd5Ht3zL5l3TuJK2w8="; - url = "https://github.com/llvm/llvm-project/commit/816fde1cbb700ebcc8b3df81fb93d675c04c12cd.patch"; - relative = "clang"; - }) - (fetchpatch { - # [PATCH] Reapply "[CUDA][HIP] Add a __device__ version of std::__glibcxx_assert_fail()" - # Fix errors with gcc15 - # https://github.com/ROCm/composable_kernel/issues/2887 - hash = "sha256-liowyS6FTsDhH8mJYXsanK7GEIlXFhd68GRDf/7Y6gg="; - url = "https://github.com/llvm/llvm-project/commit/8ec0552a7f1f50986dda6d13eae310d121d7e3ba.patch"; - relative = "clang"; - }) - ] - ++ old.patches - ++ [ + patches = old.patches ++ [ # Never add FHS include paths ./clang-bodge-ignore-systemwide-incls.diff # Prevents builds timing out if a single compiler invocation is very slow but @@ -383,6 +355,14 @@ overrideLlvmPackagesRocm (s: { url = "https://github.com/GZGavinZhao/rocm-llvm-project/commit/6d296f879b0fed830c54b2a9d26240da86c8bb3a.patch"; relative = "clang"; }) + (fetchpatch { + # [PATCH] Reapply "[CUDA][HIP] Add a __device__ version of std::__glibcxx_assert_fail()" + # Fix errors with gcc15 + # https://github.com/ROCm/composable_kernel/issues/2887 + hash = "sha256-liowyS6FTsDhH8mJYXsanK7GEIlXFhd68GRDf/7Y6gg="; + url = "https://github.com/llvm/llvm-project/commit/8ec0552a7f1f50986dda6d13eae310d121d7e3ba.patch"; + relative = "clang"; + }) ]; hardeningDisable = [ "all" ]; nativeBuildInputs = old.nativeBuildInputs ++ [ @@ -390,7 +370,6 @@ overrideLlvmPackagesRocm (s: { ]; buildInputs = old.buildInputs ++ [ zstd - zlib ]; env = (old.env or { }) // { NIX_CFLAGS_COMPILE = "${(old.env or { }).NIX_CFLAGS_COMPILE or ""} ${llvmExtraCflags}"; @@ -465,20 +444,6 @@ overrideLlvmPackagesRocm (s: { isGNU = false; }; compiler-rt-libc = s.prev.compiler-rt-libc.overrideAttrs (old: { - patches = old.patches ++ [ - (fetchpatch { - name = "Fix-missing-main-function-in-float16-bfloat16-support-checks.patch"; - url = "https://github.com/ROCm/llvm-project/commit/68d8b3846ab1e6550910f2a9a685690eee558af2.patch"; - hash = "sha256-Db+L1HFMWVj4CrofsGbn5lnMoCzEcU+7q12KKFb17/g="; - relative = "compiler-rt"; - }) - (fetchpatch { - # Fixes fortify hardening compile error related to openat usage - hash = "sha256-pgpN1q1vIQrPXHPxNSZ6zfgV2EflHO5Amzl+2BDjXbs="; - url = "https://github.com/llvm/llvm-project/commit/155b7a12820ec45095988b6aa6e057afaf2bc892.patch"; - relative = "compiler-rt"; - }) - ]; meta = old.meta // llvmMeta; }); compiler-rt = s.final.compiler-rt-libc; @@ -509,11 +474,14 @@ overrideLlvmPackagesRocm (s: { ]; buildInputs = old.buildInputs ++ [ clang-unwrapped - zlib zstd libxml2 libffi ]; + postFixup = '' + ${old.postFixup or ""} + ln -s $out/lib/libomp.so $dev/lib/libomp.so + ''; }); # AMD has a separate MLIR impl which we package under rocmPackages.rocmlir # It would be an error to rely on the original mlir package from this scope diff --git a/pkgs/development/rocm-modules/6/llvm/opt-offload-compress-on-by-default.patch b/pkgs/development/rocm-modules/llvm/opt-offload-compress-on-by-default.patch similarity index 100% rename from pkgs/development/rocm-modules/6/llvm/opt-offload-compress-on-by-default.patch rename to pkgs/development/rocm-modules/llvm/opt-offload-compress-on-by-default.patch diff --git a/pkgs/development/rocm-modules/6/llvm/perf-increase-namestring-size.patch b/pkgs/development/rocm-modules/llvm/perf-increase-namestring-size.patch similarity index 100% rename from pkgs/development/rocm-modules/6/llvm/perf-increase-namestring-size.patch rename to pkgs/development/rocm-modules/llvm/perf-increase-namestring-size.patch diff --git a/pkgs/development/rocm-modules/6/llvm/perf-shorten-gcclib-include-paths.patch b/pkgs/development/rocm-modules/llvm/perf-shorten-gcclib-include-paths.patch similarity index 100% rename from pkgs/development/rocm-modules/6/llvm/perf-shorten-gcclib-include-paths.patch rename to pkgs/development/rocm-modules/llvm/perf-shorten-gcclib-include-paths.patch diff --git a/pkgs/development/rocm-modules/6/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix similarity index 92% rename from pkgs/development/rocm-modules/6/migraphx/default.nix rename to pkgs/development/rocm-modules/migraphx/default.nix index 98ebed7c916c..e29766663ef3 100644 --- a/pkgs/development/rocm-modules/6/migraphx/default.nix +++ b/pkgs/development/rocm-modules/migraphx/default.nix @@ -59,7 +59,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "migraphx"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -75,17 +75,11 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-8iOBoRBygTvn9eX5f9cG0kBHKgKSeflqHkV6Qwh/ruA="; + hash = "sha256-P2qbj2yocmYDDgujlUVEdyqv3b+yF0RemA+Nt76KCdQ="; }; patches = [ ./msgpack-6-compat.patch - # Backport "Add quantize_bf16 to C api output" - # Required for onnxruntime 1.23+ - (fetchpatch { - url = "https://github.com/ROCm/AMDMIGraphX/commit/f33afac654dfc4558f4d9867c2d28a2d98cf49b4.patch"; - hash = "sha256-5O4UanmyhQ9Te830SISaquM4TdG/gEY3wfWSaU/cS30="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/migraphx/msgpack-6-compat.patch b/pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch similarity index 100% rename from pkgs/development/rocm-modules/6/migraphx/msgpack-6-compat.patch rename to pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix similarity index 98% rename from pkgs/development/rocm-modules/6/miopen/default.nix rename to pkgs/development/rocm-modules/miopen/default.nix index a4b00cc2a744..0a484fdd50a2 100644 --- a/pkgs/development/rocm-modules/6/miopen/default.nix +++ b/pkgs/development/rocm-modules/miopen/default.nix @@ -37,13 +37,13 @@ gpuTargets ? clr.localGpuTargets or clr.gpuTargets, buildDocs ? false, # Needs internet because of rocm-docs-core buildTests ? false, - withComposableKernel ? composable_kernel.anyMfmaTarget, + withComposableKernel ? true, }: let # FIXME: cmake files need patched to include this properly cFlags = "-Wno-documentation-pedantic --offload-compress -I${hipblas-common}/include -I${hipblas}/include -I${roctracer}/include -I${nlohmann_json}/include -I${sqlite.dev}/include -I${rocrand}/include"; - version = "6.4.3"; + version = "7.0.1"; # Targets outside this list will get # error: use of undeclared identifier 'CK_BUFFER_RESOURCE_3RD_DWORD' @@ -69,7 +69,7 @@ let owner = "ROCm"; repo = "MIOpen"; rev = "rocm-${version}"; - hash = "sha256-DEcVj2vOwIYYyNKEKFqZ0fb9o+/QRpwiSksxwnmgEMc="; + hash = "sha256-PJj2LzU5naAku+FOnMl+Ymad2beYYSS81/K/CR+l2UA="; fetchLFS = true; fetchSubmodules = true; # WORKAROUND: .lfsconfig is incorrectly set to exclude everything upstream diff --git a/pkgs/development/rocm-modules/6/miopen/skip-preexisting-dbs.patch b/pkgs/development/rocm-modules/miopen/skip-preexisting-dbs.patch similarity index 100% rename from pkgs/development/rocm-modules/6/miopen/skip-preexisting-dbs.patch rename to pkgs/development/rocm-modules/miopen/skip-preexisting-dbs.patch diff --git a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.cpp b/pkgs/development/rocm-modules/miopen/test-frugally-deep-model-loading.cpp similarity index 100% rename from pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.cpp rename to pkgs/development/rocm-modules/miopen/test-frugally-deep-model-loading.cpp diff --git a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix b/pkgs/development/rocm-modules/miopen/test-frugally-deep-model-loading.nix similarity index 100% rename from pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix rename to pkgs/development/rocm-modules/miopen/test-frugally-deep-model-loading.nix diff --git a/pkgs/development/rocm-modules/6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch b/pkgs/development/rocm-modules/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch similarity index 100% rename from pkgs/development/rocm-modules/6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch rename to pkgs/development/rocm-modules/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch diff --git a/pkgs/development/rocm-modules/6/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix similarity index 97% rename from pkgs/development/rocm-modules/6/mivisionx/default.nix rename to pkgs/development/rocm-modules/mivisionx/default.nix index fd0f16ec05f6..20f6e31007df 100644 --- a/pkgs/development/rocm-modules/6/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/mivisionx/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "MIVisionX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-07MivgCYmKLnhGDjOYsFBfwIxEoQLYNoRbOo3MPpVzE="; + hash = "sha256-SO0rE86UmX9f574ALdnnBDFceKGKTvJDQ8Lf7iSlJtA="; }; patches = [ diff --git a/pkgs/development/rocm-modules/6/mscclpp/default.nix b/pkgs/development/rocm-modules/mscclpp/default.nix similarity index 100% rename from pkgs/development/rocm-modules/6/mscclpp/default.nix rename to pkgs/development/rocm-modules/mscclpp/default.nix diff --git a/pkgs/development/rocm-modules/6/rccl/default.nix b/pkgs/development/rocm-modules/rccl/default.nix similarity index 96% rename from pkgs/development/rocm-modules/6/rccl/default.nix rename to pkgs/development/rocm-modules/rccl/default.nix index af55ded29c50..f7a0a7951104 100644 --- a/pkgs/development/rocm-modules/6/rccl/default.nix +++ b/pkgs/development/rocm-modules/rccl/default.nix @@ -13,6 +13,7 @@ perl, hipify, python3, + fmt, gtest, chrpath, roctracer, @@ -39,7 +40,7 @@ in # infiniband ib_peer_mem support isn't in the mainline kernel but is carried by some distros stdenv.mkDerivation (finalAttrs: { pname = "rccl${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -49,8 +50,6 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - ./fix-mainline-support-and-ub.diff - ./enable-mscclpp-on-all-gfx9.diff ./rccl-test-missing-iomanip.diff ./fix_hw_reg_hw_id_gt_gfx10.patch ]; @@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-XpD+UjgdbAoGYK5UvvTX3f8rny4tiEDH/vYoCdZhtjo="; + hash = "sha256-ASU+RB0Fhb1E8zZR3wLzbnLoigXWH3aNWirViRDdkw0="; }; nativeBuildInputs = [ @@ -75,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ rocm-smi + fmt gtest roctracer rocprofiler diff --git a/pkgs/development/rocm-modules/6/rccl/fix_hw_reg_hw_id_gt_gfx10.patch b/pkgs/development/rocm-modules/rccl/fix_hw_reg_hw_id_gt_gfx10.patch similarity index 100% rename from pkgs/development/rocm-modules/6/rccl/fix_hw_reg_hw_id_gt_gfx10.patch rename to pkgs/development/rocm-modules/rccl/fix_hw_reg_hw_id_gt_gfx10.patch diff --git a/pkgs/development/rocm-modules/6/rccl/rccl-test-missing-iomanip.diff b/pkgs/development/rocm-modules/rccl/rccl-test-missing-iomanip.diff similarity index 100% rename from pkgs/development/rocm-modules/6/rccl/rccl-test-missing-iomanip.diff rename to pkgs/development/rocm-modules/rccl/rccl-test-missing-iomanip.diff diff --git a/pkgs/development/rocm-modules/6/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix similarity index 97% rename from pkgs/development/rocm-modules/6/rdc/default.nix rename to pkgs/development/rocm-modules/rdc/default.nix index 48fa4c203661..a8d661d27045 100644 --- a/pkgs/development/rocm-modules/6/rdc/default.nix +++ b/pkgs/development/rocm-modules/rdc/default.nix @@ -48,7 +48,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rdc"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rdc"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-zILZPW9Lx5T+cMDqTg/zWy3ro+Nypzc9bDNTupZjt4s="; + hash = "sha256-ztInmK3oCbvnLe7XQ55/hUHRyhuZ2M2XVTG1NcVHtGs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/release-attrPaths-gen.nix b/pkgs/development/rocm-modules/release-attrPaths-gen.nix similarity index 100% rename from pkgs/development/rocm-modules/6/release-attrPaths-gen.nix rename to pkgs/development/rocm-modules/release-attrPaths-gen.nix diff --git a/pkgs/development/rocm-modules/6/release-attrPaths-gen.sh b/pkgs/development/rocm-modules/release-attrPaths-gen.sh similarity index 100% rename from pkgs/development/rocm-modules/6/release-attrPaths-gen.sh rename to pkgs/development/rocm-modules/release-attrPaths-gen.sh diff --git a/pkgs/development/rocm-modules/6/release-attrPaths.json b/pkgs/development/rocm-modules/release-attrPaths.json similarity index 100% rename from pkgs/development/rocm-modules/6/release-attrPaths.json rename to pkgs/development/rocm-modules/release-attrPaths.json diff --git a/pkgs/development/rocm-modules/6/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix similarity index 96% rename from pkgs/development/rocm-modules/6/rocalution/default.nix rename to pkgs/development/rocm-modules/rocalution/default.nix index b83aed0a86ce..a8d700d93ec4 100644 --- a/pkgs/development/rocm-modules/6/rocalution/default.nix +++ b/pkgs/development/rocm-modules/rocalution/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocalution"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocALUTION"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-bZx1Cc2jcIfysohKCKzj5mowM3IeCelRhVaBU73KnTo="; + hash = "sha256-/Tcb11/63MWnUTyigDrL2slwqL8C553hG5OKRYZan7s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/rocblas/default.nix similarity index 89% rename from pkgs/development/rocm-modules/6/rocblas/default.nix rename to pkgs/development/rocm-modules/rocblas/default.nix index c7523b883d7f..8cbe639f7622 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/rocblas/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocblas${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-FCzo/BOk4xLEFkdOdqcCXh4a9t3/OIIBEy8oz6oOMWg="; + hash = "sha256-iWSeJWPJ1/kMuw5lOijpI/PLGehAElqX6EKe+sqZDfQ="; }; outputs = [ "out" ] ++ lib.optional buildBenchmarks "benchmark" ++ lib.optional buildTests "test"; @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals buildTensile [ "-DCPACK_SET_DESTDIR=OFF" "-DLINK_BLIS=ON" - "-DBLIS_LIB=${amd-blis}/lib/libblis-mt.so" + "-DBLAS_LIBRARY=${amd-blis}/lib/libblis-mt.so" "-DBLIS_INCLUDE_DIR=${amd-blis}/include/blis/" "-DBLA_PREFER_PKGCONFIG=ON" "-DTensile_CODE_OBJECT_VERSION=default" @@ -136,23 +136,27 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (fetchpatch { name = "Extend-rocBLAS-HIP-ISA-compatibility.patch"; - url = "https://github.com/GZGavinZhao/rocBLAS/commit/89b75ff9cc731f71f370fad90517395e117b03bb.patch"; - hash = "sha256-W/ohOOyNCcYYLOiQlPzsrTlNtCBdJpKVxO8s+4G7sjo="; + url = "https://github.com/GZGavinZhao/rocm-libraries/commit/2850f22f80f90c9e498f520608a82989a4932ec3.patch"; + hash = "sha256-SPsdEwGe+r8bQudkChRzBDAgu3tPQWFweZCgzh+4nOE="; + stripLen = 2; }) - ./hiplaslt-unstable-compat.patch ]; # Pass $NIX_BUILD_CORES to Tensile postPatch = '' substituteInPlace cmake/build-options.cmake \ --replace-fail 'Tensile_CPU_THREADS ""' 'Tensile_CPU_THREADS "$ENV{NIX_BUILD_CORES}"' - substituteInPlace CMakeLists.txt \ - --replace-fail "4.43.0" "4.44.0" \ - --replace-fail '0.10' '1.0' + '' + # Workaround: libblis detection uses broken absolute paths + # TODO: upstream a proper fix + + '' + substituteInPlace clients/CMakeLists.txt \ + --replace-fail "if ( NOT WIN32 )" "if(OFF)" \ + --replace-fail "else() # WIN32" "elseif(OFF)" '' # Fixes sh: line 1: /usr/bin/diff: No such file or directory # /build/source/clients/gtest/../include/testing_logging.hpp:1117: Failure - + lib.optionals buildTests '' + + lib.optionalString buildTests '' substituteInPlace clients/include/testing_logging.hpp \ --replace-fail "/usr/bin/diff" "${lib.getExe' diffutils "diff"}" ''; diff --git a/pkgs/development/rocm-modules/6/rocblas/hiplaslt-unstable-compat.patch b/pkgs/development/rocm-modules/rocblas/hiplaslt-unstable-compat.patch similarity index 100% rename from pkgs/development/rocm-modules/6/rocblas/hiplaslt-unstable-compat.patch rename to pkgs/development/rocm-modules/rocblas/hiplaslt-unstable-compat.patch diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix b/pkgs/development/rocm-modules/rocdbgapi/default.nix similarity index 96% rename from pkgs/development/rocm-modules/6/rocdbgapi/default.nix rename to pkgs/development/rocm-modules/rocdbgapi/default.nix index ca760ec933a0..afaa4b301b0d 100644 --- a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/rocdbgapi/default.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocdbgapi"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "ROCdbgapi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Rr8+SNeFps0rjk4Jn2+rFmtRJfL42l0tNOz13oZQy+I="; + hash = "sha256-08ixnumXizPuO65Y1vRVDfiZetyuS9pQ7ZqE0m3rRhQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocfft/default.nix b/pkgs/development/rocm-modules/rocfft/default.nix similarity index 97% rename from pkgs/development/rocm-modules/6/rocfft/default.nix rename to pkgs/development/rocm-modules/rocfft/default.nix index 4b5cae75a206..91b1dcb3e7c5 100644 --- a/pkgs/development/rocm-modules/6/rocfft/default.nix +++ b/pkgs/development/rocm-modules/rocfft/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocfft${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-yaOjBF2aJkCBlxkydyOsrfT4lNZ0BVkS2jJC0fEiBug="; + hash = "sha256-z2FNJAfEcIZq7tuxcD1n9qob5PpAMV2zMQi99br3XjQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocfft/log-every-n-aot-jobs.patch b/pkgs/development/rocm-modules/rocfft/log-every-n-aot-jobs.patch similarity index 100% rename from pkgs/development/rocm-modules/6/rocfft/log-every-n-aot-jobs.patch rename to pkgs/development/rocm-modules/rocfft/log-every-n-aot-jobs.patch diff --git a/pkgs/development/rocm-modules/6/rocgdb/default.nix b/pkgs/development/rocm-modules/rocgdb/default.nix similarity index 96% rename from pkgs/development/rocm-modules/6/rocgdb/default.nix rename to pkgs/development/rocm-modules/rocgdb/default.nix index 9453e6292fc3..b729a37c841d 100644 --- a/pkgs/development/rocm-modules/6/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/rocgdb/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocgdb"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCgdb"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-evDWg2w2FHv6OU5BQOCAXTlDm7JpwdJ3Wh5a2i5r1gQ="; + hash = "sha256-OsEzhdLE+L6x6BsIbQXRK8OpEucRmdSBaZJNrLmzz+M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocm-bandwidth-test/default.nix b/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix similarity index 100% rename from pkgs/development/rocm-modules/6/rocm-bandwidth-test/default.nix rename to pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix diff --git a/pkgs/development/rocm-modules/6/rocm-cmake/default.nix b/pkgs/development/rocm-modules/rocm-cmake/default.nix similarity index 89% rename from pkgs/development/rocm-modules/6/rocm-cmake/default.nix rename to pkgs/development/rocm-modules/rocm-cmake/default.nix index c8dfc1539076..dacef47f514b 100644 --- a/pkgs/development/rocm-modules/6/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/rocm-cmake/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-cmake"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-wAipNWAB66YNf7exLSNPAzg3NgkGD9LPKfKiulL5yak="; + hash = "sha256-Gu+w+2dXKXcJtdmpODByxQaZbYMkoAeX9/0tOcGy5Es="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix b/pkgs/development/rocm-modules/rocm-comgr/default.nix similarity index 100% rename from pkgs/development/rocm-modules/6/rocm-comgr/default.nix rename to pkgs/development/rocm-modules/rocm-comgr/default.nix diff --git a/pkgs/development/rocm-modules/6/rocm-core/default.nix b/pkgs/development/rocm-modules/rocm-core/default.nix similarity index 97% rename from pkgs/development/rocm-modules/6/rocm-core/default.nix rename to pkgs/development/rocm-modules/rocm-core/default.nix index 54955d0064d2..1c412c9c4e17 100644 --- a/pkgs/development/rocm-modules/6/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-core/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocm-core"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-core"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Z21k+0vi/P35WTHGAdfUAX7/jVv+d9g5YBo+HTi1Mpk="; + hash = "sha256-TKHNtY3XoLznOi1aVHdxFk3bedtLKkrFy0NVm0ad6ZY="; }; patches = [ diff --git a/pkgs/development/rocm-modules/6/rocm-core/env-rocm-path.patch b/pkgs/development/rocm-modules/rocm-core/env-rocm-path.patch similarity index 100% rename from pkgs/development/rocm-modules/6/rocm-core/env-rocm-path.patch rename to pkgs/development/rocm-modules/rocm-core/env-rocm-path.patch diff --git a/pkgs/development/rocm-modules/6/rocm-device-libs/cmake.patch b/pkgs/development/rocm-modules/rocm-device-libs/cmake.patch similarity index 100% rename from pkgs/development/rocm-modules/6/rocm-device-libs/cmake.patch rename to pkgs/development/rocm-modules/rocm-device-libs/cmake.patch diff --git a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/rocm-device-libs/default.nix similarity index 100% rename from pkgs/development/rocm-modules/6/rocm-device-libs/default.nix rename to pkgs/development/rocm-modules/rocm-device-libs/default.nix diff --git a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/rocm-docs-core/default.nix similarity index 100% rename from pkgs/development/rocm-modules/6/rocm-docs-core/default.nix rename to pkgs/development/rocm-modules/rocm-docs-core/default.nix diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix similarity index 83% rename from pkgs/development/rocm-modules/6/rocm-runtime/default.nix rename to pkgs/development/rocm-modules/rocm-runtime/default.nix index 809a094e2752..533a493c71be 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCR-Runtime"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-zs0nydwYUY+8uiPyJxgTfAiV7spUMbESb0jUUvFf+AU="; + hash = "sha256-APFcC17JxTxTkJvaAeKezN70wXjWLTDpeIDj8e/mwhQ="; }; cmakeBuildType = "RelWithDebInfo"; @@ -59,11 +59,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/GZGavinZhao/ROCR-Runtime/commit/7c63e7185d8fcf08537a278908946145f6231121.patch"; }) # Patches for UB at runtime https://github.com/ROCm/ROCR-Runtime/issues/272 - (fetchpatch { - # [PATCH] hsa-runtime: set underlying type of hsa_region_info_t and hsa_amd_region_info_t to int - url = "https://github.com/ROCm/ROCR-Runtime/commit/39a6a168fa07e289a10f6e20e6ead4e303e99ba0.patch"; - hash = "sha256-CshJJDvII1nNyNmt+YjwMwfBHUTlrdsxkhwfgBwO+WE="; - }) (fetchpatch { # [PATCH] queues: fix UB due to 1 << 31 url = "https://github.com/ROCm/ROCR-Runtime/commit/9b8a0f5dbee1903fa990a7d8accc1c5fbc549636.patch"; @@ -79,12 +74,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/ROCR-Runtime/commit/41bfc66aef437a5b349f71105fa4b907cc7e17d5.patch"; hash = "sha256-A7VhPR3eSsmjq2cTBSjBIz9i//WiNjoXm0EsRKtF+ns="; }) - # Fix build with gcc15 - (fetchpatch { - # [PATCH] rocr:Add missing cstdint include - url = "https://github.com/ROCm/ROCR-Runtime/commit/5cc61b714d5b59ed5405639a37a582d839e6ebe9.patch"; - hash = "sha256-IPxDShpoFB0PjCG+zwFbnW9IBTCG3G2o9sfITGs+bN4="; - }) # This causes a circular dependency, aqlprofile relies on hsa-runtime64 # which is part of rocm-runtime # Worked around by having rocprofiler load aqlprofile directly diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/remove-hsa-aqlprofile-dep.patch b/pkgs/development/rocm-modules/rocm-runtime/remove-hsa-aqlprofile-dep.patch similarity index 100% rename from pkgs/development/rocm-modules/6/rocm-runtime/remove-hsa-aqlprofile-dep.patch rename to pkgs/development/rocm-modules/rocm-runtime/remove-hsa-aqlprofile-dep.patch diff --git a/pkgs/development/rocm-modules/6/rocm-smi/default.nix b/pkgs/development/rocm-modules/rocm-smi/default.nix similarity index 93% rename from pkgs/development/rocm-modules/6/rocm-smi/default.nix rename to pkgs/development/rocm-modules/rocm-smi/default.nix index 26107f9de3f6..beedc4cb2d06 100644 --- a/pkgs/development/rocm-modules/6/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/rocm-smi/default.nix @@ -11,19 +11,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm_smi_lib"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-yJ3Bf+tM39JWbY+A0NlpHNkvythdAdz6ZVp1AvLcXhk="; + hash = "sha256-jhjdx3xF6hu+p99dFAGgUwQ2fIhNf5WzeZqeWW1fKc4="; }; - patches = [ - ./cmake.patch - ]; - propagatedBuildInputs = [ libdrm ]; @@ -39,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_LIBEXECDIR=libexec" "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; diff --git a/pkgs/development/rocm-modules/6/rocm-tests/default.nix b/pkgs/development/rocm-modules/rocm-tests/default.nix similarity index 100% rename from pkgs/development/rocm-modules/6/rocm-tests/default.nix rename to pkgs/development/rocm-modules/rocm-tests/default.nix diff --git a/pkgs/development/rocm-modules/6/rocminfo/default.nix b/pkgs/development/rocm-modules/rocminfo/default.nix similarity index 92% rename from pkgs/development/rocm-modules/6/rocminfo/default.nix rename to pkgs/development/rocm-modules/rocminfo/default.nix index 9a149e58a9b2..6197e1f42dc2 100644 --- a/pkgs/development/rocm-modules/6/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/rocminfo/default.nix @@ -12,14 +12,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "6.4.3"; + version = "7.0.1"; pname = "rocminfo"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocminfo"; rev = "rocm-${finalAttrs.version}"; - sha256 = "sha256-YscZ5sFsLOVBg98w2X6vTzniTvl9NfCkIE+HAH6vv5Y="; + sha256 = "sha256-wE1/golRQm5uggXRQ1BucxV3laypSOUCvjTFx5N2yTE="; }; strictDeps = true; diff --git a/pkgs/development/rocm-modules/6/rocmlir/default.nix b/pkgs/development/rocm-modules/rocmlir/default.nix similarity index 97% rename from pkgs/development/rocm-modules/6/rocmlir/default.nix rename to pkgs/development/rocm-modules/rocmlir/default.nix index 487c3b460a96..c9a5ab561f88 100644 --- a/pkgs/development/rocm-modules/6/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/rocmlir/default.nix @@ -39,7 +39,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocMLIR"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-p/gvr1Z6yZtO5N+ecSouXiCrf520jt1HMOy/tohUHfI="; + hash = "sha256-W5CFmUd2f33nlVGyeygYQ0IY9X5QM7/Wkt1XHOZBl4Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix similarity index 95% rename from pkgs/development/rocm-modules/6/rocprim/default.nix rename to pkgs/development/rocm-modules/rocprim/default.nix index 690f1415df34..71388c8d93d2 100644 --- a/pkgs/development/rocm-modules/6/rocprim/default.nix +++ b/pkgs/development/rocm-modules/rocprim/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocPRIM"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-lH4MlBEkVJocq1VliGBtb7VvWfS6p/uIKWR239fSjRY="; + hash = "sha256-wj1H5JE7C5XJ8wwjzCA8ByO6cUC/V0ZI7bRaHmfugLc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix similarity index 84% rename from pkgs/development/rocm-modules/6/rocprofiler-register/default.nix rename to pkgs/development/rocm-modules/rocprofiler-register/default.nix index 97de42a61e61..698a65747566 100644 --- a/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix @@ -18,22 +18,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler-register"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocprofiler-register"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-HaN4XMHuCRDfKOpfuZ2SkOEQfAZKouh6luqbtATUYm0="; + hash = "sha256-2uAS/9gHinVLCMa/fX+6T+0RyHCLToyxDeobolZoD+g="; fetchSubmodules = true; }; - # vendored glog is too old and breaks on CMake 4, gets bumped in ROCm 7.0 - postPatch = '' - substituteInPlace external/glog/cmake/GetCacheVariables.cmake \ - --replace-fail "(VERSION 3.3)" "(VERSION 3.5)" - ''; - nativeBuildInputs = [ cmake clang diff --git a/pkgs/development/rocm-modules/6/rocprofiler/default.nix b/pkgs/development/rocm-modules/rocprofiler/default.nix similarity index 97% rename from pkgs/development/rocm-modules/6/rocprofiler/default.nix rename to pkgs/development/rocm-modules/rocprofiler/default.nix index 82d974d990aa..9b3ad99ccee7 100644 --- a/pkgs/development/rocm-modules/6/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocprofiler"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-CgW8foM4W3K19kUK/l8IsH2Q9DHi/z88viXTxhNqlHQ="; + hash = "sha256-p2VwMm9Ltx/SFDIFk42nY9Too0Rp/IrqfuH8cQnhoGA="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix similarity index 85% rename from pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix rename to pkgs/development/rocm-modules/rocr-debug-agent/default.nix index 6a76b9c7e5b9..49ba3089cbe0 100644 --- a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, rocmUpdateScript, cmake, + python3, clr, rocdbgapi, elfutils, @@ -11,18 +12,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocr-debug-agent"; - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocr_debug_agent"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-otoxZ2NHkPDIFhvn4/nvaQ/W4LF38Nx9MZ9IYEf1DyY="; + hash = "sha256-twoihis1OrCQ4K3rjDgjSErq+qktqz2xwkLLxBJIJ90="; }; nativeBuildInputs = [ cmake clr + python3 # TODO: check for scripts that need patchShebangs in output ]; buildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocrand/default.nix b/pkgs/development/rocm-modules/rocrand/default.nix similarity index 95% rename from pkgs/development/rocm-modules/6/rocrand/default.nix rename to pkgs/development/rocm-modules/rocrand/default.nix index b691ca6db264..28b410370797 100644 --- a/pkgs/development/rocm-modules/6/rocrand/default.nix +++ b/pkgs/development/rocm-modules/rocrand/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-pZAwmsWup0byGxJ5ADbztco8svBpIjBWITjs+OgKvQc="; + hash = "sha256-O7YCQBtFSa0xiHbbAXX2FyE6uRywEaMaJyX85875Yd0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix similarity index 97% rename from pkgs/development/rocm-modules/6/rocsolver/default.nix rename to pkgs/development/rocm-modules/rocsolver/default.nix index a47da7a68a2a..6268bdc257f9 100644 --- a/pkgs/development/rocm-modules/6/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/rocsolver/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsolver${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-JthNY5rkrrm9bf1fgkO9HnARdX6H0kiF9EW1jMbBmj4="; + hash = "sha256-MVPffQGKsF5gyb5eTEgj6H+ikLrQTPlRB7Eg/GYYvGI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocsparse/default.nix b/pkgs/development/rocm-modules/rocsparse/default.nix similarity index 98% rename from pkgs/development/rocm-modules/6/rocsparse/default.nix rename to pkgs/development/rocm-modules/rocsparse/default.nix index dc7ca260d293..232afb68179a 100644 --- a/pkgs/development/rocm-modules/6/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/rocsparse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-PrLyqHMAJYACkBMz97iBfwCaQ9Kf1IBL7IEf1IF1/m0="; + hash = "sha256-tLBfVAoviHL0LpwWslvz2w2b7wwW5xj6kKKqADTjC4s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocsparse/deps.nix b/pkgs/development/rocm-modules/rocsparse/deps.nix similarity index 100% rename from pkgs/development/rocm-modules/6/rocsparse/deps.nix rename to pkgs/development/rocm-modules/rocsparse/deps.nix diff --git a/pkgs/development/rocm-modules/6/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix similarity index 95% rename from pkgs/development/rocm-modules/6/rocthrust/default.nix rename to pkgs/development/rocm-modules/rocthrust/default.nix index 298f2149e6a9..9eb25b017023 100644 --- a/pkgs/development/rocm-modules/6/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/rocthrust/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocThrust"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-IfMBVISClD1dk7FnAakP2GIpyZFrCnAloFRTaNdSKyw="; + hash = "sha256-tbGEZ8NXu7euPN8CaRYOjcmTmYq1SUP7LNKOjO0RICE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/roctracer/default.nix b/pkgs/development/rocm-modules/roctracer/default.nix similarity index 96% rename from pkgs/development/rocm-modules/6/roctracer/default.nix rename to pkgs/development/rocm-modules/roctracer/default.nix index 43e161df0f27..ce9baed22619 100644 --- a/pkgs/development/rocm-modules/6/roctracer/default.nix +++ b/pkgs/development/rocm-modules/roctracer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "roctracer"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "roctracer"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Dwk5cBZLysmsVA2kwpQM0FQt2KXOGcaZcAw/d8VUaXw="; + hash = "sha256-8DMwaMtzdBuAAV5KhQfqLfTtSyvPiwZxc1lAAoeXGus="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocwmma/0000-dont-fetch-googletest.patch b/pkgs/development/rocm-modules/rocwmma/0000-dont-fetch-googletest.patch similarity index 100% rename from pkgs/development/rocm-modules/6/rocwmma/0000-dont-fetch-googletest.patch rename to pkgs/development/rocm-modules/rocwmma/0000-dont-fetch-googletest.patch diff --git a/pkgs/development/rocm-modules/6/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix similarity index 96% rename from pkgs/development/rocm-modules/6/rocwmma/default.nix rename to pkgs/development/rocm-modules/rocwmma/default.nix index daffc4407560..ddff8d17598a 100644 --- a/pkgs/development/rocm-modules/6/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/rocwmma/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "6.4.3"; + version = "7.0.1"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocWMMA"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-fjyxMrzt74rE7Gf4v4WawYltuw1fvahwZUpauMIE3qc="; + hash = "sha256-EnQF3V8sk234JNZTqpVUcRv8pVFWpkFJYVgLLuxqm2E="; }; patches = lib.optionals (buildTests || buildBenchmarks) [ diff --git a/pkgs/development/rocm-modules/6/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix similarity index 95% rename from pkgs/development/rocm-modules/6/rpp/default.nix rename to pkgs/development/rocm-modules/rpp/default.nix index 65909ee616fb..e8a5c2c37350 100644 --- a/pkgs/development/rocm-modules/6/rpp/default.nix +++ b/pkgs/development/rocm-modules/rpp/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "6.4.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rpp"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-rccVjSrOVIe4ZDtloCoCCI3u9UIcUqdirHIzS7ffAas="; + hash = "sha256-oysmF9TS1tm37x9DNoZ2KqHKP1wJDoFY+IuL1WkIz0o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix similarity index 87% rename from pkgs/development/rocm-modules/6/tensile/default.nix rename to pkgs/development/rocm-modules/tensile/default.nix index c8a7593d2698..a1fcab0f2379 100644 --- a/pkgs/development/rocm-modules/6/tensile/default.nix +++ b/pkgs/development/rocm-modules/tensile/default.nix @@ -18,16 +18,14 @@ buildPythonPackage rec { pname = "tensile"; - # Using a specific commit which has compression support from after the 6.4 release - # Without compression packages are too large for hydra - version = "6.4-unstable-2025-06-12"; + version = "7.0.0"; pyproject = true; src = fetchFromGitHub { owner = "ROCm"; repo = "Tensile"; - rev = "1ce87a9fe73610ffb962082f0a882360cd39b103"; - hash = "sha256-qIuoIbmridy1HQVV10qPTzbccuxNJPsOvePaQQnClZc="; + rev = "rocm-${version}"; + hash = "sha256-miNQzXfr/1qIqPJqun42zp6QGI6v6K1fKIXdCfkNKow="; }; # TODO: It should be possible to run asm caps test ONCE for all supported arches diff --git a/pkgs/development/rocm-modules/6/tensile/tensile-create-library-dont-copy-twice.diff b/pkgs/development/rocm-modules/tensile/tensile-create-library-dont-copy-twice.diff similarity index 100% rename from pkgs/development/rocm-modules/6/tensile/tensile-create-library-dont-copy-twice.diff rename to pkgs/development/rocm-modules/tensile/tensile-create-library-dont-copy-twice.diff diff --git a/pkgs/development/rocm-modules/6/tensile/tensile-solutionstructs-perf-fix.diff b/pkgs/development/rocm-modules/tensile/tensile-solutionstructs-perf-fix.diff similarity index 100% rename from pkgs/development/rocm-modules/6/tensile/tensile-solutionstructs-perf-fix.diff rename to pkgs/development/rocm-modules/tensile/tensile-solutionstructs-perf-fix.diff diff --git a/pkgs/development/rocm-modules/6/update.nix b/pkgs/development/rocm-modules/update.nix similarity index 85% rename from pkgs/development/rocm-modules/6/update.nix rename to pkgs/development/rocm-modules/update.nix index 69a45f9d4cd4..6e2068a8b112 100644 --- a/pkgs/development/rocm-modules/6/update.nix +++ b/pkgs/development/rocm-modules/update.nix @@ -51,12 +51,12 @@ let >&2 echo parsed version "$version_arr" from "$version" - if (( ''${version_arr[0]} > 6 )); then - echo "'rocmPackages_6.${pname}' is already at its maximum allowed version.''\nAny further upgrades should go into 'rocmPackages_X.${pname}'." >&2 + if (( ''${version_arr[0]} > 7 )); then + echo "'rocmPackages.${pname}' is already at its maximum allowed version.''\nAny further upgrades should go into 'rocmPackages_X.${pname}'." >&2 exit 1 fi - update-source-version rocmPackages_6.${pname} "$version" --ignore-same-hash + update-source-version rocmPackages.${pname} "$version" --ignore-same-hash ''; in [ updateScript ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 566cb5480b7c..1b49fa2ec8d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2429,8 +2429,7 @@ with pkgs; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; - rocmPackages = recurseIntoAttrs rocmPackages_6; - rocmPackages_6 = callPackage ../development/rocm-modules/6 { }; + rocmPackages = recurseIntoAttrs (callPackage ../development/rocm-modules { }); tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; }; From b280ad4aafe56678efdf366a8e8ab712d04443ff Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 21 Dec 2025 05:01:26 -0800 Subject: [PATCH 023/142] rocmPackages: 7.0.1 -> 7.0.2 --- pkgs/development/rocm-modules/amdsmi/default.nix | 4 ++-- pkgs/development/rocm-modules/aqlprofile/default.nix | 8 +++----- pkgs/development/rocm-modules/clr/default.nix | 4 ++-- .../rocm-modules/composable_kernel/base.nix | 2 +- .../rocm-modules/composable_kernel/ck4inductor.nix | 3 +-- pkgs/development/rocm-modules/half/default.nix | 2 +- pkgs/development/rocm-modules/hip-common/default.nix | 4 ++-- .../rocm-modules/hipblas-common/default.nix | 2 +- pkgs/development/rocm-modules/hipblas/default.nix | 4 ++-- pkgs/development/rocm-modules/hipblaslt/default.nix | 2 +- pkgs/development/rocm-modules/hipcub/default.nix | 2 +- pkgs/development/rocm-modules/hipfft/default.nix | 4 ++-- pkgs/development/rocm-modules/hipfort/default.nix | 2 +- pkgs/development/rocm-modules/hipify/default.nix | 2 +- pkgs/development/rocm-modules/hiprand/default.nix | 2 +- pkgs/development/rocm-modules/hipsolver/default.nix | 2 +- pkgs/development/rocm-modules/hipsparse/default.nix | 2 +- pkgs/development/rocm-modules/llvm/default.nix | 12 ++---------- pkgs/development/rocm-modules/migraphx/default.nix | 4 ++-- pkgs/development/rocm-modules/miopen/default.nix | 2 +- pkgs/development/rocm-modules/mivisionx/default.nix | 2 +- pkgs/development/rocm-modules/rccl/default.nix | 4 ++-- pkgs/development/rocm-modules/rdc/default.nix | 2 +- pkgs/development/rocm-modules/rocalution/default.nix | 2 +- pkgs/development/rocm-modules/rocblas/default.nix | 4 ++-- pkgs/development/rocm-modules/rocdbgapi/default.nix | 4 ++-- pkgs/development/rocm-modules/rocfft/default.nix | 4 ++-- pkgs/development/rocm-modules/rocgdb/default.nix | 4 ++-- pkgs/development/rocm-modules/rocm-cmake/default.nix | 2 +- pkgs/development/rocm-modules/rocm-core/default.nix | 2 +- .../rocm-modules/rocm-runtime/default.nix | 4 ++-- pkgs/development/rocm-modules/rocm-smi/default.nix | 4 ++-- pkgs/development/rocm-modules/rocminfo/default.nix | 2 +- pkgs/development/rocm-modules/rocmlir/default.nix | 4 ++-- pkgs/development/rocm-modules/rocprim/default.nix | 4 ++-- .../rocm-modules/rocprofiler-register/default.nix | 4 ++-- .../development/rocm-modules/rocprofiler/default.nix | 2 +- .../rocm-modules/rocr-debug-agent/default.nix | 2 +- pkgs/development/rocm-modules/rocrand/default.nix | 2 +- pkgs/development/rocm-modules/rocsolver/default.nix | 4 ++-- pkgs/development/rocm-modules/rocsparse/default.nix | 4 ++-- pkgs/development/rocm-modules/rocthrust/default.nix | 2 +- pkgs/development/rocm-modules/roctracer/default.nix | 2 +- pkgs/development/rocm-modules/rocwmma/default.nix | 4 ++-- pkgs/development/rocm-modules/rpp/default.nix | 2 +- pkgs/development/rocm-modules/tensile/default.nix | 4 ++-- 46 files changed, 69 insertions(+), 80 deletions(-) diff --git a/pkgs/development/rocm-modules/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix index 692aecccf620..eb33b7608604 100644 --- a/pkgs/development/rocm-modules/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/amdsmi/default.nix @@ -21,12 +21,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amdsmi"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "rocm"; repo = "amdsmi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-66xcdMRcKYyseS+xOt4NPDa2cK4ASAlS6zB5/LUoq9A="; + hash = "sha256-1xQD68mrG1g9Bpw5/vxn+XxDM5HuAyEHyALyBixqR1s="; }; postPatch = '' diff --git a/pkgs/development/rocm-modules/aqlprofile/default.nix b/pkgs/development/rocm-modules/aqlprofile/default.nix index f73fa4760473..97fa65abfd56 100644 --- a/pkgs/development/rocm-modules/aqlprofile/default.nix +++ b/pkgs/development/rocm-modules/aqlprofile/default.nix @@ -8,15 +8,13 @@ stdenv.mkDerivation { pname = "aqlprofile"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { - # TODO: Will move to rocm-systems repo and have proper tags in 7.x - # pinned to oddly named tag for now owner = "ROCm"; repo = "aqlprofile"; - tag = "rocm-7.0.1"; - hash = "sha256-avL78ZfB+rJ1TYaejSUzU6i5L9JeMawMwIxaTQINQdE="; + tag = "rocm-7.0.2"; + hash = "sha256-A17SAkEUf3yAGwvZUWSdL7Tn5YAXB0YlD3T1DLTjDSg="; }; env.CXXFLAGS = "-DROCP_LD_AQLPROFILE=1"; diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index 7fbf7710d3ed..4861e59fb7e2 100644 --- a/pkgs/development/rocm-modules/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -70,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clr"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "clr"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-z7qmL7c/0zlB5/rb7zporfeUPM9KIkS1iZf6GmYFxbo="; + hash = "sha256-zajb/iTtF/ECRScdcQ85HPgq8DdIGqSinJoVyyi89bw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix index 6c9604be5b31..5c51c4208d40 100644 --- a/pkgs/development/rocm-modules/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/composable_kernel/base.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ''; pname = "composable_kernel_base"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix index 428daae27fa5..ce3d9363e9d2 100644 --- a/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix +++ b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix @@ -14,8 +14,7 @@ buildPythonPackage { setuptools setuptools-scm ]; - version = "7.0"; - inherit (composable_kernel) src; + inherit (composable_kernel) version src; pythonImportsCheck = [ "ck4inductor" "ck4inductor.universal_gemm.gen_instances" diff --git a/pkgs/development/rocm-modules/half/default.nix b/pkgs/development/rocm-modules/half/default.nix index 204fd730105e..54a2bdc7054e 100644 --- a/pkgs/development/rocm-modules/half/default.nix +++ b/pkgs/development/rocm-modules/half/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "half"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hip-common/default.nix b/pkgs/development/rocm-modules/hip-common/default.nix index 59abcd935032..365ffc146c82 100644 --- a/pkgs/development/rocm-modules/hip-common/default.nix +++ b/pkgs/development/rocm-modules/hip-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hip-common"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "HIP"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-aKR87SZftt5sLuj/TOgwcdg+CZON0Jr2BpPvqA02lw4="; + hash = "sha256-9VQrCed5EKVXu41Qrnf2m2jXveWt5Y/SlSxlUmjZS0M="; }; dontConfigure = true; diff --git a/pkgs/development/rocm-modules/hipblas-common/default.nix b/pkgs/development/rocm-modules/hipblas-common/default.nix index e04581b0f831..adf9c331de39 100644 --- a/pkgs/development/rocm-modules/hipblas-common/default.nix +++ b/pkgs/development/rocm-modules/hipblas-common/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hipblas-common"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hipblas/default.nix b/pkgs/development/rocm-modules/hipblas/default.nix index 0374630ae61c..6f1682110652 100644 --- a/pkgs/development/rocm-modules/hipblas/default.nix +++ b/pkgs/development/rocm-modules/hipblas/default.nix @@ -24,7 +24,7 @@ # Can also use cuBLAS stdenv.mkDerivation (finalAttrs: { pname = "hipblas"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-4y+VPhYikPytY1pXRrhbARh33yEmQDZfVET70Be8e4Q="; + hash = "sha256-SoszZBbk8sM3yjgahs1UrPCsEbGmTYTpdOw+Ah/z8H8="; }; postPatch = '' diff --git a/pkgs/development/rocm-modules/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix index 44a0028a4b3e..f19734394f0e 100644 --- a/pkgs/development/rocm-modules/hipblaslt/default.nix +++ b/pkgs/development/rocm-modules/hipblaslt/default.nix @@ -70,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hipblaslt${clr.gpuArchSuffix}"; - version = "7.0-unstable-2025-08-21"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix index 00f45df98bdf..d0a7f7815bf4 100644 --- a/pkgs/development/rocm-modules/hipcub/default.nix +++ b/pkgs/development/rocm-modules/hipcub/default.nix @@ -17,7 +17,7 @@ # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix index e7a4a0a7b7b5..0439197337cd 100644 --- a/pkgs/development/rocm-modules/hipfft/default.nix +++ b/pkgs/development/rocm-modules/hipfft/default.nix @@ -21,7 +21,7 @@ # Can also use cuFFT stdenv.mkDerivation (finalAttrs: { pname = "hipfft"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-dbmCPzvz+xnvAWn610HCvmGzzLEq1IPhX78lJgY87bg="; + hash = "sha256-cozwHUlqACq0IM3YToc/xFB694DJ3rPiEPUCTo0xuHY="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/hipfort/default.nix b/pkgs/development/rocm-modules/hipfort/default.nix index fe87494b2e48..c13345965c2f 100644 --- a/pkgs/development/rocm-modules/hipfort/default.nix +++ b/pkgs/development/rocm-modules/hipfort/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hipify/default.nix b/pkgs/development/rocm-modules/hipify/default.nix index e27714f20f77..22fd712c2983 100644 --- a/pkgs/development/rocm-modules/hipify/default.nix +++ b/pkgs/development/rocm-modules/hipify/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipify"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix index 49f0ddb41d6c..8854b4dc4827 100644 --- a/pkgs/development/rocm-modules/hiprand/default.nix +++ b/pkgs/development/rocm-modules/hiprand/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiprand"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/hipsolver/default.nix b/pkgs/development/rocm-modules/hipsolver/default.nix index 028f7e2f5f79..48f1149d60f6 100644 --- a/pkgs/development/rocm-modules/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/hipsolver/default.nix @@ -21,7 +21,7 @@ # Can also use cuSOLVER stdenv.mkDerivation (finalAttrs: { pname = "hipsolver"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix index 61ec88a48f5d..033250e16725 100644 --- a/pkgs/development/rocm-modules/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/hipsparse/default.nix @@ -19,7 +19,7 @@ # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/llvm/default.nix b/pkgs/development/rocm-modules/llvm/default.nix index 744b343f6ecf..3d5db0710d41 100644 --- a/pkgs/development/rocm-modules/llvm/default.nix +++ b/pkgs/development/rocm-modules/llvm/default.nix @@ -33,7 +33,7 @@ }: let - version = "7.0.1"; + version = "7.0.2"; # major version of this should be the clang version ROCm forked from rocmLlvmVersion = "20.0.0-rocm"; # llvmPackages_base version should match rocmLlvmVersion @@ -115,7 +115,7 @@ let owner = "ROCm"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-C6QTDKqjeqExxgBtlCEZmgsEir1uFijgmvKCA/32+/A="; + hash = "sha256-gJlDFbCRsiwHgRzmwm36C3WvGfWwgPrtBNUHYmZHTB8="; }; llvmMajorVersion = lib.versions.major rocmLlvmVersion; # An llvmPackages (pkgs/development/compilers/llvm/) built from ROCm LLVM's source tree @@ -355,14 +355,6 @@ overrideLlvmPackagesRocm (s: { url = "https://github.com/GZGavinZhao/rocm-llvm-project/commit/6d296f879b0fed830c54b2a9d26240da86c8bb3a.patch"; relative = "clang"; }) - (fetchpatch { - # [PATCH] Reapply "[CUDA][HIP] Add a __device__ version of std::__glibcxx_assert_fail()" - # Fix errors with gcc15 - # https://github.com/ROCm/composable_kernel/issues/2887 - hash = "sha256-liowyS6FTsDhH8mJYXsanK7GEIlXFhd68GRDf/7Y6gg="; - url = "https://github.com/llvm/llvm-project/commit/8ec0552a7f1f50986dda6d13eae310d121d7e3ba.patch"; - relative = "clang"; - }) ]; hardeningDisable = [ "all" ]; nativeBuildInputs = old.nativeBuildInputs ++ [ diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix index e29766663ef3..f2f0ddb74e8e 100644 --- a/pkgs/development/rocm-modules/migraphx/default.nix +++ b/pkgs/development/rocm-modules/migraphx/default.nix @@ -59,7 +59,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "migraphx"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-P2qbj2yocmYDDgujlUVEdyqv3b+yF0RemA+Nt76KCdQ="; + hash = "sha256-P3jiq6i7jpfpL9/S7mc1CiNRwAt8fzy3waHKhyuYIXI="; }; patches = [ diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix index 0a484fdd50a2..512a24a85685 100644 --- a/pkgs/development/rocm-modules/miopen/default.nix +++ b/pkgs/development/rocm-modules/miopen/default.nix @@ -43,7 +43,7 @@ let # FIXME: cmake files need patched to include this properly cFlags = "-Wno-documentation-pedantic --offload-compress -I${hipblas-common}/include -I${hipblas}/include -I${roctracer}/include -I${nlohmann_json}/include -I${sqlite.dev}/include -I${rocrand}/include"; - version = "7.0.1"; + version = "7.0.2"; # Targets outside this list will get # error: use of undeclared identifier 'CK_BUFFER_RESOURCE_3RD_DWORD' diff --git a/pkgs/development/rocm-modules/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix index 20f6e31007df..40107372e408 100644 --- a/pkgs/development/rocm-modules/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/mivisionx/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rccl/default.nix b/pkgs/development/rocm-modules/rccl/default.nix index f7a0a7951104..757cffedc610 100644 --- a/pkgs/development/rocm-modules/rccl/default.nix +++ b/pkgs/development/rocm-modules/rccl/default.nix @@ -40,7 +40,7 @@ in # infiniband ib_peer_mem support isn't in the mainline kernel but is carried by some distros stdenv.mkDerivation (finalAttrs: { pname = "rccl${clr.gpuArchSuffix}"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-ASU+RB0Fhb1E8zZR3wLzbnLoigXWH3aNWirViRDdkw0="; + hash = "sha256-ByKz6TNdGVbh65ZH5PtgUbAj4qNVmOBmZ9SrOjkTbWU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix index a8d661d27045..1177fedb87c8 100644 --- a/pkgs/development/rocm-modules/rdc/default.nix +++ b/pkgs/development/rocm-modules/rdc/default.nix @@ -48,7 +48,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rdc"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix index a8d700d93ec4..e40b0598a856 100644 --- a/pkgs/development/rocm-modules/rocalution/default.nix +++ b/pkgs/development/rocm-modules/rocalution/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocalution"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocblas/default.nix b/pkgs/development/rocm-modules/rocblas/default.nix index 8cbe639f7622..309858960511 100644 --- a/pkgs/development/rocm-modules/rocblas/default.nix +++ b/pkgs/development/rocm-modules/rocblas/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocblas${clr.gpuArchSuffix}"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-iWSeJWPJ1/kMuw5lOijpI/PLGehAElqX6EKe+sqZDfQ="; + hash = "sha256-528jAdhWtZbbw76dfUgpMr5px0T7q4Oj76jp0z0lh3A="; }; outputs = [ "out" ] ++ lib.optional buildBenchmarks "benchmark" ++ lib.optional buildTests "test"; diff --git a/pkgs/development/rocm-modules/rocdbgapi/default.nix b/pkgs/development/rocm-modules/rocdbgapi/default.nix index afaa4b301b0d..7103a988c146 100644 --- a/pkgs/development/rocm-modules/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/rocdbgapi/default.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocdbgapi"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "ROCdbgapi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-08ixnumXizPuO65Y1vRVDfiZetyuS9pQ7ZqE0m3rRhQ="; + hash = "sha256-adzHfTd4O59YKqkPL1oZnM8qiuGjlWefbl50MI2Z7co="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocfft/default.nix b/pkgs/development/rocm-modules/rocfft/default.nix index 91b1dcb3e7c5..c132b7952656 100644 --- a/pkgs/development/rocm-modules/rocfft/default.nix +++ b/pkgs/development/rocm-modules/rocfft/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocfft${clr.gpuArchSuffix}"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-z2FNJAfEcIZq7tuxcD1n9qob5PpAMV2zMQi99br3XjQ="; + hash = "sha256-VVRZSmMma/sjSj2obRrwP118v/FasS30ZU0nFsEp9rw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocgdb/default.nix b/pkgs/development/rocm-modules/rocgdb/default.nix index b729a37c841d..3cc5a4a410a5 100644 --- a/pkgs/development/rocm-modules/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/rocgdb/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocgdb"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCgdb"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-OsEzhdLE+L6x6BsIbQXRK8OpEucRmdSBaZJNrLmzz+M="; + hash = "sha256-IYdhYYJGTXBIftTEpvi+lvdhtYgdFWSpdNbtTBh0l9s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocm-cmake/default.nix b/pkgs/development/rocm-modules/rocm-cmake/default.nix index dacef47f514b..a30a34c74b03 100644 --- a/pkgs/development/rocm-modules/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/rocm-cmake/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocm-core/default.nix b/pkgs/development/rocm-modules/rocm-core/default.nix index 1c412c9c4e17..242c9bfa7d92 100644 --- a/pkgs/development/rocm-modules/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-core/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocm-core"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix index 533a493c71be..98b2bded9d9e 100644 --- a/pkgs/development/rocm-modules/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCR-Runtime"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-APFcC17JxTxTkJvaAeKezN70wXjWLTDpeIDj8e/mwhQ="; + hash = "sha256-oz2UCR4XEhNm1uDlCeDnDJrmysWKA6GKxlEuFu21es0="; }; cmakeBuildType = "RelWithDebInfo"; diff --git a/pkgs/development/rocm-modules/rocm-smi/default.nix b/pkgs/development/rocm-modules/rocm-smi/default.nix index beedc4cb2d06..f10d5da21474 100644 --- a/pkgs/development/rocm-modules/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/rocm-smi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm_smi_lib"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jhjdx3xF6hu+p99dFAGgUwQ2fIhNf5WzeZqeWW1fKc4="; + hash = "sha256-LzWKWiHmMDGO2ejvcT0BBg22HbYD9q0fxK/bq6JvcnQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocminfo/default.nix b/pkgs/development/rocm-modules/rocminfo/default.nix index 6197e1f42dc2..620c63cb1ec6 100644 --- a/pkgs/development/rocm-modules/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/rocminfo/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "7.0.1"; + version = "7.0.2"; pname = "rocminfo"; src = fetchFromGitHub { diff --git a/pkgs/development/rocm-modules/rocmlir/default.nix b/pkgs/development/rocm-modules/rocmlir/default.nix index c9a5ab561f88..5ed107d458db 100644 --- a/pkgs/development/rocm-modules/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/rocmlir/default.nix @@ -39,7 +39,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocMLIR"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-W5CFmUd2f33nlVGyeygYQ0IY9X5QM7/Wkt1XHOZBl4Q="; + hash = "sha256-0+vZ/Lkh1fC9oKyy83YjIX4xuMJEWErd8UpZZuaaXdI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix index 71388c8d93d2..f1769f266292 100644 --- a/pkgs/development/rocm-modules/rocprim/default.nix +++ b/pkgs/development/rocm-modules/rocprim/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocPRIM"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-wj1H5JE7C5XJ8wwjzCA8ByO6cUC/V0ZI7bRaHmfugLc="; + hash = "sha256-uOlrN/FvEBBCHsPeJOWs9NNqVwrcxVExfs5wp03PH0U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix index 698a65747566..5e23901f4c09 100644 --- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler-register"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocprofiler-register"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-2uAS/9gHinVLCMa/fX+6T+0RyHCLToyxDeobolZoD+g="; + hash = "sha256-hK7k4tg7/5rYCSTFKsFRsRYfVevkCARcDyxlexrXbts="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/rocprofiler/default.nix b/pkgs/development/rocm-modules/rocprofiler/default.nix index 9b3ad99ccee7..a8aeefc12886 100644 --- a/pkgs/development/rocm-modules/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler/default.nix @@ -44,7 +44,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix index 49ba3089cbe0..aebee50302ba 100644 --- a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocr-debug-agent"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/rocrand/default.nix b/pkgs/development/rocm-modules/rocrand/default.nix index 28b410370797..8d952d3e10b8 100644 --- a/pkgs/development/rocm-modules/rocrand/default.nix +++ b/pkgs/development/rocm-modules/rocrand/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand${clr.gpuArchSuffix}"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix index 6268bdc257f9..cbad72ab2328 100644 --- a/pkgs/development/rocm-modules/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/rocsolver/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsolver${clr.gpuArchSuffix}"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-MVPffQGKsF5gyb5eTEgj6H+ikLrQTPlRB7Eg/GYYvGI="; + hash = "sha256-/JFGqNA4weVgFuVtszYAxq65/+oZjiKC8zSxwvp964M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocsparse/default.nix b/pkgs/development/rocm-modules/rocsparse/default.nix index 232afb68179a..df695fb09d6c 100644 --- a/pkgs/development/rocm-modules/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/rocsparse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse${clr.gpuArchSuffix}"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-tLBfVAoviHL0LpwWslvz2w2b7wwW5xj6kKKqADTjC4s="; + hash = "sha256-0KFzrVGScCQDbOdlX016ymZ4lgCimd9XK4auK9V5p3k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix index 9eb25b017023..940bedc8fa83 100644 --- a/pkgs/development/rocm-modules/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/rocthrust/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/roctracer/default.nix b/pkgs/development/rocm-modules/roctracer/default.nix index ce9baed22619..fd71442c4c58 100644 --- a/pkgs/development/rocm-modules/roctracer/default.nix +++ b/pkgs/development/rocm-modules/roctracer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "roctracer"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix index ddff8d17598a..6b3800c83b12 100644 --- a/pkgs/development/rocm-modules/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/rocwmma/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "7.0.1"; + version = "7.0.2"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocWMMA"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-EnQF3V8sk234JNZTqpVUcRv8pVFWpkFJYVgLLuxqm2E="; + hash = "sha256-xCLoYvbKiAgAxDCbEopNxYBs3V3EJBmO3NpONiveXvE="; }; patches = lib.optionals (buildTests || buildBenchmarks) [ diff --git a/pkgs/development/rocm-modules/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix index e8a5c2c37350..bfa3849a3987 100644 --- a/pkgs/development/rocm-modules/rpp/default.nix +++ b/pkgs/development/rocm-modules/rpp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix index a1fcab0f2379..b4d150b357f3 100644 --- a/pkgs/development/rocm-modules/tensile/default.nix +++ b/pkgs/development/rocm-modules/tensile/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "tensile"; - version = "7.0.0"; + version = "7.0.2"; pyproject = true; src = fetchFromGitHub { owner = "ROCm"; repo = "Tensile"; rev = "rocm-${version}"; - hash = "sha256-miNQzXfr/1qIqPJqun42zp6QGI6v6K1fKIXdCfkNKow="; + hash = "sha256-1G6qp/VBJL67QW9t2VB5KK5lwn+PbY0hqHq8DzyK2fg="; }; # TODO: It should be possible to run asm caps test ONCE for all supported arches From 2ed265624cde67609ab5bfcb964972a9d0a9f287 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 21 Dec 2025 08:35:41 -0800 Subject: [PATCH 024/142] rocmPackages.rdc: fix upstream CMake issues with build types and libcap include Applies: - fix(rdc): Fix CXXFLAGS clobbering and incompatibility with non-x64 architecture ROCm/rocm-systems#2423 - fix(rdc): use pkg-config to find libcap ROCm/rocm-systems#2424 --- pkgs/development/rocm-modules/rdc/default.nix | 15 +- .../rocm-modules/rdc/fix-cmake-cxxflags.patch | 217 ++++++++++++++++++ .../rdc/fix-libcap-pkgconfig.patch | 57 +++++ 3 files changed, 285 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/rocm-modules/rdc/fix-cmake-cxxflags.patch create mode 100644 pkgs/development/rocm-modules/rdc/fix-libcap-pkgconfig.patch diff --git a/pkgs/development/rocm-modules/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix index 1177fedb87c8..8d25a239f168 100644 --- a/pkgs/development/rocm-modules/rdc/default.nix +++ b/pkgs/development/rocm-modules/rdc/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, rocmUpdateScript, cmake, + pkg-config, amdsmi, rocm-smi, rocm-runtime, @@ -67,8 +68,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ztInmK3oCbvnLe7XQ55/hUHRyhuZ2M2XVTG1NcVHtGs="; }; + patches = [ + # https://github.com/ROCm/rocm-systems/pull/2423 + ./fix-cmake-cxxflags.patch + # https://github.com/ROCm/rocm-systems/pull/2424 + ./fix-libcap-pkgconfig.patch + ]; + nativeBuildInputs = [ cmake + pkg-config protobuf ] ++ lib.optionals buildDocs [ @@ -90,10 +99,8 @@ stdenv.mkDerivation (finalAttrs: { gtest ]; - CXXFLAGS = "-I${libcap.dev}/include"; - cmakeFlags = [ - "-DCMAKE_VERBOSE_MAKEFILE=OFF" + "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DRDC_INSTALL_PREFIX=${placeholder "out"}" "-DBUILD_RVS=OFF" # TODO: Needs RVS package "-DBUILD_ROCRTEST=ON" @@ -114,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace CMakeLists.txt \ - --replace "file(STRINGS /etc/os-release LINUX_DISTRO LIMIT_COUNT 1 REGEX \"NAME=\")" "set(LINUX_DISTRO \"NixOS\")" + --replace-fail "file(STRINGS /etc/os-release LINUX_DISTRO LIMIT_COUNT 1 REGEX \"NAME=\")" "set(LINUX_DISTRO \"NixOS\")" ''; postInstall = '' diff --git a/pkgs/development/rocm-modules/rdc/fix-cmake-cxxflags.patch b/pkgs/development/rocm-modules/rdc/fix-cmake-cxxflags.patch new file mode 100644 index 000000000000..bf7f3dbb0eef --- /dev/null +++ b/pkgs/development/rocm-modules/rdc/fix-cmake-cxxflags.patch @@ -0,0 +1,217 @@ +From 92f25181dbf722cb749e445851580df4ea779299 Mon Sep 17 00:00:00 2001 +From: Luna Nova +Date: Sun, 21 Dec 2025 08:01:08 -0800 +Subject: [PATCH 1/2] fix(rdc): set CMAKE_CXX_FLAGS after project() to avoid + clobbering env + +CMAKE_CXX_FLAGS' initial value is set from $CXXFLAGS on project() call +so the previous location ignored CXXFLAGS from env or CMake toolchain +config. + +Ref: https://cmake.org/cmake/help/v4.2/variable/CMAKE_LANG_FLAGS_INIT.html +Fixes: 874a7b438f ("CMAKE - Fix build types") +--- + CMakeLists.txt | 48 +++++++++++++++++++------------------ + 1 file changed, 25 insertions(+), 23 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 907c9fbff42..8b386c7be3d 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,29 +55,6 @@ set_property( + PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo" "MinSizeRel" + ) + +-# Set compile flags +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2") +-set(CMAKE_CXX_FLAGS_DEBUG +- "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG" +- CACHE STRING +- "Flags for Debug builds" +-) +-set(CMAKE_CXX_FLAGS_RELEASE +- "${CMAKE_CXX_FLAGS_RELEASE} -O2 -s -DNDEBUG" +- CACHE STRING +- "Flags for Release builds" +-) +-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO +- "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG" +- CACHE STRING +- "Flags for RelWithDebInfo builds" +-) +-set(CMAKE_CXX_FLAGS_MINSIZEREL +- "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG" +- CACHE STRING +- "Flags for MinSizeRel builds" +-) +- + set(CMAKE_MODULE_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/" + CACHE INTERNAL +@@ -155,6 +132,31 @@ project(${RDC} VERSION "${VERSION_STRING}" HOMEPAGE_URL "https://github.com/Rade + # this must go after project() + include(GNUInstallDirs) + ++# NB: CMAKE__FLAGS are initialized from environment (CXXFLAGS et al.) ++# during project(). Setting them before project() discards env and toolchain ++# defaults. Cf. CMAKE__FLAGS_INIT for toolchain overrides. ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2") ++set(CMAKE_CXX_FLAGS_DEBUG ++ "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG" ++ CACHE STRING ++ "Flags for Debug builds" ++) ++set(CMAKE_CXX_FLAGS_RELEASE ++ "${CMAKE_CXX_FLAGS_RELEASE} -O2 -s -DNDEBUG" ++ CACHE STRING ++ "Flags for Release builds" ++) ++set(CMAKE_CXX_FLAGS_RELWITHDEBINFO ++ "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG" ++ CACHE STRING ++ "Flags for RelWithDebInfo builds" ++) ++set(CMAKE_CXX_FLAGS_MINSIZEREL ++ "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG" ++ CACHE STRING ++ "Flags for MinSizeRel builds" ++) ++ + set(COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/common") + + set(GRPC_ROOT_DEFAULT "/usr") + +From 0c8710c3570963b29c709b1cd1f78b15fd73a950 Mon Sep 17 00:00:00 2001 +From: Luna Nova +Date: Sun, 21 Dec 2025 08:13:04 -0800 +Subject: [PATCH 2/2] fix(rdc): don't reimplement CMake default build type flag + logic + +The previous approach was overly complicated and added nothing. CMake already defaults +similar flags for each of the default supported build types. +Additionally, the previous flags broke AArch64 as -m64 -msse are incompatible. +It's not necessary to explicitly set this with modern toolchains. + +Fixes: 874a7b438f ("CMAKE - Fix build types") +Fixes: bc7f01e992 ("Initial RDC commit") +--- + CMakeLists.txt | 25 +--------------------- + example/CMakeLists.txt | 26 ++--------------------- + tests/example/CMakeLists.txt | 24 +-------------------- + 3 files changed, 4 insertions(+), 71 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b386c7be3d..251fcddd653 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -132,30 +132,7 @@ project(${RDC} VERSION "${VERSION_STRING}" HOMEPAGE_URL "https://github.com/Rade + # this must go after project() + include(GNUInstallDirs) + +-# NB: CMAKE__FLAGS are initialized from environment (CXXFLAGS et al.) +-# during project(). Setting them before project() discards env and toolchain +-# defaults. Cf. CMAKE__FLAGS_INIT for toolchain overrides. +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2") +-set(CMAKE_CXX_FLAGS_DEBUG +- "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG" +- CACHE STRING +- "Flags for Debug builds" +-) +-set(CMAKE_CXX_FLAGS_RELEASE +- "${CMAKE_CXX_FLAGS_RELEASE} -O2 -s -DNDEBUG" +- CACHE STRING +- "Flags for Release builds" +-) +-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO +- "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG" +- CACHE STRING +- "Flags for RelWithDebInfo builds" +-) +-set(CMAKE_CXX_FLAGS_MINSIZEREL +- "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG" +- CACHE STRING +- "Flags for MinSizeRel builds" +-) ++add_compile_options(-Wall -Wextra) + + set(COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/common") + +diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt +index 378a2005818..7c51307ec38 100755 +--- a/example/CMakeLists.txt ++++ b/example/CMakeLists.txt +@@ -31,30 +31,6 @@ cmake_minimum_required(VERSION 3.15) + option(CMAKE_VERBOSE_MAKEFILE "Enable verbose output" ON) + option(CMAKE_EXPORT_COMPILE_COMMANDS "Export compile commands for linters and autocompleters" ON) + +-# Set compile flags +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2") +-set(CMAKE_CXX_FLAGS_DEBUG +- "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG" +- CACHE STRING +- "Flags for Debug builds" +-) +-# note: no '-s' here unlike other CMakeLists.txt +-set(CMAKE_CXX_FLAGS_RELEASE +- "${CMAKE_CXX_FLAGS_RELEASE} -O2 -DNDEBUG" +- CACHE STRING +- "Flags for Release builds" +-) +-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO +- "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG" +- CACHE STRING +- "Flags for RelWithDebInfo builds" +-) +-set(CMAKE_CXX_FLAGS_MINSIZEREL +- "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG" +- CACHE STRING +- "Flags for MinSizeRel builds" +-) +- + set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard to use") + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) +@@ -66,6 +42,8 @@ endif() + + project(RDC_example) + ++add_compile_options(-Wall -Wextra) ++ + # provides cmake_print_variables(VAR) + include(CMakePrintHelpers) + +diff --git a/tests/example/CMakeLists.txt b/tests/example/CMakeLists.txt +index d5614f387bd..13c2f3857a1 100755 +--- a/tests/example/CMakeLists.txt ++++ b/tests/example/CMakeLists.txt +@@ -22,29 +22,7 @@ message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&") + message(" Cmake Example Lib ") + message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&") + +-# Set compile flags +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2") +-set(CMAKE_CXX_FLAGS_DEBUG +- "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG" +- CACHE STRING +- "Flags for Debug builds" +-) +-# note: no '-s' here unlike other CMakeLists.txt +-set(CMAKE_CXX_FLAGS_RELEASE +- "${CMAKE_CXX_FLAGS_RELEASE} -O2 -DNDEBUG" +- CACHE STRING +- "Flags for Release builds" +-) +-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO +- "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG" +- CACHE STRING +- "Flags for RelWithDebInfo builds" +-) +-set(CMAKE_CXX_FLAGS_MINSIZEREL +- "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG" +- CACHE STRING +- "Flags for MinSizeRel builds" +-) ++add_compile_options(-Wall -Wextra) + + # Required Defines first: + diff --git a/pkgs/development/rocm-modules/rdc/fix-libcap-pkgconfig.patch b/pkgs/development/rocm-modules/rdc/fix-libcap-pkgconfig.patch new file mode 100644 index 000000000000..54e7303ce88f --- /dev/null +++ b/pkgs/development/rocm-modules/rdc/fix-libcap-pkgconfig.patch @@ -0,0 +1,57 @@ +From 299f2c770ff0abf07b8f394f154168d2aa78aa60 Mon Sep 17 00:00:00 2001 +From: Luna Nova +Date: Sun, 21 Dec 2025 08:23:01 -0800 +Subject: [PATCH] fix(rdc): use pkg-config to find libcap + +If libcap isn't available in system wide FHS include paths building would fail. +Fix this by using pkg-config to find libcap which provides both the library +to link and include dirs. +--- + CMakeLists.txt | 6 +++--- + rdc_libs/rdc/CMakeLists.txt | 2 +- + server/CMakeLists.txt | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 907c9fbff42..00e0a9dd87d 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -192,9 +192,9 @@ mark_as_advanced( + CPACK_GENERATOR + ) + +-# check if libcap exists +-# needed for sys/capabilities.h +-find_library(LIB_CAP NAMES cap REQUIRED) ++# needed for sys/capability.h ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(LIBCAP REQUIRED IMPORTED_TARGET libcap) + + if(BUILD_STANDALONE AND GRPC_ROOT STREQUAL GRPC_ROOT_DEFAULT) + message( +diff --git a/rdc_libs/rdc/CMakeLists.txt b/rdc_libs/rdc/CMakeLists.txt +index d4e368edca5..f9a3ac4c487 100644 +--- a/rdc_libs/rdc/CMakeLists.txt ++++ b/rdc_libs/rdc/CMakeLists.txt +@@ -71,7 +71,7 @@ set(RDC_LIB_INC_LIST + message("RDC_LIB_INC_LIST=${RDC_LIB_INC_LIST}") + + add_library(${RDC_LIB} SHARED ${RDC_LIB_SRC_LIST} ${RDC_LIB_INC_LIST}) +-target_link_libraries(${RDC_LIB} ${BOOTSTRAP_LIB} pthread amd_smi cap) ++target_link_libraries(${RDC_LIB} ${BOOTSTRAP_LIB} pthread amd_smi PkgConfig::LIBCAP) + target_include_directories( + ${RDC_LIB} + PRIVATE "${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/include" "${AMD_SMI_INCLUDE_DIR}" +diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt +index baf0d851c86..0a6e71dda1c 100755 +--- a/server/CMakeLists.txt ++++ b/server/CMakeLists.txt +@@ -97,7 +97,7 @@ target_link_libraries( + pthread + rt + gRPC::grpc++ +- cap ++ PkgConfig::LIBCAP + dl + amd_smi + rdc_bootstrap From 3504249611cca4485c2b0fbd374345783e4fe750 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 21 Dec 2025 15:50:49 -0800 Subject: [PATCH 025/142] rocmPackages.migraphx: fix unicode minus sign breaking CArrays embed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A comment in src/targets/gpu/kernels/include/migraphx/kernels/bit.hpp contains a Unicode MINUS SIGN instead of ASCII hyphen: // popcount(~(x | −x)) When EMBED_USE=CArrays, the cmake Embed.cmake mechanism reads source files as hex and generates char[] arrays. The UTF-8 encoding of U+2212 (0xe2 0x88 0x92) causes a compile error: constant expression evaluates to 226 which cannot be narrowed to type 'char' [-Wc++11-narrowing] --- pkgs/development/rocm-modules/migraphx/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix index f2f0ddb74e8e..afce720b4f23 100644 --- a/pkgs/development/rocm-modules/migraphx/default.nix +++ b/pkgs/development/rocm-modules/migraphx/default.nix @@ -153,6 +153,12 @@ stdenv.mkDerivation (finalAttrs: { # `error: '__clang_hip_runtime_wrapper.h' file not found [clang-diagnostic-error]` substituteInPlace CMakeLists.txt \ --replace "set(MIGRAPHX_TIDY_ERRORS ALL)" "" + + # Fix Unicode minus sign (U+2212) in comment that breaks EMBED_USE=CArrays + # The embed mechanism generates char[] arrays that can't store unicode − + # which has values >127 + substituteInPlace src/targets/gpu/kernels/include/migraphx/kernels/bit.hpp \ + --replace-fail "// popcount(~(x | −x))" "// popcount(~(x | -x))" '' + lib.optionalString (!buildDocs) '' substituteInPlace CMakeLists.txt \ From d379fc21faa852b86f8cf8e61a2c24c13bebcde7 Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Fri, 26 Dec 2025 09:16:08 -0800 Subject: [PATCH 026/142] rocmPackages.clr: add HIP impure tests for generic-arch and isa-compat Co-Authored-By: Luna Nova --- pkgs/development/rocm-modules/clr/default.nix | 27 +++++++ .../rocm-modules/clr/test-isa-compat.nix | 74 +++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 pkgs/development/rocm-modules/clr/test-isa-compat.nix diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index 4861e59fb7e2..79070cb3ffba 100644 --- a/pkgs/development/rocm-modules/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -269,6 +269,33 @@ stdenv.mkDerivation (finalAttrs: { opencl-example = callPackage ./test-opencl-example.nix { clr = finalAttrs.finalPackage; }; + generic-arch = callPackage ./test-isa-compat.nix { + clr = finalAttrs.finalPackage; + name = "generic-arch"; + offloadArches = [ + "gfx9-generic" + "gfx10-1-generic" + "gfx10-3-generic" + "gfx11-generic" + "gfx12-generic" + ]; + }; + isa-compat = callPackage ./test-isa-compat.nix { + clr = finalAttrs.finalPackage; + name = "isa-compat"; + offloadArches = [ + "gfx900" + "gfx1010" + "gfx1030" + ]; + }; + spirv = callPackage ./test-isa-compat.nix { + clr = finalAttrs.finalPackage; + name = "spirv"; + offloadArches = [ + "amdgcnspirv" + ]; + }; }; selectGpuTargets = diff --git a/pkgs/development/rocm-modules/clr/test-isa-compat.nix b/pkgs/development/rocm-modules/clr/test-isa-compat.nix new file mode 100644 index 000000000000..2eca8edbff3d --- /dev/null +++ b/pkgs/development/rocm-modules/clr/test-isa-compat.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + makeImpureTest, + fetchFromGitHub, + clr, + rocm-smi, + name, + offloadArches, +}: + +let + # TODO: swap to another tiny test if this breaks; upstream is archived but fine for now + vectoradd = stdenv.mkDerivation { + pname = "rocm-hip-vectoradd"; + version = "2024-04-11"; + + src = fetchFromGitHub { + owner = "ROCm"; + repo = "HIP-Examples"; + rev = "cdf9d101acd9a3fc89ee750f73c1f1958cbd5cc3"; + hash = "sha256-/I1KmOBFbEZIjA1vRE+2tPTtEKtOgazjCbnZtr+87E0="; + }; + + nativeBuildInputs = [ + clr + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + amdclang++ -x hip -o $out/bin/vectoradd \ + ${lib.concatMapStringsSep " " (arch: "--offload-arch=${arch}") offloadArches} \ + vectorAdd/vectoradd_hip.cpp + + runHook postInstall + ''; + + meta = { + description = "vectorAdd HIP example for ROCm"; + homepage = "https://github.com/ROCm/HIP-Examples"; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + teams = [ lib.teams.rocm ]; + }; + }; + +in +makeImpureTest { + inherit name; + testedPackage = "rocmPackages.clr"; + + sandboxPaths = [ + "/sys" + "/dev/dri" + "/dev/kfd" + ]; + + nativeBuildInputs = [ + vectoradd + rocm-smi + ]; + + testScript = '' + rocm-smi + + vectoradd + ''; + + meta = { + teams = [ lib.teams.rocm ]; + }; +} From 12f2544fccb7b43acb88df75e8536c7a6893b6c9 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 27 Dec 2025 06:19:53 -0800 Subject: [PATCH 027/142] zluda: use finalAttrs --- pkgs/by-name/zl/zluda/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix index 6dce56c92190..043367d8f421 100644 --- a/pkgs/by-name/zl/zluda/package.nix +++ b/pkgs/by-name/zl/zluda/package.nix @@ -14,7 +14,7 @@ stdenv, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "zluda"; version = "4-unstable-2025-01-28"; @@ -80,10 +80,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "CUDA on non-Nvidia GPUs"; homepage = "https://github.com/vosen/ZLUDA"; - changelog = "https://github.com/vosen/ZLUDA/releases/tag/${src.rev}"; + changelog = "https://github.com/vosen/ZLUDA/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.errnoh ]; }; -} +}) From 6f09201211929a22feb3e446fd05bb9b30fd2d15 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 27 Dec 2025 06:47:55 -0800 Subject: [PATCH 028/142] zluda: 4-unstable-2025-01-28 -> 6-preview.45 Bumping to a new unstable tag for ROCm 7.x support --- pkgs/by-name/zl/zluda/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix index 043367d8f421..e8810be5aeed 100644 --- a/pkgs/by-name/zl/zluda/package.nix +++ b/pkgs/by-name/zl/zluda/package.nix @@ -16,14 +16,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zluda"; - version = "4-unstable-2025-01-28"; + version = "6-preview.45"; src = fetchFromGitHub { owner = "vosen"; repo = "ZLUDA"; - # Cargo.lock introduced and major bug fixes in this commit - rev = "df5a96d935b014f88e30af4abc487882b0b54a76"; - hash = "sha256-T2pCZZzZbCLI01YSF0VguKtL3EDEdIoUyH4C9ccaCi8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-796OuIM5a0saE0v1QHHAGRjUPT+YAIfUuEtAruMn8Mk="; fetchSubmodules = true; }; @@ -35,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rocmPackages.rocsolver rocmPackages.rocblas rocmPackages.hipblas + rocmPackages.hipblaslt rocmPackages.rocm-cmake rocmPackages.hipfft zlib @@ -50,7 +50,10 @@ rustPlatform.buildRustPackage (finalAttrs: { clang ]; - cargoHash = "sha256-hDQWjzkx7YdkgSmNKTzCa2VhBFvn6P9QANV9hJ7UiT8="; + cargoHash = "sha256-YNBeweZ/vfXGfM0lrZbAh71z6Rb0+B7nOuO8VL2BmCo="; + + # Tests require a GPU and segfault in the sandbox + doCheck = false; # xtask doesn't support passing --target, but nix hooks expect the folder structure from when it's set env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.cargoShortTarget; From fa7beaf3411399b5cb70b388f1d0fe6a59c2535c Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Fri, 2 Jan 2026 18:23:29 -0800 Subject: [PATCH 029/142] rocmPackages.aotriton: 0.10b -> 0.11.1b Diff: https://github.com/ROCm/aotriton/compare/0.10b...0.11.1b --- .../rocm-modules/aotriton/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/rocm-modules/aotriton/default.nix b/pkgs/development/rocm-modules/aotriton/default.nix index 99d0c1d46bda..03d6e3f6c30c 100644 --- a/pkgs/development/rocm-modules/aotriton/default.nix +++ b/pkgs/development/rocm-modules/aotriton/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "aotriton${lib.optionalString (!anySupportedTargets) "-shim"}"; - version = "0.10b"; + version = "0.11.1b"; src = fetchFromGitHub { owner = "ROCm"; repo = "aotriton"; tag = finalAttrs.version; - hash = "sha256-stAHnsqChkNv69wjlhM/qUetrJpNwI1i7rGnPMwsNz0="; + hash = "sha256-F7JjyS+6gMdCpOFLldTsNJdVzzVwd6lwW7+V8ZOZfig="; leaveDotGit = true; # fetch all submodules except unused triton submodule that is ~500MB postFetch = '' @@ -65,9 +65,11 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = if anySupportedTargets then [ "big-parallel" ] else [ ]; env = { + AOTRITON_CI_SUPPLIED_SHA1 = finalAttrs.version; ROCM_PATH = "${clr}"; CFLAGS = "-w -g1 -gz -Wno-c++11-narrowing"; CXXFLAGS = finalAttrs.env.CFLAGS; + TRITON_STORE_BINARY_ONLY = 1; # reduce triton disk space usage }; nativeBuildInputs = [ @@ -97,14 +99,6 @@ stdenv.mkDerivation (finalAttrs: { triton ]); - patches = [ - # CMakeLists.txt: AOTRITON_INHERIT_SYSTEM_SITE_TRITON flag - (fetchpatch { - url = "https://github.com/ROCm/aotriton/commit/9734c3e999c412a07d2b35671998650942b26ed4.patch"; - hash = "sha256-tBmjjhRJmLv3K6F2+4OcMuwf8dH7efPPECMQjh6QdUA="; - }) - ]; - # Excerpt from README: # Note: do not run ninja separately, due to the limit of the current build system, # ninja install will run the whole build process unconditionally. @@ -126,8 +120,8 @@ stdenv.mkDerivation (finalAttrs: { # picked if nix-shell is used against this package preConfigure = '' cmakeFlagsArray+=( - "-DVENV_DIR=$(pwd)/aotriton-venv/" - "-DVENV_BIN_PYTHON=$(pwd)/aotriton-venv/bin/python" + "-DVENV_DIR=$(pwd)/build/venv/" + "-DVENV_BIN_PYTHON=$(pwd)/build/venv/bin/python" ) ''; @@ -136,6 +130,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "AOTRITON_NOIMAGE_MODE" (!anySupportedTargets)) # Use preinstalled triton from our python's site-packages (lib.cmakeBool "AOTRITON_INHERIT_SYSTEM_SITE_TRITON" true) + # Circular dependency + (lib.cmakeBool "AOTRITON_USE_TORCH" false) # FP32 kernels are optional, turn them off to speed up builds and save space # Perf sensitive code should be using BF16 or F16 (lib.cmakeBool "AOTRITON_ENABLE_FP32_INPUTS" false) From c01d90f7566621f855bb67a7964036660d518f09 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 21 Dec 2025 07:21:57 -0800 Subject: [PATCH 030/142] rocmPackages.hiprt: 2.5.a21e075.3 -> 3.0.3.a1525e7 PR to drop encryption support was accepted upstream so we can simplify the build slightly. Changes from 2.5: - RDNA 4 support (compressed BVH8, triangle packets, intersectable instances, OBB) - new generic BVH2 import API - per-context logger - removed kernel encryption - various bug fixes for RDNA 2 - ROCm 7 support --- pkgs/development/rocm-modules/hiprt/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/rocm-modules/hiprt/default.nix b/pkgs/development/rocm-modules/hiprt/default.nix index d856477a01cc..bd2a9f6f11fd 100644 --- a/pkgs/development/rocm-modules/hiprt/default.nix +++ b/pkgs/development/rocm-modules/hiprt/default.nix @@ -9,17 +9,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiprt"; - version = "2.5.a21e075.3"; + version = "3.0.3.a1525e7"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "HIPRT"; tag = finalAttrs.version; - sha256 = "sha256-3yGhwIsFHlFMCEzuYnXuXNzs99m7f2LTkYaTGs0GEcI="; + hash = "sha256-7r7KO+WuXOeQQhYLYpJRrD4ZqVsBOqaD2NGD15CWnoo="; }; postPatch = '' - rm -rf contrib/easy-encrypt # contains prebuilt easy-encrypt binaries, we disable encryption substituteInPlace contrib/Orochi/contrib/hipew/src/hipew.cpp --replace-fail '"/opt/rocm/hip/lib/' '"${clr}/lib' substituteInPlace hiprt/hiprt_libpath.h --replace-fail '"/opt/rocm/hip/lib/' '"${clr}/lib/' ''; @@ -40,8 +39,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "PRECOMPILE" true) # needs accelerator (lib.cmakeBool "NO_UNITTEST" true) - # we have no need to support baking encrypted kernels into object files - (lib.cmakeBool "NO_ENCRYPT" true) (lib.cmakeBool "FORCE_DISABLE_CUDA" true) ]; From c23f22dd5b96e2143de1b3ec5b15e6f9af629fa1 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 3 Jan 2026 11:04:41 -0800 Subject: [PATCH 031/142] blender-hip: manual backport of hiprt 3 support Minimal backport that applies on current blender of https://projects.blender.org/blender/blender/pulls/144889 --- pkgs/by-name/bl/blender/hiprt-3-compat.patch | 72 ++++++++++++++++++++ pkgs/by-name/bl/blender/package.nix | 3 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/by-name/bl/blender/hiprt-3-compat.patch diff --git a/pkgs/by-name/bl/blender/hiprt-3-compat.patch b/pkgs/by-name/bl/blender/hiprt-3-compat.patch new file mode 100644 index 000000000000..b3f410128507 --- /dev/null +++ b/pkgs/by-name/bl/blender/hiprt-3-compat.patch @@ -0,0 +1,72 @@ +diff --git a/extern/hipew/include/hiprtew.h b/extern/hipew/include/hiprtew.h +index d245cb76..952ed805 100644 +--- a/extern/hipew/include/hiprtew.h ++++ b/extern/hipew/include/hiprtew.h +@@ -157,7 +157,7 @@ typedef hiprtError (thiprtDestroyGlobalStackBuffer)( hiprtContext context, hiprt + + typedef hiprtError(thiprtDestroyFuncTable)(hiprtContext context, + hiprtFuncTable funcTable); +-typedef void(thiprtSetLogLevel)( hiprtLogLevel level ); ++typedef hiprtError(thiprtSetLogLevel)( hiprtContext context, hiprtLogLevel level ); + + /* Function declarations. */ + extern thiprtCreateContext *hiprtCreateContext; +diff --git a/extern/hipew/src/hipew.c b/extern/hipew/src/hipew.c +index e72ccde6..138e1efc 100644 +--- a/extern/hipew/src/hipew.c ++++ b/extern/hipew/src/hipew.c +@@ -241,13 +241,13 @@ static int hipewHipInit(void) { + /* ROCm 6 changes paths from /opt/rocm/hip/lib to /opt/rocm/lib, so + * search for libraries there. */ + +- const char* hip_paths[] = { "libamdhip64.so", ++ const char* hip_paths[] = { "libamdhip64.so.7", ++ "/opt/rocm/lib/libamdhip64.so.7", ++ "/opt/rocm/hip/lib/libamdhip64.so.7", + "libamdhip64.so.6", + "/opt/rocm/lib/libamdhip64.so.6", + "/opt/rocm/hip/lib/libamdhip64.so.6", +- "libamdhip64.so.7", +- "/opt/rocm/lib/libamdhip64.so.7", +- "/opt/rocm/hip/lib/libamdhip64.so.7", ++ "libamdhip64.so", + NULL }; + #endif + static int initialized = 0; +diff --git a/intern/cycles/device/hiprt/device_impl.cpp b/intern/cycles/device/hiprt/device_impl.cpp +index c251a8d0..b54bc36c 100644 +--- a/intern/cycles/device/hiprt/device_impl.cpp ++++ b/intern/cycles/device/hiprt/device_impl.cpp +@@ -104,10 +104,10 @@ HIPRTDevice::HIPRTDevice(const DeviceInfo &info, + } + + if (LOG_IS_ON(LOG_LEVEL_TRACE)) { +- hiprtSetLogLevel(hiprtLogLevelInfo | hiprtLogLevelWarn | hiprtLogLevelError); ++ hiprtSetLogLevel(hiprt_context, hiprtLogLevelInfo | hiprtLogLevelWarn | hiprtLogLevelError); + } + else { +- hiprtSetLogLevel(hiprtLogLevelNone); ++ hiprtSetLogLevel(hiprt_context, hiprtLogLevelNone); + } + } + +diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt +index bcaf4e16..aa6a3d17 100644 +--- a/intern/cycles/kernel/CMakeLists.txt ++++ b/intern/cycles/kernel/CMakeLists.txt +@@ -93,13 +93,13 @@ set(SRC_KERNEL_DEVICE_HIPRT_HEADERS + set(SRC_KERNEL_DEVICE_HIPRT_SDK + hiprt/impl/Aabb.h + hiprt/impl/BvhNode.h +- hiprt/impl/Geometry.h ++ hiprt/impl/Header.h + hiprt/impl/hiprt_device_impl.h + hiprt/impl/hiprt_kernels_bitcode.h + hiprt/impl/Instance.h ++ hiprt/impl/Obb.h + hiprt/impl/QrDecomposition.h + hiprt/impl/Quaternion.h +- hiprt/impl/Scene.h + hiprt/impl/Transform.h + hiprt/impl/Triangle.h + ) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index f4cec841f317..33630f2a2b26 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -126,6 +126,9 @@ stdenv'.mkDerivation (finalAttrs: { hash = "sha256-fNnQRfGfNc7rbk8npkcYtoAqRjJc6MaV4mqtSJxd0EM="; }; + # Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889 + patches = lib.optional rocmSupport ./hiprt-3-compat.patch; + postPatch = (lib.optionalString stdenv.hostPlatform.isDarwin '' : > build_files/cmake/platform/platform_apple_xcode.cmake From cadf2c1f093f6d1ad094f7236f7ebb05110f8411 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 3 Jan 2026 12:18:33 -0800 Subject: [PATCH 032/142] opensplat: add ROCm support --- pkgs/by-name/op/opensplat/package.nix | 57 +++++++++++++++++++++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/opensplat/package.nix b/pkgs/by-name/op/opensplat/package.nix index 45791b230c1b..a4c417c9be8e 100644 --- a/pkgs/by-name/op/opensplat/package.nix +++ b/pkgs/by-name/op/opensplat/package.nix @@ -12,15 +12,16 @@ cxxopts, nix-update-script, config, - # Upstream has rocm/hip support, too. anyone? cudaSupport ? config.cudaSupport, cudaPackages, + rocmSupport ? config.rocmSupport, + rocmPackages, autoAddDriverRunpath, fetchpatch2, }: let version = "1.1.4"; - torch = python3.pkgs.torch.override { inherit cudaSupport; }; + torch = python3.pkgs.torch.override { inherit cudaSupport rocmSupport; }; # Using a normal stdenv with cuda torch gives # ld: /nix/store/k1l7y96gv0nc685cg7i3g43i4icmddzk-python3.11-torch-2.2.1-lib/lib/libc10.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32' stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv; @@ -43,10 +44,32 @@ stdenv'.mkDerivation { }) ]; + postPatch = lib.optionalString rocmSupport '' + # ROCm CMake targets must be available before find_package(Torch) + # because Torch's Caffe2Targets.cmake references them in torch_hip_library + substituteInPlace CMakeLists.txt \ + --replace-fail "find_package(Torch REQUIRED)" \ + "find_package(hip REQUIRED) + find_package(hiprtc REQUIRED) + find_package(hipblas REQUIRED) + find_package(hipfft REQUIRED) + find_package(hiprand REQUIRED) + find_package(hipsparse REQUIRED) + find_package(hipsolver REQUIRED) + find_package(hipblaslt REQUIRED) + find_package(rocblas REQUIRED) + find_package(rocsolver REQUIRED) + find_package(miopen REQUIRED) + find_package(Torch REQUIRED)" + ''; + nativeBuildInputs = [ cmake ninja ] + ++ lib.optionals rocmSupport [ + rocmPackages.clr + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc autoAddDriverRunpath @@ -61,16 +84,39 @@ stdenv'.mkDerivation { torch opencv ] + ++ lib.optionals rocmSupport [ + rocmPackages.clr + rocmPackages.hipblas + rocmPackages.hipfft + rocmPackages.hiprand + rocmPackages.hipsparse + rocmPackages.hipsolver + rocmPackages.hipblaslt + rocmPackages.rocblas + rocmPackages.rocsolver + rocmPackages.rocsolver + rocmPackages.miopen + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; - env.TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" python3.pkgs.torch.cudaCapabilities}"; + env = + lib.optionalAttrs cudaSupport { + TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" python3.pkgs.torch.cudaCapabilities}"; + NIX_LDFLAGS = "-L${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"; # fixes -lcuda not found + } + // lib.optionalAttrs rocmSupport { + HIPFLAGS = "-I${lib.getInclude rocmPackages.rocthrust}/include -I${lib.getInclude rocmPackages.rocprim}/include"; + }; cmakeFlags = [ (lib.cmakeBool "CMAKE_SKIP_RPATH" true) (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") ] + ++ lib.optionals rocmSupport [ + (lib.cmakeFeature "GPU_RUNTIME" "HIP") + ] ++ lib.optionals cudaSupport [ (lib.cmakeFeature "GPU_RUNTIME" "CUDA") (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}/") @@ -87,7 +133,10 @@ stdenv'.mkDerivation { # vendored+modified gsplat lib.licenses.asl20 ]; - maintainers = [ lib.maintainers.jcaesar ]; + maintainers = [ + lib.maintainers.jcaesar + lib.maintainers.LunNova + ]; platforms = lib.platforms.linux ++ lib.optionals (!cudaSupport) lib.platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b49fa2ec8d9..fc41a46d7d04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4104,6 +4104,7 @@ with pkgs; colmapWithCuda = colmap.override { cudaSupport = true; }; + opensplatWithRocm = opensplat.override { rocmSupport = true; }; opensplatWithCuda = opensplat.override { cudaSupport = true; }; chickenPackages_4 = recurseIntoAttrs (callPackage ../development/compilers/chicken/4 { }); From 593a9b0d791f5ea42acce37e8af65cc33ed6b5d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Jan 2026 22:05:50 +0000 Subject: [PATCH 033/142] remind: 06.02.01 -> 06.02.02 --- pkgs/by-name/re/remind/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 0836507147fe..813f4fa9e139 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -16,14 +16,14 @@ tcl.mkTclDerivation rec { pname = "remind"; - version = "06.02.01"; + version = "06.02.02"; src = fetchFromGitea { domain = "git.skoll.ca"; owner = "Skollsoft-Public"; repo = "Remind"; rev = version; - hash = "sha256-bdR0uLPUGAaB5w4BNPaPOuI9Eg3utyETlUlLIQmcxMs="; + hash = "sha256-SkQT651LjHCZJRtb4Itbzqhq9x5p05jYUam1XiYT4os="; }; propagatedBuildInputs = lib.optionals withGui [ From bea9e308a86f80f21ad33bf5fc1a905fcedfddac Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 17 Jan 2026 00:00:35 +0100 Subject: [PATCH 034/142] python3Packages.aiosendspin: set version --- pkgs/development/python-modules/aiosendspin/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/aiosendspin/default.nix b/pkgs/development/python-modules/aiosendspin/default.nix index 752a8aeaf527..148de20f5905 100644 --- a/pkgs/development/python-modules/aiosendspin/default.nix +++ b/pkgs/development/python-modules/aiosendspin/default.nix @@ -30,6 +30,12 @@ buildPythonPackage rec { hash = "sha256-3vTEfXeFqouPswRKST/9U7yg9ah7J9m2KAMoxaBZNR0="; }; + # https://github.com/Sendspin/aiosendspin/blob/1.2.0/pyproject.toml#L7 + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + build-system = [ setuptools ]; From e145b863c73abe9332b6214219375cda4f7234b5 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 17 Jan 2026 00:26:35 +0100 Subject: [PATCH 035/142] python3Packages.aiosendspin: 1.2.0 -> 2.1.0 https://github.com/Sendspin/aiosendspin/releases/tag/2.0.0 https://github.com/Sendspin/aiosendspin/releases/tag/2.0.1 https://github.com/Sendspin/aiosendspin/releases/tag/2.1.0 diff: https://github.com/Sendspin/aiosendspin/compare/1.2.0...2.1.0 --- pkgs/development/python-modules/aiosendspin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiosendspin/default.nix b/pkgs/development/python-modules/aiosendspin/default.nix index 148de20f5905..aba70a364c09 100644 --- a/pkgs/development/python-modules/aiosendspin/default.nix +++ b/pkgs/development/python-modules/aiosendspin/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "aiosendspin"; - version = "1.2.0"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "Sendspin"; repo = "aiosendspin"; tag = version; - hash = "sha256-3vTEfXeFqouPswRKST/9U7yg9ah7J9m2KAMoxaBZNR0="; + hash = "sha256-9VhNtfXH2r/cGkscz51PIK2/66pPOGv0S0IpO0wFvO4="; }; # https://github.com/Sendspin/aiosendspin/blob/1.2.0/pyproject.toml#L7 From 0932137d4dac30962f527ef6e400c4d9daf357ca Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 17 Jan 2026 00:41:23 +0100 Subject: [PATCH 036/142] python3Packages.py-opensonic: 7.0.4 -> 8.1.1 https://github.com/khers/py-opensonic/blob/v8.1.1/CHANGELOG.md diff: https://github.com/khers/py-opensonic/compare/v7.0.4...v8.1.1 --- pkgs/development/python-modules/py-opensonic/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix index 63688ca8b028..5a3f34d650dc 100644 --- a/pkgs/development/python-modules/py-opensonic/default.nix +++ b/pkgs/development/python-modules/py-opensonic/default.nix @@ -3,25 +3,27 @@ buildPythonPackage, fetchFromGitHub, setuptools, + aiohttp, mashumaro, requests, }: buildPythonPackage rec { pname = "py-opensonic"; - version = "7.0.4"; + version = "8.1.1"; pyproject = true; src = fetchFromGitHub { owner = "khers"; repo = "py-opensonic"; tag = "v${version}"; - hash = "sha256-5wsisIfYW+0uh0khUzt9wKFxBf/ZXVsKpNF/Dcrj2wI="; + hash = "sha256-/P/7ytA0YHuJZEq7KQosPBQM2vo6VAss1G8pTIEswJA="; }; build-system = [ setuptools ]; dependencies = [ + aiohttp mashumaro requests ]; From 7bba703553f56efea3c56cd9f00ad38092c84b40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jan 2026 03:54:50 +0000 Subject: [PATCH 037/142] ni: 28.1.0 -> 28.2.0 --- pkgs/by-name/ni/ni/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index 93e53d3322df..63223326f773 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -12,19 +12,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ni"; - version = "28.1.0"; + version = "28.2.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "ni"; tag = "v${finalAttrs.version}"; - hash = "sha256-D6TzDyT3HIULeHL/ACkOcVQ/g7pAw8jONnWfwJgWyx4="; + hash = "sha256-QRatGm8e12mYtCPpeZwz4adtl6PTPUXTRlge6UKqiqI="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-eSnrR2Cik24wEbSObabJSzZOGfl6XzQrEyDB7Ea2hg8="; + hash = "sha256-n/iqROsdVwLZEAHU3G6Hkl2wrwnwJv7BUMzJif9bYRM="; }; nativeBuildInputs = [ From 188408f2c863a8b2e5b4eeb83efd92977847d5fd Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 17 Jan 2026 08:59:46 +0100 Subject: [PATCH 038/142] colobot: fix build with gcc 15 Related: https://github.com/NixOS/nixpkgs/issues/475479 Signed-off-by: Marcin Serwin --- pkgs/by-name/co/colobot/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/co/colobot/package.nix b/pkgs/by-name/co/colobot/package.nix index 48614012bea0..41c95d105890 100644 --- a/pkgs/by-name/co/colobot/package.nix +++ b/pkgs/by-name/co/colobot/package.nix @@ -19,6 +19,7 @@ doxygen, python3, callPackage, + fetchpatch, }: let @@ -37,6 +38,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QhNHtAG+hKq7qJhKWCJcP4ejm5YDOU8pyYtitJppVlU="; }; + patches = [ + (fetchpatch { + url = "https://github.com/colobot/colobot/commit/1561854b03500d39955c66971c9c98de1937d7e6.patch"; + relative = "colobot-app/src"; + extraPrefix = "src/app/"; + hash = "sha256-TVd/TsmFb1qQILUJr6E1zdFl/bQkREYKC/cm2I3M/iw="; + }) + ]; + nativeBuildInputs = [ cmake xmlstarlet From 772443df67c7f82de1701710c030c5be13852a41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jan 2026 09:32:07 +0000 Subject: [PATCH 039/142] pyfa: 2.65.2 -> 2.65.4 --- pkgs/by-name/py/pyfa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index 45d0569508ad..f5ae3e1a16a0 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -11,7 +11,7 @@ copyDesktopItems, }: let - version = "2.65.2"; + version = "2.65.4"; in python3Packages.buildPythonApplication rec { inherit version; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-W3HQ6x9WXYXCczVj+3MBhEnkoDgJUJ6oZal1N4iDjdg="; + hash = "sha256-dBJmtKZD2MvQjLhz2Jcn/ldAEbo0wllXDItQu5pyrW8="; }; desktopItems = [ From 9a54ea5da311b4cd61ea94030e122aa1e002f2d1 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Sat, 17 Jan 2026 12:28:29 +0100 Subject: [PATCH 040/142] lsp-ai: fix gcc15 build --- pkgs/by-name/ls/lsp-ai/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ls/lsp-ai/package.nix b/pkgs/by-name/ls/lsp-ai/package.nix index bf701de5f5fa..f6027464ee93 100644 --- a/pkgs/by-name/ls/lsp-ai/package.nix +++ b/pkgs/by-name/ls/lsp-ai/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pkg-config, cmake, + oniguruma, openssl, zlib, perl, @@ -56,10 +57,14 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ + oniguruma openssl zlib ]; + # use system oniguruma since the bundled one fails to build with gcc15 + env.RUSTONIG_SYSTEM_LIBONIG = 1; + cargoBuildFlags = [ "-p lsp-ai" ]; passthru.updateScript = gitUpdater { From 31939b4a96a60b16187f8498f214e56aee79cd28 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 17 Jan 2026 13:11:12 +0000 Subject: [PATCH 041/142] tnef: fix `gcc-15` build failure Without the change the build fails on `master` as https://hydra.nixos.org/build/318200761: ``` gcc -DHAVE_CONFIG_H -I. -g -O2 -c -o attr.o attr.c attr.c:242:1: error: conflicting types for 'attr_read'; have 'Attr *(FILE *)' 242 | attr_read (FILE* in) | ^~~~~~~~~ In file included from attr.c:29: attr.h:72:14: note: previous declaration of 'attr_read' with type 'Attr *(void)' 72 | extern Attr* attr_read (); | ^~~~~~~~~ ``` --- pkgs/by-name/tn/tnef/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/tn/tnef/package.nix b/pkgs/by-name/tn/tnef/package.nix index e8322268836c..f80c31aec274 100644 --- a/pkgs/by-name/tn/tnef/package.nix +++ b/pkgs/by-name/tn/tnef/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, autoreconfHook, }: @@ -16,6 +17,15 @@ stdenv.mkDerivation rec { sha256 = "104g48mcm00bgiyzas2vf86331w7bnw7h3bc11ib4lp7rz6zqfck"; }; + patches = [ + # Fix gcc-15 build failure: https://github.com/verdammelt/tnef/pull/49 + (fetchpatch { + name = "gcc-15.patch"; + url = "https://github.com/verdammelt/tnef/commit/86bfa75cfacbe71c8d5282fa0065981b4544c5ad.patch"; + hash = "sha256-iWQop57riqwDLVi5Ba5s4f34lGXgvKO3ZMTgWbAoRIY="; + }) + ]; + doCheck = true; nativeBuildInputs = [ autoreconfHook ]; From 0f2a6ceb01ed4467f06ffb9fe52dcbb76e8905fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 10:33:42 +0100 Subject: [PATCH 042/142] deface: remove superfluous pythonOlder --- pkgs/by-name/de/deface/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/de/deface/package.nix b/pkgs/by-name/de/deface/package.nix index dc40f47ecf93..2194ec221124 100644 --- a/pkgs/by-name/de/deface/package.nix +++ b/pkgs/by-name/de/deface/package.nix @@ -11,8 +11,6 @@ python3.pkgs.buildPythonApplication rec { version = "1.5.0"; pyproject = true; - disabled = python3.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "ORB-HD"; repo = "deface"; From 46b83ef089a44935bcdf806a81abb72ad54f610b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:31:13 +0100 Subject: [PATCH 043/142] dt-schema: remove superfluous pythonOlder --- pkgs/by-name/dt/dt-schema/package.nix | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/dt/dt-schema/package.nix b/pkgs/by-name/dt/dt-schema/package.nix index 446e47f7b9ef..6aacd1306435 100644 --- a/pkgs/by-name/dt/dt-schema/package.nix +++ b/pkgs/by-name/dt/dt-schema/package.nix @@ -1,5 +1,4 @@ { - lib, python3, }: @@ -16,22 +15,10 @@ let hash = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0="; }; - propagatedBuildInputs = - with self; - ( - [ - attrs - pyrsistent - ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - typing-extensions - ] - ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - pkgutil-resolve-name - ] - ); + propagatedBuildInputs = with self; [ + attrs + pyrsistent + ]; }); }; }; From 1eba88255c028b59ccfc8f3cc00c19b7dde0d4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:32:29 +0100 Subject: [PATCH 044/142] gogdl: remove superfluous pythonOlder --- pkgs/by-name/go/gogdl/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix index 5545eedc7434..114abc7584e4 100644 --- a/pkgs/by-name/go/gogdl/package.nix +++ b/pkgs/by-name/go/gogdl/package.nix @@ -18,8 +18,6 @@ python3Packages.buildPythonApplication rec { hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0="; }; - disabled = python3Packages.pythonOlder "3.8"; - propagatedBuildInputs = with python3Packages; [ setuptools requests From b8c2d16d524b53ce8c685042ee241b1bcc2cabee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:32:45 +0100 Subject: [PATCH 045/142] imgp: remove superfluous pythonOlder --- pkgs/by-name/im/imgp/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/im/imgp/package.nix b/pkgs/by-name/im/imgp/package.nix index e06fcf19c7bb..ed0a272b2241 100644 --- a/pkgs/by-name/im/imgp/package.nix +++ b/pkgs/by-name/im/imgp/package.nix @@ -8,7 +8,6 @@ python3Packages.buildPythonApplication rec { pname = "imgp"; version = "2.9"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "jarun"; From 6213c60987a1c871ceb06d1b7ebad9873025bf8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:33:00 +0100 Subject: [PATCH 046/142] legendary-gl: remove superfluous pythonOlder --- pkgs/by-name/le/legendary-gl/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/le/legendary-gl/package.nix b/pkgs/by-name/le/legendary-gl/package.nix index cf0c0dc8bb79..0f46e05b024f 100644 --- a/pkgs/by-name/le/legendary-gl/package.nix +++ b/pkgs/by-name/le/legendary-gl/package.nix @@ -26,8 +26,6 @@ python3Packages.buildPythonApplication { filelock ]; - disabled = python3Packages.pythonOlder "3.8"; - # no tests doCheck = false; From 948752958edbada2714b8f970e40c9be2b811f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:33:17 +0100 Subject: [PATCH 047/142] mapproxy: remove superfluous pythonOlder --- pkgs/by-name/ma/mapproxy/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index 50f45c37b661..1c1465454fb0 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -9,7 +9,6 @@ python3Packages.buildPythonApplication rec { pname = "mapproxy"; version = "5.1.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mapproxy"; From dbbbe6bf5cd6660c5833a23086b0dd8f5d5526f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:33:33 +0100 Subject: [PATCH 048/142] pdm: remove superfluous pythonOlder --- pkgs/by-name/pd/pdm/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index 6cfac71c071e..3700f96f4a3e 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -33,8 +33,6 @@ python.pkgs.buildPythonApplication rec { version = "2.26.2"; pyproject = true; - disabled = python.pkgs.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm"; From 8e632807e6dac480c63fe78ae212fc622cb5d919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:33:48 +0100 Subject: [PATCH 049/142] pg_activity: remove superfluous pythonOlder --- pkgs/by-name/pg/pg_activity/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/pg/pg_activity/package.nix b/pkgs/by-name/pg/pg_activity/package.nix index 8244a42fb6ec..345e64177ba7 100644 --- a/pkgs/by-name/pg/pg_activity/package.nix +++ b/pkgs/by-name/pg/pg_activity/package.nix @@ -8,7 +8,6 @@ python3Packages.buildPythonApplication rec { pname = "pg_activity"; version = "3.6.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "dalibo"; From 81f5ac72c9cc87ed6566ebeef2ccdbd2a5cc566d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:34:01 +0100 Subject: [PATCH 050/142] portablemc: remove superfluous pythonOlder --- pkgs/by-name/po/portablemc/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix index 6f94c7abc528..435c3e02ee79 100644 --- a/pkgs/by-name/po/portablemc/package.nix +++ b/pkgs/by-name/po/portablemc/package.nix @@ -50,8 +50,6 @@ python3Packages.buildPythonApplication rec { version = "4.4.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "mindstorm38"; repo = "portablemc"; From 61b57ae9c9cd712093889ada693c57d1245054b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:34:29 +0100 Subject: [PATCH 051/142] rapid-photo-downloader: remove superfluous pythonOlder --- .../ra/rapid-photo-downloader/package.nix | 55 +++++++++---------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/ra/rapid-photo-downloader/package.nix b/pkgs/by-name/ra/rapid-photo-downloader/package.nix index 8e86020d2354..ea9ccb492f23 100644 --- a/pkgs/by-name/ra/rapid-photo-downloader/package.nix +++ b/pkgs/by-name/ra/rapid-photo-downloader/package.nix @@ -36,35 +36,32 @@ python3Packages.buildPythonApplication rec { setuptools ]; - dependencies = - with python3Packages; - [ - ifuse - libimobiledevice - # Python dependencies - pyqt5 - pygobject3 - gphoto2 - pyzmq - tornado - psutil - pyxdg - arrow - python-dateutil - easygui - babel - colour - pillow - pymediainfo - sortedcontainers - requests - colorlog - pyprind - setuptools - show-in-file-manager - tenacity - ] - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + dependencies = with python3Packages; [ + ifuse + libimobiledevice + # Python dependencies + pyqt5 + pygobject3 + gphoto2 + pyzmq + tornado + psutil + pyxdg + arrow + python-dateutil + easygui + babel + colour + pillow + pymediainfo + sortedcontainers + requests + colorlog + pyprind + setuptools + show-in-file-manager + tenacity + ]; postPatch = '' # Drop broken version specifier From c4d6724826034e3bd541e6967bcea84de405d5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:34:47 +0100 Subject: [PATCH 052/142] sqlfluff: remove superfluous pythonOlder --- pkgs/by-name/sq/sqlfluff/package.nix | 44 ++++++++++++---------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index f5a17eb0c58c..38bd3102085a 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -22,31 +22,25 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "click" ]; - dependencies = - with python3Packages; - [ - appdirs - cached-property - chardet - click - colorama - configparser - diff-cover - jinja2 - oyaml - pathspec - platformdirs - pytest - regex - tblib - toml - tqdm - typing-extensions - ] - ++ lib.optionals (pythonOlder "3.8") [ - backports.cached-property - importlib_metadata - ]; + dependencies = with python3Packages; [ + appdirs + cached-property + chardet + click + colorama + configparser + diff-cover + jinja2 + oyaml + pathspec + platformdirs + pytest + regex + tblib + toml + tqdm + typing-extensions + ]; nativeCheckInputs = with python3Packages; [ hypothesis From 0fb57043e802e41b0bdcf860ac8c92cb165fb795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:35:02 +0100 Subject: [PATCH 053/142] stac-validator: remove superfluous pythonOlder --- pkgs/by-name/st/stac-validator/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix index c3ed965e8e27..1ea6972fc9c2 100644 --- a/pkgs/by-name/st/stac-validator/package.nix +++ b/pkgs/by-name/st/stac-validator/package.nix @@ -8,7 +8,6 @@ python3Packages.buildPythonPackage rec { pname = "stac-validator"; version = "3.10.2"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "stac-utils"; From 7ed455f17d6384f3a6e44de5ca5885867ee21418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:35:33 +0100 Subject: [PATCH 054/142] python3Packages.accupy: remove superfluous pythonOlder --- pkgs/development/python-modules/accupy/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index 08e7496cd6bb..531249d9d727 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -3,14 +3,12 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, mpmath, numpy, pybind11, pyfma, eigen, - importlib-metadata, pytestCheckHook, matplotlib, dufte, @@ -40,8 +38,7 @@ buildPythonPackage rec { mpmath numpy pyfma - ] - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + ]; nativeCheckInputs = [ perfplot From 859ff1335ee766503b50b5a60e9bcbd54ae44c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:36:06 +0100 Subject: [PATCH 055/142] python3Packages.aiosmtpd: remove superfluous pythonOlder --- pkgs/development/python-modules/aiosmtpd/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index 64f60ba0fcd0..9b7b0254bb5d 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -8,7 +8,6 @@ pytestCheckHook, pythonOlder, setuptools, - typing-extensions, # for passthru.tests django, @@ -32,8 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ atpublic attrs - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; nativeCheckInputs = [ pytest-mock From c04b2061cf9052e9768ab79754367df56f1bb33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:36:28 +0100 Subject: [PATCH 056/142] python3Packages.amaranth: remove superfluous pythonOlder --- pkgs/development/python-modules/amaranth/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index dbb725882385..83764d4dc228 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -1,14 +1,11 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, pdm-backend, jschon, pyvcd, jinja2, - importlib-resources, - importlib-metadata, git, # for tests @@ -43,9 +40,7 @@ buildPythonPackage rec { jschon jinja2 pyvcd - ] - ++ lib.optional (pythonOlder "3.9") importlib-resources - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + ]; nativeCheckInputs = [ pytestCheckHook From 3b27e8bb54c18b212f16b15164ad9cdac402a447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:36:48 +0100 Subject: [PATCH 057/142] python3Packages.anywidget: remove superfluous pythonOlder --- pkgs/development/python-modules/anywidget/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index e7954e34f841..9f94e0787eec 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -4,10 +4,8 @@ fetchPypi, pytestCheckHook, writableTmpDirAsHomeHook, - pythonOlder, hatch-jupyter-builder, hatchling, - importlib-metadata, ipykernel, ipywidgets, psygnal, @@ -43,8 +41,7 @@ buildPythonPackage rec { ipywidgets psygnal typing-extensions - ] - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + ]; nativeCheckInputs = [ pytestCheckHook From c35ee0149e2f98c45bb151f3d4d4007d970dccb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:37:22 +0100 Subject: [PATCH 058/142] python3Packages.automate-home: remove superfluous pythonOlder --- pkgs/development/python-modules/automate-home/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/automate-home/default.nix b/pkgs/development/python-modules/automate-home/default.nix index a6bb1e91233e..5c612efc7144 100644 --- a/pkgs/development/python-modules/automate-home/default.nix +++ b/pkgs/development/python-modules/automate-home/default.nix @@ -8,7 +8,6 @@ hiredis, pytestCheckHook, pythonAtLeast, - pythonOlder, pytz, pyyaml, setuptools, @@ -20,7 +19,7 @@ buildPythonPackage rec { pyproject = true; # Typing issue - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; From ed73291b800ce5ae80cda831404d3a5a87dc64a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:37:43 +0100 Subject: [PATCH 059/142] python3Packages.avro: remove superfluous pythonOlder --- pkgs/development/python-modules/avro/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 6c49c437bc97..30b7c1ed7694 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -1,10 +1,8 @@ { lib, buildPythonPackage, - pythonOlder, setuptools, fetchPypi, - typing-extensions, pytest7CheckHook, }: @@ -20,8 +18,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - nativeCheckInputs = [ pytest7CheckHook ]; disabledTests = [ From a76fcffb3842c1d210fe30ac9939eb959d5f6b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:38:00 +0100 Subject: [PATCH 060/142] python3Packages.aws-xray-sdk: remove superfluous pythonOlder --- pkgs/development/python-modules/aws-xray-sdk/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 266299989746..118e249ce4da 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -7,13 +7,11 @@ django, fetchFromGitHub, httpx, - importlib-metadata, jsonpickle, pymysql, pytest-asyncio_0, pynamodb, pytestCheckHook, - pythonOlder, requests, setuptools, sqlalchemy, @@ -40,8 +38,7 @@ buildPythonPackage rec { jsonpickle requests wrapt - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ aiohttp From b3709af86be1fad5f32c42c51fa30e045ab24b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:38:18 +0100 Subject: [PATCH 061/142] python3Packages.azure-mgmt-appcontainers: remove superfluous pythonOlder --- .../python-modules/azure-mgmt-appcontainers/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix index e4b37c63bf29..360bd6c2bcc2 100644 --- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -2,12 +2,10 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, azure-common, azure-mgmt-core, isodate, setuptools, - typing-extensions, }: buildPythonPackage rec { @@ -28,8 +26,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core isodate - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # no tests included doCheck = false; From bf80beaebecb887de492e909ce03ef087b0cba43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:38:35 +0100 Subject: [PATCH 062/142] python3Packages.azure-mgmt-batchai: remove superfluous pythonOlder --- .../python-modules/azure-mgmt-batchai/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix index ff366fa7286c..1525ea2b7118 100644 --- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -5,8 +5,6 @@ azure-common, azure-mgmt-core, isodate, - pythonOlder, - typing-extensions, }: buildPythonPackage rec { @@ -24,8 +22,7 @@ buildPythonPackage rec { isodate azure-common azure-mgmt-core - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; pythonNamespaces = [ "azure.mgmt" ]; From cd4f20e68c6ad653c9c374f670c62aac05a56fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:38:53 +0100 Subject: [PATCH 063/142] python3Packages.azure-mgmt-maps: remove superfluous pythonOlder --- pkgs/development/python-modules/azure-mgmt-maps/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix index 1f717cc37fa3..1bf20bdd1a14 100644 --- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -5,8 +5,6 @@ buildPythonPackage, fetchPypi, isodate, - pythonOlder, - typing-extensions, msrest, }: @@ -25,8 +23,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core msrest - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; pythonNamespaces = [ "azure.mgmt" ]; From 662ad762433569571b39e05727d6ceed2b248c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:39:05 +0100 Subject: [PATCH 064/142] python3Packages.azure-mgmt-redis: remove superfluous pythonOlder --- pkgs/development/python-modules/azure-mgmt-redis/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index aa02912d8a5a..9c0200e90eed 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -5,8 +5,6 @@ buildPythonPackage, fetchPypi, isodate, - pythonOlder, - typing-extensions, }: buildPythonPackage rec { @@ -24,8 +22,7 @@ buildPythonPackage rec { isodate azure-common azure-mgmt-core - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # Module has no tests doCheck = false; From 3c443af38532b61231d324dfcb477c71bdcca760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:39:19 +0100 Subject: [PATCH 065/142] python3Packages.azure-mgmt-reservations: remove superfluous pythonOlder --- .../python-modules/azure-mgmt-reservations/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index b37871080857..57bc7b355bda 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -6,8 +6,6 @@ msrest, azure-common, azure-mgmt-core, - typing-extensions, - pythonOlder, }: buildPythonPackage rec { @@ -27,8 +25,7 @@ buildPythonPackage rec { msrest azure-common azure-mgmt-core - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # has no tests doCheck = false; From e3e94b02b6fa4703cf07d71bc03411666541df59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:39:32 +0100 Subject: [PATCH 066/142] python3Packages.backports-entry-points-selectable: remove superfluous pythonOlder --- .../backports-entry-points-selectable/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix index 2e07441c4d79..2f561f4ef4df 100644 --- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools-scm, - importlib-metadata, }: buildPythonPackage rec { @@ -20,8 +18,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - # no tests doCheck = false; From bb24b1a313a7f5f8d5d8e878ef93378ea0471c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:39:52 +0100 Subject: [PATCH 067/142] python3Packages.backports-strenum: remove superfluous pythonOlder --- pkgs/development/python-modules/backports-strenum/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports-strenum/default.nix b/pkgs/development/python-modules/backports-strenum/default.nix index e967ea74b973..8cbd84c01adc 100644 --- a/pkgs/development/python-modules/backports-strenum/default.nix +++ b/pkgs/development/python-modules/backports-strenum/default.nix @@ -5,7 +5,6 @@ poetry-core, pytestCheckHook, pythonAtLeast, - pythonOlder, }: buildPythonPackage rec { @@ -13,7 +12,7 @@ buildPythonPackage rec { version = "1.3.1"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.11"; + disabled = pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "clbarnes"; From e556aca092d072ad412b55b01c68b5ee7d90fedf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:40:09 +0100 Subject: [PATCH 068/142] python3Packages.catalogue: remove superfluous pythonOlder --- pkgs/development/python-modules/catalogue/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index d98d84f8124f..7dd016dad87a 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -3,10 +3,7 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - pythonOlder, setuptools, - typing-extensions, - zipp, }: buildPythonPackage rec { @@ -21,11 +18,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - typing-extensions - zipp - ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "catalogue" ]; From 029e4718f2a01de9bf974665871046f3fb4f1edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:40:26 +0100 Subject: [PATCH 069/142] python3Packages.cli-ui: remove superfluous pythonOlder --- pkgs/development/python-modules/cli-ui/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/cli-ui/default.nix b/pkgs/development/python-modules/cli-ui/default.nix index 5a0cafd7a7c9..1637d78749ee 100644 --- a/pkgs/development/python-modules/cli-ui/default.nix +++ b/pkgs/development/python-modules/cli-ui/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, pytestCheckHook, - pythonOlder, poetry-core, colorama, tabulate, @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "0.19.0"; pyproject = true; - disabled = pythonOlder "3.8.1"; - src = fetchFromGitHub { owner = "your-tools"; repo = "python-cli-ui"; From d8ec0ebb0c984f13cf7cbc83b6079832a1b86cf9 Mon Sep 17 00:00:00 2001 From: HHR2020 <76608828+HHR2020@users.noreply.github.com> Date: Sat, 17 Jan 2026 22:41:21 +0800 Subject: [PATCH 070/142] linyaps: 1.10.0 -> 1.11.0 --- pkgs/by-name/li/linyaps/package.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix index 547fd49e10b9..df7d2c833006 100644 --- a/pkgs/by-name/li/linyaps/package.nix +++ b/pkgs/by-name/li/linyaps/package.nix @@ -1,6 +1,5 @@ { fetchFromGitHub, - fetchpatch, lib, stdenv, cmake, @@ -10,10 +9,11 @@ linyaps-box, cli11, curl, + elfutils, gpgme, gtest, libarchive, - libelf, + libcap, libsodium, libsysprof-capture, nlohmann_json, @@ -24,7 +24,6 @@ uncrustify, xz, yaml-cpp, - replaceVars, bash, binutils, coreutils, @@ -39,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "linyaps"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "OpenAtom-Linyaps"; repo = finalAttrs.pname; tag = finalAttrs.version; - hash = "sha256-C5rP6r3V+hxTjM+kmXjS4MnuL6P5wxSVP9nNmlQbcB8="; + hash = "sha256-qPHDAwEQVnHLWGioEfgz11ZWhlEBJynap3a0hgfL050="; }; patches = [ @@ -53,6 +52,9 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' + substituteInPlace apps/ll-cli/src/main.cpp \ + --replace-fail "ociRuntimeCLI, { BINDIR }" "ociRuntimeCLI, { \"${lib.getBin linyaps-box}/bin\" }" + substituteInPlace apps/ll-init/CMakeLists.txt \ --replace-fail "target_link_options(\''${LL_INIT_TARGET} PRIVATE -static -static-libgcc" \ "target_link_options(\''${LL_INIT_TARGET} PRIVATE -static -static-libgcc -L${stdenv.cc.libc.static}/lib" @@ -68,10 +70,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cli11 curl + elfutils gpgme gtest libarchive - libelf + libcap libsodium libsysprof-capture nlohmann_json @@ -92,6 +95,10 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.wrapQtAppsHook ]; + cmakeFlags = [ + (lib.cmakeBool "CPM_LOCAL_PACKAGES_ONLY" true) + ]; + postInstall = '' # move to the right location for systemd.packages option # https://github.com/NixOS/nixpkgs/blob/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054/nixos/modules/system/boot/systemd.nix#L605 From 2b7008b9793da0e34291766f29794cc0c2bfc446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:40:41 +0100 Subject: [PATCH 071/142] python3Packages.django-configurations: remove superfluous pythonOlder --- .../python-modules/django-configurations/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index bbbd10a232f4..85713ee2cbd6 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -7,9 +7,7 @@ django, django-cache-url, fetchPypi, - importlib-metadata, mock, - pythonOlder, setuptools-scm, }: @@ -25,7 +23,7 @@ buildPythonPackage rec { buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ django ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = [ django ]; nativeCheckInputs = [ mock From 7ef0c94a3f1a3acf51381aa2c7163fe7abc82322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:40:57 +0100 Subject: [PATCH 072/142] python3Packages.django_4: remove superfluous pythonOlder --- pkgs/development/python-modules/django/4.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 6a54a6e34180..a240dab9733c 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -5,7 +5,6 @@ fetchFromGitHub, fetchpatch, pythonAtLeast, - pythonOlder, replaceVars, # build @@ -48,7 +47,7 @@ buildPythonPackage rec { version = "4.2.27"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; + disabled = pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "django"; From 70e16bb5c075fea9986ff5b4d73e69589424f01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:43:47 +0100 Subject: [PATCH 073/142] python3Packages.dufte: remove superfluous pythonOlder --- pkgs/development/python-modules/dufte/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index fc701e9f8380..8cda01951587 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - importlib-metadata, matplotlib, numpy, pytestCheckHook, @@ -27,8 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; preCheck = '' export HOME=$(mktemp -d) From 893e3cfa45f0654dc881d9f25b7b7352390870d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:44:06 +0100 Subject: [PATCH 074/142] python3Packages.evaluate: remove superfluous pythonOlder --- pkgs/development/python-modules/evaluate/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/evaluate/default.nix b/pkgs/development/python-modules/evaluate/default.nix index 30ca31579b9f..a5892b4359ca 100644 --- a/pkgs/development/python-modules/evaluate/default.nix +++ b/pkgs/development/python-modules/evaluate/default.nix @@ -2,12 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, datasets, dill, fsspec, huggingface-hub, - importlib-metadata, multiprocess, numpy, packaging, @@ -44,8 +42,7 @@ buildPythonPackage rec { fsspec huggingface-hub packaging - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # most tests require internet access. doCheck = false; From c91750e058ea302099f759245220f51ec20678ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:44:24 +0100 Subject: [PATCH 075/142] python3Packages.exdown: remove superfluous pythonOlder --- pkgs/development/python-modules/exdown/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index 244266b05beb..0b1b0bf32747 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -3,9 +3,7 @@ buildPythonPackage, isPy27, fetchPypi, - pythonOlder, setuptools, - importlib-metadata, pytestCheckHook, }: @@ -24,8 +22,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "exdown" ]; From b28318dec5c3f2471c105ebbc6d5bcbb3d33a5aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:45:00 +0100 Subject: [PATCH 076/142] python3Packages.fake-useragent: remove superfluous pythonOlder --- pkgs/development/python-modules/fake-useragent/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index bd3db66e0bb9..83aa273913f4 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - importlib-metadata, importlib-resources, setuptools, pythonOlder, @@ -27,9 +26,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = - lib.optionals (pythonOlder "3.10") [ importlib-resources ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + dependencies = lib.optionals (pythonOlder "3.10") [ importlib-resources ]; nativeCheckInputs = [ pytestCheckHook ]; From 03606b16a4c341e552c395bfbcb390eb90d4ff37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:45:22 +0100 Subject: [PATCH 077/142] python3Packages.ffmpy: remove superfluous pythonOlder --- pkgs/development/python-modules/ffmpy/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index 7aabc9f56107..16d62090e03d 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -3,8 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, - pythonOlder, uv-build, pytestCheckHook, go, @@ -16,8 +14,6 @@ buildPythonPackage rec { version = "0.6.2"; pyproject = true; - disabled = pythonOlder "3.8.1"; - src = fetchFromGitHub { owner = "Ch00k"; repo = "ffmpy"; From 48f7c9fe61d6e228022933221b633b95cb2b381e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:45:39 +0100 Subject: [PATCH 078/142] python3Packages.flask-mongoengine: remove superfluous pythonOlder --- .../development/python-modules/flask-mongoengine/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 1d81c726ae23..10b3531a71d1 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -7,10 +7,8 @@ flask-wtf, markupsafe, mongoengine, - pythonOlder, setuptools, setuptools-scm, - typing-extensions, wtforms, }: @@ -38,8 +36,7 @@ buildPythonPackage rec { flask flask-wtf mongoengine - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; optional-dependencies = { wtf = [ From c88c31d4c42b218dce43760564ee9ef7dc062cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:45:53 +0100 Subject: [PATCH 079/142] python3Packages.gentools: remove superfluous pythonOlder --- pkgs/development/python-modules/gentools/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index 6c2cde3bc597..570fb4b5e8e7 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, poetry-core, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -22,8 +20,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "gentools" ]; From 216e84884fdcc5bf30d8eb3d12c1c1b96fb71dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:46:10 +0100 Subject: [PATCH 080/142] python3Packages.gptcache: remove superfluous pythonOlder --- pkgs/development/python-modules/gptcache/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix index 7b79d8d9d261..2815ecef5615 100644 --- a/pkgs/development/python-modules/gptcache/default.nix +++ b/pkgs/development/python-modules/gptcache/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cachetools, numpy, - pythonOlder, redis, redis-om, requests, @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "0.1.44"; format = "setuptools"; - disabled = pythonOlder "3.8.1"; - src = fetchFromGitHub { owner = "zilliztech"; repo = "GPTCache"; From 91d4eba9097a4f3da9352002c92eb5f7cb160d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:46:30 +0100 Subject: [PATCH 081/142] python3Packages.graphql-relay: remove superfluous pythonOlder --- pkgs/development/python-modules/graphql-relay/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix index 8d414efe7fa3..a007d735ca66 100644 --- a/pkgs/development/python-modules/graphql-relay/default.nix +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -3,14 +3,11 @@ buildPythonPackage, fetchPypi, - pythonOlder, - # build poetry-core, # runtime graphql-core, - typing-extensions, # tests pytest-asyncio, @@ -41,7 +38,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ graphql-core ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + propagatedBuildInputs = [ graphql-core ]; nativeCheckInputs = [ pytest-asyncio From d22745d0e2873fa2174e7547d410578fbf13edbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:46:52 +0100 Subject: [PATCH 082/142] python3Packages.h5py: remove superfluous pythonOlder --- pkgs/development/python-modules/h5py/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 28f5609fd34c..9e58d5641a00 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -2,7 +2,6 @@ lib, fetchPypi, buildPythonPackage, - pythonOlder, setuptools, numpy, hdf5, @@ -12,7 +11,6 @@ openssh, pytestCheckHook, pytest-mpi, - cached-property, }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -71,8 +69,7 @@ buildPythonPackage rec { ++ lib.optionals mpiSupport [ mpi4py openssh - ] - ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; + ]; nativeCheckInputs = [ pytestCheckHook From daf0fba7b80cf8ca8989daf2861626f69542d24e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:47:23 +0100 Subject: [PATCH 083/142] python3Packages.hatch-fancy-pypi-readme: remove superfluous pythonOlder --- .../python-modules/hatch-fancy-pypi-readme/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index 88ef35aee8be..b25ec89a35f9 100644 --- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -7,7 +7,6 @@ build, hatchling, tomli, - typing-extensions, }: buildPythonPackage rec { @@ -26,8 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hatchling ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ++ lib.optionals (pythonOlder "3.11") [ tomli ]; nativeCheckInputs = [ build From 9882071ebe5f5312a40499195edfcfb9dc8eb058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:47:42 +0100 Subject: [PATCH 084/142] python3Packages.importlib-metadata: remove superfluous pythonOlder --- .../python-modules/importlib-metadata/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 31c4f183d4fe..9a311c66a90c 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, setuptools-scm, - typing-extensions, toml, zipp, @@ -32,8 +30,7 @@ buildPythonPackage rec { dependencies = [ toml zipp - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # Cyclic dependencies due to pyflakefs doCheck = false; From ccd4c19cadd72051057ad31520c7450a09e702cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:48:04 +0100 Subject: [PATCH 085/142] python3Packages.ipykernel: remove superfluous pythonOlder --- .../python-modules/ipykernel/tests.nix | 31 +++++-------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index c1d7d1d7606b..3e4191104769 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, flaky, ipykernel, ipyparallel, @@ -45,29 +44,15 @@ buildPythonPackage { # traitlets.config.configurable.MultipleInstanceError: An incompatible siblin... "test_install_kernelspec" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - [ - # see https://github.com/NixOS/nixpkgs/issues/76197 - "test_subprocess_print" - "test_subprocess_error" - "test_ipython_start_kernel_no_userns" + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # see https://github.com/NixOS/nixpkgs/issues/76197 + "test_subprocess_print" + "test_subprocess_error" + "test_ipython_start_kernel_no_userns" - # https://github.com/ipython/ipykernel/issues/506 - "test_unc_paths" - ] - ++ lib.optionals (pythonOlder "3.8") [ - # flaky test https://github.com/ipython/ipykernel/issues/485 - "test_shutdown" - - # test regression https://github.com/ipython/ipykernel/issues/486 - "test_sys_path_profile_dir" - "test_save_history" - "test_help_output" - "test_write_kernel_spec" - "test_ipython_start_kernel_userns" - "ZMQDisplayPublisherTests" - ] - ); + # https://github.com/ipython/ipykernel/issues/506 + "test_unc_paths" + ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; From ddd47b147cb609a89d9e637e73697a094767a0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:48:56 +0100 Subject: [PATCH 086/142] python3Packages.line-profiler: remove superfluous pythonOlder --- pkgs/development/python-modules/line-profiler/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index 0d113cfe39c6..6b04151f1eb1 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -7,7 +7,6 @@ ipython, scikit-build, cmake, - pythonOlder, pytestCheckHook, ubelt, }: @@ -17,7 +16,7 @@ buildPythonPackage rec { version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.8" || isPyPy; + disabled = isPyPy; src = fetchPypi { pname = "line_profiler"; From 1fefa55a9a6f0a94a0fb7faa60bb2905360bb3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:49:08 +0100 Subject: [PATCH 087/142] python3Packages.logilab: remove superfluous pythonOlder --- pkgs/development/python-modules/logilab/common.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index dc60c2846029..5ca97bffebe9 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -2,11 +2,9 @@ lib, buildPythonPackage, fetchPypi, - importlib-metadata, mypy-extensions, pytestCheckHook, pythonAtLeast, - pythonOlder, pytz, setuptools, typing-extensions, @@ -33,8 +31,7 @@ buildPythonPackage rec { setuptools mypy-extensions typing-extensions - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ pytestCheckHook From 1cc43bf10a0f681c3e9d60f9be632327fdd654ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:49:24 +0100 Subject: [PATCH 088/142] python3Packages.mailmanclient: remove superfluous pythonOlder --- pkgs/development/python-modules/mailmanclient/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index b15cd1ab25e7..b00661f89d09 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, requests, - typing-extensions, }: buildPythonPackage rec { @@ -17,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-Y1gcYEyn6sAhSJwVqsygaklY63b2ZXTG+rBerGVN2Fc="; }; - propagatedBuildInputs = [ requests ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + propagatedBuildInputs = [ requests ]; # Tests require a running Mailman instance doCheck = false; From d4a7b5c38d4b77a55f80de5e5bfa72e567f1477c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:49:38 +0100 Subject: [PATCH 089/142] python3Packages.markups: remove superfluous pythonOlder --- pkgs/development/python-modules/markups/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/markups/default.nix b/pkgs/development/python-modules/markups/default.nix index 5e4573cc152a..18766012b963 100644 --- a/pkgs/development/python-modules/markups/default.nix +++ b/pkgs/development/python-modules/markups/default.nix @@ -3,12 +3,10 @@ buildPythonPackage, docutils, fetchFromGitHub, - importlib-metadata, markdown, pygments, pytestCheckHook, python-markdown-math, - pythonOlder, pyyaml, setuptools, textile, @@ -35,8 +33,7 @@ buildPythonPackage rec { python-markdown-math pyyaml textile - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ pytestCheckHook ]; From 3b3e9a58317ad72e2852354c397dad2e8f33c2f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:49:53 +0100 Subject: [PATCH 090/142] python3Packages.netcdf4: remove superfluous pythonOlder --- pkgs/development/python-modules/netcdf4/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index ddd8221f021c..07d4d53b75a4 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -13,7 +13,6 @@ numpy, oldest-supported-numpy, python, - pythonOlder, setuptools-scm, stdenv, wheel, @@ -30,7 +29,7 @@ buildPythonPackage { inherit version; pyproject = true; - disabled = isPyPy || pythonOlder "3.8"; + disabled = isPyPy; src = fetchFromGitHub { owner = "Unidata"; From 553a70e6e25ced5690317e0852d7b5599827e738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:50:08 +0100 Subject: [PATCH 091/142] python3Packages.ormar: remove superfluous pythonOlder --- pkgs/development/python-modules/ormar/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 9e0ff13a17f7..291bc5fd2ff8 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -10,7 +10,6 @@ fastapi, fetchFromGitHub, httpx, - importlib-metadata, mysqlclient, nest-asyncio, orjson, @@ -20,9 +19,7 @@ pymysql, pytest-asyncio, pytestCheckHook, - pythonOlder, sqlalchemy, - typing-extensions, }: buildPythonPackage rec { @@ -53,10 +50,6 @@ buildPythonPackage rec { pydantic sqlalchemy psycopg2 - ] - ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - importlib-metadata ]; optional-dependencies = { From a8bc3071cd4a12d8d37a46d5f261257a84e58e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:50:23 +0100 Subject: [PATCH 092/142] python3Packages.pep517: remove superfluous pythonOlder --- pkgs/development/python-modules/pep517/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index 65f806d6778b..c289334dc2ca 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -4,9 +4,6 @@ fetchPypi, flit-core, tomli, - pythonOlder, - importlib-metadata, - zipp, pytestCheckHook, setuptools, testpath, @@ -28,10 +25,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ tomli - ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - zipp ]; nativeCheckInputs = [ From 1a78346a18ad221636b485cfa14be9797a562459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:50:35 +0100 Subject: [PATCH 093/142] python3Packages.pg8000: remove superfluous pythonOlder --- pkgs/development/python-modules/pg8000/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index d56bffbf8239..61347f3b20ac 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchPypi, - importlib-metadata, passlib, python-dateutil, - pythonOlder, scramp, hatchling, versioningit, @@ -30,8 +28,7 @@ buildPythonPackage rec { passlib python-dateutil scramp - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # Tests require a running PostgreSQL instance doCheck = false; From c4c7dfeb3054413656bd795938d8c0d94c500b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:50:49 +0100 Subject: [PATCH 094/142] python3Packages.pipdate: remove superfluous pythonOlder --- pkgs/development/python-modules/pipdate/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 3e9cd16b4b7c..313b63fcca83 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -3,9 +3,7 @@ appdirs, buildPythonPackage, fetchPypi, - importlib-metadata, packaging, - pythonOlder, requests, rich, setuptools, @@ -30,8 +28,7 @@ buildPythonPackage rec { requests rich setuptools - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # Tests require network access and pythonImportsCheck requires configuration file doCheck = false; From 4996aa6c54908fede61ab303751c34d96a1c10ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:51:04 +0100 Subject: [PATCH 095/142] python3Packages.pony: remove superfluous pythonOlder --- pkgs/development/python-modules/pony/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 834558d81c44..f32e33bbc61d 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pytestCheckHook, pythonAtLeast, - pythonOlder, setuptools, }: @@ -13,7 +12,7 @@ buildPythonPackage rec { version = "0.7.19"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; + disabled = pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "ponyorm"; From 5607d644673b711797974fafcf5f8920b586f998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:51:19 +0100 Subject: [PATCH 096/142] python3Packages.pyfma: remove superfluous pythonOlder --- pkgs/development/python-modules/pyfma/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index 946a5f7892e1..f27b9e8d504a 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -3,11 +3,9 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - importlib-metadata, numpy, pybind11, pytestCheckHook, - pythonOlder, setuptools, }: @@ -35,7 +33,7 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - dependencies = [ numpy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; From 1649b8e020b910fea9187839a05f2a955ac70962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:51:32 +0100 Subject: [PATCH 097/142] python3Packages.pytest-isort: remove superfluous pythonOlder --- pkgs/development/python-modules/pytest-isort/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 9a1e7bfd0e20..70073d214f76 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,12 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, isort, poetry-core, pytest, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -26,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ isort ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = [ isort ]; nativeCheckInputs = [ pytestCheckHook ]; From 65ae69320d0d52f47565ae462b103ef7fca7a52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:51:45 +0100 Subject: [PATCH 098/142] python3Packages.python-miio: remove superfluous pythonOlder --- pkgs/development/python-modules/python-miio/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 12b8e76d37a9..0deb0563e8b5 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -11,14 +11,12 @@ defusedxml, fetchPypi, fetchpatch, - importlib-metadata, micloud, netifaces, poetry-core, pytest-asyncio, pytest-mock, pytestCheckHook, - pythonOlder, pytz, pyyaml, tqdm, @@ -67,8 +65,7 @@ buildPythonPackage rec { pyyaml tqdm zeroconf - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ pytest-asyncio From 3e6e75eed0a18da2035620bce539f7253a223c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:51:58 +0100 Subject: [PATCH 099/142] python3Packages.python-rabbitair: remove superfluous pythonOlder --- pkgs/development/python-modules/python-rabbitair/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix index 29738685812b..bc6702cae441 100644 --- a/pkgs/development/python-modules/python-rabbitair/default.nix +++ b/pkgs/development/python-modules/python-rabbitair/default.nix @@ -5,9 +5,7 @@ fetchFromGitHub, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, - typing-extensions, zeroconf, }: @@ -28,8 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography zeroconf - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; nativeCheckInputs = [ pytest-asyncio From c3acd5ddf44734dee14cb9a342bd9ae8b6273a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:52:11 +0100 Subject: [PATCH 100/142] python3Packages.pythonfinder: remove superfluous pythonOlder --- pkgs/development/python-modules/pythonfinder/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 615b2fc3379b..9fcec324a51c 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -1,14 +1,12 @@ { lib, buildPythonPackage, - cached-property, click, fetchFromGitHub, packaging, pytest-cov-stub, pytest-timeout, pytestCheckHook, - pythonOlder, setuptools, }: @@ -26,7 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; + propagatedBuildInputs = [ packaging ]; optional-dependencies = { cli = [ click ]; From c86d12d4e7f174cc7f024256fb0fff10a1d30abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:52:23 +0100 Subject: [PATCH 101/142] python3Packages.pyvo: remove superfluous pythonOlder --- pkgs/development/python-modules/pyvo/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index d820df9f40e8..2de315b4662f 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -4,7 +4,6 @@ fetchPypi, astropy, pillow, - pythonOlder, pytestCheckHook, pytest-astropy, requests, @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "1.8"; pyproject = true; - disabled = pythonOlder "3.8"; # according to setup.cfg - src = fetchPypi { inherit pname version; hash = "sha256-ZvSIn9jjnd30b+SYYV02FW1JT2or7FOIa68cLFQyKGE="; From 907a9df6d7b674ae74ca1b17ec71000288fe05bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:52:34 +0100 Subject: [PATCH 102/142] python3Packages.quandl: remove superfluous pythonOlder --- pkgs/development/python-modules/quandl/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index d07931c724b0..5a6cef69983b 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -5,7 +5,6 @@ faker, fetchPypi, httpretty, - importlib-metadata, inflection, jsondate, mock, @@ -15,7 +14,6 @@ parameterized, pytestCheckHook, python-dateutil, - pythonOlder, requests, six, }: @@ -41,8 +39,7 @@ buildPythonPackage rec { python-dateutil six more-itertools - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ factory-boy From 8c37b070f75df2ff411632872f5bfac263a9e956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:52:46 +0100 Subject: [PATCH 103/142] python3Packages.signedjson: remove superfluous pythonOlder --- pkgs/development/python-modules/signedjson/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index efcbb87009e8..a7f31be0f5f3 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -3,12 +3,9 @@ buildPythonPackage, canonicaljson, fetchPypi, - importlib-metadata, pynacl, pytestCheckHook, - pythonOlder, setuptools-scm, - typing-extensions, unpaddedbase64, }: @@ -28,10 +25,6 @@ buildPythonPackage rec { canonicaljson unpaddedbase64 pynacl - ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; From 5d2fbb0d9ad33fe3daa82c245b63f2431201afc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:52:56 +0100 Subject: [PATCH 104/142] python3Packages.sphinxcontrib-spelling: remove superfluous pythonOlder --- .../python-modules/sphinxcontrib-spelling/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index a675939ff93b..ba52464aee85 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - importlib-metadata, sphinx, pyenchant, setuptools, @@ -32,8 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sphinx pyenchant - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # No tests included doCheck = false; From 975f0877f50fc6ed1b5aec222fb13dde1b44244c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:53:11 +0100 Subject: [PATCH 105/142] python3Packages.statmake: remove superfluous pythonOlder --- pkgs/development/python-modules/statmake/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index ba9179ab18d3..8518632fcae6 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -7,7 +7,6 @@ fetchFromGitHub, fonttools, fs, - importlib-metadata, poetry-core, pytestCheckHook, pythonOlder, @@ -43,8 +42,7 @@ buildPythonPackage rec { # required by fonttools[ufo] fs ] - ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; nativeCheckInputs = [ pytestCheckHook From df728d8acdb36f1f2274fcd5cb662146f22e439a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:53:28 +0100 Subject: [PATCH 106/142] python3Packages.troposphere: remove superfluous pythonOlder --- pkgs/development/python-modules/troposphere/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index cdb909b505a8..ef626df9bd36 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -4,8 +4,6 @@ buildPythonPackage, cfn-flip, fetchFromGitHub, - pythonOlder, - typing-extensions, unittestCheckHook, }: @@ -21,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-s7eb8W/QjD+lNmq3bPhCP3tH8VV/xNf3cE2dGzWAgFk="; }; - propagatedBuildInputs = [ cfn-flip ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + propagatedBuildInputs = [ cfn-flip ]; nativeCheckInputs = [ awacs From 0a28c33c7aeee70d703ff59282e4fab5cc95507e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 17 Jan 2026 16:53:49 +0100 Subject: [PATCH 107/142] mautrix-telegram: remove superfluous pythonOlder --- pkgs/servers/mautrix-telegram/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index ce006b56011c..3d641de72490 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -26,7 +26,6 @@ in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; version = "0.15.3"; - disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; From 7975a076f4eb6d8ddaec7017e8b5868ed1504461 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jan 2026 16:06:44 +0000 Subject: [PATCH 108/142] oxlint: 1.38.0 -> 1.39.0 --- pkgs/by-name/ox/oxlint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 1167bf7d00de..ed47b1b9a8de 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oxlint"; - version = "1.38.0"; + version = "1.39.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxlint_v${finalAttrs.version}"; - hash = "sha256-kMCGKbc7qaY0KUOR+67mLvKW4J5CuvYUmC6Aj9xlzSk="; + hash = "sha256-Sg9NtXRuQ0ZruK8a8k5EkeDOJ9v6uzpNzEQ/FY56ioY="; }; - cargoHash = "sha256-cesj9jwWHIFxpFV62QDgYl22EUE8qVjIbb2nRObAyLo="; + cargoHash = "sha256-sgIarCuUmSTAVPVr82rp4dQwzDMWESIbGgkCYEExz6o="; nativeBuildInputs = [ cmake From c3ddb730d2c53faa56abdde0df21ed6c293a267e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 17 Jan 2026 18:41:37 +0100 Subject: [PATCH 109/142] siyuan: 3.5.3 -> 3.5.4-dev2 (fix CVE-2026-23645) --- pkgs/by-name/si/siyuan/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 08c971917437..6e9f0c714c6b 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -36,20 +36,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.5.3"; + version = "3.5.4-dev2"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-YAd7XVJLs66CAhb5ro8o5GrT5AhVpp/RHOpl1XkBBHU="; + hash = "sha256-D3vpbtGNeDP+PZIOUGYufZo0ZTq9/eZsesizNuvAHdE="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-2O8gk6Y6odlMldUfanPf5MIiczfd5lH/yMX0IbIEVvc="; + vendorHash = "sha256-/VLI51s3CQSzaLhiO673chXgqDml2l0zVXGFvhiVbAs="; patches = [ (replaceVars ./set-pandoc-path.patch { From 2f3d2c80f3cf13e9c1d0d0e93461525495135840 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jan 2026 18:14:09 +0000 Subject: [PATCH 110/142] cosmic-ext-applet-weather: 0-unstable-2025-12-03 -> 0-unstable-2026-01-17 --- pkgs/by-name/co/cosmic-ext-applet-weather/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix index 2e346a8f15b9..5ad79d16caf4 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-weather"; - version = "0-unstable-2025-12-03"; + version = "0-unstable-2026-01-17"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ext-applet-weather"; - rev = "289d866abaaeaf51e9b7074b7731bcd6e5ea4b55"; - hash = "sha256-LeUzDjUiDt3lQiQQvDB9RlSC1F4IyXTE4lc17eQd+Sw="; + rev = "142666f73c702036438408758ea86ec22d63611b"; + hash = "sha256-K4flguR6pknhFCpwHQ+4OtSAtPBjUag1g/uUnCNM3Pw="; }; - cargoHash = "sha256-1lIWzCqpIxk+FWA/84yN/x10Se2xRTZ7KEqAWVgfFgU="; + cargoHash = "sha256-LcTUIhAWitLFz23TasfSJt6tOAAAJDiHxfTcxBX2/Bg="; nativeBuildInputs = [ libcosmicAppHook From da7f806a617527346999bbd2bbd4318e4f91ab39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jan 2026 20:03:42 +0000 Subject: [PATCH 111/142] fresh-editor: 0.1.75 -> 0.1.77 --- pkgs/by-name/fr/fresh-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix index 915529cef0e6..697c6035bd16 100644 --- a/pkgs/by-name/fr/fresh-editor/package.nix +++ b/pkgs/by-name/fr/fresh-editor/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "fresh"; - version = "0.1.75"; + version = "0.1.77"; src = fetchFromGitHub { owner = "sinelaw"; repo = "fresh"; tag = "v${finalAttrs.version}"; - hash = "sha256-c/zpPvPOlbZvmSGb+DqPV9HA+ic8/9TYv9MgI8d4Bgs="; + hash = "sha256-+ESguKlMUB2gm9zNee35wKdZmKLhLcPFa3Z7n4KNpVQ="; }; - cargoHash = "sha256-o6/ER521tpmn8hkMDEw1ykgYuFpG1DTkFbw95NGYqGo="; + cargoHash = "sha256-MrFVolkqGRESPNPsQPDZGvHNVYyB9+ok4GANgIfBbZU="; passthru.updateScript = nix-update-script { }; From b1a001a2214a9f55abdf9c04b23bf0320c70b245 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jan 2026 21:05:30 +0000 Subject: [PATCH 112/142] python3Packages.neo4j: 6.0.3 -> 6.1.0 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 8296ca891374..b39aa1212866 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "neo4j"; - version = "6.0.3"; + version = "6.1.0"; pyproject = true; src = fetchFromGitHub { owner = "neo4j"; repo = "neo4j-python-driver"; tag = version; - hash = "sha256-KhPxwj5MmhNpd4d64dN0d1wOP6nAac/DsRQ8zoT03/A="; + hash = "sha256-1Ef9SMJid0q+tI8hceriNu2vsLAyW4Jxt53ifcmi5VA="; }; postPatch = '' From 949c6df858689ba1c81d920cc4d97a59c30ed3db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jan 2026 21:32:26 +0000 Subject: [PATCH 113/142] slidev-cli: 52.11.2 -> 52.11.3 --- pkgs/by-name/sl/slidev-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slidev-cli/package.nix b/pkgs/by-name/sl/slidev-cli/package.nix index 760e0d0b090b..bd9f31e7eab0 100644 --- a/pkgs/by-name/sl/slidev-cli/package.nix +++ b/pkgs/by-name/sl/slidev-cli/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "slidev-cli"; - version = "52.11.2"; + version = "52.11.3"; src = fetchFromGitHub { owner = "slidevjs"; repo = "slidev"; tag = "v${finalAttrs.version}"; - hash = "sha256-dAGHcnHNSYtIQvcrn/jRbA2GF7YBJkYXbQbjkGtTUa0="; + hash = "sha256-Q1nfWxeu0u9/1mxTh+aKqZYMW2IXnT7+dB1ZVfEIMWE="; }; pnpmWorkspaces = [ "@slidev/cli..." ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspaces ; fetcherVersion = 3; - hash = "sha256-rHqrtK6eIqQ6SoZA1CtuUwDbHSZ9HSHikMdNrTtojHs="; + hash = "sha256-qdIpC+pDDinStTXVlHbuZZa2s9Sr5Nu9k/OAGxmXSuI="; }; nativeBuildInputs = [ From 388676b1d3c1b6deaf60dc3a1e7625efcd8bf2de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jan 2026 21:58:29 +0000 Subject: [PATCH 114/142] astro-language-server: 2.16.2 -> 2.16.3 --- pkgs/by-name/as/astro-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 3799d76dcf01..5960a8515639 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "astro-language-server"; - version = "2.16.2"; + version = "2.16.3"; src = fetchFromGitHub { owner = "withastro"; repo = "astro"; rev = "@astrojs/language-server@${finalAttrs.version}"; - hash = "sha256-ZH+g1pnasVvbNVg3Id6/rlwqjIr7qRgitqOSilgpX64="; + hash = "sha256-ONpSW6VMoiW1Q0Aa5Dp1pZx3LAQ2Kzv5YHKxHOxbXdo="; }; # https://pnpm.io/filtering#--filter-package_name-1 @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 2; - hash = "sha256-M2Xef5yTEQCLPzzx7WGQYplTrND+DPMy1hyEuahK+kM="; + hash = "sha256-Kqw4W3ZWRHWNnJYLGks9IHjCYAYEIigskwb//yKvb6c="; }; nativeBuildInputs = [ From 62249532841b99590da98ed23c7240abe1609d95 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 17 Jan 2026 23:22:35 +0100 Subject: [PATCH 115/142] music-assistant: 2.7.3 -> 2.7.5 https://github.com/music-assistant/server/releases/tag/2.7.4 https://github.com/music-assistant/server/releases/tag/2.7.5 diff: https://github.com/music-assistant/server/compare/2.7.3...2.7.5 --- pkgs/by-name/mu/music-assistant/package.nix | 4 ++-- pkgs/by-name/mu/music-assistant/providers.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 3877924bfac4..fe7ab9c868bb 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -47,14 +47,14 @@ assert python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.7.3"; + version = "2.7.5"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-6D3B88wjfVHvNhNrTDOu77eAkherOqdBVafUhht7okA="; + hash = "sha256-iWdOGdmPJO7Pjdn8UjuSOhWnRGBFjmARFsuHmP6IP58="; }; patches = [ diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index a40106dec226..0ad1828c4768 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.7.3"; + version = "2.7.5"; providers = { airplay = ps: [ ]; @@ -134,6 +134,7 @@ sendspin = ps: with ps; [ aiosendspin + av ]; siriusxm = ps: [ ]; # missing sxm From 1d81b0a624eb5de05e8000646377df2bcbd67dc5 Mon Sep 17 00:00:00 2001 From: Vikingnope Date: Sat, 17 Jan 2026 23:30:53 +0100 Subject: [PATCH 116/142] wttrbar: 0.13.0 -> 0.13.1 --- pkgs/by-name/wt/wttrbar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index a4964d0b2a09..b9a41a5055d9 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wttrbar"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; tag = finalAttrs.version; - hash = "sha256-TYWbC9TMHRWLPQ199SMbg2ROVVCFYbZDqB54IAbeTUQ="; + hash = "sha256-TDjEIrxFkh6d0x89LxaiarsP0BIzP5+rxu3YCdXIQ2U="; }; - cargoHash = "sha256-yqfg/tDLCEwkgSAD2B63y7tVNx7RLblfD2yvywPzbz0="; + cargoHash = "sha256-yiShp9k5oiGAtj59jGDEFsQKujDFajO+Nwq0bLh/PtA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 37d940236354e7efb14541e283a7738ba06fe06e Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 17 Jan 2026 23:30:59 +0100 Subject: [PATCH 117/142] jjui: 0.9.9 -> 0.9.10 Changelog: https://github.com/idursun/jjui/releases/tag/v0.9.10 Diff: https://github.com/idursun/jjui/compare/v0.9.9...v0.9.10 --- pkgs/by-name/jj/jjui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 082cd77da9c5..b6960bceed6b 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "jjui"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${finalAttrs.version}"; - hash = "sha256-kBhEX6k/1vVhSqKeUcIQp6sOpKDnJfgUNKOTzbjG/VI="; + hash = "sha256-Hsuyf5VcSZcNi2gmubXS47uRarL17oPEtorisY75bbM="; }; vendorHash = "sha256-jte0g+aUiGNARLi8DyfsX6wYYJnodHnILzmid6KvMiA="; From d3ae307c40d3823c7bfc1ae6636fdb6c29ce72a8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 18 Jan 2026 08:37:42 +1000 Subject: [PATCH 118/142] linux_6_18: 6.18.5 -> 6.18.6 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 9d8494c2be6d..2f7f250ec50a 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,8 +30,8 @@ "lts": true }, "6.18": { - "version": "6.18.5", - "hash": "sha256:0h6r5w7755gd8ys18zi9rgw95wrd2yalbq0h88ihv3ggki01z78q", + "version": "6.18.6", + "hash": "sha256:06x3z649mzwwkb1hvsy0yh7j5jk9qrnwqcmwy7dx8s1ggccrf927", "lts": false } } From 30faebbd255174397316c3746b310815cf111271 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 18 Jan 2026 08:38:18 +1000 Subject: [PATCH 119/142] linux_6_12: 6.12.65 -> 6.12.66 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 2f7f250ec50a..b493821931ca 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -25,8 +25,8 @@ "lts": true }, "6.12": { - "version": "6.12.65", - "hash": "sha256:1h9rl62lffwxan5ggz1vi9wmyzzsclg330gwdk80wp7kg9k55s2l", + "version": "6.12.66", + "hash": "sha256:1bvfadb5149sh927f8cbr1rnypn7v0h6znjdrc1mmc30q2hrff5s", "lts": true }, "6.18": { From 672eb8dd41adefff3bf3a18cf94e7d382b53f42c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 18 Jan 2026 08:39:08 +1000 Subject: [PATCH 120/142] linux_6_6: 6.6.120 -> 6.6.121 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index b493821931ca..385574918614 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "lts": true }, "6.6": { - "version": "6.6.120", - "hash": "sha256:08fwwi9wjnhaj4ig0n0ycppzw384djh0gzv3i3blzp7fb4nk6p20", + "version": "6.6.121", + "hash": "sha256:1fhl9pr02s10j4b5nli0isy7ps644cpbmjqzkwf5mk14rr7rvbvn", "lts": true }, "6.12": { From 8e4510a4fe63aee0f08ece8026f0e8e422a0d8c8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 18 Jan 2026 08:39:53 +1000 Subject: [PATCH 121/142] linux_6_1: 6.1.160 -> 6.1.161 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 385574918614..1d98124cfc82 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,8 +5,8 @@ "lts": false }, "6.1": { - "version": "6.1.160", - "hash": "sha256:15l4s87vyv4rnf5yagl6x7kz4yrlalh191ssxwbvwn3m8fl4d18f", + "version": "6.1.161", + "hash": "sha256:0aasgrq6mv5nj7b8ashzx0pxlaah5y0f3sq7d8w00di2lyync5ml", "lts": true }, "5.15": { From 5d3cb810321cbfaf06cf204f6a4f50f071e7cc4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jan 2026 22:47:30 +0000 Subject: [PATCH 122/142] hydralauncher: 3.8.0 -> 3.8.1 --- pkgs/by-name/hy/hydralauncher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 1c98d0bed83d..e57161c3d9f6 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-8dRnGr9nVu+GNIVcH90iPDF0VoMibiKqL6dGRdmZl94="; + hash = "sha256-GLoGdZ/UWtkWt4WjjhmupQzPQTMuQI+7jb7IjSCcvo0="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; From 232a75b8c582297a426d062c7462d753da34022e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Jan 2026 23:56:12 +0100 Subject: [PATCH 123/142] python313Packages.streamlit: migrate to finalAttrs --- .../development/python-modules/streamlit/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index f61467d882d3..a59295d5d6fb 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -25,19 +25,17 @@ watchdog, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "streamlit"; version = "1.53.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ARQRbTRYny5lK/Ssc1o6ymmAfmWfkvmcmOe2INAAg48="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; pythonRelaxDeps = [ "packaging" ]; @@ -74,7 +72,7 @@ buildPythonPackage rec { meta = { homepage = "https://streamlit.io/"; - changelog = "https://github.com/streamlit/streamlit/releases/tag/${version}"; + changelog = "https://github.com/streamlit/streamlit/releases/tag/${finalAttrs.version}"; description = "Fastest way to build custom ML tools"; mainProgram = "streamlit"; maintainers = with lib.maintainers; [ @@ -83,4 +81,4 @@ buildPythonPackage rec { ]; license = lib.licenses.asl20; }; -} +}) From 9b0a1b1f247299e5bde478973c430187283a7856 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 17 Jan 2026 13:44:38 +0100 Subject: [PATCH 124/142] cups-zj-58: fix build exclude incompatible-pointer-types by setting env.NIX_CFLAGS_COMPILE --- pkgs/by-name/cu/cups-zj-58/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/cu/cups-zj-58/package.nix b/pkgs/by-name/cu/cups-zj-58/package.nix index 6fa17f917d15..73d0cd229104 100644 --- a/pkgs/by-name/cu/cups-zj-58/package.nix +++ b/pkgs/by-name/cu/cups-zj-58/package.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation { --replace-fail "cmake_minimum_required ( VERSION 3.0 )" "cmake_minimum_required ( VERSION 3.10 )" ''; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + installPhase = '' install -D ppd/zj80.ppd $out/share/cups/model/zjiang/zj80.ppd install -D ppd/zj58.ppd $out/share/cups/model/zjiang/zj58.ppd From eeb61923fe9b829cb7c734cd64b1a430b7b32be8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jan 2026 23:40:56 +0000 Subject: [PATCH 125/142] python3Packages.unstructured-client: 0.42.6 -> 0.42.8 --- .../python-modules/unstructured-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index f6fb1b8cce11..6c3a2e2ebd5f 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "unstructured-client"; - version = "0.42.6"; + version = "0.42.8"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; tag = "v${version}"; - hash = "sha256-94d4OBaQTMacbOaRniNlaDVE3jZ+g28Hl3xbTmvY8L8="; + hash = "sha256-BXHJOkTZdAnpf38WdHugcwYyWuURylbYTjaKoPt7O5A="; }; preBuild = '' From 2e2c7e49848b7fcaa90a2a472e5f6211cd21c9b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jan 2026 23:44:15 +0000 Subject: [PATCH 126/142] python3Packages.growattserver: 1.7.1 -> 1.8.0 --- pkgs/development/python-modules/growattserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index a1ced89cd953..927e1428e473 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.7.1"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; tag = version; - hash = "sha256-rob2+uXuBD5Gf05rNFFEW210JxrTbWN7knk9Tnz7wOE="; + hash = "sha256-2Jgz/wN0k6ni+4PbQwfDg3uMvYxv5N3BVgdARHqQ0Yc="; }; build-system = [ setuptools ]; From 92538e77a0f7d9c89f2fcc2a6f4543c228d4badc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jan 2026 00:16:37 +0000 Subject: [PATCH 127/142] python3Packages.aiolifx-themes: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/aiolifx-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 3f518fe0f54d..43e359ece3b1 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; tag = "v${version}"; - hash = "sha256-uJQWKgmlNwuvIXfK6fFHngaSncgaDJJ36vkOLGWB/lY="; + hash = "sha256-Y92ze+zrkz+fxQNFFSR5V9sPJMN0/dfIRwT6UhXo0+U="; }; build-system = [ poetry-core ]; From e74da1eb66994e3daa81a872aea10347983f4340 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jan 2026 00:33:58 +0000 Subject: [PATCH 128/142] cdncheck: 1.2.18 -> 1.2.19 --- pkgs/by-name/cd/cdncheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 7af21f996747..433d1e8a039e 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "cdncheck"; - version = "1.2.18"; + version = "1.2.19"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${finalAttrs.version}"; - hash = "sha256-RFA/5fCh9csa6nYoVmuZ5vs6JCaTVFUuEz0E8w7Rb/s="; + hash = "sha256-gb+M/y1MADwCR9gz1+mSXbvE3sSV8FKTDSz+Y9U2gfU="; }; vendorHash = "sha256-Tc8qrML7u5qE0zVe7JCL1BM0KbhJSwnjhnd2gX5YUaA="; From 0d321ec153a6a66b4966bffccd3fdabfa2c036f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Jan 2026 01:37:36 +0100 Subject: [PATCH 129/142] python313Packages.aiolifx-themes: migrate to finalAttrs --- .../development/python-modules/aiolifx-themes/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 43e359ece3b1..517e10840aba 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -11,7 +11,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiolifx-themes"; version = "1.0.3"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Djelibeybi"; repo = "aiolifx-themes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Y92ze+zrkz+fxQNFFSR5V9sPJMN0/dfIRwT6UhXo0+U="; }; @@ -41,8 +41,8 @@ buildPythonPackage rec { meta = { description = "Color themes for LIFX lights running on aiolifx"; homepage = "https://github.com/Djelibeybi/aiolifx-themes"; - changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/${src.tag}"; + changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lukegb ]; }; -} +}) From 007e592930caca876146fe3372446e353c9331c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Jan 2026 01:39:32 +0100 Subject: [PATCH 130/142] python313Packages.unstructured-client: migrate to finalAttrs --- .../python-modules/unstructured-client/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index 6c3a2e2ebd5f..afec345dacc8 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -19,7 +19,7 @@ typing-inspection, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unstructured-client"; version = "0.42.8"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BXHJOkTZdAnpf38WdHugcwYyWuURylbYTjaKoPt7O5A="; }; @@ -66,15 +66,16 @@ buildPythonPackage rec { enabledTestPaths = [ "_test_unstructured_client" ]; + enabledTests = [ "unit" ]; meta = { - changelog = "https://github.com/Unstructured-IO/unstructured-python-client/blob/${src.tag}/RELEASES.md"; + changelog = "https://github.com/Unstructured-IO/unstructured-python-client/blob/${finalAttrs.src.tag}/RELEASES.md"; description = "Python Client SDK for Unstructured API"; homepage = "https://github.com/Unstructured-IO/unstructured-python-client"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) From 7db786e769652dd44d2adee5d94e2fb290883b89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Jan 2026 01:40:03 +0100 Subject: [PATCH 131/142] python313Packages.growattserver: migrate to finalAttrs --- pkgs/development/python-modules/growattserver/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 927e1428e473..719ce3bd7989 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "growattserver"; version = "1.8.0"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2Jgz/wN0k6ni+4PbQwfDg3uMvYxv5N3BVgdARHqQ0Yc="; }; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Python package to retrieve information from Growatt units"; homepage = "https://github.com/indykoning/PyPi_GrowattServer"; - changelog = "https://github.com/indykoning/PyPi_GrowattServer/releases/tag/${src.tag}"; + changelog = "https://github.com/indykoning/PyPi_GrowattServer/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From d385537236396bfb7eed1d6c4a14a1a3d25b25d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Jan 2026 01:43:18 +0100 Subject: [PATCH 132/142] python313Packages.neo4j: migrate to finalAttrs --- pkgs/development/python-modules/neo4j/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index b39aa1212866..8817d524e4ee 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "neo4j"; version = "6.1.0"; pyproject = true; @@ -18,14 +18,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neo4j"; repo = "neo4j-python-driver"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1Ef9SMJid0q+tI8hceriNu2vsLAyW4Jxt53ifcmi5VA="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "setuptools ==" "setuptools >=" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -49,8 +49,8 @@ buildPythonPackage rec { meta = { description = "Neo4j Bolt Driver for Python"; homepage = "https://github.com/neo4j/neo4j-python-driver"; - changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${src.tag}"; + changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From ba99e9c1c338f5ef23764b0a7cadf5dafef45099 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jan 2026 00:54:38 +0000 Subject: [PATCH 133/142] terraform-providers.bpg_proxmox: 0.92.0 -> 0.93.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d00222509938..893d290a1610 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,11 +110,11 @@ "vendorHash": null }, "bpg_proxmox": { - "hash": "sha256-d0v0a4t0sPkGQ9LGK7p5XZmuZBuBeLcWHBoslFu9Qs8=", + "hash": "sha256-eRed1lShDIpQRCC/JvqT5uYbDU+mgpMfEPiSQFoV1QA=", "homepage": "https://registry.terraform.io/providers/bpg/proxmox", "owner": "bpg", "repo": "terraform-provider-proxmox", - "rev": "v0.92.0", + "rev": "v0.93.0", "spdx": "MPL-2.0", "vendorHash": "sha256-+UWPbNHoV3TdeMZdY0ZOLBe1/Dej37hHORatC9Kol58=" }, From b80966d05af7f19d2cf633015bc4ba860a7627a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jan 2026 01:01:08 +0000 Subject: [PATCH 134/142] regal: 0.37.0 -> 0.38.1 --- pkgs/by-name/re/regal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index af6438144b46..3f312c59747f 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { name = "regal"; - version = "0.37.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "regal"; rev = "v${version}"; - hash = "sha256-zAp4v1bKz+q+29jlhEccl7o9RWLA+Hn3Kp/UGBQlmA8="; + hash = "sha256-/WGZCwT9VJ5zjEmL4PZqPymaUJFaWzjbgq2KMBfl6uQ="; }; - vendorHash = "sha256-yvUvv8EL3WrsyBnzaGQK4DR+O5Ner9ehkZYCMnfRwRU="; + vendorHash = "sha256-b7Q9eqq/lDykIQ0tkwBWk2ukAoScBTApfwoE2Ubm5iQ="; # Only build the main binary, exclude build/lsp/main.go subPackages = [ "." ]; From 13aad2545a7909c9e737bb2b001f77c613d6cbc6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Jan 2026 02:13:15 +0100 Subject: [PATCH 135/142] forgejo-runner: 12.5.2 -> 12.5.3 https://code.forgejo.org/forgejo/runner/releases/tag/v12.5.3 --- pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 293be60a958a..8f65d52bb8ce 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -49,17 +49,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "12.5.2"; + version = "12.5.3"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-aL79wMzoqt1rqaOQyV28HSeZwjL3k60AyQOhOT/+BRY="; + hash = "sha256-qCk2GvPWKIQfEjYtx2Uc7GcVDehUu0/u4LP88FxoA9A="; }; - vendorHash = "sha256-XNUhlGkW8bZ1cjODD6QIyRmmNdQ4Tq/hP2FToYfTq2k="; + vendorHash = "sha256-pGLZmSW7MKEy/K+njgcPv5a+7Qtf8mqUI4OwKhfEZXY="; nativeBuildInputs = [ makeWrapper ]; From d86e8d4da5342d0206b98cf1ae90fe8dd7aba107 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Jan 2026 02:03:02 +0100 Subject: [PATCH 136/142] nixos/resolved: fix regressions after interface change With the options being only set when `services.resolved.enable` was enabled, they were only available if the host resolver was resolved. That broke the resolved config used when initrd networking is enabled. A good indicator that something is wrong is if the config section of a module configures the options itself. That means non introspectable settings are being put in place. Additionally DNS= and Domains= need to be space-separated lists. The manpage does not indicate that they can be set multiple times. I decided not to port the LLMNR enablement over, since it never gained widespread traction and is generally being phased out in favor of mDNS. Fixes: #480964 --- nixos/modules/system/boot/resolved.nix | 89 +++++++++++++++++++------- 1 file changed, 67 insertions(+), 22 deletions(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index b86e28f81a0a..cc7f1096e8b3 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -10,11 +10,13 @@ let inherit (utils.systemdUtils.unitOptions) unitOption; inherit (lib) + concatStringsSep + elem + isList literalExpression mkIf mkMerge mkOption - mkOptionDefault mkOrder mkRenamedOptionModule mkRemovedOptionModule @@ -26,7 +28,25 @@ let dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries; - resolvedConf = settingsToSections cfg.settings; + transformSettings = + settings: + lib.mapAttrs ( + key: value: + # concat lists for options that should result in space-separated values + if + elem key [ + "DNS" + "Domains" + "FallbackDNS" + ] + && isList value + then + concatStringsSep " " value + else + value + ) settings; + + resolvedConf = settingsToSections (transformSettings cfg.settings); in { imports = [ @@ -60,22 +80,56 @@ in options = { services.resolved = { enable = lib.mkEnableOption "the Systemd DNS resolver daemon (systemd-resolved)"; + settings.Resolve = mkOption { description = '' Settings option for systemd-resolved. See {manpage}`resolved.conf(5)` for all available options. ''; - # Remember to keep this in sync to the actual settings at the bottom of the page. - defaultText = literalExpression '' - { - DNS = config.networking.nameservers; - DNSOverTLS = false; - DNSSEC = false; - Domains = config.networking.search; - LLMNR = true; - } - ''; - type = types.attrsOf unitOption; + default = { }; + type = types.submodule { + freeformType = types.attrsOf unitOption; + options = { + DNS = mkOption { + type = unitOption; + default = config.networking.nameservers; + defaultText = literalExpression "config.networking.nameservers"; + description = '' + List of IP addresses to query as recursive DNS resolvers. + ''; + }; + + DNSOverTLS = mkOption { + type = unitOption; + default = false; + description = '' + Whether to use TLS encryption for DNS queries. Requires + nameservers that support DNS-over-TLS. + ''; + }; + + DNSSEC = mkOption { + type = unitOption; + default = false; + description = '' + Whether to validate DNSSEC for DNS lookups. + ''; + }; + + Domains = mkOption { + type = unitOption; + default = config.networking.search; + defaultText = literalExpression "config.networking.search"; + example = [ + "scope.example.com" + "example.com" + ]; + description = '' + List of search domains used to complete unqualified name lookups. + ''; + }; + }; + }; }; }; @@ -101,15 +155,6 @@ in } ]; - # If updating any of these attrs, also update the defaultText above. - services.resolved.settings.Resolve = { - DNS = config.networking.nameservers; - DNSOverTLS = mkOptionDefault false; - DNSSEC = mkOptionDefault false; - Domains = mkOptionDefault config.networking.search; - LLMNR = mkOptionDefault true; - }; - users.users.systemd-resolve.group = "systemd-resolve"; # add resolve to nss hosts database if enabled and nscd enabled From 08d43be6c7adf4c8760196ed7893d0d83123b6f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jan 2026 03:03:48 +0000 Subject: [PATCH 137/142] clashmi: 1.0.15.191 -> 1.0.16.204 --- pkgs/by-name/cl/clashmi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clashmi/package.nix b/pkgs/by-name/cl/clashmi/package.nix index 810d3a302eff..dfb5d0a28d68 100644 --- a/pkgs/by-name/cl/clashmi/package.nix +++ b/pkgs/by-name/cl/clashmi/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "clashmi"; - version = "1.0.15.191"; + version = "1.0.16.204"; src = fetchurl { url = "https://github.com/KaringX/clashmi/releases/download/v${finalAttrs.version}/clashmi_${finalAttrs.version}_linux_amd64.deb"; - hash = "sha256-P23H3OUIcDhVQ7dOLbB2uyZnbxh+6zurGeg0/wpPeHk="; + hash = "sha256-IOCrk4dl9BYf8rzhgXmRAaFP4pzsJMx6i2zTg/NpOCQ="; }; nativeBuildInputs = [ From 14b85b757c6f6af35f813c9d46f7a0682171fc31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jan 2026 03:17:08 +0000 Subject: [PATCH 138/142] terraform-providers.scaleway_scaleway: 2.66.0 -> 2.67.1 --- .../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 62e1125ef9ba..5b81cb625987 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1175,13 +1175,13 @@ "vendorHash": "sha256-f3b4NULINH8XworCn46fiz4GmBM31ROdAJy1j4GKkx4=" }, "scaleway_scaleway": { - "hash": "sha256-TekcGTYzpqFUVv0NYRGi71rgMD0okQpMPiPI8869cog=", + "hash": "sha256-3p/g43WkVI3T2e2xSm/hwzu9aFqivszUtVcPsFSsx1o=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.66.0", + "rev": "v2.67.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-2uqoiUdU8hVHm8Mc0dkS/qAuqZkhVVTKwf++CobRGtw=" + "vendorHash": "sha256-rT8ScPPnrbUBviiK03U96K5vvVEbcLra3MGSJ8+SYyE=" }, "scottwinkler_shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", From 75371f564ac122ea4dcb1e5c915e4273c603f049 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jan 2026 03:58:57 +0000 Subject: [PATCH 139/142] hardinfo2: 2.2.13 -> 2.2.16 --- pkgs/by-name/ha/hardinfo2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/hardinfo2/package.nix b/pkgs/by-name/ha/hardinfo2/package.nix index 63c8658cdc9f..d28c1dd8dfff 100644 --- a/pkgs/by-name/ha/hardinfo2/package.nix +++ b/pkgs/by-name/ha/hardinfo2/package.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hardinfo2"; - version = "2.2.13"; + version = "2.2.16"; src = fetchFromGitHub { owner = "hardinfo2"; repo = "hardinfo2"; tag = "release-${finalAttrs.version}"; - hash = "sha256-HRP8xjiwhlNHjW4D8y74Pshpn7bksmN5j4jhfF6KOYo="; + hash = "sha256-n/Rf/XKsATx3OEzYSjl+2Yzk7WSiaBkbOveA9+xR6fc="; }; patches = [ From 027bdb82ae0885d78a82cef463284e6bf8048e25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jan 2026 05:27:00 +0000 Subject: [PATCH 140/142] monophony: 4.3.0 -> 4.3.1 --- pkgs/by-name/mo/monophony/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 158e2b95d393..0d91dd20592d 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -12,14 +12,14 @@ }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; src = fetchFromGitLab { owner = "zehkira"; repo = "monophony"; tag = "v${version}"; - hash = "sha256-w2ev/fpswaNcutxg2zMwrtFkulMbbG7BUm3L8qlnZKk="; + hash = "sha256-Jp2RwfTcOb4xALIMc4DAQX+fWdqPE+TWv5qRgdSopbM="; }; sourceRoot = "${src.name}/source"; From c1530d3bd862f8c779dbd40cad1bdf0bbf6158dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jan 2026 06:16:01 +0000 Subject: [PATCH 141/142] appdaemon: 4.5.12 -> 4.5.13 --- pkgs/servers/home-assistant/appdaemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 3822cbef1605..da786fbcef6f 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "appdaemon"; - version = "4.5.12"; + version = "4.5.13"; pyproject = true; src = fetchFromGitHub { owner = "AppDaemon"; repo = "appdaemon"; tag = version; - hash = "sha256-lcGQQz+kPefHSyc2RNQ4gHgraRJPvn/FcgMJGvCtC48="; + hash = "sha256-uVlrLyj8GZo1T8AKBxpVTPPqUrwxmyMbgaopmEGZiR4="; }; pythonRelaxDeps = true; From 3ded50888bc9086f6ea923d036bfe2301c44d6f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jan 2026 06:27:01 +0000 Subject: [PATCH 142/142] snac2: 2.87 -> 2.88 --- pkgs/by-name/sn/snac2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix index 9682a3715ac6..ed4e4871322d 100644 --- a/pkgs/by-name/sn/snac2/package.nix +++ b/pkgs/by-name/sn/snac2/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "snac2"; - version = "2.87"; + version = "2.88"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = "snac2"; tag = finalAttrs.version; - hash = "sha256-CY4YfnIGQs7BcZrDRD8i+8Wq5eC1jbex6UR9bGgMw40="; + hash = "sha256-3IqPIIfU4MKXMMpOFYgI0RN+DZE+oTgLGOYIKwfKCsI="; }; buildInputs = [