From 46a87f1df968ec6625585a78514dac1f9173a907 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Mon, 27 Apr 2026 19:39:43 +0000 Subject: [PATCH 01/69] python3Packages.langsmith: 0.7.32 -> 0.7.37 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 14bdf2155b4b..8aa5bd54165e 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -32,14 +32,14 @@ buildPythonPackage (finalAttrs: { pname = "langsmith"; - version = "0.7.32"; + version = "0.7.37"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${finalAttrs.version}"; - hash = "sha256-OFsxQfEIQ0Z82MqWqn8U5kphSk2G89bEfyyXWF7nc84="; + hash = "sha256-E3bszn3w7MaNLVjpgSfEQEyzzqWQp056BjXIcY9YJCM="; }; sourceRoot = "${finalAttrs.src.name}/python"; From 986cb78f05538197ed0929c3bbcb9ffd427e9abe Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 28 Apr 2026 20:11:20 +0100 Subject: [PATCH 02/69] Reapply "lib/strings.concatLines: call concatStringsSep directly" But also handle empty lists. This effectively reapplies commit d7e6988c9b7bd7ada8662752ff654e4fde1a1426 which was reverted by commit 66f4e5d9886bb7da3055c4f7615f9d093acda60b. Co-authored-by: Eman Resu <78693624+quatquatt@users.noreply.github.com> --- lib/strings.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 848e61a65ddf..4c78c909b4be 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -337,7 +337,6 @@ rec { /** Concatenate a list of strings, adding a newline at the end of each one. - Defined as `concatMapStrings (s: s + "\n")`. # Inputs @@ -361,7 +360,7 @@ rec { ::: */ - concatLines = concatMapStrings (s: s + "\n"); + concatLines = lines: optionalString (lines != [ ]) (concatStringsSep "\n" lines + "\n"); /** Given string `s`, replace every occurrence of the string `from` with the string `to`. From c28707dd5b6c57b54317028f7adb98c870a915f3 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Mon, 4 May 2026 11:34:13 +0000 Subject: [PATCH 03/69] cli53: 0.8.22 -> 0.9.0 --- pkgs/by-name/cl/cli53/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cl/cli53/package.nix b/pkgs/by-name/cl/cli53/package.nix index fa58e37e73c6..f181f8d3e83b 100644 --- a/pkgs/by-name/cl/cli53/package.nix +++ b/pkgs/by-name/cl/cli53/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "cli53"; - version = "0.8.22"; + version = "0.9.0"; src = fetchFromGitHub { owner = "barnybug"; repo = "cli53"; - rev = finalAttrs.version; - sha256 = "sha256-wfb3lK/WB/B8gd4BOqh+Ol10cNZdsoCoQ+hM33+goM8="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-ojLqveOZ8IIJXNd6PdXbqWYcwXqAjjEpKiquqXwcZt8="; }; - vendorHash = "sha256-LKJXoXZS866UfJ+Edwf6AkAZmTV2Q1OI1mZfbsxHb3s="; + vendorHash = "sha256-OpBeuIyyFOliVtN1z9Ll9ji2qNS41NvZBjL7vJvRe6E="; ldflags = [ "-s" From c50248404d3812d1bca8232b5a32fd14fe338caa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 May 2026 10:57:05 +0000 Subject: [PATCH 04/69] pdf-oxide: 0.3.38 -> 0.3.43 --- pkgs/by-name/pd/pdf-oxide/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pd/pdf-oxide/package.nix b/pkgs/by-name/pd/pdf-oxide/package.nix index de648b91deb4..70cae989b2c4 100644 --- a/pkgs/by-name/pd/pdf-oxide/package.nix +++ b/pkgs/by-name/pd/pdf-oxide/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pdf-oxide"; - version = "0.3.38"; + version = "0.3.43"; src = fetchFromGitHub { owner = "yfedoseev"; repo = "pdf_oxide"; tag = "v${finalAttrs.version}"; - hash = "sha256-kvV8SzW+2vQ86o/c9vV71O9quqQ2LVvBBvTdTwAG5wY="; + hash = "sha256-pIB6x50yIBLsOlKdU9zjeS/71KR0vNc7tmu2QTEn4JA="; }; - cargoHash = "sha256-Z5nNxCrf2QEUA5XCXp5aG59UnznvdS9jjQb57R8gxHs="; + cargoHash = "sha256-3Wk5TYZDoCkzR+S186t39oMT9SfubmGXcDuucwIiaac="; __structuredAttrs = true; cargoBuildFlags = [ From 00148f722d6c0d912ae1398292ca5915d99be9b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 7 May 2026 09:57:13 -0400 Subject: [PATCH 05/69] spotify: (linux) 1.2.82.428.g0ac8be2b -> 1.2.84.475.ga1a748ff --- pkgs/by-name/sp/spotify/linux.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix index 84527870ec55..8fe795e4681c 100644 --- a/pkgs/by-name/sp/spotify/linux.nix +++ b/pkgs/by-name/sp/spotify/linux.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.82.428.g0ac8be2b"; + version = "1.2.84.475.ga1a748ff"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "92"; + rev = "93"; # fetch from snapcraft instead of the debian repository most repos fetch from. # That is a bit more cumbersome. But the debian repository only keeps the last @@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { name = "spotify-${finalAttrs.version}-${finalAttrs.rev}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${finalAttrs.rev}.snap"; - hash = "sha512-/9lB4gLotYvM2QkHt8cKS8P4IXrBVzgoXEk4bWR3GQum0OnJqK/qCC9evmCZ7PAqbbyh5/8vSblM+QXXXiQiMA=="; + hash = "sha512-X9IslXh1MHExJpBu45mXnIowdhmvkBko+fupk23WhKNoUPSR37jbj5Ee4V2ZYKxCtgyDgX8Px1YKynu3KEVUFg=="; }; nativeBuildInputs = [ From 19a404dbde3fe0fcb28f6469455f982d554d196f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 7 May 2026 10:04:37 -0400 Subject: [PATCH 06/69] spotify: (darwin) 1.2.84.476 -> 1.2.88.483 --- pkgs/by-name/sp/spotify/darwin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sp/spotify/darwin.nix b/pkgs/by-name/sp/spotify/darwin.nix index a44e694a70e2..91906e1f72d6 100644 --- a/pkgs/by-name/sp/spotify/darwin.nix +++ b/pkgs/by-name/sp/spotify/darwin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { inherit pname; - version = "1.2.84.476"; + version = "1.2.88.483"; src = # WARNING: This Wayback Machine URL redirects to the closest timestamp. @@ -20,13 +20,13 @@ stdenv.mkDerivation { # https://web.archive.org/web/*/https://download.scdn.co/Spotify.dmg if stdenv.hostPlatform.isAarch64 then (fetchurl { - url = "https://web.archive.org/web/20260228212834/https://download.scdn.co/SpotifyARM64.dmg"; - hash = "sha256-Zj5qATaW1QPTInC/Y/jZx2xq5eHG/OQixpj8DWUpEXY="; + url = "https://web.archive.org/web/20260501151114/https://download.scdn.co/SpotifyARM64.dmg"; + hash = "sha256-rBoJ5PKge4pr90FqYwsG+6JqyKvc3sKyPXM7OXXEmz8="; }) else (fetchurl { - url = "https://web.archive.org/web/20260228213541/https://download.scdn.co/Spotify.dmg"; - hash = "sha256-4Lm4g0gAQ3EA7Sj2wDTbjEXRxcNoGWHLvdEx/57nry4="; + url = "https://web.archive.org/web/20260501151019/https://download.scdn.co/Spotify.dmg"; + hash = "sha256-o/qDYnVhkrca2TBDoqxsKWq0QfDQyHdhU4llbmIGUBQ="; }); nativeBuildInputs = [ undmg ]; From 43e6dae8a0366f15bb9e0e925ece16941139120b Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 30 Apr 2026 06:19:17 +0800 Subject: [PATCH 07/69] python3Packages.plover-dict-commands: init at 0.2.5 --- .../plover-dict-commands/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/plover-dict-commands/default.nix diff --git a/pkgs/development/python-modules/plover-dict-commands/default.nix b/pkgs/development/python-modules/plover-dict-commands/default.nix new file mode 100644 index 000000000000..68e7f0492937 --- /dev/null +++ b/pkgs/development/python-modules/plover-dict-commands/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + plover, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-dict-commands"; + # See https://pypi.org/project/plover-dict-commands/ + # and https://github.com/KoiOates/plover_dict_commands/issues/4 + version = "0.2.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "KoiOates"; + repo = "plover_dict_commands"; + rev = "5dceddc0830fb5a72679d62995f27b2e49850998"; + hash = "sha256-PXsYMqJz8sxgloEtiwxxt6Eo0hyFp5oW0homIAYPz6A="; + }; + + postPatch = '' + # See https://github.com/KoiOates/plover_dict_commands/issues/4 + substituteInPlace setup.cfg \ + --replace-fail "version = 0.2.4" "version = 0.2.5" + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + plover + ]; + + pythonImportsCheck = [ + "plover_dict_commands" + ]; + + meta = { + description = "Plover plugin for enabling, disabling, and changing the priority of dictionaries"; + homepage = "https://github.com/KoiOates/plover_dict_commands"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 770ef1bcca24..6903928a725c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12668,6 +12668,8 @@ self: super: with self; { # https://github.com/opensteno/plover_plugins_registry/blob/master/unsupported.json plover = plover_4; + plover-dict-commands = callPackage ../development/python-modules/plover-dict-commands { }; + plover-stroke = callPackage ../development/python-modules/plover-stroke { }; plover_4 = callPackage ../development/python-modules/plover/4.nix { From e6eb178c41e1a278cc25d679fc670ab83b51133f Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 30 Apr 2026 08:40:13 +0800 Subject: [PATCH 08/69] python3Packages.plover-last-translation: init at 00.2 --- .../plover-last-translation/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/plover-last-translation/default.nix diff --git a/pkgs/development/python-modules/plover-last-translation/default.nix b/pkgs/development/python-modules/plover-last-translation/default.nix new file mode 100644 index 000000000000..7f7260565aac --- /dev/null +++ b/pkgs/development/python-modules/plover-last-translation/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + plover, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-last-translation"; + version = "0.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nsmarkop"; + repo = "plover_last_translation"; + tag = finalAttrs.version; + hash = "sha256-G6IvJ/xkayqFR4D3LTPJae2qxRnDpUI0yKTEbtRUxUg="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + plover + ]; + + pythonImportsCheck = [ + "plover_last_translation" + ]; + + meta = { + description = "Plugins for Plover to repeat output"; + homepage = "https://github.com/nsmarkop/plover_last_translation"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6903928a725c..880f045b9101 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12670,6 +12670,8 @@ self: super: with self; { plover-dict-commands = callPackage ../development/python-modules/plover-dict-commands { }; + plover-last-translation = callPackage ../development/python-modules/plover-last-translation { }; + plover-stroke = callPackage ../development/python-modules/plover-stroke { }; plover_4 = callPackage ../development/python-modules/plover/4.nix { From e0a26f0ad6f2646070f464974b327562769e0929 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 30 Apr 2026 08:50:00 +0800 Subject: [PATCH 09/69] python3Packages.plover-modal-dictionary: init at 0.0.3 --- .../plover-modal-dictionary/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/plover-modal-dictionary/default.nix diff --git a/pkgs/development/python-modules/plover-modal-dictionary/default.nix b/pkgs/development/python-modules/plover-modal-dictionary/default.nix new file mode 100644 index 000000000000..78aa6ba8f4b2 --- /dev/null +++ b/pkgs/development/python-modules/plover-modal-dictionary/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + plover, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-modal-dictionary"; + # See https://pypi.org/project/plover-modal-dictionary/#history + # and https://github.com/Kaoffie/plover_modal_dictionary/issues/3 + version = "0.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Kaoffie"; + repo = "plover_modal_dictionary"; + rev = "086f9784377454ace45c333d21ea8ca2666b0a06"; + hash = "sha256-d5BYkjeGXfoYQibjr5wQFUmXU69dNrewkJ/Gi4c9eEI="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + plover + ]; + + pythonImportsCheck = [ + "plover_modal_dictionary" + ]; + + meta = { + description = "Modal Dictionaries for Plover"; + homepage = "https://github.com/Kaoffie/plover_modal_dictionary"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 880f045b9101..b6a4203f611b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12672,6 +12672,8 @@ self: super: with self; { plover-last-translation = callPackage ../development/python-modules/plover-last-translation { }; + plover-modal-dictionary = callPackage ../development/python-modules/plover-modal-dictionary { }; + plover-stroke = callPackage ../development/python-modules/plover-stroke { }; plover_4 = callPackage ../development/python-modules/plover/4.nix { From 6174a6280b758cdcf0def35d149c7dfa997e749d Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 30 Apr 2026 09:06:44 +0800 Subject: [PATCH 10/69] python3Packages.plover-python-dictionary: init at 1.2.1 --- .../plover-python-dictionary/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/plover-python-dictionary/default.nix diff --git a/pkgs/development/python-modules/plover-python-dictionary/default.nix b/pkgs/development/python-modules/plover-python-dictionary/default.nix new file mode 100644 index 000000000000..e453c61273ef --- /dev/null +++ b/pkgs/development/python-modules/plover-python-dictionary/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + pytestCheckHook, + plover, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-python-dictionary"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "opensteno"; + repo = "plover_python_dictionary"; + tag = finalAttrs.version; + hash = "sha256-4li8WjriJdeLbu+JANuVOb9ejBGusHBm+AaLxyy91A0="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + plover + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "plover_python_dictionary" + ]; + + meta = { + description = "Python dictionaries support for Plover"; + homepage = "https://github.com/opensteno/plover_python_dictionary"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6a4203f611b..32dfd8d1d5c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12674,6 +12674,8 @@ self: super: with self; { plover-modal-dictionary = callPackage ../development/python-modules/plover-modal-dictionary { }; + plover-python-dictionary = callPackage ../development/python-modules/plover-python-dictionary { }; + plover-stroke = callPackage ../development/python-modules/plover-stroke { }; plover_4 = callPackage ../development/python-modules/plover/4.nix { From 2fcae69cac2cc6a4b0712f42d280c211985c9ac3 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 5 May 2026 15:32:36 +0800 Subject: [PATCH 11/69] python3Packages.plover-stiching: init at 0.1.0 --- .../plover-stitching/default.nix | 53 +++++++++++++++++++ ...est-blackbox_modernise_and_fix_build.patch | 31 +++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 86 insertions(+) create mode 100644 pkgs/development/python-modules/plover-stitching/default.nix create mode 100644 pkgs/development/python-modules/plover-stitching/plover_stitching_pr-1_test-blackbox_modernise_and_fix_build.patch diff --git a/pkgs/development/python-modules/plover-stitching/default.nix b/pkgs/development/python-modules/plover-stitching/default.nix new file mode 100644 index 000000000000..177dc5e88c4f --- /dev/null +++ b/pkgs/development/python-modules/plover-stitching/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + plover, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-stitching"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "panathea"; + repo = "plover_stitching"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Md3LIQ73CAJlA91hfVdZZp9RJElINHYfiFFBBOYrIgs="; + }; + + patches = [ + # Make plover-stitching's blackbox test use the current blackbox_test from Plover. + # https://github.com/panathea/plover_stitching/pull/1 + ./plover_stitching_pr-1_test-blackbox_modernise_and_fix_build.patch + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + plover + ]; + + pythonImportsCheck = [ + "plover_stitching" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "S-t-i-t-c-h-i-n-g support for Plover"; + homepage = "https://github.com/panathea/plover_stitching"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/development/python-modules/plover-stitching/plover_stitching_pr-1_test-blackbox_modernise_and_fix_build.patch b/pkgs/development/python-modules/plover-stitching/plover_stitching_pr-1_test-blackbox_modernise_and_fix_build.patch new file mode 100644 index 000000000000..4b8f843521c9 --- /dev/null +++ b/pkgs/development/python-modules/plover-stitching/plover_stitching_pr-1_test-blackbox_modernise_and_fix_build.patch @@ -0,0 +1,31 @@ +From 2751875916f23d42c81602d082fa2fd06a396fb1 Mon Sep 17 00:00:00 2001 +From: Yueh-Shun Li +Date: Tue, 5 May 2026 16:34:28 +0800 +Subject: [PATCH] test_blackbox: modernize to fix build + +Use `@blackbox_test` (decorator) from `plover_build_utils.testing` +instead of the historical `BlackboxTester`. +--- + test/test_blackbox.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/test/test_blackbox.py b/test/test_blackbox.py +index 71eb6d0676e39e4e916b04ae9cc290dff3de9e02..e746705fe21174ac05ee3c6087f9a19171f68189 100644 +--- a/test/test_blackbox.py ++++ b/test/test_blackbox.py +@@ -1,12 +1,12 @@ +-from plover_build_utils.testing import BlackboxTester ++from plover_build_utils.testing import blackbox_test + from plover.registry import registry + from plover import system + +-class TestsBlackbox(BlackboxTester): ++@blackbox_test ++class TestsBlackbox: + + @classmethod + def setup_class(cls): +- super().setup_class() + registry.update() + system.setup('English Stenotype') + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32dfd8d1d5c0..a9bee2be040e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12676,6 +12676,8 @@ self: super: with self; { plover-python-dictionary = callPackage ../development/python-modules/plover-python-dictionary { }; + plover-stitching = callPackage ../development/python-modules/plover-stitching { }; + plover-stroke = callPackage ../development/python-modules/plover-stroke { }; plover_4 = callPackage ../development/python-modules/plover/4.nix { From d47f39df07dbfdc8d350e79b20a431df9ab3a239 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 5 May 2026 17:12:35 +0800 Subject: [PATCH 12/69] plover-lapwing-aio: init at 1.5.0 --- .../plover-lapwing-aio/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/plover-lapwing-aio/default.nix diff --git a/pkgs/development/python-modules/plover-lapwing-aio/default.nix b/pkgs/development/python-modules/plover-lapwing-aio/default.nix new file mode 100644 index 000000000000..b181da5723ce --- /dev/null +++ b/pkgs/development/python-modules/plover-lapwing-aio/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + plover-dict-commands, + plover-last-translation, + plover-modal-dictionary, + plover-python-dictionary, + plover-stitching, +}: + +buildPythonPackage (finalAttrs: { + pname = "plover-lapwing-aio"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aerickt"; + repo = "plover-lapwing-aio"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+zXsbXwOtnj3feWdBujIYs7MdbB7VV3VWyio8CeJtB4="; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "setuptools<77" "setuptools" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + plover-dict-commands + plover-last-translation + plover-modal-dictionary + plover-python-dictionary + plover-stitching + ]; + + pythonImportsCheck = [ + "plover_lapwing" + ]; + + meta = { + description = "Plover plugin to automatically install Lapwing dictionaries, dependent plugins, extra dictionaries, and fix the number key behaviour"; + homepage = "https://github.com/aerickt/plover-lapwing-aio"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + pandapip1 + ShamrockLee + ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9bee2be040e..7adccd279d6d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12670,6 +12670,8 @@ self: super: with self; { plover-dict-commands = callPackage ../development/python-modules/plover-dict-commands { }; + plover-lapwing-aio = callPackage ../development/python-modules/plover-lapwing-aio { }; + plover-last-translation = callPackage ../development/python-modules/plover-last-translation { }; plover-modal-dictionary = callPackage ../development/python-modules/plover-modal-dictionary { }; From 506906e470fe10b2640511625e209d70cf711d5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 May 2026 07:35:52 +0000 Subject: [PATCH 13/69] python3Packages.netbox-routing: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/netbox-routing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netbox-routing/default.nix b/pkgs/development/python-modules/netbox-routing/default.nix index 124dcb064116..f77ef60c6fd5 100644 --- a/pkgs/development/python-modules/netbox-routing/default.nix +++ b/pkgs/development/python-modules/netbox-routing/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "netbox-routing"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; src = fetchFromGitHub { owner = "DanSheps"; repo = "netbox-routing"; tag = "v${version}"; - hash = "sha256-POnxnLES4Jub4u8pvpehMo0KfOCyAPGH83cRFRPgfOc="; + hash = "sha256-3biANhaAi3uRtaXnAw4i6nWnHkARkkBVqyBHLXIMOdA="; }; build-system = [ setuptools ]; From 92f7590b6f66ddd9b2a12dd882fb300e7d34122e Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Fri, 8 May 2026 15:31:49 +0200 Subject: [PATCH 14/69] librewolf-bin-unwrapped: 150.0.1-1 -> 150.0.2-1 diff: https://codeberg.org/librewolf/source/compare/150.0.1-1...150.0.2-1 mfsa: https://codeberg.org/librewolf/source/compare/150.0.1-1...150.0.2-1 --- pkgs/by-name/li/librewolf-bin-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix index 87ef1fab2d52..475f68df53f1 100644 --- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix @@ -36,7 +36,7 @@ let pname = "librewolf-bin-unwrapped"; - version = "150.0.1-1"; + version = "150.0.2-1"; in stdenv.mkDerivation { @@ -46,8 +46,8 @@ stdenv.mkDerivation { url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz"; hash = { - x86_64-linux = "sha256-yIZGbTTelMerlFZ2oISCHtK/C62KjGnWd6agO4H+pbo="; - aarch64-linux = "sha256-hEAH1/I40f/fjUtODJc6kMuUhr4Xj+TyEvn0TOPSYMc="; + x86_64-linux = "sha256-KMpSMcLJ/wkySo2gbiECJfH2/hcxdTSLXwKcZLMkvhk="; + aarch64-linux = "sha256-Dxs7eRN6nj3e/6pQ3z0d27tnTtD6CefhUxPZGwTVL+Y="; } .${stdenv.hostPlatform.system} or throwSystem; }; From c1c00aed43dd92e558a524a1c1125e04d2733df3 Mon Sep 17 00:00:00 2001 From: Harinn Date: Fri, 8 May 2026 21:17:15 +0700 Subject: [PATCH 15/69] lifelines: fix autoreconf failure from missing m4 dir --- pkgs/by-name/li/lifelines/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/lifelines/package.nix b/pkgs/by-name/li/lifelines/package.nix index 8d123c865b2a..a6d2d2a92935 100644 --- a/pkgs/by-name/li/lifelines/package.nix +++ b/pkgs/by-name/li/lifelines/package.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation { bison ]; + postPatch = '' + mkdir -p m4 + ''; + meta = { description = "Genealogy tool with ncurses interface"; homepage = "https://lifelines.github.io/lifelines/"; From e50772d7e3326e0e03952243633c18b71ca12cc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 May 2026 14:43:32 +0000 Subject: [PATCH 16/69] fastly: 14.3.1 -> 15.0.0 --- pkgs/by-name/fa/fastly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix index 0584155bdc01..e88656ca3a8b 100644 --- a/pkgs/by-name/fa/fastly/package.nix +++ b/pkgs/by-name/fa/fastly/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "fastly"; - version = "14.3.1"; + version = "15.0.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-8RdJNGI8FzM2HVkJNbWqr2Cw+CkPUTZ7uiiLQVEKTGM="; + hash = "sha256-ZSUT0f3U6tmJLtSdpTorAYxJExdR+zVan+Gua3BIcDM="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { "cmd/fastly" ]; - vendorHash = "sha256-XzfsPSG0gEXhlAF9O3VGNn8FGXlvXFxqX7kffQDdsRA="; + vendorHash = "sha256-J0UvU/rXUpxJEn/p+ScO8omFwHY2JD3kq7zGes0ohQ8="; nativeBuildInputs = [ installShellFiles From bfb59334d051ae7c497b2f42771b616cb4d6667f Mon Sep 17 00:00:00 2001 From: Harinn Date: Fri, 8 May 2026 21:45:20 +0700 Subject: [PATCH 17/69] kty: use system oniguruma to fix build --- pkgs/by-name/kt/kty/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/kt/kty/package.nix b/pkgs/by-name/kt/kty/package.nix index 24ab1c88550c..80503f3a7eed 100644 --- a/pkgs/by-name/kt/kty/package.nix +++ b/pkgs/by-name/kt/kty/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pkg-config, openssl, + oniguruma, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -23,10 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: { env = { OPENSSL_NO_VENDOR = 1; + RUSTONIG_SYSTEM_LIBONIG = 1; }; buildInputs = [ openssl + oniguruma ]; cargoHash = "sha256-nJ+nof2YhyLrNuLVy69kYj5tw+aG4IJm6nVxHkczbko="; From 6a97bf0f3622ce46c966f1030a746f14dc782599 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Fri, 8 May 2026 09:05:55 -0700 Subject: [PATCH 18/69] brave: 1.89.145 -> 1.90.121 Release notes: https://community.brave.app/t/release-channel-1-90-121/652672 --- pkgs/by-name/br/brave/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 32aacb29cfd9..f4f178f44786 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.89.145"; + version = "1.90.121"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-WcLCmhbALtVHL4LEPCUyLfRZR30kdc/41pfHxvE0rJQ="; + hash = "sha256-y4wAvJdghCfKF61EQoZHaZ28qmX2/DTmBhISRj+m8EM="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-t7OXN+42gXd/b9fE8sd40aH2l/nW2OvtLvHCqb7/1qI="; + hash = "sha256-XOTxy6+P6abDZtE9UlxSVX/eEDfNFrudC/q+9+gE3s4="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-A5SGxb+r0wEbdo7ZkUrwm6zVr86+vpOvtfBpZivmNoE="; + hash = "sha256-WI5QIym3rMC8z+CcsLG+K4qgEaRiNzIOO7a7Vf45r1M="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-kTk6BeKuGkteKlGBk2b5ftDeo9F+EaWwk4DoEzlfJGw="; + hash = "sha256-a3GJeQ6InfTz3a4jtdOcNfP37MqLsjnuIJo3M451NKc="; }; }; From 3559bcc40a089130bb8c80635f86c5bef5e31c5f Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 8 May 2026 09:59:13 -0700 Subject: [PATCH 19/69] home-assistant-custom-lovelace-modules.navbar-card: use finalAttrs, add update script, support aarch64-linux - Switch to `finalAttrs` so the node_modules FOD is a subpackage that `nix-update --subpackage node_modules` can update. - Drop `outputHashAlgo`; the SRI `outputHash` already specifies it. - Pass `--omit=optional` to `bun install` to skip the platform-specific optional binaries (`@biomejs/cli-linux-*` etc). A single `outputHash` literal then covers both x86_64-linux and aarch64-linux, replacing the per-system attrset that `nix-update` couldn't fully maintain. - Set `NODE_ENV=production` for the bundle build to match upstream. --- .../navbar-card/package.nix | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix index 59facd75fa96..58f41b53f83d 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix @@ -4,24 +4,24 @@ fetchFromGitHub, bun, nodejs-slim, + nix-update-script, writableTmpDirAsHomeHook, }: -let +stdenv.mkDerivation (finalAttrs: { pname = "navbar-card"; version = "1.6.0"; src = fetchFromGitHub { owner = "joseluis9595"; repo = "lovelace-navbar-card"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ngKsH83nrDglRQBdQhJzMC8/TRV+uL21vi2ovsLEPuY="; }; - # Create node_modules as a separate derivation node_modules = stdenv.mkDerivation { - pname = "${pname}-node_modules"; - inherit version src; + pname = "${finalAttrs.pname}-node_modules"; + inherit (finalAttrs) version src; nativeBuildInputs = [ bun @@ -40,6 +40,7 @@ let --frozen-lockfile \ --ignore-scripts \ --no-progress \ + --omit=optional \ --production runHook postBuild @@ -57,15 +58,10 @@ let # Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-F8nNDBl/BYhtwggaZd61oibYE4j5u7WPVjLG8P4UEcc="; - outputHashAlgo = "sha256"; + outputHash = "sha256-By1ZTJ+cZO+vhs0BL8HSu36k+dvG0WPRnuUwIoaclnw="; outputHashMode = "recursive"; }; -in -stdenv.mkDerivation { - inherit pname version src; - nativeBuildInputs = [ bun nodejs-slim @@ -75,7 +71,7 @@ stdenv.mkDerivation { runHook preConfigure # Copy node_modules from the separate derivation - cp -R ${node_modules}/node_modules . + cp -R ${finalAttrs.node_modules}/node_modules . runHook postConfigure ''; @@ -84,7 +80,7 @@ stdenv.mkDerivation { runHook preBuild # Build the project using bun - bun build src/navbar-card.ts --outfile=dist/navbar-card.js --target=browser + NODE_ENV=production bun build src/navbar-card.ts --outfile=dist/navbar-card.js --target=browser runHook postBuild ''; @@ -98,13 +94,25 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.entrypoint = "navbar-card.js"; + passthru = { + entrypoint = "navbar-card.js"; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "node_modules" + ]; + }; + }; meta = { description = "Navbar Card for Home Assistant's Lovelace UI - easily navigate through dashboards"; homepage = "https://github.com/joseluis9595/lovelace-navbar-card"; - changelog = "https://github.com/joseluis9595/lovelace-navbar-card/releases/tag/v${version}"; + changelog = "https://github.com/joseluis9595/lovelace-navbar-card/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; maintainers = [ lib.maintainers.jamiemagee ]; }; -} +}) From c4e699b29282dc1ecac8d1d7db70e281da5a1fe0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 May 2026 20:19:54 +0000 Subject: [PATCH 20/69] wasmtime: 44.0.0 -> 44.0.1 --- pkgs/by-name/wa/wasmtime/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index 05d4a99d0756..00547218c2e9 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -13,20 +13,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wasmtime"; - version = "44.0.0"; + version = "44.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasmtime"; tag = "v${finalAttrs.version}"; - hash = "sha256-RdEKYfBvtXxy6l4PLL+ii95qkghQfUkFHjG3XfEuM1c="; + hash = "sha256-nVE18URbDKIrZr7ImPf2Zx5Ftq/oT2mZU0CMuBh+EYE="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-OS5ZeCNks4NuN8KVuUEjuB2ZHZjfB0U0n77p3PmDC4g="; + cargoHash = "sha256-K2Y6atvbvqIuc7Upk4134fZW1y329DlG2gzm8VveyWA="; cargoBuildFlags = [ "--package" "wasmtime-cli" From 30b6d6393a531a786ee17c31b72a77ec594527d7 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Fri, 8 May 2026 21:18:57 -0700 Subject: [PATCH 21/69] creduce: fix build with gcc15 --- .../tools/misc/creduce/default.nix | 5 ++ .../tools/misc/creduce/fix-gcc15.patch | 53 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/tools/misc/creduce/fix-gcc15.patch diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 23d88f07cdcb..731e5b457099 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation { hash = "sha256-RbxFqZegsCxnUaIIA5OfTzx1wflCPeF+enQt90VwMgA="; }; + patches = [ + # https://github.com/csmith-project/creduce/pull/290 + ./fix-gcc15.patch + ]; + postPatch = '' substituteInPlace {clex,clang_delta,delta,unifdef,creduce,.}/CMakeLists.txt --replace-fail \ "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)" diff --git a/pkgs/development/tools/misc/creduce/fix-gcc15.patch b/pkgs/development/tools/misc/creduce/fix-gcc15.patch new file mode 100644 index 000000000000..42bd32aae05d --- /dev/null +++ b/pkgs/development/tools/misc/creduce/fix-gcc15.patch @@ -0,0 +1,53 @@ +From 1c715fef9113d5a5291694eab739d4a743ab08d5 Mon Sep 17 00:00:00 2001 +From: Bradley Walters +Date: Fri, 2 Jan 2026 22:02:30 -0800 +Subject: [PATCH] unifdef: constexpr is reserved in C23 + +--- + unifdef/unifdef.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/unifdef/unifdef.c b/unifdef/unifdef.c +index 5c67cd44..692a1640 100644 +--- a/unifdef/unifdef.c ++++ b/unifdef/unifdef.c +@@ -201,7 +201,7 @@ static int depth; /* current #if nesting */ + static int delcount; /* count of deleted lines */ + static unsigned blankcount; /* count of blank lines */ + static unsigned blankmax; /* maximum recent blankcount */ +-static bool constexpr; /* constant #if expression */ ++static bool isconstexpr; /* constant #if expression */ + static bool zerosyms; /* to format symdepth output */ + static bool firstsym; /* ditto */ + +@@ -1078,7 +1078,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) + *valp = (value[sym] != NULL); + lt = *valp ? LT_TRUE : LT_FALSE; + } +- constexpr = false; ++ isconstexpr = false; + } else if (!endsym(*cp)) { + debug("eval%d symbol", prec(ops)); + sym = findsym(&cp); +@@ -1095,7 +1095,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) + lt = *valp ? LT_TRUE : LT_FALSE; + cp = skipargs(cp); + } +- constexpr = false; ++ isconstexpr = false; + } else { + debug("eval%d bad expr", prec(ops)); + return (LT_ERROR); +@@ -1162,10 +1162,10 @@ ifeval(const char **cpp) + long val = 0; + + debug("eval %s", *cpp); +- constexpr = killconsts ? false : true; ++ isconstexpr = killconsts ? false : true; + ret = eval_table(eval_ops, &val, cpp); + debug("eval = %d", val); +- return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); ++ return (isconstexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); + } + + /* From 3e46802cf57d51836fcd039c4987f0e5cd7f9065 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Fri, 8 May 2026 21:25:19 -0700 Subject: [PATCH 22/69] creduce: migrate to by-name --- .../misc => by-name/cr}/creduce/fix-gcc15.patch | 0 .../default.nix => by-name/cr/creduce/package.nix} | 12 +++++++----- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 7 insertions(+), 9 deletions(-) rename pkgs/{development/tools/misc => by-name/cr}/creduce/fix-gcc15.patch (100%) rename pkgs/{development/tools/misc/creduce/default.nix => by-name/cr/creduce/package.nix} (94%) diff --git a/pkgs/development/tools/misc/creduce/fix-gcc15.patch b/pkgs/by-name/cr/creduce/fix-gcc15.patch similarity index 100% rename from pkgs/development/tools/misc/creduce/fix-gcc15.patch rename to pkgs/by-name/cr/creduce/fix-gcc15.patch diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/by-name/cr/creduce/package.nix similarity index 94% rename from pkgs/development/tools/misc/creduce/default.nix rename to pkgs/by-name/cr/creduce/package.nix index 731e5b457099..03f135937da5 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/by-name/cr/creduce/package.nix @@ -4,13 +4,15 @@ fetchFromGitHub, cmake, makeWrapper, - llvm, - libclang, + llvmPackages_18, flex, zlib, perlPackages, util-linux, }: +let + llvmPackages = llvmPackages_18; +in stdenv.mkDerivation { pname = "creduce"; @@ -44,14 +46,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake makeWrapper - llvm.dev + llvmPackages.llvm.dev ]; buildInputs = [ # Ensure stdenv's CC is on PATH before clang-unwrapped stdenv.cc # Actual deps: - llvm - libclang + llvmPackages.llvm + llvmPackages.libclang flex zlib ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 001ee576682d..1a3c94cfb214 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5542,10 +5542,6 @@ with pkgs; credstash = with python3Packages; toPythonApplication credstash; - creduce = callPackage ../development/tools/misc/creduce { - inherit (llvmPackages_18) llvm libclang; - }; - css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify; cvise = python3Packages.callPackage ../development/tools/misc/cvise { From 24cd0d2de994e0193ac41cad05fee15898f6ec4c Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Fri, 8 May 2026 21:41:29 -0700 Subject: [PATCH 23/69] cgui: fix build with gcc15 --- pkgs/by-name/cg/cgui/fix-gcc15.patch | 15 +++++++++++++++ pkgs/by-name/cg/cgui/package.nix | 4 ++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/by-name/cg/cgui/fix-gcc15.patch diff --git a/pkgs/by-name/cg/cgui/fix-gcc15.patch b/pkgs/by-name/cg/cgui/fix-gcc15.patch new file mode 100644 index 000000000000..653fd269d2f6 --- /dev/null +++ b/pkgs/by-name/cg/cgui/fix-gcc15.patch @@ -0,0 +1,15 @@ +diff --git a/examples/25viewer.c b/examples/25viewer.c +index 37e4585..a0328f0 100644 +--- a/examples/25viewer.c ++++ b/examples/25viewer.c +@@ -10,8 +10,9 @@ + + static const char *fname; /* stores name of file to open */ + +-void quit() ++void quit(void *data) + { ++ (void)data; + exit(0); + } + diff --git a/pkgs/by-name/cg/cgui/package.nix b/pkgs/by-name/cg/cgui/package.nix index 9f510370b3ca..abd0c6eaa952 100644 --- a/pkgs/by-name/cg/cgui/package.nix +++ b/pkgs/by-name/cg/cgui/package.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s"; }; + patches = [ + ./fix-gcc15.patch + ]; + buildInputs = [ texinfo allegro From c6341617c8272655e9a9686298111927e5119d62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 May 2026 05:58:12 +0000 Subject: [PATCH 24/69] mdwatch: 0.1.24 -> 0.2.0 --- pkgs/by-name/md/mdwatch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdwatch/package.nix b/pkgs/by-name/md/mdwatch/package.nix index c5ea64b36b84..8a95807213b5 100644 --- a/pkgs/by-name/md/mdwatch/package.nix +++ b/pkgs/by-name/md/mdwatch/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdwatch"; - version = "0.1.24"; + version = "0.2.0"; src = fetchFromGitHub { owner = "vimlinuz"; repo = "mdwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-dQMGVqCR8DEgKf1G0HG7eCydNju4OBaQ9UMgDD5hdvI="; + hash = "sha256-snmyfhOkCTnRsBcKcTTij5caA2NmSA1Csp3+D6BJcw4="; }; - cargoHash = "sha256-5HIc0h042gP4mGr4Yp6ej0fkwNW2SDEzlwITgLF2/7I="; + cargoHash = "sha256-CAXHIOC0K062zXNnAD1IW2Sb5Mnpc91A1Lamhc3+NLQ="; passthru.updateScript = nix-update-script { }; From 6d7ba26b22b2892b7631f3e837becdae103136d9 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 9 May 2026 15:28:28 +0700 Subject: [PATCH 25/69] d-seams: fix missing cstdint include --- pkgs/by-name/d-/d-seams/cxxopts-cstdint.patch | 11 +++++++++++ pkgs/by-name/d-/d-seams/package.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/by-name/d-/d-seams/cxxopts-cstdint.patch diff --git a/pkgs/by-name/d-/d-seams/cxxopts-cstdint.patch b/pkgs/by-name/d-/d-seams/cxxopts-cstdint.patch new file mode 100644 index 000000000000..0ffb08bfab16 --- /dev/null +++ b/pkgs/by-name/d-/d-seams/cxxopts-cstdint.patch @@ -0,0 +1,11 @@ +diff --git a/src/include/external/cxxopts.hpp b/src/include/external/cxxopts.hpp +--- a/src/include/external/cxxopts.hpp ++++ b/src/include/external/cxxopts.hpp +@@ -26,6 +26,7 @@ THE SOFTWARE. + #define CXXOPTS_HPP_INCLUDED + + #include ++#include + #include + #include + #include diff --git a/pkgs/by-name/d-/d-seams/package.nix b/pkgs/by-name/d-/d-seams/package.nix index fdb927462723..7c325f0571f2 100644 --- a/pkgs/by-name/d-/d-seams/package.nix +++ b/pkgs/by-name/d-/d-seams/package.nix @@ -36,6 +36,8 @@ clangStdenv.mkDerivation rec { url = "https://github.com/d-SEAMS/seams-core/commit/f6156057e43d0aa1a0df9de67d8859da9c30302d.patch"; hash = "sha256-PLbT1lqdw+69lIHH96MPcGRjfIeZyb88vc875QLYyqw="; }) + # Add missing include for uint8_t in vendored cxxopts. + ./cxxopts-cstdint.patch ]; postPatch = '' substituteInPlace CMakeLists.txt \ From dfc48a3572339daf5564db908ba73d9793038b90 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 9 May 2026 15:41:45 +0700 Subject: [PATCH 26/69] dictu: fix build with gcc 15 --- pkgs/by-name/di/dictu/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/di/dictu/package.nix b/pkgs/by-name/di/dictu/package.nix index b8b99593affc..96758a7d0802 100644 --- a/pkgs/by-name/di/dictu/package.nix +++ b/pkgs/by-name/di/dictu/package.nix @@ -42,6 +42,9 @@ stdenv.mkDerivation (finalAttrs: { -e 's/-flto/${lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"}/' ''; + # bcrypt magic value triggers gcc 15 -Wunterminated-string-initialization. + env.NIX_CFLAGS_COMPILE = "-Wno-error=unterminated-string-initialization"; + cmakeFlags = [ "-DBUILD_CLI=${if cliSupport then "ON" else "OFF"}" "-DDISABLE_HTTP=${if httpSupport then "OFF" else "ON"}" From 77b566aaa181bf05f6bb0932624369c6ed99c6d5 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 9 May 2026 17:03:38 +0700 Subject: [PATCH 27/69] eresi: fix build with gcc 15 --- pkgs/by-name/er/eresi/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/er/eresi/package.nix b/pkgs/by-name/er/eresi/package.nix index 97b7e50c295e..d1b8470c2d45 100644 --- a/pkgs/by-name/er/eresi/package.nix +++ b/pkgs/by-name/er/eresi/package.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # K&R-style function-pointer declarations break under gcc 15's C23 default. + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + postPatch = '' # Two occurences of fprintf() with only two arguments, which should really # be fputs(). From a7c31c90054fd5be7693a88d40b10824f9480dd3 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 27 Apr 2026 18:16:55 +0300 Subject: [PATCH 28/69] svelte-language-server: migrate from fetcherVersion = 2 to fetcherVersion = 3 --- pkgs/by-name/sv/svelte-language-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index b7122901b341..533851c95ed9 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; - fetcherVersion = 2; - hash = "sha256-v2X2WOEdrDwGO2q9IEjONpHeDFqVp3jGFYYjZ5uFLSE="; + fetcherVersion = 3; + hash = "sha256-x0yIANla1KURJ4fgxAe9WUJl/sPAsUcARubTJQ5uEpQ="; }; nativeBuildInputs = [ From 9d0aeef14adc91750ebb477d1e05ffe09375766a Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 27 Apr 2026 18:16:56 +0300 Subject: [PATCH 29/69] typespec: migrate from fetcherVersion = 2 to fetcherVersion = 3 --- pkgs/by-name/ty/typespec/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix index 87fab88b53a6..8ebb5226dd57 100644 --- a/pkgs/by-name/ty/typespec/package.nix +++ b/pkgs/by-name/ty/typespec/package.nix @@ -41,8 +41,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmWorkspaces postPatch ; - fetcherVersion = 2; - hash = "sha256-ztig1B10cQQy+4XKZjwwlCxGenwcU+C28TfTWHqZ59Y="; + fetcherVersion = 3; + hash = "sha256-wZvnRSALrupyhpSN8zNL3b6SZnVPXX3BdHrbzHUNtUg="; }; postPatch = '' From d1572af9185c1228f73eaeec80553649948edbc7 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 27 Apr 2026 18:16:56 +0300 Subject: [PATCH 30/69] vesktop: migrate from fetcherVersion = 2 to fetcherVersion = 3 --- pkgs/by-name/ve/vesktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index bed9156bf587..857054812c2a 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { patches ; pnpm = pnpm_10_29_2; - fetcherVersion = 2; - hash = "sha256-o9dxtqXfCKTQpvNrbD/h0F3Hh39TEEA1qqYA9tN3j5I="; + fetcherVersion = 3; + hash = "sha256-Ue1K1KmRi4gF7E519deVY7QH+22dqlECMjdA7Z7qDCA="; }; nativeBuildInputs = [ From 034a300b678a08298fddeb1b53d7ee900e9b5b58 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 27 Apr 2026 18:16:56 +0300 Subject: [PATCH 31/69] voicevox: migrate from fetcherVersion = 2 to fetcherVersion = 3 --- pkgs/by-name/vo/voicevox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix index 0bcb9ed27ba0..e40181d50996 100644 --- a/pkgs/by-name/vo/voicevox/package.nix +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -67,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: { moreutils ]; - fetcherVersion = 2; - hash = "sha256-U1hW6j1WRyuh2rUgMxwF8LCRk7wgSlV6cqapBoXvAdU="; + fetcherVersion = 3; + hash = "sha256-0Z/C4x4ZDPC+3o5i6KJgFqmAhHk9CUhoPB9+6yyLtdE="; }; nativeBuildInputs = [ From cd681925a9041e457104d26f688d1dc2533d03dc Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 27 Apr 2026 18:16:57 +0300 Subject: [PATCH 32/69] woodpecker-webui: migrate from fetcherVersion = 2 to fetcherVersion = 3 --- .../tools/continuous-integration/woodpecker/common.nix | 2 +- .../tools/continuous-integration/woodpecker/webui.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index a62f97f5dffc..66ececb749ba 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -2,7 +2,7 @@ let version = "3.14.0"; vendorHash = "sha256-fibx+Ky2cfP71tPzeiDybx+0f/+XvZbDXC7PAWQMRIY="; - nodeModulesHash = "sha256-8QhWOlEWkRPZA3uktm2hDSon+UCPPGznvn/4cXqyvTY="; + nodeModulesHash = "sha256-wQUOUB5uhWbdEP1nP02ihRZf3F1sEvQeZTDxOa5P1lQ="; in { inherit version vendorHash nodeModulesHash; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix index 65dd8518fe04..31197106a149 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; sourceRoot = "${common.src.name}/web"; - fetcherVersion = 2; + fetcherVersion = 3; hash = common.nodeModulesHash; }; From 6556f2e9dc8378ede044c4dfacc69a5674f41e44 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 27 Apr 2026 18:16:57 +0300 Subject: [PATCH 33/69] yt-dlp-ejs: migrate from fetcherVersion = 2 to fetcherVersion = 3 --- pkgs/development/python-modules/yt-dlp-ejs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yt-dlp-ejs/default.nix b/pkgs/development/python-modules/yt-dlp-ejs/default.nix index fb9f12c163cd..4157f6d99236 100644 --- a/pkgs/development/python-modules/yt-dlp-ejs/default.nix +++ b/pkgs/development/python-modules/yt-dlp-ejs/default.nix @@ -28,8 +28,8 @@ buildPythonPackage rec { version src ; - fetcherVersion = 2; - hash = "sha256-3hhwKUzfdlKmth4uRlfBSdxEOIfhAVaq2PZIOHWGWiM="; + fetcherVersion = 3; + hash = "sha256-4qMOAl9Dbe1oYSRIeP7oPcV/+P8NLdIYvSNxaz0h+Z0="; }; build-system = [ From 6ab6ef542f403711636d11faf4b6819fcfbb04a2 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 27 Apr 2026 18:16:57 +0300 Subject: [PATCH 34/69] zipline: migrate from fetcherVersion = 2 to fetcherVersion = 3 --- pkgs/by-name/zi/zipline/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index 943eece50309..5707257e3e81 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -53,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm'; - fetcherVersion = 2; - hash = "sha256-eoZi4JMN9PiiRRd/z/HjqSHX9ta33cL4+d1GMGxJ33U="; + fetcherVersion = 3; + hash = "sha256-QnKYtSBiTFnBmzVRJ8wZsKDzi99Y4039N9fsJmJkDYc="; }; buildInputs = [ From eecd15125356deec9a8ebd0fe1ec9b45be7a3db9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 May 2026 11:25:18 +0000 Subject: [PATCH 35/69] dashy-ui: 4.0.5 -> 4.0.7 --- pkgs/by-name/da/dashy-ui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix index c3bfe85af7cf..206dc5016818 100644 --- a/pkgs/by-name/da/dashy-ui/package.nix +++ b/pkgs/by-name/da/dashy-ui/package.nix @@ -17,16 +17,16 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dashy-ui"; - version = "4.0.5"; + version = "4.0.7"; src = fetchFromGitHub { owner = "lissy93"; repo = "dashy"; tag = finalAttrs.version; - hash = "sha256-vcNKnRcSQMU4AuvWTFdTlxVOAA0rlPCKUrDZbd+8/mk="; + hash = "sha256-PWuynBFOp4A/0AC5Lc5zAkb5Y5DWJgdZHtDc/douYQc="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-1FRrhNKm38/AP30F6Rf0cCHflIK9bWoxUCMMiT5c1Fc="; + hash = "sha256-jU/XnX6i6P1CWWWyUeVXt2q2PXMExDvmPTiLBOEuHcE="; }; passthru = { From 39f064f0e36717c414bba74e9820f66b8acd6611 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 9 May 2026 17:49:31 +0300 Subject: [PATCH 36/69] doc/using/configuration: document NIXPKGS_CONFIG lookup order The NIXPKGS_CONFIG environment variable and the system-wide /etc/nix/nixpkgs-config.nix path used by NixOS were undocumented in the Nixpkgs manual; the only mention was a release-note from 2006. Add a short paragraph to the Global configuration chapter describing the lookup order, the NixOS-specific default, and the limitation that the file is not generated automatically. Closes #28085. --- doc/using/configuration.chapter.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md index 5934726c068b..c54124fbe7a6 100644 --- a/doc/using/configuration.chapter.md +++ b/doc/using/configuration.chapter.md @@ -31,6 +31,22 @@ Unfree software is not tested or built in Nixpkgs continuous integration, and th Most unfree licenses prohibit either executing or distributing the software. ::: +The `NIXPKGS_CONFIG` environment variable can override the configuration file location. +Nixpkgs resolves the config in this order: + +1. `$NIXPKGS_CONFIG`, if set and the file exists. +2. `~/.config/nixpkgs/config.nix`, if it exists. +3. `~/.nixpkgs/config.nix` (legacy), if it exists. +4. Empty configuration. + +On NixOS, `NIXPKGS_CONFIG` points to `/etc/nix/nixpkgs-config.nix` system-wide. +Drop a file there to apply configuration to `nix-env`, `nix-shell`, and other user-level commands. +NixOS does not create this file. +The [`nixpkgs.config`](https://nixos.org/manual/nixos/stable/options#opt-nixpkgs.config) option does not affect `nix-env`, `nix-shell`, or other user-level commands. + +This lookup applies to non-flake usage like channels and ``. +Flakes ignore it; pass `config` directly when importing `nixpkgs`. + ## Installing broken packages {#sec-allow-broken} There are several ways to try compiling a package which has been marked as broken. From 9e27b8b54e1a21499556084c11e49a4991779b6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 May 2026 18:27:04 +0000 Subject: [PATCH 37/69] amp-cli: 0.0.1777624460-g8bb2f0 -> 0.0.1778343260-gb9a37d --- pkgs/by-name/am/amp-cli/package-lock.json | 8 ++++---- pkgs/by-name/am/amp-cli/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 42a9d633e30e..6195cb95700c 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1777624460-g8bb2f0" + "@sourcegraph/amp": "^0.0.1778343260-gb9a37d" } }, "node_modules/@napi-rs/keyring": { @@ -228,9 +228,9 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1777624460-g8bb2f0", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1777624460-g8bb2f0.tgz", - "integrity": "sha512-LGr3VAfyW5W7eJNPa545KvCL11qsac0FFzu67rPrqCR2Xh7v0mP1N7S9TLHKDG74NoqmB3xdhX7o0lIk2ZoGkg==", + "version": "0.0.1778343260-gb9a37d", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1778343260-gb9a37d.tgz", + "integrity": "sha512-TY4lL2lqwt+NtBa3ngKZSYfY5Z1qBAOd4UQMCT0nsUKatQGtSOIMec+zQSv6tr0L+z2jrDUzD0cpRkBDkLQjsQ==", "license": "Amp Commercial License", "dependencies": { "@napi-rs/keyring": "1.1.10" diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index f507ceeacf83..3116d00e392a 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -9,11 +9,11 @@ buildNpmPackage (finalAttrs: { pname = "amp-cli"; - version = "0.0.1777624460-g8bb2f0"; + version = "0.0.1778343260-gb9a37d"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-HUoRVq++AsIbQxJHkI4oyPyBbFcji6BvWdWxrqdUQQ0="; + hash = "sha256-48FyPDniLNQoeZ+SaheTvzLCYL3r95e9VDCW4Y5gMq8="; }; postPatch = '' @@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-Lnnutg8LDp9UMuJ+TuoRABK7lcQNizZDltr1cMFpYEc="; + npmDepsHash = "sha256-Ce7TaJuSrha+NcFmppMm/byAFosBR2I/zMY4KA5JXuE="; propagatedBuildInputs = [ ripgrep From 090b7d28bf46caa3da2867ff494ea5b337615b6a Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 21:31:18 -0700 Subject: [PATCH 38/69] python3Packages.pyteleinfo: init at 0.4.0 --- .../python-modules/pyteleinfo/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/pyteleinfo/default.nix diff --git a/pkgs/development/python-modules/pyteleinfo/default.nix b/pkgs/development/python-modules/pyteleinfo/default.nix new file mode 100644 index 000000000000..15f3a227417d --- /dev/null +++ b/pkgs/development/python-modules/pyteleinfo/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pydantic-settings, + pyserial, + pyserial-asyncio-fast, + pyhamcrest, + pytest-asyncio, + pytest-cov-stub, + pytest-mock, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "pyteleinfo"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "esciara"; + repo = "pyteleinfo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-uNkCunWlFoGmg80t69z2PXyPL1pGDsezTc8heec97VI="; + }; + + build-system = [ hatchling ]; + + pythonRelaxDeps = [ "pydantic-settings" ]; + + dependencies = [ + pydantic-settings + pyserial + pyserial-asyncio-fast + ]; + + nativeCheckInputs = [ + pyhamcrest + pytest-asyncio + pytest-cov-stub + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "teleinfo" ]; + + meta = { + description = "Python library for decoding and encoding ENEDIS teleinfo frames"; + homepage = "https://github.com/esciara/pyteleinfo"; + changelog = "https://github.com/esciara/pyteleinfo/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6764c6b7795e..f32ed99f5771 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15295,6 +15295,8 @@ self: super: with self; { pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; + pyteleinfo = callPackage ../development/python-modules/pyteleinfo { }; + pytenable = callPackage ../development/python-modules/pytenable { }; pytensor = callPackage ../development/python-modules/pytensor { }; From dc51a6dcc5e523597db213718d98440b6f3d8eb4 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 21:33:43 -0700 Subject: [PATCH 39/69] home-assistant: update component packages --- 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 1d6ef8b616ab..04af0a467488 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -6346,8 +6346,9 @@ "teleinfo" = ps: with ps; [ aiousbwatcher + pyteleinfo serialx - ]; # missing inputs: pyteleinfo + ]; "tellduslive" = ps: with ps; [ tellduslive @@ -8376,6 +8377,7 @@ "tedee" "telegram" "telegram_bot" + "teleinfo" "tellduslive" "teltonika" "temper" From 3683a920de73eed8a6f49335207d883242005e60 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 21:41:51 -0700 Subject: [PATCH 40/69] python3Packages.python-dropbox-api: init at 0.1.3 --- .../python-dropbox-api/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/python-dropbox-api/default.nix diff --git a/pkgs/development/python-modules/python-dropbox-api/default.nix b/pkgs/development/python-modules/python-dropbox-api/default.nix new file mode 100644 index 000000000000..234eb501c828 --- /dev/null +++ b/pkgs/development/python-modules/python-dropbox-api/default.nix @@ -0,0 +1,34 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + poetry-core, +}: + +buildPythonPackage (finalAttrs: { + pname = "python-dropbox-api"; + version = "0.1.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdr99"; + repo = "python-dropbox-api"; + tag = finalAttrs.version; + hash = "sha256-J3xgcDULK7Z+2HiarvpV6H+Na80PnfKJcdi3RRUcLzs="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; + + pythonImportsCheck = [ "python_dropbox_api" ]; + + meta = { + description = "Lightweight wrapper for the Dropbox API intended for use in Home Assistant"; + homepage = "https://github.com/bdr99/python-dropbox-api"; + changelog = "https://github.com/bdr99/python-dropbox-api/releases/tag/${finalAttrs.src.tag}"; + 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 6764c6b7795e..a7cc1114d5b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15723,6 +15723,8 @@ self: super: with self; { python-dotenv = callPackage ../development/python-modules/python-dotenv { }; + python-dropbox-api = callPackage ../development/python-modules/python-dropbox-api { }; + python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { }; python-editor = callPackage ../development/python-modules/python-editor { }; From d145371334ead74a2ce0017b13066da5594e98e6 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 21:42:51 -0700 Subject: [PATCH 41/69] home-assistant: update component packages --- 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 1d6ef8b616ab..e5d4a7e9eab4 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1397,8 +1397,9 @@ ps: with ps; [ aiohasupervisor cronsim + python-dropbox-api securetar - ]; # missing inputs: python-dropbox-api + ]; "droplet" = ps: with ps; [ pydroplet @@ -7637,6 +7638,7 @@ "downloader" "dremel_3d_printer" "drop_connect" + "dropbox" "droplet" "dsmr" "dsmr_reader" From fbdca412f9593a58ede8ac90e50b88e84cd3f3d0 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 21:50:17 -0700 Subject: [PATCH 42/69] python3Packages.aiopnsense: init at 1.0.8 --- .../python-modules/aiopnsense/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/aiopnsense/default.nix diff --git a/pkgs/development/python-modules/aiopnsense/default.nix b/pkgs/development/python-modules/aiopnsense/default.nix new file mode 100644 index 000000000000..19541f5a3c3d --- /dev/null +++ b/pkgs/development/python-modules/aiopnsense/default.nix @@ -0,0 +1,55 @@ +{ + lib, + aiohttp, + awesomeversion, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytest-cov-stub, + pytest-timeout, + pytestCheckHook, + python-dateutil, + pythonOlder, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "aiopnsense"; + version = "1.0.8"; + pyproject = true; + + disabled = pythonOlder "3.14"; + + src = fetchFromGitHub { + owner = "Snuffy2"; + repo = "aiopnsense"; + tag = "v${finalAttrs.version}"; + hash = "sha256-pJVYbf81/vZRi5elhNhiscXrEqDRLiIrik8N9GcR6yQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + awesomeversion + python-dateutil + ]; + + nativeCheckInputs = [ + aiohttp + pytest-asyncio + pytest-cov-stub + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ "aiopnsense" ]; + + meta = { + description = "Async Python client library for OPNsense"; + homepage = "https://github.com/Snuffy2/aiopnsense"; + changelog = "https://github.com/Snuffy2/aiopnsense/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6764c6b7795e..3816c1f180fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -444,6 +444,8 @@ self: super: with self; { aiopinboard = callPackage ../development/python-modules/aiopinboard { }; + aiopnsense = callPackage ../development/python-modules/aiopnsense { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aioprometheus = callPackage ../development/python-modules/aioprometheus { }; From 62ffd2d115d0d5720df13dfa1ac0bcee2c2cbefe Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 21:56:18 -0700 Subject: [PATCH 43/69] home-assistant: update component packages --- 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 1d6ef8b616ab..df741f9bd7bc 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4650,7 +4650,8 @@ ]; "opnsense" = ps: with ps; [ - ]; # missing inputs: aiopnsense + aiopnsense + ]; "opower" = ps: with ps; [ fnv-hash-fast @@ -8125,6 +8126,7 @@ "opentherm_gw" "openuv" "openweathermap" + "opnsense" "opower" "oralb" "orvibo" From 061c9ead16ed5144d8c59b50e6c1c6d9d67582a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 04:59:08 +0000 Subject: [PATCH 44/69] zwave-js-ui: 11.16.2 -> 11.17.0 --- pkgs/by-name/zw/zwave-js-ui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 58ee6bf093e4..60b534a38e1d 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "11.16.2"; + version = "11.17.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-1x5nYWPT30AQBk98yuOdB55Ac/7wRKBc4DUwY4kO6LY="; + hash = "sha256-plN7FJfPkEu/479JUrCWqpvTmm8CEqRWNurqeOPJUKA="; }; - npmDepsHash = "sha256-4kCHoYB2oH2jUk+31aGjbfBkdz3wdUOqctVk3/JXrBI="; + npmDepsHash = "sha256-8rFmFr7IXRbi2LW4diXDOka4nPJGr+DcrB8+JPBxzQA="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; From acd96e1a0e5f1f0c13fd0d02bb1031adf85ff258 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 22:04:04 -0700 Subject: [PATCH 45/69] python3Packages.pyomie: init at 1.1.1 --- .../python-modules/pyomie/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/pyomie/default.nix diff --git a/pkgs/development/python-modules/pyomie/default.nix b/pkgs/development/python-modules/pyomie/default.nix new file mode 100644 index 000000000000..3709034e38d2 --- /dev/null +++ b/pkgs/development/python-modules/pyomie/default.nix @@ -0,0 +1,55 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + deepdiff, + fetchFromGitHub, + poetry-core, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + rich, + typer, +}: + +buildPythonPackage (finalAttrs: { + pname = "pyomie"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "luuuis"; + repo = "pyomie"; + tag = "v${finalAttrs.version}"; + hash = "sha256-BOaOClTXeoRxWb2aJKN6+lQRCLAShvHPXsUZBbH0mno="; + }; + + build-system = [ poetry-core ]; + + pythonRelaxDeps = [ "typer" ]; + + dependencies = [ + aiohttp + rich + typer + ]; + + nativeCheckInputs = [ + aioresponses + deepdiff + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyomie" ]; + + meta = { + description = "Client for OMIE - Spain and Portugal electricity market data"; + homepage = "https://github.com/luuuis/pyomie"; + changelog = "https://github.com/luuuis/pyomie/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6764c6b7795e..6ca1ace8aa72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14576,6 +14576,8 @@ self: super: with self; { pyombi = callPackage ../development/python-modules/pyombi { }; + pyomie = callPackage ../development/python-modules/pyomie { }; + pyomo = callPackage ../development/python-modules/pyomo { }; pyopen-wakeword = callPackage ../development/python-modules/pyopen-wakeword/default.nix { }; From 2d26de2d1f882168826d1899c73b23e7cf252b21 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 22:04:04 -0700 Subject: [PATCH 46/69] home-assistant: update component packages --- 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 1d6ef8b616ab..b72df9e8b3d2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4479,7 +4479,8 @@ ]; "omie" = ps: with ps; [ - ]; # missing inputs: pyomie + pyomie + ]; "omnilogic" = ps: with ps; [ omnilogic @@ -8100,6 +8101,7 @@ "octoprint" "ohme" "ollama" + "omie" "omnilogic" "onboarding" "oncue" From 7ea190c8ecd1b6c686569e0a992dcbffeeeeec04 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 22:08:04 -0700 Subject: [PATCH 47/69] python3Packages.kiosker-python-api: init at 1.2.9 --- .../kiosker-python-api/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/kiosker-python-api/default.nix diff --git a/pkgs/development/python-modules/kiosker-python-api/default.nix b/pkgs/development/python-modules/kiosker-python-api/default.nix new file mode 100644 index 000000000000..839edb3b9d2c --- /dev/null +++ b/pkgs/development/python-modules/kiosker-python-api/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + httpx, +}: + +buildPythonPackage (finalAttrs: { + pname = "kiosker-python-api"; + version = "1.2.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Top-North"; + repo = "kiosker-python"; + tag = finalAttrs.version; + hash = "sha256-DGJ1lxi4pP4gyRWDpeUdyPGCKQmzpRaWw8bwHrFUKF0="; + }; + + build-system = [ hatchling ]; + + dependencies = [ httpx ]; + + # Tests require a live Kiosker device (HOST/TOKEN env vars). + doCheck = false; + + pythonImportsCheck = [ "kiosker" ]; + + meta = { + description = "Python wrapper for the Kiosker API"; + homepage = "https://github.com/Top-North/kiosker-python"; + changelog = "https://github.com/Top-North/kiosker-python/releases/tag/${finalAttrs.src.tag}"; + 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 6764c6b7795e..3e1f98459036 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8369,6 +8369,8 @@ self: super: with self; { kinparse = callPackage ../development/python-modules/kinparse { }; + kiosker-python-api = callPackage ../development/python-modules/kiosker-python-api { }; + kiss-headers = callPackage ../development/python-modules/kiss-headers { }; kitchen = callPackage ../development/python-modules/kitchen { }; From 91e02a10afaaa43e60a01e2651319a58180e2b11 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 22:09:06 -0700 Subject: [PATCH 48/69] home-assistant: update component packages --- 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 1d6ef8b616ab..31b27d998583 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3250,7 +3250,8 @@ ]; "kiosker" = ps: with ps; [ - ]; # missing inputs: kiosker-python-api + kiosker-python-api + ]; "kira" = ps: with ps; [ pykira @@ -7912,6 +7913,7 @@ "keenetic_ndms2" "kegtron" "keymitt_ble" + "kiosker" "kira" "kitchen_sink" "kmtronic" From 29df146b4e8dc0cfcb376edfeac2be6e1f518fb4 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 22:23:11 -0700 Subject: [PATCH 49/69] python3Packages.eurotronic-cometblue-ha: init at 1.4.0 --- .../eurotronic-cometblue-ha/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/eurotronic-cometblue-ha/default.nix diff --git a/pkgs/development/python-modules/eurotronic-cometblue-ha/default.nix b/pkgs/development/python-modules/eurotronic-cometblue-ha/default.nix new file mode 100644 index 000000000000..ad6b99a36788 --- /dev/null +++ b/pkgs/development/python-modules/eurotronic-cometblue-ha/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pdm-backend, + bleak, + bleak-retry-connector, +}: + +buildPythonPackage (finalAttrs: { + pname = "eurotronic-cometblue-ha"; + version = "1.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rikroe"; + repo = "eurotronic-cometblue"; + tag = "v${finalAttrs.version}"; + hash = "sha256-j3UuN0Cmb2mOo3QGqy0wu19+vRyMahclXKyka2Vy10w="; + }; + + build-system = [ pdm-backend ]; + + dependencies = [ + bleak + bleak-retry-connector + ]; + + # Tests require a real Bluetooth Comet Blue device. + doCheck = false; + + pythonImportsCheck = [ "eurotronic_cometblue_ha" ]; + + meta = { + description = "Python client for Eurotronic GmbH BLE Comet (and rebranded) Radiator TRVs"; + homepage = "https://github.com/rikroe/eurotronic-cometblue"; + changelog = "https://github.com/rikroe/eurotronic-cometblue/releases/tag/${finalAttrs.src.tag}"; + 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 6764c6b7795e..9c8c4ff95139 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5184,6 +5184,8 @@ self: super: with self; { euporie = callPackage ../development/python-modules/euporie { }; + eurotronic-cometblue-ha = callPackage ../development/python-modules/eurotronic-cometblue-ha { }; + eval-type-backport = callPackage ../development/python-modules/eval-type-backport { }; evaluate = callPackage ../development/python-modules/evaluate { }; From 0637936092ef5a84345bbb6914696afa7d0d89f7 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 22:24:48 -0700 Subject: [PATCH 50/69] home-assistant: update component packages --- 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 1d6ef8b616ab..7fe75ef84327 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1761,9 +1761,10 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast + eurotronic-cometblue-ha habluetooth serialx - ]; # missing inputs: eurotronic-cometblue-ha + ]; "event" = ps: with ps; [ ]; @@ -7687,6 +7688,7 @@ "esphome" "essent" "eufylife_ble" + "eurotronic_cometblue" "event" "everlights" "evil_genius_labs" From d9693f49af2b184cc6174c2ba79223a916357a40 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 22:32:09 -0700 Subject: [PATCH 51/69] python3Packages.earn-e-p1: init at 0.1.0 --- .../python-modules/earn-e-p1/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/earn-e-p1/default.nix diff --git a/pkgs/development/python-modules/earn-e-p1/default.nix b/pkgs/development/python-modules/earn-e-p1/default.nix new file mode 100644 index 000000000000..6497a46b60e7 --- /dev/null +++ b/pkgs/development/python-modules/earn-e-p1/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "earn-e-p1"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Miggets7"; + repo = "earn-e-p1"; + tag = finalAttrs.version; + hash = "sha256-a76+slVhZj6AQIDCcaEym3G6DjIsQQLfi13wIsYGkjA="; + }; + + build-system = [ hatchling ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "earn_e_p1" ]; + + meta = { + description = "Async Python library for communicating with EARN-E P1 energy meters via UDP"; + homepage = "https://github.com/Miggets7/earn-e-p1"; + changelog = "https://github.com/Miggets7/earn-e-p1/releases/tag/${finalAttrs.src.tag}"; + 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 6764c6b7795e..fff16e3b5536 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4863,6 +4863,8 @@ self: super: with self; { eagle100 = callPackage ../development/python-modules/eagle100 { }; + earn-e-p1 = callPackage ../development/python-modules/earn-e-p1 { }; + easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; easydict = callPackage ../development/python-modules/easydict { }; From 4d8acc9b514c4d3f8a0a1e035c99f25842c69651 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 22:33:23 -0700 Subject: [PATCH 52/69] home-assistant: update component packages --- 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 1d6ef8b616ab..14b13325b91d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1450,7 +1450,8 @@ ]; "earn_e_p1" = ps: with ps; [ - ]; # missing inputs: earn-e-p1 + earn-e-p1 + ]; "eastron" = ps: with ps; [ ]; @@ -7646,6 +7647,7 @@ "dwd_weather_warnings" "dynalite" "eafm" + "earn_e_p1" "easyenergy" "ecobee" "ecoforest" From d7409e47948ccd39f8fa020a0178b1cdd0444c70 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 22:44:00 -0700 Subject: [PATCH 53/69] python3Packages.denon-rs232: init at 4.1.0 --- .../python-modules/denon-rs232/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/denon-rs232/default.nix diff --git a/pkgs/development/python-modules/denon-rs232/default.nix b/pkgs/development/python-modules/denon-rs232/default.nix new file mode 100644 index 000000000000..69bb56dbd029 --- /dev/null +++ b/pkgs/development/python-modules/denon-rs232/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytest-timeout, + pytestCheckHook, + pythonOlder, + serialx, + uv-build, +}: + +buildPythonPackage (finalAttrs: { + pname = "denon-rs232"; + version = "4.1.0"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "denon-rs232"; + tag = finalAttrs.version; + hash = "sha256-SkfxUen1F5cakQao68uYz5uxAkzJfZtVtuIoFGH6mOU="; + }; + + build-system = [ uv-build ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' \ + --replace-fail '"uv_build>=0.8.4,<0.9.0"' '"uv_build>=0.8.4"' + ''; + + dependencies = [ serialx ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ "denon_rs232" ]; + + meta = { + description = "Async library to control Denon receivers over RS232"; + homepage = "https://github.com/home-assistant-libs/denon-rs232"; + changelog = "https://github.com/home-assistant-libs/denon-rs232/releases/tag/${finalAttrs.src.tag}"; + 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 6764c6b7795e..c03711b5e4f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3842,6 +3842,8 @@ self: super: with self; { dendropy = callPackage ../development/python-modules/dendropy { }; + denon-rs232 = callPackage ../development/python-modules/denon-rs232 { }; + denonavr = callPackage ../development/python-modules/denonavr { }; dep-logic = callPackage ../development/python-modules/dep-logic { }; From 5f5be4ccdea5d69f4bacdeeba1c1a9835d934084 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 22:44:54 -0700 Subject: [PATCH 54/69] home-assistant: update component packages --- 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 1d6ef8b616ab..f9db3f4d3e54 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1236,8 +1236,9 @@ "denon_rs232" = ps: with ps; [ aiousbwatcher + denon-rs232 serialx - ]; # missing inputs: denon-rs232 + ]; "denonavr" = ps: with ps; [ denonavr @@ -7611,6 +7612,7 @@ "default_config" "deluge" "demo" + "denon_rs232" "denonavr" "derivative" "devialet" From 9c17139e046483f7f8d3e59fe7f73ef0349f33bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 06:44:34 +0000 Subject: [PATCH 55/69] gforth: 0.7.9_20260415 -> 0.7.9_20260508 --- pkgs/by-name/gf/gforth/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix index df742e4790f7..e49afbcd7f65 100644 --- a/pkgs/by-name/gf/gforth/package.nix +++ b/pkgs/by-name/gf/gforth/package.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gforth"; - version = "0.7.9_20260415"; + version = "0.7.9_20260508"; src = fetchFromGitHub { owner = "forthy42"; repo = "gforth"; rev = finalAttrs.version; - hash = "sha256-eMBerL8kry9UlsXS4qdXT7jLK4f1S/q//5qkJ5qi3dA="; + hash = "sha256-XcGykMUEMmrNQ8y++SM1s0RPfMFgBTDXAIeAGKgU2Iw="; }; patches = [ ./use-nproc-instead-of-fhs.patch ]; From e0101cb9cf4d60dbf10c50b7a214e3f09f9252f7 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 10 May 2026 15:47:59 +0800 Subject: [PATCH 56/69] lib/modules: make comment more clear --- lib/modules.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/modules.nix b/lib/modules.nix index e369d98a6426..207b9f3cc6b4 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -589,7 +589,8 @@ let in modulesPath: initialModules: args: { modules = filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args); - # Intentionally not shared with `modules` above: this allows `collected` + # Intentionally not shared with `modules` above: this allows + # the return value of `collectStructuredModules` # to be garbage collected after `filterModules` returns. graph = toGraph modulesPath (collectStructuredModules unknownModule "" initialModules args); }; From 7caf1f085d71af70cfcb1b00c50797219eb18ed5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 11:25:16 +0000 Subject: [PATCH 57/69] brainflow: 5.21.0 -> 5.22.0 --- pkgs/by-name/br/brainflow/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index c308ec735302..4a7a69a5dfac 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "brainflow"; - version = "5.21.0"; + version = "5.22.0"; src = fetchFromGitHub { owner = "brainflow-dev"; repo = "brainflow"; tag = finalAttrs.version; - hash = "sha256-AE8c2ArkNipoAJSCj3NHEM91rulfbWGyANunPESKc/E="; + hash = "sha256-DizB9SCw3SMOsBz/bioUqLvDME9lfNaBzOY/pFGzv8g="; }; patches = [ ]; From ea45b74e9c91fc3e2dfea02c8398f01ccbceaaf7 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Sun, 10 May 2026 13:54:00 +0200 Subject: [PATCH 58/69] vim-flog: add meta.license attribute The upstream repo does not declare the license very prominently: It is only noted at the top of the vim help file: https://github.com/rbong/vim-flog/blob/master/doc/flog.txt#L5 --- pkgs/applications/editors/vim/plugins/overrides.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 58b4f03611fa..c759a6e3d6db 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -4950,10 +4950,13 @@ assertNoAdditions { }; }); - vim-flog = super.vim-flog.overrideAttrs { + vim-flog = super.vim-flog.overrideAttrs (old: { # Not intended to be required, used by vim plugin nvimSkipModules = "flog.graph_bin"; - }; + meta = old.meta // { + license = lib.licenses.vim; + }; + }); vim-fugitive = super.vim-fugitive.overrideAttrs (old: { meta = old.meta // { From 83d419ae5eb81820910fd1edd9098d78d5404747 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 12:10:26 +0000 Subject: [PATCH 59/69] multica-cli: 0.2.23 -> 0.2.29 --- pkgs/by-name/mu/multica-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/multica-cli/package.nix b/pkgs/by-name/mu/multica-cli/package.nix index b3637d909a37..7ad2ac9d982b 100644 --- a/pkgs/by-name/mu/multica-cli/package.nix +++ b/pkgs/by-name/mu/multica-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { __structuredAttrs = true; pname = "multica-cli"; - version = "0.2.23"; + version = "0.2.29"; src = fetchFromGitHub { owner = "multica-ai"; repo = "multica"; rev = "v${version}"; - hash = "sha256-2W2OjiKsjaLmKJTr1Rr31eqL/yt+o4XsLFeLwbyv7MY="; + hash = "sha256-RW9GXWMOJZGc2RsuKAmfTOol66/XwQLdyK7iPoGFF48="; }; sourceRoot = "${src.name}/server"; From 959274ad308a3e11301f7563bf1b03aa5f38f1d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 12:24:18 +0000 Subject: [PATCH 60/69] mcporter: 0.10.1 -> 0.10.2 --- pkgs/by-name/mc/mcporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mc/mcporter/package.nix b/pkgs/by-name/mc/mcporter/package.nix index 5f740a4ab921..5eb9e42d0dd8 100644 --- a/pkgs/by-name/mc/mcporter/package.nix +++ b/pkgs/by-name/mc/mcporter/package.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "mcporter"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "steipete"; repo = "mcporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-MaIduY59Q2zVZheN1IYhAWBklQ3n6iJV3KiTMHCML2U="; + hash = "sha256-1wBdYetYu+R04Fl50KR3zZK3QO6S95GV+PEO9k3Thhc="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-jqHEu86dNjJuYBVKDeDlre+KlFEqx55YXZ5K81AK+uY="; + hash = "sha256-TZfEoUSjba8cRz6L9uY2PGskYsR7S/xAahiKLd8dhFM="; }; nativeBuildInputs = [ From d65cd4342b46f71c450de867a3df55afe62ee311 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 10 May 2026 14:29:03 +0200 Subject: [PATCH 61/69] reaction: fix version check Even though we moved ahead of 2.3.1 the --version flag still shows 2.3.1. --- pkgs/by-name/re/reaction/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix index 34e810b5693a..a0a15d0b128e 100644 --- a/pkgs/by-name/re/reaction/package.nix +++ b/pkgs/by-name/re/reaction/package.nix @@ -13,13 +13,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "reaction"; - version = "2.3.1-11"; + version = "2.3.1"; src = fetchFromGitLab { domain = "framagit.org"; owner = "ppom"; repo = "reaction"; - rev = "c0868d6fe1d155de183a89729b5f3f0ede7be4a2"; + rev = "c0868d6fe1d155de183a89729b5f3f0ede7be4a2"; # TODO: return to tagged release hash = "sha256-QlSXZ2Wk1OXzAY2x6YjtW+xNchY+Ghb/6AsJgjfgoFE="; }; From 0b1ed724dee231e0c35ee58b3797ca18740bf587 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 14:46:32 +0000 Subject: [PATCH 62/69] velocity: 3.5.0-unstable-2026-05-01 -> 3.5.0-unstable-2026-05-09 --- pkgs/by-name/ve/velocity/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix index 14326b097d58..149f6c441f31 100644 --- a/pkgs/by-name/ve/velocity/package.nix +++ b/pkgs/by-name/ve/velocity/package.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "velocity"; - version = "3.5.0-unstable-2026-05-01"; + version = "3.5.0-unstable-2026-05-09"; src = fetchFromGitHub { owner = "PaperMC"; repo = "Velocity"; - rev = "ad8de4361c9d6e93b818d3381e85b14e0c90ad05"; - hash = "sha256-SzIZWZxFVupHNMVtlEC8BuDkj42G7uJkkOZa/In2tFY="; + rev = "9c0c9b02187c20bb767ce16ac7685580430d9b10"; + hash = "sha256-SPsI/bAlO3aQOT+84tJJZ0+UjbR4REXzaiFr6952/sI="; }; nativeBuildInputs = [ From 7bc28c26a37019e04860bba0402096ca684731ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 10 May 2026 17:02:14 +0200 Subject: [PATCH 63/69] meshlab: Add geospatial team --- pkgs/by-name/me/meshlab/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix index 2aaff1fc9806..104fbc3a03d2 100644 --- a/pkgs/by-name/me/meshlab/package.nix +++ b/pkgs/by-name/me/meshlab/package.nix @@ -153,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: { nim65s yzx9 ]; + teams = [ lib.teams.geospatial ]; platforms = with lib.platforms; linux ++ darwin; }; }) From 6dc6486d7ec235ecf4f0ed462090b581ea98dbb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 15:36:32 +0000 Subject: [PATCH 64/69] goverlay: 1.7.5 -> 1.8.1 --- pkgs/by-name/go/goverlay/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index d5a666880079..68c6fae7a480 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goverlay"; - version = "1.7.5"; + version = "1.8.1"; src = fetchFromGitHub { owner = "benjamimgois"; repo = "goverlay"; tag = finalAttrs.version; - hash = "sha256-q4g6K4iUkeam1dVHOWdkUjH/XAOIKgOXnJDE0dm5HVw="; + hash = "sha256-/ItkUqUQq1aeDPB8gHNOQkFp8s+/mOwFthnC77fT+h8="; }; outputs = [ From 878f31c60ed2ea1eba60800c4d725d10ae520035 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 15:51:55 +0000 Subject: [PATCH 65/69] statix: 0-unstable-2026-05-03 -> 0-unstable-2026-05-09 --- pkgs/by-name/st/statix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix index 509d4c3480d5..92b10f2647f1 100644 --- a/pkgs/by-name/st/statix/package.nix +++ b/pkgs/by-name/st/statix/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "statix"; - version = "0-unstable-2026-05-03"; + version = "0-unstable-2026-05-09"; src = fetchFromGitHub { owner = "molybdenumsoftware"; repo = "statix"; - rev = "91e28aa76179b5769e8eff7ff4b09464d0913f27"; - hash = "sha256-JDCJ8fgIs5ZdYygQxlR63H/V4VyfmVMR4FleWwAl+AM="; + rev = "f61bc82c0c90569de508f0c71a6ba7f4aba9cca7"; + hash = "sha256-4LtWT+BFSPaq5DXQPlZ+xVrW/osS9yhG5T0tEfSdczs="; }; cargoHash = "sha256-lODAnIGw8MncMT5xicWORSbCChn2HQXENsOStJYHepQ="; From 26cd1f58c2d1e1a2bacf004ca80b25a3ebfbcfb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 15:52:58 +0000 Subject: [PATCH 66/69] prettier-plugin-jinja-template: 2.1.0 -> 2.2.0 --- pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix b/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix index 84824fd0bd1d..a1cf1f23840e 100644 --- a/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix +++ b/pkgs/by-name/pr/prettier-plugin-jinja-template/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "prettier-plugin-jinja-template"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "davidodenwald"; repo = "prettier-plugin-jinja-template"; tag = "v${finalAttrs.version}"; - hash = "sha256-qAmN4VJCJana7YbrQC/51JKCbP2DN10HpIt+S88yvPE="; + hash = "sha256-OBpY8XYG6Hn2sQpWoJkNJGsnZ1Lh7LAviofgCRFMXwk="; }; - npmDepsHash = "sha256-/m0+z2fSwX77zRY4Yg4xdyI/ZEzAKNUuicaqz0b8f5w="; + npmDepsHash = "sha256-YsrDWoaA5EdQi3uzuWBx3Jv1US0qWwkh+636dfvlAkI="; passthru.updateScript = nix-update-script { }; From 869d6412815ae236d313b4f242f8667ed8c7cf30 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 20 Apr 2026 00:40:23 -0700 Subject: [PATCH 67/69] treewide: replace stdenv.is* with stdenv.hostPlatform.is* --- .../extensions/ms-vscode.js-debug/default.nix | 6 +++--- .../prettier.prettier-vscode/default.nix | 6 +++--- .../rust-lang.rust-analyzer/default.nix | 2 +- .../vadimcn.vscode-lldb/node_deps.nix | 2 +- pkgs/applications/misc/diffpdf/default.nix | 2 +- pkgs/build-support/rust/hooks/default.nix | 10 +++++----- pkgs/by-name/ab/abbaye-des-morts/package.nix | 4 ++-- pkgs/by-name/ae/aeron-cpp/package.nix | 4 ++-- pkgs/by-name/an/angle/package.nix | 8 ++++---- pkgs/by-name/ap/apache-orc/package.nix | 2 +- pkgs/by-name/ap/apko/package.nix | 2 +- pkgs/by-name/at/atuin-desktop/package.nix | 2 +- pkgs/by-name/az/azahar/package.nix | 4 ++-- pkgs/by-name/ba/basedpyright/package.nix | 2 +- pkgs/by-name/bl/bluej/package.nix | 2 +- pkgs/by-name/bm/bmake/package.nix | 4 +++- pkgs/by-name/br/brogue-ce/package.nix | 6 +++--- pkgs/by-name/br/bruno-cli/package.nix | 2 +- pkgs/by-name/br/bruno/package.nix | 2 +- pkgs/by-name/br/brush-splat/package.nix | 2 +- pkgs/by-name/ca/caido-cli/package.nix | 5 +++-- pkgs/by-name/ca/caido-desktop/package.nix | 4 ++-- pkgs/by-name/ca/cargo-nextest/package.nix | 2 +- pkgs/by-name/do/dovecot/generic.nix | 8 +++++--- pkgs/by-name/do/dovecot_pigeonhole/generic.nix | 2 +- pkgs/by-name/fe/feather-tk/package.nix | 6 +++--- pkgs/by-name/fi/filen-desktop/package.nix | 2 +- pkgs/by-name/fi/filtr/package.nix | 2 +- pkgs/by-name/fo/forgejo-runner/package.nix | 2 +- pkgs/by-name/fv/fverb/package.nix | 2 +- pkgs/by-name/ga/gate12/package.nix | 2 +- pkgs/by-name/ge/gemini-cli/package.nix | 4 ++-- pkgs/by-name/gi/gitaly/git.nix | 2 +- pkgs/by-name/gr/grype/package.nix | 2 +- pkgs/by-name/gt/gts/package.nix | 2 +- pkgs/by-name/hy/hygg/package.nix | 2 +- pkgs/by-name/id/idris2/libidris2_support.nix | 2 +- pkgs/by-name/in/inetutils/package.nix | 4 ++-- pkgs/by-name/is/isle-portable/unwrapped.nix | 2 +- pkgs/by-name/ja/jabref/package.nix | 4 ++-- .../kn/knot-resolver-manager_6/package.nix | 2 +- pkgs/by-name/li/libxkbcommon_8/package.nix | 4 ++-- pkgs/by-name/ll/llama-swap/package.nix | 2 +- pkgs/by-name/mc/mcap-cli/package.nix | 2 +- pkgs/by-name/mi/microfetch/package.nix | 2 +- pkgs/by-name/nu/nusmv/package.nix | 2 +- pkgs/by-name/op/open5gs/package.nix | 4 ++-- pkgs/by-name/pg/pgsql-tools/package.nix | 6 +++--- pkgs/by-name/pi/pinta/package.nix | 8 ++++---- pkgs/by-name/pl/plakar/package.nix | 2 +- pkgs/by-name/qd/qdelay/package.nix | 4 ++-- pkgs/by-name/ra/radicle-tui/package.nix | 2 +- pkgs/by-name/re/reevr/package.nix | 2 +- pkgs/by-name/rk/rkdeveloptool/package.nix | 2 +- pkgs/by-name/ro/roc/package.nix | 12 ++++++------ pkgs/by-name/sc/scipopt-zimpl/package.nix | 2 +- pkgs/by-name/sd/sdcc/package.nix | 2 +- pkgs/by-name/se/segger-jlink/package.nix | 4 ++-- pkgs/by-name/sg/sg-323/package.nix | 2 +- pkgs/by-name/si/signal-desktop/webrtc.nix | 18 +++++++++--------- pkgs/by-name/si/sirial/package.nix | 4 ++-- pkgs/by-name/sp/spacetimedb/package.nix | 2 +- pkgs/by-name/sp/speed-dreams/package.nix | 10 +++++----- pkgs/by-name/st/star/package.nix | 4 ++-- pkgs/by-name/st/starboard/package.nix | 2 +- pkgs/by-name/su/superfile/package.nix | 2 +- pkgs/by-name/ti/time12/package.nix | 2 +- pkgs/by-name/ti/timr-tui/package.nix | 4 ++-- pkgs/by-name/tr/transito/package.nix | 2 +- pkgs/by-name/tu/turingdb/package.nix | 6 +++--- pkgs/by-name/un/unnix/package.nix | 2 +- pkgs/by-name/vc/vcv-rack/package.nix | 6 +++--- pkgs/by-name/ve/vengi-tools/package.nix | 2 +- pkgs/by-name/vi/vips/package.nix | 2 +- pkgs/by-name/vs/vsce/package.nix | 2 +- .../vs/vscode-solidity-server/package.nix | 2 +- pkgs/by-name/we/weasis/package.nix | 6 +++--- pkgs/by-name/wh/whisper-cpp/package.nix | 2 +- pkgs/by-name/xa/xash3d-fwgs/package.nix | 2 +- pkgs/by-name/xc/xcp/package.nix | 4 ++-- pkgs/by-name/xd/xdg-user-dirs/package.nix | 2 +- pkgs/by-name/xo/xonsh/unwrapped.nix | 4 ++-- .../compilers/dotnet/source/vmr.nix | 9 +++++---- pkgs/development/interpreters/love/11.nix | 2 +- .../development/mobile/androidenv/emulator.nix | 2 +- pkgs/development/mobile/androidenv/tools.nix | 2 +- .../python-modules/agate/default.nix | 2 +- .../python-modules/ai-edge-litert/default.nix | 2 +- .../python-modules/anndata/default.nix | 2 +- pkgs/development/python-modules/ar/default.nix | 2 +- .../python-modules/beziers/default.nix | 2 +- .../development/python-modules/mpv/default.nix | 2 +- .../python-modules/primp/default.nix | 2 +- .../python-modules/pyglet/default.nix | 6 +++--- .../python-modules/pystray/default.nix | 2 +- .../python-modules/qiskit-aer/default.nix | 2 +- .../python-modules/resvg-py/default.nix | 2 +- .../python-modules/screeninfo/default.nix | 4 ++-- .../python-modules/tiledb/default.nix | 2 +- .../tools/build-managers/gnumake/default.nix | 2 +- pkgs/development/web/nodejs/v24.nix | 2 +- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- pkgs/os-specific/linux/zfs/2_3.nix | 2 +- pkgs/os-specific/linux/zfs/2_4.nix | 2 +- pkgs/servers/varnish/default.nix | 6 +++--- pkgs/tools/misc/fltrdr/default.nix | 2 +- pkgs/tools/misc/tdarr/common.nix | 6 +++--- .../nix/modular/packaging/everything.nix | 2 +- .../nix/modular/src/perl/package.nix | 2 +- 109 files changed, 188 insertions(+), 182 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix index 217701a6ac02..80544534894c 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix @@ -34,7 +34,7 @@ let }; makeCacheWritable = true; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret ]; nativeBuildInputs = [ @@ -42,10 +42,10 @@ let nodejs-slim.python npmHooks.npmConfigHook ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool clang_20 # clang_21 breaks @vscode/vsce's optional dependency keytar ]; diff --git a/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix index 2b4644a8502b..41fdc17e69f4 100644 --- a/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix @@ -32,7 +32,7 @@ let hash = "sha256-vktxhQA2a+D9Nr4vhbmGCnNdGzt0U89K50g0SgiV5SE="; }; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret ]; @@ -41,10 +41,10 @@ let nodejs-slim.python npmHooks.npmConfigHook ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 # clang_21 breaks @vscode/vsce's optional dependency keytar ]; diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index cc47b9f8ecd6..4c2ab7990fe4 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -47,7 +47,7 @@ let pkg-config ] - ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar + ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar # Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 installPhase = '' diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix index 7b4b082988be..a81e42ca3349 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix @@ -22,7 +22,7 @@ buildNpmPackage { python3 pkg-config ] - ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar + ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar buildInputs = [ libsecret ]; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index b4730af82ae2..7c5fdc28720d 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; installPhase = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' mkdir -p "$out" mv diffpdf.app "$out"/ diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index c122efe78fcc..0814f78edfef 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -27,7 +27,7 @@ passthru.tests = { test = tests.rust-hooks.cargoBuildHook; } - // lib.optionalAttrs (stdenv.isLinux) { + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook; }; } ./cargo-build-hook.sh; @@ -41,7 +41,7 @@ passthru.tests = { test = tests.rust-hooks.cargoCheckHook; } - // lib.optionalAttrs (stdenv.isLinux) { + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook; }; } ./cargo-check-hook.sh; @@ -54,7 +54,7 @@ passthru.tests = { test = tests.rust-hooks.cargoInstallHook; } - // lib.optionalAttrs (stdenv.isLinux) { + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook; }; } ./cargo-install-hook.sh; @@ -68,7 +68,7 @@ passthru.tests = { test = tests.rust-hooks.cargoNextestHook; } - // lib.optionalAttrs (stdenv.isLinux) { + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook; }; } ./cargo-nextest-hook.sh; @@ -107,7 +107,7 @@ passthru.tests = { test = tests.rust-hooks.cargoSetupHook; } - // lib.optionalAttrs (stdenv.isLinux) { + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook; }; } ./cargo-setup-hook.sh; diff --git a/pkgs/by-name/ab/abbaye-des-morts/package.nix b/pkgs/by-name/ab/abbaye-des-morts/package.nix index e0905c31c0ca..6cff999a347b 100644 --- a/pkgs/by-name/ab/abbaye-des-morts/package.nix +++ b/pkgs/by-name/ab/abbaye-des-morts/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=${placeholder "out"}" "DESTDIR=" ] - ++ lib.optional stdenv.isDarwin "PLATFORM=mac"; + ++ lib.optional stdenv.hostPlatform.isDarwin "PLATFORM=mac"; # Even with PLATFORM=mac, the Makefile specifies some GCC-specific CFLAGS that # are not supported by modern Clang on macOS - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace-fail "-funswitch-loops" "" \ --replace-fail "-fgcse-after-reload" "" diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix index 2260544631f1..e5bb023800d3 100644 --- a/pkgs/by-name/ae/aeron-cpp/package.nix +++ b/pkgs/by-name/ae/aeron-cpp/package.nix @@ -60,10 +60,10 @@ stdenv.mkDerivation { makeWrapper patchelf ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/by-name/an/angle/package.nix b/pkgs/by-name/an/angle/package.nix index 597c7e41ad1f..a7920e4b0e94 100644 --- a/pkgs/by-name/an/angle/package.nix +++ b/pkgs/by-name/an/angle/package.nix @@ -35,7 +35,7 @@ let llvmPackages.clang ]; postBuild = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/lib/clang/${llvmMajorVersion}/lib/darwin ln -s $out/resource-root/lib/darwin/libclang_rt.osx.a \ @@ -67,12 +67,12 @@ stdenv.mkDerivation (finalAttrs: { python3 llvmPackages.bintools ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ glib libxcb.dev libx11.dev @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { pciutils libGL ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix index c648c00d517b..42d546715507 100644 --- a/pkgs/by-name/ap/apache-orc/package.nix +++ b/pkgs/by-name/ap/apache-orc/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") (lib.cmakeBool "BUILD_JAVA" false) - (lib.cmakeBool "STOP_BUILD_ON_WARNING" stdenv.isLinux) + (lib.cmakeBool "STOP_BUILD_ON_WARNING" stdenv.hostPlatform.isLinux) (lib.cmakeBool "INSTALL_VENDORED_LIBS" false) ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 0290e2b73e21..490bc6bbb4d1 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -55,7 +55,7 @@ buildGoModule (finalAttrs: { # skip tests on darwin due to some local networking failures # `__darwinAllowLocalNetworking = true;` wasn't sufficient for # aarch64 or x86_64 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # some test data include SOURCE_DATE_EPOCH (which is different from our default) # and the default version info which we get by unsetting our ldflags diff --git a/pkgs/by-name/at/atuin-desktop/package.nix b/pkgs/by-name/at/atuin-desktop/package.nix index 254e156b8884..8c314c465018 100644 --- a/pkgs/by-name/at/atuin-desktop/package.nix +++ b/pkgs/by-name/at/atuin-desktop/package.nix @@ -153,7 +153,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=ui::viewport::tests::test_add_line_scrolling" "--skip=ui::viewport::tests::test_line_wrapping" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; __structuredAttrs = true; diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index e872aa63dc30..2ecbc0851df4 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { (cmakeBool "ENABLE_SSE42" enableSSE42) ]; - installPhase = optionalString stdenv.isDarwin '' + installPhase = optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/Applications $out/bin @@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs+=( --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" - ${optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : ${ + ${optionalString stdenv.hostPlatform.isDarwin "--prefix DYLD_LIBRARY_PATH : ${ lib.makeLibraryPath [ moltenvk ] }"} ) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 0073245147e2..3070840aac38 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -40,7 +40,7 @@ buildNpmPackage rec { docify pkg-config ] - ++ lib.optional stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar + ++ lib.optional stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar buildInputs = [ libsecret ]; diff --git a/pkgs/by-name/bl/bluej/package.nix b/pkgs/by-name/bl/bluej/package.nix index 88bbdef9e5df..8dcee7a0b549 100644 --- a/pkgs/by-name/bl/bluej/package.nix +++ b/pkgs/by-name/bl/bluej/package.nix @@ -19,7 +19,7 @@ let { enableJavaFX = true; } - // lib.optionalAttrs stdenv.isLinux { + // lib.optionalAttrs stdenv.hostPlatform.isLinux { openjfx_jdk = openjfx21.override { withWebKit = true; }; } ); diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index b71d91edc6e3..c6bede970944 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -62,7 +62,9 @@ stdenv.mkDerivation (finalAttrs: { "varmod-localtime" ] # TODO: drop the name-conditioning on stdenv rebuild - ++ lib.optional (stdenv.isDarwin && lib.getName stdenv != "bootstrap-stage1-stdenv-darwin") "export" + ++ lib.optional ( + stdenv.hostPlatform.isDarwin && lib.getName stdenv != "bootstrap-stage1-stdenv-darwin" + ) "export" ); strictDeps = true; diff --git a/pkgs/by-name/br/brogue-ce/package.nix b/pkgs/by-name/br/brogue-ce/package.nix index 793b9c8b490d..c57df0a4996b 100644 --- a/pkgs/by-name/br/brogue-ce/package.nix +++ b/pkgs/by-name/br/brogue-ce/package.nix @@ -46,10 +46,10 @@ stdenv.mkDerivation (finalAttrs: { "DATADIR=$(out)/opt/brogue-ce" "TERMINAL=${if terminal then "YES" else "NO"}" "GRAPHICS=${if graphics then "YES" else "NO"}" - "MAC_APP=${if stdenv.isDarwin then "YES" else "NO"}" + "MAC_APP=${if stdenv.hostPlatform.isDarwin then "YES" else "NO"}" ]; - postBuild = lib.optionalString (stdenv.isDarwin && graphics) '' + postBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && graphics) '' make Brogue.app $makeFlags ''; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postInstall = lib.optionalString (stdenv.isDarwin && graphics) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin && graphics) '' mkdir -p $out/Applications mv Brogue.app "$out/Applications/Brogue CE.app" ''; diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix index bdbac91e5cd7..8f9c54f3e414 100644 --- a/pkgs/by-name/br/bruno-cli/package.nix +++ b/pkgs/by-name/br/bruno-cli/package.nix @@ -31,7 +31,7 @@ buildNpmPackage { nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.isDarwin clang_20; # clang_21 breaks gyp builds + ++ lib.optional stdenv.hostPlatform.isDarwin clang_20; # clang_21 breaks gyp builds buildInputs = [ pango diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 89d0a6eb48cf..f768c3a81a32 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -42,7 +42,7 @@ buildNpmPackage rec { nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.isDarwin clang_20 # clang_21 breaks gyp builds + ++ lib.optional stdenv.hostPlatform.isDarwin clang_20 # clang_21 breaks gyp builds ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ makeWrapper copyDesktopItems diff --git a/pkgs/by-name/br/brush-splat/package.nix b/pkgs/by-name/br/brush-splat/package.nix index 9f8c7f33151c..c697d89714ee 100644 --- a/pkgs/by-name/br/brush-splat/package.nix +++ b/pkgs/by-name/br/brush-splat/package.nix @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: { vulkan-loader zstd ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; diff --git a/pkgs/by-name/ca/caido-cli/package.nix b/pkgs/by-name/ca/caido-cli/package.nix index e8c9427f52ac..a113c3f354e1 100644 --- a/pkgs/by-name/ca/caido-cli/package.nix +++ b/pkgs/by-name/ca/caido-cli/package.nix @@ -35,9 +35,10 @@ stdenv.mkDerivation (finalAttrs: { ); nativeBuildInputs = - lib.optionals stdenv.isLinux [ autoPatchelfHook ] ++ lib.optionals stdenv.isDarwin [ unzip ]; + lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; - buildInputs = lib.optionals stdenv.isLinux [ libgcc ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libgcc ]; sourceRoot = "."; diff --git a/pkgs/by-name/ca/caido-desktop/package.nix b/pkgs/by-name/ca/caido-desktop/package.nix index 2702da1b469c..0c26ee5beb60 100644 --- a/pkgs/by-name/ca/caido-desktop/package.nix +++ b/pkgs/by-name/ca/caido-desktop/package.nix @@ -113,9 +113,9 @@ let }; in -if stdenv.isLinux then +if stdenv.hostPlatform.isLinux then linux -else if stdenv.isDarwin then +else if stdenv.hostPlatform.isDarwin then darwin else throw "caido-desktop: unsupported platform ${stdenv.hostPlatform.system}" diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index c18a62d2a07a..64464a140c27 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; # FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918 - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./no-dtrace-macos.patch ]; diff --git a/pkgs/by-name/do/dovecot/generic.nix b/pkgs/by-name/do/dovecot/generic.nix index b84f947e3357..7c6c2768f505 100644 --- a/pkgs/by-name/do/dovecot/generic.nix +++ b/pkgs/by-name/do/dovecot/generic.nix @@ -147,9 +147,11 @@ stdenv.mkDerivation (finalAttrs: { 'NOPLUGIN_LDFLAGS="-undefined dynamic_lookup"' ''; - preBuild = lib.optionalString (lib.strings.versionOlder version "2.4" && stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup" - ''; + preBuild = + lib.optionalString (lib.strings.versionOlder version "2.4" && stdenv.hostPlatform.isDarwin) + '' + export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup" + ''; # We need this for sysconfdir, see remark below. installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/by-name/do/dovecot_pigeonhole/generic.nix b/pkgs/by-name/do/dovecot_pigeonhole/generic.nix index fca1f17172ec..29367dd72364 100644 --- a/pkgs/by-name/do/dovecot_pigeonhole/generic.nix +++ b/pkgs/by-name/do/dovecot_pigeonhole/generic.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional withLDAP "--with-ldap"; - preBuild = lib.optionalString (!isCurrent && stdenv.isDarwin) '' + preBuild = lib.optionalString (!isCurrent && stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup" ''; diff --git a/pkgs/by-name/fe/feather-tk/package.nix b/pkgs/by-name/fe/feather-tk/package.nix index 86ca0e289908..01e3d32a0085 100644 --- a/pkgs/by-name/fe/feather-tk/package.nix +++ b/pkgs/by-name/fe/feather-tk/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableNFD [ nativefiledialog-extended ] - ++ lib.optionals (enableNFD && stdenv.isLinux) [ + ++ lib.optionals (enableNFD && stdenv.hostPlatform.isLinux) [ gtk3 ] ++ lib.optionals enablePython [ @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = enableTests; - nativeCheckInputs = lib.optionals (enableTests && stdenv.isLinux) [ + nativeCheckInputs = lib.optionals (enableTests && stdenv.hostPlatform.isLinux) [ xvfb-run ]; @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preCheck cd feather-tk/src/feather-tk-build - ${if stdenv.isLinux then "xvfb-run" else ""} ctest --verbose -C Release + ${if stdenv.hostPlatform.isLinux then "xvfb-run" else ""} ctest --verbose -C Release runHook postCheck ''; diff --git a/pkgs/by-name/fi/filen-desktop/package.nix b/pkgs/by-name/fi/filen-desktop/package.nix index abd50c5d20ea..862159bc5182 100644 --- a/pkgs/by-name/fi/filen-desktop/package.nix +++ b/pkgs/by-name/fi/filen-desktop/package.nix @@ -63,7 +63,7 @@ buildNpmPackage { electron makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/pkgs/by-name/fi/filtr/package.nix b/pkgs/by-name/fi/filtr/package.nix index 6b3a72a9d94e..7cd357b00749 100644 --- a/pkgs/by-name/fi/filtr/package.nix +++ b/pkgs/by-name/fi/filtr/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 4f85ec25dc13..d4ae132e8e78 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -45,7 +45,7 @@ let # Timeouts "TestRunJob_WithConnectionFromCommandOptions" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Uses docker-specific options, unsupported on Darwin "TestMergeJobOptions" ]; diff --git a/pkgs/by-name/fv/fverb/package.nix b/pkgs/by-name/fv/fverb/package.nix index 63495ca19594..532360cf4156 100644 --- a/pkgs/by-name/fv/fverb/package.nix +++ b/pkgs/by-name/fv/fverb/package.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; # clang++: error: unsupported option '-mfpu=' for target 'arm64-apple-darwin' # clang++: error: unsupported option '-mfloat-abi=' for target 'arm64-apple-darwin' - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/ga/gate12/package.nix b/pkgs/by-name/ga/gate12/package.nix index cf2eb205347e..117e8e0aef6b 100644 --- a/pkgs/by-name/ga/gate12/package.nix +++ b/pkgs/by-name/ga/gate12/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 7676f0630813..e07f14806b03 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -28,14 +28,14 @@ buildNpmPackage (finalAttrs: { npmDepsHash = "sha256-4znN1YR3AX2SKeCJjUS8cm6WGcOGPXI27xrQCotBjgQ="; - dontPatchElf = stdenv.isDarwin; + dontPatchElf = stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ jq pkg-config makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optionalDependencies keytar + ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optionalDependencies keytar buildInputs = [ ripgrep diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix index 7e02ecfd91dc..5be2c2b04b95 100644 --- a/pkgs/by-name/gi/gitaly/git.nix +++ b/pkgs/by-name/gi/gitaly/git.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" - + lib.optionalString stdenv.isFreeBSD "-lthr"; + + lib.optionalString stdenv.hostPlatform.isFreeBSD "-lthr"; # The build phase already installs it all GIT_PREFIX = placeholder "out"; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 2369b88eb1d8..018a7c67c470 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -106,7 +106,7 @@ buildGoModule (finalAttrs: { "Test_dpkgUseCPEsForEOLEnvVar" "Test_rpmUseCPEsForEOLEnvVar" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails to generate x509 certificate # cat: /etc/ssl/openssl.cnf: Operation not permitted "Test_defaultHTTPClientHasCert" diff --git a/pkgs/by-name/gt/gts/package.nix b/pkgs/by-name/gt/gts/package.nix index e51a67eb374a..b50c41b42156 100644 --- a/pkgs/by-name/gt/gts/package.nix +++ b/pkgs/by-name/gt/gts/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gettext ]; propagatedBuildInputs = [ glib ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Doesn't build on Darwin with -std=gnu23. NIX_CFLAGS_COMPILE = "-std=gnu17"; }; diff --git a/pkgs/by-name/hy/hygg/package.nix b/pkgs/by-name/hy/hygg/package.nix index ded0143917db..01a9dbb3c8d9 100644 --- a/pkgs/by-name/hy/hygg/package.nix +++ b/pkgs/by-name/hy/hygg/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ## Skipping this test due to the high variability of its outcome ## When the package was merged the test was passing but on hydra its not ## Look at PR #448907 - ++ (if pkgs.stdenv.isDarwin then [ "--skip=test_stdin_processing" ] else [ ]); + ++ (if pkgs.stdenv.hostPlatform.isDarwin then [ "--skip=test_stdin_processing" ] else [ ]); doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/id/idris2/libidris2_support.nix b/pkgs/by-name/id/idris2/libidris2_support.nix index 538da01e26d7..2117bc729283 100644 --- a/pkgs/by-name/id/idris2/libidris2_support.nix +++ b/pkgs/by-name/id/idris2/libidris2_support.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" ] - ++ lib.optional stdenv.isDarwin "OS="; + ++ lib.optional stdenv.hostPlatform.isDarwin "OS="; buildFlags = [ "support" ]; diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix index f0713769865e..b42101a350e1 100644 --- a/pkgs/by-name/in/inetutils/package.nix +++ b/pkgs/by-name/in/inetutils/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch - (if stdenv.isDarwin then ./tests-libls-2.sh.patch else ./tests-libls.sh.patch) + (if stdenv.hostPlatform.isDarwin then ./tests-libls-2.sh.patch else ./tests-libls.sh.patch) (fetchpatch { name = "CVE-2026-24061_1.patch"; @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-servers"; - ${if stdenv.isDarwin then "hardeningDisable" else null} = [ "format" ]; + ${if stdenv.hostPlatform.isDarwin then "hardeningDisable" else null} = [ "format" ]; doCheck = true; diff --git a/pkgs/by-name/is/isle-portable/unwrapped.nix b/pkgs/by-name/is/isle-portable/unwrapped.nix index 825b9e9bad5a..889968a859e4 100644 --- a/pkgs/by-name/is/isle-portable/unwrapped.nix +++ b/pkgs/by-name/is/isle-portable/unwrapped.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace packaging/macos/CMakeLists.txt \ --replace-fail "fixup_bundle" "#fixup_bundle" ''; diff --git a/pkgs/by-name/ja/jabref/package.nix b/pkgs/by-name/ja/jabref/package.nix index 0a38413359f9..742501fe21b2 100644 --- a/pkgs/by-name/ja/jabref/package.nix +++ b/pkgs/by-name/ja/jabref/package.nix @@ -173,8 +173,8 @@ stdenv.mkDerivation rec { zip -d $out/lib/javafx-web-*-*.jar "*.so" # Use postgresql from nixpkgs since the bundled binary doesn't work on NixOS - ARCH1=${if stdenv.isAarch64 then "arm64v8" else "amd64"} - ARCH2=${if stdenv.isAarch64 then "arm_64" else "x86_64"} + ARCH1=${if stdenv.hostPlatform.isAarch64 then "arm64v8" else "amd64"} + ARCH2=${if stdenv.hostPlatform.isAarch64 then "arm_64" else "x86_64"} mkdir postgresql cd postgresql ln -s ${postgresql}/{lib,share} ./ diff --git a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix index 1f4e03cc7e6d..cb449cb1df97 100644 --- a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix @@ -75,7 +75,7 @@ python3Packages.buildPythonPackage { echo -e 'quit()' | env -i ./kresd -a 127.0.0.1#53535 -c test-http.lua ''; - doCheck = python3Packages.stdenv.isLinux; # maybe in future + doCheck = python3Packages.stdenv.hostPlatform.isLinux; # maybe in future nativeCheckInputs = with python3Packages; [ augeas dnspython diff --git a/pkgs/by-name/li/libxkbcommon_8/package.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix index bcb1ad7bf2d0..364e08c46186 100644 --- a/pkgs/by-name/li/libxkbcommon_8/package.nix +++ b/pkgs/by-name/li/libxkbcommon_8/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { bison doxygen ] - ++ lib.optional stdenv.isLinux xvfb + ++ lib.optional stdenv.hostPlatform.isLinux xvfb ++ lib.optional withWaylandTools wayland-scanner; buildInputs = [ @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { "-Denable-wayland=${lib.boolToString withWaylandTools}" ]; - doCheck = stdenv.isLinux; # TODO: disable just a part of the tests + doCheck = stdenv.hostPlatform.isLinux; # TODO: disable just a part of the tests preCheck = '' patchShebangs ../test/ ''; diff --git a/pkgs/by-name/ll/llama-swap/package.nix b/pkgs/by-name/ll/llama-swap/package.nix index 4bc48c28be3b..eff3876c6e44 100644 --- a/pkgs/by-name/ll/llama-swap/package.nix +++ b/pkgs/by-name/ll/llama-swap/package.nix @@ -81,7 +81,7 @@ buildGoModule (finalAttrs: { checkFlags = let - skippedTests = lib.optionals (stdenv.isDarwin) [ + skippedTests = lib.optionals (stdenv.hostPlatform.isDarwin) [ # Fail only on *-darwin intermittently # https://github.com/mostlygeek/llama-swap/issues/320 "TestProcess_AutomaticallyStartsUpstream" diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix index 1145facb3dff..65fcd91a4a4b 100644 --- a/pkgs/by-name/mc/mcap-cli/package.nix +++ b/pkgs/by-name/mc/mcap-cli/package.nix @@ -34,7 +34,7 @@ buildGoModule { tags = [ "sqlite_omit_load_extension" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "netgo" "osusergo" ]; diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 8a2ee1cf49ad..3fdfefc7f965 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-vGvpjRJr4ez322JWUwboVml22vnRVRlwpZ9W4F5wATA="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ mold ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ mold ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nu/nusmv/package.nix b/pkgs/by-name/nu/nusmv/package.nix index fb32ef5d1a0e..f56d1d41aed7 100644 --- a/pkgs/by-name/nu/nusmv/package.nix +++ b/pkgs/by-name/nu/nusmv/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { throw "only linux and mac x86_64 are currently supported" ); - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' install -m755 -D bin/NuSMV $out/bin/NuSMV diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix index ea5895282f95..f934093ffc48 100644 --- a/pkgs/by-name/op/open5gs/package.nix +++ b/pkgs/by-name/op/open5gs/package.nix @@ -83,10 +83,10 @@ stdenv.mkDerivation (finalAttrs: { gnutls libnghttp2.dev ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ lksctp-tools ] - ++ lib.optionals (!stdenv.isLinux) [ + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ usrsctp ]; diff --git a/pkgs/by-name/pg/pgsql-tools/package.nix b/pkgs/by-name/pg/pgsql-tools/package.nix index ab9d06f47d11..e8ac7a04be46 100644 --- a/pkgs/by-name/pg/pgsql-tools/package.nix +++ b/pkgs/by-name/pg/pgsql-tools/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcrypt-legacy (lib.getLib stdenv.cc.cc) ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r _internal $out/lib/pgsql-tools/ makeBinaryWrapper $out/lib/pgsql-tools/ossdbtoolsservice_main $out/bin/ossdbtoolsservice_main \ - ${lib.optionalString stdenv.isLinux ''--prefix LD_LIBRARY_PATH : "${ + ${lib.optionalString stdenv.hostPlatform.isLinux ''--prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ libxcrypt-legacy (lib.getLib stdenv.cc.cc) diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index 368ac7efd747..1ab6568aab57 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -47,7 +47,7 @@ buildDotnetModule rec { glib libadwaita ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Transitive dylib deps that Pinta's NativeImportResolver dlopen's by bare name. # These are not pulled in by wrapGAppsHook4's LD_LIBRARY_PATH on Darwin, so symlink is needed. graphene @@ -73,7 +73,7 @@ buildDotnetModule rec { projectFile = "Pinta"; - env = lib.optionalAttrs (!stdenv.isDarwin) { + env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }; @@ -93,7 +93,7 @@ buildDotnetModule rec { mkdir -p "$out/share/icons" cp -r "$out/lib/Pinta/icons/." "$out/share/icons/" '' - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' dotnet build installer/linux/install.proj \ -target:Install \ -p:ContinuousIntegrationBuild=true \ @@ -102,7 +102,7 @@ buildDotnetModule rec { -p:PublishDir="$out/lib/Pinta" \ -p:InstallPrefix="$out" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Symlink all dylibs from runtimeDeps into the assembly dir. # GirCore and Pinta's own NativeImportResolver both search here by bare name. for dir in ${lib.concatMapStringsSep " " (d: "${lib.getLib d}/lib") runtimeDeps}; do diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix index d3a8c7e16d93..584908cb2aae 100644 --- a/pkgs/by-name/pl/plakar/package.nix +++ b/pkgs/by-name/pl/plakar/package.nix @@ -33,7 +33,7 @@ buildGo125Module (finalAttrs: { # mount: fusermount: exec: "fusermount": executable file not found in $PATH "TestExecuteCmdMountDefault" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestBTreeScanMemory" "TestBTreeScanPebble" "TestExecuteCmdServerDefault" diff --git a/pkgs/by-name/qd/qdelay/package.nix b/pkgs/by-name/qd/qdelay/package.nix index c01d32a4b43c..8314c20757d8 100644 --- a/pkgs/by-name/qd/qdelay/package.nix +++ b/pkgs/by-name/qd/qdelay/package.nix @@ -18,7 +18,7 @@ writableTmpDirAsHomeHook, buildVST3 ? true, - buildLV2 ? stdenv.isLinux, + buildLV2 ? stdenv.hostPlatform.isLinux, }: stdenv.mkDerivation (finalAttrs: { @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/ra/radicle-tui/package.nix b/pkgs/by-name/ra/radicle-tui/package.nix index ba24f457a295..3e57ffa770ad 100644 --- a/pkgs/by-name/ra/radicle-tui/package.nix +++ b/pkgs/by-name/ra/radicle-tui/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv zlib ]; diff --git a/pkgs/by-name/re/reevr/package.nix b/pkgs/by-name/re/reevr/package.nix index bf1a80125869..9d042c2fbead 100644 --- a/pkgs/by-name/re/reevr/package.nix +++ b/pkgs/by-name/re/reevr/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/rk/rkdeveloptool/package.nix b/pkgs/by-name/rk/rkdeveloptool/package.nix index 1799adfc7b29..25f77a07ba3f 100644 --- a/pkgs/by-name/rk/rkdeveloptool/package.nix +++ b/pkgs/by-name/rk/rkdeveloptool/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { # main.cpp:1568:36: error: '%s' directive output may be truncated writing up to 557 bytes into a region of size 5 env.CPPFLAGS = toString ( lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ] - ++ lib.optionals stdenv.isDarwin [ "-Wno-error=vla-cxx-extension" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=vla-cxx-extension" ] ); meta = { diff --git a/pkgs/by-name/ro/roc/package.nix b/pkgs/by-name/ro/roc/package.nix index 7c4455e58447..1c91e27c0bd0 100644 --- a/pkgs/by-name/ro/roc/package.nix +++ b/pkgs/by-name/ro/roc/package.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage { cmake zig_0_13 ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage { llvmPackages.llvm.dev makeBinaryWrapper ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ glibc stdenv.cc.cc.lib ]; @@ -67,13 +67,13 @@ rustPlatform.buildRustPackage { ''; postInstall = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/roc \ --set NIX_GLIBC_PATH ${glibc.out}/lib \ --set NIX_LIBGCC_S_PATH ${stdenv.cc.cc.lib}/lib \ --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} '' - + lib.optionalString (!stdenv.isLinux) '' + + lib.optionalString (!stdenv.hostPlatform.isLinux) '' wrapProgram $out/bin/roc --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} ''; @@ -84,12 +84,12 @@ rustPlatform.buildRustPackage { ]; checkPhase = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' runHook preCheck NIX_GLIBC_PATH=${glibc.out}/lib NIX_LIBGCC_S_PATH=${stdenv.cc.cc.lib}/lib cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip=glue_cli_tests --skip=test_snapshots runHook postCheck '' - + lib.optionalString (!stdenv.isLinux) '' + + lib.optionalString (!stdenv.hostPlatform.isLinux) '' runHook preCheck cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip=glue_cli_tests --skip=test_snapshots runHook postCheck diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix index 86fef3fafafc..c8f965653c42 100644 --- a/pkgs/by-name/sc/scipopt-zimpl/package.nix +++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { maintainers = with lib.maintainers; [ pmeinhold ]; platforms = lib.platforms.linux; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "https://zimpl.zib.de/download/CHANGELOG.txt"; description = "Zuse Institute Mathematical Programming Language"; longDescription = '' diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix index c1f3dc77015d..5a3b4ed4dfb4 100644 --- a/pkgs/by-name/sd/sdcc/package.nix +++ b/pkgs/by-name/sd/sdcc/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { "out" "doc" ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "man" ]; diff --git a/pkgs/by-name/se/segger-jlink/package.nix b/pkgs/by-name/se/segger-jlink/package.nix index 11f0aa1ebda9..deb4fd651e2a 100644 --- a/pkgs/by-name/se/segger-jlink/package.nix +++ b/pkgs/by-name/se/segger-jlink/package.nix @@ -199,9 +199,9 @@ let }; buildAttrs = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then buildAttrsLinux - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then buildAttrsDarwin else throw "platform not supported"; diff --git a/pkgs/by-name/sg/sg-323/package.nix b/pkgs/by-name/sg/sg-323/package.nix index d2d70e1b6ce4..74eba4a8c2fb 100644 --- a/pkgs/by-name/sg/sg-323/package.nix +++ b/pkgs/by-name/sg/sg-323/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix index 8a33b1575517..0ea34b0dec7c 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc.nix +++ b/pkgs/by-name/si/signal-desktop/webrtc.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # Chromium's Darwin toolchain defines _LIBCPP_HARDENING_MODE itself; keep # cc-wrapper from injecting a conflicting default. - hardeningDisable = lib.optionals stdenv.isDarwin [ + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "libcxxhardeningfast" "libcxxhardeningextensive" ]; @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config gclient2nix.gclientUnpackHook ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk xcodebuild ]; @@ -78,10 +78,10 @@ stdenv.mkDerivation (finalAttrs: { glib pulseaudio ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.compiler-rt ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace modules/audio_device/linux/pulseaudiosymboltable_linux.cc \ --replace-fail "libpulse.so.0" "${pulseaudio}/lib/libpulse.so.0" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix Darwin Python script shebangs for sandbox builds patchShebangs build/mac/should_use_hermetic_xcode.py build/toolchain/apple/linker_driver.py @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace build/config/mac/BUILD.gn \ --replace-fail "apple-macos" "apple-darwin" '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace modules/audio_device/linux/alsasymboltable_linux.cc \ --replace-fail "libasound.so.2" "${alsa-lib}/lib/libasound.so.2" ''; @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { ''; gnFlags = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ # webrtc uses chromium's `src/build/BUILDCONFIG.gn`. many of these flags # are copied from pkgs/applications/networking/browsers/chromium/common.nix. ''target_os="linux"'' @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ''target_os="mac"'' ''mac_deployment_target="${stdenv.hostPlatform.darwinMinVersion}"'' "use_sysroot=true" @@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: { "use_custom_libcxx=false" ''rust_sysroot_absolute="${buildPackages.rustc}"'' ] - ++ lib.optionals (stdenv.isLinux && stdenv.buildPlatform != stdenv.hostPlatform) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.buildPlatform != stdenv.hostPlatform) [ ''host_toolchain="//build/toolchain/linux/unbundle:host"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"'' ]; diff --git a/pkgs/by-name/si/sirial/package.nix b/pkgs/by-name/si/sirial/package.nix index ec2f6325c5c4..ab6ea58cabc4 100644 --- a/pkgs/by-name/si/sirial/package.nix +++ b/pkgs/by-name/si/sirial/package.nix @@ -18,7 +18,7 @@ writableTmpDirAsHomeHook, buildVST3 ? true, - buildLV2 ? stdenv.isLinux, + buildLV2 ? stdenv.hostPlatform.isLinux, }: stdenv.mkDerivation (finalAttrs: { @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix index 2acc65a48f4e..911948f33a97 100644 --- a/pkgs/by-name/sp/spacetimedb/package.nix +++ b/pkgs/by-name/sp/spacetimedb/package.nix @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=codegen" "--skip=publish" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flakes on darwin in nix build sandbox, timing out waiting for listen addr "--skip=cli_can_ping_spacetimedb_on_disk" "--skip=cli_can_publish_spacetimedb_on_disk" diff --git a/pkgs/by-name/sp/speed-dreams/package.nix b/pkgs/by-name/sp/speed-dreams/package.nix index 226157212a55..46d8de4ffe87 100644 --- a/pkgs/by-name/sp/speed-dreams/package.nix +++ b/pkgs/by-name/sp/speed-dreams/package.nix @@ -39,7 +39,7 @@ }: let - glLibs = lib.optionals stdenv.isLinux [ + glLibs = lib.optionals stdenv.hostPlatform.isLinux [ libGL libGLU libglut @@ -73,7 +73,7 @@ let stdenv.cc.cc.lib ]; runtimeLibPath = lib.makeLibraryPath runtimeLibs; - libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in stdenv.mkDerivation (finalAttrs: { version = "2.4.2"; @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' substituteInPlace "$out/share/applications/speed-dreams.desktop" \ --replace-fail "Exec=$out/games/speed-dreams-2" "Exec=speed-dreams" - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' # Symlink for desktop icon mkdir -p $out/share/icons/hicolor/{96x96,scalable}/apps ln -s "$out/share/games/speed-dreams-2/data/icons/icon.png" "$out/share/icons/hicolor/96x96/apps/speed-dreams-2.png" @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapperArgs=( --prefix ${libPathVar} : "$out/lib/games/speed-dreams-2/lib:$out/lib:${runtimeLibPath}" ) - ${lib.optionalString stdenv.isLinux "makeWrapperArgs+=(--set SDL_VIDEODRIVER x11)"} + ${lib.optionalString stdenv.hostPlatform.isLinux "makeWrapperArgs+=(--set SDL_VIDEODRIVER x11)"} makeWrapper "$out/games/speed-dreams-2" "$out/bin/speed-dreams" "''${makeWrapperArgs[@]}" ''; @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { minizip rhash ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL libGLU libglut diff --git a/pkgs/by-name/st/star/package.nix b/pkgs/by-name/st/star/package.nix index c9adc50fefea..782ddd4dcf50 100644 --- a/pkgs/by-name/st/star/package.nix +++ b/pkgs/by-name/st/star/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ xxd ]; - buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; + buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; enableParallelBuilding = true; makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "CXXFLAGS_SIMD=" ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' export CXXFLAGS="$CXXFLAGS -DSHM_NORESERVE=0" ''; diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix index 55efa152c717..b64a87251b15 100644 --- a/pkgs/by-name/st/starboard/package.nix +++ b/pkgs/by-name/st/starboard/package.nix @@ -50,7 +50,7 @@ buildGoModule (finalAttrs: { preCheck = '' # Remove test that requires networking rm pkg/plugin/aqua/client/client_integration_test.go - ${lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + ${lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' # Remove "[It] should make a request to fetch registries" test that fails on x86_64-darwin rm pkg/plugin/aqua/client/client_test.go ''} diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 24c64a9ac658..48c85b702b36 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -37,7 +37,7 @@ buildGoModule { checkFlags = [ "-skip=^TestReturnDirElement/Sort_by_Date$" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Only failing on nix darwin. I suspect this is due to the way # darwin handles file permissions. "-skip=^TestCompressSelectedFiles" diff --git a/pkgs/by-name/ti/time12/package.nix b/pkgs/by-name/ti/time12/package.nix index d8de9cb1b581..e4d8f572babf 100644 --- a/pkgs/by-name/ti/time12/package.nix +++ b/pkgs/by-name/ti/time12/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libx11 libxcomposite diff --git a/pkgs/by-name/ti/timr-tui/package.nix b/pkgs/by-name/ti/timr-tui/package.nix index de7e88f5bee3..8bef4a38dba3 100644 --- a/pkgs/by-name/ti/timr-tui/package.nix +++ b/pkgs/by-name/ti/timr-tui/package.nix @@ -28,10 +28,10 @@ rustPlatform.buildRustPackage (finalAttrs: { # Enable upstream "sound" feature when requested buildFeatures = lib.optionals enableSound [ "sound" ]; - nativeBuildInputs = lib.optionals (enableSound && stdenv.isLinux) [ pkg-config ]; + nativeBuildInputs = lib.optionals (enableSound && stdenv.hostPlatform.isLinux) [ pkg-config ]; # Runtime/FFI deps for the sound feature (Linux) - buildInputs = lib.optionals (enableSound && stdenv.isLinux) [ + buildInputs = lib.optionals (enableSound && stdenv.hostPlatform.isLinux) [ (alsa-lib-with-plugins.override { plugins = [ alsa-plugins diff --git a/pkgs/by-name/tr/transito/package.nix b/pkgs/by-name/tr/transito/package.nix index db5d3856d771..7e60406bfc9c 100644 --- a/pkgs/by-name/tr/transito/package.nix +++ b/pkgs/by-name/tr/transito/package.nix @@ -74,6 +74,6 @@ buildGoModule (finalAttrs: { maintainers = [ lib.maintainers.McSinyx ]; mainProgram = "transito"; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/tu/turingdb/package.nix b/pkgs/by-name/tu/turingdb/package.nix index ea231abddab7..091b7e8b7cb7 100644 --- a/pkgs/by-name/tu/turingdb/package.nix +++ b/pkgs/by-name/tu/turingdb/package.nix @@ -22,7 +22,7 @@ }: let - turingstdenv = if stdenv.isDarwin then llvmPackages_20.stdenv else stdenv; + turingstdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_20.stdenv else stdenv; in turingstdenv.mkDerivation (finalAttrs: { pname = "turingdb"; @@ -71,7 +71,7 @@ turingstdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals turingstdenv.isDarwin [ llvmPackages_20.openmp ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; cmakeFlags = [ (lib.cmakeBool "NIX_BUILD" true) @@ -80,7 +80,7 @@ turingstdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_EXE_LINKER_FLAGS" "-lgomp") (lib.cmakeFeature "FLEX_INCLUDE_DIR" "${lib.getDev flex}/include") ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "OpenMP_CXX_FLAGS" "-fopenmp") (lib.cmakeFeature "OpenMP_CXX_LIB_NAMES" "omp") (lib.cmakeFeature "OpenMP_omp_LIBRARY" "${lib.getLib llvmPackages_20.openmp}/lib/libomp.dylib") diff --git a/pkgs/by-name/un/unnix/package.nix b/pkgs/by-name/un/unnix/package.nix index c088df964b67..54234e0ac55a 100644 --- a/pkgs/by-name/un/unnix/package.nix +++ b/pkgs/by-name/un/unnix/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, installShellFiles, pkg-config, - withBubblewrap ? stdenv.isLinux, + withBubblewrap ? stdenv.hostPlatform.isLinux, makeBinaryWrapper, xz, zstd, diff --git a/pkgs/by-name/vc/vcv-rack/package.nix b/pkgs/by-name/vc/vcv-rack/package.nix index 761a00c43949..8e49779c72c1 100644 --- a/pkgs/by-name/vc/vcv-rack/package.nix +++ b/pkgs/by-name/vc/vcv-rack/package.nix @@ -249,13 +249,13 @@ stdenv.mkDerivation (finalAttrs: { pkg-config zstd ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems imagemagick libicns wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ rsync ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rsync ]; buildInputs = [ curl @@ -320,7 +320,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png done; '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{bin,Applications} mv dist/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app' \ $out/Applications diff --git a/pkgs/by-name/ve/vengi-tools/package.nix b/pkgs/by-name/ve/vengi-tools/package.nix index 2484bdf1e39d..57ee941258a9 100644 --- a/pkgs/by-name/ve/vengi-tools/package.nix +++ b/pkgs/by-name/ve/vengi-tools/package.nix @@ -133,6 +133,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; # Segfaults when building shaders - broken = stdenv.isLinux; + broken = stdenv.hostPlatform.isLinux; }; }) diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index 0fd8c7674883..6a2516a3e2d3 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -49,7 +49,7 @@ withDevDoc ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD - && !(stdenv.hostPlatform.isRiscV && stdenv.isLinux), + && !(stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.isLinux), # passthru testers, diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index c09db62db93a..cfa6c39587b6 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -32,7 +32,7 @@ buildNpmPackage (finalAttrs: { pkg-config nodejs-slim.python ] - ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar + ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar buildInputs = [ libsecret ]; diff --git a/pkgs/by-name/vs/vscode-solidity-server/package.nix b/pkgs/by-name/vs/vscode-solidity-server/package.nix index aa91cf45f815..2b26b7c5b3ef 100644 --- a/pkgs/by-name/vs/vscode-solidity-server/package.nix +++ b/pkgs/by-name/vs/vscode-solidity-server/package.nix @@ -21,7 +21,7 @@ buildNpmPackage { npmDepsHash = "sha256-zXhWtPuiu+CRk712KskuHP4vglogJmFoCak6qWczPFM="; - nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar buildInputs = [ libsecret ]; diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix index 664e45982fba..22ac32255b97 100644 --- a/pkgs/by-name/we/weasis/package.nix +++ b/pkgs/by-name/we/weasis/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems makeBinaryWrapper ] - ++ lib.optional stdenv.isDarwin unzip; + ++ lib.optional stdenv.hostPlatform.isDarwin unzip; desktopItems = [ (makeDesktopItem { @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/{bin,opt/Weasis,share/{applications,icons/hicolor/64x64/apps}} mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis/* $out/opt/Weasis @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runtimeDeps} done '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis.app $out/Applications/ '' diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix index b507e34814d2..5cbbb917a407 100644 --- a/pkgs/by-name/wh/whisper-cpp/package.nix +++ b/pkgs/by-name/wh/whisper-cpp/package.nix @@ -100,7 +100,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { for target in examples/{bench,command,cli,quantize,server,stream,talk-llama}/CMakeLists.txt; do if ! grep -q -F 'install('; then echo 'install(TARGETS ''${TARGET} RUNTIME)' >> $target - ${lib.optionalString stdenv.isDarwin "echo 'install(TARGETS whisper.coreml LIBRARY)' >> src/CMakeLists.txt"} + ${lib.optionalString stdenv.hostPlatform.isDarwin "echo 'install(TARGETS whisper.coreml LIBRARY)' >> src/CMakeLists.txt"} fi done ''; diff --git a/pkgs/by-name/xa/xash3d-fwgs/package.nix b/pkgs/by-name/xa/xash3d-fwgs/package.nix index 1a2854c84a25..ec155f7d9c7d 100644 --- a/pkgs/by-name/xa/xash3d-fwgs/package.nix +++ b/pkgs/by-name/xa/xash3d-fwgs/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { bzip2 SDL2 ] - ++ lib.optionals (!buildServer && stdenv.isLinux) [ + ++ lib.optionals (!buildServer && stdenv.hostPlatform.isLinux) [ libx11 ]; diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index b519f2407933..4601ddacc909 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; - checkInputs = lib.optionals stdenv.isLinux [ acl ]; + checkInputs = lib.optionals stdenv.hostPlatform.isLinux [ acl ]; # disable tests depending on special filesystem features checkNoDefaultFeatures = true; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # had concurrency issues on 64 cores, also tests are quite fast compared to build dontUseCargoParallelTests = true; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # ---- test_socket_file::test_with_parallel_file_driver stdout ---- # STDOUT: 12:20:56 [WARN] Socket copy not supported by this OS: /private/tmp/nix-build-xcp-0.24.1.drv-0/source/targ> # diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix index e31ff0f1be71..94b9c4ca7233 100644 --- a/pkgs/by-name/xd/xdg-user-dirs/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libintl ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-liconv"; }; diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index f4848494253d..2fc27e57c7d1 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -73,7 +73,7 @@ buildPythonPackage rec { # required by test_xonsh_activator virtualenv ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # required by test_man_completion man util-linux @@ -110,7 +110,7 @@ buildPythonPackage rec { "test_vc_get_branch" "test_dirty_working_directory" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails on Darwin "test_bash_and_is_alias_is_only_functional_alias" "test_complete_command" diff --git a/pkgs/development/compilers/dotnet/source/vmr.nix b/pkgs/development/compilers/dotnet/source/vmr.nix index b3b89bf9f6a7..44e028c3b2bd 100644 --- a/pkgs/development/compilers/dotnet/source/vmr.nix +++ b/pkgs/development/compilers/dotnet/source/vmr.nix @@ -508,10 +508,11 @@ stdenv.mkDerivation { runHook postInstall ''; - ${if stdenv.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null} = '' - mkdir -p "$out"/nix-support - echo ${sigtool} > "$out"/nix-support/manual-sdk-deps - ''; + ${if stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null} = + '' + mkdir -p "$out"/nix-support + echo ${sigtool} > "$out"/nix-support/manual-sdk-deps + ''; # stripping dlls results in: # Failed to load System.Private.CoreLib.dll (error code 0x8007000B) diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix index c94536743167..4c66e0ad08b1 100644 --- a/pkgs/development/interpreters/love/11.nix +++ b/pkgs/development/interpreters/love/11.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix rpath so love binary can find libliblove.dylib install_name_tool -change "@rpath/libliblove.dylib" "$out/lib/libliblove.dylib" "$out/bin/love" ''; diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 61b6ece1cff7..aacd4a50f780 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -55,7 +55,7 @@ deployAndroidPackage { libxkbfile libxshmfence ]) - ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc; + ++ lib.optional (os == "linux" && stdenv.hostPlatform.isx86_64) pkgsi686Linux.glibc; patchInstructions = (lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index f46ffe5b9f0e..df216fefdb17 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -28,7 +28,7 @@ deployAndroidPackage { libxrender libxext ]) - ++ lib.optionals (os == "linux" && stdenv.isx86_64) ( + ++ lib.optionals (os == "linux" && stdenv.hostPlatform.isx86_64) ( with pkgsi686Linux; [ glibc diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index d21337899238..16c7c83b4739 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -48,7 +48,7 @@ buildPythonPackage (finalAttrs: { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Output is slightly different on macOS "test_cast_format_locale" ]; diff --git a/pkgs/development/python-modules/ai-edge-litert/default.nix b/pkgs/development/python-modules/ai-edge-litert/default.nix index 58be026d1134..a1df84f92fe2 100644 --- a/pkgs/development/python-modules/ai-edge-litert/default.nix +++ b/pkgs/development/python-modules/ai-edge-litert/default.nix @@ -77,7 +77,7 @@ buildPythonPackage { passthru.updateScript = ./update.py; meta = { - broken = stdenv.isDarwin; # elftools.common.exceptions.ELFError: Magic number does not match + broken = stdenv.hostPlatform.isDarwin; # elftools.common.exceptions.ELFError: Magic number does not match changelog = "https://github.com/google-ai-edge/LiteRT/releases/tag/v${release.version}"; description = "LiteRT is for mobile and embedded devices"; downloadPage = "https://github.com/google-ai-edge/LiteRT"; diff --git a/pkgs/development/python-modules/anndata/default.nix b/pkgs/development/python-modules/anndata/default.nix index 3d909a6e51d2..daea4573b0e3 100644 --- a/pkgs/development/python-modules/anndata/default.nix +++ b/pkgs/development/python-modules/anndata/default.nix @@ -126,7 +126,7 @@ buildPythonPackage rec { # Tests that are seemingly broken. See https://github.com/scverse/anndata/issues/2017. "test_concat_dask_sparse_matches_memory" ] - ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ # RuntimeError: Cluster failed to start: [Errno 1] Operation not permitted "test_dask_distributed_write" "test_read_lazy_h5_cluster" diff --git a/pkgs/development/python-modules/ar/default.nix b/pkgs/development/python-modules/ar/default.nix index 420b0e17e648..461f21af25e1 100644 --- a/pkgs/development/python-modules/ar/default.nix +++ b/pkgs/development/python-modules/ar/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ar" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_list" "test_read_content" "test_read_binary" diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix index 3131f75ab469..9a08cd67280b 100644 --- a/pkgs/development/python-modules/beziers/default.nix +++ b/pkgs/development/python-modules/beziers/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pythonImportsCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Fails on macOS with Trace/BPT trap: 5 - something to do with recursion depth "test_cubic_cubic" ]; diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index a4076d57c0cd..892f0726382c 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pytestCheckHook pyvirtualdisplay ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb ]; diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix index d3029dd8b2bf..dca64249d902 100644 --- a/pkgs/development/python-modules/primp/default.nix +++ b/pkgs/development/python-modules/primp/default.nix @@ -56,7 +56,7 @@ buildPythonPackage (finalAttrs: { # Tests crash with Abort trap: 6 on Darwin due to tokio runtime # initialization in PyInit_pyo3_async_runtimes being blocked by the sandbox. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "primp" ]; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 001de77758f4..7780a6a634d2 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { let ext = stdenv.hostPlatform.extensions.sharedLibrary; in - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' cat > pyglet/lib.py < pyglet/lib.py < Date: Sat, 9 May 2026 22:37:26 -0700 Subject: [PATCH 68/69] python3Packages.python-duco-client: init at 0.4.1 --- .../python-duco-client/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/python-duco-client/default.nix diff --git a/pkgs/development/python-modules/python-duco-client/default.nix b/pkgs/development/python-modules/python-duco-client/default.nix new file mode 100644 index 000000000000..7a079ed02de8 --- /dev/null +++ b/pkgs/development/python-modules/python-duco-client/default.nix @@ -0,0 +1,45 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "python-duco-client"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ronaldvdmeer"; + repo = "python-duco-client"; + tag = "v${finalAttrs.version}"; + hash = "sha256-q7Y+66/vJvm05gHyg8mk0vWYySso3DDRvqw6w9hvn9w="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "duco" ]; + + meta = { + description = "Async Python client for the Duco ventilation API"; + homepage = "https://github.com/ronaldvdmeer/python-duco-client"; + changelog = "https://github.com/ronaldvdmeer/python-duco-client/releases/tag/${finalAttrs.src.tag}"; + 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 87bf5404cb22..dcd84157257b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15751,6 +15751,8 @@ self: super: with self; { python-dropbox-api = callPackage ../development/python-modules/python-dropbox-api { }; + python-duco-client = callPackage ../development/python-modules/python-duco-client { }; + python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { }; python-editor = callPackage ../development/python-modules/python-editor { }; From aba2ddc61111c26f168fa538c5df64473a632f80 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 9 May 2026 22:38:24 -0700 Subject: [PATCH 69/69] home-assistant: update component packages --- 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 482ee8572322..f1f496c558f3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1424,7 +1424,8 @@ ]; "duco" = ps: with ps; [ - ]; # missing inputs: python-duco-client + python-duco-client + ]; "dunehd" = ps: with ps; [ pdunehd @@ -7651,6 +7652,7 @@ "dsmr" "dsmr_reader" "duckdns" + "duco" "dunehd" "duotecno" "dwd_weather_warnings"