From 6c2c08e3272f99f878ca665e4871921b53bb9807 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Mar 2026 19:15:01 +0000 Subject: [PATCH 01/51] python3Packages.pypdfium2: 5.5.0 -> 5.6.0 --- pkgs/development/python-modules/pypdfium2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypdfium2/default.nix b/pkgs/development/python-modules/pypdfium2/default.nix index 2ad662c35a17..21394cf6624f 100644 --- a/pkgs/development/python-modules/pypdfium2/default.nix +++ b/pkgs/development/python-modules/pypdfium2/default.nix @@ -36,14 +36,14 @@ let in buildPythonPackage rec { pname = "pypdfium2"; - version = "5.5.0"; + version = "5.6.0"; pyproject = true; src = fetchFromGitHub { owner = "pypdfium2-team"; repo = "pypdfium2"; tag = version; - hash = "sha256-MSX7Ij9yGi5BYyAw794ZxQpoXz9hldevKKz7hxO0Yrg="; + hash = "sha256-3mGjr8GgylxFIFT+NmyJ50ozTQvCIPexAgaQ30Ki2Ww="; }; build-system = [ From 969dbdbbc5c79d70eb7d29b35a421425df394d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 15 Mar 2026 06:53:23 -0700 Subject: [PATCH 02/51] python3Packages.quil: 0.34.0 -> 0.35.0 Diff: https://github.com/rigetti/quil-rs/compare/quil-rs/v0.34.0...quil-rs/v0.35.0 Changelog: https://github.com/rigetti/quil-rs/blob/quil-rs/v0.35.0/quil-rs/CHANGELOG.md --- pkgs/development/python-modules/quil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/quil/default.nix b/pkgs/development/python-modules/quil/default.nix index cc6a83b48352..575b62ec9621 100644 --- a/pkgs/development/python-modules/quil/default.nix +++ b/pkgs/development/python-modules/quil/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "quil"; - version = "0.34.0"; + version = "0.35.0"; pyproject = true; src = fetchFromGitHub { owner = "rigetti"; repo = "quil-rs"; tag = "quil-rs/v${version}"; - hash = "sha256-to6eKStXiJPqP22kN+gNiroiBUFiK7Q84BuTZHMr5SI="; + hash = "sha256-QWW8+cup81eyedDTU3jgslNanaj0+D2jI5XQMS3ZUIo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-vNa4RUIecCHDb9rvMdiC8jtBdM/6C2bKagX1YkSMuhk="; + hash = "sha256-cIWnTuxoFqkl+0W6NH9DwNokq7RKdNggFLwPYgkbHho="; }; buildAndTestSubdir = "quil-rs"; From ffd2f32338a1d9ed5a50a4790e06af2440f4b1f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 15 Mar 2026 06:42:07 -0700 Subject: [PATCH 03/51] python3Packages.qcs-sdk-python: 0.21.22 -> 0.26.0 Diff: https://github.com/rigetti/qcs-sdk-rust/compare/python/v0.21.22...lib/v0.26.0 Changelog: https://github.com/rigetti/qcs-sdk-rust/blob/lib/v0.26.0/crates/lib/CHANGELOG.md --- .../python-modules/qcs-sdk-python/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix index 05b0aa611699..067534536bc6 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -7,7 +7,6 @@ opentelemetry-sdk, pytest-asyncio, pytestCheckHook, - pythonAtLeast, qcs-api-client-common, quil, rustPlatform, @@ -16,25 +15,22 @@ buildPythonPackage rec { pname = "qcs-sdk-python"; - version = "0.21.22"; + version = "0.26.0"; pyproject = true; - # error: the configured Python interpreter version (3.13) is newer than PyO3's maximum supported version (3.12) - disabled = pythonAtLeast "3.13"; - src = fetchFromGitHub { owner = "rigetti"; repo = "qcs-sdk-rust"; - tag = "python/v${version}"; - hash = "sha256-uaoXSkc8yg+WZONgvRkOARaf9kvLKv6S+K5yMDuXbbA="; + tag = "lib/v${version}"; + hash = "sha256-A404lYKGAigzsnqWO4BAphOK/Juj4Fa2EHXQO8N1U9I="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-/SkYzQisSACTedC4FsEp4rXXdWV5f64gA33I/Ubu80E="; + hash = "sha256-NAcCZks5N1KPqeA5v72NAcJqHGexRU99yXQHg21vkPA="; }; - buildAndTestSubdir = "crates/python"; + buildAndTestSubdir = "crates/lib"; nativeBuildInputs = [ rustPlatform.cargoSetupHook @@ -71,11 +67,11 @@ buildPythonPackage rec { ]; passthru.updateScript = gitUpdater { - rev-prefix = "python/v"; + rev-prefix = "lib/v"; }; meta = { - changelog = "https://github.com/rigetti/qcs-sdk-rust/blob/${src.tag}/crates/python/CHANGELOG.md"; + changelog = "https://github.com/rigetti/qcs-sdk-rust/blob/${src.tag}/${buildAndTestSubdir}/CHANGELOG.md"; description = "Python interface for the QCS Rust SDK"; homepage = "https://github.com/rigetti/qcs-sdk-rust/tree/main/crates/python"; license = lib.licenses.asl20; From 21eb469490600fcf077e86fcfba9e19a05f63e43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Mar 2026 15:58:07 +0000 Subject: [PATCH 04/51] pdfium-binaries: 7643 -> 7734 --- pkgs/by-name/pd/pdfium-binaries/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index e53196f2d54a..5724474f7891 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdfium-binaries"; - version = "7643"; + version = "7734"; src = let @@ -27,17 +27,17 @@ stdenv.mkDerivation (finalAttrs: { hash = if withV8 then selectSystem { - x86_64-linux = "sha256-u44789oMKbBQ6USu4BnyoL4ZcCKDVkh81kOku9ZfloE="; - aarch64-linux = "sha256-w+WI4+aESiBafPv4bbvwVqptecenzEj3M9wSH43n294="; - x86_64-darwin = "sha256-0cPMIu8NDrnDd/4g0eL0j0jV9bzQCh36Ahx4mC/Hw9E="; - aarch64-darwin = "sha256-R09JnjpcQMMfjbhFzRwE4/KXb9FCXzt/APM+oEUdknk="; + x86_64-linux = "sha256-ovbxiOwsmBUddbuTreVvhJeHMYd4dKu+rACDELsRC90="; + aarch64-linux = "sha256-wMddHbzxCs21dzZhLjpLEviplFOzHukrRRbCPMOTrDs="; + x86_64-darwin = "sha256-+UsFsft9WKd0LrDKbdxuKlHxNsfhzOIWvm8Br0MlNgc="; + aarch64-darwin = "sha256-MDE27+uIhqkSe76xtx/sHt++OQtXXAueq10KrwYVJ8Q="; } else selectSystem { - x86_64-linux = "sha256-IpiNeuB5fOm2hYBfjydrg4G00xtvJQEqZJIzxHtzwac="; - aarch64-linux = "sha256-NgboVIUuntEO/CyXcTJB8Gn9H1B5Z0GEfR7FhCFbHko="; - x86_64-darwin = "sha256-fBatwgVRO4TawMAd0MaXxvgX+OLln+K10RjsGsvPLBs="; - aarch64-darwin = "sha256-Sqrt5V0IxYuZmy1w9faDrESkoI4QNhtKS+GHY0ushGA="; + x86_64-linux = "sha256-us1UjIhdsRTSGJOkasLdMyIRKdHXKr21hY2+NOIKVH4="; + aarch64-linux = "sha256-wHZVPH/c+jsxcClWznox/wnlKlTyUeKqdQxujdD67XU="; + x86_64-darwin = "sha256-+Umu2SsuO9lJGngkBVyuAvg4wu9d/OCsSabQ7F4U55U="; + aarch64-darwin = "sha256-pHEK9QC2DMZoRnTGc6NfVjCxaZYmCsh3RqHdSCdZ0Cs="; }; stripRoot = false; }; From 0e95b2a61aeeda0b4b3348fa025da991ec2a016f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 24 Mar 2026 19:01:25 +1100 Subject: [PATCH 05/51] mupdf: xcbuild not required --- pkgs/by-name/mu/mupdf/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 8decbcb600dd..0e14f518e7ba 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -35,7 +35,6 @@ enablePython ? false, which, swig, - xcbuild, gitUpdater, enableBarcode ? false, # for passthru.tests @@ -135,7 +134,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames - xcbuild ]; buildInputs = [ From 12a6b362611290f616bd4f0a94456d343f984ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 24 Mar 2026 20:50:54 +1100 Subject: [PATCH 06/51] cdxgen: remove unnecessasry xcbuild --- pkgs/by-name/cd/cdxgen/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/cd/cdxgen/package.nix b/pkgs/by-name/cd/cdxgen/package.nix index 9119e668d10d..d7f4a98c38ff 100644 --- a/pkgs/by-name/cd/cdxgen/package.nix +++ b/pkgs/by-name/cd/cdxgen/package.nix @@ -10,7 +10,6 @@ pnpmConfigHook, python3, stdenv, - xcbuild, }: stdenv.mkDerivation (finalAttrs: { pname = "cdxgen"; @@ -32,7 +31,6 @@ stdenv.mkDerivation (finalAttrs: { python3 # required for sqlite3 bindings ] ++ lib.optional stdenv.hostPlatform.isDarwin [ - xcbuild cctools.libtool ]; From 2b48f9699823c74125eadd294341de447178d9cd Mon Sep 17 00:00:00 2001 From: kyehn <228304369+kyehn@users.noreply.github.com> Date: Tue, 24 Mar 2026 17:15:09 +0800 Subject: [PATCH 07/51] zug: 0.1.1 -> 0.1.2 Diff: https://github.com/arximboldi/zug/compare/v0.1.1...v0.1.2 --- pkgs/by-name/zu/zug/gcc15.patch | 15 --------------- pkgs/by-name/zu/zug/package.nix | 15 ++------------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 pkgs/by-name/zu/zug/gcc15.patch diff --git a/pkgs/by-name/zu/zug/gcc15.patch b/pkgs/by-name/zu/zug/gcc15.patch deleted file mode 100644 index b0e44a4b7b1d..000000000000 --- a/pkgs/by-name/zu/zug/gcc15.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/zug/sequence.hpp b/zug/sequence.hpp -index d7ac093..bffb771 100644 ---- a/zug/sequence.hpp -+++ b/zug/sequence.hpp -@@ -76,8 +76,9 @@ struct sequence_data - - sequence_data& operator=(sequence_data&& other) - { -- impl_ = std::move(other.impl); -+ impl_ = std::move(other.impl_); - impl_.reductor.current(this); -+ return *this; - } - - sequence_data& operator=(const sequence_data& other) diff --git a/pkgs/by-name/zu/zug/package.nix b/pkgs/by-name/zu/zug/package.nix index 2ffc1c446ec5..9c76aed52cb1 100644 --- a/pkgs/by-name/zu/zug/package.nix +++ b/pkgs/by-name/zu/zug/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, boost, catch2, @@ -10,25 +9,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "zug"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "arximboldi"; repo = "zug"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ti0EurhGQgWSXzSOlH9/Zsp6kQ/+qGjWbfHGTPpfehs="; + hash = "sha256-0HrvCpbVnxEvwvG4btXu0hRzdcHsGwM/HUWES/fmxrs="; }; - patches = [ - (fetchpatch { - url = "https://github.com/arximboldi/zug/commit/c8c74ada30d931e40636c13763b892f20d3ce1ae.patch"; - hash = "sha256-0x+ScRnziBeyHWYJowcVb2zahkcK2qKrMVVk2twhtHA="; - }) - - # https://github.com/arximboldi/zug/issues/45 - ./gcc15.patch - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ From 28923d5072f76ef8296ce1165b626ac654ba5a3b Mon Sep 17 00:00:00 2001 From: langsjo <104687438+langsjo@users.noreply.github.com> Date: Tue, 24 Mar 2026 14:10:23 +0200 Subject: [PATCH 08/51] rmg: patch includes that cause errors --- pkgs/by-name/rm/rmg/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index c4a1d31452d7..03063b819cbd 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, gitUpdater, boost, cmake, @@ -39,6 +40,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-d2kUUJTZhm5m7MIZ8Ym0wyBvX2+h/FsrRQoyLTi0/N8="; }; + # Fixes include errors from including minizip libraries + patches = [ + (fetchpatch2 { + name = "0000-fix-minizip-include-archive"; + url = "https://github.com/Rosalie241/RMG/commit/7e4e402f277803d3a998e96ea04064063bd1551a.patch"; + hash = "sha256-uyEYv2r7J2nou9AHkezEX0LS/mOnIa6lbQqhxHY9ibo="; + }) + (fetchpatch2 { + name = "0001-fix-minizip-include-mupen64plus-core"; + url = "https://github.com/Rosalie241/RMG/commit/8ee3410680c247dcfee806562073626a0b7bf46b.patch"; + hash = "sha256-29zg90ScPNizWq3BzNuM6yfCwmMXRYFfbjOg3YpCrGI="; + }) + ]; + nativeBuildInputs = [ cmake nasm From 41326ad76f7e62d38a64c4e9f06930ed29175889 Mon Sep 17 00:00:00 2001 From: langsjo <104687438+langsjo@users.noreply.github.com> Date: Tue, 24 Mar 2026 14:10:34 +0200 Subject: [PATCH 09/51] rmg: 0.8.8 -> 0.8.9 --- pkgs/by-name/rm/rmg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 03063b819cbd..8f5707c82b09 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rmg"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "Rosalie241"; repo = "RMG"; tag = "v${finalAttrs.version}"; - hash = "sha256-d2kUUJTZhm5m7MIZ8Ym0wyBvX2+h/FsrRQoyLTi0/N8="; + hash = "sha256-L8fA2D1BQWhJiygHmbOmINBFk27X2Vd7zHCGnElM9EE="; }; # Fixes include errors from including minizip libraries From 46e433c436e555bc11a4862eb3b09921b9c4195b Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 22 Mar 2026 15:59:41 -0700 Subject: [PATCH 10/51] python3Packages.hyponcloud: init at 0.9.0 --- .../python-modules/hyponcloud/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/hyponcloud/default.nix diff --git a/pkgs/development/python-modules/hyponcloud/default.nix b/pkgs/development/python-modules/hyponcloud/default.nix new file mode 100644 index 000000000000..312a7b3508e5 --- /dev/null +++ b/pkgs/development/python-modules/hyponcloud/default.nix @@ -0,0 +1,49 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + mashumaro, + pytest-asyncio, + pytestCheckHook, + setuptools, + setuptools-scm, +}: + +buildPythonPackage (finalAttrs: { + pname = "hyponcloud"; + version = "0.9.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jcisio"; + repo = "hyponcloud"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZFolkhyXauUS+6rbCjSp+5Oxfp3Y7oh8fjXHwDi+zKA="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + aiohttp + mashumaro + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "hyponcloud" ]; + + meta = { + description = "Python library for Hypontech Cloud API for solar inverter monitoring"; + homepage = "https://github.com/jcisio/hyponcloud"; + changelog = "https://github.com/jcisio/hyponcloud/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4640b26e4b9b..fcec3e87755c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7286,6 +7286,8 @@ self: super: with self; { hyperscan = callPackage ../development/python-modules/hyperscan { }; + hyponcloud = callPackage ../development/python-modules/hyponcloud { }; + hypothesis = callPackage ../development/python-modules/hypothesis { }; hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { }; From b04e5f4892d6e5725a53cd539e722017dab9e65f Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 22 Mar 2026 15:59:45 -0700 Subject: [PATCH 11/51] home-assistant: add hypontech component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- pkgs/servers/home-assistant/tests.nix | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 42ff5594450c..b2d7155cfbc7 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2665,7 +2665,8 @@ ]; "hypontech" = ps: with ps; [ - ]; # missing inputs: hyponcloud + hyponcloud + ]; "ialarm" = ps: with ps; [ pyialarm @@ -7635,6 +7636,7 @@ "hvv_departures" "hydrawise" "hyperion" + "hypontech" "ialarm" "iaqualink" "ibeacon" diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 1147744310a7..2ebd6474769c 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -167,6 +167,10 @@ let }; extraDisabledTestPaths = { + hypontech = [ + # outdated snapshot + "tests/components/hypontech/test_sensor.py::test_sensors" + ]; jellyfin = [ # AssertionError: assert 'audio/x-flac' == 'audio/flac' "tests/components/jellyfin/test_media_source.py::test_resolve" From 4fb1de3ddaf4dafb9f54142abb216d59fe6a6314 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Fri, 27 Mar 2026 09:04:59 -0700 Subject: [PATCH 12/51] rocmPackages: 7.2.0 -> 7.2.1 Release notes: https://rocm.docs.amd.com/en/latest/about/release-notes.html --- .../rocm-modules/amdsmi/default.nix | 18 ++++++----- .../rocm-modules/aotriton/default.nix | 1 - .../rocm-modules/aqlprofile/default.nix | 25 ++++++++++----- pkgs/development/rocm-modules/clr/default.nix | 18 ++++++----- .../rocm-modules/composable_kernel/base.nix | 16 ++++++---- .../composable_kernel/ck4inductor.nix | 4 +-- pkgs/development/rocm-modules/default.nix | 2 -- .../development/rocm-modules/half/default.nix | 5 ++- .../rocm-modules/hip-common/default.nix | 16 ++++++---- .../rocm-modules/hipblas-common/default.nix | 16 ++++++---- .../rocm-modules/hipblas/default.nix | 16 ++++++---- .../rocm-modules/hipblaslt/default.nix | 6 ++-- .../rocm-modules/hipcub/default.nix | 16 ++++++---- .../rocm-modules/hipfft/default.nix | 16 ++++++---- .../rocm-modules/hipfort/default.nix | 5 ++- .../rocm-modules/hipify/default.nix | 5 ++- .../rocm-modules/hiprand/default.nix | 16 ++++++---- .../rocm-modules/hipsolver/default.nix | 16 ++++++---- .../rocm-modules/hipsparse/default.nix | 16 ++++++---- .../development/rocm-modules/llvm/default.nix | 15 ++------- .../rocm-modules/migraphx/default.nix | 7 ++--- .../rocm-modules/miopen/default.nix | 31 ++++++++++++------- .../development/rocm-modules/miopen/update.sh | 4 +-- .../rocm-modules/mivisionx/default.nix | 7 ++--- .../development/rocm-modules/rccl/default.nix | 7 ++--- pkgs/development/rocm-modules/rdc/default.nix | 16 ++++++---- .../rocm-modules/rocalution/default.nix | 7 ++--- .../rocm-modules/rocblas/default.nix | 16 ++++++---- .../rocm-modules/rocdbgapi/default.nix | 5 ++- .../rocm-modules/rocfft/default.nix | 22 +++++++------ .../rocm-modules/rocgdb/default.nix | 5 ++- .../rocm-modules/rocm-cmake/default.nix | 5 ++- .../rocm-modules/rocm-core/default.nix | 17 +++++----- .../rocm-modules/rocm-device-libs/default.nix | 1 - .../rocm-modules/rocm-docs-core/default.nix | 4 +-- .../rocm-modules/rocm-runtime/default.nix | 29 ++++++----------- .../rocm-modules/rocm-smi/default.nix | 16 ++++++---- .../rocm-modules/rocminfo/default.nix | 16 ++++++---- .../rocm-modules/rocmlir/default.nix | 3 +- .../rocm-modules/rocprim/default.nix | 16 ++++++---- .../rocprofiler-register/default.nix | 16 ++++++---- .../rocm-modules/rocprofiler/default.nix | 16 ++++++---- .../rocm-modules/rocr-debug-agent/default.nix | 5 ++- .../rocm-modules/rocrand/default.nix | 16 ++++++---- .../rocm-modules/rocsolver/default.nix | 13 +++++--- .../rocm-modules/rocsparse/default.nix | 16 ++++++---- .../rocm-modules/rocthrust/default.nix | 16 ++++++---- .../rocm-modules/roctracer/default.nix | 16 ++++++---- .../rocm-modules/rocwmma/default.nix | 16 ++++++---- pkgs/development/rocm-modules/rpp/default.nix | 7 ++--- .../rocm-modules/tensile/default.nix | 13 +++++--- 51 files changed, 360 insertions(+), 272 deletions(-) diff --git a/pkgs/development/rocm-modules/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix index ccd7e4d5062a..6a353c7e9845 100644 --- a/pkgs/development/rocm-modules/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/amdsmi/default.nix @@ -21,13 +21,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amdsmi"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { - owner = "rocm"; - repo = "amdsmi"; + owner = "ROCm"; + repo = "rocm-systems"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-3V3B9+B3cpg0ebvsmX6wwvKoTIHbXtvbpIQHs4tkeWU="; + sparseCheckout = [ + "projects/amdsmi" + "shared" + ]; + hash = "sha256-TFi+3txemvV6K827e8S3hZOd9jcj4Qzop6V9CdKrpLg="; }; + sourceRoot = "${finalAttrs.src.name}/projects/amdsmi"; postPatch = '' substituteInPlace goamdsmi_shim/CMakeLists.txt \ @@ -79,13 +84,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "System management interface for AMD GPUs supported by ROCm"; - homepage = "https://github.com/ROCm/rocm_smi_lib"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/amdsmi"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ lovesegfault ]; teams = [ lib.teams.rocm ]; diff --git a/pkgs/development/rocm-modules/aotriton/default.nix b/pkgs/development/rocm-modules/aotriton/default.nix index 03d6e3f6c30c..3f10e65a839f 100644 --- a/pkgs/development/rocm-modules/aotriton/default.nix +++ b/pkgs/development/rocm-modules/aotriton/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, rocm-cmake, clr, diff --git a/pkgs/development/rocm-modules/aqlprofile/default.nix b/pkgs/development/rocm-modules/aqlprofile/default.nix index 3b11e86862d5..40d912dc062f 100644 --- a/pkgs/development/rocm-modules/aqlprofile/default.nix +++ b/pkgs/development/rocm-modules/aqlprofile/default.nix @@ -4,18 +4,24 @@ clr, cmake, fetchFromGitHub, + rocmUpdateScript, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "aqlprofile"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; - repo = "aqlprofile"; - tag = "rocm-7.2.0"; - hash = "sha256-MAZUHo52gb0aZSFnKugMlXxcDkmMwhy1AFF1RDRgRVk="; + repo = "rocm-systems"; + rev = "rocm-${finalAttrs.version}"; + sparseCheckout = [ + "projects/aqlprofile" + "shared" + ]; + hash = "sha256-74HjB5Ughu17rSRx9mfCCsPJI4TVyXnT4aU7vIbm7ak="; }; + sourceRoot = "${finalAttrs.src.name}/projects/aqlprofile"; env.CXXFLAGS = "-DROCP_LD_AQLPROFILE=1"; @@ -24,11 +30,16 @@ stdenv.mkDerivation { clr ]; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + inherit (finalAttrs.src) owner repo; + }; + meta = { description = "AQLPROFILE library for AMD HSA runtime API extension support"; - homepage = "https://github.com/ROCm/aqlprofile/"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/aqlprofile"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index 8592f361199b..f6a15163b2b8 100644 --- a/pkgs/development/rocm-modules/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -13,7 +13,6 @@ rocm-device-libs, rocm-comgr, rocm-runtime, - rocm-toolchain, rocm-core, roctracer, rocminfo, @@ -70,7 +69,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clr"; - version = "7.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -82,10 +81,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "clr"; + repo = "rocm-systems"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-zz2O4Qsl1zXMC25L714azsFR2PROAvdpjgKhRolmt1w="; + sparseCheckout = [ + "projects/clr" + "shared" + ]; + hash = "sha256-8V2WbyaJZbEcKZpF/xvg0p+3oX9f/zy/45rkKZT9R3o="; }; + sourceRoot = "${finalAttrs.src.name}/projects/clr"; nativeBuildInputs = [ makeWrapper @@ -257,9 +261,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; - page = "tags?per_page=4"; + inherit (finalAttrs.src) owner repo; }; impureTests = { @@ -324,7 +326,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "AMD Common Language Runtime for hipamd, opencl, and rocclr"; - homepage = "https://github.com/ROCm/clr"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/clr"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ lovesegfault ]; teams = [ lib.teams.rocm ]; diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix index 739a65528ecf..0ae14568019f 100644 --- a/pkgs/development/rocm-modules/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/composable_kernel/base.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ''; pname = "composable_kernel_base"; - version = "7.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -55,10 +55,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "composable_kernel"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-ABL0MSmWtqAeY5uyw8Ib64npB2v82baUnzLpmrEgDn4="; + sparseCheckout = [ + "projects/composablekernel" + "shared" + ]; + hash = "sha256-Zs6wwPmys1kUlgDD4XzKKw273nH/Ur3HtuYxJjvjDs0="; }; + sourceRoot = "${finalAttrs.src.name}/projects/composablekernel"; nativeBuildInputs = [ # Deliberately not using ninja @@ -172,8 +177,7 @@ stdenv.mkDerivation (finalAttrs: { inherit gpuTargets miOpenReqLibsOnly; updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; anyGfx9Target = lib.lists.any (lib.strings.hasPrefix "gfx9") gpuTargets; anyMfmaTarget = @@ -187,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Performance portable programming model for machine learning tensor operators"; - homepage = "https://github.com/ROCm/composable_kernel"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/composablekernel"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix index ce3d9363e9d2..a5b57743b8eb 100644 --- a/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix +++ b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix @@ -14,7 +14,7 @@ buildPythonPackage { setuptools setuptools-scm ]; - inherit (composable_kernel) version src; + inherit (composable_kernel) version src sourceRoot; pythonImportsCheck = [ "ck4inductor" "ck4inductor.universal_gemm.gen_instances" @@ -34,7 +34,7 @@ buildPythonPackage { ''; meta = { description = "Pytorch inductor backend which uses composable_kernel universal GEMM implementations"; - homepage = "https://github.com/ROCm/composable_kernel"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/composablekernel"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/default.nix b/pkgs/development/rocm-modules/default.nix index c89340f298ba..01077ced8012 100644 --- a/pkgs/development/rocm-modules/default.nix +++ b/pkgs/development/rocm-modules/default.nix @@ -3,8 +3,6 @@ config, callPackage, newScope, - symlinkJoin, - fetchFromGitHub, boost179, opencv, python3Packages, diff --git a/pkgs/development/rocm-modules/half/default.nix b/pkgs/development/rocm-modules/half/default.nix index 9f61563c37ae..703a167873f9 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.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; @@ -25,8 +25,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { diff --git a/pkgs/development/rocm-modules/hip-common/default.nix b/pkgs/development/rocm-modules/hip-common/default.nix index cc9b3a4e71d5..a33efc30baab 100644 --- a/pkgs/development/rocm-modules/hip-common/default.nix +++ b/pkgs/development/rocm-modules/hip-common/default.nix @@ -7,14 +7,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "hip-common"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; - repo = "HIP"; + repo = "rocm-systems"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-eQ+jHc6MlZePPIwJQMB8NKiEcE26i83+U21vKgfGFFM="; + sparseCheckout = [ + "projects/hip" + "shared" + ]; + hash = "sha256-orfTXKjcZJ5E73cmXEyltZVYhCQo8FLExVHM3J/rqUM="; }; + sourceRoot = "${finalAttrs.src.name}/projects/hip"; dontConfigure = true; dontBuild = true; @@ -30,13 +35,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "C++ Heterogeneous-Compute Interface for Portability"; - homepage = "https://github.com/ROCm/HIP"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/hip"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ lovesegfault ]; teams = [ lib.teams.rocm ]; diff --git a/pkgs/development/rocm-modules/hipblas-common/default.nix b/pkgs/development/rocm-modules/hipblas-common/default.nix index c5c2bf902abe..0786e4d47cc7 100644 --- a/pkgs/development/rocm-modules/hipblas-common/default.nix +++ b/pkgs/development/rocm-modules/hipblas-common/default.nix @@ -8,14 +8,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hipblas-common"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; - repo = "hipBLAS-common"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-oOelDrk7TLe9/17fzaw6CDPL4MGAoITJL90ahHzhaAE="; + sparseCheckout = [ + "projects/hipblas-common" + "shared" + ]; + hash = "sha256-83LgS4I1fMSaNtWdVFf1qhYRMT7a9jVzO3XpUzEipXg="; }; + sourceRoot = "${finalAttrs.src.name}/projects/hipblas-common"; nativeBuildInputs = [ cmake @@ -29,12 +34,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "Common files shared by hipBLAS and hipBLASLt"; - homepage = "https://github.com/ROCm/hipBLASlt"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblas-common"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/hipblas/default.nix b/pkgs/development/rocm-modules/hipblas/default.nix index 0138aa5fe84f..d35e0410d3b6 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -41,10 +41,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "hipBLAS"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-w7myy4FO2vKm91OOfSGWO3bxR8jAvjU68oqI7aJX82c="; + sparseCheckout = [ + "projects/hipblas" + "shared" + ]; + hash = "sha256-1+aNDotV5liHBnGddmWtaKYCcsWPxQD3AoEubnghV0M="; }; + sourceRoot = "${finalAttrs.src.name}/projects/hipblas"; postPatch = '' substituteInPlace library/CMakeLists.txt \ @@ -112,8 +117,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; passthru.tests.hipblas-tested = hipblas.override { buildTests = true; @@ -123,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ROCm BLAS marshalling library"; - homepage = "https://github.com/ROCm/hipBLAS"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblas"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix index f1511cc81264..711fe91c092b 100644 --- a/pkgs/development/rocm-modules/hipblaslt/default.nix +++ b/pkgs/development/rocm-modules/hipblaslt/default.nix @@ -70,13 +70,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hipblaslt${clr.gpuArchSuffix}"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-+yaOUA8hzRPnz14Cmp2BbfIS5811PgMcHQLY2+FatMU="; + hash = "sha256-+xMmPKb32NP9U35dHCXfXWwa6exfiL5TezfXERVDfe4="; sparseCheckout = [ "projects/hipblaslt" "shared" @@ -251,7 +251,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { description = "Library that provides general matrix-matrix operations with a flexible API"; - homepage = "https://github.com/ROCm/hipBLASlt"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblaslt"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix index 75a9edb5934d..b95d1ec3878c 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -31,10 +31,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "hipCUB"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-hIIpU1E/X6bPIhFfauNLPnFNBYSwtoxZV335Huw9fCA="; + sparseCheckout = [ + "projects/hipcub" + "shared" + ]; + hash = "sha256-geO6LS1osKAlmVRtiZ6keqFHsJccyB7pRZdWPEkue2M="; }; + sourceRoot = "${finalAttrs.src.name}/projects/hipcub"; nativeBuildInputs = [ cmake @@ -85,13 +90,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "Thin wrapper library on top of rocPRIM or CUB"; - homepage = "https://github.com/ROCm/hipCUB"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipcub"; license = with lib.licenses; [ bsd3 ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix index c0e9d4284dc7..434e47d7ca11 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -38,11 +38,16 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "hipFFT"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-5zeL3o/Dfh0iyZOj5CHyfEQdFNehD2BLmllnZRdpsQI="; + sparseCheckout = [ + "projects/hipfft" + "shared" + ]; fetchSubmodules = true; + hash = "sha256-EtxZuxBPx6trTN9iC7uri2+UR0Eolp919Ry4U1PEqNA="; }; + sourceRoot = "${finalAttrs.src.name}/projects/hipfft"; nativeBuildInputs = [ clr @@ -106,13 +111,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "FFT marshalling library"; - homepage = "https://github.com/ROCm/hipFFT"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipfft"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/hipfort/default.nix b/pkgs/development/rocm-modules/hipfort/default.nix index 7f9a0b2e3406..bd4fa96ea862 100644 --- a/pkgs/development/rocm-modules/hipfort/default.nix +++ b/pkgs/development/rocm-modules/hipfort/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; @@ -52,8 +52,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { diff --git a/pkgs/development/rocm-modules/hipify/default.nix b/pkgs/development/rocm-modules/hipify/default.nix index cce9bb153bd5..74355f4b63fa 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.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; @@ -47,8 +47,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; postInstall = '' diff --git a/pkgs/development/rocm-modules/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix index 63f34e625e5a..40b935709163 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -25,10 +25,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "hipRAND"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-mhhwYswewcRYKGoVAB/ZTIY8ubFSlTDXKZFoJpoDf2o="; + sparseCheckout = [ + "projects/hiprand" + "shared" + ]; + hash = "sha256-bjcwjN1dNukhoDAbiSpATlK6dtAwM8bOJTe3IjhdwwY="; }; + sourceRoot = "${finalAttrs.src.name}/projects/hiprand"; nativeBuildInputs = [ cmake @@ -63,13 +68,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "HIP wrapper for rocRAND and cuRAND"; - homepage = "https://github.com/ROCm/hipRAND"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hiprand"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/hipsolver/default.nix b/pkgs/development/rocm-modules/hipsolver/default.nix index a16a5676921b..c3be9d41d7b1 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -38,10 +38,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "hipSOLVER"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-xrzRU3X0zlmK6t8Bz4p5ihnJnadrqiW1BW2HLRDpu1M="; + sparseCheckout = [ + "projects/hipsolver" + "shared" + ]; + hash = "sha256-ts5wuXHoBFZ1WMAk8Ir5cucP75G0SMOWmn3FEH04ZEQ="; }; + sourceRoot = "${finalAttrs.src.name}/projects/hipsolver"; nativeBuildInputs = [ cmake @@ -102,13 +107,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "ROCm SOLVER marshalling library"; - homepage = "https://github.com/ROCm/hipSOLVER"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsolver"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix index df2edc82f203..ed3bf27c1d03 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -33,10 +33,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "hipSPARSE"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-DmanHHlDny/SweYrSes4xQeWoF6TV+AoThyDHQpz+hQ="; + sparseCheckout = [ + "projects/hipsparse" + "shared" + ]; + hash = "sha256-E1chG+giFtf02fjutoV4yM2XvrQKjgXRSvxs0NBBkvI="; }; + sourceRoot = "${finalAttrs.src.name}/projects/hipsparse"; nativeBuildInputs = [ cmake @@ -133,13 +138,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "ROCm SPARSE marshalling library"; - homepage = "https://github.com/ROCm/hipSPARSE"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsparse"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/llvm/default.nix b/pkgs/development/rocm-modules/llvm/default.nix index 8403c2259fa4..513805b0b78c 100644 --- a/pkgs/development/rocm-modules/llvm/default.nix +++ b/pkgs/development/rocm-modules/llvm/default.nix @@ -13,7 +13,6 @@ zstd, gcc-unwrapped, glibc, - replaceVars, libffi, libxml2, removeReferencesTo, @@ -37,7 +36,7 @@ }: let - version = "7.2.0"; + version = "7.2.1"; # major version of this should be the clang version ROCm forked from rocmLlvmVersion = "22.0.0-rocm"; # llvmPackages_base version should match rocmLlvmVersion @@ -119,7 +118,7 @@ let owner = "ROCm"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-I/Bxq1JjU9N4h3vXj/tbD3xPYY4+N7QzYA8UTIq1EL0="; + hash = "sha256-TwFvQimbax2E37ZC/52lNkHXCgyBNfSGDBaqmas2x/s="; }; llvmMajorVersion = lib.versions.major rocmLlvmVersion; # An llvmPackages (pkgs/development/compilers/llvm/) built from ROCm LLVM's source tree @@ -295,16 +294,6 @@ in overrideLlvmPackagesRocm (s: { libllvm = (s.prev.libllvm.override { }).overrideAttrs (old: { patches = old.patches ++ [ - (fetchpatch { - # Revert of a patch that cause perf regression by pessimising loop unrolling decisions - # See PR and issue discussion - # https://github.com/ROCm/rocm-systems/issues/2865 https://github.com/ROCm/llvm-project/pull/1349 - name = "rocm-llvm-revert-unrolling-regression.patch"; - url = "https://github.com/ROCm/llvm-project/commit/f58b06dce1f9c15707c5f808fd002e18c2accf7e.patch"; - hash = "sha256-pH+3C7PSDqNfOF014sA5Rvm+sc2IJMQJfysS2bvj/o0="; - # stripLen instead of relative to avoid filterdiff mangling /dev/null on the deleted test file - stripLen = 1; - }) ./perf-increase-namestring-size.patch # v64i8 shuffle lowering inf loop on VBMI targets, hangs whisper-cpp etc # https://github.com/NixOS/nixpkgs/issues/497745 diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix index 8b602bcdf362..fb9ede92a62b 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-FBAVsk4x3ATLDYtfzcPUPnUTwe36maIAY1/FwqG6jD0="; + hash = "sha256-2jNdbfDLHqifCst8yPiJy7y2/PIaaVS9101p3VZTvnc="; }; nativeBuildInputs = [ @@ -192,8 +192,7 @@ stdenv.mkDerivation (finalAttrs: { }; passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix index 8e173f4ff40e..7a6eb06b4999 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.2.0"; + version = "7.2.1"; # Targets outside this list will get # error: use of undeclared identifier 'CK_BUFFER_RESOURCE_3RD_DWORD' @@ -65,14 +65,6 @@ let "gfx1201" ] gpuTargets; - src = fetchFromGitHub { - owner = "ROCm"; - repo = "MIOpen"; - rev = "rocm-${version}"; - hash = "sha256-OwBFzUruHHeJD7n3zLs/NsU5cNEjwkwFgim4m2/1hR0="; - fetchSubmodules = true; - }; - latex = lib.optionalAttrs buildDocs ( texliveSmall.withPackages ( ps: with ps; [ @@ -103,7 +95,9 @@ let } > $out ''; - kdbs = lib.mapAttrs fetchKdb (import ./kdbs.nix); + kdbs = lib.mapAttrs fetchKdb ( + lib.filterAttrs (name: _: lib.elem name supportedTargets) (import ./kdbs.nix) + ); linkKDBsTo = targetPath: @@ -114,9 +108,22 @@ let ); in stdenv.mkDerivation (finalAttrs: { - inherit version src; + inherit version; pname = "miopen"; + src = fetchFromGitHub { + owner = "ROCm"; + repo = "rocm-libraries"; + rev = "rocm-${finalAttrs.version}"; + sparseCheckout = [ + "projects/miopen" + "shared" + ]; + fetchSubmodules = true; + hash = "sha256-plZpBTbEBVMa5CasjfbUsu45xP/BYstrEpWKK2H7QQ4="; + }; + sourceRoot = "${finalAttrs.src.name}/projects/miopen"; + env.CFLAGS = cFlags; env.CXXFLAGS = cFlags; @@ -305,7 +312,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Machine intelligence library for ROCm"; - homepage = "https://github.com/ROCm/MIOpen"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/miopen"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/miopen/update.sh b/pkgs/development/rocm-modules/miopen/update.sh index 4baef06dd1b0..8e2e92585760 100755 --- a/pkgs/development/rocm-modules/miopen/update.sh +++ b/pkgs/development/rocm-modules/miopen/update.sh @@ -5,7 +5,7 @@ set -euo pipefail gh_curl() { curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sf "$@"; } -version="${1:-$(gh_curl "https://api.github.com/repos/ROCm/MIOpen/releases?per_page=4" \ +version="${1:-$(gh_curl "https://api.github.com/repos/ROCm/rocm-libraries/releases?per_page=4" \ | jq -re 'map(.tag_name // .name) | map(select(test("^rocm-[0-9]+\\.[0-9]+(\\.[0-9]+)?$"))) | first | ltrimstr("rocm-")')}" @@ -19,7 +19,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" bucket="https://therock-dvc.s3.amazonaws.com/rocm-libraries/files/md5" # Fetch directory listing; extract name + download_url for .dvc files -dvc_entries=$(gh_curl "https://api.github.com/repos/ROCm/MIOpen/contents/src/kernels?ref=rocm-${version}" \ +dvc_entries=$(gh_curl "https://api.github.com/repos/ROCm/rocm-libraries/contents/projects/miopen/src/kernels?ref=rocm-${version}" \ | jq -r '.[] | select(.name | endswith(".kdb.bz2.dvc")) | "\(.name)\t\(.download_url)"') [[ -n "$dvc_entries" ]] || { echo "No .kdb.bz2.dvc files found, upstream likely changed packaging again" >&2; exit 1; } diff --git a/pkgs/development/rocm-modules/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix index 183f8cdd457b..e72278b71789 100644 --- a/pkgs/development/rocm-modules/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/mivisionx/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "MIVisionX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-rdYQt001kFi9FjVL5R8XVzT+Y+rZVeMsbjXCJEB887A="; + hash = "sha256-LyiPcZi4vU0R+eI/AbYk8ioewuqET5lCtArtPltJ+Gw="; }; patches = [ @@ -127,8 +127,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { diff --git a/pkgs/development/rocm-modules/rccl/default.nix b/pkgs/development/rocm-modules/rccl/default.nix index f05efa2a139b..9691379d4084 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Kpobn0fR7/mXGVWYjNQ35sToRWLfOQTHRbjuSYj1of4="; + hash = "sha256-A1IQYIDWqu3JLiPQ70G52s1/0ZweQxFlgMUH81qJWmU="; }; requiredSystemFeatures = [ "big-parallel" ]; # Very resource intensive LTO @@ -140,8 +140,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; # This package with sanitizers + manual integration test binaries built diff --git a/pkgs/development/rocm-modules/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix index 86113a40e82d..730522901806 100644 --- a/pkgs/development/rocm-modules/rdc/default.nix +++ b/pkgs/development/rocm-modules/rdc/default.nix @@ -49,7 +49,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rdc"; - version = "7.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -63,10 +63,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "rdc"; + repo = "rocm-systems"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-gF17mcbsqsL2K9pwTAVG9E6nVY4pi2lC88WyPa0xMes="; + sparseCheckout = [ + "projects/rdc" + "shared" + ]; + hash = "sha256-SmySauRxFnEQJVTjGYf4TpmQclTwZG2RZrk3u6ko5Qo="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rdc"; patches = [ # https://github.com/ROCm/rocm-systems/pull/2423 @@ -135,13 +140,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "Simplifies administration and addresses infrastructure challenges in cluster and datacenter environments"; - homepage = "https://github.com/ROCm/rdc"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rdc"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix index f377b44bb81a..07e92f59cb13 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocALUTION"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-7ZlY0GVIsUJE8OOAkQwQ4pXNHKzgCQomQOET9+TKQN4="; + hash = "sha256-yPM26e8tGNpPScIriAPRb+6OZfdpX4PgE0E9bmc3FkU="; }; nativeBuildInputs = [ @@ -112,8 +112,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { diff --git a/pkgs/development/rocm-modules/rocblas/default.nix b/pkgs/development/rocm-modules/rocblas/default.nix index d61f34b83e94..4c7eef6e1649 100644 --- a/pkgs/development/rocm-modules/rocblas/default.nix +++ b/pkgs/development/rocm-modules/rocblas/default.nix @@ -40,14 +40,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocblas${clr.gpuArchSuffix}"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; - repo = "rocBLAS"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-oY6yELFnpnDDksu63Go88TGLAgC64tUaPIbaRgD2qus="; + sparseCheckout = [ + "projects/rocblas" + "shared" + ]; + hash = "sha256-wrjcr2ASSF+bk5atjvKfIYSbg+vevo/a2W2ca9Nft/4="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocblas"; outputs = [ "out" ] ++ lib.optional buildBenchmarks "benchmark" ++ lib.optional buildTests "test"; @@ -189,8 +194,7 @@ stdenv.mkDerivation (finalAttrs: { amdgpu_targets = gpuTargets'; updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; }; @@ -199,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "BLAS implementation for ROCm platform"; - homepage = "https://github.com/ROCm/rocBLAS"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocblas"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocdbgapi/default.nix b/pkgs/development/rocm-modules/rocdbgapi/default.nix index a7d9e68dd8e6..f6c097267c68 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -99,8 +99,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { diff --git a/pkgs/development/rocm-modules/rocfft/default.nix b/pkgs/development/rocm-modules/rocfft/default.nix index c33e74f0174b..17eddb367820 100644 --- a/pkgs/development/rocm-modules/rocfft/default.nix +++ b/pkgs/development/rocm-modules/rocfft/default.nix @@ -20,14 +20,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocfft${clr.gpuArchSuffix}"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; - repo = "rocFFT"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-AFBV5tlhNYH9+d0KG7mCjSifKfRt+8c1ie5wASTiQXM="; + sparseCheckout = [ + "projects/rocfft" + "shared" + ]; + hash = "sha256-RjWMzLX0nBA8ClweJ8YgRTn+Nzt/VUkOoSw3jMQ3IWg="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocfft"; nativeBuildInputs = [ cmake @@ -68,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-test"; inherit (finalAttrs) version src; - sourceRoot = "${finalAttrs.src.name}/clients/tests"; + sourceRoot = "${finalAttrs.src.name}/projects/rocfft/clients/tests"; nativeBuildInputs = [ cmake @@ -97,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-benchmark"; inherit (finalAttrs) version src; - sourceRoot = "${finalAttrs.src.name}/clients/rider"; + sourceRoot = "${finalAttrs.src.name}/projects/rocfft/clients/rider"; nativeBuildInputs = [ cmake @@ -127,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-samples"; inherit (finalAttrs) version src; - sourceRoot = "${finalAttrs.src.name}/clients/samples"; + sourceRoot = "${finalAttrs.src.name}/projects/rocfft/clients/samples"; nativeBuildInputs = [ cmake @@ -152,8 +157,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; }; @@ -161,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "FFT implementation for ROCm"; - homepage = "https://github.com/ROCm/rocFFT"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocfft"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocgdb/default.nix b/pkgs/development/rocm-modules/rocgdb/default.nix index ee2a1dc5a550..05c316df9504 100644 --- a/pkgs/development/rocm-modules/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/rocgdb/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocgdb"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; @@ -103,8 +103,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { diff --git a/pkgs/development/rocm-modules/rocm-cmake/default.nix b/pkgs/development/rocm-modules/rocm-cmake/default.nix index e24d92c09d74..14016459308d 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.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; @@ -24,8 +24,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { diff --git a/pkgs/development/rocm-modules/rocm-core/default.nix b/pkgs/development/rocm-modules/rocm-core/default.nix index 153fb9593e40..59d76542a47d 100644 --- a/pkgs/development/rocm-modules/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-core/default.nix @@ -17,14 +17,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocm-core"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; - repo = "rocm-core"; + repo = "rocm-systems"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-AqD6MByFAtY6IzAFXdCrCANPXqROaGHybdKixv3NbXE="; + sparseCheckout = [ + "projects/rocm-core" + "shared" + ]; + hash = "sha256-Y3WuDwruD5zKN2epwfUCZAGq5vgxCT27awJN8JxmOsY="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocm-core"; patches = [ ./env-rocm-path.patch @@ -80,14 +85,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.ROCM_LIBPATCH_VERSION = finalAttrs.env.ROCM_LIBPATCH_VERSION; passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; - page = "tags?per_page=4"; + inherit (finalAttrs.src) owner repo; }; meta = { description = "Utility for getting the ROCm release version"; - homepage = "https://github.com/ROCm/rocm-core"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocm-core"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/rocm-device-libs/default.nix index 06a86f3a51d2..41034d2c6480 100644 --- a/pkgs/development/rocm-modules/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/rocm-device-libs/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, cmake, ninja, zlib, diff --git a/pkgs/development/rocm-modules/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/rocm-docs-core/default.nix index 8d5e41f32ed3..3de29d072aed 100644 --- a/pkgs/development/rocm-modules/rocm-docs-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-docs-core/default.nix @@ -24,14 +24,14 @@ # FIXME: Move to rocmPackages_common buildPythonPackage rec { pname = "rocm-docs-core"; - version = "1.31.3"; + version = "1.33.1"; pyproject = true; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-docs-core"; rev = "v${version}"; - hash = "sha256-N9wqu83fPQGgOSDdb4yXmfxfDxkevk6QA31vLl5sYHo="; + hash = "sha256-eHX5Vz3MmIHi6n90hgBm4Ik+MGhxmniw2Me6pyZVC+k="; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix index 6ee5a951aaf1..0931ab897d0e 100644 --- a/pkgs/development/rocm-modules/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix @@ -16,14 +16,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; - repo = "ROCR-Runtime"; + repo = "rocm-systems"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-6xELKQ/uqAoorsCR/H7d8iNK7LsVNsW2DRRZo5cU7UM="; + sparseCheckout = [ + "projects/rocr-runtime" + "shared" + ]; + hash = "sha256-hcyjOLMtoBX/p6r6R9Bl9635DuvI6rTn1KziHMeyYM0="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocr-runtime"; cmakeBuildType = "RelWithDebInfo"; separateDebugInfo = true; @@ -67,19 +72,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/ROCR-Runtime/commit/41bfc66aef437a5b349f71105fa4b907cc7e17d5.patch"; hash = "sha256-A7VhPR3eSsmjq2cTBSjBIz9i//WiNjoXm0EsRKtF+ns="; }) - (fetchpatch { - # [PATCH] hsakmt: Expose and use CWSR and Control stack sizes (#2200) - # Fixes potential mismatches between stack sizes configured in amdgpu kernel module - # and userspace by relying on kernel value when available - # Falls back to hardcoded size based on ISA if kernel is too old. For gfx1151, also prints: - # WARNING: KFD ABI 1.20+ is recommended … This may result in faults, crashes and other application instability - # This allows new kernels to work with this runtime detection mechanism - # Only gfx1151 warns loudly because only it has had the size updated in kernel… - name = "rocr-runtime-kernel-stack-size.patch"; - url = "https://github.com/ROCm/rocm-systems/commit/7037a71f311c021974fafd13727dfefd8a1cc79d.patch"; - relative = "projects/rocr-runtime"; - hash = "sha256-EbDxuEvNu0fyQJZmqq0fbcCdNtaEWUbmyPLvcfqDPjc="; - }) # This causes a circular dependency, aqlprofile relies on hsa-runtime64 # which is part of rocm-runtime # Worked around by having rocprofiler load aqlprofile directly @@ -104,13 +96,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "Platform runtime for ROCm"; - homepage = "https://github.com/ROCm/ROCR-Runtime"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocr-runtime"; license = with lib.licenses; [ ncsa ]; maintainers = with lib.maintainers; [ lovesegfault ]; teams = [ lib.teams.rocm ]; diff --git a/pkgs/development/rocm-modules/rocm-smi/default.nix b/pkgs/development/rocm-modules/rocm-smi/default.nix index 4f14eb134c04..154fde82899b 100644 --- a/pkgs/development/rocm-modules/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/rocm-smi/default.nix @@ -11,14 +11,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; - repo = "rocm_smi_lib"; + repo = "rocm-systems"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-IeOutA/Mpt/75VpdcfPnZrWvx6GG/JLaQNfBrNKb+Mw="; + sparseCheckout = [ + "projects/rocm-smi-lib" + "shared" + ]; + hash = "sha256-Si8SbeVKUBtqk6h2QJ9ssQV68bLq6TvESrYXJuArHd8="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocm-smi-lib"; propagatedBuildInputs = [ libdrm @@ -57,13 +62,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "System management interface for AMD GPUs supported by ROCm"; - homepage = "https://github.com/ROCm/rocm_smi_lib"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocm-smi-lib"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ lovesegfault ]; teams = [ lib.teams.rocm ]; diff --git a/pkgs/development/rocm-modules/rocminfo/default.nix b/pkgs/development/rocm-modules/rocminfo/default.nix index 712cae5a0303..6cde03054844 100644 --- a/pkgs/development/rocm-modules/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/rocminfo/default.nix @@ -12,15 +12,20 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "7.2.0"; + version = "7.2.1"; pname = "rocminfo"; src = fetchFromGitHub { owner = "ROCm"; - repo = "rocminfo"; + repo = "rocm-systems"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Md91iH2YWU7ziNE//xxKuk2RrXdujO9mY6SZY5R9TqA="; + sparseCheckout = [ + "projects/rocminfo" + "shared" + ]; + hash = "sha256-0esRBEXVibC2uzyonpc0ABNNHQ2NAWZrBmmg6p1zP0c="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocminfo"; strictDeps = true; @@ -40,13 +45,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "ROCm Application for Reporting System Info"; - homepage = "https://github.com/ROCm/rocminfo"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocminfo"; license = lib.licenses.ncsa; mainProgram = "rocminfo"; maintainers = with lib.maintainers; [ lovesegfault ]; diff --git a/pkgs/development/rocm-modules/rocmlir/default.nix b/pkgs/development/rocm-modules/rocmlir/default.nix index ac6e997d5b9e..f8be324fcea7 100644 --- a/pkgs/development/rocm-modules/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/rocmlir/default.nix @@ -148,8 +148,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; page = "tags?per_page=4"; }; diff --git a/pkgs/development/rocm-modules/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix index c416214daa39..bb6c0bd0b7ff 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -29,10 +29,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "rocPRIM"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-/6x4S8W4MbWY+M2b46Tmebj2echBIs31OnKq+50M21M="; + sparseCheckout = [ + "projects/rocprim" + "shared" + ]; + hash = "sha256-e0mZ27OXyblcnXQGv2ex/CvWx9smw6nBbHZIijj7lP8="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocprim"; nativeBuildInputs = [ cmake @@ -82,13 +87,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "ROCm parallel primitives"; - homepage = "https://github.com/ROCm/rocPRIM"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocprim"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix index c586a894845a..c9663e348886 100644 --- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix @@ -18,15 +18,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler-register"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; - repo = "rocprofiler-register"; + repo = "rocm-systems"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-6jr6dfmCjeP5PCNfLDMmh8IO9Hxz6RvLlacNwIWQduQ="; + sparseCheckout = [ + "projects/rocprofiler-register" + "shared" + ]; fetchSubmodules = true; + hash = "sha256-2u5rLLT4Aif0jwAqqlIzrzh9kICJG15nZAslbiL7H9g="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocprofiler-register"; nativeBuildInputs = [ cmake @@ -66,13 +71,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = "rocprofiler-register"; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "Profiling with perf-counters and derived metrics"; - homepage = "https://github.com/ROCm/rocprofiler"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocprofiler-register"; license = with lib.licenses; [ mit ]; # mitx11 teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocprofiler/default.nix b/pkgs/development/rocm-modules/rocprofiler/default.nix index e9259c045b9b..d23390eeb0c6 100644 --- a/pkgs/development/rocm-modules/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler/default.nix @@ -44,15 +44,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; - repo = "rocprofiler"; + repo = "rocm-systems"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-W32VAdtZdFmkHeUwyHIIHk8yRnABq6gUaHLZ9Bj8kYI="; + sparseCheckout = [ + "projects/rocprofiler" + "shared" + ]; fetchSubmodules = true; + hash = "sha256-Wo0pymD8LsrdczdIUEEVe5x2Id//KIFkh40kliAQgWo="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocprofiler"; nativeBuildInputs = [ cmake @@ -125,14 +130,13 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; passthru.rocmtoolkit-merged = rocmtoolkit-merged; meta = { description = "Profiling with perf-counters and derived metrics"; - homepage = "https://github.com/ROCm/rocprofiler"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocprofiler"; license = with lib.licenses; [ mit ]; # mitx11 teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix index c2805349d87e..a158feaf5269 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.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; @@ -45,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { diff --git a/pkgs/development/rocm-modules/rocrand/default.nix b/pkgs/development/rocm-modules/rocrand/default.nix index 83b1a77600e0..e3d64c3c336d 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -29,10 +29,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "rocRAND"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-BX1A74ZBXE0fqYqA7WijezCezUOpEciUm6k2vhFQlA4="; + sparseCheckout = [ + "projects/rocrand" + "shared" + ]; + hash = "sha256-tl++h7LSEXf0jWe007+RIRwYHdB6TKPDpzipj1Emew8="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocrand"; nativeBuildInputs = [ cmake @@ -83,13 +88,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "Generate pseudo-random and quasi-random numbers"; - homepage = "https://github.com/ROCm/rocRAND"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocrand"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix index 2e91b9b157e1..cbb667f869e8 100644 --- a/pkgs/development/rocm-modules/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/rocsolver/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsolver${clr.gpuArchSuffix}"; - version = "7.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -51,10 +51,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "rocSOLVER"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-aCmNTF8P0Y7piPkRnu/+DWFhTd7X8mDcaQpotfw/4hM="; + sparseCheckout = [ + "projects/rocsolver" + "shared" + ]; + hash = "sha256-n+Y8RheA0UYeSfpvOw5zfwe4VAW5hsKjlCXtBceGhf0="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocsolver"; nativeBuildInputs = [ cmake @@ -124,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ROCm LAPACK implementation"; - homepage = "https://github.com/ROCm/rocSOLVER"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocsolver"; license = with lib.licenses; [ bsd2 ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocsparse/default.nix b/pkgs/development/rocm-modules/rocsparse/default.nix index 3eb12cc60ad7..33d01f8a6e01 100644 --- a/pkgs/development/rocm-modules/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/rocsparse/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse${clr.gpuArchSuffix}"; - version = "7.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -34,10 +34,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "rocSPARSE"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jmrX1a09DlQTkuXwkrInt9pKX5pk3oCO88S0pKXXhO0="; + sparseCheckout = [ + "projects/rocsparse" + "shared" + ]; + hash = "sha256-hkfBTcLig39al2w8zFTSQQnouaou9wlD6VlvIyFTNMg="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocsparse"; nativeBuildInputs = [ cmake @@ -143,14 +148,13 @@ stdenv.mkDerivation (finalAttrs: { updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; }; meta = { description = "ROCm SPARSE implementation"; - homepage = "https://github.com/ROCm/rocSPARSE"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocsparse"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix index 2887e5789a9b..1c3123d1f834 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -29,10 +29,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "rocThrust"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-BDxFeCR2FfZI+TGMi2jBDHORCoAnFwk8WGGKMckCkmU="; + sparseCheckout = [ + "projects/rocthrust" + "shared" + ]; + hash = "sha256-wHEgpmBZCYtvp+OyebrRyfoFz3WQyKWfHPrdzQVL8lY="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocthrust"; nativeBuildInputs = [ cmake @@ -78,13 +83,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "ROCm parallel algorithm library"; - homepage = "https://github.com/ROCm/rocThrust"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocthrust"; license = with lib.licenses; [ asl20 ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/roctracer/default.nix b/pkgs/development/rocm-modules/roctracer/default.nix index c6326d3b7e63..2f5db2c05040 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -33,10 +33,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "roctracer"; + repo = "rocm-systems"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-LCtdPnE+rJU/ccI1PTFDMPNXxgl1GrRgc5z7LjOw3zA="; + sparseCheckout = [ + "projects/roctracer" + "shared" + ]; + hash = "sha256-KUNLX5ZonE0bW/xOacD3k3hCcg7M3Vk1dM3WQSDYMvM="; }; + sourceRoot = "${finalAttrs.src.name}/projects/roctracer"; nativeBuildInputs = [ cmake @@ -103,13 +108,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "Tracer callback/activity library"; - homepage = "https://github.com/ROCm/roctracer"; + homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/roctracer"; license = with lib.licenses; [ mit ]; # mitx11 teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix index 16637ef0c3b3..c75d4020f432 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.2.0"; + version = "7.2.1"; outputs = [ "out" @@ -36,10 +36,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; - repo = "rocWMMA"; + repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-O+P+pobPnlKnmJQylFp/qUQLE1kJKbxjMWyGS6lc3Mo="; + sparseCheckout = [ + "projects/rocwmma" + "shared" + ]; + hash = "sha256-eoF8a7zknpgvDOSDzolOrdtszUJ5tC7Ur2sRShiQEO0="; }; + sourceRoot = "${finalAttrs.src.name}/projects/rocwmma"; patches = lib.optionals (buildTests || buildBenchmarks) [ ./0000-dont-fetch-googletest.patch @@ -101,13 +106,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { description = "Mixed precision matrix multiplication and accumulation"; - homepage = "https://github.com/ROCm/rocWMMA"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocwmma"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix index b587e3d27283..ebd601ba2e90 100644 --- a/pkgs/development/rocm-modules/rpp/default.nix +++ b/pkgs/development/rocm-modules/rpp/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rpp-${if useCPU then "cpu" else "hip"}"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rpp"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-mET9nZReO3BrNZkcNeB7hOwIQaVZ8OD7lPD3b1Jot2k="; + hash = "sha256-6e4JHKFC2dvtSGo9xbQKzIdUwlHB09pr5C/5xHwP3l4="; }; nativeBuildInputs = [ @@ -67,8 +67,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; - inherit (finalAttrs.src) owner; - inherit (finalAttrs.src) repo; + inherit (finalAttrs.src) owner repo; }; meta = { diff --git a/pkgs/development/rocm-modules/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix index b04622b32086..085c36e22017 100644 --- a/pkgs/development/rocm-modules/tensile/default.nix +++ b/pkgs/development/rocm-modules/tensile/default.nix @@ -18,15 +18,20 @@ buildPythonPackage rec { pname = "tensile"; - version = "7.2.0"; + version = "7.2.1"; pyproject = true; src = fetchFromGitHub { owner = "ROCm"; - repo = "Tensile"; + repo = "rocm-libraries"; rev = "rocm-${version}"; - hash = "sha256-pTuEeu+0E+RlpdeFho0mJmx/V/tou/ZRLYX9KoWEPpA="; + sparseCheckout = [ + "shared/tensile" + "shared" + ]; + hash = "sha256-sYudPiEPGeZLmf6+3XfQDZqRXiKgRsGPucApzYwlGV8="; }; + sourceRoot = "${src.name}/shared/tensile"; # TODO: It should be possible to run asm caps test ONCE for all supported arches # We currently disable the test because it's slow and runs each time tensile launches @@ -83,7 +88,7 @@ buildPythonPackage rec { meta = { description = "GEMMs and tensor contractions"; - homepage = "https://github.com/ROCm/Tensile"; + homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/shared/tensile"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; From 374d7b4b483a3f740980f75762b459227b58c31e Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Fri, 27 Mar 2026 09:59:32 -0700 Subject: [PATCH 13/51] rocmPackages: teach local update script to use finalAttrs and infer config --- pkgs/development/rocm-modules/amdsmi/default.nix | 5 +---- .../development/rocm-modules/aqlprofile/default.nix | 5 +---- pkgs/development/rocm-modules/clr/default.nix | 5 +---- .../rocm-modules/composable_kernel/base.nix | 5 +---- pkgs/development/rocm-modules/half/default.nix | 5 +---- .../development/rocm-modules/hip-common/default.nix | 5 +---- .../rocm-modules/hipblas-common/default.nix | 5 +---- pkgs/development/rocm-modules/hipblas/default.nix | 5 +---- pkgs/development/rocm-modules/hipblaslt/default.nix | 5 +---- pkgs/development/rocm-modules/hipcub/default.nix | 5 +---- pkgs/development/rocm-modules/hipfft/default.nix | 5 +---- pkgs/development/rocm-modules/hipfort/default.nix | 5 +---- pkgs/development/rocm-modules/hipify/default.nix | 5 +---- pkgs/development/rocm-modules/hiprand/default.nix | 5 +---- pkgs/development/rocm-modules/hipsolver/default.nix | 5 +---- pkgs/development/rocm-modules/hipsparse/default.nix | 5 +---- pkgs/development/rocm-modules/migraphx/default.nix | 5 +---- pkgs/development/rocm-modules/mivisionx/default.nix | 5 +---- pkgs/development/rocm-modules/rccl/default.nix | 5 +---- pkgs/development/rocm-modules/rdc/default.nix | 5 +---- .../development/rocm-modules/rocalution/default.nix | 5 +---- pkgs/development/rocm-modules/rocblas/default.nix | 5 +---- pkgs/development/rocm-modules/rocdbgapi/default.nix | 5 +---- pkgs/development/rocm-modules/rocfft/default.nix | 5 +---- pkgs/development/rocm-modules/rocgdb/default.nix | 5 +---- .../development/rocm-modules/rocm-cmake/default.nix | 5 +---- pkgs/development/rocm-modules/rocm-core/default.nix | 5 +---- .../rocm-modules/rocm-runtime/default.nix | 5 +---- pkgs/development/rocm-modules/rocm-smi/default.nix | 5 +---- pkgs/development/rocm-modules/rocminfo/default.nix | 5 +---- pkgs/development/rocm-modules/rocmlir/default.nix | 6 +----- pkgs/development/rocm-modules/rocprim/default.nix | 5 +---- .../rocm-modules/rocprofiler-register/default.nix | 5 +---- .../rocm-modules/rocprofiler/default.nix | 5 +---- .../rocm-modules/rocr-debug-agent/default.nix | 5 +---- pkgs/development/rocm-modules/rocrand/default.nix | 5 +---- pkgs/development/rocm-modules/rocsolver/default.nix | 5 +---- pkgs/development/rocm-modules/rocsparse/default.nix | 5 +---- pkgs/development/rocm-modules/rocthrust/default.nix | 5 +---- pkgs/development/rocm-modules/roctracer/default.nix | 5 +---- pkgs/development/rocm-modules/rocwmma/default.nix | 5 +---- pkgs/development/rocm-modules/rpp/default.nix | 5 +---- pkgs/development/rocm-modules/tensile/default.nix | 13 +++++-------- pkgs/development/rocm-modules/update.nix | 11 ++++++----- 44 files changed, 53 insertions(+), 182 deletions(-) diff --git a/pkgs/development/rocm-modules/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix index 6a353c7e9845..b7f1b7fa0a74 100644 --- a/pkgs/development/rocm-modules/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/amdsmi/default.nix @@ -82,10 +82,7 @@ stdenv.mkDerivation (finalAttrs: { ln -sf $out/libexec/amdsmi_cli/amdsmi_cli.py $out/bin/amd-smi ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "System management interface for AMD GPUs supported by ROCm"; diff --git a/pkgs/development/rocm-modules/aqlprofile/default.nix b/pkgs/development/rocm-modules/aqlprofile/default.nix index 40d912dc062f..4cb34c6d62d5 100644 --- a/pkgs/development/rocm-modules/aqlprofile/default.nix +++ b/pkgs/development/rocm-modules/aqlprofile/default.nix @@ -30,10 +30,7 @@ stdenv.mkDerivation (finalAttrs: { clr ]; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "AQLPROFILE library for AMD HSA runtime API extension support"; diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index f6a15163b2b8..17bb9b3d30a6 100644 --- a/pkgs/development/rocm-modules/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -259,10 +259,7 @@ stdenv.mkDerivation (finalAttrs: { inherit hipClangPath; - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + updateScript = rocmUpdateScript { inherit finalAttrs; }; impureTests = { # bash $(nix-build -A rocmPackages.clr.impureTests.rocm-smi) diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix index 0ae14568019f..9f1353ac7e05 100644 --- a/pkgs/development/rocm-modules/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/composable_kernel/base.nix @@ -175,10 +175,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit gpuTargets miOpenReqLibsOnly; - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + updateScript = rocmUpdateScript { inherit finalAttrs; }; anyGfx9Target = lib.lists.any (lib.strings.hasPrefix "gfx9") gpuTargets; anyMfmaTarget = (lib.lists.intersectLists gpuTargets [ diff --git a/pkgs/development/rocm-modules/half/default.nix b/pkgs/development/rocm-modules/half/default.nix index 703a167873f9..9895571762d9 100644 --- a/pkgs/development/rocm-modules/half/default.nix +++ b/pkgs/development/rocm-modules/half/default.nix @@ -23,10 +23,7 @@ stdenv.mkDerivation (finalAttrs: { rocm-cmake ]; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "C++ library for half precision floating point arithmetics"; diff --git a/pkgs/development/rocm-modules/hip-common/default.nix b/pkgs/development/rocm-modules/hip-common/default.nix index a33efc30baab..3064aa1e367b 100644 --- a/pkgs/development/rocm-modules/hip-common/default.nix +++ b/pkgs/development/rocm-modules/hip-common/default.nix @@ -33,10 +33,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "C++ Heterogeneous-Compute Interface for Portability"; diff --git a/pkgs/development/rocm-modules/hipblas-common/default.nix b/pkgs/development/rocm-modules/hipblas-common/default.nix index 0786e4d47cc7..594dafd3e60f 100644 --- a/pkgs/development/rocm-modules/hipblas-common/default.nix +++ b/pkgs/development/rocm-modules/hipblas-common/default.nix @@ -32,10 +32,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Common files shared by hipBLAS and hipBLASLt"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblas-common"; diff --git a/pkgs/development/rocm-modules/hipblas/default.nix b/pkgs/development/rocm-modules/hipblas/default.nix index d35e0410d3b6..9dfd5ea4e2aa 100644 --- a/pkgs/development/rocm-modules/hipblas/default.nix +++ b/pkgs/development/rocm-modules/hipblas/default.nix @@ -115,10 +115,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; passthru.tests.hipblas-tested = hipblas.override { buildTests = true; buildBenchmarks = true; diff --git a/pkgs/development/rocm-modules/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix index 711fe91c092b..4c8d243ce3e3 100644 --- a/pkgs/development/rocm-modules/hipblaslt/default.nix +++ b/pkgs/development/rocm-modules/hipblaslt/default.nix @@ -245,10 +245,7 @@ stdenv.mkDerivation (finalAttrs: { # and are fine ignoring it at runtime if it's not supported # so we have to support building an empty hipblaslt passthru.supportsTargetArches = supportsTargetArches; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Library that provides general matrix-matrix operations with a flexible API"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblaslt"; diff --git a/pkgs/development/rocm-modules/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix index b95d1ec3878c..dd254ec8f967 100644 --- a/pkgs/development/rocm-modules/hipcub/default.nix +++ b/pkgs/development/rocm-modules/hipcub/default.nix @@ -88,10 +88,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Thin wrapper library on top of rocPRIM or CUB"; diff --git a/pkgs/development/rocm-modules/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix index 434e47d7ca11..bafd9b0c8783 100644 --- a/pkgs/development/rocm-modules/hipfft/default.nix +++ b/pkgs/development/rocm-modules/hipfft/default.nix @@ -109,10 +109,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "FFT marshalling library"; diff --git a/pkgs/development/rocm-modules/hipfort/default.nix b/pkgs/development/rocm-modules/hipfort/default.nix index bd4fa96ea862..a94b73477eeb 100644 --- a/pkgs/development/rocm-modules/hipfort/default.nix +++ b/pkgs/development/rocm-modules/hipfort/default.nix @@ -50,10 +50,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "/bin/ln" "ln" ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Fortran interfaces for ROCm libraries"; diff --git a/pkgs/development/rocm-modules/hipify/default.nix b/pkgs/development/rocm-modules/hipify/default.nix index 74355f4b63fa..ce6630a70c25 100644 --- a/pkgs/development/rocm-modules/hipify/default.nix +++ b/pkgs/development/rocm-modules/hipify/default.nix @@ -45,10 +45,7 @@ stdenv.mkDerivation (finalAttrs: { chmod +x bin/* ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; postInstall = '' rm $out/bin/hipify-perl diff --git a/pkgs/development/rocm-modules/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix index 40b935709163..0e70b6e656a2 100644 --- a/pkgs/development/rocm-modules/hiprand/default.nix +++ b/pkgs/development/rocm-modules/hiprand/default.nix @@ -66,10 +66,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "HIP wrapper for rocRAND and cuRAND"; diff --git a/pkgs/development/rocm-modules/hipsolver/default.nix b/pkgs/development/rocm-modules/hipsolver/default.nix index c3be9d41d7b1..14db7d532710 100644 --- a/pkgs/development/rocm-modules/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/hipsolver/default.nix @@ -105,10 +105,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "ROCm SOLVER marshalling library"; diff --git a/pkgs/development/rocm-modules/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix index ed3bf27c1d03..7285479040fa 100644 --- a/pkgs/development/rocm-modules/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/hipsparse/default.nix @@ -136,10 +136,7 @@ stdenv.mkDerivation (finalAttrs: { } $sample/bin/example_* ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "ROCm SPARSE marshalling library"; diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix index fb9ede92a62b..7311e6f0c252 100644 --- a/pkgs/development/rocm-modules/migraphx/default.nix +++ b/pkgs/development/rocm-modules/migraphx/default.nix @@ -190,10 +190,7 @@ stdenv.mkDerivation (finalAttrs: { migraphx = finalAttrs.finalPackage; }; }; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "AMD's graph optimization engine"; diff --git a/pkgs/development/rocm-modules/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix index e72278b71789..2c3b54ce47a9 100644 --- a/pkgs/development/rocm-modules/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/mivisionx/default.nix @@ -125,10 +125,7 @@ stdenv.mkDerivation (finalAttrs: { python3 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Set of comprehensive computer vision and machine intelligence libraries, utilities, and applications"; diff --git a/pkgs/development/rocm-modules/rccl/default.nix b/pkgs/development/rocm-modules/rccl/default.nix index 9691379d4084..4b9efd6b3313 100644 --- a/pkgs/development/rocm-modules/rccl/default.nix +++ b/pkgs/development/rocm-modules/rccl/default.nix @@ -138,10 +138,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; # This package with sanitizers + manual integration test binaries built # must be ran manually diff --git a/pkgs/development/rocm-modules/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix index 730522901806..a3c6aad5b589 100644 --- a/pkgs/development/rocm-modules/rdc/default.nix +++ b/pkgs/development/rocm-modules/rdc/default.nix @@ -138,10 +138,7 @@ stdenv.mkDerivation (finalAttrs: { mv $out/bin/rdctst_tests $test/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Simplifies administration and addresses infrastructure challenges in cluster and datacenter environments"; diff --git a/pkgs/development/rocm-modules/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix index 07e92f59cb13..f36c0ec3d473 100644 --- a/pkgs/development/rocm-modules/rocalution/default.nix +++ b/pkgs/development/rocm-modules/rocalution/default.nix @@ -110,10 +110,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Iterative sparse solvers for ROCm"; diff --git a/pkgs/development/rocm-modules/rocblas/default.nix b/pkgs/development/rocm-modules/rocblas/default.nix index 4c7eef6e1649..311cf443211e 100644 --- a/pkgs/development/rocm-modules/rocblas/default.nix +++ b/pkgs/development/rocm-modules/rocblas/default.nix @@ -192,10 +192,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { amdgpu_targets = gpuTargets'; - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + updateScript = rocmUpdateScript { inherit finalAttrs; }; }; enableParallelBuilding = true; diff --git a/pkgs/development/rocm-modules/rocdbgapi/default.nix b/pkgs/development/rocm-modules/rocdbgapi/default.nix index f6c097267c68..b45d492020cd 100644 --- a/pkgs/development/rocm-modules/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/rocdbgapi/default.nix @@ -97,10 +97,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/share/html ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Debugger support for control of execution and inspection state of AMD's GPU architectures"; diff --git a/pkgs/development/rocm-modules/rocfft/default.nix b/pkgs/development/rocm-modules/rocfft/default.nix index 17eddb367820..c173dd7905a5 100644 --- a/pkgs/development/rocm-modules/rocfft/default.nix +++ b/pkgs/development/rocm-modules/rocfft/default.nix @@ -155,10 +155,7 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + updateScript = rocmUpdateScript { inherit finalAttrs; }; }; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/development/rocm-modules/rocgdb/default.nix b/pkgs/development/rocm-modules/rocgdb/default.nix index 05c316df9504..4dd48eeeeed5 100644 --- a/pkgs/development/rocm-modules/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/rocgdb/default.nix @@ -101,10 +101,7 @@ stdenv.mkDerivation (finalAttrs: { env.CFLAGS = "-Wno-switch -Wno-format-nonliteral -I${zstd.dev}/include -I${zlib.dev}/include -I${expat.dev}/include -I${ncurses.dev}/include"; env.CXXFLAGS = finalAttrs.env.CFLAGS; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "ROCm source-level debugger for Linux, based on GDB"; diff --git a/pkgs/development/rocm-modules/rocm-cmake/default.nix b/pkgs/development/rocm-modules/rocm-cmake/default.nix index 14016459308d..2e9c484acce4 100644 --- a/pkgs/development/rocm-modules/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/rocm-cmake/default.nix @@ -22,10 +22,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ rocm-core ]; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "CMake modules for common build tasks for the ROCm stack"; diff --git a/pkgs/development/rocm-modules/rocm-core/default.nix b/pkgs/development/rocm-modules/rocm-core/default.nix index 59d76542a47d..f403c2c194ca 100644 --- a/pkgs/development/rocm-modules/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-core/default.nix @@ -83,10 +83,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.ROCM_LIBPATCH_VERSION = finalAttrs.env.ROCM_LIBPATCH_VERSION; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Utility for getting the ROCm release version"; diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix index 0931ab897d0e..8faf6085b49f 100644 --- a/pkgs/development/rocm-modules/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix @@ -94,10 +94,7 @@ stdenv.mkDerivation (finalAttrs: { export HIP_DEVICE_LIB_PATH="${rocm-device-libs}/amdgcn/bitcode" ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Platform runtime for ROCm"; diff --git a/pkgs/development/rocm-modules/rocm-smi/default.nix b/pkgs/development/rocm-modules/rocm-smi/default.nix index 154fde82899b..95f00dd5c327 100644 --- a/pkgs/development/rocm-modules/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/rocm-smi/default.nix @@ -60,10 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${libdrm.dev}/include/libdrm/ $out/include/ ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "System management interface for AMD GPUs supported by ROCm"; diff --git a/pkgs/development/rocm-modules/rocminfo/default.nix b/pkgs/development/rocm-modules/rocminfo/default.nix index 6cde03054844..0b712cec2138 100644 --- a/pkgs/development/rocm-modules/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/rocminfo/default.nix @@ -43,10 +43,7 @@ stdenv.mkDerivation (finalAttrs: { sed 's,lsmod | grep ,${busybox}/bin/lsmod | ${gnugrep}/bin/grep ,' -i rocminfo.cc ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "ROCm Application for Reporting System Info"; diff --git a/pkgs/development/rocm-modules/rocmlir/default.nix b/pkgs/development/rocm-modules/rocmlir/default.nix index f8be324fcea7..466f40d8a5ff 100644 --- a/pkgs/development/rocm-modules/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/rocmlir/default.nix @@ -146,11 +146,7 @@ stdenv.mkDerivation (finalAttrs: { patchelf --set-rpath $out/lib:$external/lib:${libPath} $out/{bin/*,lib/*.so*} ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - page = "tags?per_page=4"; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "MLIR-based convolution and GEMM kernel generator"; diff --git a/pkgs/development/rocm-modules/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix index bb6c0bd0b7ff..a862e6fca610 100644 --- a/pkgs/development/rocm-modules/rocprim/default.nix +++ b/pkgs/development/rocm-modules/rocprim/default.nix @@ -85,10 +85,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "ROCm parallel primitives"; diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix index c9663e348886..a51abd2d0f37 100644 --- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix @@ -69,10 +69,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; - passthru.updateScript = rocmUpdateScript { - name = "rocprofiler-register"; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Profiling with perf-counters and derived metrics"; diff --git a/pkgs/development/rocm-modules/rocprofiler/default.nix b/pkgs/development/rocm-modules/rocprofiler/default.nix index d23390eeb0c6..fdd4756d3c54 100644 --- a/pkgs/development/rocm-modules/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler/default.nix @@ -128,10 +128,7 @@ stdenv.mkDerivation (finalAttrs: { --add-needed libhsa-amd-aqlprofile64.so ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; passthru.rocmtoolkit-merged = rocmtoolkit-merged; meta = { diff --git a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix index a158feaf5269..2dda0c29227c 100644 --- a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix @@ -43,10 +43,7 @@ stdenv.mkDerivation (finalAttrs: { rm -rf $out/src ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Library that provides some debugging functionality for ROCr"; diff --git a/pkgs/development/rocm-modules/rocrand/default.nix b/pkgs/development/rocm-modules/rocrand/default.nix index e3d64c3c336d..3b687df33b26 100644 --- a/pkgs/development/rocm-modules/rocrand/default.nix +++ b/pkgs/development/rocm-modules/rocrand/default.nix @@ -86,10 +86,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Generate pseudo-random and quasi-random numbers"; diff --git a/pkgs/development/rocm-modules/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix index cbb667f869e8..1dcee4874832 100644 --- a/pkgs/development/rocm-modules/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/rocsolver/default.nix @@ -120,10 +120,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = "rocsolver"; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/development/rocm-modules/rocsparse/default.nix b/pkgs/development/rocm-modules/rocsparse/default.nix index 33d01f8a6e01..8f5ee482f65d 100644 --- a/pkgs/development/rocm-modules/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/rocsparse/default.nix @@ -146,10 +146,7 @@ stdenv.mkDerivation (finalAttrs: { mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; }; - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + updateScript = rocmUpdateScript { inherit finalAttrs; }; }; meta = { diff --git a/pkgs/development/rocm-modules/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix index 1c3123d1f834..58c46f4a4fa5 100644 --- a/pkgs/development/rocm-modules/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/rocthrust/default.nix @@ -81,10 +81,7 @@ stdenv.mkDerivation (finalAttrs: { rm -rf $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "ROCm parallel algorithm library"; diff --git a/pkgs/development/rocm-modules/roctracer/default.nix b/pkgs/development/rocm-modules/roctracer/default.nix index 2f5db2c05040..81819cecb207 100644 --- a/pkgs/development/rocm-modules/roctracer/default.nix +++ b/pkgs/development/rocm-modules/roctracer/default.nix @@ -106,10 +106,7 @@ stdenv.mkDerivation (finalAttrs: { rm -rf $out/test ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Tracer callback/activity library"; diff --git a/pkgs/development/rocm-modules/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix index c75d4020f432..f43a20c654c6 100644 --- a/pkgs/development/rocm-modules/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/rocwmma/default.nix @@ -104,10 +104,7 @@ stdenv.mkDerivation (finalAttrs: { rm -rf $out/bin ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Mixed precision matrix multiplication and accumulation"; diff --git a/pkgs/development/rocm-modules/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix index ebd601ba2e90..6fc3425d67d3 100644 --- a/pkgs/development/rocm-modules/rpp/default.nix +++ b/pkgs/development/rocm-modules/rpp/default.nix @@ -65,10 +65,7 @@ stdenv.mkDerivation (finalAttrs: { python3 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html ''; - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - inherit (finalAttrs.src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "Comprehensive high-performance computer vision library for AMD processors"; diff --git a/pkgs/development/rocm-modules/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix index 085c36e22017..33c7dd2e6cbd 100644 --- a/pkgs/development/rocm-modules/tensile/default.nix +++ b/pkgs/development/rocm-modules/tensile/default.nix @@ -16,7 +16,7 @@ rich, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tensile"; version = "7.2.1"; pyproject = true; @@ -24,14 +24,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-libraries"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; sparseCheckout = [ "shared/tensile" "shared" ]; hash = "sha256-sYudPiEPGeZLmf6+3XfQDZqRXiKgRsGPucApzYwlGV8="; }; - sourceRoot = "${src.name}/shared/tensile"; + sourceRoot = "${finalAttrs.src.name}/shared/tensile"; # TODO: It should be possible to run asm caps test ONCE for all supported arches # We currently disable the test because it's slow and runs each time tensile launches @@ -81,10 +81,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "Tensile" ]; - passthru.updateScript = rocmUpdateScript { - name = pname; - inherit (src) owner repo; - }; + passthru.updateScript = rocmUpdateScript { inherit finalAttrs; }; meta = { description = "GEMMs and tensor contractions"; @@ -93,4 +90,4 @@ buildPythonPackage rec { teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/rocm-modules/update.nix b/pkgs/development/rocm-modules/update.nix index 6e2068a8b112..7ffc5f9a7e6c 100644 --- a/pkgs/development/rocm-modules/update.nix +++ b/pkgs/development/rocm-modules/update.nix @@ -4,10 +4,11 @@ }: { - name ? "", - owner ? "", - repo ? "", - page ? "releases", + finalAttrs ? { }, + name ? finalAttrs.pname, + owner ? finalAttrs.src.owner, + repo ? finalAttrs.src.repo, + page ? "releases?per_page=10", # input: array of [ { tag_name: "rocm-6.x.x", }, ... ]. some entries may have bad names like rocm-test-date we want to skip # output: first tag_name/name that's a proper version if any filter ? "map(.tag_name // .name) | map(select(test(\"^rocm-[0-9]+\\\\.[0-9]+(\\\\.[0-9]+)?$\"))) | first | ltrimstr(\"rocm-\")", @@ -34,7 +35,7 @@ let find_valid_version() { local releases="$1" >&2 echo "$releases" - # Wrap in array if not already an array to make handline specific release or tags page the same + # Wrap in array if not already an array to make handling specific release or tags page the same >&2 echo jq -r 'if type == "array" then . else [.] end | ${filter}' echo "$releases" | jq -r 'if type == "array" then . else [.] end | ${filter}' } From 9a40c93398a31c0efd731dfe8c410416161a8567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 27 Mar 2026 11:20:15 -0700 Subject: [PATCH 14/51] python3Packages.hueble: 2.1.1 -> 2.2.0 Diff: https://github.com/flip-dots/HueBLE/compare/v2.1.1...v2.2.0 Changelog: https://github.com/flip-dots/HueBLE/blob/v2.2.0/CHANGELOG.rst --- pkgs/development/python-modules/hueble/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hueble/default.nix b/pkgs/development/python-modules/hueble/default.nix index c7d168fddc34..883ff3f88446 100644 --- a/pkgs/development/python-modules/hueble/default.nix +++ b/pkgs/development/python-modules/hueble/default.nix @@ -5,18 +5,20 @@ setuptools, bleak, bleak-retry-connector, + pytest-asyncio, + pytestCheckHook, }: buildPythonPackage rec { pname = "hueble"; - version = "2.1.1"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "flip-dots"; repo = "HueBLE"; tag = "v${version}"; - hash = "sha256-CMipY44tfuOQE2P77mH44stevg1IOd0MeF+cS6jkPnw="; + hash = "sha256-BokZeQMgOseIlxs4u5BpYmGLKCM5IwSCvV8ic0ZVIeI="; }; build-system = [ setuptools ]; @@ -28,8 +30,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "HueBLE" ]; - # upstream has no tests - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; meta = { changelog = "https://github.com/flip-dots/HueBLE/blob/${src.tag}/CHANGELOG.rst"; From 04bd440dbe2a5be7301c161a38f6ded29f45c5c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 27 Mar 2026 11:49:21 -0700 Subject: [PATCH 15/51] python3Packages.urllib3-future: 2.17.903 -> 2.18.901 Diff: https://github.com/jawah/urllib3.future/compare/2.17.903...2.18.901 Changelog: https://github.com/jawah/urllib3.future/blob/2.18.901/CHANGES.rst --- pkgs/development/python-modules/urllib3-future/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix index 9184b6a9b1c4..055139daed20 100644 --- a/pkgs/development/python-modules/urllib3-future/default.nix +++ b/pkgs/development/python-modules/urllib3-future/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "urllib3-future"; - version = "2.17.903"; + version = "2.18.901"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "urllib3.future"; tag = version; - hash = "sha256-tgAKjtYuVVjkxI6qC7/iFHv/DE+rGSw0+Dye73WTcis="; + hash = "sha256-y6DRN24U2vxLRcVw9w9E4FMlk71W44x7UYSJrS6hfuA="; }; postPatch = '' From d50b6f378ab8bb4cea47bf6c7db569090bb34a89 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 27 Mar 2026 20:21:44 +0000 Subject: [PATCH 16/51] libdng: enable strictDeps, fix cross compilation pkg-config is needed to locate `scdoc`. fixes `nix-build -A pkgsCross.aarch64-multiplatform.libdng` --- pkgs/by-name/li/libdng/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/li/libdng/package.nix b/pkgs/by-name/li/libdng/package.nix index 84560352eb36..a8e1d9b789fe 100644 --- a/pkgs/by-name/li/libdng/package.nix +++ b/pkgs/by-name/li/libdng/package.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2Kwz5K37I3HnnKePyY4nKYwnGHP09vr6IThiuKd3EfQ="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -39,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; + strictDeps = true; meta = { changelog = "https://gitlab.com/megapixels-org/libdng/-/tags/${finalAttrs.src.tag}"; From 11b761e60d232c6c64b6e090d833bf673b21c9e9 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 19 Feb 2026 17:04:57 +0000 Subject: [PATCH 17/51] pkgsi686Linux: force `i686-linux` on unsupported platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise we end up evaluating into `i686-darwin` in CI… --- pkgs/top-level/stage.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 6c237bc6dd55..13bb34e31b39 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -241,12 +241,16 @@ let ] ++ overlays; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { - config = lib.systems.parse.tripleFromSystem ( - stdenv.hostPlatform.parsed - // { - cpu = lib.systems.parse.cpuTypes.i686; - } - ); + config = + if isSupported then + lib.systems.parse.tripleFromSystem ( + stdenv.hostPlatform.parsed + // { + cpu = lib.systems.parse.cpuTypes.i686; + } + ) + else + "i686-unknown-linux-gnu"; }; } else From 878bcac756d3bedb3742c71fdfaa02980529412a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 27 Mar 2026 15:03:30 -0700 Subject: [PATCH 18/51] python3Packages.afdko: update dependencies --- pkgs/development/python-modules/afdko/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 06e0be5c82f3..a2bb7f770f32 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -9,10 +9,9 @@ fetchFromGitHub, fetchpatch, fontmath, - fontpens, fonttools, libxml2, - mutatormath, + lxml, ninja, pytestCheckHook, runAllTests ? false, @@ -88,14 +87,14 @@ buildPythonPackage (finalAttrs: { booleanoperations defcon fontmath - fontpens fonttools - mutatormath + lxml tqdm ufonormalizer ufoprocessor ] ++ defcon.optional-dependencies.lxml + ++ defcon.optional-dependencies.pens ++ fonttools.optional-dependencies.lxml ++ fonttools.optional-dependencies.ufo ++ fonttools.optional-dependencies.unicode From 0f6d5aaf165bf0bec27dec8fb41e4e8b70724b10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Mar 2026 09:28:40 +0000 Subject: [PATCH 19/51] xmake: 3.0.7 -> 3.0.8 --- pkgs/by-name/xm/xmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xm/xmake/package.nix b/pkgs/by-name/xm/xmake/package.nix index 58524f808dc0..83a632bb7dd6 100644 --- a/pkgs/by-name/xm/xmake/package.nix +++ b/pkgs/by-name/xm/xmake/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xmake"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "xmake-io"; repo = "xmake"; tag = "v${finalAttrs.version}"; - hash = "sha256-SmvkdAo0XZF8RMP039kkmJxx3pwSPxKj3k8ScfTfYb8="; + hash = "sha256-8Rm1OtjpyzM/G8YN8nsK8TypF/C/8tQvW+7TxEX5st0="; fetchSubmodules = true; }; From a8c0a2b219e7a4025fd26edb83cb337fd05eab5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 Mar 2026 07:13:04 -0700 Subject: [PATCH 20/51] pytr: 0.4.6 -> 0.4.7 Diff: https://github.com/pytr-org/pytr/compare/v0.4.6...v0.4.7 Changelog: https://github.com/pytr-org/pytr/releases/tag/v0.4.7 --- pkgs/by-name/py/pytr/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index 4eecd6d3558d..7adb5efa55e6 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "pytr"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; src = fetchFromGitHub { owner = "pytr-org"; repo = "pytr"; tag = "v${version}"; - hash = "sha256-2x0Kwg4upKLwFYslyIvXcssdO4W8l0Gs3qvy6kJYNnI="; + hash = "sha256-+GIjNtlg9q125jf8p5AyE1F+lT0mfqQaSJbusp0kRmo="; }; build-system = with python3Packages; [ @@ -28,6 +28,8 @@ python3Packages.buildPythonApplication rec { babel certifi coloredlogs + cryptography + curl-cffi ecdsa packaging pathvalidate From f90f05d78ec782aa18a0f79ad8b046bd63a6668d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Mar 2026 17:55:46 +0100 Subject: [PATCH 21/51] python3Packages.pyenphase: 2.4.5 -> 2.4.6 Diff: https://github.com/pyenphase/pyenphase/compare/v2.4.5...v2.4.6 Changelog: https://github.com/pyenphase/pyenphase/blob/v2.4.6/CHANGELOG.md --- pkgs/development/python-modules/pyenphase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 06715a760afb..a95b4409d960 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "pyenphase"; - version = "2.4.5"; + version = "2.4.6"; pyproject = true; src = fetchFromGitHub { owner = "pyenphase"; repo = "pyenphase"; tag = "v${finalAttrs.version}"; - hash = "sha256-BMzYo6KrgJII/30TJndYRGOjRS2ufWJirQd5X8D0bbo="; + hash = "sha256-t2f0Zgcl/oWSTTN66dx1wO6ed1gxXZ+J8loN1X6CkM4="; }; pythonRelaxDeps = [ "tenacity" ]; From c94fc05d303c1feaa73ad4ed99df4f86b904bbef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Mar 2026 18:13:11 +0100 Subject: [PATCH 22/51] python3Packages.tesla-fleet-api: 1.4.3 -> 1.4.5 Diff: https://github.com/Teslemetry/python-tesla-fleet-api/compare/v1.4.3...v1.4.5 Changelog: https://github.com/Teslemetry/python-tesla-fleet-api/releases/tag/v1.4.5 --- pkgs/development/python-modules/tesla-fleet-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 4690cf59bfff..86bbb51e9646 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "1.4.3"; + version = "1.4.5"; pyproject = true; src = fetchFromGitHub { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; tag = "v${version}"; - hash = "sha256-bT0nI9YFnhMxvtJRQtHpDXKbWhZwQrPGIjEt/nHH5VU="; + hash = "sha256-YmhLVbTIn2zthmw2d2AsmQFbWNHZvRFYAF5DB4gwIhQ="; }; build-system = [ setuptools ]; From 45e25632d1737778bfc42b2d02a30ad9e0e721fc Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 28 Mar 2026 18:50:24 +0100 Subject: [PATCH 23/51] floorp-bin: 12.11.0 -> 12.12.0 Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v12.11.0...v12.12.0 Release notes: https://blog.floorp.app/release/12.12.0 Signed-off-by: Christoph Heiss --- .../fl/floorp-bin-unwrapped/sources.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json index 1f509c9cd034..65609014a811 100644 --- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json @@ -1,21 +1,21 @@ { - "version": "12.11.0", + "version": "12.12.0", "sources": { "aarch64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.11.0/floorp-linux-aarch64.tar.xz", - "sha256": "e3d1b8c928bf8c3c1a2e64270f83acfee1db04c49bfb8182d64e7895889e4348" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-linux-aarch64.tar.xz", + "sha256": "0ca2c2e80ee569a8d2bcbcac64e28e33e6aa5ece91faf8b9755189c34a71af9a" }, "x86_64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.11.0/floorp-linux-x86_64.tar.xz", - "sha256": "307bcc82f9eb086aea636851d3774a7ec746bc45dd0a6a5d4681f5a477ded9c4" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-linux-x86_64.tar.xz", + "sha256": "a6f61ad904e8229ca4e709a30d38f2a0e6926dc3f82ddbe24efb8e0c1ba51910" }, "aarch64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.11.0/floorp-macOS-universal.dmg", - "sha256": "adac6b0bc406b132dcc9fd72ac10ebbdfc87b5e276d89d4b4155c5e515716ecf" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-macOS-universal.dmg", + "sha256": "d5fc6ea7c98514e304cdfe192d8df6c253b8d6b248b39cb41486f6e67a8b566e" }, "x86_64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.11.0/floorp-macOS-universal.dmg", - "sha256": "adac6b0bc406b132dcc9fd72ac10ebbdfc87b5e276d89d4b4155c5e515716ecf" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-macOS-universal.dmg", + "sha256": "d5fc6ea7c98514e304cdfe192d8df6c253b8d6b248b39cb41486f6e67a8b566e" } } } From 57373374cd58d2d88d4a869ec9ef3509f76c8b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 Mar 2026 18:49:00 -0700 Subject: [PATCH 24/51] python3Packages.pysvn: 1.9.23 -> 1.9.25 --- pkgs/development/python-modules/pysvn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 4616cc98e196..dba40e596a18 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pysvn"; - version = "1.9.23"; + version = "1.9.25"; pyproject = false; src = fetchurl { url = "mirror://sourceforge/project/pysvn/pysvn/V${version}/pysvn-${version}.tar.gz"; - hash = "sha256-ABru1nng1RaYfZwe0Z0NxE90rU/J2h/BhzUnvgrasCk="; + hash = "sha256-M9LzUr/6FZSUWFQdGM6Ew1/ySE5C/Q7cNXi+jGa+JdY="; }; patches = [ ./replace-python-first.patch ]; From 974df199362bba7199121f1fb29f89c285967440 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Mar 2026 10:14:31 +0000 Subject: [PATCH 25/51] g-ls: 0.31.0 -> 0.31.2 --- pkgs/by-name/g-/g-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/g-/g-ls/package.nix b/pkgs/by-name/g-/g-ls/package.nix index 3a787cd97f45..0414cdce8766 100644 --- a/pkgs/by-name/g-/g-ls/package.nix +++ b/pkgs/by-name/g-/g-ls/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "g-ls"; - version = "0.31.0"; + version = "0.31.2"; src = fetchFromGitHub { owner = "Equationzhao"; repo = "g"; tag = "v${finalAttrs.version}"; - hash = "sha256-cHB9oW4vF00hvhZ7KNY5TUjIjLjEoiJb/psMSq+kSHU="; + hash = "sha256-krir/F+USTbVRFwC7d2rA5d4EcOG+2CNpwSqCUJP5fU="; }; - vendorHash = "sha256-5ksa0AJ7JbQPzBypDDMUvnXtIeXNEm9zKL5JetHWnrs="; + vendorHash = "sha256-j1zsulX1wySlWivVU9ajJFmx8Ww2/sxVMV41fUJa1DU="; subPackages = [ "." ]; From 834cb31adea1132f1b50742ec4fc3cd8559e7dc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Mar 2026 10:28:42 +0000 Subject: [PATCH 26/51] sshwifty: 0.4.3-beta-release -> 0.4.5-beta-release --- pkgs/by-name/ss/sshwifty/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ss/sshwifty/package.nix b/pkgs/by-name/ss/sshwifty/package.nix index cef2cdb5ffee..4ebcf41219fd 100644 --- a/pkgs/by-name/ss/sshwifty/package.nix +++ b/pkgs/by-name/ss/sshwifty/package.nix @@ -11,13 +11,13 @@ }: buildGoModule (finalAttrs: { pname = "sshwifty"; - version = "0.4.3-beta-release"; + version = "0.4.5-beta-release"; src = fetchFromGitHub { owner = "nirui"; repo = "sshwifty"; tag = finalAttrs.version; - hash = "sha256-Khx8iOEe1/NYiWEawwGuCbybflGq8FDtJFh8DFoNI+k="; + hash = "sha256-b6DgDhnaeIT8HnE2+TNzI2XPmERwPdnv6U8cu0ZZmAc="; }; nativeBuildInputs = [ @@ -32,10 +32,10 @@ buildGoModule (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-i7EHR3hw+LPKbiRKLXOjEsMVtUIBAWwH22ZMVTh715A="; + hash = "sha256-xfnG5ONEVA58ZHmFoG6x9bYxwHuAjq7VsqxifEH2nQk="; }; - vendorHash = "sha256-s1+hP9oakR2YgBUOc0ezFW2MQBi8piRPKAVLBgJLN6o="; + vendorHash = "sha256-s9wjaxeuIBClyBwDSZvnSVxXh/RI6oOITU2cL3oNb5o="; preBuild = '' # Generate static pages From cae497b5e4f80b9f7a8b70ddb012009539789bec Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 29 Mar 2026 19:42:24 +0800 Subject: [PATCH 27/51] code-cursor: 2.6.21 -> 2.6.22 --- pkgs/by-name/co/code-cursor/sources.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 1806a93f935f..91923720370e 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,22 @@ { - "version": "2.6.21", + "version": "2.6.22", "vscodeVersion": "1.105.1", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/fea2f546c979a0a4ad1deab23552a43568807592/linux/x64/Cursor-2.6.21-x86_64.AppImage", - "hash": "sha256-ZohAVWsde5fOac0JL9kc8ql/ZGohbc7S0yStARXQVSU=" + "url": "https://downloads.cursor.com/production/c6285feaba0ad62603f7c22e72f0a170dc8415a5/linux/x64/Cursor-2.6.22-x86_64.AppImage", + "hash": "sha256-rmPXBpIHIp87yF0PDJhqIgvtXOVYT0JXHT66Yynwggg=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/fea2f546c979a0a4ad1deab23552a43568807592/linux/arm64/Cursor-2.6.21-aarch64.AppImage", - "hash": "sha256-U1iWEcCeXwGQjX5Wc8mp1jfFp1eUDfida+n6Ahmay7s=" + "url": "https://downloads.cursor.com/production/c6285feaba0ad62603f7c22e72f0a170dc8415a5/linux/arm64/Cursor-2.6.22-aarch64.AppImage", + "hash": "sha256-kMXmgDza9AndVIKEUFYaPxOX5C7wfNY6UWWKqdX3ElE=" }, "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/fea2f546c979a0a4ad1deab23552a43568807592/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-KhR7DnQMMbpbr8wPHMr75HDyoCOHRxsr/goeN3tAoTs=" + "url": "https://downloads.cursor.com/production/c6285feaba0ad62603f7c22e72f0a170dc8415a5/darwin/x64/Cursor-darwin-x64.dmg", + "hash": "sha256-o63Y3Ysm/TcFdS+OoYGZkwpylOKJgFLJ0CUHweDjVRw=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/fea2f546c979a0a4ad1deab23552a43568807592/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-1zPqim1x1x01p5FM8PmAtordVUKdtqEhqkqoAswF1OE=" + "url": "https://downloads.cursor.com/production/c6285feaba0ad62603f7c22e72f0a170dc8415a5/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-Q26w+OBK8GnNh4z0DwOWqpfMap4O7OAOpxqLdMio5rk=" } } } From 181d2c9c7aeefe4bc920c185c5df5ba95d50575c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Mar 2026 13:23:50 +0000 Subject: [PATCH 28/51] cloudlog: 2.8.9 -> 2.8.10 --- pkgs/by-name/cl/cloudlog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix index 632eaf9a6b5a..8e7f3c402baf 100644 --- a/pkgs/by-name/cl/cloudlog/package.nix +++ b/pkgs/by-name/cl/cloudlog/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.8.9"; + version = "2.8.10"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-vq4mt0/Bfd+VR/2Inj8oJteIV9V7v0uiLmRMkpV2wI8="; + hash = "sha256-i/0GNVLvF0jHF83Ee9GCo80xeHoQb18OLmSZL++OTEo="; }; postPatch = '' From 3479140d12ac743a6cc696808f6f75e5024f6bf2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 29 Mar 2026 13:56:10 +0000 Subject: [PATCH 29/51] thunar: 4.20.7 -> 4.20.8 https://gitlab.xfce.org/xfce/thunar/-/compare/thunar-4.20.7...thunar-4.20.8 --- pkgs/by-name/th/thunar-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/th/thunar-unwrapped/package.nix b/pkgs/by-name/th/thunar-unwrapped/package.nix index a8fe92e72800..cc96494e8c95 100644 --- a/pkgs/by-name/th/thunar-unwrapped/package.nix +++ b/pkgs/by-name/th/thunar-unwrapped/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "thunar"; - version = "4.20.7"; + version = "4.20.8"; outputs = [ "out" @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "xfce"; repo = "thunar"; tag = "thunar-${finalAttrs.version}"; - hash = "sha256-ii3ObvKCTXube3rnn+JdCsxTZDubrKcevBgpiGVbL/c="; + hash = "sha256-gcNo9HNBY5NGhJ8N8DBTXYb5gsNAXrItvWuo3XdSBRg="; }; nativeBuildInputs = [ From 8736c599571946cb28eab0e0790f79f59568741b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 29 Mar 2026 15:42:22 +0000 Subject: [PATCH 30/51] protobuf_25: 25.8 -> 25.9 Diff: https://github.com/protocolbuffers/protobuf/compare/v25.8...v25.9 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v25.9 --- pkgs/development/libraries/protobuf/25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix index 6d1d6253bc19..963d406392b8 100644 --- a/pkgs/development/libraries/protobuf/25.nix +++ b/pkgs/development/libraries/protobuf/25.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "25.8"; - hash = "sha256-UUUblMKN1xFknFtanq5MRVQ57dzhOV9sPqlw1J37aNE="; + version = "25.9"; + hash = "sha256-Psv9dJxrHnlWTLZF+FwjqB/Yw2r8DWdcuvzB9vv0Nok="; } // args ) From e4361d11b7079cf9228293e95738d18fbb12b245 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Mar 2026 17:22:54 +0000 Subject: [PATCH 31/51] tigerbeetle: 0.16.77 -> 0.16.78 --- pkgs/by-name/ti/tigerbeetle/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index df1ed45c99cf..b99dec74289e 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-ByZdWkpVsrwbgC43WgDGMvw53IVX4y+dOeZweqavVmY="; - "x86_64-linux" = "sha256-zwsoyTbSt2bVZ/Qquu60dnqUzzW81fV8NuOfZB4o4/I="; - "aarch64-linux" = "sha256-/2LjENxaD4iJUCaCRKpMl22WO1KMtLHP181yZCK8fqA="; + "universal-macos" = "sha256-xL2D05My1EgM8d6ku5+2GqYLwcyWljqyMowb8A1lsh0="; + "x86_64-linux" = "sha256-exI0jZ4LXcUXYcYL6wVXZhmjD4LFvTzqy+IaokmLs/M="; + "aarch64-linux" = "sha256-MBUpe8o0/0sa4qSGmzv3CYrDDqGiiW/NrUnmmfn0dBc="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.16.77"; + version = "0.16.78"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; From 8bd829ddfa914d7dd84bd75e881e5761266e082b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 29 Mar 2026 10:28:22 -0700 Subject: [PATCH 32/51] python3Packages.aioimmich: 0.12.0 -> 0.12.1 Diff: https://github.com/mib1185/aioimmich/compare/v0.12.0...v0.12.1 Changelog: https://github.com/mib1185/aioimmich/releases/tag/v0.12.1 --- pkgs/development/python-modules/aioimmich/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aioimmich/default.nix b/pkgs/development/python-modules/aioimmich/default.nix index df535eb7737b..42eff42600d1 100644 --- a/pkgs/development/python-modules/aioimmich/default.nix +++ b/pkgs/development/python-modules/aioimmich/default.nix @@ -14,19 +14,19 @@ buildPythonPackage rec { pname = "aioimmich"; - version = "0.12.0"; + version = "0.12.1"; pyproject = true; src = fetchFromGitHub { owner = "mib1185"; repo = "aioimmich"; tag = "v${version}"; - hash = "sha256-ieGjdccvk97jWKP9bnE+KCkOocNJSWEOqCPxoXv5oOs="; + hash = "sha256-bmBVIy96qEhLltz8weA1pwr27MlHoETe/YVfM7sLGWw="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail setuptools==80.10.2 setuptools + --replace-fail setuptools==82.0.0 setuptools ''; build-system = [ setuptools ]; From b17eb6625f78da7a7dfe6c388471edf112c61717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 29 Mar 2026 10:30:29 -0700 Subject: [PATCH 33/51] python3Packages.youtubeaio: 2.1.1 -> 2.1.2 Diff: https://github.com/joostlek/python-youtube/compare/v2.1.1...v2.1.2 Changelog: https://github.com/joostlek/python-youtube/releases/tag/v2.1.2 --- pkgs/development/python-modules/youtubeaio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youtubeaio/default.nix b/pkgs/development/python-modules/youtubeaio/default.nix index b97727cc91e3..ddb4a6edb589 100644 --- a/pkgs/development/python-modules/youtubeaio/default.nix +++ b/pkgs/development/python-modules/youtubeaio/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "youtubeaio"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; src = fetchFromGitHub { owner = "joostlek"; repo = "python-youtube"; tag = "v${version}"; - hash = "sha256-2PqVFZ5816g8Ilc0Mhlm+Gzw/eOSaC1JYPY/t2yzxCU="; + hash = "sha256-GE06T3NSA2JdPSd2kS7rf3abI+b/zegS34n3Oxj2tnE="; }; build-system = [ poetry-core ]; From 61841c54e8e39526e922c91ea9031686907506eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 29 Mar 2026 10:31:44 -0700 Subject: [PATCH 34/51] python3Packages.aiontfy: 0.8.1 -> 0.8.3 Diff: https://github.com/tr4nt0r/aiontfy/compare/v0.8.1...v0.8.3 Changelog: https://github.com/tr4nt0r/aiontfy/releases/tag/v0.8.3 --- pkgs/development/python-modules/aiontfy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiontfy/default.nix b/pkgs/development/python-modules/aiontfy/default.nix index 5ff9a00e048d..2cf64b7a64a6 100644 --- a/pkgs/development/python-modules/aiontfy/default.nix +++ b/pkgs/development/python-modules/aiontfy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "aiontfy"; - version = "0.8.1"; + version = "0.8.3"; pyproject = true; src = fetchFromGitHub { owner = "tr4nt0r"; repo = "aiontfy"; tag = "v${version}"; - hash = "sha256-pwlPtFeMBvSc1keFvDv5hzB/WIxHJSuTspKKQrAowiA="; + hash = "sha256-whofQUPT4UcOOBxvdMz3mMzMR/svVaLQrC6c7EfzwZY="; }; build-system = [ @@ -29,6 +29,10 @@ buildPythonPackage rec { hatchling ]; + pythonRelaxDeps = [ + "orjson" + ]; + dependencies = [ aiohttp mashumaro From 482f9e2d1dc6989219b8a6855ec6b3c9ad36010e Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Mon, 23 Mar 2026 13:20:05 -0700 Subject: [PATCH 35/51] python3Packages.tuya-device-handlers: init at 0.0.10 --- .../tuya-device-handlers/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/tuya-device-handlers/default.nix diff --git a/pkgs/development/python-modules/tuya-device-handlers/default.nix b/pkgs/development/python-modules/tuya-device-handlers/default.nix new file mode 100644 index 000000000000..2f8f79435cf5 --- /dev/null +++ b/pkgs/development/python-modules/tuya-device-handlers/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + tuya-device-sharing-sdk, + pytestCheckHook, + syrupy, +}: + +buildPythonPackage (finalAttrs: { + pname = "tuya-device-handlers"; + version = "0.0.10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "tuya-device-handlers"; + tag = "v${finalAttrs.version}"; + hash = "sha256-W5aSEt8xXxQUcs6+AVVcgXxjm3WppzfCaww8YX+sej0="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ tuya-device-sharing-sdk ]; + + nativeCheckInputs = [ + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ "tuya_device_handlers" ]; + + meta = { + description = "Tuya quirks library"; + homepage = "https://github.com/home-assistant-libs/tuya-device-handlers"; + changelog = "https://github.com/home-assistant-libs/tuya-device-handlers/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 036e5dada01e..dc25dd958544 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19758,6 +19758,8 @@ self: super: with self; { turrishw = callPackage ../development/python-modules/turrishw { }; + tuya-device-handlers = callPackage ../development/python-modules/tuya-device-handlers { }; + tuya-device-sharing-sdk = callPackage ../development/python-modules/tuya-device-sharing-sdk { }; tuya-iot-py-sdk = callPackage ../development/python-modules/tuya-iot-py-sdk { }; From 4d3a18dfedd144db0f06e57ff6733ac00d6c987b Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 26 Mar 2026 21:52:03 -0700 Subject: [PATCH 36/51] python3Packages.tuya-device-sharing-sdk: 0.2.9 -> 0.2.8 Downgrade to match the version pinned by home-assistant 2026.3.3 in its manifest.json. --- .../python-modules/tuya-device-sharing-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix index 8f53a89075d6..c89f11ded901 100644 --- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "tuya-device-sharing-sdk"; - version = "0.2.9"; + version = "0.2.8"; pyproject = true; src = fetchFromGitHub { owner = "tuya"; repo = "tuya-device-sharing-sdk"; tag = finalAttrs.version; - hash = "sha256-kNWg+AXISThwK14ByObUr+/4GMntrZgtEEMNpw/HjLw="; + hash = "sha256-uD2Lzs08i/01iEksXpYRGB2lU7I15sQrJLfJZ93+oeY="; }; build-system = [ setuptools ]; From 39cf448b9cf200bc9da9f859082a92e318199314 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 26 Mar 2026 21:52:13 -0700 Subject: [PATCH 37/51] home-assistant: add tuya-device-handlers, disable flaky tests Update component-packages.nix to include tuya-device-handlers as a dependency of the tuya integration and add tuya to supportedComponentsWithTests. Disable snapshot tests that fail due to nixpkgs-specific issues: - test_diagnostics.py: entity ordering differs because Python 3.14 schedules async platform setup differently than 3.13. - test_device_diagnostics[tdq_9htyiowaf5rtdhrv] and test_platform_setup_and_discovery: PyPI sdist translations differ from source strings.json ("Power-on behavior" vs "Power on behavior"). --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- pkgs/servers/home-assistant/tests.nix | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f344e5595ed2..48c4dff66996 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -6527,8 +6527,9 @@ "tuya" = ps: with ps; [ ha-ffmpeg + tuya-device-handlers tuya-device-sharing-sdk - ]; # missing inputs: tuya-device-handlers + ]; "twentemilieu" = ps: with ps; [ twentemilieu @@ -8196,6 +8197,7 @@ "trend" "triggercmd" "tts" + "tuya" "twentemilieu" "twilio" "twinkly" diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index b0c7c39646ea..b579d174b505 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -204,6 +204,11 @@ let # TraneConfigFlow doesn't support step reauth "tests/components/trane/test_init.py::test_setup_auth_error" ]; + tuya = [ + # entity ordering in diagnostics is non-deterministic; fixed upstream in + # https://github.com/home-assistant/core/pull/164819 (landing in HA 2026.4) + "tests/components/tuya/test_diagnostics.py" + ]; youtube = [ # outdated snapshot "tests/components/youtube/test_sensor.py::test_sensor" @@ -237,6 +242,12 @@ let # tries to retrieve file from github "test_non_text_stdout_capture" ]; + tuya = [ + # snapshot mismatches: PyPI sdist translations differ from strings.json + # ("Power-on behavior" vs "Power on behavior"); expected to resolve in HA 2026.4 + "test_device_diagnostics[tdq_9htyiowaf5rtdhrv]" + "test_platform_setup_and_discovery" + ]; zeroconf = [ # multicast socket bind, not possible in the sandbox "test_subscribe_discovery" From 6565c1722d8369c045e2ec6c4490913eabd50586 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Mar 2026 22:15:46 +0000 Subject: [PATCH 38/51] python3Packages.netbox-contract: 2.4.4 -> 2.4.5 --- pkgs/development/python-modules/netbox-contract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netbox-contract/default.nix b/pkgs/development/python-modules/netbox-contract/default.nix index ecd92c127504..3622ad49d9f3 100644 --- a/pkgs/development/python-modules/netbox-contract/default.nix +++ b/pkgs/development/python-modules/netbox-contract/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { pname = "netbox-contract"; - version = "2.4.4"; + version = "2.4.5"; pyproject = true; disabled = python.pythonVersion != netbox.python.pythonVersion; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mlebreuil"; repo = "netbox-contract"; tag = "v${version}"; - hash = "sha256-3kjxy6gkhqYrWvl/gbeAxb8m8r3Dihas9cDf50NQMC4="; + hash = "sha256-+6dw8vPDNItZRfExL0C5ul2XghoToMHotEAH90B3CmE="; }; build-system = [ setuptools ]; From c3e63fed9e41b1a891f0ecce48723166b18f576b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Mar 2026 22:24:39 +0000 Subject: [PATCH 39/51] ddhx: 0.9.1 -> 0.9.2 --- pkgs/by-name/dd/ddhx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dd/ddhx/package.nix b/pkgs/by-name/dd/ddhx/package.nix index fbc156530902..cae4b6a32653 100644 --- a/pkgs/by-name/dd/ddhx/package.nix +++ b/pkgs/by-name/dd/ddhx/package.nix @@ -5,13 +5,13 @@ }: buildDubPackage (finalAttrs: { pname = "ddhx"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "dd86k"; repo = "ddhx"; tag = "v${finalAttrs.version}"; - hash = "sha256-AFhxrYncqVnHfro4sUgCT1ZBeL3CUwcwhnGXVuFQ9ak="; + hash = "sha256-1AoTSoykukvKEsdAU0WUQA7LwVebKELam/0kqEWTxFc="; }; dubLock = ./dub-lock.json; From 49decf88a822ff5b43b7e56a1fc2b5c1f686ae4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Mon, 30 Mar 2026 09:47:10 +1100 Subject: [PATCH 40/51] actool: 1.3.0 -> 1.3.2 Fix handling for asset subdirectories. --- pkgs/by-name/ac/actool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ac/actool/package.nix b/pkgs/by-name/ac/actool/package.nix index ad7511d763b9..079c79f9fdc8 100644 --- a/pkgs/by-name/ac/actool/package.nix +++ b/pkgs/by-name/ac/actool/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "actool"; - version = "1.3.0"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "viraptor"; repo = "actool"; tag = finalAttrs.version; - hash = "sha256-8v2P6Z1ZOP65M30+7dTtfXvD0dvaKYSLA9aaP2uzA7E="; + hash = "sha256-4g4Uex6eE5ULKi9JGaOIlyTAzwuK0cPKdYMxTnvKN3U="; }; build-system = with python3Packages; [ From 703a589ec3718eadb59a83b4e775002e44c56b5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Mar 2026 23:58:08 +0000 Subject: [PATCH 41/51] python3Packages.azure-synapse-artifacts: 0.21.0 -> 0.22.0 --- .../python-modules/azure-synapse-artifacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 50955194f74a..f85680118c80 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.21.0"; + version = "0.22.0"; format = "setuptools"; src = fetchPypi { pname = "azure_synapse_artifacts"; inherit version; - hash = "sha256-1+N1Fs+FaeA8YE2SHjQH1xQM91I7Z7Z/dXyvmZ48juc="; + hash = "sha256-3cD7Yic4w+q3RlzkKM+gzUGtAahw+9RTYeTVjRdcYjw="; }; propagatedBuildInputs = [ From 9191694d5636327a4012ee9c6c88eff767cffe8a Mon Sep 17 00:00:00 2001 From: azban Date: Sun, 29 Mar 2026 18:01:15 -0600 Subject: [PATCH 42/51] maintainers: fix matrix for azban --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5180004b9172..611bab3b36c7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2809,7 +2809,7 @@ }; azban = { name = "azban"; - matrix = "azban@matrix.org"; + matrix = "@azban:matrix.org"; github = "azban"; githubId = 714931; }; From 80f5b217107cdcdd525c7198feaafc6f6c73c4ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Mar 2026 00:47:19 +0000 Subject: [PATCH 43/51] python3Packages.mediawiki-langcodes: 0.2.18 -> 0.2.19 --- .../python-modules/mediawiki-langcodes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mediawiki-langcodes/default.nix b/pkgs/development/python-modules/mediawiki-langcodes/default.nix index 16de76c82d79..327e9b1f7e54 100644 --- a/pkgs/development/python-modules/mediawiki-langcodes/default.nix +++ b/pkgs/development/python-modules/mediawiki-langcodes/default.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { pname = "mediawiki-langcodes"; - version = "0.2.18"; + version = "0.2.19"; pyproject = true; # Using fetchPypi instead of fetching from source for technical reason. @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "mediawiki_langcodes"; inherit (finalAttrs) version; - hash = "sha256-9wHlISFD2Pc4qA+kAGR2yRXRby6NGkQRTOoamaoFCxU="; + hash = "sha256-NjLtryaAtIgoturRub1FDYQljJN2ZpmpXz0FkiOIxW8="; }; build-system = [ setuptools ]; From 057c947979a7689793f3528cdfc66d86b964c559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 29 Mar 2026 18:27:15 -0700 Subject: [PATCH 44/51] python3Packages.bleak-retry-connector: only depend on dbus-fast on Linux --- .../python-modules/bleak-retry-connector/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index a15eeaf5da4e..2213d3d9c737 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -28,9 +28,9 @@ buildPythonPackage rec { dependencies = [ bleak - dbus-fast ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus-fast bluetooth-adapters ]; @@ -40,6 +40,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # ModuleNotFoundError: No module named 'dbus_fast' + doCheck = stdenv.hostPlatform.isLinux; + pythonImportsCheck = [ "bleak_retry_connector" ]; meta = { From 300da03a9d0b90000d70a1717e3862d15d08f26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 29 Mar 2026 18:36:10 -0700 Subject: [PATCH 45/51] python3Packages.caldav: fix tests on Darwin --- pkgs/development/python-modules/caldav/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 4403aff4125f..2ad6b596042d 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -70,6 +70,8 @@ buildPythonPackage rec { "test_rfc8764_test_conf" ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "caldav" ]; meta = { From 13a157bfc2f89bc25f8d26322c5745bcb64fb4d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 29 Mar 2026 19:11:54 -0700 Subject: [PATCH 46/51] python3Packages.pynecil: depends on bluetooth-adapters --- pkgs/development/python-modules/pynecil/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pynecil/default.nix b/pkgs/development/python-modules/pynecil/default.nix index 0e39c26f2e61..40e6aadba1f3 100644 --- a/pkgs/development/python-modules/pynecil/default.nix +++ b/pkgs/development/python-modules/pynecil/default.nix @@ -2,6 +2,7 @@ aiohttp, bleak, bleak-retry-connector, + bluetooth-adapters, buildPythonPackage, fetchFromGitHub, hatch-regex-commit, @@ -33,6 +34,7 @@ buildPythonPackage rec { aiohttp bleak bleak-retry-connector + bluetooth-adapters ]; pythonImportsCheck = [ "pynecil" ]; From 1799a464abc8867a95411fbadc1986fe7d46d80f Mon Sep 17 00:00:00 2001 From: kurogeek Date: Fri, 27 Mar 2026 17:21:06 +0700 Subject: [PATCH 47/51] python3Packages.django-xforwardedfor-middleware: init at 2.0 --- .../default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/django-xforwardedfor-middleware/default.nix diff --git a/pkgs/development/python-modules/django-xforwardedfor-middleware/default.nix b/pkgs/development/python-modules/django-xforwardedfor-middleware/default.nix new file mode 100644 index 000000000000..dff1cca50560 --- /dev/null +++ b/pkgs/development/python-modules/django-xforwardedfor-middleware/default.nix @@ -0,0 +1,38 @@ +{ + buildPythonPackage, + django, + fetchFromGitHub, + lib, + setuptools, +}: +buildPythonPackage (finalAttrs: { + pname = "django-xforwardedfor-middleware"; + version = "2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "allo-"; + repo = "django-xforwardedfor-middleware"; + tag = "v${finalAttrs.version}"; + hash = "sha256-dDXSb17kXOSeIgY6wid1QFHhUjrapasWgCEb/El51eA="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + ]; + + # No tests on upstream + doCheck = false; + + pythonImportsCheck = [ "x_forwarded_for" ]; + + meta = { + description = "Use the X-Forwarded-For header to get the real ip of a request"; + homepage = "https://github.com/allo-/django-xforwardedfor-middleware"; + changelog = "https://github.com/allo-/django-xforwardedfor-middleware/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ kurogeek ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bffdd977ba0f..ac0d8f1066de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4426,6 +4426,10 @@ self: super: with self; { django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { }; + django-xforwardedfor-middleware = + callPackage ../development/python-modules/django-xforwardedfor-middleware + { }; + # LTS in extended support phase django_4 = callPackage ../development/python-modules/django/4.nix { }; From dd7d4256625e045380aba36d7715e7801d6e4bdc Mon Sep 17 00:00:00 2001 From: kurogeek Date: Thu, 8 Jan 2026 15:26:17 +0700 Subject: [PATCH 48/51] python3Packages.django-sslserver: init at 0.15 Co-authored-by: dotlambda --- .../django-sslserver/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/django-sslserver/default.nix diff --git a/pkgs/development/python-modules/django-sslserver/default.nix b/pkgs/development/python-modules/django-sslserver/default.nix new file mode 100644 index 000000000000..426571678182 --- /dev/null +++ b/pkgs/development/python-modules/django-sslserver/default.nix @@ -0,0 +1,39 @@ +{ + buildPythonPackage, + django, + lib, + setuptools-scm, + fetchFromGitHub, +}: +buildPythonPackage (finalAttrs: { + pname = "django-sslserver"; + version = "0.15"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "teddziuba"; + repo = "django-sslserver"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RIhqvwJQ7fYZT1SAkbcBNl2jX7j7UZND8e5Vra+ibHA="; + }; + + build-system = [ setuptools-scm ]; + + dependencies = [ + django + ]; + + # No tests on upstream + doCheck = false; + + pythonImportsCheck = [ "sslserver" ]; + + meta = { + description = "SSL-enabled development server for Django"; + homepage = "https://github.com/teddziuba/django-sslserver"; + changelog = "https://github.com/teddziuba/django-sslserver/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kurogeek ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4ecc61a632d..d9caa94eb194 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4378,6 +4378,8 @@ self: super: with self; { django-sql-utils = callPackage ../development/python-modules/django-sql-utils { }; + django-sslserver = callPackage ../development/python-modules/django-sslserver { }; + django-statici18n = callPackage ../development/python-modules/django-statici18n { }; django-storages = callPackage ../development/python-modules/django-storages { }; From f36bc0fe708e56255f6009a87814152448283a96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Mar 2026 04:36:06 +0000 Subject: [PATCH 49/51] lockbook: 26.3.20 -> 26.3.22 --- pkgs/by-name/lo/lockbook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index cd1881fce55a..a7fca5634da6 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "lockbook"; - version = "26.3.20"; + version = "26.3.22"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = finalAttrs.version; - hash = "sha256-uV0n9xQwcJPWbW0Jez1L/ZvNXWm5LZNFnuBs1MwyYa0="; + hash = "sha256-Mroh2xSLe5dlKNXxTPyP9RzLtwcEf2JXZnE1tN4t1fE="; }; - cargoHash = "sha256-9TGuMmDwwc2J1iiFCZataZRRWu1VChPavveEGz7kulg="; + cargoHash = "sha256-hPQlDG2eFmiPXkCyjk10fpVDAbq3R8mQs7bOHbCBhwg="; doCheck = false; # there are no cli tests cargoBuildFlags = [ From f18f9892d1aa402b4c9f96f7f3a84d1b68e264b5 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 22 Mar 2026 22:51:43 -0700 Subject: [PATCH 50/51] python3Packages.aionanoleaf2: init at 1.0.2 --- .../python-modules/aionanoleaf2/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/aionanoleaf2/default.nix diff --git a/pkgs/development/python-modules/aionanoleaf2/default.nix b/pkgs/development/python-modules/aionanoleaf2/default.nix new file mode 100644 index 000000000000..eb61eb10fded --- /dev/null +++ b/pkgs/development/python-modules/aionanoleaf2/default.nix @@ -0,0 +1,37 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "aionanoleaf2"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "loebi-ch"; + repo = "aionanoleaf2"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Auh69JY07nnZKRUGPkaqo4DjZNeNkY8FIlsjch3JLu4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "aionanoleaf2" ]; + + meta = { + description = "Async Python package for the Nanoleaf API"; + homepage = "https://github.com/loebi-ch/aionanoleaf2"; + changelog = "https://github.com/loebi-ch/aionanoleaf2/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cba10e15a437..efe97fd95ad9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -414,6 +414,8 @@ self: super: with self; { aionanoleaf = callPackage ../development/python-modules/aionanoleaf { }; + aionanoleaf2 = callPackage ../development/python-modules/aionanoleaf2 { }; + aionotion = callPackage ../development/python-modules/aionotion { }; aiontfy = callPackage ../development/python-modules/aiontfy { }; From a1b092f75263ab6c10ffeb061d95c6c4f50737de Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 22 Mar 2026 22:52:55 -0700 Subject: [PATCH 51/51] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d5984440b7eb..a3365ee73819 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4090,7 +4090,8 @@ ]; "nanoleaf" = ps: with ps; [ - ]; # missing inputs: aionanoleaf2 + aionanoleaf2 + ]; "nasweb" = ps: with ps; [ webio-api @@ -7835,6 +7836,7 @@ "myuplink" "nam" "namecheapdns" + "nanoleaf" "nasweb" "neato" "nederlandse_spoorwegen"