From 35ea5267403db0e2ecac272fa016e0a5f4b51f20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Feb 2026 17:03:21 +0000 Subject: [PATCH 001/152] python3Packages.iplotx: 1.6.0 -> 1.7.1 --- pkgs/development/python-modules/iplotx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iplotx/default.nix b/pkgs/development/python-modules/iplotx/default.nix index 3f098ef33d2b..8f0ca468ca46 100644 --- a/pkgs/development/python-modules/iplotx/default.nix +++ b/pkgs/development/python-modules/iplotx/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "iplotx"; - version = "1.6.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { owner = "fabilab"; repo = "iplotx"; tag = finalAttrs.version; - hash = "sha256-pTSY7eEYKwBSDttxZqauGCofYK5SFaxjJLXYBwSr3ew="; + hash = "sha256-vLYjTYdt3ctaUwnzV73vNWu2uKpER92SH8uqeLR/G7M="; }; build-system = [ hatchling ]; From 47df79e056c77436adabc5f0865dc96d2e0f4312 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Mar 2026 09:37:13 +0000 Subject: [PATCH 002/152] pj: 1.13.0 -> 1.14.0 --- pkgs/by-name/pj/pj/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pj/pj/package.nix b/pkgs/by-name/pj/pj/package.nix index 5b48a60c27bc..42f65a474e6e 100644 --- a/pkgs/by-name/pj/pj/package.nix +++ b/pkgs/by-name/pj/pj/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "pj"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "josephschmitt"; repo = "pj"; tag = "v${finalAttrs.version}"; - hash = "sha256-T09puEftbgvtXKcywJcXHfI+UTKGjyFaPMr7LEHDIUQ="; + hash = "sha256-i6BYNKizpEE3OffkOuAShFow21sMMHPyCK5RMguXCCQ="; }; vendorHash = "sha256-rya2afSV9Y1hmUZU0wyR9NETBl3TXD/OTHv0zvVl8v8="; From a2c168923d054830222be49f5b737f56a2131107 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Mar 2026 17:45:09 +0000 Subject: [PATCH 003/152] cni-plugins: 1.9.0 -> 1.9.1 --- pkgs/applications/networking/cluster/cni/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 5803d84dc9d8..f57bbe3679a2 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-0ZonR8pV20bBbC2AkNCJhoseDVxNwwMa7coD/ON6clA="; + hash = "sha256-3OhUvIJPU5Ayc4/po9Rj4Tfa5536aN8bj+51M6Xg5os="; }; vendorHash = null; From e5d27c1b2be0165d6c7ce83ffd652c18f382c590 Mon Sep 17 00:00:00 2001 From: Benoit Brard <32198131+83noit@users.noreply.github.com> Date: Sat, 28 Mar 2026 13:22:17 +0000 Subject: [PATCH 004/152] ttdl: 4.25.1 -> 6.0.0 --- pkgs/by-name/tt/ttdl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index a4b70b2f9ba4..1d2df7b72ff7 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ttdl"; - version = "4.25.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-gDR9EQN1EorqELaWUk+0sFwa6FxjmdkCLXudnFRjs+U="; + sha256 = "sha256-/G8JHqlX6odUnNK8n/NWW843MltBEdiOSeQSzesCJ6Q="; }; - cargoHash = "sha256-+G2F5HGv57JqKJF6G1I7gLOrQSma9RUXdG4CVsdplaE="; + cargoHash = "sha256-WBbHllQxiePIiMKaOuoB1Htt1im0doZb20hvgIFxAZc="; meta = { description = "CLI tool to manage todo lists in todo.txt format"; From 22f3d00fd6940262817277cc422fb7b2989599a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Mar 2026 00:30:08 +0000 Subject: [PATCH 005/152] vokoscreen-ng: 4.8.3 -> 4.9.0 --- pkgs/by-name/vo/vokoscreen-ng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vo/vokoscreen-ng/package.nix b/pkgs/by-name/vo/vokoscreen-ng/package.nix index 6bb7e40a4b83..2003ca1cb20f 100644 --- a/pkgs/by-name/vo/vokoscreen-ng/package.nix +++ b/pkgs/by-name/vo/vokoscreen-ng/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vokoscreen-ng"; - version = "4.8.3"; + version = "4.9.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; tag = finalAttrs.version; - hash = "sha256-D2E4G6rq6kFZbwjYhoccl/aROCdpuS8UJu0JKGc8wKU="; + hash = "sha256-ncN5ZKPd//yE+HKBzVud1Xw+2qHmw2bRNWHdMpVcGlw="; }; qmakeFlags = [ "src/vokoscreenNG.pro" ]; From 903b8bc1c69ec3dc56858ab25762649a31b7e93f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Mar 2026 08:46:33 +0000 Subject: [PATCH 006/152] python3Packages.pinecone-plugin-assistant: 3.0.2 -> 3.0.3 --- .../python-modules/pinecone-plugin-assistant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix b/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix index e21032893ab7..9c3e3999bf11 100644 --- a/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix +++ b/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pinecone-plugin-assistant"; - version = "3.0.2"; + version = "3.0.3"; pyproject = true; src = fetchPypi { pname = "pinecone_plugin_assistant"; inherit version; - hash = "sha256-BBY68oKteJW1gauJ+FDtE55N3OpyAQyt+kxXN1nVyJY="; + hash = "sha256-U/VI7eYKldef9I14ZaPQr9Zlztnnd1gnLmK6DGxjvSY="; }; build-system = [ From 24eeb3b56ad53b2d4a37e8429e8270e9d9f30f50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Apr 2026 03:56:55 +0000 Subject: [PATCH 007/152] python3Packages.junitparser: 4.0.2 -> 5.0.0 --- pkgs/development/python-modules/junitparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix index 6e8471c8a02c..d476d86775a9 100644 --- a/pkgs/development/python-modules/junitparser/default.nix +++ b/pkgs/development/python-modules/junitparser/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "junitparser"; - version = "4.0.2"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "weiwei"; repo = "junitparser"; tag = version; - hash = "sha256-+81n5xW9SEE+NZbYKxXu6xupoq4/haUZokVardh43iM="; + hash = "sha256-I/bQQPT6b6PTZ9bIlWCQmN/gUWnVIO42xtJh/g7L79A="; }; build-system = [ setuptools ]; From 953dd06ec644f340669c72d5ec2c556302d1fcb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Apr 2026 05:44:58 +0000 Subject: [PATCH 008/152] astroterm: 1.0.10 -> 1.2.0 --- pkgs/by-name/as/astroterm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/astroterm/package.nix b/pkgs/by-name/as/astroterm/package.nix index 924bc301471e..37364e45b8a0 100644 --- a/pkgs/by-name/as/astroterm/package.nix +++ b/pkgs/by-name/as/astroterm/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "astroterm"; - version = "1.0.10"; + version = "1.2.0"; src = fetchFromGitHub { owner = "da-luce"; repo = "astroterm"; tag = "v${finalAttrs.version}"; - hash = "sha256-z9KblIAoXk///NnRFHCSAFNDuNiPxDuuiliajcsyJM0="; + hash = "sha256-u0UKYoZCDClRmG12czmm0rmOcy3nruarSyjdh8Lu2dw="; }; bsc5File = fetchurl { From ac5c6d2da0e7228699f9008912c2385d11023ee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Apr 2026 21:51:32 +0000 Subject: [PATCH 009/152] python3Packages.qemu-qmp: 0.0.5 -> 0.0.6 --- pkgs/development/python-modules/qemu-qmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qemu-qmp/default.nix b/pkgs/development/python-modules/qemu-qmp/default.nix index d4acf9e0a058..5d0e925fbc58 100644 --- a/pkgs/development/python-modules/qemu-qmp/default.nix +++ b/pkgs/development/python-modules/qemu-qmp/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "qemu-qmp"; - version = "0.0.5"; + version = "0.0.6"; pyproject = true; src = fetchFromGitLab { owner = "qemu-project"; repo = "python-qemu-qmp"; tag = "v${version}"; - hash = "sha256-Mpay8JIau3cuUDxtEVn78prilr+YncmtbVX5LkBDrvk="; + hash = "sha256-iuYiYjUfAxXzG7w7s8I2l5oXROyTjswn++vYs9lauGA="; }; build-system = [ From 8a566cb9b57663630c628cc8a21b8fd282eb1387 Mon Sep 17 00:00:00 2001 From: GraysonTinker Date: Sun, 5 Apr 2026 16:15:04 -0700 Subject: [PATCH 010/152] python3Packages.libbs: fix dependencies Package is still broken but now has dependencies it needs --- .../development/python-modules/libbs/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/libbs/default.nix b/pkgs/development/python-modules/libbs/default.nix index cf4a3b03e00b..dc7b832bb670 100644 --- a/pkgs/development/python-modules/libbs/default.nix +++ b/pkgs/development/python-modules/libbs/default.nix @@ -3,15 +3,13 @@ buildPythonPackage, fetchFromGitHub, filelock, - ghidra-bridge, - jfx-bridge, networkx, platformdirs, ply, prompt-toolkit, psutil, pycparser, - pyhidra, + pyghidra, pytestCheckHook, setuptools, toml, @@ -28,7 +26,7 @@ let hash = "sha256-P7+BTJgdC9W8cC/7xQduFYllF+0ds1dSlm59/BFvZ2g="; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libbs"; version = "3.3.0"; pyproject = true; @@ -36,7 +34,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "binsync"; repo = "libbs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Xe47JZPkbROHFlqc2o/htqvZWjknsv5KekJBqXA44O4="; }; @@ -44,15 +42,13 @@ buildPythonPackage rec { dependencies = [ filelock - ghidra-bridge - jfx-bridge networkx platformdirs ply prompt-toolkit psutil pycparser - pyhidra + pyghidra toml tqdm ]; @@ -81,8 +77,8 @@ buildPythonPackage rec { meta = { description = "Library for writing plugins in any decompiler: includes API lifting, common data formatting, and GUI abstraction"; homepage = "https://github.com/binsync/libbs"; - changelog = "https://github.com/binsync/libbs/releases/tag/${src.tag}"; + changelog = "https://github.com/binsync/libbs/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ scoder12 ]; }; -} +}) From af3057b2fe4e6be485cf5037795f5ef7a13b84db Mon Sep 17 00:00:00 2001 From: GraysonTinker Date: Sun, 5 Apr 2026 16:21:58 -0700 Subject: [PATCH 011/152] python3Packages.ghidra-bridge: drop --- .../python-modules/ghidra-bridge/default.nix | 43 ------------------- .../ghidra-bridge/no-invoke-git.patch | 13 ------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 pkgs/development/python-modules/ghidra-bridge/default.nix delete mode 100644 pkgs/development/python-modules/ghidra-bridge/no-invoke-git.patch diff --git a/pkgs/development/python-modules/ghidra-bridge/default.nix b/pkgs/development/python-modules/ghidra-bridge/default.nix deleted file mode 100644 index 2c50519da9bd..000000000000 --- a/pkgs/development/python-modules/ghidra-bridge/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - jfx-bridge, - setuptools, -}: - -buildPythonPackage rec { - pname = "ghidra-bridge"; - version = "1.0.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "justfoxing"; - repo = "ghidra_bridge"; - tag = version; - hash = "sha256-VcAl1tamsuHvZRtBP0+DCl2A9d7E6aoj2AbJhEcBNMM="; - }; - - patches = [ ./no-invoke-git.patch ]; - - postPatch = '' - substituteInPlace ./setup.py --subst-var-by version ${version} - ''; - - build-system = [ setuptools ]; - - dependencies = [ jfx-bridge ]; - - # Tests require a running server instance - doCheck = false; - - pythonImportsCheck = [ "ghidra_bridge" ]; - - meta = { - description = "Python bridge to Ghidra's Python scripting"; - homepage = "https://github.com/justfoxing/ghidra_bridge"; - changelog = "https://github.com/justfoxing/ghidra_bridge/releases/tag/${src.tag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ scoder12 ]; - }; -} diff --git a/pkgs/development/python-modules/ghidra-bridge/no-invoke-git.patch b/pkgs/development/python-modules/ghidra-bridge/no-invoke-git.patch deleted file mode 100644 index f82ebccde6ea..000000000000 --- a/pkgs/development/python-modules/ghidra-bridge/no-invoke-git.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 9a2abe0..75ce109 100644 ---- a/setup.py -+++ b/setup.py -@@ -6,7 +6,7 @@ with open("README.md", "r") as fh: - - # determine the version, then write it out into the bridge.py file - version = ( -- subprocess.check_output("git describe --tags", shell=True).decode("utf-8").strip() -+ "@version@" - ) - # check if this is a non-tag release and remark it as a dev release - if "-" in version: diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 070b98284fbf..4527c21e2e45 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -231,6 +231,7 @@ mapAliases { FormEncode = throw "'FormEncode' has been renamed to/replaced by 'formencode'"; # Converted to throw 2025-10-29 garminconnect-ha = throw "'garminconnect-ha' has been renamed to/replaced by 'garminconnect'"; # Converted to throw 2025-10-29 GeoIP = throw "'GeoIP' has been renamed to/replaced by 'geoip'"; # Converted to throw 2025-10-29 + ghidra-bridge = throw "'ghidra-bridge' has been removed as it was unmaintained upstream"; # Added 2026-04-05 github3_py = throw "'github3_py' has been renamed to/replaced by 'github3-py'"; # Converted to throw 2025-10-29 GitPython = throw "'GitPython' has been renamed to/replaced by 'gitpython'"; # Converted to throw 2025-10-29 google_api_python_client = throw "'google_api_python_client' has been renamed to/replaced by 'google-api-python-client'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 145dd80ebfe5..0123a8767605 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6232,8 +6232,6 @@ self: super: with self; { ghdiff = callPackage ../development/python-modules/ghdiff { }; - ghidra-bridge = callPackage ../development/python-modules/ghidra-bridge { }; - ghmap = callPackage ../development/python-modules/ghmap { }; ghome-foyer-api = callPackage ../development/python-modules/ghome-foyer-api { }; From 1e331e9dbff0a1a2da78668a06f2fb7d65d6a868 Mon Sep 17 00:00:00 2001 From: GraysonTinker Date: Sun, 5 Apr 2026 16:26:08 -0700 Subject: [PATCH 012/152] python3Packages.jfx-bridge: drop --- .../python-modules/jfx-bridge/default.nix | 52 ------------------- .../jfx-bridge/no-invoke-git.patch | 13 ----- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 pkgs/development/python-modules/jfx-bridge/default.nix delete mode 100644 pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch diff --git a/pkgs/development/python-modules/jfx-bridge/default.nix b/pkgs/development/python-modules/jfx-bridge/default.nix deleted file mode 100644 index 2c261be4b96a..000000000000 --- a/pkgs/development/python-modules/jfx-bridge/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytestCheckHook, - python, - setuptools, -}: - -buildPythonPackage rec { - pname = "jfx-bridge"; - version = "1.0.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "justfoxing"; - repo = "jfx_bridge"; - tag = version; - hash = "sha256-fpUrKNGqTpthhTfohCbwO1GBDAP/YnLWeapVhZftldg="; - }; - - patches = [ ./no-invoke-git.patch ]; - - postPatch = '' - substituteInPlace ./setup.py --subst-var-by version ${version} - ''; - - build-system = [ setuptools ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - preCheck = '' - ${python.interpreter} test_bridge_server.py & - ''; - - disabledTests = [ - # known to cause timeout with newer python (acknowledged in test comment) - "test_nonreturn_marker_local" - # the mechanisms that hook into the python import machinery seem broken on newer python - "TestBridgeHookImport" - ]; - - pythonImportsCheck = [ "jfx_bridge" ]; - - meta = { - description = "Base Python RPC bridge used for ghidra_bridge"; - homepage = "https://github.com/justfoxing/jfx_bridge"; - changelog = "https://github.com/justfoxing/jfx_bridge/releases/tag/${src.tag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ scoder12 ]; - }; -} diff --git a/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch b/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch deleted file mode 100644 index 2c1f53ca2d6c..000000000000 --- a/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 079cb01..c5e71b8 100644 ---- a/setup.py -+++ b/setup.py -@@ -6,7 +6,7 @@ with open("README.md", "r") as fh: - long_description = fh.read() - - # determine the version, then write it out into the bridge.py file --version = subprocess.check_output("git describe --tags", shell=True).decode("utf-8").strip() -+version = "@version@" - # check if this is a non-tag release and remark it as a dev release - if "-" in version: - ver, commits, hash = version.split("-") diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4527c21e2e45..5dc3ae361d00 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -272,6 +272,7 @@ mapAliases { jaraco_stream = throw "'jaraco_stream' has been renamed to/replaced by 'jaraco-stream'"; # Converted to throw 2025-10-29 jaraco_text = throw "'jaraco_text' has been renamed to/replaced by 'jaraco-text'"; # Converted to throw 2025-10-29 JayDeBeApi = throw "'JayDeBeApi' has been renamed to/replaced by 'jaydebeapi'"; # Converted to throw 2025-10-29 + jfx-bridge = throw "'jfx-bridge' has been removed as it was unmaintained upstream"; # Added 2026-04-05 jinja2_pluralize = throw "'jinja2_pluralize' has been renamed to/replaced by 'jinja2-pluralize'"; # Converted to throw 2025-10-29 jinja2_time = throw "'jinja2_time' has been renamed to/replaced by 'jinja2-time'"; # Converted to throw 2025-10-29 JPype1 = throw "'JPype1' has been renamed to/replaced by 'jpype1'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0123a8767605..57fa745aa87d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7859,8 +7859,6 @@ self: super: with self; { jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; - jfx-bridge = callPackage ../development/python-modules/jfx-bridge { }; - jh2 = callPackage ../development/python-modules/jh2 { }; jianpu-ly = callPackage ../development/python-modules/jianpu-ly { }; From 6896a860c53b658fcf5493c297fe6a2b010cb54c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Apr 2026 20:38:26 +0000 Subject: [PATCH 013/152] deadbeefPlugins.statusnotifier: 1.6 -> 1.7 --- pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix index f23e967d5687..3f7479882c59 100644 --- a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix +++ b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "deadbeef-statusnotifier-plugin"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "vovochka404"; repo = "deadbeef-statusnotifier-plugin"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-6WEbY59vPNrL3W5GUwFQJimmSS+td8Ob+G46fPAxfV4="; + sha256 = "sha256-pDiQn+iHSTNWTO01j/fbEq3P374TMmnUiC5/Jn2hwBI="; }; nativeBuildInputs = [ pkg-config ]; From a1e6811139347628cd1177535c702fc2a7b7e9c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Apr 2026 20:38:48 +0000 Subject: [PATCH 014/152] dvdisaster: 0.79.10-pl5 -> 0.79.10-pl6 --- pkgs/by-name/dv/dvdisaster/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dv/dvdisaster/package.nix b/pkgs/by-name/dv/dvdisaster/package.nix index e68dfba2d32c..55881bdbea47 100644 --- a/pkgs/by-name/dv/dvdisaster/package.nix +++ b/pkgs/by-name/dv/dvdisaster/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dvdisaster"; - version = "0.79.10-pl5"; + version = "0.79.10-pl6"; src = fetchFromGitHub { owner = "speed47"; repo = "dvdisaster"; tag = "v${finalAttrs.version}"; - hash = "sha256-lWvZDB08lZb87l4oEbrdtc6Me4mWHiW3DFNXYoYR3a0="; + hash = "sha256-yQldvTvmbZgIOLKzdubd1zomSRKvAkTnS6hpEYWPr8A="; }; nativeBuildInputs = [ From 36f3208413b6fa8e104e120dde7db918c153f9ae Mon Sep 17 00:00:00 2001 From: GraysonTinker Date: Sun, 5 Apr 2026 16:32:21 -0700 Subject: [PATCH 015/152] python3Packages.pyhidra: drop --- .../python-modules/pyhidra/default.nix | 57 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/development/python-modules/pyhidra/default.nix diff --git a/pkgs/development/python-modules/pyhidra/default.nix b/pkgs/development/python-modules/pyhidra/default.nix deleted file mode 100644 index 0afc76e3e63c..000000000000 --- a/pkgs/development/python-modules/pyhidra/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - jpype1, - pytest-datadir, - pytestCheckHook, - setuptools, -}: - -buildPythonPackage rec { - pname = "pyhidra"; - version = "1.3.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "dod-cyber-crime-center"; - repo = "pyhidra"; - tag = version; - hash = "sha256-8xouU+S7Apy1ySIlvOLPerTApqKy/MNdl9vuBdt+9Vk="; - }; - - build-system = [ setuptools ]; - - dependencies = [ jpype1 ]; - - nativeCheckInputs = [ - pytest-datadir - pytestCheckHook - ]; - - pythonImportsCheck = [ "pyhidra" ]; - - disabledTests = [ - # Tests require a running Ghidra instance - "test_invalid_jpype_keyword_arg" - "test_invalid_vm_arg_succeed" - "test_run_script" - "test_open_program" - "test_no_compiler" - "test_no_language_with_compiler" - "test_loader" - "test_invalid_loader_type" - "test_no_project" - "test_no_program" - "test_import_script" - "test_import_ghidra_base_java_packages" - ]; - - meta = { - description = "Provides direct access to the Ghidra API within a native CPython interpreter using jpype"; - homepage = "https://github.com/dod-cyber-crime-center/pyhidra"; - changelog = "https://github.com/dod-cyber-crime-center/pyhidra/blob/${src.tag}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ scoder12 ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5dc3ae361d00..0c9f9a81f1c8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -411,6 +411,7 @@ mapAliases { pygls_2 = pygls; # added 2026-01-05 pygtk = throw "pygtk has been removed because it was not supported by python3"; # Added 2026-01-14 pyheif = throw "pyheif has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17 + pyhidra = throw "'pyhidra' has been removed as it was incorporated into upstream and renamed 'pyghidra'"; # Added 2026-04-21 pyhiveapi = throw "'pyhiveapi' has been renamed to/replaced by 'pyhive-integration'"; # Converted to throw 2025-10-29 pyialarmxr = throw "'pyialarmxr' has been renamed to/replaced by 'pyialarmxr-homeassistant'"; # Converted to throw 2025-10-29 PyICU = throw "'PyICU' has been renamed to/replaced by 'pyicu'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57fa745aa87d..cadba9fbe839 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13900,8 +13900,6 @@ self: super: with self; { pyhibp = callPackage ../development/python-modules/pyhibp { }; - pyhidra = callPackage ../development/python-modules/pyhidra { }; - pyhik = callPackage ../development/python-modules/pyhik { }; pyhive-integration = callPackage ../development/python-modules/pyhive-integration { }; From f6c3a18d60ddf603fbb00ce39a4e9c52137110b9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 29 Apr 2026 13:00:49 +0200 Subject: [PATCH 016/152] ettercap: fix link to changelog --- pkgs/by-name/et/ettercap/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/et/ettercap/package.nix b/pkgs/by-name/et/ettercap/package.nix index a34721462648..ab056633e881 100644 --- a/pkgs/by-name/et/ettercap/package.nix +++ b/pkgs/by-name/et/ettercap/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { analysis. ''; homepage = "https://www.ettercap-project.org/"; - changelog = "https://github.com/Ettercap/ettercap/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/Ettercap/ettercap/blob/master/CHANGELOG"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ pSub ]; From 5093e727357706df6630baff313c0cf47dc1cc7b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 29 Apr 2026 13:01:00 +0200 Subject: [PATCH 017/152] global: fix link to changelog --- pkgs/by-name/gl/global/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/global/package.nix b/pkgs/by-name/gl/global/package.nix index 43a1630067ef..447c653a1ea8 100644 --- a/pkgs/by-name/gl/global/package.nix +++ b/pkgs/by-name/gl/global/package.nix @@ -87,8 +87,6 @@ stdenv.mkDerivation (finalAttrs: { peterhoeg ]; platforms = lib.platforms.unix; - changelog = "https://cvs.savannah.gnu.org/viewvc/global/global/NEWS?view=markup&pathrev=VERSION-${ - lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version - }"; + changelog = "https://www.gnu.org/software/global/whatsnew.html"; }; }) From 41bc5f42608e257759ffafc3879ee716c9401ec7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 3 May 2026 16:48:04 +0200 Subject: [PATCH 018/152] avell-unofficial-control-center: migrate to pyproject --- .../av/avell-unofficial-control-center/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/av/avell-unofficial-control-center/package.nix b/pkgs/by-name/av/avell-unofficial-control-center/package.nix index 7802f3057deb..47c7961d686f 100644 --- a/pkgs/by-name/av/avell-unofficial-control-center/package.nix +++ b/pkgs/by-name/av/avell-unofficial-control-center/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication { pname = "avell-unofficial-control-center"; version = "1.0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rodgomesc"; @@ -17,14 +17,16 @@ python3Packages.buildPythonApplication { sha256 = "1qz1kv7p09nxffndzz9jlkzpfx26ppz66f8603zyamjq9dqdmdin"; }; - # No tests included - doCheck = false; + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pyusb elevate ]; + # No tests included + doCheck = false; + meta = { homepage = "https://github.com/rodgomesc/avell-unofficial-control-center"; description = "Software for controlling RGB keyboard lights on some gaming laptops that use ITE Device(8291) Rev 0.03"; From 4d1cc1390c326ab12cc7701867e8c0352269c744 Mon Sep 17 00:00:00 2001 From: Benoit Brard <32198131+83noit@users.noreply.github.com> Date: Wed, 6 May 2026 10:36:05 +0100 Subject: [PATCH 019/152] ttdl: 6.0.0 -> 6.1.1 --- pkgs/by-name/tt/ttdl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index 1d2df7b72ff7..b12b4a1edb80 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ttdl"; - version = "6.0.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-/G8JHqlX6odUnNK8n/NWW843MltBEdiOSeQSzesCJ6Q="; + sha256 = "sha256-E2rhhg1RJOQDD0zAAYGfC52goLLmnWhbgfx6C7VSlAc="; }; - cargoHash = "sha256-WBbHllQxiePIiMKaOuoB1Htt1im0doZb20hvgIFxAZc="; + cargoHash = "sha256-e+cpHAdJzH6UYG2Bv4DpsItLx+lcCFch+K/pTLxMNS4="; meta = { description = "CLI tool to manage todo lists in todo.txt format"; From a587521131a9f30f8a382720851bbf028ba91fb9 Mon Sep 17 00:00:00 2001 From: Kiran Rubin Date: Tue, 19 May 2026 14:42:19 +0300 Subject: [PATCH 020/152] maintainers: add vavakado --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3242041cde63..d2141fa0a0da 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -28859,6 +28859,14 @@ githubId = 110242808; name = "Vasilii Pustovoit"; }; + vavakado = { + email = "xor@vavakado.xyz"; + github = "vavakado"; + githubId = 80159210; + name = "Vladimir Rubin"; + matrix = "@vavakado:imagisphe.re"; + keys = [ { fingerprint = "A054 0374 CD37 2C71 FE6D E0CF CAB7 4472 7F36 B524"; } ]; + }; vbgl = { email = "Vincent.Laporte@gmail.com"; github = "vbgl"; From 9a03e4931fda89c2daa00b2846a7d88387966841 Mon Sep 17 00:00:00 2001 From: Cameron Brown Date: Sat, 23 May 2026 14:47:20 -0400 Subject: [PATCH 021/152] caffeine-ng: 4.2.0 -> 4.3.2 --- pkgs/by-name/ca/caffeine-ng/fix-build.patch | 9 --------- pkgs/by-name/ca/caffeine-ng/package.nix | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ca/caffeine-ng/fix-build.patch b/pkgs/by-name/ca/caffeine-ng/fix-build.patch index cf075451138f..5600731771d7 100644 --- a/pkgs/by-name/ca/caffeine-ng/fix-build.patch +++ b/pkgs/by-name/ca/caffeine-ng/fix-build.patch @@ -13,12 +13,3 @@ index 3e4f9ea..5b82861 100644 ) dependency('pygobject-3.0') -@@ -82,7 +78,7 @@ configure_file( - - install_data( - 'share/applications/caffeine.desktop', -- install_dir: '/etc/xdg/autostart', -+ install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'), - ) - - install_data( diff --git a/pkgs/by-name/ca/caffeine-ng/package.nix b/pkgs/by-name/ca/caffeine-ng/package.nix index 25db55074f19..481aa8870161 100644 --- a/pkgs/by-name/ca/caffeine-ng/package.nix +++ b/pkgs/by-name/ca/caffeine-ng/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "caffeine-ng"; - version = "4.2.0"; + version = "4.3.2"; pyproject = false; src = fetchFromCodeberg { owner = "WhyNotHugo"; repo = "caffeine-ng"; rev = "v${finalAttrs.version}"; - hash = "sha256-uYzLRZ+6ZgIwhSuJWRBpLYHgonX7sFXgUZid0V26V0Q="; + hash = "sha256-eJ/0lzE5X1WFhgTAgI/SOmtxPbK7ppTk90RWobPZk2o="; }; nativeBuildInputs = [ From bc7755192748b43c1c19c994c0ae5eb86a71f388 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 25 May 2026 16:40:12 -0400 Subject: [PATCH 022/152] inlyne: 0.5.0 -> 0.5.2 Diff: https://github.com/Inlyne-Project/inlyne/compare/v0.5.0...v0.5.2 Changelog: https://github.com/Inlyne-Project/inlyne/releases/tag/v0.5.2 --- pkgs/by-name/in/inlyne/package.nix | 12 ++++-------- pkgs/by-name/in/inlyne/update-metrics.patch | 14 -------------- 2 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 pkgs/by-name/in/inlyne/update-metrics.patch diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix index 5c56664215a4..6e5b4e15de90 100644 --- a/pkgs/by-name/in/inlyne/package.nix +++ b/pkgs/by-name/in/inlyne/package.nix @@ -21,21 +21,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inlyne"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "Inlyne-Project"; repo = "inlyne"; rev = "v${finalAttrs.version}"; - hash = "sha256-ueE1NKbCMBUBrrdsHkwZ5Yv6LD3tQL3ZAk2O4xoYOcw="; + hash = "sha256-bUM9Mn/C9l6s6ucoLRo25m4PbbW3gp5d3AvO/9GTJcI="; }; - cargoHash = "sha256-6TwMZNYvW1bBE+9PJUXQxP5Uz7VYsjyLabmaxcX9Mbk="; - - cargoPatches = [ - # update metrics dependency to fix Rust 1.94 compatibility - ./update-metrics.patch - ]; + cargoHash = "sha256-IaaojW5PYSUwyh1iv2HrDidIV8keEykKHY61rpcCAPc="; nativeBuildInputs = [ installShellFiles @@ -83,6 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: { lib.makeLibraryPath [ libGL libx11 + libxkbcommon ] } ''; diff --git a/pkgs/by-name/in/inlyne/update-metrics.patch b/pkgs/by-name/in/inlyne/update-metrics.patch deleted file mode 100644 index 7bfc10569354..000000000000 --- a/pkgs/by-name/in/inlyne/update-metrics.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2409,9 +2409,9 @@ dependencies = [ - - [[package]] - name = "metrics" --version = "0.24.0" -+version = "0.24.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8ae428771d17306715c5091d446327d1cfdedc82185c65ba8423ab404e45bf10" -+checksum = "5d5312e9ba3771cfa961b585728215e3d972c950a3eed9252aa093d6301277e8" - dependencies = [ - "ahash 0.8.11", - "portable-atomic", From fa695d885eb613113e9f95c3799948d3cbfb0c44 Mon Sep 17 00:00:00 2001 From: avosirenfal Date: Mon, 25 May 2026 18:49:59 -0700 Subject: [PATCH 023/152] nixos/fontconfig: add alias support --- nixos/modules/config/fonts/fontconfig.nix | 101 ++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 62214cacc101..74a931e8b0c5 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -127,6 +127,38 @@ let ''; + # user defined font aliases + # priority 53 + aliases = + let + mkFontBlock = + key: fonts: + lib.optionalString ((builtins.length fonts) > 0) '' + <${key}> + ${lib.concatStringsSep "" (map (font: "${font}") fonts)} + + ''; + + mkAliasBlock = family: opts: '' + + ${family} + ${mkFontBlock "prefer" opts.prefer} + ${mkFontBlock "accept" opts.accept} + ${mkFontBlock "default" opts.default} + + ''; + in + pkgs.writeText "fc-53-user-aliases.conf" '' + + + + + + ${lib.concatStringsSep "" (lib.mapAttrsToList mkAliasBlock cfg.aliases)} + + + ''; + # bitmap font options # priority 53 rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" '' @@ -245,6 +277,9 @@ let # 53-no-bitmaps.conf ln -s ${rejectBitmaps} $dst/53-no-bitmaps.conf + # 53-user-aliases.conf + ln -s ${aliases} $dst/53-user-aliases.conf + ${lib.optionalString (!cfg.allowType1) '' # 53-nixos-reject-type1.conf ln -s ${rejectType1} $dst/53-nixos-reject-type1.conf @@ -522,6 +557,69 @@ in description = "Use embedded bitmaps in fonts like Calibri."; }; + aliases = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.submodule { + options = { + binding = lib.mkOption { + type = lib.types.enum [ + "same" + "weak" + "strong" + ]; + default = "same"; + description = '' + Binding precedence for this font family. See + fontconfig "Font Matching" section for details. + ''; + }; + + prefer = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Fonts whose glyphs are chosen preferentially prior + to fonts which match the alias family. + ''; + }; + + accept = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Fonts that are chosen if none of the preferred + fonts, nor the alias family could provide the + desired glyph. + ''; + }; + + default = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Last chance fallback fonts which are chosen by + default if none of the other options could + provide the desired glyph. + ''; + }; + }; + } + ); + default = { }; + example = lib.literalExpression '' + { + # use FreeSans for Greek symbols missing in Helvetica + "Helvetica" = { + default = [ "FreeSans" ]; + }; + }; + ''; + description = '' + Font aliases that can substitute preferential fonts, + or specify custom fallback fonts. + ''; + }; + }; }; @@ -557,6 +655,9 @@ in # 52-nixos-default-fonts.conf r ${defaultFontsConf}, + # 53-user-aliases.conf + r ${aliases}, + # 53-no-bitmaps.conf r ${rejectBitmaps}, From 33bb95dfa0a1764ab501245d963da8afdfde1889 Mon Sep 17 00:00:00 2001 From: Kiran Rubin Date: Tue, 19 May 2026 14:57:41 +0300 Subject: [PATCH 024/152] hinoirisetr: init at 1.6.3 --- pkgs/by-name/hi/hinoirisetr/package.nix | 60 +++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/hi/hinoirisetr/package.nix diff --git a/pkgs/by-name/hi/hinoirisetr/package.nix b/pkgs/by-name/hi/hinoirisetr/package.nix new file mode 100644 index 000000000000..f81630e23e47 --- /dev/null +++ b/pkgs/by-name/hi/hinoirisetr/package.nix @@ -0,0 +1,60 @@ +{ + fetchFromForgejo, + installShellFiles, + lib, + libnotify, + pandoc, + patchelf, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hinoirisetr"; + version = "1.6.3"; + + __structuredAttrs = true; + + src = fetchFromForgejo { + domain = "git.vavakado.xyz"; + owner = "me"; + repo = "hinoirisetr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-XgIeeVCnlntf2RopA6SMuFCgbqTlTEZv6V5ezjEHVKA="; + }; + + cargoHash = "sha256-lydS9TWb+Y1PPC7C3Mn6KNVX1fsooAcDKJeKMnXWZY0="; + + nativeBuildInputs = [ + installShellFiles + pandoc + patchelf + ]; + + buildInputs = [ + libnotify + ]; + + postFixup = '' + patchelf --add-rpath "${lib.getLib libnotify}/lib" $out/bin/hinoirisetr + ''; + + postBuild = '' + pandoc manpages/hinoirisetr.1.md -s -t man -o hinoirisetr.1 + ''; + + postInstall = '' + installManPage hinoirisetr.1 + ''; + + meta = { + description = "a lightweight daemon that automatically adjusts your screen's color temperature and gamma"; + homepage = "https://git.vavakado.xyz/me/hinoirisetr"; + changelog = "https://git.vavakado.xyz/me/hinoirisetr/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + vavakado + ]; + mainProgram = "hinoirisetr"; + platforms = lib.platforms.linux; + }; +}) From e2e2418e60287c1a30a6254b84607de143eabfdd Mon Sep 17 00:00:00 2001 From: Cameron Brown Date: Sat, 23 May 2026 14:33:20 -0400 Subject: [PATCH 025/152] byobu: 6.13 -> 6.15 --- pkgs/by-name/by/byobu/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/by/byobu/package.nix b/pkgs/by-name/by/byobu/package.nix index 95db27a77ca8..926b82cd66cc 100644 --- a/pkgs/by-name/by/byobu/package.nix +++ b/pkgs/by-name/by/byobu/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "byobu"; - version = "6.13"; + version = "6.15"; src = fetchFromGitHub { owner = "dustinkirkland"; repo = "byobu"; - rev = finalAttrs.version; - hash = "sha256-h+3BEMfBRozmpqFNRyfKzjKgevaYm8v7DsJMwkhiCQ4="; + tag = finalAttrs.version; + hash = "sha256-QovoXH8cm8CZMSYGjI7FgynHtJjahpe9R2s62F7aZvo="; }; nativeBuildInputs = [ @@ -103,9 +103,9 @@ stdenv.mkDerivation (finalAttrs: { Tmux terminal multiplexer, and works on most Linux, BSD, and Mac distributions. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "byobu"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ cbrxyz ]; platforms = lib.platforms.unix; }; }) From 7b944799c98421b873982b4cc8fb3836447eeeb8 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Tue, 2 Jun 2026 10:45:27 +0200 Subject: [PATCH 026/152] rmapi: add boltzmannrain to maintainers I use this package and can help approving version bumps like https://github.com/NixOS/nixpkgs/pull/515009 --- pkgs/by-name/rm/rmapi/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix index 509c11d6ea86..a797bca9e89c 100644 --- a/pkgs/by-name/rm/rmapi/package.nix +++ b/pkgs/by-name/rm/rmapi/package.nix @@ -24,7 +24,10 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/ddvk/rmapi"; changelog = "https://github.com/ddvk/rmapi/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.agpl3Only; - maintainers = [ lib.maintainers.nickhu ]; + maintainers = with lib.maintainers; [ + nickhu + boltzmannrain + ]; mainProgram = "rmapi"; }; }) From c1b9d04d9cf9ef877ffba9ba2efdd22f3bb98f3e Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 4 Jun 2026 12:02:22 +0200 Subject: [PATCH 027/152] maintainers: drop momeemt Signed-off-by: Marcin Serwin --- maintainers/maintainer-list.nix | 7 ------- pkgs/by-name/ac/actionlint/package.nix | 2 +- pkgs/by-name/al/algolia-cli/package.nix | 2 +- pkgs/by-name/al/almo/package.nix | 2 +- pkgs/by-name/av/avro-tools/package.nix | 2 +- pkgs/by-name/bl/bloaty/package.nix | 2 +- pkgs/by-name/bu/buildpack/package.nix | 2 +- pkgs/by-name/bu/bundletool/package.nix | 2 +- pkgs/by-name/cf/cfn-nag/package.nix | 1 - pkgs/by-name/cl/clean-css-cli/package.nix | 2 +- pkgs/by-name/ej/ejs/package.nix | 2 +- pkgs/by-name/fi/firebase-tools/package.nix | 1 - pkgs/by-name/le/leiningen/package.nix | 2 +- pkgs/by-name/lh/lha/package.nix | 3 +-- pkgs/by-name/re/redo/package.nix | 2 +- pkgs/by-name/sa/satyrographos/package.nix | 2 +- pkgs/by-name/sa/satysfi/package.nix | 1 - pkgs/by-name/sm/smatch/package.nix | 2 +- pkgs/by-name/sn/snyk/package.nix | 2 +- pkgs/by-name/sp/spectral-language-server/package.nix | 2 +- pkgs/by-name/st/stylelint/package.nix | 2 +- pkgs/by-name/su/superfile/package.nix | 1 - pkgs/by-name/tf/tflint/package.nix | 2 +- pkgs/development/ocaml-modules/amqp-client/default.nix | 2 +- pkgs/development/ocaml-modules/ancient/default.nix | 2 +- pkgs/development/ocaml-modules/benchmark/default.nix | 2 +- pkgs/development/ocaml-modules/bisect_ppx/default.nix | 2 +- .../development/ocaml-modules/brisk-reconciler/default.nix | 2 +- pkgs/development/ocaml-modules/ffmpeg/base.nix | 1 - pkgs/development/ocaml-modules/mirage-crypto/default.nix | 1 - pkgs/development/ocaml-modules/odoc-parser/default.nix | 2 +- 31 files changed, 24 insertions(+), 38 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 236e5638263b..fdcefd9d56be 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18456,13 +18456,6 @@ github = "mohe2015"; githubId = 13287984; }; - momeemt = { - name = "Mutsuha Asada"; - email = "me@momee.mt"; - github = "momeemt"; - githubId = 43488453; - keys = [ { fingerprint = "D94F EA9F 5B08 F6A1 7B8F EB8B ACB5 4F0C BC6A A7C6"; } ]; - }; monaaraj = { name = "Mon Aaraj"; email = "owo69uwu69@gmail.com"; diff --git a/pkgs/by-name/ac/actionlint/package.nix b/pkgs/by-name/ac/actionlint/package.nix index 06008b257a97..0b0b0e8b388d 100644 --- a/pkgs/by-name/ac/actionlint/package.nix +++ b/pkgs/by-name/ac/actionlint/package.nix @@ -53,7 +53,7 @@ buildGoModule (finalAttrs: { description = "Static checker for GitHub Actions workflow files"; changelog = "https://github.com/rhysd/actionlint/raw/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; mainProgram = "actionlint"; }; }) diff --git a/pkgs/by-name/al/algolia-cli/package.nix b/pkgs/by-name/al/algolia-cli/package.nix index 00061b1b3f7e..ce2c6b3f0da1 100644 --- a/pkgs/by-name/al/algolia-cli/package.nix +++ b/pkgs/by-name/al/algolia-cli/package.nix @@ -43,6 +43,6 @@ buildGoModule { mainProgram = "algolia"; homepage = "https://algolia.com/doc/tools/cli/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/al/almo/package.nix b/pkgs/by-name/al/almo/package.nix index 818dec23a5ef..897886a97d85 100644 --- a/pkgs/by-name/al/almo/package.nix +++ b/pkgs/by-name/al/almo/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; homepage = "https://github.com/abap34/almo"; changelog = "https://github.com/abap34/almo/releases/tag/${finalAttrs.src.tag}"; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; mainProgram = "almo"; }; }) diff --git a/pkgs/by-name/av/avro-tools/package.nix b/pkgs/by-name/av/avro-tools/package.nix index 962349c2119f..eb01fac8f562 100644 --- a/pkgs/by-name/av/avro-tools/package.nix +++ b/pkgs/by-name/av/avro-tools/package.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "avro-tools"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/bl/bloaty/package.nix b/pkgs/by-name/bl/bloaty/package.nix index 08cb16425ec1..e79fe2cc40ab 100644 --- a/pkgs/by-name/bl/bloaty/package.nix +++ b/pkgs/by-name/bl/bloaty/package.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation { homepage = "https://github.com/google/bloaty"; license = lib.licenses.asl20; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix index a3ac52c26266..09dcb0b5cc33 100644 --- a/pkgs/by-name/bu/buildpack/package.nix +++ b/pkgs/by-name/bu/buildpack/package.nix @@ -42,6 +42,6 @@ buildGoModule (finalAttrs: { description = "CLI for building apps using Cloud Native Buildpacks"; mainProgram = "pack"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/bu/bundletool/package.nix b/pkgs/by-name/bu/bundletool/package.nix index befdb021fcb1..e9762efa20d8 100644 --- a/pkgs/by-name/bu/bundletool/package.nix +++ b/pkgs/by-name/bu/bundletool/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://developer.android.com/studio/command-line/bundletool"; changelog = "https://github.com/google/bundletool/releases/tag/${finalAttrs.version}"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; platforms = jre_headless.meta.platforms; license = lib.licenses.asl20; }; diff --git a/pkgs/by-name/cf/cfn-nag/package.nix b/pkgs/by-name/cf/cfn-nag/package.nix index b5f7cd01298a..f4ba07fd8c1a 100644 --- a/pkgs/by-name/cf/cfn-nag/package.nix +++ b/pkgs/by-name/cf/cfn-nag/package.nix @@ -19,7 +19,6 @@ bundlerEnv { mainProgram = "cfn_nag"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - momeemt mathstlouis ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/cl/clean-css-cli/package.nix b/pkgs/by-name/cl/clean-css-cli/package.nix index 4141f0731390..bfdf30b9a55e 100644 --- a/pkgs/by-name/cl/clean-css-cli/package.nix +++ b/pkgs/by-name/cl/clean-css-cli/package.nix @@ -26,6 +26,6 @@ buildNpmPackage (finalAttrs: { changelog = "https://github.com/clean-css/clean-css-cli/blob/v${finalAttrs.version}/History.md"; license = lib.licenses.mit; mainProgram = "cleancss"; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ej/ejs/package.nix b/pkgs/by-name/ej/ejs/package.nix index 60737a1dbf6f..c3d40e9ed5a7 100644 --- a/pkgs/by-name/ej/ejs/package.nix +++ b/pkgs/by-name/ej/ejs/package.nix @@ -32,6 +32,6 @@ buildNpmPackage { homepage = "https://ejs.co"; license = lib.licenses.asl20; mainProgram = "ejs"; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 990743c533c3..35c3c1d01dc3 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -46,7 +46,6 @@ buildNpmPackage rec { license = lib.licenses.mit; mainProgram = "firebase"; maintainers = with lib.maintainers; [ - momeemt sarahec ]; }; diff --git a/pkgs/by-name/le/leiningen/package.nix b/pkgs/by-name/le/leiningen/package.nix index 01550fdb9768..f06f6d58ed8c 100644 --- a/pkgs/by-name/le/leiningen/package.nix +++ b/pkgs/by-name/le/leiningen/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.epl10; platforms = jdk.meta.platforms; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; mainProgram = "lein"; }; }) diff --git a/pkgs/by-name/lh/lha/package.nix b/pkgs/by-name/lh/lha/package.nix index 9fea6e1beefe..49371a72bd70 100644 --- a/pkgs/by-name/lh/lha/package.nix +++ b/pkgs/by-name/lh/lha/package.nix @@ -22,8 +22,7 @@ stdenv.mkDerivation { description = "Archiver and compressor using the LZSS and Huffman encoding compression algorithms"; homepage = "https://github.com/jca02266/lha"; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - momeemt + maintainers = [ ]; # Some of the original LHa code has been rewritten and the current author # considers adopting a "true" free and open source license for it. diff --git a/pkgs/by-name/re/redo/package.nix b/pkgs/by-name/re/redo/package.nix index 8e3e138501e9..941f0fbd56aa 100644 --- a/pkgs/by-name/re/redo/package.nix +++ b/pkgs/by-name/re/redo/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { homepage = "https://github.com/jdebp/redo"; description = "System for building target files from source files"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; mainProgram = "redo"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/sa/satyrographos/package.nix b/pkgs/by-name/sa/satyrographos/package.nix index 035477bf2682..2b58265306d5 100644 --- a/pkgs/by-name/sa/satyrographos/package.nix +++ b/pkgs/by-name/sa/satyrographos/package.nix @@ -40,7 +40,7 @@ ocamlPackages.buildDunePackage { changelog = "https://github.com/na4zagin3/satyrographos/releases/tag/${src.rev}"; description = "Package manager for SATySFi"; homepage = "https://github.com/na4zagin3/satyrographos"; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; mainProgram = "satyrographos"; license = lib.licenses.lgpl3Plus; }; diff --git a/pkgs/by-name/sa/satysfi/package.nix b/pkgs/by-name/sa/satysfi/package.nix index 2e7de38ddd75..fe7d71c8b4be 100644 --- a/pkgs/by-name/sa/satysfi/package.nix +++ b/pkgs/by-name/sa/satysfi/package.nix @@ -95,7 +95,6 @@ ocamlPackages.buildDunePackage { license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ mt-caret - momeemt ]; platforms = lib.platforms.all; mainProgram = "satysfi"; diff --git a/pkgs/by-name/sm/smatch/package.nix b/pkgs/by-name/sm/smatch/package.nix index 9ebdcc4f0005..7c8f27c0b5a3 100644 --- a/pkgs/by-name/sm/smatch/package.nix +++ b/pkgs/by-name/sm/smatch/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Semantic analysis tool for C"; homepage = "https://sparse.docs.kernel.org/"; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix index 191095e39362..35312af8fff3 100644 --- a/pkgs/by-name/sn/snyk/package.nix +++ b/pkgs/by-name/sn/snyk/package.nix @@ -43,7 +43,7 @@ buildNpmPackage { homepage = "https://snyk.io"; changelog = "https://github.com/snyk/cli/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; mainProgram = "snyk"; }; } diff --git a/pkgs/by-name/sp/spectral-language-server/package.nix b/pkgs/by-name/sp/spectral-language-server/package.nix index df7410f77def..059177ba9e35 100644 --- a/pkgs/by-name/sp/spectral-language-server/package.nix +++ b/pkgs/by-name/sp/spectral-language-server/package.nix @@ -102,7 +102,7 @@ buildNpmPackage { meta = { homepage = "https://github.com/luizcorreia/spectral-language-server"; description = "Awesome Spectral JSON/YAML linter with OpenAPI/AsyncAPI support"; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; license = lib.licenses.mit; mainProgram = "spectral-language-server"; }; diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix index 715d0d674b23..25505a25aac8 100644 --- a/pkgs/by-name/st/stylelint/package.nix +++ b/pkgs/by-name/st/stylelint/package.nix @@ -26,6 +26,6 @@ buildNpmPackage rec { mainProgram = "stylelint"; homepage = "https://stylelint.io"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 48c85b702b36..2e99634fed01 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -51,7 +51,6 @@ buildGoModule { changelog = "https://github.com/yorukot/superfile/blob/${tag}/changelog.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - momeemt redyf ]; mainProgram = "superfile"; diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix index bd873fcaa6b5..a81576d77f10 100644 --- a/pkgs/by-name/tf/tflint/package.nix +++ b/pkgs/by-name/tf/tflint/package.nix @@ -61,6 +61,6 @@ buildGo125Module (finalAttrs: { homepage = "https://github.com/terraform-linters/tflint"; changelog = "https://github.com/terraform-linters/tflint/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; }) diff --git a/pkgs/development/ocaml-modules/amqp-client/default.nix b/pkgs/development/ocaml-modules/amqp-client/default.nix index 112710d2a439..089c006646d1 100644 --- a/pkgs/development/ocaml-modules/amqp-client/default.nix +++ b/pkgs/development/ocaml-modules/amqp-client/default.nix @@ -25,7 +25,7 @@ buildDunePackage { homepage = "https://github.com/andersfugmann/amqp-client"; license = lib.licenses.bsd3; changelog = "https://raw.githubusercontent.com/andersfugmann/amqp-client/refs/tags/${version}/Changelog"; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; longDescription = '' This library provides high level client bindings for amqp. The library is tested with rabbitmq, but should work with other amqp diff --git a/pkgs/development/ocaml-modules/ancient/default.nix b/pkgs/development/ocaml-modules/ancient/default.nix index 78d2f5e9a637..0fc1528ee8b1 100644 --- a/pkgs/development/ocaml-modules/ancient/default.nix +++ b/pkgs/development/ocaml-modules/ancient/default.nix @@ -37,6 +37,6 @@ buildDunePackage (finalAttrs: { homepage = "https://github.com/OCamlPro/ocaml-ancient"; changelog = "https://raw.githubusercontent.com/OCamlPro/ocaml-ancient/refs/tags/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; }) diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index e3bce24b52fb..c335b7e4380e 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -25,6 +25,6 @@ buildDunePackage (finalAttrs: { ''; changelog = "https://raw.githubusercontent.com/Chris00/ocaml-benchmark/refs/tags/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.lgpl3; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; }) diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index 62356c085733..7aee95e8f1af 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -45,7 +45,7 @@ buildDunePackage (finalAttrs: { description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested"; homepage = "https://github.com/aantron/bisect_ppx"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; mainProgram = "bisect-ppx-report"; }; }) diff --git a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix index aa918ae4d674..4f92e924851e 100644 --- a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix +++ b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix @@ -36,7 +36,7 @@ buildDunePackage { * stateful functions: Functions that maintain state over time. Imagine that you can take any variable in your function and manage its value over the function's invocation. Now, imagine that any function invocation really creates its own "instance" of the function which will track this state separately from other invocations of this function. ''; homepage = "https://github.com/briskml/brisk-reconciler"; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; license = lib.licenses.mit; broken = lib.versionAtLeast ocaml.version "5.3"; }; diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index 418db720f5f5..72582d05f288 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -17,7 +17,6 @@ rec { license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ dandellion - momeemt juaningan ]; }; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 2dea0eb4c218..88288e3d2510 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -41,7 +41,6 @@ buildDunePackage (finalAttrs: { ]; maintainers = with lib.maintainers; [ sternenseemann - momeemt ]; }; }) diff --git a/pkgs/development/ocaml-modules/odoc-parser/default.nix b/pkgs/development/ocaml-modules/odoc-parser/default.nix index cac3a548369f..fb1554719b47 100644 --- a/pkgs/development/ocaml-modules/odoc-parser/default.nix +++ b/pkgs/development/ocaml-modules/odoc-parser/default.nix @@ -65,7 +65,7 @@ lib.throwIf (param ? max_version && lib.versionAtLeast ocaml.version param.max_v meta = { description = "Parser for Ocaml documentation comments"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; homepage = "https://github.com/ocaml-doc/odoc-parser"; changelog = "https://github.com/ocaml-doc/odoc-parser/raw/${version}/CHANGES.md"; }; From 18ed26979e702670938a10b1478c00927d074045 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jun 2026 14:52:42 +0000 Subject: [PATCH 028/152] blocky: 0.30.0 -> 0.31.0 --- pkgs/by-name/bl/blocky/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bl/blocky/package.nix b/pkgs/by-name/bl/blocky/package.nix index 7d0cb1fae802..0c5d680dc1ea 100644 --- a/pkgs/by-name/bl/blocky/package.nix +++ b/pkgs/by-name/bl/blocky/package.nix @@ -7,20 +7,20 @@ buildGoModule (finalAttrs: { pname = "blocky"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "0xERR0R"; repo = "blocky"; rev = "v${finalAttrs.version}"; - hash = "sha256-SZpAPX+MIQA0HRUUmjXi7g+DEJ+jyub4rlyc0RLclew="; + hash = "sha256-qFGJaShWplvZo/uKRjizWWeb/OzLJCoL9YTRsKWTriY="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorHash = "sha256-DahHFf0w0ksQniuVByX45/fLcqpAga23qMjAGnZTjjY="; + vendorHash = "sha256-EsGaY3U6bHjQTj+rLRtjiQJoNP5WnP7/gZ2NrRX53b0="; ldflags = [ "-s" From d4394b0197421fc818615ad3aad21792f3eb70d1 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 6 Jun 2026 01:55:15 +0700 Subject: [PATCH 029/152] python3Packages.bch: migrate to pyproject --- pkgs/development/python-modules/bch/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bch/default.nix b/pkgs/development/python-modules/bch/default.nix index c2f529fddee3..9f39521f3327 100644 --- a/pkgs/development/python-modules/bch/default.nix +++ b/pkgs/development/python-modules/bch/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, click, click-log, paho-mqtt, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "bch"; version = "1.2.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "hardwario"; @@ -20,7 +21,9 @@ buildPythonPackage rec { sha256 = "/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ click click-log paho-mqtt From 52e3616c5486294472aa5d26bdf1b61e8ec339b2 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 6 Jun 2026 09:28:59 +0200 Subject: [PATCH 030/152] maintainers: drop cameronfyfe Signed-off-by: Marcin Serwin --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/ca/cargo-risczero/package.nix | 2 +- pkgs/by-name/du/dumbpipe/package.nix | 2 +- pkgs/by-name/et/ets/package.nix | 2 +- pkgs/by-name/pr/present-cli/package.nix | 2 +- pkgs/by-name/se/sendme/package.nix | 2 +- pkgs/tools/networking/iroh/default.nix | 1 - 7 files changed, 5 insertions(+), 12 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 59fe70cb9843..2b2d13790156 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4426,12 +4426,6 @@ githubId = 54632731; name = "Cameron Dugan"; }; - cameronfyfe = { - email = "cameron.j.fyfe@gmail.com"; - github = "cameronfyfe"; - githubId = 21013281; - name = "Cameron Fyfe"; - }; cameronnemo = { email = "cnemo@tutanota.com"; github = "CameronNemo"; diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix index 579345d9b265..aed35ada6c6e 100644 --- a/pkgs/by-name/ca/cargo-risczero/package.nix +++ b/pkgs/by-name/ca/cargo-risczero/package.nix @@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "cargo-risczero"; homepage = "https://risczero.com"; license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ cameronfyfe ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index e76e8e71f581..57515cc69043 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 mit ]; - maintainers = with lib.maintainers; [ cameronfyfe ]; + maintainers = [ ]; mainProgram = "dumbpipe"; }; }) diff --git a/pkgs/by-name/et/ets/package.nix b/pkgs/by-name/et/ets/package.nix index ac3f6fd7ea5a..598f6ac6468d 100644 --- a/pkgs/by-name/et/ets/package.nix +++ b/pkgs/by-name/et/ets/package.nix @@ -40,7 +40,7 @@ buildGoModule (finalAttrs: { description = "Command output timestamper"; homepage = "https://github.com/gdubicki/ets/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ cameronfyfe ]; + maintainers = [ ]; mainProgram = "ets"; }; }) diff --git a/pkgs/by-name/pr/present-cli/package.nix b/pkgs/by-name/pr/present-cli/package.nix index f39b7abc3b02..bd124106b852 100644 --- a/pkgs/by-name/pr/present-cli/package.nix +++ b/pkgs/by-name/pr/present-cli/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { description = "Script interpolation engine for markdown documents"; homepage = "https://github.com/terror/present/"; license = lib.licenses.cc0; - maintainers = with lib.maintainers; [ cameronfyfe ]; + maintainers = [ ]; mainProgram = "present"; }; } diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index 23def3c74b66..d263744fdfff 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 mit ]; - maintainers = with lib.maintainers; [ cameronfyfe ]; + maintainers = [ ]; mainProgram = "sendme"; }; }) diff --git a/pkgs/tools/networking/iroh/default.nix b/pkgs/tools/networking/iroh/default.nix index 8c12e79e4def..df44ce53c60b 100644 --- a/pkgs/tools/networking/iroh/default.nix +++ b/pkgs/tools/networking/iroh/default.nix @@ -45,7 +45,6 @@ let ]; maintainers = with lib.maintainers; [ andreashgk - cameronfyfe ]; mainProgram = name; }; From 45da54d89d2b9034ab3459c983666966179867e2 Mon Sep 17 00:00:00 2001 From: 0xSA7 Date: Sun, 7 Jun 2026 16:05:56 +0300 Subject: [PATCH 031/152] nixos-firewall-tool: set pname and version --- pkgs/by-name/ni/nixos-firewall-tool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-firewall-tool/package.nix b/pkgs/by-name/ni/nixos-firewall-tool/package.nix index f0245905a902..08cf7b138c8a 100644 --- a/pkgs/by-name/ni/nixos-firewall-tool/package.nix +++ b/pkgs/by-name/ni/nixos-firewall-tool/package.nix @@ -7,8 +7,8 @@ }: stdenvNoCC.mkDerivation { - name = "nixos-firewall-tool"; - + pname = "nixos-firewall-tool"; + version = lib.trivial.release; src = builtins.filterSource (name: _: !(lib.hasSuffix ".nix" name)) ./.; strictDeps = true; From 790e489027d0305f9d89b79cae9d846c045a661d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jun 2026 19:44:24 +0000 Subject: [PATCH 032/152] qemu: 11.0.0 -> 11.0.1 --- pkgs/by-name/qe/qemu/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qe/qemu/package.nix b/pkgs/by-name/qe/qemu/package.nix index dea71a96bd84..34d22a285da4 100644 --- a/pkgs/by-name/qe/qemu/package.nix +++ b/pkgs/by-name/qe/qemu/package.nix @@ -140,11 +140,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-wEyjYBJlPzLRHGdNNwz1KnEOfT8Ywti2PkkyBSpIVNY="; + hash = "sha256-DSNfWCAnjZFKMVXsJ6+OQljWl+qJKJVXCAfWnAy4zWQ="; }; depsBuildBuild = [ From 0c1890a8006f3cd0346112399603eb769b866fcf Mon Sep 17 00:00:00 2001 From: Zain Kergaye Date: Mon, 8 Jun 2026 20:19:30 -0600 Subject: [PATCH 033/152] syncthing: add zainkergaye as maintainer --- pkgs/by-name/sy/syncthing/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sy/syncthing/package.nix b/pkgs/by-name/sy/syncthing/package.nix index de32f29866a9..307b47bdb918 100644 --- a/pkgs/by-name/sy/syncthing/package.nix +++ b/pkgs/by-name/sy/syncthing/package.nix @@ -119,6 +119,7 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ joko peterhoeg + zainkergaye ]; mainProgram = target; platforms = lib.platforms.unix; From a22e20d775005c5d1ad847b8f33f129d7aa963ff Mon Sep 17 00:00:00 2001 From: Zain Kergaye Date: Mon, 8 Jun 2026 20:20:37 -0600 Subject: [PATCH 034/152] syncthing: 2.0.15 -> 2.1.0 --- pkgs/by-name/sy/syncthing/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syncthing/package.nix b/pkgs/by-name/sy/syncthing/package.nix index 307b47bdb918..7b963e50ca41 100644 --- a/pkgs/by-name/sy/syncthing/package.nix +++ b/pkgs/by-name/sy/syncthing/package.nix @@ -22,16 +22,16 @@ assert builtins.elem target [ buildGoModule (finalAttrs: { pname = "syncthing"; - version = "2.0.15"; + version = "2.1.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; tag = "v${finalAttrs.version}"; - hash = "sha256-v77ovjV+UoCRA1GteP+HDqC8dsRvtOhFX/IkSgSIf8Y="; + hash = "sha256-sTtFmZBPJIHMksaFFLmA3Abt9EhAC8Nz/ibdzg2LMd4="; }; - vendorHash = "sha256-boYTLgvH+iWlh3y3Z0LPvSVGEget3X94AthtJKphhCw="; + vendorHash = "sha256-rOsdg98WVAKqjV7AxH+m4oSf8Z4FPru4NSbgGFtUMVE="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when From e68093e1dbeb729f0efd855d6c72afd1fe1f5dd5 Mon Sep 17 00:00:00 2001 From: HigherOrderLogic <73709188+HigherOrderLogic@users.noreply.github.com> Date: Wed, 10 Jun 2026 11:13:52 +0000 Subject: [PATCH 035/152] serve: remove unused args --- pkgs/by-name/se/serve/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/se/serve/package.nix b/pkgs/by-name/se/serve/package.nix index 7c7cd1eb0713..66bc8a559f54 100644 --- a/pkgs/by-name/se/serve/package.nix +++ b/pkgs/by-name/se/serve/package.nix @@ -2,8 +2,6 @@ buildNpmPackage, fetchFromGitHub, lib, - makeWrapper, - nodejs, pnpm_9, fetchPnpmDeps, pnpmConfigHook, From 641e69c8100d9419b39fdaf49308a8687fc12a91 Mon Sep 17 00:00:00 2001 From: HigherOrderLogic <73709188+HigherOrderLogic@users.noreply.github.com> Date: Wed, 10 Jun 2026 11:21:47 +0000 Subject: [PATCH 036/152] serve: 14.2.4 -> 14.2.6 --- pkgs/by-name/se/serve/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/se/serve/package.nix b/pkgs/by-name/se/serve/package.nix index 66bc8a559f54..69328c100a54 100644 --- a/pkgs/by-name/se/serve/package.nix +++ b/pkgs/by-name/se/serve/package.nix @@ -8,13 +8,13 @@ }: buildNpmPackage (finalAttrs: { pname = "serve"; - version = "14.2.4"; + version = "14.2.6"; src = fetchFromGitHub { owner = "vercel"; repo = "serve"; - tag = finalAttrs.version; - hash = "sha256-QVbau4MrpgEQkwlWx4tU9H93zdM0mSZgIzXpjHRM5mk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-lM04fuzgcLHz8/Jf4wJVYXveFcO6sFyJ9PQAcpweyjk="; }; npmDeps = null; @@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 3; - hash = "sha256-N5oasGilHECndJZYdRHZFvAa4aYwmPtOTBZtcty4g/k="; + hash = "sha256-6JcH7ODO78Vu7sd55npJYRnkCLSMKJM/iSv+isBsBdU="; }; nativeBuildInputs = [ pnpm_9 ]; From 98db5ab60e5845078d4c6061e790f36bb7c3cad3 Mon Sep 17 00:00:00 2001 From: HigherOrderLogic <73709188+HigherOrderLogic@users.noreply.github.com> Date: Wed, 10 Jun 2026 11:26:39 +0000 Subject: [PATCH 037/152] serve: bump to pnpm 10 matches what upstream use --- pkgs/by-name/se/serve/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/se/serve/package.nix b/pkgs/by-name/se/serve/package.nix index 69328c100a54..361608fe2729 100644 --- a/pkgs/by-name/se/serve/package.nix +++ b/pkgs/by-name/se/serve/package.nix @@ -2,7 +2,7 @@ buildNpmPackage, fetchFromGitHub, lib, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, }: @@ -20,12 +20,12 @@ buildNpmPackage (finalAttrs: { npmDeps = null; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-6JcH7ODO78Vu7sd55npJYRnkCLSMKJM/iSv+isBsBdU="; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-9gejKf+GqB8BPAQtQSuZsTb6jFro3X1aL1noVfyKTPg="; }; - nativeBuildInputs = [ pnpm_9 ]; + nativeBuildInputs = [ pnpm_10 ]; npmConfigHook = pnpmConfigHook; dontNpmBuild = true; From c594b8858cd733301cb89141dbb9c9410ab1aa15 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Wed, 10 Jun 2026 17:33:57 +0200 Subject: [PATCH 038/152] maintainers: remove berce --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/li/libacr38u/package.nix | 2 +- pkgs/by-name/or/orca/package.nix | 1 - pkgs/by-name/rh/rhvoice/package.nix | 2 +- pkgs/by-name/sp/speechd/package.nix | 5 +---- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d85109f2dd0d..e07a0500c6b9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3438,12 +3438,6 @@ githubId = 20448408; keys = [ { fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; } ]; }; - berce = { - email = "bert.moens@gmail.com"; - github = "berce"; - githubId = 10439709; - name = "Bert Moens"; - }; bergey = { email = "bergey@teallabs.org"; github = "bergey"; diff --git a/pkgs/by-name/li/libacr38u/package.nix b/pkgs/by-name/li/libacr38u/package.nix index 899c8dcacde0..de8c18b1faaa 100644 --- a/pkgs/by-name/li/libacr38u/package.nix +++ b/pkgs/by-name/li/libacr38u/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { ''; homepage = "https://www.acs.com.hk"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ berce ]; + maintainers = [ ]; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 6cb77c9b2ed0..41769c769272 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -128,7 +128,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { Needs `services.gnome.at-spi2-core.enable = true;` in `configuration.nix`. ''; - maintainers = with lib.maintainers; [ berce ]; teams = [ lib.teams.gnome ]; license = lib.licenses.lgpl21; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/rh/rhvoice/package.nix b/pkgs/by-name/rh/rhvoice/package.nix index 409e31190028..039d8ea5fa98 100644 --- a/pkgs/by-name/rh/rhvoice/package.nix +++ b/pkgs/by-name/rh/rhvoice/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Free and open source speech synthesizer for Russian language and others"; homepage = "https://github.com/Olga-Yakovleva/RHVoice/wiki"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ berce ]; + maintainers = [ ]; platforms = with lib.platforms; all; mainProgram = "RHVoice-test"; }; diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix index c18482000427..e63b5db36d92 100644 --- a/pkgs/by-name/sp/speechd/package.nix +++ b/pkgs/by-name/sp/speechd/package.nix @@ -157,10 +157,7 @@ stdenv.mkDerivation (finalAttrs: { "Common interface to speech synthesis" + lib.optionalString libsOnly " - client libraries only"; homepage = "https://devel.freebsoft.org/speechd"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - berce - jtojnar - ]; + maintainers = with lib.maintainers; [ jtojnar ]; # TODO: remove checks for `withPico` once PR #375450 is merged platforms = if withAlsa || withPico then lib.platforms.linux else lib.platforms.unix; mainProgram = "speech-dispatcher"; From d0dd8b455543fb4a4a9e7ac85f4dbac843dbf791 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Sun, 7 Jun 2026 12:31:01 -0700 Subject: [PATCH 039/152] corefonts: use installFonts --- pkgs/by-name/co/corefonts/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/corefonts/package.nix b/pkgs/by-name/co/corefonts/package.nix index bf7dc985b2c4..ce3cb273f7f3 100644 --- a/pkgs/by-name/co/corefonts/package.nix +++ b/pkgs/by-name/co/corefonts/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, cabextract, + installFonts, }: let @@ -76,7 +77,10 @@ stdenv.mkDerivation { ) fonts ); - nativeBuildInputs = [ cabextract ]; + nativeBuildInputs = [ + cabextract + installFonts + ]; buildCommand = '' for i in $exes; do @@ -124,7 +128,9 @@ stdenv.mkDerivation { mv webdings.ttf Webdings.ttf.tmp mv Webdings.ttf.tmp Webdings.ttf - install -m444 -Dt $out/share/fonts/truetype *.ttf + # using buildCommand means no phases are run + # so we run the function ourselves + installFonts # Also put the EULA there to be on the safe side. cp ${eula} $out/share/fonts/truetype/eula.html From 4c378e3078f593645a985446a62243fc6444a432 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Wed, 10 Jun 2026 23:10:23 +0200 Subject: [PATCH 040/152] ty: 0.0.46 -> 0.0.47 Changelog: https://github.com/astral-sh/ty/releases/tag/0.0.47 Diff: https://github.com/astral-sh/ty/compare/0.0.46...0.0.47 --- pkgs/by-name/ty/ty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index c1a1f061bebe..554adc7d6dd4 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.46"; + version = "0.0.47"; __structuredAttrs = true; src = fetchFromGitHub { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-IZgQduqsQU8wMu0yW3SYypEzAJ0gmDObTJ75xG88xbA="; + hash = "sha256-biK2bAXfg8Pg/eavKhlEQWHrCCqYJ3zX73Ka48LiE6A="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-rSvaYddm5n1qtPRHfY6du0aA1t2TsIqzTPnHQ9NHMP8="; + cargoHash = "sha256-k30sfORnNpLXBokke2EGnDUtKypqOJ5VlTKQNZGgC68="; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ rust-jemalloc-sys ]; From 5b28b7f98e84da9639d35e4bc6c6c66cf3ddda25 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Thu, 11 Jun 2026 10:41:22 +0200 Subject: [PATCH 041/152] ty: 0.0.47 -> 0.0.48 Changelog: https://github.com/astral-sh/ty/releases/tag/0.0.48 Diff: https://github.com/astral-sh/ty/compare/0.0.47...0.0.48 --- pkgs/by-name/ty/ty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 554adc7d6dd4..82e02009fd91 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.47"; + version = "0.0.48"; __structuredAttrs = true; src = fetchFromGitHub { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-biK2bAXfg8Pg/eavKhlEQWHrCCqYJ3zX73Ka48LiE6A="; + hash = "sha256-DNVuve6aX/om6NmiGL2GhrAKIL759VsIv8tAPxnyLCE="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-k30sfORnNpLXBokke2EGnDUtKypqOJ5VlTKQNZGgC68="; + cargoHash = "sha256-mBps5HM1ELSn77++RASpCUrUE1bgLnI4PKAhkBAMF+4="; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ rust-jemalloc-sys ]; From 3a8b38d4ee7cb9ecc9221af00f6eb4a0c43b8a19 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2026 22:29:28 +0200 Subject: [PATCH 042/152] nixos/polkit: modernize --- nixos/modules/security/polkit.nix | 90 ++++++++++++++++++++----------- nixos/tests/rtkit.nix | 2 +- 2 files changed, 59 insertions(+), 33 deletions(-) diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index c2bbe706529f..cc62f22df6bd 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -6,27 +6,51 @@ }: let - cfg = config.security.polkit; + inherit (lib) + mkEnableOption + mkOption + mkIf + mkPackageOption + mkRemovedOptionModule + types + ; + cfg = config.security.polkit; in { + imports = [ + (mkRemovedOptionModule [ "security" "polkit" "debug" ] "Use security.polkit.extraArgs instead") + ]; - options = { + options.security.polkit = { + enable = mkEnableOption "polkit"; - security.polkit.enable = lib.mkEnableOption "polkit"; - security.polkit.package = lib.mkPackageOption pkgs "polkit" { }; + package = mkPackageOption pkgs "polkit" { }; - security.polkit.debug = lib.mkEnableOption "debug logs from polkit. This is required in order to see log messages from rule definitions"; + extraArgs = mkOption { + type = types.listOf types.str; + default = [ + "--no-debug" + "--log-level=notice" + ]; + description = '' + List of arguments to pass to the polkitd executable. - security.polkit.extraConfig = lib.mkOption { - type = lib.types.lines; + ::: {.note} + To see debug logs you need to negate the default `--no-debug` setting. + ::: + ''; + }; + + extraConfig = mkOption { + type = types.lines; default = ""; example = '' /* Log authorization checks. */ polkit.addRule(function(action, subject) { - // Make sure to set { security.polkit.debug = true; } in configuration.nix + // Make sure to negate --no-debug in services.polkit.extraArgs: { security.polkit.extraArgs = [ "--log-level=notice" ]; } polkit.log("user " + subject.user + " is attempting action " + action.id + " from PID " + subject.pid); }); @@ -41,8 +65,8 @@ in ''; }; - security.polkit.adminIdentities = lib.mkOption { - type = lib.types.listOf lib.types.str; + adminIdentities = mkOption { + type = with types; listOf str; default = [ "unix-group:wheel" ]; example = [ "unix-user:alice" @@ -58,25 +82,35 @@ in }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { environment.systemPackages = [ cfg.package.bin cfg.package.out ]; + services.dbus.packages = [ cfg.package.out ]; + systemd.packages = [ cfg.package.out ]; - systemd.services.polkit.serviceConfig.ExecStart = [ - "" - "${cfg.package.out}/lib/polkit-1/polkitd ${lib.optionalString (!cfg.debug) "--no-debug"}" - ]; - - systemd.services.polkit.restartTriggers = [ config.system.path ]; - systemd.services.polkit.reloadTriggers = [ - config.environment.etc."polkit-1/rules.d/10-nixos.rules".source - ]; - systemd.services.polkit.stopIfChanged = false; + systemd.services.polkit = { + restartTriggers = [ config.system.path ]; + reloadTriggers = [ + config.environment.etc."polkit-1/rules.d/10-nixos.rules".source + ]; + stopIfChanged = false; + serviceConfig.ExecStart = [ + # nuke default ExecStart + "" + # provide our own instead + (toString ( + [ + "${lib.getLib cfg.package}/lib/polkit-1/polkitd" + ] + ++ cfg.extraArgs + )) + ]; + }; systemd.sockets."polkit-agent-helper".wantedBy = [ "sockets.target" ]; @@ -89,7 +123,7 @@ in # The upstream unit uses PrivateDevices=yes and ProtectHome=yes, # which prevents PAM modules from accessing hardware (e.g. FIDO # tokens via /dev/hidraw*) or reading key files from home directories. - (lib.mkIf config.security.pam.u2f.enable { + (mkIf config.security.pam.u2f.enable { # Override upstream PrivateDevices=yes to allow access to /dev/hidraw* PrivateDevices = false; DeviceAllow = [ @@ -100,7 +134,7 @@ in # ~/.config/Yubico/u2f_keys (the default key file location) ProtectHome = "read-only"; }) - (lib.mkIf config.security.pam.zfs.enable { + (mkIf config.security.pam.zfs.enable { PrivateDevices = false; DeviceAllow = [ "/dev/zfs rw" @@ -120,23 +154,15 @@ in ${cfg.extraConfig} ''; # TODO: validation on compilation (at least against typos) - services.dbus.packages = [ cfg.package.out ]; - security.pam.services.polkit-1 = { }; security.wrappers.pkexec = { setuid = true; owner = "root"; group = "root"; - source = "${cfg.package.bin}/bin/pkexec"; + source = lib.getExe' cfg.package "pkexec"; }; - systemd.tmpfiles.rules = [ - # Probably no more needed, clean up - "R /var/lib/polkit-1" - "R /var/lib/PolicyKit" - ]; - users.users.polkituser = { description = "PolKit daemon"; uid = config.ids.uids.polkituser; diff --git a/nixos/tests/rtkit.nix b/nixos/tests/rtkit.nix index 74bf69e02a83..295fd36a1391 100644 --- a/nixos/tests/rtkit.nix +++ b/nixos/tests/rtkit.nix @@ -55,7 +55,7 @@ # Provide a little logging of polkit checks - otherwise it's # impossible to know what's going on. - security.polkit.debug = true; + security.polkit.extraArgs = [ "--log-level=notice" ]; security.polkit.extraConfig = '' polkit.addRule(function(action, subject) { const ns = "org.freedesktop.RealtimeKit1."; From e88efa73069adf9abd9b0e78d10a1367560728d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2026 22:29:49 +0200 Subject: [PATCH 043/152] nixos/polkit: make pkexec opt-in --- nixos/doc/manual/release-notes/rl-2611.section.md | 2 ++ nixos/modules/security/polkit.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 3697b3bb2e3e..3a00b506896f 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -28,6 +28,8 @@ - Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use. +- `security.polkit.enablePkexecWrapper` has been introduced, making the `pkexec` setuid wrapper opt-in. + - `systemd.user.extraConfig` has been removed in favor of the structured [](#opt-systemd.user.settings.Manager) option. Use `systemd.user.settings.Manager` to set any `systemd-user.conf(5)` option directly. For example, replace `systemd.user.extraConfig = "DefaultTimeoutStartSec=60";` with `systemd.user.settings.Manager.DefaultTimeoutStartSec = 60;`. - `services.timesyncd.extraConfig` has been removed in favor of the structured [](#opt-services.timesyncd.settings.Time) option. Use `services.timesyncd.settings.Time` to set any `timesyncd.conf(5)` option directly. For example, replace `services.timesyncd.extraConfig = "PollIntervalMaxSec=180";` with `services.timesyncd.settings.Time.PollIntervalMaxSec = 180;`. diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index cc62f22df6bd..3e8b0a3924a7 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -26,6 +26,7 @@ in options.security.polkit = { enable = mkEnableOption "polkit"; + enablePkexecWrapper = mkEnableOption "the setuid pkexec wrapper"; package = mkPackageOption pkgs "polkit" { }; @@ -157,6 +158,7 @@ in security.pam.services.polkit-1 = { }; security.wrappers.pkexec = { + enable = cfg.enablePkexecWrapper; setuid = true; owner = "root"; group = "root"; From 0c1e323f6aadc184674e45e1fcc3890d0108444c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2026 23:05:33 +0200 Subject: [PATCH 044/152] nixos/installers/calamares: opt into pkexec --- .../installer/cd-dvd/installation-cd-graphical-calamares.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix index 097a4eca51d5..59e050fe2846 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix @@ -11,6 +11,9 @@ in { imports = [ ./installation-cd-graphical-base.nix ]; + # required for calamares + security.polkit.enablePkexecWrapper = true; + # required for kpmcore to work correctly programs.partition-manager.enable = true; From 581de9713ce0a5736a5680721222d31583d058ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2026 23:24:21 +0200 Subject: [PATCH 045/152] nixos/throne: opt into pkexec https://github.com/throneproj/Throne/blob/4.3.7/src/ui/mainwindow.cpp#L843-L847 --- nixos/modules/programs/throne.nix | 48 +++++++++++++++++-------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/nixos/modules/programs/throne.nix b/nixos/modules/programs/throne.nix index 2023055892dd..a64178c77757 100644 --- a/nixos/modules/programs/throne.nix +++ b/nixos/modules/programs/throne.nix @@ -64,32 +64,36 @@ in # 3. Put ThroneCore into a systemd service, and let polkit check service name. # This is the most secure and convenient way but requires heavy modification # to Throne source code. Would be good to let upstream support that eventually. - security.polkit.extraConfig = - lib.mkIf (cfg.tunMode.enable && (!cfg.tunMode.setuid) && config.services.resolved.enable) - '' - polkit.addRule(function(action, subject) { - const allowedActionIds = [ - "org.freedesktop.resolve1.revert", - "org.freedesktop.resolve1.set-domains", - "org.freedesktop.resolve1.set-default-route", - "org.freedesktop.resolve1.set-dns-servers" - ]; + security.polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + extraConfig = + lib.mkIf (cfg.tunMode.enable && (!cfg.tunMode.setuid) && config.services.resolved.enable) + '' + polkit.addRule(function(action, subject) { + const allowedActionIds = [ + "org.freedesktop.resolve1.revert", + "org.freedesktop.resolve1.set-domains", + "org.freedesktop.resolve1.set-default-route", + "org.freedesktop.resolve1.set-dns-servers" + ]; - if (allowedActionIds.indexOf(action.id) !== -1) { - try { - var parentPid = polkit.spawn(["${lib.getExe' pkgs.procps "ps"}", "-o", "ppid=", subject.pid]).trim(); - var parentCap = polkit.spawn(["${lib.getExe' pkgs.libcap "getpcaps"}", parentPid]).trim(); - if (parentCap.includes("cap_net_admin") && parentCap.includes("cap_net_raw")) { - return polkit.Result.YES; - } else { + if (allowedActionIds.indexOf(action.id) !== -1) { + try { + var parentPid = polkit.spawn(["${lib.getExe' pkgs.procps "ps"}", "-o", "ppid=", subject.pid]).trim(); + var parentCap = polkit.spawn(["${lib.getExe' pkgs.libcap "getpcaps"}", parentPid]).trim(); + if (parentCap.includes("cap_net_admin") && parentCap.includes("cap_net_raw")) { + return polkit.Result.YES; + } else { + return polkit.Result.NOT_HANDLED; + } + } catch (e) { return polkit.Result.NOT_HANDLED; } - } catch (e) { - return polkit.Result.NOT_HANDLED; } - } - }) - ''; + }) + ''; + }; }; meta.maintainers = with lib.maintainers; [ aleksana ]; From 85af19563a855c79870a03df8607ee998422bfff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2026 23:26:22 +0200 Subject: [PATCH 046/152] nixos/xfce: opt into pkexec https://github.com/search?q=org%3Axfce-mirror%20pkexec&type=code --- nixos/modules/services/x11/desktop-managers/xfce.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 2d53eb58f287..3dcc5431e7c8 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -220,7 +220,10 @@ in # Enable helpful DBus services. services.udisks2.enable = true; - security.polkit.enable = true; + security.polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + }; services.accounts-daemon.enable = true; services.upower.enable = config.powerManagement.enable; services.gnome.glib-networking.enable = true; From 29e29c39b151f03795f8a4c9f9f2151959fa178f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2026 23:27:20 +0200 Subject: [PATCH 047/152] nixos/cinnamon: opt into pkexec https://github.com/search?q=repo%3Alinuxmint%2Fcinnamon%20pkexec&type=code --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a91fa045aa7a..738aaa000a79 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -111,7 +111,10 @@ in services.blueman.enable = mkDefault (notExcluded pkgs.blueman); services.hardware.bolt.enable = mkDefault (notExcluded pkgs.bolt); hardware.bluetooth.enable = mkDefault true; - security.polkit.enable = true; + security.polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + }; services.accounts-daemon.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.dbus.packages = with pkgs; [ From 861d61d3a8ba08c67f875669f23843da10f75ec1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2026 23:36:26 +0200 Subject: [PATCH 048/152] nixos/cosmic: opt into pkexec https://github.com/search?q=org%3Apop-os%20pkexec&type=code --- nixos/modules/services/desktop-managers/cosmic.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index c780a5164922..3d367f01defe 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -146,7 +146,10 @@ in environment.sessionVariables.X11_EXTRA_RULES_XML = "${config.services.xserver.xkb.dir}/rules/base.extras.xml"; programs.dconf.enable = true; programs.dconf.packages = [ pkgs.cosmic-session ]; - security.polkit.enable = true; + security.polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + }; security.rtkit.enable = true; services.accounts-daemon.enable = true; services.displayManager.sessionPackages = [ pkgs.cosmic-session ]; From 6e6895d6bfbfcd889a98a4e6f001e0818467aba2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2026 23:38:06 +0200 Subject: [PATCH 049/152] nixos/budgie: opt into pkexec https://github.com/search?q=org%3ABuddiesOfBudgie%20pkexec&type=code --- nixos/modules/services/desktop-managers/budgie.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/desktop-managers/budgie.nix b/nixos/modules/services/desktop-managers/budgie.nix index 29bdb469d7f1..807d6b019b72 100644 --- a/nixos/modules/services/desktop-managers/budgie.nix +++ b/nixos/modules/services/desktop-managers/budgie.nix @@ -243,6 +243,8 @@ in # Required by Budgie's Polkit Dialog. security.polkit.enable = mkDefault true; + # Required by Budige's Control Center and Desktop + security.polkit.enablePkexecWrapper = mkDefault true; # Required by Budgie Panel plugins and/or Budgie Control Center panels. networking.networkmanager.enable = mkDefault true; # for BCC's Network panel. From 947ef21d343d41b0fac2180afbc54acc8c55bef1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2026 23:40:59 +0200 Subject: [PATCH 050/152] nixos/gnome: opt into pkexec --- nixos/modules/services/desktop-managers/gnome.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix index 3747a491098f..1d850f1f26e5 100644 --- a/nixos/modules/services/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -325,7 +325,11 @@ in i18n.inputMethod.enable = mkDefault true; i18n.inputMethod.type = mkDefault "ibus"; programs.dconf.enable = true; - security.polkit.enable = true; + security.polkit = { + enable = true; + # Required by gnome-initial-setup, gnome-system-monitor, gvfs for admin:// + enablePkexecWrapper = lib.mkDefault true; + }; security.rtkit.enable = mkDefault true; services.accounts-daemon.enable = true; services.dleyna.enable = mkDefault true; From 00343843d4a153e1cbb0bace3d0bbeea0457f924 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2026 23:46:35 +0200 Subject: [PATCH 051/152] nixos/tuned: opt into pkexec --- nixos/modules/services/hardware/tuned.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/tuned.nix b/nixos/modules/services/hardware/tuned.nix index 65a857f4fde8..f399dc55c306 100644 --- a/nixos/modules/services/hardware/tuned.nix +++ b/nixos/modules/services/hardware/tuned.nix @@ -246,7 +246,10 @@ in systemPackages = [ cfg.package ]; }; - security.polkit.enable = lib.mkDefault true; + security.polkit = { + enable = lib.mkDefault true; + enablePkexecWrapper = lib.mkDefault true; + }; services = { dbus.packages = [ cfg.package ]; From 6ef165d25f172500e308e8dd2d3893ec9e774d2b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2026 23:53:35 +0200 Subject: [PATCH 052/152] nixos/tests/timekpr: hook up in all-tests, migrate to container --- nixos/tests/all-tests.nix | 1 + nixos/tests/timekpr.nix | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5b17b838e343..a2b16804b4cb 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1700,6 +1700,7 @@ in tiddlywiki = runTest ./tiddlywiki.nix; tigervnc = handleTest ./tigervnc.nix { }; tika = runTest ./tika.nix; + timekpr = runTest ./timekpr.nix; timezone = runTest ./timezone.nix; timidity = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./timidity { }; tinc = handleTest ./tinc { }; diff --git a/nixos/tests/timekpr.nix b/nixos/tests/timekpr.nix index 1ae793d8f70e..9f832d2b62dd 100644 --- a/nixos/tests/timekpr.nix +++ b/nixos/tests/timekpr.nix @@ -1,13 +1,15 @@ -{ pkgs, lib, ... }: +{ + lib, + ... +}: + { name = "timekpr"; meta.maintainers = [ lib.maintainers.atry ]; - nodes.machine = - { pkgs, lib, ... }: - { - services.timekpr.enable = true; - }; + containers.machine = { + services.timekpr.enable = true; + }; testScript = '' start_all() From 45d40120be493bea3566af42aee59d8727618ae5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Jun 2026 17:27:44 +0200 Subject: [PATCH 053/152] nixos/security/run0: enable guard, polkit, refactor The module now enables polkit, which run0 requires to faciliate elevation. This warrants guarding the config by an opt-in enable toggle. For the options that existed prior to the enable toggle we now assert that users need to opt into the module for them to have an effect. --- nixos/modules/security/run0.nix | 66 +++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/nixos/modules/security/run0.nix b/nixos/modules/security/run0.nix index 22296a76c95e..6aa7f9ad3155 100644 --- a/nixos/modules/security/run0.nix +++ b/nixos/modules/security/run0.nix @@ -6,6 +6,13 @@ }: let + inherit (lib) + mkEnableOption + mkIf + mkMerge + mkOption + ; + cfg = config.security.run0; sudoAlias = pkgs.writeShellScriptBin "sudo" '' @@ -18,7 +25,9 @@ let in { options.security.run0 = { - wheelNeedsPassword = lib.mkOption { + enable = mkEnableOption "support for run0"; + + wheelNeedsPassword = mkOption { type = lib.types.bool; default = true; description = '' @@ -27,26 +36,45 @@ in ''; }; - enableSudoAlias = lib.mkEnableOption "make {command}`sudo` an alias to {command}`run0`."; + enableSudoAlias = mkEnableOption "make {command}`sudo` an alias to {command}`run0`."; }; - config = { - assertions = [ - { - assertion = - cfg.enableSudoAlias -> (!config.security.sudo.enable && !config.security.sudo-rs.enable); - message = "`security.run0.enableSudoAlias` cannot be enabled if `security.sudo` or `security.sudo-rs` are enabled."; - } - ]; - - security.polkit.extraConfig = lib.mkIf (!cfg.wheelNeedsPassword) '' - polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.systemd1.manage-units" && subject.isInGroup("wheel")) { - return polkit.Result.YES; + config = mkMerge [ + { + # Late introduction of the enable toggle, this should help during migration. + # TODO: Remove after 26.11 release + assertions = [ + { + assertion = !cfg.wheelNeedsPassword -> cfg.enable; + message = "`security.run0.enable` is currently disabled, but is required for the `security.run0.wheelNeedsPassword` option to take effect"; } - }); - ''; + { + assertion = cfg.enableSudoAlias -> cfg.enable; + message = "`security.run0.enableSudoAlias` depends on `security.run0.enable`, which is disabled."; + } + ]; + } + (mkIf cfg.enable { + assertions = [ + { + assertion = + cfg.enableSudoAlias -> (!config.security.sudo.enable && !config.security.sudo-rs.enable); + message = "`security.run0.enableSudoAlias` cannot be enabled if `security.sudo` or `security.sudo-rs` are enabled."; + } + ]; - environment.systemPackages = lib.optional cfg.enableSudoAlias sudoAlias; - }; + security.polkit = { + enable = true; + extraConfig = mkIf (!cfg.wheelNeedsPassword) '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.systemd1.manage-units" && subject.isInGroup("wheel")) { + return polkit.Result.YES; + } + }); + ''; + }; + + environment.systemPackages = lib.optional cfg.enableSudoAlias sudoAlias; + }) + ]; } From f252c4820dad8bb37d2b45e8b0d45a4b08321dee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Jun 2026 01:51:48 +0200 Subject: [PATCH 054/152] nixos/gnome-remote-desktop: opt into pkexec Calls pkexec in src/grd-ctl.c. --- .../modules/services/desktops/gnome/gnome-remote-desktop.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix index 958fbb546dc3..eaa9399862a4 100644 --- a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix +++ b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix @@ -22,6 +22,10 @@ config = lib.mkIf config.services.gnome.gnome-remote-desktop.enable { services.pipewire.enable = true; services.dbus.packages = [ pkgs.gnome-remote-desktop ]; + security.polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + }; environment.systemPackages = [ pkgs.gnome-remote-desktop ]; From 3da268745ad0ce3d36520bcd5dff78ec33a5ae61 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Jun 2026 17:10:26 +0200 Subject: [PATCH 055/152] nixos/installer/tools: enable run0 module The run0 module now enables polkit and properly reflects the intent behind the `enableRun0Elevation` option. --- nixos/modules/installer/tools/tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 8fd268ee0d2d..23a0bebe388c 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -330,7 +330,7 @@ in ''; config = lib.mkIf config.system.tools.nixos-rebuild.enableRun0Elevation { - security.polkit.enable = lib.mkDefault true; + security.run0.enable = lib.mkDefault true; environment.systemPackages = [ pkgs.polkit-stdin-agent ]; }; } From 517a082accdd727933b69cf16809867b450ebb09 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Jun 2026 23:38:46 +0200 Subject: [PATCH 056/152] nixos/polkit: stop if changed We concluded this is fine, because we don't require elevation while switching generations. Co-Authored-By: r-vdp Co-Authored-By: Grimmauld --- nixos/modules/security/polkit.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 3e8b0a3924a7..6ea840d4ccf3 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -99,7 +99,6 @@ in reloadTriggers = [ config.environment.etc."polkit-1/rules.d/10-nixos.rules".source ]; - stopIfChanged = false; serviceConfig.ExecStart = [ # nuke default ExecStart "" From 73c9e8d0fa59da12e5b8bd95ba010693f2eb2435 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 11 Jun 2026 22:10:11 +0200 Subject: [PATCH 057/152] nixos/test/lomiri/desktop-appinteractions: use run0 for elevation --- nixos/tests/lomiri.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 5dc43286c0f3..61893abe91a1 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -669,7 +669,7 @@ in # Doing this here, since we need an in-session shell & separately starting a terminal again wastes time with subtest("polkit agent works"): - machine.send_chars("pkexec touch /tmp/polkit-test\n") + machine.send_chars("run0 touch /tmp/polkit-test\n") # There's an authentication notification here that gains focus, but we struggle with OCRing it # Just hope that it's up after a short wait machine.sleep(10) From 1b92c623ee72fceb65d82c8f043789616ae9434e Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Thu, 11 Jun 2026 23:25:39 +0200 Subject: [PATCH 058/152] ruff: 0.15.16 -> 0.15.17 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.15.17 Diff: https://github.com/astral-sh/ruff/compare/0.15.16...0.15.17 --- pkgs/by-name/ru/ruff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 8566e5251408..8aa8f51b8273 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.15.16"; + version = "0.15.17"; __structuredAttrs = true; @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-krmHCLijp+D4gBjKV9cdicPob4ry5I6QwB3MUz0z7zA="; + hash = "sha256-+UsKRBe+lp/LdsmK/W11wCt2RypEryA5eBPb01OKCJw="; }; cargoBuildFlags = [ "--package=ruff" ]; - cargoHash = "sha256-d2iV7iWf7lVhj1Bbaxxk5Zao4KK3oC7whppRvk0erzA="; + cargoHash = "sha256-y1sKf+KXya/K+WUiIE357U6DXh/d+AQgj0SQIi1gpUw="; nativeBuildInputs = [ installShellFiles ]; From 7a3819ed28c9daf01944f51f31628ce9d3345e01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 12 Jun 2026 00:50:44 +0200 Subject: [PATCH 059/152] nixos/gamemode: opt into pkexec --- nixos/modules/programs/gamemode.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/gamemode.nix b/nixos/modules/programs/gamemode.nix index 834ae6f54a1d..3e568f9a68aa 100644 --- a/nixos/modules/programs/gamemode.nix +++ b/nixos/modules/programs/gamemode.nix @@ -60,7 +60,10 @@ in }; security = { - polkit.enable = true; + polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + }; wrappers = lib.mkIf cfg.enableRenice { gamemoded = { owner = "root"; From 6ba3bb1ceb41ef587402e68b2251c5ce312f365c Mon Sep 17 00:00:00 2001 From: Anthony Wang Date: Thu, 11 Jun 2026 23:53:58 -0400 Subject: [PATCH 060/152] pulseaudio-module-xrdp: fix typo --- nixos/modules/services/networking/xrdp.nix | 2 +- pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index a1e9f9c23d80..8938293fee28 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -19,7 +19,7 @@ let cat > $out/startwm.sh < Date: Fri, 12 Jun 2026 10:22:49 +0200 Subject: [PATCH 061/152] ty: 0.0.48 -> 0.0.49 Changelog: https://github.com/astral-sh/ty/releases/tag/0.0.49 Diff: https://github.com/astral-sh/ty/compare/0.0.48...0.0.49 --- pkgs/by-name/ty/ty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 82e02009fd91..41db756b4492 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.48"; + version = "0.0.49"; __structuredAttrs = true; src = fetchFromGitHub { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-DNVuve6aX/om6NmiGL2GhrAKIL759VsIv8tAPxnyLCE="; + hash = "sha256-IKeoskueujGYFjhUd3V7iwKwZjFZqG3OYfe36S6J2aw="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-mBps5HM1ELSn77++RASpCUrUE1bgLnI4PKAhkBAMF+4="; + cargoHash = "sha256-y1sKf+KXya/K+WUiIE357U6DXh/d+AQgj0SQIi1gpUw="; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ rust-jemalloc-sys ]; From 5d496b05c32151272008f4971d97c4d390c983af Mon Sep 17 00:00:00 2001 From: Mynacol Date: Sun, 24 May 2026 08:20:27 +0000 Subject: [PATCH 062/152] deno: de-vendor libffi in rusty-v8 --- pkgs/by-name/de/deno/rusty-v8/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/de/deno/rusty-v8/default.nix b/pkgs/by-name/de/deno/rusty-v8/default.nix index b9865c673fa4..b47f11b08365 100644 --- a/pkgs/by-name/de/deno/rusty-v8/default.nix +++ b/pkgs/by-name/de/deno/rusty-v8/default.nix @@ -16,6 +16,7 @@ glib, glibc, icu, + libffi, python3, gn, ninja, @@ -106,6 +107,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ glib icu + libffi ] ++ lib.optionals stdenv.targetPlatform.isDarwin [ apple-sdk_15 @@ -123,6 +125,7 @@ rustPlatform.buildRustPackage (finalAttrs: { RUSTC_BOOTSTRAP = 1; EXTRA_GN_ARGS = lib.concatStringsSep " " ( [ + "use_system_libffi=true" "use_sysroot=false" # prevent download of debian sysroot "clang_version=\"${lib.versions.major llvmPackages.clang.version}\"" "rustc_version=\"${rustc.version}\"" From 7a9913093a726a6870a58ed38e2684e0a318a9f9 Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Fri, 12 Jun 2026 21:19:38 +0200 Subject: [PATCH 063/152] plausible: 3.0.1 -> 3.2.1 --- pkgs/by-name/pl/plausible/package.nix | 53 ++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix index ed170e31d665..8cabfd4ad751 100644 --- a/pkgs/by-name/pl/plausible/package.nix +++ b/pkgs/by-name/pl/plausible/package.nix @@ -9,23 +9,23 @@ runCommand, nixosTests, npm-lockfile-fix, + cmake, nix-update-script, brotli, - tailwindcss_3, esbuild, buildPackages, }: let pname = "plausible"; - version = "3.0.1"; + version = "3.2.1"; mixEnv = "ce"; src = fetchFromGitHub { owner = "plausible"; repo = "analytics"; rev = "v${version}"; - hash = "sha256-DQIRsqkH2zgIkb3yezuJEKJ99PS031GJ+bDAeHMLNUY="; + hash = "sha256-2roIj0s2cybYdGmmJSPJ5Rc1gNunxlYew9JR5xxMv+k="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/assets/package-lock.json sed -ie ' @@ -47,7 +47,7 @@ let pname = "${pname}-assets"; inherit version; src = "${src}/assets"; - npmDepsHash = "sha256-hPbKEC8DE/gb483COG/ZbTuEP8Y44Fs7ppHMpXphCjg="; + npmDepsHash = "sha256-grYxPRzpu3pcv3lyTQxx0RDhmgFhsOKZoYbzd701xjA="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -60,7 +60,7 @@ let pname = "${pname}-tracker"; inherit version; src = "${src}/tracker"; - npmDepsHash = "sha256-kfqJVUw3xnMT0sOkc5O42CwBxPQXiYnOQ5WpdZwzxfE"; + npmDepsHash = "sha256-hrsvQXvbcfRDUc1qinyUJ7Oh4yMM1e+UEdYudjYyJxk="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -69,6 +69,18 @@ let ''; }; + # lazy_html (new dep since 3.1.0) builds a NIF against lexbor + # its Makefile clones lexbor at build time (which sandbox forbids) + # pre-seed commit in lazy_html's mix.exs so the clone target is skipped + # and force a build in preBuild below + lexborCommit = "244b84956a6dc7eec293781d051354f351274c46"; + lexborSrc = fetchFromGitHub { + owner = "lexbor"; + repo = "lexbor"; + rev = lexborCommit; + hash = "sha256-Oup/lGU8a9Dqfho4Llg39t9Y9n4xfUmGk0772OkpnLQ="; + }; + mixFodDeps = beamPackages.fetchMixDeps { inherit pname @@ -76,7 +88,7 @@ let src mixEnv ; - hash = "sha256-caCbuMEDsLcxm8xehWEJiaTfgl435crBfnQFQpzGsLY"; + hash = "sha256-fm/elkCNpu5sduBxly06i/z30Y9BMtt+qthXmLuvlUc="; }; mjmlNif = rustPlatform.buildRustPackage { @@ -84,7 +96,7 @@ let version = ""; src = "${mixFodDeps}/mjml/native/mjml_nif"; - cargoHash = "sha256-zDWOik65PWAMpIDDcG+DibprPVW/k+Q83+fjFI5vWaY="; + cargoHash = "sha256-a8xSRdFtMYF0n2rl7A5ZgHoaunUJLVJwHvrkc9uyZKo="; doCheck = false; env = { @@ -109,7 +121,13 @@ let file=''${lib##*/} base=''${file%.*} ln -s "$lib" $out/mjml/priv/native/$base.so + # mjml >= 4.0 loads through RustlerPrecompiled (expects NIF name w/o lib prefix) + ln -s "$lib" $out/mjml/priv/native/''${base#lib}.so done + + mkdir -p $out/lazy_html/_build/c/third_party/lexbor + cp -r --no-preserve=mode ${lexborSrc} \ + $out/lazy_html/_build/c/third_party/lexbor/${lexborCommit} ''; beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; }); @@ -126,10 +144,22 @@ beamPackages.mixRelease rec { nativeBuildInputs = [ nodejs brotli + cmake ]; + dontUseCmakeConfigure = true; + mixFodDeps = patchedMixFodDeps; + # deps are compiled in mixRelease configurePhase + # so the force_build switch must be in place before then + # preBuild would be too late + preConfigure = '' + cat >> config/config.exs <= 3.1.0 needs tailwind v4 cat >> config/config.exs < Date: Sat, 13 Jun 2026 03:24:48 +0700 Subject: [PATCH 064/152] python3Packages.ydiff: migrate to pyproject --- pkgs/development/python-modules/ydiff/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index 3e5fc98c2614..d63ec24f910f 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pygments, gitMinimal, mercurial, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "ydiff"; version = "1.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ymattw"; @@ -36,6 +37,8 @@ buildPythonPackage rec { patchShebangs tests/*.sh ''; + build-system = [ setuptools ]; + nativeCheckInputs = [ pygments ]; checkPhase = '' From 2f70d13a748807e30ae84336f9a0f97fec306745 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 13 Jun 2026 03:25:15 +0700 Subject: [PATCH 065/152] python3Packages.yubico: migrate to pyproject --- pkgs/development/python-modules/yubico/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yubico/default.nix b/pkgs/development/python-modules/yubico/default.nix index 23b9cba70d28..c832c47a06ba 100644 --- a/pkgs/development/python-modules/yubico/default.nix +++ b/pkgs/development/python-modules/yubico/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pytestCheckHook, pyusb, }: @@ -9,14 +10,16 @@ buildPythonPackage rec { pname = "python-yubico"; version = "1.3.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-2EZkJ6pZIqxdS36cZbaTEIQnz1N9ZT1oyyEsBxPo5vU="; }; - propagatedBuildInputs = [ pyusb ]; + build-system = [ setuptools ]; + + dependencies = [ pyusb ]; checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "yubico" ]; From 190ba167117a16d709622d49fcd978ee908641da Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 13 Jun 2026 03:53:00 +0700 Subject: [PATCH 066/152] python3Packages.yubico: modernize --- pkgs/development/python-modules/yubico/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/yubico/default.nix b/pkgs/development/python-modules/yubico/default.nix index c832c47a06ba..9d2ff41859aa 100644 --- a/pkgs/development/python-modules/yubico/default.nix +++ b/pkgs/development/python-modules/yubico/default.nix @@ -7,13 +7,15 @@ pyusb, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-yubico"; version = "1.3.3"; pyproject = true; + __structuredAttrs = true; + src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2EZkJ6pZIqxdS36cZbaTEIQnz1N9ZT1oyyEsBxPo5vU="; }; @@ -34,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ s1341 ]; }; -} +}) From 05b52ad9c5b846ea5a8af56a6adff8f276585df8 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 13 Jun 2026 04:13:05 +0700 Subject: [PATCH 067/152] python3Packages.ydiff: modernize --- pkgs/development/python-modules/ydiff/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index d63ec24f910f..d778a8a9804d 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -11,15 +11,17 @@ less, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ydiff"; version = "1.5"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "ymattw"; repo = "ydiff"; - tag = version; + tag = finalAttrs.version; hash = "sha256-9a7M6+CqGRvO1yainImN2RQVH3XMxE9PTLXJGKekXLg="; }; @@ -47,6 +49,8 @@ buildPythonPackage rec { runHook postCheck ''; + pythonImportsCheck = [ "ydiff" ]; + meta = { description = "View colored, incremental diff in workspace or from stdin with side by side and auto pager support (Was \"cdiff\")"; mainProgram = "ydiff"; @@ -63,4 +67,4 @@ buildPythonPackage rec { despsyched ]; }; -} +}) From 852fa1bf52e20c39714d19ae03760d5db9ebb6f6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 12 Jun 2026 21:40:34 +0000 Subject: [PATCH 068/152] gpu-viewer: 3.34 -> 3.35 Diff: https://github.com/arunsivaramanneo/gpu-viewer/compare/v3.34...v3.35 Changelog: https://github.com/arunsivaramanneo/GPU-Viewer/releases/tag/v3.35 --- pkgs/by-name/gp/gpu-viewer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gp/gpu-viewer/package.nix b/pkgs/by-name/gp/gpu-viewer/package.nix index d81a56f116d2..f0b4663a0796 100644 --- a/pkgs/by-name/gp/gpu-viewer/package.nix +++ b/pkgs/by-name/gp/gpu-viewer/package.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gpu-viewer"; - version = "3.34"; + version = "3.35"; pyproject = false; __structuredAttrs = true; @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "arunsivaramanneo"; repo = "gpu-viewer"; tag = "v${finalAttrs.version}"; - hash = "sha256-ovgP5RaFAT01zccQiyy1vERBj9OW77v0hMZ0SjoS74M="; + hash = "sha256-W8BPtHbOwLZ95bY6ZmAaKS87fh+gOWZIhxjWKqiavag="; }; nativeBuildInputs = [ From e8a87769f199a5a91e6bd32f5d02cfa851b353ac Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 13 Jun 2026 05:20:32 +0700 Subject: [PATCH 069/152] python3Packages.zigpy-cc: migrate to pyproject --- pkgs/development/python-modules/zigpy-cc/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix index 51f8b9c3958a..e1e566aeda1b 100644 --- a/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -3,6 +3,7 @@ asynctest, buildPythonPackage, fetchFromGitHub, + setuptools, pyserial-asyncio, pytest-asyncio, pytestCheckHook, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-cc"; version = "0.5.2"; - format = "setuptools"; + pyproject = true; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and @@ -25,7 +26,9 @@ buildPythonPackage rec { sha256 = "U3S8tQ3zPlexZDt5GvCd+rOv7CBVeXJJM1NGe7nRl2o="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyserial-asyncio zigpy ]; From 5f486598e62d6c74f0ee3f868e79f6fed9c31426 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 13 Jun 2026 05:27:31 +0700 Subject: [PATCH 070/152] python3Packages.zigpy-cc: modernize --- pkgs/development/python-modules/zigpy-cc/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix index e1e566aeda1b..36b41b0e6ff8 100644 --- a/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -10,11 +10,13 @@ zigpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zigpy-cc"; version = "0.5.2"; pyproject = true; + __structuredAttrs = true; + # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -22,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-cc"; - rev = version; - sha256 = "U3S8tQ3zPlexZDt5GvCd+rOv7CBVeXJJM1NGe7nRl2o="; + tag = finalAttrs.version; + hash = "sha256-U3S8tQ3zPlexZDt5GvCd+rOv7CBVeXJJM1NGe7nRl2o="; }; build-system = [ setuptools ]; @@ -58,4 +60,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ mvnetbiz ]; platforms = lib.platforms.linux; }; -} +}) From 77a5e34b11b5218f8dda31d9573c5a8008e337d1 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 13 Jun 2026 05:49:33 +0700 Subject: [PATCH 071/152] python3Packages.vsts: migrate to pyproject --- pkgs/development/python-modules/vsts/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix index e77ab7456ca0..3adc29a8a77b 100644 --- a/pkgs/development/python-modules/vsts/default.nix +++ b/pkgs/development/python-modules/vsts/default.nix @@ -3,12 +3,13 @@ lib, python, fetchPypi, + setuptools, msrest, }: buildPythonPackage rec { version = "0.1.25"; - format = "setuptools"; + pyproject = true; pname = "vsts"; src = fetchPypi { @@ -16,7 +17,9 @@ buildPythonPackage rec { sha256 = "15sgwqa72ynpahj101r2kc15s3dnsafg5gqx0sz3hnqz29h925ys"; }; - propagatedBuildInputs = [ msrest ]; + build-system = [ setuptools ]; + + dependencies = [ msrest ]; postPatch = '' substituteInPlace setup.py --replace "msrest>=0.6.0,<0.7.0" "msrest" From c8c1a2476ca086876d70193208a3ce06b0b511b6 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 13 Jun 2026 06:06:06 +0700 Subject: [PATCH 072/152] python3Packages.vsts: modernize --- pkgs/development/python-modules/vsts/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix index 3adc29a8a77b..7696690c699a 100644 --- a/pkgs/development/python-modules/vsts/default.nix +++ b/pkgs/development/python-modules/vsts/default.nix @@ -7,14 +7,16 @@ msrest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { + pname = "vsts"; version = "0.1.25"; pyproject = true; - pname = "vsts"; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; - sha256 = "15sgwqa72ynpahj101r2kc15s3dnsafg5gqx0sz3hnqz29h925ys"; + inherit (finalAttrs) pname version; + hash = "sha256-2heRYBIfWzi+Bh2/8pzStg1dApsiBxAkVNd6cRTmT5c="; }; build-system = [ setuptools ]; @@ -22,7 +24,7 @@ buildPythonPackage rec { dependencies = [ msrest ]; postPatch = '' - substituteInPlace setup.py --replace "msrest>=0.6.0,<0.7.0" "msrest" + substituteInPlace setup.py --replace-fail "msrest>=0.6.0,<0.7.0" "msrest" ''; # Tests are highly impure @@ -30,10 +32,12 @@ buildPythonPackage rec { ${python.interpreter} -c 'import vsts.version; print(vsts.version.VERSION)' ''; + pythonImportsCheck = [ "vsts" ]; + meta = { description = "Python APIs for interacting with and managing Azure DevOps"; homepage = "https://github.com/microsoft/azure-devops-python-api"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From 89cf57284e70900200272b3bb3c91c1db160a97b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 10 Jun 2026 16:22:40 +0000 Subject: [PATCH 073/152] python3Packages.opt-einsum-fx: init at 0.1.4 --- .../python-modules/opt-einsum-fx/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/opt-einsum-fx/default.nix diff --git a/pkgs/development/python-modules/opt-einsum-fx/default.nix b/pkgs/development/python-modules/opt-einsum-fx/default.nix new file mode 100644 index 000000000000..d183970cc557 --- /dev/null +++ b/pkgs/development/python-modules/opt-einsum-fx/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + opt-einsum, + torch, + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "opt-einsum-fx"; + version = "0.1.4"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Linux-cpp-lisp"; + repo = "opt_einsum_fx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-HamDghqmdX4Q+4zXQvCly588p3TaYFCSnzgEKLVMXSo="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + opt-einsum + torch + ]; + + pythonImportsCheck = [ "opt_einsum_fx" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Einsum optimization using opt_einsum and PyTorch FX graph rewriting"; + homepage = "https://github.com/Linux-cpp-lisp/opt_einsum_fx"; + changelog = "https://github.com/Linux-cpp-lisp/opt_einsum_fx/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb255c8fb62c..da7abac6b097 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12052,6 +12052,8 @@ self: super: with self; { opt-einsum = callPackage ../development/python-modules/opt-einsum { }; + opt-einsum-fx = callPackage ../development/python-modules/opt-einsum-fx { }; + optax = callPackage ../development/python-modules/optax { }; optiland = callPackage ../development/python-modules/optiland { }; From 8d8a002aba3ff7a6f36604cb214dd857219321ef Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 10 Jun 2026 16:22:59 +0000 Subject: [PATCH 074/152] python3Packages.e3nn: init at 0.6.0 --- .../python-modules/e3nn/default.nix | 78 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/development/python-modules/e3nn/default.nix diff --git a/pkgs/development/python-modules/e3nn/default.nix b/pkgs/development/python-modules/e3nn/default.nix new file mode 100644 index 000000000000..4382881a2302 --- /dev/null +++ b/pkgs/development/python-modules/e3nn/default.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + opt-einsum-fx, + scipy, + sympy, + torch, + + # tests + pytestCheckHook, + llvmPackages, +}: + +buildPythonPackage (finalAttrs: { + pname = "e3nn"; + version = "0.6.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "e3nn"; + repo = "e3nn"; + tag = finalAttrs.version; + hash = "sha256-gGl0DiLU8w0jqGWA/ZzvkxdZdZCvtXqtmEEZ2dIwZ2o="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + opt-einsum-fx + scipy + sympy + torch + ]; + + pythonImportsCheck = [ "e3nn" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # RuntimeError: torch.compile does not support compiling torch.jit.script or + # torch.jit.freeze models directly + "test_identity" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # symbol not found in flat namespace '___kmpc_barrier' + "test_activation" + "test_input_weights_jit" + "test_variance" + ]; + + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + # Otherwise, torch will fail to include `omp.h`: + # torch._inductor.exc.InductorError: CppCompileError: C++ compile error OpenMP support not found + llvmPackages.openmp + ]; + + meta = { + description = "Modular framework for neural networks with Euclidean symmetry"; + homepage = "https://github.com/e3nn/e3nn"; + changelog = "https://github.com/e3nn/e3nn/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da7abac6b097..aa8891a5d573 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4905,6 +4905,8 @@ self: super: with self; { e3-testsuite = callPackage ../development/python-modules/e3-testsuite { }; + e3nn = callPackage ../development/python-modules/e3nn { }; + eagle100 = callPackage ../development/python-modules/eagle100 { }; earn-e-p1 = callPackage ../development/python-modules/earn-e-p1 { }; From e749bb1151ce7086384cea0c35d88b3f6dd532c9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 11 Jun 2026 10:08:18 +0000 Subject: [PATCH 075/152] python3Packages.pytest-subtests: init at 0.15.0 --- .../pytest-subtests/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-subtests/default.nix diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix new file mode 100644 index 000000000000..d4b98e40e5c3 --- /dev/null +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + attrs, + pytest, +}: + +buildPythonPackage (finalAttrs: { + pname = "pytest-subtests"; + version = "0.15.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-subtests"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KJbTxhheEkvH/Xnje45dSb57526bVoi8N6GSKfUfCYA="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + attrs + pytest + ]; + + pythonImportsCheck = [ "pytest_subtests" ]; + + # The self-tests assert on exact pytest terminal output. pytest 9 ships its + # own bundled subtests support and changed how subtest failures are reported, + # so these output-matching tests no longer match. The plugin itself works. + doCheck = false; + + meta = { + description = "Unittest subTest() support and subtests fixture"; + homepage = "https://github.com/pytest-dev/pytest-subtests"; + changelog = "https://github.com/pytest-dev/pytest-subtests/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa8891a5d573..22c03dc51d65 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15797,6 +15797,8 @@ self: super: with self; { pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; + pytest-subtests = callPackage ../development/python-modules/pytest-subtests { }; + pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; pytest-tap = callPackage ../development/python-modules/pytest-tap { }; From 3e17027d913a93d61b0791a680690cf790dd31dc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 10 Jun 2026 21:48:48 +0000 Subject: [PATCH 076/152] python3Packages.matscipy: init at 1.2.0 --- .../python-modules/matscipy/default.nix | 186 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 188 insertions(+) create mode 100644 pkgs/development/python-modules/matscipy/default.nix diff --git a/pkgs/development/python-modules/matscipy/default.nix b/pkgs/development/python-modules/matscipy/default.nix new file mode 100644 index 000000000000..9183f200e54d --- /dev/null +++ b/pkgs/development/python-modules/matscipy/default.nix @@ -0,0 +1,186 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + pythonAtLeast, + + fetchpatch, + + # build-system + meson-python, + ninja, + numpy, + + # dependencies + ase, + packaging, + scipy, + + # optional-dependencies + # cli: + argcomplete, + # dislocation: + atomman, + nglview, + ovito, + # docs: + jupytext, + myst-nb, + numpydoc, + pydata-sphinx-theme, + sphinx, + sphinx-copybutton, + sphinx-rtd-theme, + sphinxcontrib-spelling, + + # tests + pytest-subtests, + pytest-timeout, + pytest-xdist, + sympy, + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "matscipy"; + version = "1.2.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "libAtoms"; + repo = "matscipy"; + tag = "v${finalAttrs.version}"; + hash = "sha256-XmY13B5S8tXYiUaec9gL6e0E3bSnbaMteHHiX2ij2sw="; + }; + + patches = [ + # API: Fix compatibility with ASE 3.27.0 + # https://github.com/libAtoms/matscipy/pull/301 + (fetchpatch { + url = "https://github.com/libAtoms/matscipy/commit/6a91a4646e30796abe51ef3efa4b479d4471aae0.patch"; + hash = "sha256-PH9I+7+nN6fSkugVbxPCs3LqjhP/fQ5NZjiNQ7F70YU="; + }) + (fetchpatch { + url = "https://github.com/libAtoms/matscipy/commit/f6478347bbceeab8ec177042b6ed1243e742d55f.patch"; + hash = "sha256-DKk+1TlP+OngcmycsCIE+7s2h/7wa7Gxv9APbuIAoZg="; + }) + ]; + + postPatch = + # Otherwise the script fails as it can't resolve the version with git + '' + substituteInPlace discover_version.py \ + --replace-fail \ + "version = get_version_from_git()" \ + "version = '${finalAttrs.version}'" + '' + # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. + + '' + substituteInPlace setup.cfg \ + --replace-fail \ + "[pytest]" \ + "[tool:pytest]" + ''; + + build-system = [ + # meson + meson-python + ninja + numpy + ]; + + dependencies = [ + ase + numpy + packaging + scipy + ]; + + optional-dependencies = { + cli = [ + argcomplete + ]; + dislocation = [ + atomman + nglview + ovito + ]; + docs = [ + jupytext + # matscipy + myst-nb + numpydoc + pydata-sphinx-theme + sphinx + sphinx-copybutton + sphinx-rtd-theme + sphinxcontrib-spelling + ]; + }; + + pythonImportsCheck = [ "matscipy" ]; + + nativeCheckInputs = [ + pytest-subtests + pytest-timeout + pytest-xdist + pytestCheckHook + sympy + ]; + + preCheck = '' + rm -rf matscipy + ''; + + disabledTestPaths = [ + # The CLI tests look for the source scripts under `../matscipy/cli` relative to the test + # directory, which we remove in `preCheck` so that tests run against the installed package. + "tests/test_electrochemistry_cli.py" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # ValueError: cannot resize an array that may be referenced by another object + "tests/manybody/test_newmb.py" + "tests/test_neighbours.py" + ]; + + disabledTests = [ + # Numerical assertion failure + "test_birch_constants" + + # numpy 2 / ase 3.28 incompatibilities in matscipy 1.2.0 + # `ase.phonons` finite-difference reference no longer matches + "test_hessian_monoatomic" + "test_hessian_amorphous_alloy" + "test_hessian_crystalline_alloy" + + # TypeError: only 0-dimensional arrays can be converted to Python scalars + "test_eam_read_write" + + # AttributeError: 'Log' object has no attribute 'close' + "test_logger" + "test_usage" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # AssertionError: assert np.False (numerical precision) + "test_fixed_line_atoms" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # ValueError: cannot resize an array that may be referenced by another object + "test_harmonic_bond" + "test_read_molecules_from_atoms" + "test_read_molecules_from_lammps_data" + "test_read_write_lammps_data" + ]; + + meta = { + description = "Materials science with Python at the atomic-scale"; + homepage = "https://github.com/libAtoms/matscipy"; + changelog = "https://github.com/libAtoms/matscipy/blob/${finalAttrs.src.tag}/ChangeLog.md"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22c03dc51d65..66728b94791e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9752,6 +9752,8 @@ self: super: with self; { matrix-nio = callPackage ../development/python-modules/matrix-nio { }; + matscipy = callPackage ../development/python-modules/matscipy { }; + matter-ble-proxy = callPackage ../development/python-modules/matter-ble-proxy { }; matter-python-client = callPackage ../development/python-modules/matter-python-client { }; From 04b3bd8efca17267b1040711907326fb076aceb2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 11 Jun 2026 13:13:57 +0000 Subject: [PATCH 077/152] python3Packages.torch-ema: init at 0.3.0 --- .../python-modules/torch-ema/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/torch-ema/default.nix diff --git a/pkgs/development/python-modules/torch-ema/default.nix b/pkgs/development/python-modules/torch-ema/default.nix new file mode 100644 index 000000000000..a81ee06f9a19 --- /dev/null +++ b/pkgs/development/python-modules/torch-ema/default.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + torch, + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "torch-ema"; + version = "0.3.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "fadel"; + repo = "pytorch_ema"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OOF5Lb3HEIBXc1WXoUp7y44pheDc5oX/7L1vTrwNS2o="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + torch + ]; + + pythonImportsCheck = [ "torch_ema" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox: + # RuntimeError: Failed to initialize cpuinfo! + "test_state_dict_types" + "test_to" + ]; + + meta = { + description = "Tiny PyTorch library for maintaining a moving average of a collection of parameters"; + homepage = "https://github.com/fadel/pytorch_ema"; + changelog = "https://github.com/fadel/pytorch_ema/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66728b94791e..d0f5a23b99e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19913,6 +19913,8 @@ self: super: with self; { torch-einops-utils = callPackage ../development/python-modules/torch-einops-utils { }; + torch-ema = callPackage ../development/python-modules/torch-ema { }; + torch-geometric = callPackage ../development/python-modules/torch-geometric { }; torch-memory-saver = callPackage ../development/python-modules/torch-memory-saver { }; From 8b2f221d44487d00d8ce76e878aa93a256240ac2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 11 Jun 2026 13:09:02 +0000 Subject: [PATCH 078/152] python3Packages.python-hostlist: init at 2.3.0 --- .../python-hostlist/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/python-hostlist/default.nix diff --git a/pkgs/development/python-modules/python-hostlist/default.nix b/pkgs/development/python-modules/python-hostlist/default.nix new file mode 100644 index 000000000000..3de14c209422 --- /dev/null +++ b/pkgs/development/python-modules/python-hostlist/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchurl, + + # build-system + setuptools, + + # tests + pytestCheckHook, +}: +buildPythonPackage (finalAttrs: { + pname = "python-hostlist"; + version = "2.3.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchurl { + url = "https://www.nsc.liu.se/~kent/python-hostlist/python_hostlist-${finalAttrs.version}.tar.gz"; + hash = "sha256-4aCxjlJaX8pXPLmGJ5nxGz8r07p67HDE7Ni5U0G7ceo="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "hostlist" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Python module for hostlist handling"; + homepage = "https://www.nsc.liu.se/~kent/python-hostlist/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0f5a23b99e1..b38e2d759fb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16029,6 +16029,8 @@ self: super: with self; { python-homewizard-energy = callPackage ../development/python-modules/python-homewizard-energy { }; + python-hostlist = callPackage ../development/python-modules/python-hostlist { }; + python-hosts = callPackage ../development/python-modules/python-hosts { }; python-hpilo = callPackage ../development/python-modules/python-hpilo { }; From f03ca2e04c7765cbefabfa49d97d67bdf33a08c7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 10 Jun 2026 16:23:18 +0000 Subject: [PATCH 079/152] python3Packages.mace-torch: init at 0.3.16 --- .../python-modules/mace-torch/default.nix | 138 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 140 insertions(+) create mode 100644 pkgs/development/python-modules/mace-torch/default.nix diff --git a/pkgs/development/python-modules/mace-torch/default.nix b/pkgs/development/python-modules/mace-torch/default.nix new file mode 100644 index 000000000000..3c8b486f643b --- /dev/null +++ b/pkgs/development/python-modules/mace-torch/default.nix @@ -0,0 +1,138 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + ase, + configargparse, + e3nn, + gitpython, + h5py, + lmdb, + matplotlib, + matscipy, + numpy, + opt-einsum, + orjson, + pandas, + prettytable, + python-hostlist, + pyyaml, + torch, + torch-ema, + torchmetrics, + tqdm, + + # tests + pytestCheckHook, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "mace-torch"; + version = "0.3.16"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "acesuit"; + repo = "mace"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sJ/3c7kPe99vkliixUMqqQi2OiL3CCUdlcgpDZ/PUHA="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ + "e3nn" + ]; + dependencies = [ + ase + configargparse + e3nn + gitpython + h5py + lmdb + matplotlib + matscipy + numpy + opt-einsum + orjson + pandas + prettytable + python-hostlist + pyyaml + torch + torch-ema + torchmetrics + tqdm + ]; + + pythonImportsCheck = [ "mace" ]; + + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + disabledTests = [ + # _pickle.PickleError: ScriptFunction cannot be pickled + "test_run_eval_fail_with_wrong_model" + + # ValueError: too many values to unpack (expected 2) + "test_mace_mp" + + # AssertionError (tensors not close) + "test_run_train_dipole" + "test_run_train_dipole_polar" + + # RuntimeError: Model download failed and no local model found + "test_calculator_descriptor" + "test_compile_foundation" + "test_extract_config" + "test_finite_difference_hessian" + "test_foundations" + "test_initial_metrics_replay_head_mh0" + "test_initial_metrics_replay_head_mh1" + "test_initial_metrics_replay_head_omol" + "test_mace_mh_1_elements_subset_reproduces_energy_forces" + "test_mace_mp_energies" + "test_mace_mp_stresses" + "test_mace_off" + "test_mace_omol_elements_subset_reproduces_energy_forces" + "test_multi_reference" + "test_multihead_finetuning_different_formats" + "test_multihead_finetuning_does_not_modify_default_keyspec" + "test_potential_energy_and_hessian" + "test_remove_pt_head_omol_multihead" + "test_run_train_foundation" + "test_run_train_foundation_elements" + "test_run_train_foundation_elements_multihead" + "test_run_train_foundation_multihead" + "test_run_train_foundation_multihead_json" + "test_run_train_foundation_multihead_pseudolabeling" + "test_run_train_freeze" + "test_run_train_mh_foundation" + "test_run_train_soft_freeze" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # symbol not found in flat namespace '___kmpc_barrier' + "test_mace" + "test_mace_compile_stress" + ]; + + meta = { + description = "Fast and accurate machine learning interatomic potentials with higher order equivariant message passing"; + homepage = "https://github.com/acesuit/mace"; + changelog = "https://github.com/acesuit/mace/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b38e2d759fb2..f1bfd4f84c93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9578,6 +9578,8 @@ self: super: with self; { macaddress = callPackage ../development/python-modules/macaddress { }; + mace-torch = callPackage ../development/python-modules/mace-torch { }; + macfsevents = callPackage ../development/python-modules/macfsevents { }; macholib = callPackage ../development/python-modules/macholib { }; From b53623ab0ed0f3914fde208a8d66a4e68d4f62d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jun 2026 08:59:38 +0000 Subject: [PATCH 080/152] python3Packages.aioghost: 0.4.16 -> 0.4.17 --- pkgs/development/python-modules/aioghost/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioghost/default.nix b/pkgs/development/python-modules/aioghost/default.nix index 4aff5398247a..f1854faf7d44 100644 --- a/pkgs/development/python-modules/aioghost/default.nix +++ b/pkgs/development/python-modules/aioghost/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "aioghost"; - version = "0.4.16"; + version = "0.4.17"; pyproject = true; src = fetchFromGitHub { owner = "TryGhost"; repo = "aioghost"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZyRPXtQVOEyKHiX1utIukoayHtCNB/gm8i/gUIEYhtg="; + hash = "sha256-4yywuZOfKwTTHpZdSSyE0d8t+LlJL5+AW48Xb85od+k="; }; build-system = [ hatchling ]; From 08b04d3581dc13760f5861bb0e034c91b4e7fca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 13 Jun 2026 12:25:23 +0700 Subject: [PATCH 081/152] =?UTF-8?q?nixtamal:=201.5.4=20=E2=86=92=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ni/nixtamal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix index e9f4193375a0..cb79390c8a10 100644 --- a/pkgs/by-name/ni/nixtamal/package.nix +++ b/pkgs/by-name/ni/nixtamal/package.nix @@ -20,7 +20,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { pname = "nixtamal"; - version = "1.5.4"; + version = "1.6.0"; release_year = 2026; minimalOCamlVersion = "5.3"; @@ -29,7 +29,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { url = "https://darcs.toastal.in.th/nixtamal/stable/"; mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ]; rev = finalAttrs.version; - hash = "sha256-ST90m0SF3dyGOV3Q43bJ9bGuznP0WIkQsIJXUNFNPOs="; + hash = "sha256-OOAulI6ZJGbbUMi68jnJQ+cJpZVQYL5F5HUfdOZ3wEs="; }; nativeBuildInputs = [ From bbc84aaf4e64390982580081874bea222ca76caa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jun 2026 10:40:26 +0000 Subject: [PATCH 082/152] python3Packages.pyghmi: 1.6.16 -> 1.6.17 --- pkgs/development/python-modules/pyghmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix index 31d8a4fce4c3..f48c56f9ff99 100644 --- a/pkgs/development/python-modules/pyghmi/default.nix +++ b/pkgs/development/python-modules/pyghmi/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pyghmi"; - version = "1.6.16"; + version = "1.6.17"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-VqMQ54Mx9fkq3UAbzEApzm0LuRKEGXQARf8HGH7yZ6U="; + hash = "sha256-+MkEYEzmT5744sVCEVQxb+cfAIed7m+nPndYpF5r/h0="; }; build-system = [ From 2a73bf3e84bb0db4c76da5420172a9a3512d4d36 Mon Sep 17 00:00:00 2001 From: Alex Epelde Date: Sat, 13 Jun 2026 08:55:01 -0400 Subject: [PATCH 083/152] python3Packages.low-index: add update script The default `nix-update-script { }` does not work. --- pkgs/development/python-modules/low-index/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/low-index/default.nix b/pkgs/development/python-modules/low-index/default.nix index c753e78d2ff5..0f0a48415c0e 100644 --- a/pkgs/development/python-modules/low-index/default.nix +++ b/pkgs/development/python-modules/low-index/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, + nix-update-script, }: buildPythonPackage rec { @@ -28,6 +29,13 @@ buildPythonPackage rec { runHook postCheck ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v(.*)_as_released" + ]; + }; + meta = { description = "Enumerates low index subgroups of a finitely presented group"; changelog = "https://github.com/3-manifolds/low_index/releases/tag/${src.tag}"; From 5d6d986a6466f2f0485de3ca04da3d0c8c945ee6 Mon Sep 17 00:00:00 2001 From: Alex Epelde Date: Sat, 13 Jun 2026 08:55:28 -0400 Subject: [PATCH 084/152] python3Packages.low-index: 1.2.1 -> 1.3 --- pkgs/development/python-modules/low-index/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/low-index/default.nix b/pkgs/development/python-modules/low-index/default.nix index 0f0a48415c0e..6bd1711c40ee 100644 --- a/pkgs/development/python-modules/low-index/default.nix +++ b/pkgs/development/python-modules/low-index/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "low-index"; - version = "1.2.1"; + version = "1.3"; pyproject = true; src = fetchFromGitHub { owner = "3-manifolds"; repo = "low_index"; tag = "v${version}_as_released"; - hash = "sha256-T8hzC9ulikQ1pUdbXgjuKAX5oMJEycPvXWv74rCkQGY="; + hash = "sha256-m3p05bqu70pMOsb9drW1B6+N893eBSZBFTNNS23OY6w="; }; build-system = [ setuptools ]; From 2fe270b6547fcb2939d06069796865902823d53b Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sat, 13 Jun 2026 15:11:33 +0200 Subject: [PATCH 085/152] bazel-gazelle: 0.47.0 -> 0.51.3 changelog: https://github.com/bazel-contrib/bazel-gazelle/releases/tag/v0.51.3 diff: https://github.com/bazel-contrib/bazel-gazelle/compare/v0.47.0...v0.51.3 --- pkgs/by-name/ba/bazel-gazelle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bazel-gazelle/package.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix index a6d180098248..1f82a1e5ce02 100644 --- a/pkgs/by-name/ba/bazel-gazelle/package.nix +++ b/pkgs/by-name/ba/bazel-gazelle/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "bazel-gazelle"; - version = "0.47.0"; + version = "0.51.3"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-gazelle"; rev = "v${finalAttrs.version}"; - hash = "sha256-rnJ8rht7ccAI8ceOv3B0mlcY0fQg9Nfy+hu+/pmQQqE="; + hash = "sha256-ooqk4xutkjXoy9Irikos/53+6Mhdh3+WmJF7vo3JVFw="; }; vendorHash = null; From 8a1d2aa20ba34fc6ab05c4658f9bbb5c02b7dcfb Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sat, 13 Jun 2026 15:13:12 +0200 Subject: [PATCH 086/152] bazel-gazelle: modernize --- pkgs/by-name/ba/bazel-gazelle/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/bazel-gazelle/package.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix index 1f82a1e5ce02..bca86e6bc710 100644 --- a/pkgs/by-name/ba/bazel-gazelle/package.nix +++ b/pkgs/by-name/ba/bazel-gazelle/package.nix @@ -9,9 +9,9 @@ buildGoModule (finalAttrs: { version = "0.51.3"; src = fetchFromGitHub { - owner = "bazelbuild"; + owner = "bazel-contrib"; repo = "bazel-gazelle"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ooqk4xutkjXoy9Irikos/53+6Mhdh3+WmJF7vo3JVFw="; }; @@ -22,7 +22,8 @@ buildGoModule (finalAttrs: { subPackages = [ "cmd/gazelle" ]; meta = { - homepage = "https://github.com/bazelbuild/bazel-gazelle"; + changelog = "https://github.com/bazel-contrib/bazel-gazelle/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://github.com/bazel-contrib/bazel-gazelle"; description = '' Gazelle is a Bazel build file generator for Bazel projects. It natively supports Go and protobuf, and it may be extended to support new languages From 8970b14527c6ca5e745bed07415c641208ff2795 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sat, 13 Jun 2026 15:13:41 +0200 Subject: [PATCH 087/152] bazel-gazelle: add hythera as maintainer --- pkgs/by-name/ba/bazel-gazelle/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/bazel-gazelle/package.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix index bca86e6bc710..24e3c6c62f0e 100644 --- a/pkgs/by-name/ba/bazel-gazelle/package.nix +++ b/pkgs/by-name/ba/bazel-gazelle/package.nix @@ -30,7 +30,10 @@ buildGoModule (finalAttrs: { and custom rule sets. ''; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ kalbasit ]; + maintainers = with lib.maintainers; [ + kalbasit + hythera + ]; mainProgram = "gazelle"; }; }) From 3641018eba90f1b6544bc77604a666dc52747911 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jun 2026 17:20:10 +0000 Subject: [PATCH 088/152] amp-cli: 0.0.1780564400-g2007df -> 0.0.1781370323-g977781 --- pkgs/by-name/am/amp-cli/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index 1e95356b3f79..9d550582c9d3 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -27,7 +27,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "amp-cli"; - version = "0.0.1780564400-g2007df"; + version = "0.0.1781370323-g977781"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}; @@ -78,10 +78,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://static.ampcode.com/cli/${finalAttrs.version}/amp-${platform}.gz"; hash = { - x86_64-linux = "sha256-7hUa1Qs1pNH2+31rrc9T99eDQ9Vq+CSwxROISyPqogY="; - aarch64-linux = "sha256-ThT2J1YBoZM5+YanRbL40GyxYQtK/xyDqac8fv0gfZs="; - x86_64-darwin = "sha256-VnuMqXVzqge5jgduxB+woYLVZkFtu92MEsEsrh4tJgE="; - aarch64-darwin = "sha256-gYAI+eQitglQTBtuilHkHKd8rsYsJ7s2QKoFQR85l6o="; + x86_64-linux = "sha256-taXa0AE0re6IoUxr/Sa7Os/pt/u0Zm+eCxRbRW019fA="; + aarch64-linux = "sha256-gFfgGlFB+HpV+KAitpOtXu2ij7hQYmxzm8gzy+l79us="; + x86_64-darwin = "sha256-1L+J9i/y5fg2rySOfAZySnBbqgmxpM7+7h9CoREI14s="; + aarch64-darwin = "sha256-1I7roExnTQFjByVDDr6ym3X+70Ba9IVE9vxBHVlJQIY="; } .${system'}; } From 074a86bc3870ac52cc014a1a4cdd09a57361bb88 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 13 Jun 2026 18:39:15 +0000 Subject: [PATCH 089/152] python3Packages.jaxtyping: 0.3.10 -> 0.3.11 Diff: https://github.com/patrick-kidger/jaxtyping/compare/v0.3.10...v0.3.11 Changelog: https://github.com/patrick-kidger/jaxtyping/releases/tag/v0.3.11 --- pkgs/development/python-modules/jaxtyping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index e388ba7b5260..19df15b2aa7b 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { pname = "jaxtyping"; - version = "0.3.10"; + version = "0.3.11"; pyproject = true; __structuredAttrs = true; @@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: { owner = "patrick-kidger"; repo = "jaxtyping"; tag = "v${finalAttrs.version}"; - hash = "sha256-7HhStNjVKjnPfXiuXDLsvwH1efSGSMqRuCWeOtpcidw="; + hash = "sha256-oC8n4YiV39EjRm8vYDFrUVJmEPeH814q7uIKdmpqnJk="; }; build-system = [ hatchling ]; From e8a7dc5c4fb4b98cc87237da536bb9d06001e4b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jun 2026 20:00:13 +0000 Subject: [PATCH 090/152] kodiPackages.jellycon: 0.9.1 -> 1.0.0 --- pkgs/applications/video/kodi/addons/jellycon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix index fee86e9c401b..8c0996f7764f 100644 --- a/pkgs/applications/video/kodi/addons/jellycon/default.nix +++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix @@ -17,13 +17,13 @@ in buildKodiAddon rec { pname = "jellycon"; namespace = "plugin.video.jellycon"; - version = "0.9.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellycon"; rev = "v${version}"; - sha256 = "sha256-bSAzd0nKD0S3hNEM0azmCNPw9wHQK5XH6lbfcz3sW9o="; + sha256 = "sha256-1o9mkMjlLDIcokpTqDKmFlCOF1XjrVOxlFfy0bpZolc="; }; nativeBuildInputs = [ From 9a34c16d42ba7a309f738f83710661b3b779ba23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jun 2026 20:30:27 +0000 Subject: [PATCH 091/152] hl-log-viewer: 0.36.2 -> 0.36.3 --- pkgs/by-name/hl/hl-log-viewer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hl/hl-log-viewer/package.nix b/pkgs/by-name/hl/hl-log-viewer/package.nix index fd44667d6c23..cad200fb82fc 100644 --- a/pkgs/by-name/hl/hl-log-viewer/package.nix +++ b/pkgs/by-name/hl/hl-log-viewer/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hl-log-viewer"; - version = "0.36.2"; + version = "0.36.3"; src = fetchFromGitHub { owner = "pamburus"; repo = "hl"; tag = "v${finalAttrs.version}"; - hash = "sha256-r6p4gw1QzZPu1DWzbTNDnvKMi/pqZvViK4rAn4aov4A="; + hash = "sha256-Azt1jfBZP7N5ZAgdY2Hww6nt5ty2VEKZpaHZDodP/zM="; }; - cargoHash = "sha256-8yb8elk8iG4snyExkQdJQn5eaKMNcPqYsAE/sIW6euk="; + cargoHash = "sha256-RXIXoF3z2Zleje1OakHXQxPmNkRcqHjINRZYqMXS8U0="; nativeBuildInputs = [ installShellFiles ]; From 5daeda6cddd5ac94eb22a1631b87642f645df15f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 13 Jun 2026 22:41:00 +0000 Subject: [PATCH 092/152] python3Packages.torchrl: fix hash --- pkgs/development/python-modules/torchrl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index 7a8f43834926..43db2040c220 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -83,7 +83,7 @@ buildPythonPackage (finalAttrs: { owner = "pytorch"; repo = "rl"; tag = "v${finalAttrs.version}"; - hash = "sha256-S0jfngqmRQwIVGHM72KUnp/TlR2js+QLRpsX6abiv84="; + hash = "sha256-xnQLwOofHwdRvrOMNJpAEiOT7BEfxoPmrcxw2H3CTvI="; }; postPatch = '' From 134e32b7c7111ad9210db13c794beaf010723d82 Mon Sep 17 00:00:00 2001 From: Siren Date: Sat, 13 Jun 2026 16:00:28 -0700 Subject: [PATCH 093/152] nixos/fontconfig: concatStringsSep -> concatMapStrings Co-authored-by: gabby --- nixos/modules/config/fonts/fontconfig.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 74a931e8b0c5..861b17cc96a2 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -135,7 +135,7 @@ let key: fonts: lib.optionalString ((builtins.length fonts) > 0) '' <${key}> - ${lib.concatStringsSep "" (map (font: "${font}") fonts)} + ${lib.concatMapStrings (font: "${font}") fonts} ''; From b87e5beca208dc5c7f7f20d1090c6acb63c701d4 Mon Sep 17 00:00:00 2001 From: Siren Date: Sat, 13 Jun 2026 16:01:01 -0700 Subject: [PATCH 094/152] nixos/fontconfig: concatStringsSep -> concatStrings Co-authored-by: gabby --- nixos/modules/config/fonts/fontconfig.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 861b17cc96a2..16b22841ac14 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -154,7 +154,7 @@ let - ${lib.concatStringsSep "" (lib.mapAttrsToList mkAliasBlock cfg.aliases)} + ${lib.concatStrings (lib.mapAttrsToList mkAliasBlock cfg.aliases)} ''; From e0ae506a1cafcc037618160c5a0ee76deeb629fb Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sat, 13 Jun 2026 22:58:10 -0300 Subject: [PATCH 095/152] deluge: add missing libappindicator-gtk3 dependency --- pkgs/applications/networking/p2p/deluge/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index ef4bd7b5faef..e08d463c6300 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -5,6 +5,7 @@ libtorrent-rasterbar, python3Packages, gtk3, + libappindicator-gtk3, glib, gobject-introspection, librsvg, @@ -54,6 +55,7 @@ let gtk3 gobject-introspection pygobject3 + libappindicator-gtk3 ]; nativeBuildInputs = [ From 668a960aeb7b04fd9efaf01e1286e85cf74fe7b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 06:32:14 +0000 Subject: [PATCH 096/152] oelint-adv: 9.8.2 -> 9.8.4 --- pkgs/by-name/oe/oelint-adv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index 68215db4413c..60997d1a6a5a 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "oelint-adv"; - version = "9.8.2"; + version = "9.8.4"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-adv"; tag = finalAttrs.version; - hash = "sha256-mZleG+NAVqjeJ66SlYYvF90XwJ4H1wlsMOQRBdH1qhM="; + hash = "sha256-bQFjf+BAmJKsjcjZcTc34+4bcSq4hgSBKgHRcYA1ai0="; }; postPatch = '' From de907029bd003c08125c17299400c58aa5610ce7 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Thu, 4 Jun 2026 22:14:30 +0200 Subject: [PATCH 097/152] =?UTF-8?q?zensical:=200.0.43=20=E2=86=92=200.0.45?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ze/zensical/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix index 7bf903354831..885e498be641 100644 --- a/pkgs/by-name/ze/zensical/package.nix +++ b/pkgs/by-name/ze/zensical/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "zensical"; - version = "0.0.43"; + version = "0.0.45"; pyproject = true; # We fetch from PyPi, because GitHub repo does not contain all sources. @@ -16,12 +16,12 @@ python3Packages.buildPythonApplication (finalAttrs: { # We could combine sources, but then nix-update won't work. src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-3C04BP9WJ5XBAkEw4MPOeXNkZ5MHKd2jFPCW0ONbmMg="; + hash = "sha256-MVvOSrBHAzjdNYit04+zJfhAhWw3VyLmgCvVigZEYmY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-clm+y56i2RN0FxicGpZ/JWdGxjkSo6xFf0sGE6LdSaQ="; + hash = "sha256-f2CNYnHLZrffyMw/lZq/cVb5sB1+CfZzlAtQUMvlwqE="; }; nativeBuildInputs = with rustPlatform; [ From 80b6ddbccc7e840fadd330489c179f5613a68177 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 06:59:54 +0000 Subject: [PATCH 098/152] python3Packages.protego: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/protego/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index a732efb982ac..4da1b264cb29 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "protego"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "scrapy"; repo = "protego"; tag = finalAttrs.version; - hash = "sha256-qyOY35gNFojewFMFVT58k1s5uM4j9IZzEURnPh+3htE="; + hash = "sha256-Me+bSJnHHJH0ryPoSS7EN2Px5FNElCWQzvKrmWll4mQ="; }; build-system = [ hatchling ]; From b5f702439e92f29dce5cd933a8f0cfe7baf46d19 Mon Sep 17 00:00:00 2001 From: James Alseth Date: Sun, 14 Jun 2026 00:11:49 -0700 Subject: [PATCH 099/152] gimp: revert __structuredAttrs Revert the `__structuredAttrs = true` added in b08f524 (#526359). This causes GIMP to crash at runtime. Fixes #531558. --- pkgs/applications/graphics/gimp/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 89a8c9f1cbd8..59d035b32d97 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -338,8 +338,6 @@ stdenv.mkDerivation (finalAttrs: { gtk = gtk3; }; - __structuredAttrs = true; - meta = { description = "GNU Image Manipulation Program"; homepage = "https://www.gimp.org/"; From 09476e6bdd0d7327d7b41e683a3ee7520ce05346 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Jun 2026 13:08:05 +0300 Subject: [PATCH 100/152] linux/generate-config: disallow conflicting answers on choice questions These are order dependent and also wrong and bad and no. --- pkgs/os-specific/linux/kernel/generate-config.pl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 57d3ab739cb6..18d1f2150562 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -100,7 +100,13 @@ sub runConfig { elsif ($line =~ /choice\[(.*)\]: ###$/) { my $answer = ""; foreach my $name (keys %choices) { - $answer = $choices{$name} if ($answers{$name} || "") eq "y"; + if (($answers{$name} || "") eq "y") { + if ($answer eq "") { + $answer = $choices{$name}; + } else { + die "conflicting answers!" + } + } } print STDERR "CHOICE: $1, ANSWER: $answer\n" if $debug; print OUT "$answer\n" if $1 =~ /-/; From 143dd2e587f0ff3ec29c467f9f5f9891d1067062 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Jun 2026 13:53:35 +0300 Subject: [PATCH 101/152] linux/common-config: adjust preempt settings to avoid conflicts The only difference on all vanilla kernels across {aarch64,x86_64}-linux is that aarch64-linux 6.18 gets PREEMPT_LAZY consistently. --- pkgs/os-specific/linux/kernel/common-config.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f89fa487bfe2..91bea44bf1a7 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1420,13 +1420,10 @@ let DRM_AMDGPU_USERPTR = yes; # We want to prefer PREEMPT_LAZY when available, and fall back on PREEMPT_VOLUNTARY. - # It just so happens that kconfig asks for PREEMPT_LAZY first, so doing it like this - # does what we want. - # FIXME: This is stupid and bad. - # See: https://github.com/torvalds/linux/commit/7dadeaa6e851e7d67733f3e24fc53ee107781d0f + # The version cutoff is arbitrary, the real cutoff is somewhere around 6.13 depending on target. PREEMPT = no; - PREEMPT_LAZY = option yes; - PREEMPT_VOLUNTARY = option yes; + PREEMPT_LAZY = whenAtLeast "6.18" yes; + PREEMPT_VOLUNTARY = whenOlder "6.18" yes; X86_AMD_PLATFORM_DEVICE = lib.mkIf stdenv.hostPlatform.isx86 yes; X86_PLATFORM_DRIVERS_DELL = lib.mkIf stdenv.hostPlatform.isx86 (whenAtLeast "5.12" yes); From b55fad695e03f146f89fc7c200e70ccf5b13933a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 11:46:40 +0000 Subject: [PATCH 102/152] python3Packages.openslide: 1.4.3 -> 1.4.6 --- pkgs/development/python-modules/openslide/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openslide/default.nix b/pkgs/development/python-modules/openslide/default.nix index 663c1d30df26..72a60b005b7d 100644 --- a/pkgs/development/python-modules/openslide/default.nix +++ b/pkgs/development/python-modules/openslide/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "openslide"; - version = "1.4.3"; + version = "1.4.6"; pyproject = true; src = fetchFromGitHub { owner = "openslide"; repo = "openslide-python"; tag = "v${version}"; - hash = "sha256-v8JrZdDwZPtnWYOmvJXbq22k6/MQqMzWweD86Eof0e4="; + hash = "sha256-uo1jcfxbx9v9vNQGnzAhO4N/QKQycMh5y4ICWstnZA0="; }; postPatch = '' From b14214ae2cf04aea3d59c95b48d1a194ca680b65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 11:52:14 +0000 Subject: [PATCH 103/152] google-cloud-sql-proxy: 2.21.1 -> 2.22.1 --- pkgs/by-name/go/google-cloud-sql-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix index 4e65566a0a90..6b89b0bad4cf 100644 --- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix +++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "google-cloud-sql-proxy"; - version = "2.21.1"; + version = "2.22.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${finalAttrs.version}"; - hash = "sha256-3C7IfpVcv1BpzKnMV6dQJ0e7hY50owR3YijlI2+cAJQ="; + hash = "sha256-vTTYQ1D42X1L03EE9c5Xz/SCRE3wWROT/daY+f0vLPI="; }; subPackages = [ "." ]; - vendorHash = "sha256-tbglk7rscPx1RrURSzVW5FgZE6b6mp4tvOXVQKMUrjQ="; + vendorHash = "sha256-lOT9GpZk6Bv5P8kiyMR4j+aHOO0be4pW4WvVux8hpnQ="; checkFlags = [ "-short" From 42e134272909bd79765e5e872b67f0ddf71f8942 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 13:09:08 +0000 Subject: [PATCH 104/152] statix: 0-unstable-2026-05-14 -> 0.5.8-unstable-2026-06-13 --- pkgs/by-name/st/statix/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix index ea7986f959b6..3c6ed8dbb302 100644 --- a/pkgs/by-name/st/statix/package.nix +++ b/pkgs/by-name/st/statix/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "statix"; - version = "0-unstable-2026-05-14"; + version = "0.5.8-unstable-2026-06-13"; src = fetchFromGitHub { owner = "molybdenumsoftware"; repo = "statix"; - rev = "f0d256d60d9b9736b274a0edc0492be472318166"; - hash = "sha256-dylteN19qQ/MclInQ+x4vf+rBGNIsaKWJ+WgiS0ZBjI="; + rev = "127a42f761909e5caa79f616a353e9b6e1a0587f"; + hash = "sha256-epwk3oW5A0ttTKSO2zgC50PkD9mTFjLtDlofTIeOdf8="; }; - cargoHash = "sha256-lODAnIGw8MncMT5xicWORSbCChn2HQXENsOStJYHepQ="; + cargoHash = "sha256-bsy8p8zbfQ7EjXCDwFbVaq4qN8aEsp27Jcn9zfW2eXw="; buildFeatures = lib.optional withJson "json"; From a40b1f6d99d7b8e05a20097d6916b925f3244c98 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 14 Jun 2026 20:20:46 +0700 Subject: [PATCH 105/152] python3Packages.awesome-slugify: drop --- .../awesome-slugify/default.nix | 43 ------------------- .../slugify_filename_test.patch | 13 ------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 pkgs/development/python-modules/awesome-slugify/default.nix delete mode 100644 pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix deleted file mode 100644 index 30d1ebca1044..000000000000 --- a/pkgs/development/python-modules/awesome-slugify/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - unidecode, - regex, - unittestCheckHook, -}: - -buildPythonPackage rec { - pname = "awesome-slugify"; - version = "1.6.5"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "0wgxrhr8s5vk2xmcz9s1z1aml4ppawmhkbggl9rp94c747xc7pmv"; - }; - - prePatch = '' - substituteInPlace setup.py \ - --replace 'Unidecode>=0.04.14,<0.05' 'Unidecode>=0.04.14' - ''; - - patches = [ - ./slugify_filename_test.patch # fixes broken test by new unidecode - ]; - - propagatedBuildInputs = [ - unidecode - regex - ]; - - nativeCheckInputs = [ unittestCheckHook ]; - - meta = { - homepage = "https://github.com/dimka665/awesome-slugify"; - description = "Python flexible slugify function"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch b/pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch deleted file mode 100644 index 3283d76eae05..000000000000 --- a/pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/slugify/tests.py w/slugify/tests.py -index 4c9fa1c..3e14328 100644 ---- i/slugify/tests.py -+++ w/slugify/tests.py -@@ -57,7 +57,7 @@ class PredefinedSlugifyTestCase(unittest.TestCase): - self.assertEqual(slugify_url('The Über article'), 'uber-article') - - def test_slugify_filename(self): -- self.assertEqual(slugify_filename(u'Дrаft №2.txt'), u'Draft_2.txt') -+ self.assertEqual(slugify_filename(u'Дrаft №2.txt'), u'Draft_No._2.txt') - - - class ToLowerTestCase(unittest.TestCase): diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f038db61d384..d113ecb465d9 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -100,6 +100,7 @@ mapAliases { audio-metadata = throw "'audio-metadata' has been removed as it's unmaintained since 2020"; # Added 2026-03-12 autotrash = throw "'autotrash' has been renamed to/replaced by 'super.pkgs.autotrash'"; # Converted to throw 2025-10-29 av_13 = throw "'av_13' has been renamed to/replaced by 'av'"; # Added 2026-02-01 + awesome-slugify = throw "'awesome-slugify' has been removed as it was unmaintained upstream"; # Added 2026-06-14 Babel = throw "'Babel' has been renamed to/replaced by 'babel'"; # Converted to throw 2025-10-29 backports-functools-lru-cache = throw "'backports-functools-lru-cache' has been removed from nixpkgs as it was not longer used in python2"; # Added 2026-01-14 backports_shutil_get_terminal_size = throw "'backports_shutil_get_terminal_size' has been renamed to/replaced by 'backports-shutil-get-terminal-size'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42f7e233afab..48699eac83a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1343,8 +1343,6 @@ self: super: with self; { awacs = callPackage ../development/python-modules/awacs { }; - awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; - awesomeversion = callPackage ../development/python-modules/awesomeversion { }; awkward = callPackage ../development/python-modules/awkward { }; From 615d7c597dc93ba300e06977965f2fe4041be6d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 13:41:49 +0000 Subject: [PATCH 106/152] terraform-providers.venafi_venafi: 0.23.1 -> 0.23.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2811b1757f18..99b297f1f782 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1436,13 +1436,13 @@ "vendorHash": "sha256-lWBMihP6oX7qPpTuPQQwQS3IDwdyb/rEYqtBsTozb7Q=" }, "venafi_venafi": { - "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=", + "hash": "sha256-WOCZRVAYVR9uzsyyAvCQvYReaas6YmZsbRgxxxhDF/k=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.23.1", + "rev": "v0.23.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-chDZVBd7tb1VsfTXcWz7j29LzHpUnJpXKRFAyqxnR8s=" + "vendorHash": "sha256-rqDzBez3HvhG+xvEyQ6foq/m0sFyyqrioquY9mcuWOU=" }, "vinyldns_vinyldns": { "hash": "sha256-/M+HFMDeKpIzzdn04TkMxriVeE6vvORRiqonxF38B9Q=", From bbd7e87d3b1d811cc39bfcf34e1ca886ab39c94a Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 6 Jun 2026 02:03:27 +0700 Subject: [PATCH 107/152] python3Packages.bch: modernize --- pkgs/development/python-modules/bch/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bch/default.nix b/pkgs/development/python-modules/bch/default.nix index 9f39521f3327..c947beafd19b 100644 --- a/pkgs/development/python-modules/bch/default.nix +++ b/pkgs/development/python-modules/bch/default.nix @@ -9,16 +9,18 @@ pyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bch"; version = "1.2.1"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "hardwario"; repo = "bch-control-tool"; - rev = "v${version}"; - sha256 = "/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY="; }; build-system = [ setuptools ]; @@ -31,8 +33,8 @@ buildPythonPackage rec { ]; postPatch = '' - sed -ri 's/@@VERSION@@/${version}/g' \ - bch/cli.py setup.py + substituteInPlace bch/cli.py setup.py \ + --replace-fail "@@VERSION@@" "${finalAttrs.version}" ''; pythonImportsCheck = [ "bch" ]; @@ -45,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ cynerd ]; }; -} +}) From 2970fe74cbe750945cc37ec3ee0b67f87f85df0b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 14 Jun 2026 13:34:58 +0000 Subject: [PATCH 108/152] python3Packages.sunpy: 7.1.0 -> 7.1.2 Diff: https://github.com/sunpy/sunpy/compare/v7.1.0...v7.1.2 Changelog: https://docs.sunpy.org/en/stable/whatsnew/changelog.html --- pkgs/development/python-modules/sunpy/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index b28502734bd4..be52a3357bf8 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -60,14 +60,15 @@ buildPythonPackage (finalAttrs: { pname = "sunpy"; - version = "7.1.0"; + version = "7.1.2"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "sunpy"; repo = "sunpy"; tag = "v${finalAttrs.version}"; - hash = "sha256-FeKmg3dZfbbjt1lDliF4uXf8PvM3J5HWtYqKRriJ4l0="; + hash = "sha256-saq3vYJMKogXSBxKn/tqlSnE96K10EM27femC+Qx0Gw="; }; build-system = [ @@ -179,6 +180,10 @@ buildPythonPackage (finalAttrs: { "test_main_submodule_map" "test_tai_seconds" "test_utime" + + # AssertionError: assert 2 == 1 + # where 2 = len(WarningsChecker(record=True)) + "test_sunpy_warnings_logging" ]; disabledTestPaths = [ From 3b3556e3ef0c45a7f400103820d96df69575b8ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 14:02:29 +0000 Subject: [PATCH 109/152] lemminx: 0.31.0 -> 0.31.2 --- pkgs/by-name/le/lemminx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix index 725c9565142a..8371961d9431 100644 --- a/pkgs/by-name/le/lemminx/package.nix +++ b/pkgs/by-name/le/lemminx/package.nix @@ -26,13 +26,13 @@ let in maven.buildMavenPackage rec { pname = "lemminx"; - version = "0.31.0"; + version = "0.31.2"; src = fetchFromGitHub { owner = "eclipse"; repo = "lemminx"; tag = version; - hash = "sha256-a+9RN1265fsmYAUMuUTxA+VqJv7xPlzuc8HqoZwmR4M="; + hash = "sha256-nV+IXeGEnJ7q2GEH9LKiy8ABePHSIt8GFPj/sZzv71E="; # Lemminx reads this git information at runtime from a git.properties # file on the classpath leaveDotGit = true; From 400f7150d984a895cd48c8fdc9bffd17362f60d0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 4 May 2026 23:33:32 +0000 Subject: [PATCH 110/152] python3Packages.cartopy: cleanup, fix --- .../python-modules/cartopy/default.nix | 83 ++++++++++++++----- 1 file changed, 63 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 2c82eae651f0..b747f7f171f1 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -1,39 +1,57 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system cython, - fetchPypi, - fontconfig, - gdal, + setuptools-scm, + + # nativeBuildInputs geos, + proj, + + # dependencies matplotlib, numpy, - owslib, - pillow, - proj, pyproj, pyshp, + shapely, + + # optional-dependencies + # ows + owslib, + pillow, + # plotting + gdal, + scipy, + + # tests + fontconfig, pytest-mpl, pytestCheckHook, - scipy, - setuptools-scm, - shapely, + writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cartopy"; version = "0.25.0"; pyproject = true; + __structuredAttrs = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-VfGjkOXz8HWyIcfZH7ECWK2XjbeGx5MOugbrRdKHU/4="; + src = fetchFromGitHub { + owner = "SciTools"; + repo = "cartopy"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qnsr8IgqgqQDyGslYBvpAr/+ccsUPOiA2yGOXge3nUw="; }; - build-system = [ setuptools-scm ]; + build-system = [ + cython + setuptools-scm + ]; nativeBuildInputs = [ - cython geos # for geos-config proj ]; @@ -66,12 +84,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mpl pytestCheckHook + writableTmpDirAsHomeHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; preCheck = '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf - export HOME=$TMPDIR ''; pytestFlags = [ @@ -85,16 +103,41 @@ buildPythonPackage rec { ]; disabledTests = [ + # Numerical errors. Example: + # AssertionError: Arrays are not almost equal to 4 decimals + "test_LatitudeFormatter_mercator" + "test_cursor_values" + "test_default" + "test_extents" + "test_geoaxes_no_subslice" + "test_geoaxes_set_boundary_clipping" + "test_get_extent" + "test_gridliner_labels_zoom" + "test_infinite_loop_bounds" + "test_invalid_xy_domain_corner" + "test_invalid_y_domain" + "test_osgb_vals" + "test_pcolormesh_datalim" + "test_plot_after_contour_doesnt_shrink" + "test_sweep" + "test_tiny_point_between_boundary_points" + "test_transform_point" + "test_with_transform" + + # Failed: Error: Image files did not match. + "test_background_img" "test_gridliner_constrained_adjust_datalim" - "test_gridliner_labels_bbox_style" + "test_imshow" + "test_pil_Image" + "test_stock_img" ]; meta = { description = "Process geospatial data to create maps and perform analyses"; homepage = "https://scitools.org.uk/cartopy/docs/latest/"; - changelog = "https://github.com/SciTools/cartopy/releases/tag/v${version}"; + changelog = "https://github.com/SciTools/cartopy/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl3Plus; maintainers = [ ]; mainProgram = "feature_download"; }; -} +}) From 16a84aac3ceb6ac8802c702baed6638d19e4bf10 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 14 Jun 2026 14:52:48 +0000 Subject: [PATCH 111/152] python3Packages.kserve: 0.18.0 -> 0.19.0 Diff: https://github.com/kserve/kserve/compare/v0.18.0...v0.19.0 Changelog: https://github.com/kserve/kserve/releases/tag/v0.19.0 --- pkgs/development/python-modules/kserve/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index e0503d4b0f23..ecfb16deb689 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -24,6 +24,7 @@ prometheus-client, protobuf, psutil, + pyasn1, pydantic, python-dateutil, python-multipart, @@ -59,7 +60,7 @@ buildPythonPackage (finalAttrs: { pname = "kserve"; - version = "0.18.0"; + version = "0.19.0"; pyproject = true; __structuredAttrs = true; @@ -67,7 +68,7 @@ buildPythonPackage (finalAttrs: { owner = "kserve"; repo = "kserve"; tag = "v${finalAttrs.version}"; - hash = "sha256-qmv6DzYA/c/uGS4LNTdn3PnzhtLrhprF6r9ccngsUTU="; + hash = "sha256-i8eFdXwNLPTdEj2MnNAMbefxQGkMLHNwZXxg8+zv6v0="; }; sourceRoot = "${finalAttrs.src.name}/python/kserve"; @@ -106,6 +107,7 @@ buildPythonPackage (finalAttrs: { prometheus-client protobuf psutil + pyasn1 pydantic python-dateutil python-multipart From ceee92f9a3f400b84a52faf2cc40940be38faea6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 14:54:51 +0000 Subject: [PATCH 112/152] terraform-providers.oracle_oci: 8.17.0 -> 8.18.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2811b1757f18..fa4561cec391 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1058,11 +1058,11 @@ "vendorHash": null }, "oracle_oci": { - "hash": "sha256-uIggPhDgTMQei6LpXPzAbfbsoNjVN35P60QcqqHyCIA=", + "hash": "sha256-SFs0BYaYgB4J/HbaYFx1Sh1raVWhRJdW/3KMWdyvX+I=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v8.17.0", + "rev": "v8.18.0", "spdx": "MPL-2.0", "vendorHash": null }, From 578a0d3e39d1520ebaf0dbf3146c18e308e8b03c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 14 Jun 2026 14:38:21 +0000 Subject: [PATCH 113/152] python3Packages.portion: 2.6.1 -> 2.6.2 Diff: https://github.com/AlexandreDecan/portion/compare/2.6.1...2.6.2 Changelog: https://github.com/AlexandreDecan/portion/blob/refs/tags/2.6.2/CHANGELOG.md --- .../python-modules/portion/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/portion/default.nix b/pkgs/development/python-modules/portion/default.nix index 7cbe2884f387..effffd8f60bd 100644 --- a/pkgs/development/python-modules/portion/default.nix +++ b/pkgs/development/python-modules/portion/default.nix @@ -2,21 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system hatchling, + + # dependencies sortedcontainers, + + # tests + pytest-benchmark, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "portion"; - version = "2.6.1"; + version = "2.6.2"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "AlexandreDecan"; repo = "portion"; - tag = version; - hash = "sha256-K4mZn8Fm96ZBBdLTMfM9f1GKDdIrRwDRzk6ObaXSFG4="; + tag = finalAttrs.version; + hash = "sha256-ns9kUoSufegx0I3ag/KVl68ZviEIRx+zPA+BSWq3k80="; }; build-system = [ hatchling ]; @@ -25,13 +33,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "portion" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-benchmark + pytestCheckHook + ]; meta = { - description = "Portion, a Python library providing data structure and operations for intervals"; + description = "Python library providing data structure and operations for intervals"; homepage = "https://github.com/AlexandreDecan/portion"; - changelog = "https://github.com/AlexandreDecan/portion/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/AlexandreDecan/portion/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) From 7fa1b4c6285e9cda8a5ba470fa61ef4dcb4313e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 15:18:10 +0000 Subject: [PATCH 114/152] zashboard: 3.7.1 -> 3.9.0 --- pkgs/by-name/za/zashboard/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix index f138d9da8f52..d9fb336a683b 100644 --- a/pkgs/by-name/za/zashboard/package.nix +++ b/pkgs/by-name/za/zashboard/package.nix @@ -12,13 +12,13 @@ let in buildNpmPackage (finalAttrs: { pname = "zashboard"; - version = "3.7.1"; + version = "3.9.0"; src = fetchFromGitHub { owner = "Zephyruso"; repo = "zashboard"; tag = "v${finalAttrs.version}"; - hash = "sha256-XMhMYYYxdseHIAC1iJVgd5N0A0cb9zDR/nEugLpmalk="; + hash = "sha256-QUu1HNGjxcT/oNO6XEiUpQ6TfMwLv9MQIsAtff+hYsY="; }; npmDeps = null; From 32256defcca437e61ed355216e773b4802b39902 Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Sun, 14 Jun 2026 17:45:09 +0200 Subject: [PATCH 115/152] vimPlugins.avante-nvim: copy compiled libraries instead of symlinking Avoids installing avante-nvim-lib and rustc (+1 GB) into the user's system closure --- .../vim/plugins/non-generated/avante-nvim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 5b65f729acc2..18f312fc37fc 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -67,10 +67,10 @@ vimUtils.buildVimPlugin { in '' mkdir -p $out/build - ln -s ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext} - ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext} - ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext} - ln -s ${avante-nvim-lib}/lib/libavante_html2md${ext} $out/build/avante_html2md${ext} + cp ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext} + cp ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext} + cp ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext} + cp ${avante-nvim-lib}/lib/libavante_html2md${ext} $out/build/avante_html2md${ext} # Fixes PKCE auth flows not finding libcrypto substituteInPlace "$out/lua/avante/auth/pkce.lua" \ From ab7db15c69ce1836eecfb26b374c46e7f87a81a8 Mon Sep 17 00:00:00 2001 From: bokicoder <1556588440@qq.com> Date: Mon, 15 Jun 2026 00:11:26 +0800 Subject: [PATCH 116/152] nixos/scx-loader: fix failure to run when `/etc` is immutable --- nixos/modules/services/scheduling/scx-loader.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/scheduling/scx-loader.nix b/nixos/modules/services/scheduling/scx-loader.nix index 70c4df00c3bb..55f9bb7bd065 100644 --- a/nixos/modules/services/scheduling/scx-loader.nix +++ b/nixos/modules/services/scheduling/scx-loader.nix @@ -75,7 +75,11 @@ in } ]; - environment.systemPackages = [ cfg.package ] ++ cfg.schedsPackages; + environment = { + systemPackages = [ cfg.package ] ++ cfg.schedsPackages; + etc."scx_loader.toml".source = configFile; + }; + systemd.packages = [ cfg.package ]; services.dbus.packages = [ cfg.package ]; @@ -84,10 +88,6 @@ in systemd.services.scx_loader = { path = cfg.schedsPackages; wantedBy = [ "multi-user.target" ]; - serviceConfig = { - TemporaryFileSystem = [ "/etc" ]; - BindReadOnlyPaths = [ "${configFile.outPath}:/etc/scx_loader.toml" ]; - }; }; }; From 9e2a7c6780974c1084e6cb9faee81cb68a7ca682 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 24 May 2026 15:46:51 +0200 Subject: [PATCH 117/152] bitwarden-desktop: remove usage of CSC_IDENTITY_AUTO_DISCOVERY --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 3dfd2513b7ee..5bbbbae658e8 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -95,9 +95,6 @@ buildNpmPackage rec { env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - # make electron-builder not attempt to codesign the app on darwin - env.CSC_IDENTITY_AUTO_DISCOVERY = "false"; - nativeBuildInputs = [ cargo dart-sass From dd7d6f1134602bde2ade04b818ce6f45c8136c21 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 24 May 2026 15:47:14 +0200 Subject: [PATCH 118/152] drawio: remove usage of CSC_IDENTITY_AUTO_DISCOVERY --- pkgs/by-name/dr/drawio/package.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/dr/drawio/package.nix b/pkgs/by-name/dr/drawio/package.nix index f93da550e2cd..a494d80edfeb 100644 --- a/pkgs/by-name/dr/drawio/package.nix +++ b/pkgs/by-name/dr/drawio/package.nix @@ -64,19 +64,18 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - cp -R ${electron.dist}/Electron.app Electron.app - chmod -R u+w Electron.app - export CSC_IDENTITY_AUTO_DISCOVERY=false + electron_dist="$(mktemp -d)" + cp -r ${electron.dist}/. "$electron_dist" + chmod -R u+w "$electron_dist" + sed -i "/afterSign/d" electron-builder-linux-mac.json - '' - + '' + npm exec electron-builder -- \ --dir \ - ${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json --config.mac.identity=null"} \ - -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \ - -c.electronVersion=${electron.version} + --config electron-builder-linux-mac.json \ + -c.electronDist="$electron_dist" \ + -c.electronVersion=${electron.version} \ + -c.mac.identity=null runHook postBuild ''; From 74fa738dc84877048189274a466f3780061634b0 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 24 May 2026 15:47:25 +0200 Subject: [PATCH 119/152] gridtracker2: remove usage of CSC_IDENTITY_AUTO_DISCOVERY, refactor --- pkgs/by-name/gr/gridtracker2/package.nix | 28 +++++++++--------------- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix index aba9890cff20..338ec428b897 100644 --- a/pkgs/by-name/gr/gridtracker2/package.nix +++ b/pkgs/by-name/gr/gridtracker2/package.nix @@ -50,28 +50,20 @@ buildNpmPackage (finalAttrs: { buildPhase = '' runHook preBuild - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # electronDist needs to be modifiable on Darwin - cp -r ${electron.dist} electron-dist - chmod -R u+w electron-dist - # Disable code signing during build on macOS. - # https://github.com/electron-userland/electron-builder/blob/fa6fc16/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos - export CSC_IDENTITY_AUTO_DISCOVERY=false + # the electronDist directory needs to be outside of the working directory + # otherwise the electron-builder config accidentally includes it inside the .asar file + electron_dist="$(mktemp -d)" + cp -r ${electron.dist}/. "$electron_dist" + chmod -R u+w "$electron_dist" npm exec electron-builder -- \ --dir \ - -c.electronDist=electron-dist \ - -c.electronVersion=${electron.version} - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - npm exec electron-builder -- \ - --dir \ - -c.electronDist=${electron.dist} \ - -c.electronVersion=${electron.version} - '' - + '' + -c.electronDist="$electron_dist" \ + -c.electronVersion=${electron.version} \ + -c.mac.identity=null + # ^ disable codesigning on Darwin + runHook postBuild ''; From eac6f84bdc31200d76282bdcfe8c04e91c01c2d8 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 24 May 2026 15:47:43 +0200 Subject: [PATCH 120/152] kando: remove usage of CSC_IDENTITY_AUTO_DISCOVERY --- pkgs/by-name/ka/kando/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix index 86a4d4d372f8..d4963a5d5eeb 100644 --- a/pkgs/by-name/ka/kando/package.nix +++ b/pkgs/by-name/ka/kando/package.nix @@ -69,8 +69,6 @@ buildNpmPackage.override { inherit nodejs; } rec { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; # use our own node headers since we skip downloading them NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node"; - # disable code signing on Darwin - CSC_IDENTITY_AUTO_DISCOVERY = lib.optionalString stdenv.hostPlatform.isDarwin "false"; }; postConfigure = '' From 0d9c3cc57e8e9ac471f541c29cffba62865f37ea Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 24 May 2026 15:47:56 +0200 Subject: [PATCH 121/152] mqtt-explorer: remove usage of CSC_IDENTITY_AUTO_DISCOVERY --- pkgs/by-name/mq/mqtt-explorer/package.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix index 1f09774684f6..8471ece5d4a7 100644 --- a/pkgs/by-name/mq/mqtt-explorer/package.nix +++ b/pkgs/by-name/mq/mqtt-explorer/package.nix @@ -56,12 +56,6 @@ stdenv.mkDerivation rec { env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - # disable code signing on macos - # https://github.com/electron-userland/electron-builder/blob/77f977435c99247d5db395895618b150f5006e8f/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos - postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' - export CSC_IDENTITY_AUTO_DISCOVERY=false - ''; - configurePhase = '' runHook preConfigure @@ -100,7 +94,9 @@ stdenv.mkDerivation rec { yarn --offline run electron-builder --dir \ -c.electronDist="$electron_dist" \ - -c.electronVersion=${electron.version} + -c.electronVersion=${electron.version} \ + -c.mac.identity=null + # ^ disable code signing on macos runHook postBuild ''; From cd3edd505edadee81a5e7cd69ddd8c6eb890fab5 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 24 May 2026 15:48:06 +0200 Subject: [PATCH 122/152] opencode-desktop: remove usage of CSC_IDENTITY_AUTO_DISCOVERY --- pkgs/by-name/op/opencode-desktop/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix index 2af9b61a87bb..87b15e49ed0d 100644 --- a/pkgs/by-name/op/opencode-desktop/package.nix +++ b/pkgs/by-name/op/opencode-desktop/package.nix @@ -54,12 +54,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { OPENCODE_CHANNEL = "prod"; MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json"; OPENCODE_DISABLE_MODELS_FETCH = true; - } - # Disable code signing on macOS. Public build hosts don't have Apple Developer - # certificates, so electron-builder's `security find-identity` spawns produce - # EPERM inside the nix sandbox. - // lib.optionalAttrs stdenvNoCC.hostPlatform.isDarwin { - CSC_IDENTITY_AUTO_DISCOVERY = "false"; }; postPatch = '' From 524f9353a2fc45c4fe8d71510e0147370f0bde53 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 24 May 2026 15:48:13 +0200 Subject: [PATCH 123/152] signal-desktop: remove usage of CSC_IDENTITY_AUTO_DISCOVERY --- pkgs/by-name/si/signal-desktop/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index d84055a39297..de8764171560 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -181,10 +181,6 @@ stdenv.mkDerivation (finalAttrs: { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; SOURCE_DATE_EPOCH = 1780508208; - } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - # Disable code signing during local macOS builds. - CSC_IDENTITY_AUTO_DISCOVERY = "false"; }; preBuild = '' From 92c17ecc75c7bc3ee6f5a4b2b99033d5f2ec80b6 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 24 May 2026 15:48:24 +0200 Subject: [PATCH 124/152] super-productivity: remove usage of CSC_IDENTITY_AUTO_DISCOVERY --- pkgs/by-name/su/super-productivity/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 9584cc17b9c7..77f6c9bd3525 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -78,7 +78,6 @@ buildNpmPackage rec { env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; CHROMEDRIVER_SKIP_DOWNLOAD = "true"; - CSC_IDENTITY_AUTO_DISCOVERY = "false"; }; nativeBuildInputs = [ copyDesktopItems ]; From 730875f9e64eab47ac2cc999eb0155c1c4255d8d Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 24 May 2026 15:48:36 +0200 Subject: [PATCH 125/152] teams-for-linux: remove usage of CSC_IDENTITY_AUTO_DISCOVERY --- pkgs/by-name/te/teams-for-linux/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index d6c919d4c068..6533308cff6b 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -37,11 +37,7 @@ buildNpmPackage rec { doInstallCheck = stdenv.hostPlatform.isLinux; - env = { - # disable code signing on Darwin - CSC_IDENTITY_AUTO_DISCOVERY = "false"; - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - }; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; makeCacheWritable = true; From f701f68ba0db315505da52c243e007922328de05 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 24 May 2026 15:48:43 +0200 Subject: [PATCH 126/152] voicevox: remove usage of CSC_IDENTITY_AUTO_DISCOVERY --- pkgs/by-name/vo/voicevox/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix index e40181d50996..49346e310642 100644 --- a/pkgs/by-name/vo/voicevox/package.nix +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -86,9 +86,6 @@ stdenv.mkDerivation (finalAttrs: { env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - # disable code signing on Darwin - env.CSC_IDENTITY_AUTO_DISCOVERY = "false"; - buildPhase = '' runHook preBuild @@ -106,7 +103,9 @@ stdenv.mkDerivation (finalAttrs: { --dir \ --config ./build/electronBuilderConfigLoader.cjs \ -c.electronDist=electron-dist \ - -c.electronVersion=${electron.version} + -c.electronVersion=${electron.version} \ + -c.mac.identity=null + # ^ disable codesigning on Darwin runHook postBuild ''; From 069f6dabaec91385c1a941ed4faf202aabfb05f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 16:27:24 +0000 Subject: [PATCH 127/152] warp-terminal: 0.2026.06.03.09.49.stable_01 -> 0.2026.06.10.09.27.stable_01 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index ccc8f6fc3ee8..73b6228935a7 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-vJE22Nn9GXfNZcdvwH74X28nhLrxESoAX8XtxzDSBmI=", - "version": "0.2026.06.03.09.49.stable_01" + "hash": "sha256-t+okGBJP+1/DTpQSGJLeTJp4aIE8dgfgWXZoAheD4j8=", + "version": "0.2026.06.10.09.27.stable_01" }, "linux_x86_64": { - "hash": "sha256-dVBJ9L+e8B4WlVuMPWb0nDRdDkx8+eydbiAiJUm/OQg=", - "version": "0.2026.06.03.09.49.stable_01" + "hash": "sha256-cL/usCvilNG4Hk8y0cy6Eg73s8FWhoFi5AtYQFa+Vl8=", + "version": "0.2026.06.10.09.27.stable_01" }, "linux_aarch64": { - "hash": "sha256-llYMjRqZAlpbhzQTjndW7cgcEnGvdtcaP8bPmrP8HVo=", - "version": "0.2026.06.03.09.49.stable_01" + "hash": "sha256-YaiHMipeocIungev4SiitmobTr3NzFBv5kiY0rY2MNQ=", + "version": "0.2026.06.10.09.27.stable_01" } } From 9ff193b858b6aa3fac48dee1b813e0bf19a7b532 Mon Sep 17 00:00:00 2001 From: klea Date: Sun, 14 Jun 2026 11:03:22 +0000 Subject: [PATCH 128/152] backintime-common: Add dependency on fuse3 Closes #531574 --- pkgs/by-name/ba/backintime-common/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/backintime-common/package.nix b/pkgs/by-name/ba/backintime-common/package.nix index e9fb6e0d9025..7d4615325f40 100644 --- a/pkgs/by-name/ba/backintime-common/package.nix +++ b/pkgs/by-name/ba/backintime-common/package.nix @@ -9,6 +9,7 @@ cron, openssh, sshfs-fuse, + fuse3, gocryptfs, which, ps, @@ -73,11 +74,14 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "share" "${python'.sitePackages}" substituteInPlace "schedule.py" \ - --replace-fail "'crontab'" "'${cron}/bin/crontab'" \ + --replace-fail "'crontab'" "'${lib.getExe' cron "crontab"}'" \ --replace-fail "'which'" "'${lib.getExe which}'" \ --replace-fail "'ps'" "'${lib.getExe ps}'" \ --replace-fail "'grep'" "'${lib.getExe gnugrep}'" \ + substituteInPlace mount.py \ + --replace-fail "'fusermount'" "'${lib.getExe' fuse3 "fusermount3"}'" + substituteInPlace "bitlicense.py" \ --replace-fail "/usr/share/doc" "$out/share/doc" \ ''; From 5a9fb8993d63607cc87ef32ccbd8c9df75fb6f9e Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 14 Jun 2026 17:46:19 +0000 Subject: [PATCH 129/152] python3Packages.curl-cffi: add missing `rich` dependency otherwise `$out/bin/curl-cffi` fails: > Traceback (most recent call last): > File "/nix/store/jdi22r7swyiml492lms3ril9b45phmf9-python3.13-curl-cffi-0.15.0/bin/.curl-cffi-wrapped", line 6, in > from curl_cffi.cli import main > File "/nix/store/jdi22r7swyiml492lms3ril9b45phmf9-python3.13-curl-cffi-0.15.0/lib/python3.13/site-packages/curl_cffi/cli/__init__.py", line 6, in > from .run import handle_run, parse_http_file # noqa: F401 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/jdi22r7swyiml492lms3ril9b45phmf9-python3.13-curl-cffi-0.15.0/lib/python3.13/site-packages/curl_cffi/cli/run.py", line 11, in > from .request import _execute_request > File "/nix/store/jdi22r7swyiml492lms3ril9b45phmf9-python3.13-curl-cffi-0.15.0/lib/python3.13/site-packages/curl_cffi/cli/request.py", line 12, in > from .output import determine_print_spec, handle_download, print_output > File "/nix/store/jdi22r7swyiml492lms3ril9b45phmf9-python3.13-curl-cffi-0.15.0/lib/python3.13/site-packages/curl_cffi/cli/output.py", line 12, in > from rich.console import Console > ModuleNotFoundError: No module named 'rich' `rich` was being propagated by `litestar` -- added to `nativeCheckInputs` in 4985af20df0a. build with `doCheck = false` and it's clear that upstream wants `rich` at runtime: > Running phase: pythonRuntimeDepsCheckHook > Executing pythonRuntimeDepsCheck > Checking runtime dependencies for curl_cffi-0.15.0-cp310-abi3-linux_aarch64.whl > - rich not installed --- pkgs/development/python-modules/curl-cffi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 228e8037b203..1d328148d6e7 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -17,6 +17,7 @@ pytest-trio, pytestCheckHook, python-multipart, + rich, trustme, uvicorn, websockets, @@ -46,6 +47,7 @@ buildPythonPackage rec { dependencies = [ cffi certifi + rich ]; pythonImportsCheck = [ "curl_cffi" ]; From fe36669082caaefa96b0d9b67b7f4e22097bcb42 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Jun 2026 21:03:13 +0300 Subject: [PATCH 130/152] linux_7_1: init at 7.1 --- pkgs/os-specific/linux/kernel/kernels-org.json | 5 +++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 11 ++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a44bc74bacac..43db58a4181e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -38,5 +38,10 @@ "version": "7.0.12", "hash": "sha256:1nk5lans9qg1avmmcwyadfps43d3hyjz9a5gjyvsc77w3sjckvap", "lts": false + }, + "7.1": { + "version": "7.1", + "hash": "sha256:18344l5fv3hgsqjrjr3dgg96lll7f294qq11lg40sydygxwl87v9", + "lts": false } } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b2622edfdaf1..4b063031718e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1277,6 +1277,7 @@ mapAliases { linux_6_18 = linuxKernel.kernels.linux_6_18; linux_6_19 = linuxKernel.kernels.linux_6_19; linux_7_0 = linuxKernel.kernels.linux_7_0; + linux_7_1 = linuxKernel.kernels.linux_7_1; linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24 linux_hardened = throw "linux_hardened has been removed due to lack of maintenance"; # Added 2026-03-18 linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01 @@ -1312,6 +1313,7 @@ mapAliases { linuxPackages_6_18 = linuxKernel.packages.linux_6_18; linuxPackages_6_19 = linuxKernel.packages.linux_6_19; linuxPackages_7_0 = linuxKernel.packages.linux_7_0; + linuxPackages_7_1 = linuxKernel.packages.linux_7_1; linuxPackages_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24 linuxPackages_hardened = throw "linuxPackages_hardened has been removed due to lack of maintenance"; # Added 2026-03-18 linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01 diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index ddf456a49931..ccd896e616ee 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -100,6 +100,14 @@ in ]; }; + linux_7_1 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "7.1"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { @@ -667,6 +675,7 @@ in linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18); linux_7_0 = recurseIntoAttrs (packagesFor kernels.linux_7_0); + linux_7_1 = recurseIntoAttrs (packagesFor kernels.linux_7_1); } // lib.optionalAttrs config.allowAliases { linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21 @@ -735,7 +744,7 @@ in packageAliases = { linux_default = packages.linux_6_18; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_7_0; + linux_latest = packages.linux_7_1; } // lib.optionalAttrs config.allowAliases { linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; From 3b6239c340d2c5a5026a36da859594412f4ee16d Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 15 Jun 2026 02:35:51 +0800 Subject: [PATCH 131/152] emacs.pkgs.keymap-popup: init at 0.3.1 Also add the devel version. We manually add this package so that we can bump jabber the latest version 0.11.0. --- .../elisp-packages/elpa-devel-generated.nix | 21 +++++++++++++++++++ .../emacs/elisp-packages/elpa-generated.nix | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 5f4e032acc72..f5dcd733ce3a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -5097,6 +5097,27 @@ }; } ) { }; + keymap-popup = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "keymap-popup"; + ename = "keymap-popup"; + version = "0.3.1.0.20260530.4"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/keymap-popup-0.3.1.0.20260530.4.tar"; + sha256 = "1k6aqp65x3azbipj2pwdg15pip045cawx4im04s84kbk91fx0fxs"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/keymap-popup.html"; + license = lib.licenses.free; + }; + } + ) { }; kind-icon = callPackage ( { elpaBuild, diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 1b3e77cf6319..b106db195fb5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -5015,6 +5015,27 @@ }; } ) { }; + keymap-popup = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "keymap-popup"; + ename = "keymap-popup"; + version = "0.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/keymap-popup-0.3.1.tar"; + sha256 = "0m44s8618n7g5pajxiv4k1dfx6l58gr01a3ga26fxc51j1d05q8b"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/keymap-popup.html"; + license = lib.licenses.free; + }; + } + ) { }; kind-icon = callPackage ( { elpaBuild, From 6922fbdfdb543b45bccbd4d43a245e263a7e9378 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 15 Jun 2026 02:39:35 +0800 Subject: [PATCH 132/152] emacs.pkgs.jabber: 0.10.5 -> 0.11.0 The devel version is also bumped. --- .../emacs/elisp-packages/nongnu-devel-generated.nix | 12 ++++++++---- .../emacs/elisp-packages/nongnu-generated.nix | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix index f870cacfbf89..3b45915f44e3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix @@ -3225,17 +3225,21 @@ elpaBuild, fetchurl, fsm, + keymap-popup, lib, }: elpaBuild { pname = "jabber"; ename = "jabber"; - version = "0.10.5.0.20260423.192938"; + version = "0.11.0.0.20260614.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.10.5.0.20260423.192938.tar"; - sha256 = "1q79iv4znishj6rdz1m76r0c8h72i2g47xfh6xfw2gqxbkkyilv3"; + url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.11.0.0.20260614.0.tar"; + sha256 = "19h0w85m6vzwwpsgg6ifcyx2j082cgj6dpd7s5yd7pr438jazkn3"; }; - packageRequires = [ fsm ]; + packageRequires = [ + fsm + keymap-popup + ]; meta = { homepage = "https://elpa.nongnu.org/nongnu-devel/jabber.html"; license = lib.licenses.free; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index e5dfa1df3392..49c0d5cdceeb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -3240,17 +3240,21 @@ elpaBuild, fetchurl, fsm, + keymap-popup, lib, }: elpaBuild { pname = "jabber"; ename = "jabber"; - version = "0.10.5"; + version = "0.11.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/jabber-0.10.5.tar"; - sha256 = "1vjmajcls0l6mwccqdp7gr4g4r1z6f2qaf2palnimjb7w3gzh4mk"; + url = "https://elpa.nongnu.org/nongnu/jabber-0.11.0.tar"; + sha256 = "1wikfd8iqj9r1qrh6cd593vgbkjndfpm9f12ilsdwxwh0nx3cpd7"; }; - packageRequires = [ fsm ]; + packageRequires = [ + fsm + keymap-popup + ]; meta = { homepage = "https://elpa.nongnu.org/nongnu/jabber.html"; license = lib.licenses.free; From 69fb8c204d2c1f511ecb098f32e55be645676277 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 19:07:28 +0000 Subject: [PATCH 133/152] microsoft-edge: 149.0.4022.52 -> 149.0.4022.69 --- pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++-- pkgs/by-name/ms/msedgedriver/package.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index bb30db2dfd79..0e696a287faa 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -164,11 +164,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "149.0.4022.52"; + version = "149.0.4022.69"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-3lFhfxkS80P59dk00lpBp+8IIFUvSEJVGGTfAghxw4g="; + hash = "sha256-0Ur+0KKJQ7VTr7IMax5BIgwSf6jNhr0Aiz+So7Hj/OE="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix index 053d4e347fac..5a7bac587d47 100644 --- a/pkgs/by-name/ms/msedgedriver/package.nix +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "msedgedriver"; - version = "149.0.4022.52"; + version = "149.0.4022.69"; src = fetchzip { url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip"; - hash = "sha256-GLPkBOlXDTpjYrrc9odDeHXXZ8vLPiw06v1bIN1zOpo="; + hash = "sha256-BtyQD+zkZWv5GhnxJOg4BkVLrCdBZr7KN1bvXyvp4B8="; stripRoot = false; }; From f2084f348194895ecd033b72c01dd8c871bac542 Mon Sep 17 00:00:00 2001 From: sarahec Date: Sun, 14 Jun 2026 18:22:34 +0000 Subject: [PATCH 134/152] python3Packages.anthropic: 0.97.0 -> 0.109.1 --- .../development/python-modules/anthropic/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index dbaef81775b3..0520d55d610d 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -38,14 +38,15 @@ buildPythonPackage (finalAttrs: { pname = "anthropic"; - version = "0.97.0"; + version = "0.109.1"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "anthropics"; repo = "anthropic-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-jekixY/D80M9wPvq14GZj20+hDBVhzpmylh8mFSdL6k="; + hash = "sha256-H+blENPgkKhoGPJmAtdszFsJDkAzgprlDso0o2fhwz8="; }; postPatch = '' @@ -98,6 +99,13 @@ buildPythonPackage (finalAttrs: { disabledTests = [ # Test require network access "test_copy_build_request" + # Tests try to launch bash and fail + "test_bash_session_persistence" + "test_bash_timeout" + "test_bash_sentinel_not_spoofable" + "test_bash_stdin_redirect" + "test_bash_session_closed_property" + "test_bash_outer_cancel_closes_subprocess_no_stale_state" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Hangs From e5bd05c78595c29bceb6a95179de2a00f96aaff4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 19:13:53 +0000 Subject: [PATCH 135/152] python3Packages.pygit2: 1.19.1 -> 1.19.3 --- pkgs/development/python-modules/pygit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 0d793e367bf8..ca497efe8206 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.19.1"; + version = "1.19.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-MWX3hKrlajCaJ9jurnkj1T2i6PYJQwjH9bQo3uySXPk="; + hash = "sha256-pUPm1Ou0OCVWSTV1jcI053ABb+1nO4Q3DUaulYBViDE="; }; preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' From d95830c43e7136129fbe704d0799de31c9e17a46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 19:21:27 +0000 Subject: [PATCH 136/152] prqlc: 0.13.12 -> 0.13.13 --- pkgs/by-name/pr/prqlc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prqlc/package.nix b/pkgs/by-name/pr/prqlc/package.nix index 8fcf24fc894d..7aec936022e5 100644 --- a/pkgs/by-name/pr/prqlc/package.nix +++ b/pkgs/by-name/pr/prqlc/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "prqlc"; - version = "0.13.12"; + version = "0.13.13"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; tag = finalAttrs.version; - hash = "sha256-dVabMpXrdNV6hvUVk80mWuIpg8Vb0ZaJnrezO+FtbKg="; + hash = "sha256-/5z8i65WpLl06uYqu+PD/fMyajeHiECbzdgTD6D4M20="; }; - cargoHash = "sha256-hL52k61pgqOFpn3aN8DIlx2KlaOjMVD60/x6dMkZ5Rg="; + cargoHash = "sha256-vQOcdDnNPC6dcHbr3GgsE/seokiormNK1oi6E9JrcTY="; nativeBuildInputs = [ pkg-config From 29dff8cf526b320e30be14e6f97ea1ed0c6afb0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 19:24:50 +0000 Subject: [PATCH 137/152] python3Packages.pydroplet: 2.3.4 -> 2.4.0 --- pkgs/development/python-modules/pydroplet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydroplet/default.nix b/pkgs/development/python-modules/pydroplet/default.nix index e31c9ab1f77e..a263d417eb9d 100644 --- a/pkgs/development/python-modules/pydroplet/default.nix +++ b/pkgs/development/python-modules/pydroplet/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydroplet"; - version = "2.3.4"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Hydrific"; repo = "pydroplet"; tag = "v${version}"; - hash = "sha256-cVftXG7sKDpGRRb2jLlFxgCH2+rA6hLYTUqWL1kvh+E="; + hash = "sha256-XLosly9Zyvp3Mfvj0mPORYJBNBkt8JPjlHuvHinZ39w="; }; build-system = [ setuptools ]; From e16bf06715add1cddcb0a195dcc3cd21c0a1b48d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 19:40:10 +0000 Subject: [PATCH 138/152] tigerbeetle: 0.17.5 -> 0.17.6 --- pkgs/by-name/ti/tigerbeetle/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index 6b1ed449569b..1f7486ade69a 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-orry8BOlsAqq44OuKxAkKN/yyLK61qJTrUf6Ohk/psQ="; - "x86_64-linux" = "sha256-p3KD0Z5JdH9IjtqWyCnaUZcZXiwKO6rwZB9wGdVKIz4="; - "aarch64-linux" = "sha256-Z4kBc006b3e8MUROxQBImxRKaW9IWQ4NZdVgd9mkLkA="; + "universal-macos" = "sha256-rrOssnfHj947LhmCl1R2Dy2d9cssXPXDQBI/fcW0reY="; + "x86_64-linux" = "sha256-f/0F8IBPz6Y4poyjzcCxhF33kxhg+gsk2yEFHSAz9DY="; + "aarch64-linux" = "sha256-DjcQkiu4Hdyce9jriTK9otmXzQxeVImDDvHjjGevBVs="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.17.5"; + version = "0.17.6"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; From 8f2bb264627917d49eb1cf5fedfedc9df0602e40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 19:42:16 +0000 Subject: [PATCH 139/152] oci-cli: 3.85.0 -> 3.86.0 --- pkgs/by-name/oc/oci-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index d2c874b0f29b..c114c75ba567 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -31,14 +31,14 @@ in py.pkgs.buildPythonApplication (finalAttrs: { pname = "oci-cli"; - version = "3.85.0"; + version = "3.86.0"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-10KIrd6ZI56YiqNzmo/f5jUEp5YZF5JUN6NPzbgnq9w="; + hash = "sha256-bdHhM7ah1dnQYOK8TXheSqSbFZn3WgMfsfQtAT24wBM="; }; nativeBuildInputs = [ installShellFiles ]; From 8f6347076c7c82e43eb7fc4fbac4df0d897054a2 Mon Sep 17 00:00:00 2001 From: Sergey Makarov <12733495+SeTSeR@users.noreply.github.com> Date: Sun, 14 Jun 2026 01:03:26 +0300 Subject: [PATCH 140/152] emacs.pkgs.jabber: build with OMEMO support Emacs-jabber requires a third-party picomemo library for OMEMO support. It is not strictly required for package to function, but it is needed for E2EE chats. Co-authored-by: Lin Jian Signed-off-by: Sergey Makarov <12733495+SeTSeR@users.noreply.github.com> --- .../elisp-packages/nongnu-common-overrides.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix index 06c66787c3f1..5c71f117ea75 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix @@ -20,5 +20,22 @@ in yasnippet ] ); + + # requires optional dependency for OMEMO support. + jabber = super.jabber.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ pkgs.mbedtls ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; + + # We need to run this in postInstall for package directory to become available + postInstall = + (old.postInstall or "") + + "\n" + + '' + pushd $out/share/emacs/site-lisp/elpa/jabber-*/src + make CC=$CC + rm -r $out/share/emacs/site-lisp/elpa/jabber-*/src + popd + ''; + }); # keep-sorted end } From 2f38420d34ffe9034574e8813224ef0342aa61cf Mon Sep 17 00:00:00 2001 From: Tim Hourigan <1819176+timhourigan@users.noreply.github.com> Date: Sun, 17 May 2026 18:21:25 +0100 Subject: [PATCH 141/152] nixos/music-assistant: Add squeezelite/slimproto firewall ports --- nixos/modules/services/audio/music-assistant.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/music-assistant.nix b/nixos/modules/services/audio/music-assistant.nix index c0aaacc756b6..cad8cc3f84d4 100644 --- a/nixos/modules/services/audio/music-assistant.nix +++ b/nixos/modules/services/audio/music-assistant.nix @@ -83,7 +83,18 @@ in lib.optional cfg.enable 8097 # Music Assistant stream port ++ lib.optional (lib.elem "airplay" cfg.providers) 7000 ++ lib.optional (lib.elem "sendspin" cfg.providers) 8927 - ++ lib.optional (lib.elem "snapcast" cfg.providers) 1780; + ++ lib.optional (lib.elem "snapcast" cfg.providers) 1780 + ++ lib.optionals (lib.elem "squeezelite" cfg.providers) [ + # https://lyrion.org/reference/slimproto-protocol/ + 3483 # Slimproto control + # https://lyrion.org/reference/cli/using-the-cli/ + 9000 # Slimproto JSON-RPC + 9090 # Slimproto CLI + ]; + allowedUDPPorts = lib.optionals (lib.elem "squeezelite" cfg.providers) [ + # https://lyrion.org/reference/slimproto-protocol/ + 3483 # Slimproto discovery + ]; # The information published by Apple 1 seem to not apply to libraop. # The closest we could find that represents the port range being used as observed by tcpdump is the ephemeral port range. # 1: https://support.apple.com/en-us/103229#:~:text=49152%E2%80%93-,65535,-TCP%2C%20UDP From 656e11ac2db93d39ba30fe34b99b7a67b68fbc50 Mon Sep 17 00:00:00 2001 From: Maddy Guthridge Date: Thu, 9 Apr 2026 22:36:18 +1000 Subject: [PATCH 142/152] makemkv: fix missing icon on Gnome --- pkgs/by-name/ma/makemkv/app-id.patch | 14 ++++++++++++++ pkgs/by-name/ma/makemkv/package.nix | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ma/makemkv/app-id.patch diff --git a/pkgs/by-name/ma/makemkv/app-id.patch b/pkgs/by-name/ma/makemkv/app-id.patch new file mode 100644 index 000000000000..b314fd7e5b6e --- /dev/null +++ b/pkgs/by-name/ma/makemkv/app-id.patch @@ -0,0 +1,14 @@ +diff --git a/makemkvgui/src/main.cpp b/makemkvgui/src/main.cpp +index 73ce457..71f822c 100644 +--- a/makemkvgui/src/main.cpp ++++ b/makemkvgui/src/main.cpp +@@ -65,6 +65,9 @@ int qMain(int argc, char **argv) + #if (QT_VERSION > 0x050000) + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + #endif ++ // Ensure the app-id ('makemkv') is set, so that GNOME can show ++ // the correct icon in the dash. ++ QGuiApplication::setDesktopFileName("makemkv"); + + CApClient::ITransport* p_trans = NULL; + diff --git a/pkgs/by-name/ma/makemkv/package.nix b/pkgs/by-name/ma/makemkv/package.nix index 6d4ffd64d016..71993f3e84f4 100644 --- a/pkgs/by-name/ma/makemkv/package.nix +++ b/pkgs/by-name/ma/makemkv/package.nix @@ -43,7 +43,12 @@ stdenv.mkDerivation ( srcs = lib.attrValues finalAttrs.passthru.srcs; sourceRoot = "makemkv-oss-${version}"; - patches = [ ./r13y.patch ]; + patches = [ + ./r13y.patch + # This patch is sourced from NonGuix, licensed GPLv3: + # https://gitlab.com/nonguix/nonguix/-/blob/2d1f3691546f007c7cd96ae87e4e970fed789182/nongnu/packages/patches/makemkv-app-id.patch + ./app-id.patch + ]; enableParallelBuilding = true; nativeBuildInputs = [ From 4a6280f84defb5846ce887f154d8eee173d40825 Mon Sep 17 00:00:00 2001 From: Luc_Ren Date: Sat, 28 Mar 2026 13:07:57 +0300 Subject: [PATCH 143/152] mitra: 4.17.0 -> 5.0.0 --- pkgs/by-name/mi/mitra/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index 0e147c1981dd..b0bc0ac14843 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mitra"; - version = "4.17.0"; + version = "5.0.0"; src = fetchFromCodeberg { owner = "silverpill"; repo = "mitra"; rev = "v${finalAttrs.version}"; - hash = "sha256-ysV0r0K+2ivnDg/GuqwK5HWa4/jQtopXqS9g/9wWrOw="; + hash = "sha256-Chn3SONSg6yhwwHcry/cO2L7/ihEco35gpRlMlQVXz8="; }; - cargoHash = "sha256-RDMLfg+KsvfXDjsCzCn53kebBRN8/6er/LsS/BzoeU0="; + cargoHash = "sha256-0lXwOphoUQqe1O0KbAOl98ZbMKyG8ZZOl7NhXYwSvvQ="; # require running database doCheck = false; From 86f2b2c9d5d077220bb3b28a05317c2559f056d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Mar 2026 07:14:59 +0000 Subject: [PATCH 144/152] s-tui: 1.3.0 -> 1.4.0 --- pkgs/by-name/s-/s-tui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/s-/s-tui/package.nix b/pkgs/by-name/s-/s-tui/package.nix index e2e601a313f0..4051f108395e 100644 --- a/pkgs/by-name/s-/s-tui/package.nix +++ b/pkgs/by-name/s-/s-tui/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage (finalAttrs: { pname = "s-tui"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; build-system = with python3Packages; [ setuptools ]; @@ -20,7 +20,7 @@ python3Packages.buildPythonPackage (finalAttrs: { owner = "amanusk"; repo = "s-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-B5KQz+/RG+IROJah0jq+2e94DtnILwY2aH9qulWzHns="; + hash = "sha256-PDDT37W0x7VJ6OnkbwvPXttphD+vHDul0zmA3VY/Sao="; }; dependencies = [ From babcc96ab6f2db2d7ad56a9abde89fe9c460c71f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jun 2026 21:23:25 +0000 Subject: [PATCH 145/152] python3Packages.matter-ble-proxy: 0.8.0 -> 1.0.0 --- pkgs/development/python-modules/matter-ble-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matter-ble-proxy/default.nix b/pkgs/development/python-modules/matter-ble-proxy/default.nix index e683b6a5860a..c155dedf829d 100644 --- a/pkgs/development/python-modules/matter-ble-proxy/default.nix +++ b/pkgs/development/python-modules/matter-ble-proxy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage (finalAttrs: { pname = "matter-ble-proxy"; - version = "0.8.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: { owner = "matter-js"; repo = "matterjs-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-AjCfPovhYKUeU4Xrsh6uL0pPG+ja0n+efFTbwre83m4="; + hash = "sha256-c/jhQfenRgE0qHisGM1TOtqWjDy/RcwGa04RE0FzR/U="; }; sourceRoot = "${finalAttrs.src.name}/python_ble_proxy"; From 48e6d9662e373c29ea961b8978306cb1d55a1e5c Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 14 Jun 2026 13:41:30 -0700 Subject: [PATCH 146/152] python3Packages.torchao: disable failing test on darwin (unknown FP type) --- pkgs/development/python-modules/torchao/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/torchao/default.nix b/pkgs/development/python-modules/torchao/default.nix index 3edd4c19fe7e..ae20677483af 100644 --- a/pkgs/development/python-modules/torchao/default.nix +++ b/pkgs/development/python-modules/torchao/default.nix @@ -325,6 +325,7 @@ buildPythonPackage (finalAttrs: { # TypeError: Trying to convert Float8_e4m3fn to the MPS backend but it does not have support for that dtype. "test/quantization/quantize_/workflows/float8/test_float8_tensor.py" + "test/test_low_bit_optim.py::TestOptim::test_subclass_appearance_dtype_subclass2_device_mps" # AssertionError: Torch not compiled with CUDA enabled "test/integration/test_integration.py" From fec2f10b70772e58f20cff187593f73b5042df3d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 14 Jun 2026 11:56:05 +0200 Subject: [PATCH 147/152] nixosTests.kea: migrate to nspawn Fix a robustness issue when curl'ig the Prometheus Exporter, where grep exiting early caused curl to throw SIGPIPE. --- nixos/tests/kea.nix | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/nixos/tests/kea.nix b/nixos/tests/kea.nix index bb361eba14fb..d810b99a4783 100644 --- a/nixos/tests/kea.nix +++ b/nixos/tests/kea.nix @@ -6,7 +6,6 @@ # address. { - pkgs, lib, ... }: @@ -15,7 +14,7 @@ name = "kea"; - nodes = { + containers = { router = { config, pkgs, ... }: { @@ -26,6 +25,7 @@ firewall.allowedUDPPorts = [ 67 ]; }; + services.resolved.enable = false; systemd.network = { enable = true; networks = { @@ -141,6 +141,7 @@ firewall.allowedUDPPorts = [ 53 ]; }; + services.resolved.enable = false; systemd.network = { enable = true; networks = { @@ -153,8 +154,6 @@ }; }; - services.resolved.enable = false; - # Set up an authoritative nameserver, serving the `lan.nixos.test` # zone and configure an ACL that allows dynamic updates from # the router's ip address. @@ -213,6 +212,7 @@ { virtualisation.vlans = [ 1 ]; systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + services.resolved.enable = false; networking = { useNetworkd = true; useDHCP = false; @@ -222,16 +222,23 @@ }; }; testScript = - { ... }: + # python '' start_all() + router.wait_for_unit("kea-dhcp4-server.service") - client.systemctl("start systemd-networkd-wait-online.service") - client.wait_for_unit("systemd-networkd-wait-online.service") - client.wait_until_succeeds("ping -c 5 10.0.0.1") - router.wait_until_succeeds("ping -c 5 10.0.0.3") - nameserver.wait_until_succeeds("kdig +short client.lan.nixos.test @10.0.0.2 | grep -q 10.0.0.3") - router.log(router.execute("curl 127.0.0.1:9547")[1]) - router.succeed("curl --no-buffer 127.0.0.1:9547 | grep -qE '^kea_dhcp4_addresses_assigned_total.*1.0$'") + + with subtest("DHCPv4"): + client.systemctl("start systemd-networkd-wait-online.service") + client.wait_for_unit("systemd-networkd-wait-online.service") + client.wait_until_succeeds("ping -c 5 10.0.0.1") + router.wait_until_succeeds("ping -c 5 10.0.0.3") + + with subtest("DDNS"): + nameserver.wait_until_succeeds("kdig +short client.lan.nixos.test @10.0.0.2 | grep -q 10.0.0.3") + + with subtest("Prometheus Exporter"): + router.log(router.execute("curl 127.0.0.1:9547")[1]) + router.succeed("curl --silent 127.0.0.1:9547 | grep -qE '^kea_dhcp4_addresses_assigned_total.*1.0$'") ''; } From 2f2bba6b56f49cbf9f214e33b38f901fc95abf45 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 14 Jun 2026 12:00:37 +0200 Subject: [PATCH 148/152] nixos/tests/systemd-networkd-ipv6-prefix-delegation: run in nspawn --- nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 5ab21bee0195..7b8c53283a79 100644 --- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -17,7 +17,7 @@ import ./make-test-python.nix ( hexa ]; }; - nodes = { + containers = { # The ISP's routers job is to delegate IPv6 prefixes via DHCPv6. Like with # regular IPv6 auto-configuration it will also emit IPv6 router @@ -38,6 +38,7 @@ import ./make-test-python.nix ( interfaces.eth1 = lib.mkForce { }; # Don't use scripted networking }; + services.resolved.enable = false; systemd.network = { enable = true; @@ -204,6 +205,7 @@ import ./make-test-python.nix ( interfaces.eth1.ipv6.addresses = lib.mkForce [ ]; }; + services.resolved.enable = false; systemd.network = { networks = { # systemd-networkd will load the first network unit file @@ -300,6 +302,7 @@ import ./make-test-python.nix ( client = { virtualisation.vlans = [ 2 ]; systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + services.resolved.enable = false; networking = { useNetworkd = true; useDHCP = false; From 091abce8363b2aa5f39303d32e79b5986842a927 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 14 Jun 2026 12:29:18 +0200 Subject: [PATCH 149/152] nixos/pretix: remove elevation from pretix-manage wrapper Instead we use runuser, which is root-only, which does not force a sudo requirement onto setups running pretix. --- nixos/modules/services/web-apps/pretix.nix | 29 ++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/web-apps/pretix.nix b/nixos/modules/services/web-apps/pretix.nix index c62ae9bcc49e..9649f98349f8 100644 --- a/nixos/modules/services/web-apps/pretix.nix +++ b/nixos/modules/services/web-apps/pretix.nix @@ -24,7 +24,6 @@ let mkOption mkPackageOption optionals - optionalString recursiveUpdate types ; @@ -60,6 +59,24 @@ let }; withRedis = cfg.settings.redis.location != null; + + pretixManageWrapper = pkgs.writeShellApplication { + name = "pretix-manage"; + runtimeInputs = with pkgs; [ + util-linux + ]; + text = '' + cd ${cfg.settings.pretix.datadir} + export PRETIX_CONFIG_FILE=${configFile} + exec runuser ${ + lib.cli.toCommandLineShellGNU { } { + inherit (cfg) user; + supp-group = if withRedis then config.services.redis.servers.pretix.group else null; + whitelist-environment = "PRETIX_CONFIG_FILE"; + } + } -- ${getExe' pythonEnv "pretix-manage"} "$@" + ''; + }; in { meta = { @@ -396,15 +413,7 @@ in # https://docs.pretix.eu/en/latest/admin/installation/index.html environment.systemPackages = [ - (pkgs.writeScriptBin "pretix-manage" '' - cd ${cfg.settings.pretix.datadir} - sudo=exec - if [[ "$USER" != ${cfg.user} ]]; then - sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} ${optionalString withRedis "-g redis-pretix"} --preserve-env=PRETIX_CONFIG_FILE' - fi - export PRETIX_CONFIG_FILE=${configFile} - $sudo ${getExe' pythonEnv "pretix-manage"} "$@" - '') + pretixManageWrapper ]; services.logrotate.settings.pretix = { From aa8c9f5d9a1cbefcb9886df41d4502048866ea27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 14 Jun 2026 13:06:41 +0200 Subject: [PATCH 150/152] nixos/pretalx: remove elevation from the pretalx-manage wrapper This reduces execution of pretalx-manage to root, so there is no dependency on sudo, a setuid root binary, any more. --- nixos/modules/services/web-apps/pretalx.nix | 35 ++++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix index 37527a4e1688..c67910f03fb6 100644 --- a/nixos/modules/services/web-apps/pretalx.nix +++ b/nixos/modules/services/web-apps/pretalx.nix @@ -27,6 +27,28 @@ let cfg.settings.database.backend == "postgresql" ) finalPackage.optional-dependencies.postgres; }; + + pretalxManageWrapper = pkgs.writeShellApplication { + name = "pretalx-manage"; + runtimeInputs = with pkgs; [ + util-linux + ]; + text = '' + cd ${cfg.settings.filesystem.data} + set -a + ${lib.concatMapStringsSep "\n" (file: '' + . ${lib.escapeShellArg file} + '') cfg.environmentFiles} + set +a + export PRETALX_CONFIG_FILE=${configFile} + exec runuser ${ + lib.cli.toCommandLineShellGNU { } { + inherit (cfg) user; + preserve-environment = true; + } + } -- ${lib.getExe' pythonEnv "pretalx-manage"} "$@" + ''; + }; in { @@ -325,18 +347,7 @@ in # https://docs.pretalx.org/administrator/installation/ environment.systemPackages = [ - (pkgs.writeScriptBin "pretalx-manage" '' - cd ${cfg.settings.filesystem.data} - sudo=exec - if [[ "$USER" != ${cfg.user} ]]; then - sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} --preserve-env=PRETALX_CONFIG_FILE' - fi - set -a - ${lib.concatMapStringsSep "\n" (file: ". ${lib.escapeShellArg file}") cfg.environmentFiles} - set +a - export PRETALX_CONFIG_FILE=${configFile} - $sudo ${lib.getExe' pythonEnv "pretalx-manage"} "$@" - '') + pretalxManageWrapper ]; services.logrotate.settings.pretalx = { From f6ba286b289ba4a2ed70898c7afd2ed24deaa5fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 14 Jun 2026 14:04:34 +0200 Subject: [PATCH 151/152] nixos/tests/pretix: migrate to nspawn --- nixos/tests/web-apps/pretix.nix | 59 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/nixos/tests/web-apps/pretix.nix b/nixos/tests/web-apps/pretix.nix index f99bb8733547..f58ad78146d2 100644 --- a/nixos/tests/web-apps/pretix.nix +++ b/nixos/tests/web-apps/pretix.nix @@ -1,50 +1,47 @@ { - lib, pkgs, ... }: { name = "pretix"; - meta.maintainers = with lib.maintainers; [ hexa ]; + meta.maintainers = pkgs.pretix.meta.maintainers; - nodes = { - pretix = { - virtualisation.memorySize = 2048; + containers.pretix = { + networking.extraHosts = '' + 127.0.0.1 tickets.local + ''; - networking.extraHosts = '' - 127.0.0.1 tickets.local - ''; - - services.pretix = { - enable = true; - nginx.domain = "tickets.local"; - plugins = with pkgs.pretix.plugins; [ - passbook - pages - zugferd - ]; - settings = { - pretix = { - instance_name = "NixOS Test"; - url = "http://tickets.local"; - }; - mail.from = "hello@tickets.local"; + services.pretix = { + enable = true; + nginx.domain = "tickets.local"; + plugins = with pkgs.pretix.plugins; [ + passbook + pages + zugferd + ]; + settings = { + pretix = { + instance_name = "NixOS Test"; + url = "http://tickets.local"; }; + mail.from = "hello@tickets.local"; }; }; }; - testScript = '' - start_all() + testScript = + # python + '' + start_all() - pretix.wait_for_unit("pretix-web.service") - pretix.wait_for_unit("pretix-worker.service") + pretix.wait_for_unit("pretix-web.service") + pretix.wait_for_unit("pretix-worker.service") - pretix.wait_until_succeeds("curl -q --fail http://tickets.local") + pretix.wait_until_succeeds("curl -q --fail http://tickets.local") - pretix.succeed("pretix-manage --help") + pretix.succeed("pretix-manage --help | grep -q 'createsuperuser'") - pretix.log(pretix.succeed("systemd-analyze security pretix-web.service")) - ''; + pretix.log(pretix.succeed("systemd-analyze security pretix-web.service")) + ''; } From 3aba1ee7d9c1ca8bb82563dd23c00bed24e0f903 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 14 Jun 2026 14:04:54 +0200 Subject: [PATCH 152/152] nixos/tests/pretalx: migrate to nspawn --- nixos/tests/web-apps/pretalx.nix | 51 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/nixos/tests/web-apps/pretalx.nix b/nixos/tests/web-apps/pretalx.nix index 03fa6684b8b5..f6d61786e893 100644 --- a/nixos/tests/web-apps/pretalx.nix +++ b/nixos/tests/web-apps/pretalx.nix @@ -4,37 +4,38 @@ name = "pretalx"; meta.maintainers = pkgs.pretalx.meta.maintainers; - nodes = { - pretalx = - { config, ... }: - { - networking.extraHosts = '' - 127.0.0.1 talks.local - ''; + containers.pretalx = + { config, ... }: + { + networking.extraHosts = '' + 127.0.0.1 talks.local + ''; - services.pretalx = { - enable = true; - plugins = with config.services.pretalx.package.plugins; [ - pages - ]; - nginx.domain = "talks.local"; - settings = { - site.url = "http://talks.local"; - }; + services.pretalx = { + enable = true; + plugins = with config.services.pretalx.package.plugins; [ + pages + ]; + nginx.domain = "talks.local"; + settings = { + site.url = "http://talks.local"; }; }; - }; + }; - testScript = '' - start_all() + testScript = + # python + '' + start_all() - pretalx.wait_for_unit("pretalx-web.service") - pretalx.wait_for_unit("pretalx-worker.service") + pretalx.wait_for_unit("pretalx-web.service") + pretalx.wait_for_unit("pretalx-worker.service") - pretalx.wait_until_succeeds("curl -q --fail http://talks.local/orga/") + pretalx.wait_until_succeeds("curl -q --fail http://talks.local/orga/") - pretalx.succeed("pretalx-manage --help") + pretalx.log(pretalx.succeed("id")) + pretalx.succeed("pretalx-manage --help | grep -q 'createsuperuser'") - pretalx.log(pretalx.succeed("systemd-analyze security pretalx-web.service")) - ''; + pretalx.log(pretalx.succeed("systemd-analyze security pretalx-web.service")) + ''; }