From 4a485c4265865ca5e8ab1ad3e25f0a1a76f04908 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 25 Feb 2026 09:54:16 +0000 Subject: [PATCH 001/130] python3Packages.python-keycloak: modernize --- .../python-modules/python-keycloak/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index 0ac6c2b31550..7ce0c93f129e 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -11,7 +11,7 @@ requests-toolbelt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-keycloak"; version = "7.0.2"; pyproject = true; @@ -19,14 +19,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marcospereirampj"; repo = "python-keycloak"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3JHmVfGd5X5aEZt8O7Aj/UfYpLtDsI6MPwWxLo7SGBs="; }; postPatch = '' # Upstream doesn't set version substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ poetry-core ]; @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = { description = "Provides access to the Keycloak API"; homepage = "https://github.com/marcospereirampj/python-keycloak"; - changelog = "https://github.com/marcospereirampj/python-keycloak/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/marcospereirampj/python-keycloak/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From 1c44a8ef547f821da4f4e8d4f7df1cd99105fe1f Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 25 Feb 2026 09:54:16 +0000 Subject: [PATCH 002/130] python3Packages.python-keycloak: enable checks --- .../python-keycloak/default.nix | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index 7ce0c93f129e..c41d940ea046 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -9,6 +9,9 @@ poetry-core, requests, requests-toolbelt, + freezegun, + pytest-asyncio, + pytestCheckHook, }: buildPythonPackage (finalAttrs: { @@ -40,8 +43,26 @@ buildPythonPackage (finalAttrs: { requests-toolbelt ]; - # Test fixtures require a running keycloak instance - doCheck = false; + nativeCheckInputs = [ + freezegun + pytest-asyncio + pytestCheckHook + ]; + + # conftest.py requires these variables to be set, + # even if the respective tests are disabled + preCheck = '' + export KEYCLOAK_{HOST,PORT,ADMIN{,_PASSWORD}}= + ''; + + disabledTestPaths = [ + # these tests require a running keycloak instance + "tests/test_keycloak_openid.py" + "tests/test_keycloak_admin.py" + "tests/test_keycloak_uma.py" + # requires docker + "tests/test_pkce_flow.py" + ]; pythonImportsCheck = [ "keycloak" ]; From 5a89bfccb8059d01ec294c3248231888ca101407 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 25 Feb 2026 09:54:16 +0000 Subject: [PATCH 003/130] python3Packages.python-keycloak: 7.0.2 -> 7.1.1 https://github.com/marcospereirampj/python-keycloak/compare/refs/tags/v7.0.2...refs/tags/v7.1.1 https://github.com/marcospereirampj/python-keycloak/blob/refs/tags/v7.1.1/CHANGELOG.md --- pkgs/development/python-modules/python-keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index c41d940ea046..5d831b6951d8 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "python-keycloak"; - version = "7.0.2"; + version = "7.1.1"; pyproject = true; src = fetchFromGitHub { owner = "marcospereirampj"; repo = "python-keycloak"; tag = "v${finalAttrs.version}"; - hash = "sha256-3JHmVfGd5X5aEZt8O7Aj/UfYpLtDsI6MPwWxLo7SGBs="; + hash = "sha256-3BrXSktN0OYQJRRZ234z06pGHicJOIBUzSdMd6y95L4="; }; postPatch = '' From 214e752eb0f135ada16134bfc49c4ed9e02f0cce Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 13 Apr 2026 15:37:40 +0200 Subject: [PATCH 004/130] filezilla: enable strictDeps, fix xdg-utils xdg-utils should be on the PATH at runtime --- pkgs/by-name/fi/filezilla/package.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/filezilla/package.nix b/pkgs/by-name/fi/filezilla/package.nix index b83886dcdbab..ba6c22929f61 100644 --- a/pkgs/by-name/fi/filezilla/package.nix +++ b/pkgs/by-name/fi/filezilla/package.nix @@ -33,12 +33,14 @@ stdenv.mkDerivation { configureFlags = [ "--disable-manualupdatecheck" "--disable-autoupdatecheck" + "--with-wx-prefix=${wxwidgets_3_2}" ]; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 + xdg-utils ]; buildInputs = [ @@ -52,13 +54,19 @@ stdenv.mkDerivation { pugixml sqlite tinyxml - wxwidgets_3_2 gtk3 - xdg-utils ]; + strictDeps = true; + enableParallelBuilding = true; + preFixup = '' + gappsWrapperArgs+=( + --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" + ) + ''; + meta = { homepage = "https://filezilla-project.org/"; description = "Graphical FTP, FTPS and SFTP client"; From df7bd84cc51a1bc056c3b97f39644eebf7666f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 19 May 2026 22:01:44 +0200 Subject: [PATCH 005/130] nixos/pangolin: render default settings in option search --- .../modules/services/networking/pangolin.nix | 60 ++++++++++++------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/networking/pangolin.nix b/nixos/modules/services/networking/pangolin.nix index 1dce42fdb2ad..354e496cab02 100644 --- a/nixos/modules/services/networking/pangolin.nix +++ b/nixos/modules/services/networking/pangolin.nix @@ -9,7 +9,7 @@ let cfg = config.services.pangolin; format = pkgs.formats.yaml { }; - finalSettings = lib.attrsets.recursiveUpdate pangolinConf cfg.settings; + finalSettings = lib.attrsets.recursiveUpdate options.services.pangolin.settings.default cfg.settings; cfgFile = format.generate "config.yml" finalSettings; # override the type to allow for optionality nullOrOpt = t: lib.types.nullOr t // { _optional = true; }; @@ -33,25 +33,6 @@ let fi ''; }; - - pangolinConf = { - app.dashboard_url = "https://${cfg.dashboardDomain}"; - domains.domain1 = { - base_domain = cfg.baseDomain; - prefer_wildcard_cert = false; - }; - server = { - external_port = 3000; - internal_port = 3001; - next_port = 3002; - integration_port = 3003; - # needs to be set, otherwise this fails silently - # see https://github.com/fosrl/newt/issues/37 - internal_hostname = "localhost"; - }; - gerbil.base_endpoint = cfg.dashboardDomain; - flags.enable_integration_api = false; - }; in { options.services = { @@ -61,7 +42,44 @@ in settings = lib.mkOption { inherit (format) type; - default = { }; + default = { + app.dashboard_url = "https://${cfg.dashboardDomain}"; + domains.domain1 = { + base_domain = cfg.baseDomain; + prefer_wildcard_cert = false; + }; + server = { + external_port = 3000; + internal_port = 3001; + next_port = 3002; + integration_port = 3003; + # needs to be set, otherwise this fails silently + # see https://github.com/fosrl/newt/issues/37 + internal_hostname = "localhost"; + }; + gerbil.base_endpoint = cfg.dashboardDomain; + flags.enable_integration_api = false; + }; + defaultText = lib.literalExpression '' + { + app.dashboard_url = "https://''${config.services.pangolin.dashboardDomain}"; + domains.domain1 = { + base_domain = cfg.baseDomain; + prefer_wildcard_cert = false; + }; + server = { + external_port = 3000; + internal_port = 3001; + next_port = 3002; + integration_port = 3003; + # needs to be set, otherwise this fails silently + # see https://github.com/fosrl/newt/issues/37 + internal_hostname = "localhost"; + }; + gerbil.base_endpoint = config.services.pangolin.dashboardDomain; + flags.disable_signup_without_invite = true; + } + ''; description = '' Additional attributes to be merged with the configuration options and written to Pangolin's {file}`config.yml` file. ''; From 3aca9c4155f5f58ef39ef3dd97e7f4c456da81f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 19 May 2026 22:02:06 +0200 Subject: [PATCH 006/130] nixos/pangolin: disable sign up per default Otherwise pangolin has open registration and we want to have secure defaults. --- nixos/modules/services/networking/pangolin.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/pangolin.nix b/nixos/modules/services/networking/pangolin.nix index 354e496cab02..37fb0935be87 100644 --- a/nixos/modules/services/networking/pangolin.nix +++ b/nixos/modules/services/networking/pangolin.nix @@ -58,7 +58,10 @@ in internal_hostname = "localhost"; }; gerbil.base_endpoint = cfg.dashboardDomain; - flags.enable_integration_api = false; + flags = { + disable_signup_without_invite = true; + enable_integration_api = false; + }; }; defaultText = lib.literalExpression '' { @@ -77,7 +80,10 @@ in internal_hostname = "localhost"; }; gerbil.base_endpoint = config.services.pangolin.dashboardDomain; - flags.disable_signup_without_invite = true; + flags = { + disable_signup_without_invite = true; + enable_integration_api = false; + }; } ''; description = '' From 8d7914b232b4d44dda546f54124534236a40a1c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 21 May 2026 09:27:29 -0700 Subject: [PATCH 007/130] xandikos: 0.3.4 -> 0.4.0 Diff: https://github.com/jelmer/xandikos/compare/v0.3.4...v0.4.0 Changelog: https://github.com/jelmer/xandikos/blob/v0.4.0/NEWS --- pkgs/by-name/xa/xandikos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xa/xandikos/package.nix b/pkgs/by-name/xa/xandikos/package.nix index 4343f0acf839..d04f54d121cc 100644 --- a/pkgs/by-name/xa/xandikos/package.nix +++ b/pkgs/by-name/xa/xandikos/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "xandikos"; - version = "0.3.4"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "jelmer"; repo = "xandikos"; tag = "v${version}"; - hash = "sha256-udKhJUsWFcyapEzYJOoujpq/VioFLGCCKq5WAlXsHnU="; + hash = "sha256-lVxbqgxBhHJHxG3QozX9xvCZAOPSa85ATSE88i3zayA="; }; build-system = with python3Packages; [ @@ -24,12 +24,12 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ aiohttp aiohttp-openmetrics + aiosmtpd dulwich defusedxml icalendar jinja2 multidict - pytz vobject ]; From 0674a59872f4013c52e7796cf8404df5a70685d8 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 22 May 2026 11:26:19 +0200 Subject: [PATCH 008/130] lauti: 1.1.0 -> 1.2.0 --- pkgs/by-name/la/lauti/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/lauti/package.nix b/pkgs/by-name/la/lauti/package.nix index bc25d3f0f0c8..ce9193d23564 100644 --- a/pkgs/by-name/la/lauti/package.nix +++ b/pkgs/by-name/la/lauti/package.nix @@ -7,12 +7,12 @@ }: let - version = "1.1.0"; + version = "1.2.0"; src = fetchFromCodeberg { owner = "Klasse-Methode"; repo = "lauti"; tag = "v${version}"; - hash = "sha256-eYIKVQG+Vj2qld/xKbxx0JpNqKhnGSjIOXXc7400BYo="; + hash = "sha256-llmXXaCy6V4DE0B1a0K0rRCb6XSvC1+EaG9legx0u4I="; }; frontend = callPackage ./frontend.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { pname = "lauti"; inherit version src; - vendorHash = "sha256-4LQ3PvwWAg+/KBQHroj2ZVQZst7jPq99XwLTHClDPCU="; + vendorHash = "sha256-XO2Fo4rH6YDlj8x9f0847OEBLLpLlzFpK72uOEgW65o="; ldflags = [ "-s" From ceeb688e95b199989ac0daac466e027c1c5787b3 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 22 May 2026 11:26:26 +0200 Subject: [PATCH 009/130] lauti.frontend: 1.1.0 -> 1.2.0 --- pkgs/by-name/la/lauti/frontend.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/la/lauti/frontend.nix b/pkgs/by-name/la/lauti/frontend.nix index 96ce091dc19d..fed4f33c5632 100644 --- a/pkgs/by-name/la/lauti/frontend.nix +++ b/pkgs/by-name/la/lauti/frontend.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-8+bAqWg6sqWQcjEdhS/tDZ1farY6VQ++lvbAfpwOeRE="; + hash = "sha256-RKalgQ6dXNOxMeC6pSKe9Lo0KXN0gfeX0I/pkcv2FXs="; }; nativeBuildInputs = [ From cd537a1ebc65b18f5757195c7ab570e13f8dab88 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Fri, 22 May 2026 22:00:45 +0300 Subject: [PATCH 010/130] maintainers: drop rht --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/br/brave/make-brave.nix | 1 - pkgs/by-name/in/inconsolata-lgc/package.nix | 1 - pkgs/by-name/zc/zcash/package.nix | 1 - 4 files changed, 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e37ff00cb911..7ed4419a1b51 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23336,12 +23336,6 @@ githubId = 6047658; name = "Ryan Horiguchi"; }; - rht = { - email = "rhtbot@protonmail.com"; - github = "rht"; - githubId = 395821; - name = "rht"; - }; rhydianjenkins = { name = "Rhydian Jenkins"; github = "RhydianJenkins"; diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 35c3ea7e109e..497820c9f4cf 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -299,7 +299,6 @@ stdenv.mkDerivation { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ uskudnik - rht jefflabonte nasirhm buckley310 diff --git a/pkgs/by-name/in/inconsolata-lgc/package.nix b/pkgs/by-name/in/inconsolata-lgc/package.nix index 0cb86795a25d..8888a4e91e03 100644 --- a/pkgs/by-name/in/inconsolata-lgc/package.nix +++ b/pkgs/by-name/in/inconsolata-lgc/package.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/MihailJP/Inconsolata-LGC"; maintainers = with lib.maintainers; [ avnik - rht ]; }; } diff --git a/pkgs/by-name/zc/zcash/package.nix b/pkgs/by-name/zc/zcash/package.nix index 2fb2eed14c55..f62290dfe9c0 100644 --- a/pkgs/by-name/zc/zcash/package.nix +++ b/pkgs/by-name/zc/zcash/package.nix @@ -108,7 +108,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Peer-to-peer, anonymous electronic cash system"; homepage = "https://z.cash/"; maintainers = with lib.maintainers; [ - rht tkerber centromere ]; From c52e0a11107196974858aaaaf617a50744054896 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 23 May 2026 23:24:46 +0000 Subject: [PATCH 011/130] libglycin{,-gtk4}: fix cross compilation --- pkgs/by-name/li/libglycin-gtk4/package.nix | 5 +++++ pkgs/by-name/li/libglycin/package.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/by-name/li/libglycin-gtk4/package.nix b/pkgs/by-name/li/libglycin-gtk4/package.nix index a7c2b7901ec1..74f5c269aed1 100644 --- a/pkgs/by-name/li/libglycin-gtk4/package.nix +++ b/pkgs/by-name/li/libglycin-gtk4/package.nix @@ -79,6 +79,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs \ build-aux/crates-version.py + substituteInPlace libglycin/meson.build --replace-fail \ + "cargo_output = cargo_target_dir / rust_target" \ + "cargo_output = cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target" ''; postFixup = '' @@ -86,6 +89,8 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/doc" "$devdoc" ''; + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + meta = { description = "C-Bindings to convert glycin frames to GDK Textures"; homepage = "https://gitlab.gnome.org/GNOME/glycin"; diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index b2eeab914a7f..23c14d269da7 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -94,6 +94,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs \ build-aux/crates-version.py + substituteInPlace libglycin/meson.build --replace-fail \ + "cargo_output = cargo_target_dir / rust_target" \ + "cargo_output = cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target" ''; postFixup = '' @@ -101,6 +104,8 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/doc" "$devdoc" ''; + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + passthru = { updateScript = let From b0eee67a21128b8ff9e392cc7d27ec941d8db4f1 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 23 May 2026 23:39:19 +0000 Subject: [PATCH 012/130] libglycin{,-gtk4}: enable strictDeps --- pkgs/by-name/li/libglycin-gtk4/package.nix | 2 ++ pkgs/by-name/li/libglycin/package.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libglycin-gtk4/package.nix b/pkgs/by-name/li/libglycin-gtk4/package.nix index 74f5c269aed1..f5b46f1d68b3 100644 --- a/pkgs/by-name/li/libglycin-gtk4/package.nix +++ b/pkgs/by-name/li/libglycin-gtk4/package.nix @@ -91,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: { env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + strictDeps = true; + meta = { description = "C-Bindings to convert glycin frames to GDK Textures"; homepage = "https://gitlab.gnome.org/GNOME/glycin"; diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 23c14d269da7..9ee9bb5df921 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -106,6 +106,8 @@ stdenv.mkDerivation (finalAttrs: { env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + strictDeps = true; + passthru = { updateScript = let From 02080bb9b191f87d4fd2c87f8e64744bc2b0af8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 Mar 2026 22:32:45 +0100 Subject: [PATCH 013/130] nixos/home-assistant: add openFirewallForComponents option and open sonos component specific ports when it is enabled --- .../home-automation/home-assistant.nix | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index dc1900f52c1e..7860ca773f64 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -569,7 +569,25 @@ in openFirewall = mkOption { default = false; type = types.bool; - description = "Whether to open the firewall for the specified port."; + description = '' + Whether to open the firewall for the specified frontend port + + :::{.note} + For components specific ports see {option}`services.home-assistant.openFirewallForComponents`. + ::: + ''; + }; + + openFirewallForComponents = mkOption { + default = false; + type = types.bool; + description = '' + Whether to open required firewall ports for enabled components. + + :::{.note} + For the frontend see {option}`services.home-assistant.openFirewall`. + ::: + ''; }; blueprints = mergeAttrsList ( @@ -620,7 +638,13 @@ in } ]; - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.config.http.server_port ]; + networking.firewall.allowedTCPPorts = mkMerge [ + (mkIf cfg.openFirewall [ cfg.config.http.server_port ]) + (mkIf cfg.openFirewallForComponents + # https://www.home-assistant.io/integrations/sonos/#network-requirements + (optionals (useComponent "sonos") [ 1400 ]) + ) + ]; # symlink the configuration to /etc/home-assistant environment.etc = mkMerge [ From 1ae63d4ca58881331b729fcf788067c54e1df29a Mon Sep 17 00:00:00 2001 From: Jonas Eana Date: Mon, 18 May 2026 22:35:08 +0200 Subject: [PATCH 014/130] python3Packages.upnpclient: init at 2.0.3 --- .../python-modules/upnpclient/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/upnpclient/default.nix diff --git a/pkgs/development/python-modules/upnpclient/default.nix b/pkgs/development/python-modules/upnpclient/default.nix new file mode 100644 index 000000000000..abfc739ee2b8 --- /dev/null +++ b/pkgs/development/python-modules/upnpclient/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + requests, + python-dateutil, + lxml, + ifaddr, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage (finalAttrs: { + pname = "upnpclient"; + version = "2.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "flyte"; + repo = "upnpclient"; + tag = finalAttrs.version; + hash = "sha256-bT7oNCYAKJvhCaSczLWnDAy+ULqhjP+3ZvFnIGAb+Ww="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + requests + python-dateutil + lxml + ifaddr + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + pythonImportsCheck = [ "upnpclient" ]; + + meta = { + description = "Python 3 library for accessing UPnP devices"; + homepage = "https://github.com/flyte/upnpclient"; + changelog = "https://github.com/flyte/upnpclient/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ eana ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75a1ff10b2df..d518eed1c3e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20827,6 +20827,8 @@ self: super: with self; { uploadserver = callPackage ../development/python-modules/uploadserver { }; + upnpclient = callPackage ../development/python-modules/upnpclient { }; + upnpy = callPackage ../development/python-modules/upnpy { }; uproot = callPackage ../development/python-modules/uproot { }; From 4030b9e48f85854d2531178c81bb4ac860b6d10e Mon Sep 17 00:00:00 2001 From: Lisa Scheers Date: Mon, 25 May 2026 11:33:11 +0200 Subject: [PATCH 015/130] python3Packages.twilio: fix tests on Python 3.14 Assisted-by: OpenAI Codex (GPT-5) --- .../python-modules/twilio/default.nix | 5 +- .../twilio/remove-aiounittest.patch | 120 ++++++++++++++++++ 2 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/twilio/remove-aiounittest.patch diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 3a1ab16d7216..4cf65c0631e8 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -2,7 +2,6 @@ lib, aiohttp-retry, aiohttp, - aiounittest, buildPythonPackage, cryptography, django, @@ -29,6 +28,9 @@ buildPythonPackage (finalAttrs: { hash = "sha256-WLgx8kAHfLf7BHhu4A7b4gI3pB7WODb/CPV1qw7oNXM="; }; + # https://github.com/twilio/twilio-python/pull/919 + patches = [ ./remove-aiounittest.patch ]; + build-system = [ setuptools ]; dependencies = [ @@ -41,7 +43,6 @@ buildPythonPackage (finalAttrs: { ]; nativeCheckInputs = [ - aiounittest cryptography django mock diff --git a/pkgs/development/python-modules/twilio/remove-aiounittest.patch b/pkgs/development/python-modules/twilio/remove-aiounittest.patch new file mode 100644 index 000000000000..1f7df32c3a98 --- /dev/null +++ b/pkgs/development/python-modules/twilio/remove-aiounittest.patch @@ -0,0 +1,120 @@ +From 62378b10ea8124435fbaf8c70f4c77f36f79ab7f Mon Sep 17 00:00:00 2001 +From: Santiago Arteta +Date: Tue, 21 Apr 2026 01:44:58 -0300 +Subject: [PATCH] tests: drop aiounittest in favor of stdlib + IsolatedAsyncioTestCase + +Fixes #916. aiounittest hasn't had a release since 2022 and doesn't +support Python 3.14 (kwarunek/aiounittest#28), which was breaking the +test suite build on 3.14. + +unittest.IsolatedAsyncioTestCase has been in the stdlib since Python 3.8 +and is a drop-in replacement for aiounittest.AsyncTestCase, so this is +just an import swap. + +Changes: +- tests/requirements.txt: remove aiounittest +- tests/unit/http/test_async_http_client.py +- tests/unit/rest/test_client.py +- tests/unit/base/test_version.py + +Tested locally on Python 3.13 (Windows): 620 unit tests pass, including +the 71 previously-async tests in the three files touched. +--- + tests/requirements.txt | 1 - + tests/unit/base/test_version.py | 3 +-- + tests/unit/http/test_async_http_client.py | 8 ++++---- + tests/unit/rest/test_client.py | 4 +--- + 4 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/tests/requirements.txt b/tests/requirements.txt +index 679f8e13d0..a6224c9827 100644 +--- a/tests/requirements.txt ++++ b/tests/requirements.txt +@@ -2,7 +2,6 @@ Sphinx>=1.8.0 + mock + pytest + pytest-cov +-aiounittest + flake8 + wheel>=0.22.0 + cryptography +diff --git a/tests/unit/base/test_version.py b/tests/unit/base/test_version.py +index 94c0ad496f..85b9fdd16b 100644 +--- a/tests/unit/base/test_version.py ++++ b/tests/unit/base/test_version.py +@@ -1,7 +1,6 @@ + import unittest + from unittest.mock import Mock + +-import aiounittest + from tests import IntegrationTestCase + from tests.holodeck import Request + from twilio.base.version import Version +@@ -791,7 +790,7 @@ def test_fetch_with_response_info_returns_tuple(self): + self.assertIsInstance(headers, dict) + + +-class AsyncVersionTestCase(aiounittest.AsyncTestCase): ++class AsyncVersionTestCase(unittest.IsolatedAsyncioTestCase): + def setUp(self): + from tests.holodeck import AsyncHolodeck + from twilio.rest import Client +diff --git a/tests/unit/http/test_async_http_client.py b/tests/unit/http/test_async_http_client.py +index 23df35dc02..bbb89eda05 100644 +--- a/tests/unit/http/test_async_http_client.py ++++ b/tests/unit/http/test_async_http_client.py +@@ -1,4 +1,4 @@ +-import aiounittest ++import unittest + + from aiohttp import ClientSession + from mock import patch, AsyncMock +@@ -20,7 +20,7 @@ async def text(self): + return self._text + + +-class TestAsyncHttpClientRequest(aiounittest.AsyncTestCase): ++class TestAsyncHttpClientRequest(unittest.IsolatedAsyncioTestCase): + def setUp(self): + self.session_mock = AsyncMock(wraps=ClientSession) + self.session_mock.request.return_value = MockResponse("test", 200) +@@ -59,7 +59,7 @@ async def test_invalid_request_timeout_raises_exception(self): + await self.client.request("doesnt matter", "doesnt matter", timeout=-1) + + +-class TestAsyncHttpClientRetries(aiounittest.AsyncTestCase): ++class TestAsyncHttpClientRetries(unittest.IsolatedAsyncioTestCase): + def setUp(self): + self.session_mock = AsyncMock(wraps=ClientSession) + self.session_mock.request.side_effect = [ +@@ -92,7 +92,7 @@ async def test_request_retries_until_max(self): + self.assertEqual(response.text, "Error") + + +-class TestAsyncHttpClientSession(aiounittest.AsyncTestCase): ++class TestAsyncHttpClientSession(unittest.IsolatedAsyncioTestCase): + def setUp(self): + self.session_patcher = patch("twilio.http.async_http_client.ClientSession") + self.session_constructor_mock = self.session_patcher.start() +diff --git a/tests/unit/rest/test_client.py b/tests/unit/rest/test_client.py +index f2e2affc02..6053120f7b 100644 +--- a/tests/unit/rest/test_client.py ++++ b/tests/unit/rest/test_client.py +@@ -1,7 +1,5 @@ + import unittest + +-import aiounittest +- + from mock import AsyncMock, Mock + + from twilio.http.response import Response +@@ -108,7 +106,7 @@ def test_set_user_agent_extensions(self): + self.assertEqual(user_agent_extensions, expected_user_agent_extensions) + + +-class TestClientAsyncRequest(aiounittest.AsyncTestCase): ++class TestClientAsyncRequest(unittest.IsolatedAsyncioTestCase): + def setUp(self): + self.mock_async_http_client = AsyncMock() + self.mock_async_http_client.request.return_value = Response(200, "test") From e65082804c00429626f1f843e76bad63166fbdf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 May 2026 14:09:54 +0000 Subject: [PATCH 016/130] blazesym-c: 0.1.7 -> 0.1.8 --- pkgs/by-name/bl/blazesym-c/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bl/blazesym-c/package.nix b/pkgs/by-name/bl/blazesym-c/package.nix index 6fe542c592df..c9f0035b5495 100644 --- a/pkgs/by-name/bl/blazesym-c/package.nix +++ b/pkgs/by-name/bl/blazesym-c/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "blazesym-c"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "libbpf"; repo = "blazesym"; tag = "capi-v${finalAttrs.version}"; - hash = "sha256-+wpKDxZgFkezvKzL0xA7FFS/sIx++kwSf32Kl4u0rAg="; + hash = "sha256-IdeY9FCGziYN9glnvQJu2oa5ogdXb6D9QcY2MRnq7vA="; }; - cargoHash = "sha256-J14dckx/t0BG+l6NOiBY/Kkq42C98dXIzP9e6LtpgVg="; + cargoHash = "sha256-fsvdhahTKxjrrH9z6m1k3cTkXfMUZXZNZlYRi3tgTlA="; cargoBuildFlags = [ "--package" From bbe2801b29027d571fe153079b5ee5ef0e0b57c6 Mon Sep 17 00:00:00 2001 From: Nico Felbinger Date: Sat, 11 Apr 2026 18:22:58 +0200 Subject: [PATCH 017/130] tigervnc: set mainProgram --- pkgs/by-name/ti/tigervnc/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix index cebd3311ac44..8830f9d8ca01 100644 --- a/pkgs/by-name/ti/tigervnc/package.nix +++ b/pkgs/by-name/ti/tigervnc/package.nix @@ -222,5 +222,6 @@ stdenv.mkDerivation (finalAttrs: { broken = stdenv.hostPlatform.isDarwin; # Prevent a store collision. priority = 4; + mainProgram = "vncviewer"; }; }) From 6f10040be4551217a7d7e17d25f20cd7932f3c3d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 28 May 2026 20:15:12 +0300 Subject: [PATCH 018/130] mutter: fix cross compilation splicing Fix #510432. Co-Authored-By: Yves Fischer --- pkgs/by-name/mu/mutter/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index f56610f03041..d6e132537610 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -56,6 +56,7 @@ gnome-settings-daemon, xorg-server, python3, + python3Packages, wayland-scanner, wrapGAppsHook4, gi-docgen, @@ -117,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { xvfb-run pkg-config python3 - python3.pkgs.argcomplete # for register-python-argcomplete + python3Packages.argcomplete # for register-python-argcomplete wayland-scanner wrapGAppsHook4 gi-docgen From fde0dc17b7ccb5a7b9019c64ec1bb09b54c88c44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 May 2026 05:20:05 +0000 Subject: [PATCH 019/130] samrewritten: 1.3.4 -> 1.4.0 --- pkgs/by-name/sa/samrewritten/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix index 22c6dc8bfba5..26cf244add10 100644 --- a/pkgs/by-name/sa/samrewritten/package.nix +++ b/pkgs/by-name/sa/samrewritten/package.nix @@ -15,16 +15,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "samrewritten"; - version = "1.3.4"; + version = "1.4.0"; src = fetchFromGitHub { owner = "PaulCombal"; repo = "SamRewritten"; tag = "v${finalAttrs.version}"; - hash = "sha256-5SXek64kccyUs+vSyA8QCX+UpRSm0aDEZwULYZgmIUw="; + hash = "sha256-y8ByD/dGjc+QJCbhy519fBHDXRh+m4sIC7ew17sj03g="; }; - cargoHash = "sha256-sL6kIkYWnD7QKw/RGMDS9ZZK/LcKtYjFr5pQ6758IuQ="; + cargoHash = "sha256-anV5tiXgX9DviKe8ZlnbBrQw5vCnpgQ1xKUki8/f+20="; # Tests require network access and a running Steam client. Skipping. doCheck = false; From a4d03764cb22e76d170466d0703a0079f1234060 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 May 2026 08:06:42 +0000 Subject: [PATCH 020/130] kubescape: 4.0.8 -> 4.0.9 --- pkgs/by-name/ku/kubescape/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix index e4410ae667b8..b789c8b1a8c2 100644 --- a/pkgs/by-name/ku/kubescape/package.nix +++ b/pkgs/by-name/ku/kubescape/package.nix @@ -9,18 +9,18 @@ }: buildGoModule (finalAttrs: { pname = "kubescape"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; tag = "v${finalAttrs.version}"; - hash = "sha256-QWPMWUT8Hv6240yEtcaoLXmgtySHNOZpzBw2soHCW8A="; + hash = "sha256-BkBRRrYs551bGnT00EvVSzaNQM8GfcltEl8xLb/AKd8="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-tObBMdIjW8JUEv7tKdmhXZuB+kQryP+B856MXtsKp5U="; + vendorHash = "sha256-GQTk12dHSNLWdLcb0VedK1Ex1uJOZtL3+XOnh527p/8="; subPackages = [ "." ]; From 5705e70242497fb7d8118625f32e6563ee5c8ad4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 May 2026 11:27:26 +0200 Subject: [PATCH 021/130] python3Packages.rich-click: 1.9.7 -> 1.9.8 Diff: https://github.com/ewels/rich-click/compare/v1.9.7...v1.9.8 Changelog: https://github.com/ewels/rich-click/blob/v1.9.8/CHANGELOG.md --- pkgs/development/python-modules/rich-click/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 8f5a3c0d62fa..132a254ba24c 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.9.7"; + version = "1.9.8"; pyproject = true; src = fetchFromGitHub { owner = "ewels"; repo = "rich-click"; tag = "v${version}"; - hash = "sha256-HT82Dk3dYNMVU4lKJodKtn2KfEH7HUAORpa2RKSmg68="; + hash = "sha256-FjtwlWYFqI7vQ7JtpCtTIi90mbEkmHSKH8SROy9d+vU="; }; build-system = [ setuptools ]; From 89e323404a06d2a51f2c9a088d8cde0746977c31 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 May 2026 11:28:53 +0200 Subject: [PATCH 022/130] python3Packages.rich-click: migrate to finalAttrs --- pkgs/development/python-modules/rich-click/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 132a254ba24c..963fd89bd650 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -8,7 +8,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rich-click"; version = "1.9.8"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ewels"; repo = "rich-click"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FjtwlWYFqI7vQ7JtpCtTIi90mbEkmHSKH8SROy9d+vU="; }; @@ -36,9 +36,9 @@ buildPythonPackage rec { meta = { description = "Module to format click help output nicely with rich"; homepage = "https://github.com/ewels/rich-click"; - changelog = "https://github.com/ewels/rich-click/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/ewels/rich-click/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "rich-click"; }; -} +}) From 24c019a0565ccddbc9d9bbb0b5d47af920c778de Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 29 May 2026 06:01:46 -0400 Subject: [PATCH 023/130] python3Packages.jh2: 5.0.11 -> 5.0.13 Diff: https://github.com/jawah/h2/compare/v5.0.11...v5.0.13 Changelog: https://github.com/jawah/h2/blob/refs/tags/v5.0.13/CHANGELOG.rst --- pkgs/development/python-modules/jh2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jh2/default.nix b/pkgs/development/python-modules/jh2/default.nix index 95a1eceb2ed9..499ed171c790 100644 --- a/pkgs/development/python-modules/jh2/default.nix +++ b/pkgs/development/python-modules/jh2/default.nix @@ -11,20 +11,20 @@ buildPythonPackage (finalAttrs: { pname = "jh2"; - version = "5.0.11"; + version = "5.0.13"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "h2"; tag = "v${finalAttrs.version}"; - hash = "sha256-k69U8O0c7z1TJASOWcndZA/LYTsX7nVfelhaS6FlN5g="; + hash = "sha256-zlc0R+DeE9bd5daD7sUrGHXU3NR5tRiiFvBrccSKCTI="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-ELZD3CIAv70DGoCgdK8T2yVLtib9ylSvoZPFOge6nIQ="; + hash = "sha256-BPTgGc/qH101ZBlqiqwBe5KXXpnpDGe5K6GLqG99GSI="; }; build-system = [ From 523b2a1584fee1a781df0a01554ceb61735e73af Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Fri, 29 May 2026 13:08:30 +0200 Subject: [PATCH 024/130] home-assistant-matter-hub: 2.0.43 -> 2.0.45 --- .../ho/home-assistant-matter-hub/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix index 9b45a6d213b0..7ed0b5a4068e 100644 --- a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix +++ b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix @@ -8,16 +8,18 @@ fetchPnpmDeps, makeWrapper, }: - +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-assistant-matter-hub"; - version = "2.0.43"; + version = "2.0.45"; src = fetchFromGitHub { owner = "RiDDiX"; repo = "home-assistant-matter-hub"; tag = "v${finalAttrs.version}"; - hash = "sha256-Dls5TglEIFvVGpg8ENTb6IhCwJermmREHuJnalF4kJ4="; + hash = "sha256-fEPcUq0OejfJXhzxfxXzQMIZ+L6nYEjoflA2GZdu3hg="; }; # The bundled cli.js imports transitive dependencies (e.g. @noble/curves) @@ -33,8 +35,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmInstallFlags pnpmWorkspaces ; + inherit pnpm; fetcherVersion = 3; - hash = "sha256-1DaR4q1QH07UR+EchfDI92bTdRY4C2IaGIRj426DURI="; + hash = "sha256-n/LQhY6HWFlkslodO6ERuTcm5ux+vd+8CwzX19oC7c8="; }; __structuredAttrs = true; @@ -47,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs - pnpm_10 + pnpm pnpmConfigHook makeWrapper ]; From 4f02af8e4c3294a68e77fc525829d39d16411baa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 May 2026 14:16:54 +0000 Subject: [PATCH 025/130] python3Packages.microsoft-kiota-serialization-multipart: 1.9.8 -> 1.10.2 --- .../microsoft-kiota-serialization-multipart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix index 405c3529c5b6..aa9770764983 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-multipart"; - version = "1.9.8"; + version = "1.10.2"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; tag = "microsoft-kiota-serialization-multipart-v${version}"; - hash = "sha256-05/I06p3zBc/Kb7H8dMEbUxFr0dOXSSBuIyEGZ4twhA="; + hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I="; }; sourceRoot = "${src.name}/packages/serialization/multipart/"; From b07aee3fc28642c7d5823955603241707ae57d10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 May 2026 14:25:31 +0000 Subject: [PATCH 026/130] python3Packages.microsoft-kiota-serialization-text: 1.9.8 -> 1.10.2 --- .../microsoft-kiota-serialization-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix index 1363980d0474..6094582d51d0 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-text"; - version = "1.9.8"; + version = "1.10.2"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; tag = "microsoft-kiota-serialization-text-v${version}"; - hash = "sha256-05/I06p3zBc/Kb7H8dMEbUxFr0dOXSSBuIyEGZ4twhA="; + hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I="; }; sourceRoot = "${src.name}/packages/serialization/text/"; From 74afbd0efcbaf261b8deef712d1025a15a41375f Mon Sep 17 00:00:00 2001 From: Curtis Jones Date: Fri, 29 May 2026 10:34:01 -0400 Subject: [PATCH 027/130] python3Packages.proxmoxer: 2.3.0 correct revision & hash Commit 3dee50b updated the nix metadata not source information. --- pkgs/development/python-modules/proxmoxer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index a18670d33498..5e790c93a691 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "proxmoxer"; repo = "proxmoxer"; - rev = "cf1bcde696537c74ef00d8e71fb86735fb4c2c79"; - hash = "sha256-h5Sla7/4XiZSGwKstyiqs/T2Qgi13jI9YMVPqDcF3sA="; + rev = "99fe9814d6212c614a944ce7b3d907e05042c4fa"; + hash = "sha256-v/QqNCzkcYk2pqr9tTeyvEEeXt4nzqooHAQEIiJitZ4="; }; build-system = [ setuptools ]; From 3fecd4eba3d4e813e7baf813ab3a018ca40ecddb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 29 May 2026 19:10:57 +0200 Subject: [PATCH 028/130] mendeley: cleanup --- pkgs/applications/office/mendeley/default.nix | 1 - pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index af72e6a6e3e0..8d17cec5f610 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -2,7 +2,6 @@ lib, fetchurl, appimageTools, - gconf, imagemagick, }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d0e11e21108..2852df7467eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9546,9 +9546,7 @@ with pkgs; mediaelch-qt5 = callPackage ../by-name/me/mediaelch/package.nix { qtVersion = 5; }; mediaelch-qt6 = mediaelch; - mendeley = libsForQt5.callPackage ../applications/office/mendeley { - gconf = gnome2.GConf; - }; + mendeley = callPackage ../applications/office/mendeley { }; mercurialFull = mercurial.override { fullBuild = true; }; From efb974c06391dd92c1d708f70007b776748a46ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 May 2026 18:19:32 +0000 Subject: [PATCH 029/130] nezha: 2.0.11 -> 2.0.14 --- pkgs/by-name/ne/nezha/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 414f6ffd1322..c97bcf8f9141 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -48,13 +48,13 @@ let in buildGoModule (finalAttrs: { pname = "nezha"; - version = "2.0.11"; + version = "2.0.14"; src = fetchFromGitHub { owner = "nezhahq"; repo = "nezha"; tag = "v${finalAttrs.version}"; - hash = "sha256-XZPyzIiqf2UG1gE6uHiYSVPCP6G/lrKK+Y3vRgkPk20="; + hash = "sha256-dSFwU1p2lAI8CaNoQgdX/pkumIumZpdLgnn1XCkoeKU="; }; proxyVendor = true; @@ -94,7 +94,7 @@ buildGoModule (finalAttrs: { GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs ''; - vendorHash = "sha256-x347CkS4nw8hFUhmuewvrqNDE2a2lT3KmIQ1hc98NJE="; + vendorHash = "sha256-y7XvvpLrmoaU1gLtaN38T9rsS3Rpi313XAKaVcia6Q4="; ldflags = [ "-s" From a6a1f8470c0b9f6b20b91f18f4cba7efb65c30e5 Mon Sep 17 00:00:00 2001 From: rorosen Date: Wed, 20 May 2026 22:30:51 +0200 Subject: [PATCH 030/130] nixos/rancher: adapt auto deploy test to upstream change to traefik Upstream changed the default bundled load balancer starting in RKE2 v1.36. This adapts the auto deploy test accordingly. From the RKE2 release notes: Because ingress-nginx was retired upstream as of March 2026, Traefik is now the default for new clusters starting in v1.36 (existing clusters will keep their current ingress upon upgrade to avoid breakage). This transition brings the following structural changes: - Airgapped Environments: The rke2-images-core tarball now contains Traefik images instead of ingress-nginx. The standalone rke2-images-traefik tarball has been removed. Users who must continue using ingress-nginx will now need to manually provide the rke2-images-ingress-nginx tarball. - Future Removal: The ingress-nginx chart will not receive any additional updates and will be completely removed in v1.37 for community users. - Prime Customers: Please refer to the official product documentation for specific Prime considerations. --- nixos/tests/rancher/auto-deploy.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/tests/rancher/auto-deploy.nix b/nixos/tests/rancher/auto-deploy.nix index b9c2a80cbd5a..3da2fa7f1f9a 100644 --- a/nixos/tests/rancher/auto-deploy.nix +++ b/nixos/tests/rancher/auto-deploy.nix @@ -275,9 +275,16 @@ in k3s = '' machine.wait_until_succeeds("kubectl -n kube-system rollout status deployment traefik") ''; - rke2 = '' - machine.wait_until_succeeds("kubectl -n kube-system rollout status daemonset rke2-ingress-nginx-controller") - ''; + rke2 = + # Starting from v1.36, RKE2 also uses traefik as default load balancer + if lib.versionAtLeast rancherPackage.version "1.36" then + '' + machine.wait_until_succeeds("kubectl -n kube-system rollout status daemonset rke2-traefik") + '' + else + '' + machine.wait_until_succeeds("kubectl -n kube-system rollout status daemonset rke2-ingress-nginx-controller") + ''; } .${rancherDistro} } From e90f7606c95b6e7733d4b9cad67664e22de8983a Mon Sep 17 00:00:00 2001 From: rorosen Date: Thu, 21 May 2026 11:50:29 +0200 Subject: [PATCH 031/130] rke2: enable __structuredAttrs for all packages --- pkgs/applications/networking/cluster/rke2/builder.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix index c7d65fac7374..29b42d02e6b0 100644 --- a/pkgs/applications/networking/cluster/rke2/builder.nix +++ b/pkgs/applications/networking/cluster/rke2/builder.nix @@ -46,6 +46,7 @@ lib: nixosTests, }: buildGoModule (finalAttrs: { + __structuredAttrs = true; pname = "rke2"; version = rke2Version; From e9dadb2a8fa2ed2647a8ca015b23b19d9c34c72a Mon Sep 17 00:00:00 2001 From: rorosen Date: Wed, 20 May 2026 22:54:40 +0200 Subject: [PATCH 032/130] rke2_1_36: init at 1.36.1+rke2r1 https://github.com/rancher/rke2/releases/tag/v1.36.1%2Brke2r1 Upstream ingress-nginx Retirement & Transition to Traefik Because ingress-nginx was retired upstream as of March 2026, Traefik is now the default for new clusters starting in v1.36 (existing clusters will keep their current ingress upon upgrade to avoid breakage). This transition brings the following structural changes: - Airgapped Environments: The rke2-images-core tarball now contains Traefik images instead of ingress-nginx. The standalone rke2-images-traefik tarball has been removed. Users who must continue using ingress-nginx will now need to manually provide the rke2-images-ingress-nginx tarball. - Future Removal: The ingress-nginx chart will not receive any additional updates and will be completely removed in v1.37 for community users. - Prime Customers: Please refer to the official product documentation for specific Prime considerations. --- .../cluster/rke2/1_36/images-versions.json | 138 ++++++++++++++++++ .../networking/cluster/rke2/1_36/versions.nix | 13 ++ .../networking/cluster/rke2/default.nix | 4 +- pkgs/top-level/all-packages.nix | 1 + 4 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/cluster/rke2/1_36/images-versions.json create mode 100644 pkgs/applications/networking/cluster/rke2/1_36/versions.nix diff --git a/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json new file mode 100644 index 000000000000..b82d9e141d76 --- /dev/null +++ b/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json @@ -0,0 +1,138 @@ +{ + "images-calico-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "bc9fb1ba72af6185de90e4e0f8a384993657c4b0fdedbb14e7ca5cf93bf2303d" + }, + "images-calico-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "38fc5ecd017e9a66e3831ece42efedcfedaafc000759eaa4fb9f19a68122ec51" + }, + "images-calico-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "e86ac7f4cf14e4f02fcdd0e3d74e832fa43654f592068c2b5d8c044c69e2b749" + }, + "images-calico-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "03df93db61bc54f351bb6131c632279c265d4b71af0a90e2a6898f9b99b453f4" + }, + "images-canal-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "5cce5314ed6ff237c646723456c81876e89517b9164368728a9df00697655858" + }, + "images-canal-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d" + }, + "images-canal-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "e8346348137747fbd626846e5b71d182c49e8a1dcb997ea9e91f50e7bd907129" + }, + "images-canal-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d" + }, + "images-cilium-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "8c52261340b4af54186f83d2913c676a2dcef820f25a1b42b8c51cfef1dcdbc6" + }, + "images-cilium-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "865913456dc55b2ba4748b0fe76489e4960a60990f207341c66bcbf9e93e95b3" + }, + "images-cilium-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "4170bfc7d0ebf9167a94d24e393fbff0fc7dce4da1443257709fdbe603ffc579" + }, + "images-cilium-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "016caf748e5c39460b9618d998d261c7db8fe8348f9fa43d35693a47d4913b86" + }, + "images-core-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "03a72f2c228131b7cb616c5b7758cd1c00b7f3e7d589573c5faf837e4e2ab764" + }, + "images-core-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "37acd15d183693fb0bb465840590593ed78d72415752a052d282a418fdb905cf" + }, + "images-core-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "4798bf3293e7b5b62e694bee8a811c3ace86bb5c7516c9f196a4ba48dc947c3f" + }, + "images-core-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "ff8c770fa2b17151e333a0a4449bc4dc3cd5c65662ec88b2ffc31fde6a40d0ed" + }, + "images-flannel-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "0e5c71c9ecd89f11bb1cc0ea72a0297090e7a44395efe5fd74e14af3db3581a8" + }, + "images-flannel-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "sha256": "23695fd8c2a77f043a089c44437d12b5bde88422dbcd1d70edcda7a78f651137" + }, + "images-flannel-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "d9f75aaace63bcba2cbaeba2662d9877d39ec822621fd96824e9ec3fbe62a79c" + }, + "images-flannel-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "8aa8e19b739bc3fd897115f92d54acd081453441ee4dae8ca694ec47662838a7" + }, + "images-harvester-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "c9442d489c4170fc515d04c2c5c7c76ff3ca2fb4093a94aea0d0a6fb1719c5d3" + }, + "images-harvester-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "9551558d7baba1a78de7954f4801cf4329b5fb5ffd0cc3566b9fa32732ff950c" + }, + "images-harvester-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "11ea150625fc1a4700cec2859367692d533f7f9288f7196b331a77682766d742" + }, + "images-harvester-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "045db3938a0a11f6d5b4936f63471fec48fd76d29ef85e9cfe6bae5bddd8525e" + }, + "images-ingress-nginx-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.gz", + "sha256": "0af77531d170d30b844518bb4665b29f3f386cf160f7c2b955467516f4d04dc3" + }, + "images-ingress-nginx-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.zst", + "sha256": "d5b7d3f12de0799cebf84fc6260fc4f093f2837c5fef6fc84849d8f1da5cbc22" + }, + "images-ingress-nginx-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.gz", + "sha256": "8c5d5eea216102e5dd07621671f2e462dfade184f20c81adb8facbaa58e59c2c" + }, + "images-ingress-nginx-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.zst", + "sha256": "363f42d83118e3398e72996f6b42477230000ffd50d93fdda570140ea020539b" + }, + "images-multus-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "ec3d8557e36db43acd9a76c38242de6feea354e41ae3ff8b9ab55de82ee19026" + }, + "images-multus-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "8be7075092a5e179e50fb526ea730018103d9f8a609f22f0d1431482690a9d7f" + }, + "images-multus-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "caebabf77d9d3190d76156990d8eaa0c2df5cb563a8447f1e506b50f4104e1a0" + }, + "images-multus-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "39bd89d250894254f7c1f9b061401a574716574ab3f51cc3a82c03eb4e804825" + }, + "images-vsphere-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "d07ed8b72db67fae9024540fca3eed7990b4a4b3a7ba6eef78a2eae8e6b3b4d3" + }, + "images-vsphere-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "4cd43197b21bd1344c0a7e87a7f28c8766b3edfab8e2fb2bb6954d144f3b44a7" + } +} diff --git a/pkgs/applications/networking/cluster/rke2/1_36/versions.nix b/pkgs/applications/networking/cluster/rke2/1_36/versions.nix new file mode 100644 index 000000000000..0df94c7d70dd --- /dev/null +++ b/pkgs/applications/networking/cluster/rke2/1_36/versions.nix @@ -0,0 +1,13 @@ +{ + rke2Version = "1.36.1+rke2r1"; + rke2Commit = "b4a8e78038f35eb282a8d6e3c29797a1181fa961"; + rke2TarballHash = "sha256-SD7+lNYu6/5iMxEmHEpkD8g9UCgN6gjkFsGdQn9o1Cc="; + rke2VendorHash = "sha256-gUgRAC9yKDa8JYb/jdCxZdP6500XxjqHprmYlPv5A8c="; + k8sImageTag = "v1.36.1-rke2r1-build20260512"; + etcdVersion = "v3.6.7-k3s1-build20260512"; + pauseVersion = "3.6"; + ccmVersion = "v1.36.0-rc2.0.20260427154526-d239025e2a23-build20260429"; + dockerizedVersion = "v1.36.1-rke2r1"; + helmJobVersion = "v0.10.0-build20260513"; + imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); +} diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix index e48b0b94f63c..d0f035cc2fd1 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/pkgs/applications/networking/cluster/rke2/default.nix @@ -11,7 +11,9 @@ rec { rke2_1_35 = common (import ./1_35/versions.nix) extraArgs; + rke2_1_36 = common (import ./1_36/versions.nix) extraArgs; + # Automatically set by update script, changes shouldn't be backported rke2_stable = rke2_1_35; - rke2_latest = rke2_1_35; + rke2_latest = rke2_1_36; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53ce8a608ea4..5b9499b7dbad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9840,6 +9840,7 @@ with pkgs; rke2_1_33 rke2_1_34 rke2_1_35 + rke2_1_36 rke2_stable rke2_latest ; From 6165bc30f3f03921e72f5b9c6f37e57af116b1aa Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Fri, 29 May 2026 23:13:38 +0200 Subject: [PATCH 033/130] proton-pass-cli: disable update checks --- pkgs/by-name/pr/proton-pass-cli/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix index f1cfa51d6133..c7616dbbc93f 100644 --- a/pkgs/by-name/pr/proton-pass-cli/package.nix +++ b/pkgs/by-name/pr/proton-pass-cli/package.nix @@ -8,6 +8,7 @@ jq, keyutils, libgcc, + makeBinaryWrapper, versionCheckHook, writeShellScript, }: @@ -18,7 +19,10 @@ stdenv.mkDerivation (finalAttrs: { src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + nativeBuildInputs = [ + makeBinaryWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -37,6 +41,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + postFixup = '' + wrapProgram $out/bin/pass-cli --set PROTON_PASS_NO_UPDATE_CHECK 1 + ''; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook From ccff74d3dd0c278190e0bc7fa764b823dc011e37 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 29 May 2026 23:48:02 +0200 Subject: [PATCH 034/130] python3Packages.aiolookin: migrate to pyproject --- pkgs/development/python-modules/aiolookin/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index 8a59fd24fbec..af73080aab20 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -7,12 +7,13 @@ pytest-aiohttp, pytest-mock, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "aiolookin"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ANMalko"; @@ -21,7 +22,9 @@ buildPythonPackage rec { hash = "sha256-G3/lUgV60CMLskUo83TlvLLIfJtu5DEz+94mdVI4OrI="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; doCheck = false; # all tests are async and no async plugin is configured From 6447d9194ca03334ec34c9bc02522f8328946f55 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 29 May 2026 23:49:08 +0200 Subject: [PATCH 035/130] python3Packages.aiolookin: use finalAttrs --- pkgs/development/python-modules/aiolookin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index af73080aab20..362c3c016b96 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiolookin"; version = "1.0.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ANMalko"; repo = "aiolookin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-G3/lUgV60CMLskUo83TlvLLIfJtu5DEz+94mdVI4OrI="; }; @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Python client for interacting with LOOKin devices"; homepage = "https://github.com/ANMalko/aiolookin"; - changelog = "https://github.com/ANMalko/aiolookin/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/ANMalko/aiolookin/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 08df72918de3198b2ffb94c3caf4c261213045b0 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 29 May 2026 23:57:54 +0200 Subject: [PATCH 036/130] python3Packages.aiopylgtv: migrate to pyproject --- pkgs/development/python-modules/aiopylgtv/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix index 15e2b8707774..af2cea1c4765 100644 --- a/pkgs/development/python-modules/aiopylgtv/default.nix +++ b/pkgs/development/python-modules/aiopylgtv/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, numpy, + setuptools, sqlitedict, websockets, }: @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "aiopylgtv"; version = "0.4.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bendavid"; @@ -19,7 +20,9 @@ buildPythonPackage rec { hash = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy sqlitedict websockets From 93124525da6139f1d5387f9110db7f7de6ac8593 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 29 May 2026 23:58:36 +0200 Subject: [PATCH 037/130] python3Packages.aiopylgtv: use finalAttrs --- pkgs/development/python-modules/aiopylgtv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix index af2cea1c4765..f5103948c5e5 100644 --- a/pkgs/development/python-modules/aiopylgtv/default.nix +++ b/pkgs/development/python-modules/aiopylgtv/default.nix @@ -8,7 +8,7 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiopylgtv"; version = "0.4.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bendavid"; repo = "aiopylgtv"; - rev = version; + tag = finalAttrs.version; hash = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM="; }; @@ -39,4 +39,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 8b17fd7c8b3e5026116504becfc810e1ba4001e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 May 2026 22:05:19 +0000 Subject: [PATCH 038/130] greenmask: 0.2.20 -> 0.2.21 --- pkgs/by-name/gr/greenmask/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index 41c00d5de92b..8a9a72457091 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "greenmask"; - version = "0.2.20"; + version = "0.2.21"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; tag = "v${finalAttrs.version}"; - hash = "sha256-SnljUU0GDtTlHKjbMeD7yZYh+IZM2zWuMk0wck0zJb0="; + hash = "sha256-QlNw2kCh5Rd8kwuA/BiNHXaw0p5qCfn4hzo9dgN45lU="; }; - vendorHash = "sha256-SB71/Tf9Bw8AlTYGXOaRR8sdiwx8l9wQba93p6vAbAk="; + vendorHash = "sha256-zVbSppCgLil0qS4WYhkzQZxbBx6L/0gbexY//I+GzwQ="; subPackages = [ "cmd/greenmask/" ]; From 3b4b79b2c195965ad644e826e25143b6fef42dd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 May 2026 22:17:00 +0000 Subject: [PATCH 039/130] fflogs: 9.3.17 -> 9.3.61 --- pkgs/by-name/ff/fflogs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index c789986a2c19..bc3ca4bbae15 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -6,10 +6,10 @@ let pname = "fflogs"; - version = "9.3.17"; + version = "9.3.61"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-EYo65CerGE14kQadNIaVyANvyBig/yW1PfulAAE6dxo="; + hash = "sha256-QBiZR8wjhMsLguzBaM21mADlR1hKHdBuK66DcSzyVtQ="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in From c7b82f3fd8543eaf22738f393c744324403dd558 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 21 May 2026 15:51:13 +0200 Subject: [PATCH 040/130] maintainers: remove kirikaza --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/mo/moolticute/package.nix | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9e88cfa3c165..c30c861dbc87 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14374,12 +14374,6 @@ githubId = 451835; name = "Kirill Elagin"; }; - kirikaza = { - email = "k@kirikaza.ru"; - github = "kirikaza"; - githubId = 804677; - name = "Kirill Kazakov"; - }; kirillrdy = { email = "kirillrdy@gmail.com"; github = "kirillrdy"; diff --git a/pkgs/by-name/mo/moolticute/package.nix b/pkgs/by-name/mo/moolticute/package.nix index dbcfa3829f0a..6f355da890e7 100644 --- a/pkgs/by-name/mo/moolticute/package.nix +++ b/pkgs/by-name/mo/moolticute/package.nix @@ -54,10 +54,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/mooltipass/moolticute"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - kirikaza - hughobrien - ]; + maintainers = with lib.maintainers; [ hughobrien ]; platforms = lib.platforms.linux; }; } From ee789afb831068d2dd8484f45ddff2f6ad86e7b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 30 May 2026 00:31:57 +0200 Subject: [PATCH 041/130] zoneminder: migrate to pcre2 --- pkgs/by-name/zo/zoneminder/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zo/zoneminder/package.nix b/pkgs/by-name/zo/zoneminder/package.nix index a2eb9719205e..1339d09f18f6 100644 --- a/pkgs/by-name/zo/zoneminder/package.nix +++ b/pkgs/by-name/zo/zoneminder/package.nix @@ -15,7 +15,7 @@ mp4v2, libmysqlclient, mariadb, - pcre, + pcre2, perl, perlPackages, polkit, @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { mp4v2 libmysqlclient mariadb - pcre + pcre2 perl polkit x264 From de3bda3fa9acdb7a8e879a98e1ff41f948700d84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 May 2026 23:04:52 +0000 Subject: [PATCH 042/130] python3Packages.aioharmony: 1.0.3 -> 1.0.8 --- pkgs/development/python-modules/aioharmony/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index be5857afbb37..6bc82851f106 100644 --- a/pkgs/development/python-modules/aioharmony/default.nix +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioharmony"; - version = "1.0.3"; + version = "1.0.8"; pyproject = true; src = fetchFromGitHub { owner = "Harmony-Libs"; repo = "aioharmony"; tag = "v${version}"; - hash = "sha256-163L2ilmfMRL6qsD4RgWEX3kdKK6rnvjw9c78vKBtuE="; + hash = "sha256-7K/I71yonmAqLp12Hk8e72BBfF/sez1cFdQbnixDdbg="; }; build-system = [ setuptools ]; From aef2f5423288724d8774d2a5a60b1a77aed50962 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 May 2026 23:33:54 +0000 Subject: [PATCH 043/130] home-assistant-custom-components.daikin_onecta: 4.6.0 -> 4.6.2 --- .../custom-components/daikin_onecta/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix index f8c287c4297d..5adb61200356 100644 --- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix +++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "jwillemsen"; domain = "daikin_onecta"; - version = "4.6.0"; + version = "4.6.2"; src = fetchFromGitHub { owner = "jwillemsen"; repo = "daikin_onecta"; tag = "v${version}"; - hash = "sha256-7X/I52jvcKtaLU01sa+oZ7n9wIJ9qNemiBUgEj5lRNQ="; + hash = "sha256-uLEFbYG+3+f+LNfJlLi06v75StLBsHdJTiHxA/tNwj4="; }; meta = { From 6b003ddfd1cb57f73d16f6dad0f9a3ce8ca4b338 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 00:54:49 +0000 Subject: [PATCH 044/130] wakatime-cli: 2.14.5 -> 2.14.12 --- pkgs/by-name/wa/wakatime-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index 976b33b25689..493aacf57bda 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/pkgs/by-name/wa/wakatime-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "wakatime-cli"; - version = "2.14.5"; + version = "2.14.12"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-C5d0E4+NSZsy+GiolLEGBjRJBHlc/XKNCNZNFz46qVQ="; + hash = "sha256-bfDaIJweh8RMXey0AypHEsZZO9eqToKjbLQR9//J0yc="; }; - vendorHash = "sha256-OfnXj6X2JIN/lLCvB8LLYeqNj1aW3GuA1hCiw+219QQ="; + vendorHash = "sha256-xrIvtUfOFOgcKJ+2VgUgOzF2Cwp3NPBf39yXgAHN/cQ="; ldflags = [ "-s" From 73fac2351c172c4cd0f4502a32ab9c3e7841549c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 00:59:12 +0000 Subject: [PATCH 045/130] python3Packages.apprise: 1.10.0 -> 1.11.0 --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index ea9cd651a335..3678bca77297 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -23,12 +23,12 @@ buildPythonPackage (finalAttrs: { pname = "apprise"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-t2jzLZnkXtX0w+7x9nkD6APJf5e6YaUxpdCkXUDfkKg="; + hash = "sha256-Ox5vU2WzAtH64nDAyAB5WOVCJLm3gIrOxpAG6if1uKI="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' From 4fa6030154df416cc64a59566a513ad625501bcc Mon Sep 17 00:00:00 2001 From: mshnwq Date: Sat, 30 May 2026 04:32:09 +0300 Subject: [PATCH 046/130] maintainers: update mshnwq --- maintainers/maintainer-list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9e88cfa3c165..66455eab32fb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18727,10 +18727,10 @@ keys = [ { fingerprint = "3B66 ACFA D10F 02AA B1D5  2CB1 8DD0 D81D 7D1F C61A"; } ]; }; mshnwq = { - email = "mshnwq.com@gmail.com"; + email = "hmachnouk@proton.me"; github = "mshnwq"; githubId = 68467027; - name = "Hayan Al-Machnouk"; + name = "Mshnwq"; }; msiedlarek = { email = "mikolaj@siedlarek.pl"; From 635bbc2b1781912b532c491e787dc8b090d6f5d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 02:44:19 +0000 Subject: [PATCH 047/130] deezer-desktop: 7.1.200 -> 7.1.220 --- pkgs/by-name/de/deezer-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/deezer-desktop/package.nix b/pkgs/by-name/de/deezer-desktop/package.nix index 9690ea77bfba..c3a29be27f6c 100644 --- a/pkgs/by-name/de/deezer-desktop/package.nix +++ b/pkgs/by-name/de/deezer-desktop/package.nix @@ -8,15 +8,15 @@ }: let - version = "7.1.200"; + version = "7.1.220"; srcs = { x86_64-linux = fetchurl { url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz"; - hash = "sha256-FrAFUkxv4/GGhDO/2g+0Kym1LCV+YoIee7rmOAw17/Q="; + hash = "sha256-q4j4S88c7xsC+Ax7XY1EVbqRRJXH+JzLrZRRB6rfQOE="; }; aarch64-linux = fetchurl { url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz"; - hash = "sha256-FcP4jAVvIA71GCtVoWEIA4AynsHOAn0/zt3rNB6Q25Y="; + hash = "sha256-g94qn+EHr8Dwn21L7z3W7Z5+LJoVSQcAEXHpJiAdbJg="; }; }; From 017a7bbdc8b698ff67e145154f9f54fc1b8ad688 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 02:48:40 +0000 Subject: [PATCH 048/130] vscode-extensions.coder.coder-remote: 1.14.5 -> 1.14.6 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3e1f1f6342e8..90e532d1ed90 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1007,8 +1007,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.14.5"; - hash = "sha256-08GsGOtgLhq5vLpQ9VDdVk/q5VSW6d7cXXflNQOpB50="; + version = "1.14.6"; + hash = "sha256-dABM44pSD0srzNl6J+1OsqugWb++soVFmtEIzliByDs="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; From 36897b15c37ef45b08dac63d358956f0eea809ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 04:25:27 +0000 Subject: [PATCH 049/130] plantuml-server: 1.2026.3 -> 1.2026.5 --- pkgs/by-name/pl/plantuml-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plantuml-server/package.nix b/pkgs/by-name/pl/plantuml-server/package.nix index c0f01addce5e..6618d990f540 100644 --- a/pkgs/by-name/pl/plantuml-server/package.nix +++ b/pkgs/by-name/pl/plantuml-server/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "plantuml-server"; - version = "1.2026.3"; + version = "1.2026.5"; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${finalAttrs.version}/plantuml-v${finalAttrs.version}.war"; - hash = "sha256-zn5Xkysncam27MlHkLp5ncf2jx9zfKj/ZgmW2JOO2dc="; + hash = "sha256-Ub6Ao+m1hC+tEerkVnMXN2CMRf8CKg9XcB9E8JsunvY="; }; dontUnpack = true; From 030cfc3ebb708bd532538d1ee921fd775c1355df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 04:49:22 +0000 Subject: [PATCH 050/130] python3Packages.soco: 0.31.0 -> 0.31.1 --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 7c308bd2a216..88fd47ee21c9 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.31.0"; + version = "0.31.1"; pyproject = true; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; tag = "v${version}"; - hash = "sha256-Tuh+ycH2czTZHNw5p02NtCfBDuqshMiJAuzPAfcCaTE="; + hash = "sha256-YxIpTFGB82aBvRxfntou2dUZm7T0KSj7yhX3gcdAO7U="; }; build-system = [ setuptools ]; From 1a3c3c6c211a7ddcffb3c4bb85bdd6242f08524d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 04:50:41 +0000 Subject: [PATCH 051/130] python3Packages.coinbase-advanced-py: 1.8.2 -> 1.8.3 --- .../python-modules/coinbase-advanced-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coinbase-advanced-py/default.nix b/pkgs/development/python-modules/coinbase-advanced-py/default.nix index 3d46ac84cff9..e8f6450de417 100644 --- a/pkgs/development/python-modules/coinbase-advanced-py/default.nix +++ b/pkgs/development/python-modules/coinbase-advanced-py/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "coinbase-advanced-py"; - version = "1.8.2"; + version = "1.8.3"; pyproject = true; src = fetchFromGitHub { owner = "coinbase"; repo = "coinbase-advanced-py"; tag = "v${version}"; - hash = "sha256-1XJ4QnFJVSbSCfkB16+UTARXqhlsy36Db3S6ju6nJUY="; + hash = "sha256-iGSe0OSCrmglaVzzJOIWwoz9DXLIE82EqK9R2QiTEUw="; }; build-system = [ From 1583e7b474f2cb8d99e5634980878bf5aca1c026 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 05:15:18 +0000 Subject: [PATCH 052/130] rasm: 3.0.9 -> 3.2.4bis --- pkgs/by-name/ra/rasm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index fa7e6302ef07..d4916b436fdc 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rasm"; - version = "3.0.9"; + version = "3.2.4bis"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; tag = "v${finalAttrs.version}"; - hash = "sha256-QlFdp/Cju28yOoqoQzM1JiZqRcxKjX7RgJPyz0VJYJ0="; + hash = "sha256-D9V9CqCCy0EYRIX0nr+kwxPH7W2KIIq67jabP7ZzETE="; }; # by default the EXEC variable contains `rasm.exe` From d3586da606296ebc840caacf922732c3865e970c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 07:07:46 +0000 Subject: [PATCH 053/130] wappalyzergo: 0.2.80 -> 0.2.82 --- pkgs/by-name/wa/wappalyzergo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wappalyzergo/package.nix b/pkgs/by-name/wa/wappalyzergo/package.nix index 5b7c55ece1c8..aca1cf3ff4e4 100644 --- a/pkgs/by-name/wa/wappalyzergo/package.nix +++ b/pkgs/by-name/wa/wappalyzergo/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "wappalyzergo"; - version = "0.2.80"; + version = "0.2.82"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "wappalyzergo"; tag = "v${finalAttrs.version}"; - hash = "sha256-m293HQoZRpKoKPlddQntjLJ4/6hCS7P0V4+A9bAulAU="; + hash = "sha256-2gnlyYQup9CneyTZTbt7gCO/XXiQfDVcMgFyY1yW7fk="; }; - vendorHash = "sha256-kcg5XaI06UOkOTo803aTJCAt8lUE9QW9jSTbOflTTEo="; + vendorHash = "sha256-9MUhivdlbxAhcdbLALdt6vhxvMLzm+WincF3iG9pR1A="; ldflags = [ "-s" ]; From e3f13cecea2a442cc399b9918b1ea17e70c39d85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 09:38:42 +0000 Subject: [PATCH 054/130] python3Packages.pyvlx: 0.2.34 -> 0.2.35 --- pkgs/development/python-modules/pyvlx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 1836be024dab..7808b5486e57 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "pyvlx"; - version = "0.2.34"; + version = "0.2.35"; pyproject = true; src = fetchFromGitHub { owner = "Julius2342"; repo = "pyvlx"; tag = finalAttrs.version; - hash = "sha256-QROewaUCvZ4wTCdi/TB5FTr58lytaViac9oOUGRp5Tw="; + hash = "sha256-NdS1Arx2XaHCltpE3VPwghRTGQcskUmXoEuauyAmMUU="; }; build-system = [ From a379fabfdb60aee0cb88ab0b0246bd5da750c6e8 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 May 2026 11:23:17 +0200 Subject: [PATCH 055/130] nginx-config-formatter: enable and fix strictDeps --- pkgs/by-name/ng/nginx-config-formatter/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ng/nginx-config-formatter/package.nix b/pkgs/by-name/ng/nginx-config-formatter/package.nix index bc33bd6c786c..254fec050b4d 100644 --- a/pkgs/by-name/ng/nginx-config-formatter/package.nix +++ b/pkgs/by-name/ng/nginx-config-formatter/package.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; + + strictDeps = true; + doCheck = true; checkPhase = '' python3 $src/test_nginxfmt.py From 22159ce6946cc8d8ac5f6fad31bfcae14fb6b6ca Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 May 2026 11:30:07 +0200 Subject: [PATCH 056/130] nginx-config-formatter: use tag/hash in fetcher --- pkgs/by-name/ng/nginx-config-formatter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ng/nginx-config-formatter/package.nix b/pkgs/by-name/ng/nginx-config-formatter/package.nix index 254fec050b4d..c62ea6d1ffec 100644 --- a/pkgs/by-name/ng/nginx-config-formatter/package.nix +++ b/pkgs/by-name/ng/nginx-config-formatter/package.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "slomkowski"; repo = "nginx-config-formatter"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-HB1knL/q1G2z6RyVCsOyIKpp4O6x68/93ccvox1FKGQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-HB1knL/q1G2z6RyVCsOyIKpp4O6x68/93ccvox1FKGQ="; }; buildInputs = [ python3 ]; From 07d5fb982050b69268f6140a3fbdefbd2c93ab97 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 May 2026 11:33:06 +0200 Subject: [PATCH 057/130] nginx-config-formatter: add install check If python3 is only in nativeBuildInputs but not buildInputs, the program builds but doesn't run. Add this check to keep an eye on that. --- pkgs/by-name/ng/nginx-config-formatter/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ng/nginx-config-formatter/package.nix b/pkgs/by-name/ng/nginx-config-formatter/package.nix index c62ea6d1ffec..f1db50e0e47f 100644 --- a/pkgs/by-name/ng/nginx-config-formatter/package.nix +++ b/pkgs/by-name/ng/nginx-config-formatter/package.nix @@ -32,6 +32,13 @@ stdenv.mkDerivation (finalAttrs: { install -m 0755 $src/nginxfmt.py $out/bin/nginxfmt ''; + doInstallCheck = true; + # We can't do a version check because there is no version command + # but we do want to check that python3 is available + installCheckPhase = '' + $out/bin/nginxfmt --help + ''; + meta = { description = "Nginx config file formatter"; maintainers = with lib.maintainers; [ Baughn ]; From e883a034bf45e7ca4ff5292922ce0e62f7367804 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 09:54:37 +0000 Subject: [PATCH 058/130] python3Packages.python-socketio: 5.16.1 -> 5.16.2 --- pkgs/development/python-modules/python-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 205d7963d500..6ef8bd15fd87 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.16.1"; + version = "5.16.2"; pyproject = true; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-socketio"; tag = "v${version}"; - hash = "sha256-fUxwQHbtr8skjxYC/KfqLkhPMs/D7LNkFCyvRmUxFmw="; + hash = "sha256-YZuNXaO+zvdKWe3A+G4nhEuYlUKf/3EAy0GyG/UkuIg="; }; build-system = [ setuptools ]; From e062a191667e1c067213959dad57d1c52b40edef Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sat, 30 May 2026 11:44:43 +0100 Subject: [PATCH 059/130] claude-code: 2.1.156 -> 2.1.158 https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md Assisted-by: Claude Code (Claude Opus 4.8) --- pkgs/by-name/cl/claude-code/manifest.json | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index 845d1ba03229..51f565fe996d 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.156", - "commit": "de3d672b5e8c35ae78d81c9dd83844d334ec63af", - "buildDate": "2026-05-28T18:38:44Z", + "version": "2.1.158", + "commit": "96d5f49347b9949c6a3e6287cbb62b8939b7e1c2", + "buildDate": "2026-05-29T23:34:41Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "9c1e8601031f5cbb3101e49dda22bf8ba31183692c705e267a6923585fa2ba09", - "size": 214986144 + "checksum": "536a0517fa64d48ddcbc8eb511a3d08027d47e06d148872332a8041d72c22768", + "size": 215233824 }, "darwin-x64": { "binary": "claude", - "checksum": "ccd608c694677324e24dec7d1253b51f887a7be838cdb75b22d5362c97351107", - "size": 217500304 + "checksum": "b7b33293702fb8e0a119b795d5af5178bd346fb46d4d7f161336d521f62d1451", + "size": 217747984 }, "linux-arm64": { "binary": "claude", - "checksum": "7ed95d0a93aeb40e2b98e234b760d9295b7044ef678c62db8d1f5e14bfd57878", - "size": 240301704 + "checksum": "98807675a3ed5b7b775f7eaa81eda32cba2810b97e9db9f6f98d7bd658cec00e", + "size": 240563848 }, "linux-x64": { "binary": "claude", - "checksum": "6d83cd2264450c5e54fc988be1032c288cf418ee604294acfb8fc4ac28f5f7a3", - "size": 240420560 + "checksum": "dd27008acd42700bac5762652ec83ff604bf9ae0786d4dde55d57a6866017fbe", + "size": 240666320 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "858aa70793d5ba6293ae64b0e351514040a6e1021e9b2bac7129a791216505ce", - "size": 233156440 + "checksum": "742329f43930cbb1122eb1fe7aca339cb3dfb67be83cd256867859fba1e79ce2", + "size": 233418584 }, "linux-x64-musl": { "binary": "claude", - "checksum": "a594c2a56f7333816b85f53ed0501399b49bd44c05f25b315869b5b102ff34c3", - "size": 234814512 + "checksum": "56d66c89bf8d3e8efdab965e1dcc840d993212b40a2e89c751567c4bc605beba", + "size": 235060272 }, "win32-x64": { "binary": "claude.exe", - "checksum": "188cc105e1caaed88f63ac2060283eb426ea17a69130810c10126b2c14f7dc7e", - "size": 236074144 + "checksum": "10fa305545b20baf6e074a086762bd252b89dfe7035848a5d41385503b1a6c74", + "size": 236306080 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "1e10b4fa9e8a4829cfdf77a9c55cfe0dd26c54f2afb4d3dd9d19ff9e99ca1887", - "size": 232039072 + "checksum": "9e0e303015eb3c9aba782b366b35194073ab8130ac6c091c2c46870798a20bdc", + "size": 232271008 } } } From 6a03e6089deeee22259d89ece3b941f70dcfd79e Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sat, 30 May 2026 11:45:06 +0100 Subject: [PATCH 060/130] vscode-extensions.anthropic.claude-code: 2.1.156 -> 2.1.158 https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md Assisted-by: Claude Code (Claude Opus 4.8) --- .../extensions/anthropic.claude-code/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 1596e6753fec..e5255aeb0f35 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-cKQwDXdsaUI4pFF/DMa/8qLs9q3C1WwI47/otxKS+Ww="; + hash = "sha256-fiPj/rkwNevJC2bTjRBkuhwdI3Sqgj3xsQB1yp6KxEM="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-2hOK3Hl5GDspu0oU0w2kqH324nOafRsKEoRCk2N6Nmw="; + hash = "sha256-NZy2I3cNZBM2oXUJ/mf56QW1edvcKu0HICAZq6VVF6U="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-fw/WkYTeB7uh9ggEASmZIz636iuy0nDsIt/oU2DBfGo="; + hash = "sha256-admTed1OpngSd2BY368AkOQGWnVLX7KM4icgx2uNJYE="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-YwUoK12QEMasKl7GOTfHOnDgkg/NNBZMA29sx674XBc="; + hash = "sha256-l39oH4LOgFrZ5598+YWvArIHrZHSz0NU9wOAMop7kNw="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.156"; + version = "2.1.158"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); From e4d95caf8d6e8bd22c29b0d0aa836f046d1aabee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 10:56:53 +0000 Subject: [PATCH 061/130] python3Packages.wakeonlan: 3.1.0 -> 3.3.0 --- pkgs/development/python-modules/wakeonlan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 0f23df1e6ef1..bbb23a1aa7b5 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "wakeonlan"; - version = "3.1.0"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "remcohaszing"; repo = "pywakeonlan"; tag = version; - hash = "sha256-VPdklyD3GVn0cex4I6zV61I0bUr4KQp8DdMKAM/r4io="; + hash = "sha256-AQjecGfcxI+zzUR6IO/iG/49QH1jClNYJFBEOABek5U="; }; nativeBuildInputs = [ poetry-core ]; From aaeb70af5fe63a961b75683420c33190361db06c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 11:13:55 +0000 Subject: [PATCH 062/130] hugo: 0.161.1 -> 0.162.1 --- pkgs/by-name/hu/hugo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index f1f4fa6d7ed6..e3fb27c5845d 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.161.1"; + version = "0.162.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-TmsXtsH3NgxrAvYzyMKGK+DZRAPjvo/Uy3zXw0lWss8="; + hash = "sha256-n3BL09Aqq/sL2d0idzxKhRv/chEComNbIp/e4euqKL4="; }; - vendorHash = "sha256-pgyJMdiifwqft29wG36TAYY1LlW4P21LIWKfepeDmYg="; + vendorHash = "sha256-Wm2CMGhpVSL9K5pMdkQwH4HwI2uV9f7gq9wr/NHNLOI="; checkFlags = let From a7a576d5c52df5a4eb9913faee6bd2f3e9338c6b Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Fri, 22 May 2026 02:30:48 +0300 Subject: [PATCH 063/130] python3Packages.unidic-lite: modernize and migrate to pyproject --- .../python-modules/unidic-lite/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/unidic-lite/default.nix b/pkgs/development/python-modules/unidic-lite/default.nix index 77463f4c839c..c2530aa94334 100644 --- a/pkgs/development/python-modules/unidic-lite/default.nix +++ b/pkgs/development/python-modules/unidic-lite/default.nix @@ -2,18 +2,21 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unidic-lite"; version = "1.0.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0idj4yp0sl27ylr2wzkybbh0wj7c843lp7cljw5d1m7xv5r4b7fv"; }; + build-system = [ setuptools ]; + # no tests doCheck = false; @@ -25,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.mit; teams = [ lib.teams.tts ]; }; -} +}) From 4806576c95ed27e0eb8194564b9ff5e05bc5f701 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 12:16:29 +0000 Subject: [PATCH 064/130] home-assistant-custom-components.dreo: 1.9.0 -> 1.9.5 --- .../servers/home-assistant/custom-components/dreo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/dreo/package.nix b/pkgs/servers/home-assistant/custom-components/dreo/package.nix index 0c362286109a..e10888a251d0 100644 --- a/pkgs/servers/home-assistant/custom-components/dreo/package.nix +++ b/pkgs/servers/home-assistant/custom-components/dreo/package.nix @@ -12,13 +12,13 @@ buildHomeAssistantComponent rec { owner = "JeffSteinbok"; domain = "dreo"; - version = "1.9.0"; + version = "1.9.5"; src = fetchFromGitHub { inherit owner; repo = "hass-dreo"; tag = "v${version}"; - hash = "sha256-JF1n6a33qA6HN0JQ5ULT87Pnj3tp7ZrIwLfhLrWx+6I="; + hash = "sha256-YGzGDEgPifF6KcD8cCEE7PqGHGo/wG/H3V0dnGEa/Tc="; }; dependencies = [ websockets ]; From 443a0b89d552c38f6b118175e4ac56759524b408 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 30 May 2026 22:25:21 +1000 Subject: [PATCH 065/130] luastatus: drop pcre --- pkgs/by-name/lu/luastatus/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix index 1c64f5602cf3..b92aaa6a742f 100644 --- a/pkgs/by-name/lu/luastatus/package.nix +++ b/pkgs/by-name/lu/luastatus/package.nix @@ -16,7 +16,6 @@ libxau, libxdmcp, pcre2, - pcre, util-linux, libselinux, libsepol, @@ -61,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: { glib udev pcre2 - pcre util-linux lua5 docutils From 531cc6069ec37971c945d62f7ef5ee8b512288e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 12:33:53 +0000 Subject: [PATCH 066/130] fselect: 0.10.0 -> 0.10.1 --- pkgs/by-name/fs/fselect/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix index 3ef6ce28353a..a0f51ed11bd2 100644 --- a/pkgs/by-name/fs/fselect/package.nix +++ b/pkgs/by-name/fs/fselect/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fselect"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = finalAttrs.version; - sha256 = "sha256-2YLWFUDwmurQAkoYB0KNjCEhwDNAUIAkgw6+lpU7DDA="; + sha256 = "sha256-eu2OAxdhDaKewMKL02rj8ED6tfB9OI3br7g0WoKOejk="; }; - cargoHash = "sha256-7dyMzlrlhU4yuEd9sNce2QoIB8dWjpcNr0mnIZxjC3U="; + cargoHash = "sha256-6XV8O3Ko4NKw5PaVbazrh6LQ0eQpbiPh/cB3Y9dkcb8="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; From ffa172d31eae02d9396fae6abbcad76cf0d5507f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 30 May 2026 14:41:19 +0200 Subject: [PATCH 067/130] transmission_4: drop unused pcre dependency --- pkgs/applications/networking/p2p/transmission/4.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index a42e2ad6eeaf..b41a170aee6e 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -11,7 +11,6 @@ inotify-tools, systemd, zlib, - pcre, rapidjson, small, libb64, @@ -24,7 +23,6 @@ miniupnpc, dht, libnatpmp, - libiconv, # Build options enableGTK3 ? false, gtkmm3, @@ -54,7 +52,6 @@ let libpsl miniupnpc openssl - pcre zlib ] ++ optionals enableSystemd [ systemd ] @@ -136,7 +133,6 @@ stdenv.mkDerivation (finalAttrs: { libutp miniupnpc openssl - pcre rapidjson small utf8cpp From 7fc9081feeeb144b59ad1b4e5a039bd8efefa7b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 12:43:05 +0000 Subject: [PATCH 068/130] python3Packages.amaranth-soc: 0.1a-unstable-2026-03-03 -> 0.1a-unstable-2026-05-23 --- pkgs/development/python-modules/amaranth-soc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index 46bed2e857c5..369149444880 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "0.1a-unstable-2026-03-03"; + version = "0.1a-unstable-2026-05-23"; pyproject = true; # from `pdm show` realVersion = @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "99d0837fd44ddaeacd9d81db6a6c5087b41ea998"; - hash = "sha256-eQqsshIyu70XkYqTREGQ/HnOOIMJSG6STHSLJTNUcfs="; + rev = "3e3d8b7241c1c7e80e0cd12937d288d0ad4a6cba"; + hash = "sha256-GuunBRGQpMSJWWU6ukr9FYTpPDIxsTyLz7j9iQgN900="; }; build-system = [ pdm-backend ]; From d1cd13b661c558c9695b9b15dda12bd142ff87cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 30 May 2026 14:44:35 +0200 Subject: [PATCH 069/130] clementine: drop unused pcre dependency --- pkgs/by-name/cl/clementine/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/cl/clementine/package.nix b/pkgs/by-name/cl/clementine/package.nix index 0b93d566a882..672eb96a2b53 100644 --- a/pkgs/by-name/cl/clementine/package.nix +++ b/pkgs/by-name/cl/clementine/package.nix @@ -20,7 +20,6 @@ libpulseaudio, gvfs, libcdio, - pcre, projectm_3, protobuf, pkg-config, @@ -83,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: { gvfs libsForQt5.liblastfm libpulseaudio - pcre projectm_3 protobuf libsForQt5.qca-qt5 From 3d4bc1021bc789975dab2bad0d5d5d7b2b82f1c1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 30 May 2026 14:46:41 +0200 Subject: [PATCH 070/130] xournalpp: drop unused pcre dependency --- pkgs/by-name/xo/xournalpp/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/xo/xournalpp/package.nix b/pkgs/by-name/xo/xournalpp/package.nix index b7005cb3a63d..9b3884c3d47e 100644 --- a/pkgs/by-name/xo/xournalpp/package.nix +++ b/pkgs/by-name/xo/xournalpp/package.nix @@ -11,7 +11,6 @@ adwaita-icon-theme, alsa-lib, - binutils, glib, gsettings-desktop-schemas, gtk3, @@ -20,7 +19,6 @@ libsndfile, libxml2, libzip, - pcre, poppler, portaudio, qpdf, @@ -59,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { libsndfile libxml2 libzip - pcre poppler portaudio qpdf From a95a506991b11447a02eb5298027d40634c9ac12 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 May 2026 14:48:20 +0200 Subject: [PATCH 071/130] nixos/nginx: use structuredAttrs instead of passAsFile in writeNginxConfig --- pkgs/build-support/writers/scripts.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 560681e4c4ae..01afb249d407 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -1100,12 +1100,11 @@ rec { pkgs.runCommandLocal name { inherit text; - passAsFile = [ "text" ]; + __structuredAttrs = true; nativeBuildInputs = [ gixy ]; } # sh '' - cp "$textPath" $out - ${lib.getExe pkgs.nginx-config-formatter} --max-empty-lines 0 $out + printf "%s" "$text" | ${lib.getExe pkgs.nginx-config-formatter} --max-empty-lines 0 - > $out ${lib.getExe pkgs.gnused} -i 's/ ;/;/g' $out gixy $out || (echo "\n\nThis can be caused by combining multiple incompatible services on the same hostname.\n\nFull merged config:\n\n"; cat $out; exit 1) ''; From f4da1f458e15a76a3d8b8bf2a5c48ab5a7748a62 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sat, 30 May 2026 15:14:21 +0200 Subject: [PATCH 072/130] vectorscan: drop pcre pcre is only required for building chimera --- pkgs/by-name/ve/vectorscan/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix index 1e8beb5fef6d..2f7a23143f85 100644 --- a/pkgs/by-name/ve/vectorscan/package.nix +++ b/pkgs/by-name/ve/vectorscan/package.nix @@ -9,7 +9,6 @@ python3, boost, sqlite, - pcre, enableShared ? !stdenv.hostPlatform.isStatic, }: @@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost sqlite - pcre ]; # FAT_RUNTIME bundles optimized implementations for different CPU extensions and uses CPUID to From b6304a318b175d124da18b95682a515c16f55d42 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 30 May 2026 08:33:10 -0500 Subject: [PATCH 073/130] tinc_pre: modernize derivation --- pkgs/tools/networking/tinc/pre.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 254021b801a2..093076844a38 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -12,14 +12,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tinc"; version = "1.1pre18"; src = fetchFromGitHub { owner = "gsliepen"; repo = "tinc"; - rev = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-1anjTUlVLx57FlUqGwBd590lfkZ2MmrM1qRcMl4P7Sg="; }; @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { # needed so the build doesn't need to run git to find out the version. prePatch = '' - substituteInPlace configure.ac --replace UNKNOWN ${version} - echo "${version}" > configure-version - echo "https://tinc-vpn.org/git/browse?p=tinc;a=log;h=refs/tags/release-${version}" > ChangeLog - sed -i '/AC_INIT/s/m4_esyscmd_s.*/${version})/' configure.ac + substituteInPlace configure.ac --replace UNKNOWN ${finalAttrs.version} + echo "${finalAttrs.version}" > configure-version + echo "https://tinc-vpn.org/git/browse?p=tinc;a=log;h=refs/tags/release-${finalAttrs.version}" > ChangeLog + sed -i '/AC_INIT/s/m4_esyscmd_s.*/${finalAttrs.version})/' configure.ac ''; configureFlags = [ @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { mic92 ]; }; -} +}) From a578c315bd0adeafb457394f8a8bcf1b2c014da5 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 30 May 2026 08:34:45 -0500 Subject: [PATCH 074/130] tinc_pre: migrate to by-name --- .../networking/tinc/pre.nix => by-name/ti/tinc_pre/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/tinc/pre.nix => by-name/ti/tinc_pre/package.nix} (100%) diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/by-name/ti/tinc_pre/package.nix similarity index 100% rename from pkgs/tools/networking/tinc/pre.nix rename to pkgs/by-name/ti/tinc_pre/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..fbf30e111307 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3226,8 +3226,6 @@ with pkgs; tinc = callPackage ../tools/networking/tinc { }; - tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; - tldr-hs = haskellPackages.tldr; tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); From 98b7f1b2152517be5c91d25ee93d88a02965a4d5 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 30 May 2026 08:39:38 -0500 Subject: [PATCH 075/130] tinc: modernize derivation --- pkgs/tools/networking/tinc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 85722207bea4..90a633dd49a4 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -7,13 +7,13 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.0.36"; pname = "tinc"; src = fetchurl { - url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "021i2sl2mjscbm8g59d7vs74iw3gf0m48wg7w3zhwj6czarkpxs0"; + url = "https://www.tinc-vpn.org/packages/tinc-${finalAttrs.version}.tar.gz"; + hash = "sha256-QPc7s/rMSA7/4OdxRCpwb/BIjt6npfJQXUzLKqgWMQg="; }; buildInputs = [ @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { mainProgram = "tincd"; platforms = lib.platforms.unix; }; -} +}) From 81ca8c3e5651ba7bc2b34404684c32c1a218b97a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 30 May 2026 08:40:58 -0500 Subject: [PATCH 076/130] tinc: migrate to by-name --- .../networking/tinc/default.nix => by-name/ti/tinc/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/tinc/default.nix => by-name/ti/tinc/package.nix} (100%) diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/by-name/ti/tinc/package.nix similarity index 100% rename from pkgs/tools/networking/tinc/default.nix rename to pkgs/by-name/ti/tinc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbf30e111307..6d364a3b98ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3224,8 +3224,6 @@ with pkgs; extraFonts = true; }; - tinc = callPackage ../tools/networking/tinc { }; - tldr-hs = haskellPackages.tldr; tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); From 74b33ba41fbae2ead356807b854c80bc428c4cf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Apr 2026 14:56:04 +0000 Subject: [PATCH 077/130] Fabric: 3.2.2 -> 3.2.3 --- pkgs/development/python-modules/fabric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fabric/default.nix b/pkgs/development/python-modules/fabric/default.nix index ada40a9ba905..b2f7013432be 100644 --- a/pkgs/development/python-modules/fabric/default.nix +++ b/pkgs/development/python-modules/fabric/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fabric"; - version = "3.2.2"; + version = "3.2.3"; pyproject = true; src = fetchFromGitHub { owner = "fabric"; repo = "fabric"; tag = version; - hash = "sha256-7qC2UuI0RP5xlKIYSz1sLyK/nQYegXOou1mlJYFk7M0="; + hash = "sha256-GbZQ6rFKQyJZXYfe9b4j6yjKgAB0ct8AD1xYG0yGZl8="; }; build-system = [ setuptools ]; From 205c347345a68b12926d6d4de7936b6607b4b62c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 30 May 2026 15:58:21 +0200 Subject: [PATCH 078/130] awsebcli: relax fabric version --- pkgs/by-name/aw/awsebcli/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 856a8ee7ac0b..580885fb4d06 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -41,6 +41,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { pythonRelaxDeps = [ "botocore" "colorama" + "fabric" "pathspec" "packaging" "PyYAML" From 255175edae0b7d9324edcb26052a2a88e56afd21 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 May 2026 16:17:23 +0200 Subject: [PATCH 079/130] python3Packages.remarshal: fix source Upstream at dbodhan is gone --- pkgs/development/python-modules/remarshal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index 561923f7ea5e..2f8ac9b22dad 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pyproject = true; src = fetchFromGitHub { - owner = "dbohdan"; + owner = "remarshal-project"; repo = "remarshal"; tag = "v${version}"; hash = "sha256-/K8x6ij23pk5O1+XJdFHaGbZ47nFMbXzp+4UMO5dGp4="; @@ -53,7 +53,7 @@ buildPythonPackage rec { changelog = "https://github.com/remarshal-project/remarshal/releases/tag/${src.tag}"; description = "Convert between TOML, YAML and JSON"; license = lib.licenses.mit; - homepage = "https://github.com/dbohdan/remarshal"; + homepage = "https://github.com/remarshal-project/remarshal"; maintainers = [ ]; mainProgram = "remarshal"; }; From a9b08c9f8d3175cdd2fca2f4d282cb3a625438aa Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 May 2026 16:18:08 +0200 Subject: [PATCH 080/130] python3Packages.remarshal: use finalAttrs --- pkgs/development/python-modules/remarshal/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index 2f8ac9b22dad..254be50c8641 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -21,7 +21,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "remarshal"; version = "1.3.0"; # test with `nix-build pkgs/pkgs-lib/format` pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "remarshal-project"; repo = "remarshal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/K8x6ij23pk5O1+XJdFHaGbZ47nFMbXzp+4UMO5dGp4="; }; @@ -50,11 +50,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - changelog = "https://github.com/remarshal-project/remarshal/releases/tag/${src.tag}"; + changelog = "https://github.com/remarshal-project/remarshal/releases/tag/${finalAttrs.src.tag}"; description = "Convert between TOML, YAML and JSON"; license = lib.licenses.mit; homepage = "https://github.com/remarshal-project/remarshal"; maintainers = [ ]; mainProgram = "remarshal"; }; -} +}) From ad0f7fbbe5847ca6c57e589d4b28d20b2176a134 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 11:47:57 -0400 Subject: [PATCH 081/130] {esbuild,esbuild_netlify}: move to by-name --- .../esbuild/default.nix => by-name/es/esbuild/package.nix} | 0 .../netlify.nix => by-name/es/esbuild_netlify/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 deletions(-) rename pkgs/{development/tools/esbuild/default.nix => by-name/es/esbuild/package.nix} (100%) rename pkgs/{development/tools/esbuild/netlify.nix => by-name/es/esbuild_netlify/package.nix} (100%) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/by-name/es/esbuild/package.nix similarity index 100% rename from pkgs/development/tools/esbuild/default.nix rename to pkgs/by-name/es/esbuild/package.nix diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/by-name/es/esbuild_netlify/package.nix similarity index 100% rename from pkgs/development/tools/esbuild/netlify.nix rename to pkgs/by-name/es/esbuild_netlify/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..0a0a88d368a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1487,10 +1487,6 @@ with pkgs; dkimpy = with python3Packages; toPythonApplication dkimpy; - esbuild = callPackage ../development/tools/esbuild { }; - - esbuild_netlify = callPackage ../development/tools/esbuild/netlify.nix { }; - libfx2 = with python3Packages; toPythonApplication fx2; foxdot = with python3Packages; toPythonApplication foxdot; From b45dd5a392d51f2a7bd58bf4175c6c6655365985 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 12:00:15 -0400 Subject: [PATCH 082/130] anystyle-cli: move to by-name --- pkgs/{tools/misc => by-name/an}/anystyle-cli/Gemfile | 0 pkgs/{tools/misc => by-name/an}/anystyle-cli/Gemfile.lock | 0 .../misc => by-name/an}/anystyle-cli/anystyle-cli.gemspec | 0 pkgs/{tools/misc => by-name/an}/anystyle-cli/gemset.nix | 0 .../default.nix => by-name/an/anystyle-cli/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 2 deletions(-) rename pkgs/{tools/misc => by-name/an}/anystyle-cli/Gemfile (100%) rename pkgs/{tools/misc => by-name/an}/anystyle-cli/Gemfile.lock (100%) rename pkgs/{tools/misc => by-name/an}/anystyle-cli/anystyle-cli.gemspec (100%) rename pkgs/{tools/misc => by-name/an}/anystyle-cli/gemset.nix (100%) rename pkgs/{tools/misc/anystyle-cli/default.nix => by-name/an/anystyle-cli/package.nix} (100%) diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile b/pkgs/by-name/an/anystyle-cli/Gemfile similarity index 100% rename from pkgs/tools/misc/anystyle-cli/Gemfile rename to pkgs/by-name/an/anystyle-cli/Gemfile diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile.lock b/pkgs/by-name/an/anystyle-cli/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/anystyle-cli/Gemfile.lock rename to pkgs/by-name/an/anystyle-cli/Gemfile.lock diff --git a/pkgs/tools/misc/anystyle-cli/anystyle-cli.gemspec b/pkgs/by-name/an/anystyle-cli/anystyle-cli.gemspec similarity index 100% rename from pkgs/tools/misc/anystyle-cli/anystyle-cli.gemspec rename to pkgs/by-name/an/anystyle-cli/anystyle-cli.gemspec diff --git a/pkgs/tools/misc/anystyle-cli/gemset.nix b/pkgs/by-name/an/anystyle-cli/gemset.nix similarity index 100% rename from pkgs/tools/misc/anystyle-cli/gemset.nix rename to pkgs/by-name/an/anystyle-cli/gemset.nix diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/by-name/an/anystyle-cli/package.nix similarity index 100% rename from pkgs/tools/misc/anystyle-cli/default.nix rename to pkgs/by-name/an/anystyle-cli/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..0603b8f15746 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1910,8 +1910,6 @@ with pkgs; bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; - anystyle-cli = callPackage ../tools/misc/anystyle-cli { }; - bzip2 = callPackage ../tools/compression/bzip2 { }; bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { }; From eb752255960162eb2c343e815dc1e02bbeed25d6 Mon Sep 17 00:00:00 2001 From: Marc Bornand Date: Sat, 30 May 2026 18:14:44 +0200 Subject: [PATCH 083/130] python3Packages.ifcopenshell: remove pcre Remove pcre from buildInputs since it was only used by the now removed opencollada --- pkgs/development/python-modules/ifcopenshell/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index bcdde4021d10..a68a4d0f75f1 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -24,7 +24,6 @@ mpfr, nlohmann_json, opencascade-occt_7_6, - pcre, zlib, # python deps @@ -101,7 +100,6 @@ buildPythonPackage rec { mpfr nlohmann_json opencascade-occt - pcre ]; propagatedBuildInputs = [ From dcd4d1e0d2bfe6cb13dadb5f1a9910e808a3d9d2 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 May 2026 19:38:16 +0300 Subject: [PATCH 084/130] wireless-regdb: 2026.02.04 -> 2026.05.30 --- pkgs/by-name/wi/wireless-regdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/wireless-regdb/package.nix b/pkgs/by-name/wi/wireless-regdb/package.nix index 84c66f27810c..d1a453329f16 100644 --- a/pkgs/by-name/wi/wireless-regdb/package.nix +++ b/pkgs/by-name/wi/wireless-regdb/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "wireless-regdb"; - version = "2026.02.04"; + version = "2026.05.30"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-${version}.tar.xz"; - hash = "sha256-D/SKXNnpz+joFaJOAjc0kZ6aO3rS8DkkOtEhz1qr9sY="; + hash = "sha256-iie/wIG6/tjCTdcPqw2W8JjloL/NCNPaZyWV8iWriZM="; }; dontBuild = true; From 70b00421a8a150b8fd3c793a78d94bc231a0fcae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 16:57:08 +0000 Subject: [PATCH 085/130] bitwuzla: 0.9.0 -> 0.9.1 --- pkgs/by-name/bi/bitwuzla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitwuzla/package.nix b/pkgs/by-name/bi/bitwuzla/package.nix index 1645e8076947..0f4cdddd4fe9 100644 --- a/pkgs/by-name/bi/bitwuzla/package.nix +++ b/pkgs/by-name/bi/bitwuzla/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bitwuzla"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; tag = finalAttrs.version; - hash = "sha256-3ThDKoXzCqDtiX3JXshqRtwri8V7lOFxmr+4IqQbUAQ="; + hash = "sha256-3uStLdDFhXVgqzremUPRbxPUcl0IqVg5MRLltgm8rCA="; }; strictDeps = true; From 75120a47827f8bd347845fced8f2585f4367d024 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 17:04:28 +0000 Subject: [PATCH 086/130] python3Packages.cloudflare: 4.3.1 -> 5.2.0 --- pkgs/development/python-modules/cloudflare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 9c2b224a4289..07662468c005 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "4.3.1"; + version = "5.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-seHGvuuNmPY7/gocuodPxOIuAAvMSQVE+VbGibO1slg="; + hash = "sha256-3PXLS1T1Q7AApoCVKXvMFqnGGLmMCXR9e3jlnj2GUpI="; }; postPatch = '' From 6e377eb159d2a2552bea3d8b4e0c1d69926eb6e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 17:49:03 +0000 Subject: [PATCH 087/130] terraform-providers.yandex-cloud_yandex: 0.204.0 -> 0.206.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a4ec6bf3ec52..66ade5f84158 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1508,12 +1508,12 @@ "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, "yandex-cloud_yandex": { - "hash": "sha256-j2JFdTXcry5VHEKBK7VHIjAdmPePF9fnJ4fW5dXglaY=", + "hash": "sha256-JSF1Q0wNRg2oavZ1+67QfCxNz+JOHrG+rfKn/1T9cgc=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.204.0", + "rev": "v0.206.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ikUGcbJ1j/QrpPF5qn+ag2e7i1gxAK74h3nrUqR+azo=" + "vendorHash": "sha256-SpJ6wuzBzfI46C7MbNxs0gQpG62ODmB0WIZ8UpJjuPU=" } } From 8e5204a9de5cf583db0e983b65fdbc0df938d1bc Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Fri, 29 May 2026 21:10:14 +0000 Subject: [PATCH 088/130] proton-pass-cli: 2.1.0 -> 2.1.2 https://github.com/protonpass/pass-cli/blob/main/CHANGELOG.md --- pkgs/by-name/pr/proton-pass-cli/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix index c7616dbbc93f..c13cfc0afe79 100644 --- a/pkgs/by-name/pr/proton-pass-cli/package.nix +++ b/pkgs/by-name/pr/proton-pass-cli/package.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "proton-pass-cli"; - version = "2.1.0"; + version = "2.1.2"; + + __structuredAttrs = true; + strictDeps = true; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; @@ -54,19 +57,19 @@ stdenv.mkDerivation (finalAttrs: { sources = { "aarch64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64"; - hash = "sha256-5FQSl6Xqipm6MWq2kza2FVXSajX4xCB4gqaAed40NoI="; + hash = "sha256-KuW98gL2fkt/eIbdukTSZyQvzTXMuGGmGs+GAjXeIlA="; }; "aarch64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64"; - hash = "sha256-4UgcR9yV/iQaQoQUFDRa+yzSCFIIk/SaPCOJdTgpMQI="; + hash = "sha256-BWJiWBL5QL1Ler1mSzu8/v3q950vmxLy0Kc74f/FUf8="; }; "x86_64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64"; - hash = "sha256-iT53cCskSY8+AvLXWQGcqFklQJJBO1d7AFMEIYEDllo="; + hash = "sha256-XZAtgly95dAANK4G4VKUKeOJ3ssIkdhgT9RrD7DGdQA="; }; "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64"; - hash = "sha256-WnddX4Ov+9jBvL8VF8ONGhV8FgEz5xNrANUxG6/oupM="; + hash = "sha256-UpHt0h2F0iJTi5E0E0WuOwoUeeJU1Ckgwru9NAEsYkM="; }; }; updateScript = writeShellScript "update-proton-pass-cli" '' From e8cc556d0440b1995519af8a7b8d9dae9cf5dc30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 18:16:18 +0000 Subject: [PATCH 089/130] python3Packages.python-ecobee-api: 0.3.2 -> 0.4.1 --- pkgs/development/python-modules/python-ecobee-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index e5fd9da0bd59..704f0a62bfd4 100644 --- a/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "python-ecobee-api"; - version = "0.3.2"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "nkgilley"; repo = "python-ecobee-api"; tag = version; - hash = "sha256-6uZc022C3EgEgsPGD302qAtFqubwQSETQr3SQSYXeb8="; + hash = "sha256-Gr0aLAX5Qv8COMjwvoqyhc7yBNMu6nbMCSBVT5FcX1Q="; }; build-system = [ setuptools ]; From ffc0c4dc22b8d251923e3ae864d4c870fb03c6b9 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Fri, 29 May 2026 23:26:49 +0200 Subject: [PATCH 090/130] opencode: disable autoupdate --- pkgs/by-name/op/opencode/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 62d536461c80..304c0212f67b 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -18,6 +18,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; version = "1.15.12"; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; @@ -134,7 +137,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { sysctl ] ) - } + } \ + --set OPENCODE_DISABLE_AUTOUPDATE true install -Dm644 config.json $out/share/opencode/config.json install -Dm644 tui.json $out/share/opencode/tui.json From 8ee83677f83fef57cc4b06846ff64c739fd4b533 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 30 May 2026 20:39:31 +0200 Subject: [PATCH 091/130] grantlee: migrate to pkgs/by-name --- .../gr/grantlee}/grantlee-nix-profiles.patch | 0 .../grantlee-no-canonicalize-filepath.patch | 0 .../gr/grantlee/package.nix} | 18 +++++---- .../5 => by-name/gr/grantlee}/setup-hook.sh | 0 .../libraries/grantlee/default.nix | 38 ------------------- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/qt5-packages.nix | 2 +- 7 files changed, 11 insertions(+), 49 deletions(-) rename pkgs/{development/libraries/grantlee/5 => by-name/gr/grantlee}/grantlee-nix-profiles.patch (100%) rename pkgs/{development/libraries/grantlee/5 => by-name/gr/grantlee}/grantlee-no-canonicalize-filepath.patch (100%) rename pkgs/{development/libraries/grantlee/5/default.nix => by-name/gr/grantlee/package.nix} (89%) rename pkgs/{development/libraries/grantlee/5 => by-name/gr/grantlee}/setup-hook.sh (100%) delete mode 100644 pkgs/development/libraries/grantlee/default.nix diff --git a/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch b/pkgs/by-name/gr/grantlee/grantlee-nix-profiles.patch similarity index 100% rename from pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch rename to pkgs/by-name/gr/grantlee/grantlee-nix-profiles.patch diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/by-name/gr/grantlee/grantlee-no-canonicalize-filepath.patch similarity index 100% rename from pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch rename to pkgs/by-name/gr/grantlee/grantlee-no-canonicalize-filepath.patch diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/by-name/gr/grantlee/package.nix similarity index 89% rename from pkgs/development/libraries/grantlee/5/default.nix rename to pkgs/by-name/gr/grantlee/package.nix index b0818c670a05..a32612b986e7 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/by-name/gr/grantlee/package.nix @@ -1,13 +1,12 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, - qtbase, - qtscript, + qt5, cmake, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "grantlee"; version = "5.3.1"; grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}"; @@ -20,10 +19,13 @@ mkDerivation rec { }; buildInputs = [ - qtbase - qtscript + qt5.qtbase + qt5.qtscript + ]; + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook ]; - nativeBuildInputs = [ cmake ]; patches = [ ./grantlee-nix-profiles.patch @@ -63,6 +65,6 @@ mkDerivation rec { homepage = "https://github.com/steveire/grantlee"; maintainers = [ lib.maintainers.ttuegel ]; license = lib.licenses.lgpl21; - inherit (qtbase.meta) platforms; + inherit (qt5.qtbase.meta) platforms; }; } diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/by-name/gr/grantlee/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/grantlee/5/setup-hook.sh rename to pkgs/by-name/gr/grantlee/setup-hook.sh diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix deleted file mode 100644 index 2704d3a718f5..000000000000 --- a/pkgs/development/libraries/grantlee/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - qtbase, - cmake, - wrapQtAppsHook, -}: - -stdenv.mkDerivation rec { - pname = "grantlee"; - version = "5.3.1"; - - src = fetchFromGitHub { - owner = "steveire"; - repo = "grantlee"; - rev = "v${version}"; - hash = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY="; - }; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - ]; - buildInputs = [ qtbase ]; - - meta = { - description = "Libraries for text templating with Qt"; - longDescription = '' - Grantlee is a set of Free Software libraries written using the Qt framework. Currently two libraries are shipped with Grantlee: Grantlee Templates and Grantlee TextDocument. - The goal of Grantlee Templates is to make it easier for application developers to separate the structure of documents from the data they contain, opening the door for theming and advanced generation of other text such as code. - The syntax uses the syntax of the Django template system, and the core design of Django is reused in Grantlee. - ''; - - homepage = "https://github.com/steveire/grantlee"; - license = lib.licenses.lgpl21Plus; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d0e11e21108..85e11c00929a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6270,8 +6270,6 @@ with pkgs; gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { }); - grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; - glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc; # Not moved to aliases while we decide if we should split the package again. diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 2432f157d63c..b6af4b4bcc4e 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -74,7 +74,7 @@ makeScopeWithSplicing' { qgpgme = callPackage ../development/libraries/qgpgme { }; - grantlee = callPackage ../development/libraries/grantlee/5 { }; + grantlee = pkgs.grantlee; herqq = callPackage ../by-name/he/herqq/package.nix { }; From 6bc5c115e5fe7723ac18f265afd5bd6314bcec91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 18:39:35 +0000 Subject: [PATCH 092/130] aws-sso-creds: 2.0.0 -> 2.1.0 --- pkgs/by-name/aw/aws-sso-creds/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aw/aws-sso-creds/package.nix b/pkgs/by-name/aw/aws-sso-creds/package.nix index 5dacccc81c1b..20b727d212e9 100644 --- a/pkgs/by-name/aw/aws-sso-creds/package.nix +++ b/pkgs/by-name/aw/aws-sso-creds/package.nix @@ -7,15 +7,15 @@ }: buildGoModule (finalAttrs: { pname = "aws-sso-creds"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jaxxstorm"; repo = "aws-sso-creds"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-QYE+HvvBEWPxopVP8QMqb4lNRyAtVDewuiWzja9XdM4="; + sha256 = "sha256-HFkPx/ptg/xXW2bbvZLSuuckj/SbuJQQcAbNfiTgTLM="; }; - vendorHash = "sha256-2EDpyw7Mqhvc0i6+UjWfNlvndRYJDaezRkOy9PBeD1Y="; + vendorHash = "sha256-GiloBizb8ec7PgXbzQEOKjyJP5doFnQ2ALH3Y1+AKZw="; nativeBuildInputs = [ makeWrapper ]; From dc9955b2159cdeae8fa2f8dfd3c60a98e2895aa8 Mon Sep 17 00:00:00 2001 From: fe2-Nyxar Date: Sat, 30 May 2026 19:48:46 +0100 Subject: [PATCH 093/130] vimPlugins.reactive-nvim: init at 1.2.1 https://github.com/rasulomaroff/reactive.nvim --- .../applications/editors/vim/plugins/generated.nix | 14 ++++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 15 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b28476267150..2aad4186b645 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -15358,6 +15358,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + reactive-nvim = buildVimPlugin { + pname = "reactive.nvim"; + version = "1.2.1"; + src = fetchFromGitHub { + owner = "rasulomaroff"; + repo = "reactive.nvim"; + tag = "v1.2.1"; + hash = "sha256-LZCCboM/fw+Kw6wVskrPs6nr4SFLoD0pi6EMxSIGelw="; + }; + meta.homepage = "https://github.com/rasulomaroff/reactive.nvim/"; + meta.license = getLicenseFromSpdxId "Apache-2.0"; + meta.hydraPlatforms = [ ]; + }; + readline-vim = buildVimPlugin { pname = "readline.vim"; version = "0-unstable-2023-03-09"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index f09f6a5ef4c7..9d98d2d27261 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1095,6 +1095,7 @@ https://github.com/winston0410/range-highlight.nvim/,, https://github.com/kelly-lin/ranger.nvim/,, https://github.com/rafaqz/ranger.vim/,, https://github.com/vim-scripts/rcshell.vim/,, +https://github.com/rasulomaroff/reactive.nvim/,, https://github.com/ryvnf/readline.vim/,, https://github.com/theprimeagen/refactoring.nvim/,, https://github.com/mawkler/refjump.nvim/,, From 3fc2400dfa959ba3573bdb487c9f02b640faafa6 Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Sat, 30 May 2026 21:48:56 +0300 Subject: [PATCH 094/130] cross-seed: 6.13.6 -> 6.13.7 --- pkgs/by-name/cr/cross-seed/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/cross-seed/package.nix b/pkgs/by-name/cr/cross-seed/package.nix index 435a71191e64..d6410dc29279 100644 --- a/pkgs/by-name/cr/cross-seed/package.nix +++ b/pkgs/by-name/cr/cross-seed/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "cross-seed"; - version = "6.13.6"; + version = "6.13.7"; src = fetchFromGitHub { owner = "cross-seed"; repo = "cross-seed"; tag = "v${version}"; - hash = "sha256-E2tnlDU2/msNcSsoDXvwGWFhWpXEByloUmlVp2tckwo="; + hash = "sha256-+7A4UGIY75hvF0JvtIr6nGNdXkUE0XV9TFpEQz9OW+Y="; }; - npmDepsHash = "sha256-tR7zPoIX6yjlRx8QbRSxskvueQ1BsP3gGAlonKHH0RY="; + npmDepsHash = "sha256-HoIiO7cj4JNY+sJEuH1v0AgagDuBTySJaoVo/4SsfIc="; passthru = { updateScript = nix-update-script { }; From d0ba6ac7267f9283de024dc9d3a859805e3b6607 Mon Sep 17 00:00:00 2001 From: whispers Date: Sat, 30 May 2026 14:48:09 -0400 Subject: [PATCH 095/130] uhttpmock: drop 0.0 abi The current uhttpmock package refers to the 0.5.x release series/0.0 ABI. This is outdated, relies on the insecure libsoup 2.4, and has no in-tree dependents. Thus, we drop it. --- doc/release-notes/rl-2611.section.md | 2 + pkgs/by-name/uh/uhttpmock/package.nix | 61 --------------------------- 2 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 pkgs/by-name/uh/uhttpmock/package.nix diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 8a6f62892387..2dabcfb3f3d6 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -15,6 +15,8 @@ - `libgdata` has been removed, as it was archived upstream and relied on the insecure libsoup 2.4. +- `uhttpmock` providing 0.0 ABI was removed. + - `requireFile` now sets `meta.license = lib.licenses.unfree` by default. Users of `requireFile`-based derivations that preserve this default will need to explicitly allow their evaluation as described in [](#sec-allow-unfree). ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} diff --git a/pkgs/by-name/uh/uhttpmock/package.nix b/pkgs/by-name/uh/uhttpmock/package.nix deleted file mode 100644 index d52050bb6cdc..000000000000 --- a/pkgs/by-name/uh/uhttpmock/package.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - meson, - mesonEmulatorHook, - ninja, - pkg-config, - gobject-introspection, - vala, - gtk-doc, - docbook-xsl-nons, - glib, - libsoup_2_4, -}: - -stdenv.mkDerivation rec { - pname = "uhttpmock"; - version = "0.5.5"; - - outputs = [ - "out" - "dev" - "devdoc" - ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pwithnall"; - repo = "uhttpmock"; - rev = version; - sha256 = "NuxiVVowZ8ilP9rcgapCe9OzFCpoOfZxZiSyjTeOrts="; - }; - - strictDeps = true; - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gtk-doc - docbook-xsl-nons - ] - ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - libsoup_2_4 - ]; - - meta = { - description = "Project for mocking web service APIs which use HTTP or HTTPS"; - homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/"; - license = lib.licenses.lgpl21Plus; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} From 55b0224334f694193b901022652bd2691090e5fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 18:50:51 +0000 Subject: [PATCH 096/130] python3Packages.groq: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/groq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix index 1b1e8a24835f..8d85fd7f72d4 100644 --- a/pkgs/development/python-modules/groq/default.nix +++ b/pkgs/development/python-modules/groq/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "groq"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "groq"; repo = "groq-python"; tag = "v${version}"; - hash = "sha256-Y+cF4yKDZ+brXLgPqBmh2RgvU52dB2ujTnZPXsMVShw="; + hash = "sha256-U6548+2dpRV2e0cnFCoGmvXiQgp7LuMUhMKZKoHJlzo="; }; postPatch = '' From 8ebdca12ce8a93d13b7d805f501ed790e3f931ab Mon Sep 17 00:00:00 2001 From: whispers Date: Sat, 30 May 2026 14:49:54 -0400 Subject: [PATCH 097/130] uhttpmock: rename from uhttpmock_1_0 Now that `uhttpmock` with the 0.0 ABI has been removed, we take the version with the 1.0 ABI and let it take the main name. --- doc/release-notes/rl-2611.section.md | 2 +- pkgs/by-name/li/libmsgraph/package.nix | 4 ++-- pkgs/by-name/uh/{uhttpmock_1_0 => uhttpmock}/package.nix | 0 pkgs/top-level/aliases.nix | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/by-name/uh/{uhttpmock_1_0 => uhttpmock}/package.nix (100%) diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 2dabcfb3f3d6..08d4ff31060f 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -15,7 +15,7 @@ - `libgdata` has been removed, as it was archived upstream and relied on the insecure libsoup 2.4. -- `uhttpmock` providing 0.0 ABI was removed. +- `uhttpmock` providing 0.0 ABI was removed. `uhttpmock_1_0` providing 1.0 ABI was renamed to `uhttpmock` and `uhttpmock_1_0` was kept as an alias. - `requireFile` now sets `meta.license = lib.licenses.unfree` by default. Users of `requireFile`-based derivations that preserve this default will need to explicitly allow their evaluation as described in [](#sec-allow-unfree). diff --git a/pkgs/by-name/li/libmsgraph/package.nix b/pkgs/by-name/li/libmsgraph/package.nix index ee212f31c957..52e4b01fc4bb 100644 --- a/pkgs/by-name/li/libmsgraph/package.nix +++ b/pkgs/by-name/li/libmsgraph/package.nix @@ -7,7 +7,7 @@ meson, ninja, pkg-config, - uhttpmock_1_0, + uhttpmock, libxml2, glib, gnome-online-accounts, @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - uhttpmock_1_0 + uhttpmock libxml2 ]; diff --git a/pkgs/by-name/uh/uhttpmock_1_0/package.nix b/pkgs/by-name/uh/uhttpmock/package.nix similarity index 100% rename from pkgs/by-name/uh/uhttpmock_1_0/package.nix rename to pkgs/by-name/uh/uhttpmock/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d6bb44d12231..8dfa01bacca4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2165,6 +2165,7 @@ mapAliases { udisks2 = udisks; # Added 2025-10-30 ue4demos = throw "'ue4demos' has been removed because it is unmaintained"; # Added 2026-02-07 ugarit-manifest-maker = throw "'ugarit-manifest-maker' has been removed because it is unmaintained"; # Added 2026-05-07 + uhttpmock_1_0 = warnAlias "'uhttpmock_1_0' has been renamed to 'uhttpmock'" uhttpmock; # Added 2026-05-30 unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17 unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27 unixODBC = warnAlias "'unixODBC' has been renamed to 'unixodbc'" unixodbc; # Added 2026-02-12 From 4a736a9e97359870c8a595cd3b6acc9991211d47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 18:54:42 +0000 Subject: [PATCH 098/130] ares: 147 -> 148 --- pkgs/by-name/ar/ares/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index d4f8f2c97015..46633586a1f0 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "147"; + version = "148"; src = fetchzip { url = "https://github.com/ares-emulator/ares/releases/download/v${finalAttrs.version}/ares-source.tar.gz"; - hash = "sha256-KkcrcFshNesnSp5fl+as3HFXjytgODvMv8m73Ni2euw="; + hash = "sha256-LXLt4hYjpnLrzu+0dLfXr4lEF7drZwSRjgaCAaD79+g="; stripRoot = false; }; From cd77af625a1c47af20cc09a4c74d77e4e49c4813 Mon Sep 17 00:00:00 2001 From: IogaMaster Date: Sat, 30 May 2026 13:14:51 -0600 Subject: [PATCH 099/130] maintainers: add iogamaster --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index baf912a567cf..51bbd9ec154c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11711,6 +11711,12 @@ githubId = 7348004; name = "Benjamin Levy"; }; + iogamaster = { + email = "iogamastercode+nixpkgs@gmail.com"; + name = "IogaMaster"; + github = "IogaMaster"; + githubId = 67164465; + }; ionutnechita = { email = "ionut_n2001@yahoo.com"; github = "ionutnechita"; From fbdf10eec702096767a1e62ef6db4abc79379573 Mon Sep 17 00:00:00 2001 From: IogaMaster Date: Sat, 30 May 2026 13:15:57 -0600 Subject: [PATCH 100/130] kubefwd: add iogamaster to maintainers --- pkgs/by-name/ku/kubefwd/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ku/kubefwd/package.nix b/pkgs/by-name/ku/kubefwd/package.nix index 449db34605ee..9f824a4779a5 100644 --- a/pkgs/by-name/ku/kubefwd/package.nix +++ b/pkgs/by-name/ku/kubefwd/package.nix @@ -29,7 +29,10 @@ buildGoModule (finalAttrs: { description = "Bulk port forwarding Kubernetes services for local development"; homepage = "https://kubefwd.com"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ cjimti ]; + maintainers = with lib.maintainers; [ + cjimti + iogamaster + ]; mainProgram = "kubefwd"; }; }) From 00d4449b7b417969fe0bab5afb29862b486ca3f2 Mon Sep 17 00:00:00 2001 From: IogaMaster Date: Sat, 30 May 2026 13:16:15 -0600 Subject: [PATCH 101/130] manix: add iogamaster to maintainers --- pkgs/by-name/ma/manix/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ma/manix/package.nix b/pkgs/by-name/ma/manix/package.nix index b9ecc5730be3..63bf47b0d4d6 100644 --- a/pkgs/by-name/ma/manix/package.nix +++ b/pkgs/by-name/ma/manix/package.nix @@ -23,6 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ lecoqjacob + iogamaster ]; mainProgram = "manix"; }; From de8ea3f186d74826295e840fd3c1292be250e5bc Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Thu, 14 May 2026 15:53:37 +0000 Subject: [PATCH 102/130] television: 0.15.6 -> 0.15.7 https://github.com/alexpasmantier/television/releases/tag/0.15.7 --- pkgs/by-name/te/television/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 79e01553cf1c..2b6a404a8663 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -20,18 +20,19 @@ let television = rustPlatform.buildRustPackage (finalAttrs: { pname = "television"; - version = "0.15.6"; + version = "0.15.7"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = finalAttrs.version; - hash = "sha256-0oWgVfybsSLHDeAqTQP2ijJ/84XdcdqD0eqxIv6jk9o="; + hash = "sha256-VfCD3qXgueXqJbImOQbnY5JtAFVmzazBQ5Tgh4YIw4s="; }; - cargoHash = "sha256-GoFDGNZYVD3/qGKs1LpkhMLDApAqQUds64+ibWy6juQ="; + cargoHash = "sha256-tChehWQhCwmM3JPfJrtE3J5zQ1gPSqlQJn85DPqHKTI="; - strictDeps = true; nativeBuildInputs = [ installShellFiles writableTmpDirAsHomeHook From c169724f5536e4330ce7665dea563581235485af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 19:27:48 +0000 Subject: [PATCH 103/130] mongodb-compass: 1.49.7 -> 1.49.8 --- pkgs/by-name/mo/mongodb-compass/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index 6bd63425dcad..32d614997e6c 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -52,7 +52,7 @@ let pname = "mongodb-compass"; - version = "1.49.7"; + version = "1.49.8"; selectSystem = attrs: @@ -67,9 +67,9 @@ let } }"; hash = selectSystem { - x86_64-linux = "sha256-qd05VAGDDmB/CMea+/NSPpmdHnTNms1LttwaA1bhgaU="; - x86_64-darwin = "sha256-9gIqtPE1qAKHSGE49FxrpbvYGchJNBqPMiq/0hUNkjE="; - aarch64-darwin = "sha256-zlbXep67u9F+BSynYp4+czDbkW7/VCPV/JafghLf3Xs="; + x86_64-linux = "sha256-5SmMFzQploo1EkXYmLDL4XdM+vKlIWkaIh1fFrIgrqY="; + x86_64-darwin = "sha256-2GgyiH7Bhm1MbjmgMvo8CuLQEsVCZkALiy1mtH/Zl1Q="; + aarch64-darwin = "sha256-a1nWzTR1dZhm/rVURl0kK2qTyHEnAZeQKiYKzRO6MqY="; }; }; From 1aa187c4562531730cf57fb81525c0649e3af1c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 19:42:13 +0000 Subject: [PATCH 104/130] cargo-expand: 1.0.121 -> 1.0.122 --- pkgs/by-name/ca/cargo-expand/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 8e92fbdbe0f8..07b9e98b45c4 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-expand"; - version = "1.0.121"; + version = "1.0.122"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cargo-expand"; tag = finalAttrs.version; - hash = "sha256-Mwc1toL3kF+ZSmSwE24FRHXtIGHB0IVBiKtHGEpsn2E="; + hash = "sha256-GhlVBpTkh4uCpfQdBl5ACbkXpH5UO5w/an/w9FA4dT4="; }; - cargoHash = "sha256-F5g70cQYSiz63DD4uQTYIQ6I7Xf6fXL4ZwfDzOYpXzQ="; + cargoHash = "sha256-CV+lfWLcyXoXPv8KLutJ819YIaKf3BHOZrj1eP3VMzo="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 78bea3365ab0d61ba86c18c80d97c6aba4c29464 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 20:10:56 +0000 Subject: [PATCH 105/130] home-assistant-custom-components.octopus_energy: 18.2.1 -> 18.3.0 --- .../custom-components/octopus_energy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix index fbd3497d1b82..658bbf83bc0f 100644 --- a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix +++ b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "BottlecapDave"; domain = "octopus_energy"; - version = "18.2.1"; + version = "18.3.0"; src = fetchFromGitHub { inherit owner; repo = "HomeAssistant-OctopusEnergy"; tag = "v${version}"; - hash = "sha256-wEVD1Ixriv4C6TbG+IrQoEl9f+tIfV/OysXRytVQ8FE="; + hash = "sha256-V26sdgzA7i16SbAKTLiUgdRVTKJo23kgsRxaJsEtbyw="; }; dependencies = [ pydantic ]; From 7bce97a715242a93b4708ce63a21e49832b19a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Mar 2026 16:20:47 -0800 Subject: [PATCH 106/130] python3Packages.caldav: 2.2.6 -> 3.2.1 Diff: https://github.com/python-caldav/caldav/compare/v2.2.6...v3.2.1 Changelog: https://github.com/python-caldav/caldav/blob/v3.2.1/CHANGELOG.md --- pkgs/development/python-modules/caldav/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 2ad6b596042d..057a14eb3a5f 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -16,6 +16,7 @@ hatch-vcs, proxy-py, pyfakefs, + pytest-asyncio, python-dateutil, pyyaml, toPythonModule, @@ -27,14 +28,14 @@ buildPythonPackage rec { pname = "caldav"; - version = "2.2.6"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "python-caldav"; repo = "caldav"; tag = "v${version}"; - hash = "sha256-xtxWDlYESIwkow/YdjaUAkJ/x2jdUyhqfSRycJVLncY="; + hash = "sha256-SCqc0MVxKaHpES+NkDcaItHlkk0kCFj6kFqH8k08vdA="; }; build-system = [ @@ -57,6 +58,7 @@ buildPythonPackage rec { manuel proxy-py pyfakefs + pytest-asyncio pytestCheckHook (toPythonModule (radicale.override { python3 = python; })) tzlocal @@ -65,11 +67,6 @@ buildPythonPackage rec { (toPythonModule (xandikos.override { python3Packages = python.pkgs; })) ]; - disabledTests = [ - # test contacts CalDAV servers on the internet - "test_rfc8764_test_conf" - ]; - __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "caldav" ]; From db40e3f5c24fa5553f98da2f8f4d0ba00b3125e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 30 May 2026 13:00:45 -0700 Subject: [PATCH 107/130] python3Packages.caldav_2: init at 2.2.6 --- pkgs/development/python-modules/caldav/2.nix | 85 ++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/python-modules/caldav/2.nix diff --git a/pkgs/development/python-modules/caldav/2.nix b/pkgs/development/python-modules/caldav/2.nix new file mode 100644 index 000000000000..f96cff3b0806 --- /dev/null +++ b/pkgs/development/python-modules/caldav/2.nix @@ -0,0 +1,85 @@ +{ + buildPythonPackage, + dnspython, + fetchFromGitHub, + hatch-vcs, + hatchling, + icalendar, + icalendar-searcher, + lib, + lxml, + manuel, + niquests, + proxy-py, + pyfakefs, + pytest-asyncio, + pytestCheckHook, + python, + python-dateutil, + pyyaml, + radicale, + recurring-ical-events, + toPythonModule, + tzlocal, + vobject, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "caldav"; + version = "2.2.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "python-caldav"; + repo = "caldav"; + tag = "v${version}"; + hash = "sha256-xtxWDlYESIwkow/YdjaUAkJ/x2jdUyhqfSRycJVLncY="; + }; + + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ + dnspython + lxml + niquests + icalendar + icalendar-searcher + recurring-ical-events + python-dateutil + pyyaml + ]; + + pythonImportsCheck = [ "caldav" ]; + + nativeCheckInputs = [ + manuel + proxy-py + pyfakefs + pytestCheckHook + (toPythonModule (radicale.override { python3 = python; })) + tzlocal + vobject + writableTmpDirAsHomeHook + ]; + + disabledTests = [ + # test contacts CalDAV servers on the internet + "test_rfc8764_test_conf" + # succeeds with Xandikos but fails with Radicale + "testConfigfile" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + changelog = "https://github.com/python-caldav/caldav/blob/${src.tag}/CHANGELOG.md"; + description = "CalDAV (RFC4791) client library"; + homepage = "https://github.com/python-caldav/caldav"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47db72e8d5be..3288394554b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2472,6 +2472,8 @@ self: super: with self; { caldav = callPackage ../development/python-modules/caldav { }; + caldav_2 = callPackage ../development/python-modules/caldav/2.nix { }; + callee = callPackage ../development/python-modules/callee { }; calmjs = callPackage ../development/python-modules/calmjs { }; From 9f8581edf1cb23f7bc11013c03eab04acb938886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 30 May 2026 13:01:33 -0700 Subject: [PATCH 108/130] home-assistant: use caldav_2 --- pkgs/servers/home-assistant/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e930d470b54a..ec971815ffd5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -86,6 +86,8 @@ let ]; }); + caldav = self.caldav_2; + gspread = super.gspread.overridePythonAttrs (oldAttrs: rec { version = "5.12.4"; src = fetchFromGitHub { From 4af9872e737d9bad8baa74f73740b057cf32d968 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 30 May 2026 23:42:16 +0300 Subject: [PATCH 109/130] balena-cli: drop doronbehar from maintainers Fully using Nix to deploy embedded systems now. --- pkgs/by-name/ba/balena-cli/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index 1f85160412f3..497df9719dc9 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -71,7 +71,6 @@ buildNpmPackage' rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ kalebpace - doronbehar ]; mainProgram = "balena"; }; From efca1d2578a25dc72530a5292ecb00bc7e332c1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 May 2026 22:57:10 +0200 Subject: [PATCH 110/130] python3Packages.proxmoxer: migrate to finalAttrs --- pkgs/development/python-modules/proxmoxer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index 5e790c93a691..dfeb0932b0c4 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "proxmoxer"; version = "2.3.0"; pyproject = true; @@ -53,8 +53,8 @@ buildPythonPackage rec { meta = { description = "Python wrapper for Proxmox API v2"; homepage = "https://github.com/proxmoxer/proxmoxer"; - changelog = "https://github.com/proxmoxer/proxmoxer/releases/tag/${version}"; - license = with lib.licenses; [ bsd3 ]; + changelog = "https://github.com/proxmoxer/proxmoxer/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 3f1a5df48089c0840b222fd732113cd16e51deaf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 May 2026 22:58:38 +0200 Subject: [PATCH 111/130] python3Packages.proxmoxer: use tag --- pkgs/development/python-modules/proxmoxer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index dfeb0932b0c4..a41d79a32489 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "proxmoxer"; repo = "proxmoxer"; - rev = "99fe9814d6212c614a944ce7b3d907e05042c4fa"; + tag = finalAttrs.version; hash = "sha256-v/QqNCzkcYk2pqr9tTeyvEEeXt4nzqooHAQEIiJitZ4="; }; From 7f650c98aad45a30e52ccbcb01b671ddc9b59d82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 21:09:14 +0000 Subject: [PATCH 112/130] pgdog: 0.1.41 -> 0.1.42 --- pkgs/by-name/pg/pgdog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix index 7aa3f87e9f7d..ede4beff9bcd 100644 --- a/pkgs/by-name/pg/pgdog/package.nix +++ b/pkgs/by-name/pg/pgdog/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: { pname = "pgdog"; - version = "0.1.41"; + version = "0.1.42"; src = fetchFromGitHub { owner = "pgdogdev"; repo = "pgdog"; tag = "v${finalAttrs.version}"; - hash = "sha256-SY97Mpzd+tuhNnRdUNk7/J8aZZRSmdvbkRj3OjyMqms="; + hash = "sha256-X0UsaToKHWAZzDA/xBoBqtpFSlFdso3tMwci3SD80/I="; }; - cargoHash = "sha256-8edaOyZ3i7aSpg+6GOCSoQduFMlsuNnjAqa70RQu2Xw="; + cargoHash = "sha256-6iWmNqlUoRLi9HxsX7Vhpu+KIsNrakzG97/Orwt3LOU="; # Hardcoded paths for C compiler and linker postPatch = '' From d6c26643937fd1f94bf42d097a5e7bab254cfe58 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 22 May 2026 15:32:17 -0600 Subject: [PATCH 113/130] ntfs3g: modernize, adopt, stop using fuse2 Co-authored-by: Guillaume Girol --- pkgs/by-name/nt/ntfs3g/package.nix | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/nt/ntfs3g/package.nix b/pkgs/by-name/nt/ntfs3g/package.nix index 7bda93b3c434..8b4aa462b4e9 100644 --- a/pkgs/by-name/nt/ntfs3g/package.nix +++ b/pkgs/by-name/nt/ntfs3g/package.nix @@ -8,14 +8,13 @@ mount, libuuid, kmod, - macfuse-stubs, crypto ? false, libgcrypt, + macfuse-stubs, gnutls, - fuse, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ntfs3g"; version = "2026.2.25"; @@ -29,19 +28,19 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tuxera"; repo = "ntfs-3g"; - rev = version; - sha256 = "sha256-uiVh87ExLXq94NVqR8MEg7Lrvamm6MrH+qP3Nosii5c="; + tag = finalAttrs.version; + hash = "sha256-uiVh87ExLXq94NVqR8MEg7Lrvamm6MrH+qP3Nosii5c="; }; buildInputs = [ gettext libuuid - fuse ] ++ lib.optionals crypto [ gnutls libgcrypt - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ macfuse-stubs ]; # Note: libgcrypt is listed here non-optionally because its m4 macros are # being used in ntfs-3g's configure.ac. @@ -65,12 +64,17 @@ stdenv.mkDerivation rec { "--enable-xattr-mappings" "--${if crypto then "enable" else "disable"}-crypto" "--enable-extras" - "--with-mount-helper=${mount}/bin/mount" - "--with-umount-helper=${mount}/bin/umount" - "--with-fuse=external" + "--with-mount-helper=${lib.getExe' mount "mount"}" + "--with-umount-helper=${lib.getExe' mount "umount"}" + + # Use bundled FUSE as fuse2 is being deprecated + # https://github.com/tuxera/ntfs-3g/issues/54#issuecomment-3058178016 + # Darwin doesn't support internal FUSE, so we use the external macFUSE stubs instead. + # https://github.com/tuxera/ntfs-3g/issues/8#issuecomment-920700418 + "--with-fuse=${if stdenv.hostPlatform.isLinux then "internal" else "external"}" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "--with-modprobe-helper=${kmod}/bin/modprobe" + "--with-modprobe-helper=${lib.getExe' kmod "modprobe"}" ]; postInstall = '' @@ -83,7 +87,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/tuxera/ntfs-3g"; description = "FUSE-based NTFS driver with full write support"; - maintainers = [ ]; + maintainers = [ lib.maintainers.ryand56 ]; mainProgram = "ntfs-3g"; platforms = with lib.platforms; darwin ++ linux; license = with lib.licenses; [ @@ -91,4 +95,4 @@ stdenv.mkDerivation rec { lgpl2Plus # fuse-lite ]; }; -} +}) From 2508c38ed56bd4b6712dfadd3dcc19a4802d7b35 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Fri, 22 May 2026 15:27:08 +0300 Subject: [PATCH 114/130] python3Packages.pyudev: migrate to pyproject --- .../python-modules/pyudev/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 267d8040c762..eabf1f575257 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -9,12 +9,13 @@ hypothesis, docutils, stdenvNoCC, + setuptools, }: buildPythonPackage rec { pname = "pyudev"; version = "0.24.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -26,13 +27,9 @@ buildPythonPackage rec { --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; - nativeCheckInputs = [ - pytest - mock - hypothesis - docutils - ]; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; checkPhase = '' py.test @@ -42,6 +39,13 @@ buildPythonPackage rec { # https://github.com/pyudev/pyudev/issues/187 doCheck = false; + nativeCheckInputs = [ + pytest + mock + hypothesis + docutils + ]; + meta = { homepage = "https://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; From 61fc9d6c92c6c05ac611694925edf154861439d5 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 30 May 2026 23:38:08 +0200 Subject: [PATCH 115/130] python3Packages.pyudev: use finalAttrs --- pkgs/development/python-modules/pyudev/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index eabf1f575257..6bae57ad7346 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -12,13 +12,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyudev"; version = "0.24.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-54i7mDcAsahO/C6IhisKUa8qmV1bhryZl1RlBc97Nrw="; }; @@ -52,4 +52,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ frogamic ]; }; -} +}) From 9e3c2da29cddc39bb1b3a18c70fb68c7db096843 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 30 May 2026 23:38:24 +0200 Subject: [PATCH 116/130] python3Packages.pyudev: add changelog --- pkgs/development/python-modules/pyudev/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 6bae57ad7346..f7975cfbb389 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -49,6 +49,7 @@ buildPythonPackage (finalAttrs: { meta = { homepage = "https://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; + changelog = "https://github.com/pyudev/pyudev/blob/v${finalAttrs.version}/CHANGES.rst"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ frogamic ]; }; From 301417557e72630d5a95dac7651ca71c50457ba0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 21:39:53 +0000 Subject: [PATCH 117/130] code-cursor: 3.5.17 -> 3.6.21 --- pkgs/by-name/co/code-cursor/sources.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 5ce856190a1c..ee778a21ba1c 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,22 @@ { - "version": "3.5.17", + "version": "3.6.21", "vscodeVersion": "1.105.1", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/linux/x64/Cursor-3.5.17-x86_64.AppImage", - "hash": "sha256-hOo7SIITt8GnzChwPCmAXIyOJBhiSV+fQ3ovLFAT49c=" + "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/linux/x64/Cursor-3.6.21-x86_64.AppImage", + "hash": "sha256-6zIhSz5fxEMLA8zd6oZtwNDUMAW65bZu/fYMSV/Iuh0=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/linux/arm64/Cursor-3.5.17-aarch64.AppImage", - "hash": "sha256-sutJMIhZw45glApbzOrUXleIGkrYeC8lGarc7pckuTg=" + "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/linux/arm64/Cursor-3.6.21-aarch64.AppImage", + "hash": "sha256-5DxmpvFUqNybbHSRB6RlM9yVzFKHSoXIkEDygg0b/5A=" }, "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-0sJSQJyhu2RZhHaU/nr7/whKt31vFq6Tmxr9NOWlJ2g=" + "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/darwin/x64/Cursor-darwin-x64.dmg", + "hash": "sha256-CHxaG3gNgAJSBpTGJcqX4LhfpW7BJI44nEbphDvoTDo=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-7POR+9pveTdR9WYx0/OdgOhF8yTkiZwhzg0jKEfWrfs=" + "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-QproM1zUY3xpXKzzae+yAmb7yb5Os9zwJlvliwDKLc8=" } } } From be0d72f58a2281032394f66f08e51152dfe8b36d Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Fri, 22 May 2026 15:19:12 +0300 Subject: [PATCH 118/130] python3Packages.pygdbmi: migrate to pyproject --- pkgs/development/python-modules/pygdbmi/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index b2ec99d38e46..b9d8b4fe4eeb 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -5,12 +5,13 @@ fetchFromGitHub, gdb, pytest, + setuptools, }: buildPythonPackage rec { pname = "pygdbmi"; version = "0.11.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "cs01"; @@ -19,6 +20,8 @@ buildPythonPackage rec { hash = "sha256-JqEDN8Pg/JttyYQbwkxKkLYuxVnvV45VlClD23eaYyc="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ gdb pytest @@ -27,7 +30,7 @@ buildPythonPackage rec { # tests require gcc for some reason doCheck = !stdenv.hostPlatform.isDarwin; - postPatch = '' + preCheck = '' # tries to execute flake8, # which is likely to break on flake8 updates echo "def main(): return 0" > tests/static_tests.py From f236a15562c0d74f231a6056496e510502f8c220 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 30 May 2026 23:45:14 +0200 Subject: [PATCH 119/130] python3Packages.pygdbmi: use finalAttrs --- pkgs/development/python-modules/pygdbmi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index b9d8b4fe4eeb..25c7ac21385a 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pygdbmi"; version = "0.11.0.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cs01"; repo = "pygdbmi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JqEDN8Pg/JttyYQbwkxKkLYuxVnvV45VlClD23eaYyc="; }; @@ -42,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.mic92 ]; }; -} +}) From 29bbe141ea781efacad7218b7c2a0f1158e8eaa2 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 30 May 2026 23:46:19 +0200 Subject: [PATCH 120/130] python3Packages.pygdbmi: add changelog --- pkgs/development/python-modules/pygdbmi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index 25c7ac21385a..4796bd67d042 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -39,6 +39,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Parse gdb machine interface output with Python"; homepage = "https://github.com/cs01/pygdbmi"; + changelog = "https://github.com/cs01/pygdbmi/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mic92 ]; }; From 225ea2200141b16682c0fa037cce2ab0771e255b Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Fri, 22 May 2026 15:09:22 +0300 Subject: [PATCH 121/130] python3Packages.btrfs: modernize and migrate to pyproject --- pkgs/development/python-modules/btrfs/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index 4715b96c9d06..88bbf17fdbfe 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: buildPythonPackage rec { pname = "btrfs"; version = "15"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-FBmRT/FB3+nhb9BHfZVI1L6nM+zXdYjoy3JVzhetoQs="; }; - # no tests (in v12) + build-system = [ setuptools ]; + + # currently no tests doCheck = false; + pythonImportsCheck = [ "btrfs" ]; meta = { From 2f6430f540bb5dd061cc19a626d5e296373301d2 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 30 May 2026 23:51:14 +0200 Subject: [PATCH 122/130] python3Packages.btrfs: use finalAttrs --- pkgs/development/python-modules/btrfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index 88bbf17fdbfe..43e78700ea3f 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "btrfs"; version = "15"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FBmRT/FB3+nhb9BHfZVI1L6nM+zXdYjoy3JVzhetoQs="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { Luflosi ]; }; -} +}) From 198716e4f5b28e1a3149ffbe6043ee6f26556ac2 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 30 May 2026 23:51:33 +0200 Subject: [PATCH 123/130] python3Packges.btrfs: add changelog --- pkgs/development/python-modules/btrfs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index 43e78700ea3f..b2d758528cc1 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -25,6 +25,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Inspect btrfs filesystems"; homepage = "https://github.com/knorrie/python-btrfs"; + changelog = "https://github.com/knorrie/python-btrfs/blob/v${finalAttrs.version}/CHANGES"; license = lib.licenses.lgpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ From 2cac51127be84086162c49bd1994571925a9b51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Feb 2026 20:41:32 -0800 Subject: [PATCH 124/130] python3Packages.icalendar: 6.3.2 -> 7.1.2 Diff: https://github.com/collective/icalendar/compare/v6.3.2...v7.1.2 Changelog: https://github.com/collective/icalendar/blob/v7.1.2/CHANGES.rst --- .../python-modules/icalendar/default.nix | 19 ++----------------- .../icalendar/no-dynamic-version.patch | 10 ++++------ 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index c6523be27e13..418342da74c9 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -9,25 +9,18 @@ tzdata, hypothesis, pytestCheckHook, - sphinxHook, - sphinx-copybutton, - pydata-sphinx-theme, }: buildPythonPackage rec { - version = "6.3.2"; + version = "7.1.2"; pname = "icalendar"; pyproject = true; - outputs = [ - "out" - "doc" - ]; src = fetchFromGitHub { owner = "collective"; repo = "icalendar"; tag = "v${version}"; - hash = "sha256-EnG6zPaKKTgLw2DxWOyBkxlFuqtURpBlxy1aoZjX/TQ="; + hash = "sha256-y6t27/l2jnNr6/VlGuXlE2BcNDPOd0wscyCMpRY4+MM="; }; patches = [ @@ -46,12 +39,6 @@ buildPythonPackage rec { tzdata ]; - nativeBuildInputs = [ - sphinxHook - sphinx-copybutton - pydata-sphinx-theme - ]; - nativeCheckInputs = [ hypothesis pytestCheckHook @@ -61,8 +48,6 @@ buildPythonPackage rec { # AssertionError: assert {'Atlantic/Jan_Mayen'} == {'Arctic/Longyearbyen'} "test_dateutil_timezone_is_matched_with_tzname" "test_docstring_of_python_file" - # AssertionError: assert $TZ not in set() - "test_add_missing_timezones_to_example" ]; enabledTestPaths = [ "src/icalendar" ]; diff --git a/pkgs/development/python-modules/icalendar/no-dynamic-version.patch b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch index 4754b6441a5f..0703c6126cbc 100644 --- a/pkgs/development/python-modules/icalendar/no-dynamic-version.patch +++ b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch @@ -1,17 +1,15 @@ diff --git a/pyproject.toml b/pyproject.toml -index 9730e46..9834686 100644 +index 50aa183b..3a190385 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -34,11 +34,7 @@ maintainers = [ - { name="Christian Geier" }, +@@ -36,9 +36,7 @@ maintainers = [ { name="Jaca", email="vitouejj@gmail.com" }, ] --# These attributes are dynamically generated by hatch-vcs + # These attributes are dynamically generated by hatch-vcs -dynamic = [ -- "urls", - "version" -] +version = "@version@" - description = "iCalendar parser/generator" + description = "RFC 5545 compatible parser and generator of iCalendar files" readme = { file = "README.rst", content-type = "text/x-rst" } From ad72ca16531a1ba0aef89934283d7b2ba14e3a6e Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 31 May 2026 00:09:40 +0200 Subject: [PATCH 125/130] woodpecker-pipeline-transform: 0.3.0 -> 1.0.0 --- pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix b/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix index 674dcc547a1b..49c5d473eceb 100644 --- a/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix +++ b/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix @@ -5,16 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "woodpecker-pipeline-transform"; - version = "0.3.0"; + version = "1.0.0"; src = fetchFromCodeberg { owner = "lafriks"; repo = "woodpecker-pipeline-transform"; rev = "v${finalAttrs.version}"; - hash = "sha256-5bdNtVjk7TBoS0Z026th674ZXCRRc3DbtVOLl+acKhQ="; + hash = "sha256-UXQ+b3SI+MO0T993hslQaRVMdHdPt9RnjyhfmLtooAU="; }; - vendorHash = "sha256-4JRSrkxH8/NlSwUk6KagC5+mx+UXSLvo1thSRciAewc="; + vendorHash = "sha256-NE4KUbYA19YJPQW9quSYgm0exj3lToj9Zkiv05TgyOI="; meta = { description = "Utility to convert different pipelines to Woodpecker CI pipelines"; From 41665e33ee4fed14bef2435870ab74c0e1ca013a Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Fri, 22 May 2026 15:13:54 +0300 Subject: [PATCH 126/130] python3Packages.libarchive-c: migrate to pyproject --- pkgs/development/python-modules/libarchive-c/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 964032a0981a..c2999ad6385a 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -8,12 +8,13 @@ glibcLocales, mock, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "libarchive-c"; version = "5.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Changaco"; @@ -37,6 +38,8 @@ buildPythonPackage rec { "find_library('archive')" "'${libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; + build-system = [ setuptools ]; + pythonImportsCheck = [ "libarchive" ]; nativeCheckInputs = [ From cecae0fe8dfdb77ed46d1046c8101a737818ce6f Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 31 May 2026 00:12:53 +0200 Subject: [PATCH 127/130] python3Packages.libarchive-c: use finalAttrs --- .../python-modules/libarchive-c/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index c2999ad6385a..243b7b086786 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -11,16 +11,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libarchive-c"; version = "5.3"; pyproject = true; src = fetchFromGitHub { owner = "Changaco"; - repo = "python-${pname}"; - tag = version; - sha256 = "sha256-JqXTV1aD3k88OlW+8rT3xsDuW34+1xErG7hkupvL7Uo="; + repo = "python-libarchive-c"; + tag = finalAttrs.version; + hash = "sha256-JqXTV1aD3k88OlW+8rT3xsDuW34+1xErG7hkupvL7Uo="; }; patches = [ @@ -53,4 +53,4 @@ buildPythonPackage rec { description = "Python interface to libarchive"; license = lib.licenses.cc0; }; -} +}) From 1d220d35d8e3cd0c5fcad2cf3fe04b970b39b406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 30 May 2026 15:25:55 -0700 Subject: [PATCH 128/130] python3Packages.icalendar-compatibility: skip test failing with icalendar v7 --- .../python-modules/icalendar-compatibility/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/icalendar-compatibility/default.nix b/pkgs/development/python-modules/icalendar-compatibility/default.nix index b5969bcca32b..0bd535a1d91f 100644 --- a/pkgs/development/python-modules/icalendar-compatibility/default.nix +++ b/pkgs/development/python-modules/icalendar-compatibility/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { git ]; + disabledTests = [ + # https://github.com/niccokunzmann/icalendar_compatibility/issues/5 + "test_geo_location_is_also_escaped" + ]; + pythonImportsCheck = [ "icalendar_compatibility" ]; # env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From 278c713e17aef5af422f8dfb42036d9b8aacc878 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 22:54:30 +0000 Subject: [PATCH 129/130] n64recomp: 0-unstable-2026-05-17 -> 0-unstable-2026-05-27 --- pkgs/by-name/n6/n64recomp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/n6/n64recomp/package.nix b/pkgs/by-name/n6/n64recomp/package.nix index 73f99962aa96..f8f8a39cbf1c 100644 --- a/pkgs/by-name/n6/n64recomp/package.nix +++ b/pkgs/by-name/n6/n64recomp/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "n64recomp"; - version = "0-unstable-2026-05-17"; + version = "0-unstable-2026-05-27"; src = fetchFromGitHub { owner = "N64Recomp"; repo = "N64Recomp"; - rev = "70a894aad8d3491ca0fccee1f94dae8190845686"; - hash = "sha256-4y1Cb2lmVZi+IoIBY9AZuWa+XPoBejdd1rL/uTjM07E="; + rev = "ffb39cdad1da5de07eaaa48bd1db4a89a7986771"; + hash = "sha256-/MmRvLWxh/uaFXp0eiNdrnMKrrYQvjxmw/+/o5lXyFU="; fetchSubmodules = true; }; From 12d5b3fca210c7ef8b1a37084fcaa1f9b82b2332 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 31 May 2026 00:59:22 +0200 Subject: [PATCH 130/130] flint: add wegank as maintainer --- pkgs/by-name/fl/flint/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fl/flint/package.nix b/pkgs/by-name/fl/flint/package.nix index 2f26e91bd5a4..27d9b48f0940 100644 --- a/pkgs/by-name/fl/flint/package.nix +++ b/pkgs/by-name/fl/flint/package.nix @@ -88,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Fast Library for Number Theory"; license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.smasher164 ]; + maintainers = [ + lib.maintainers.smasher164 + lib.maintainers.wegank + ]; teams = [ lib.teams.sage ]; platforms = lib.platforms.all; homepage = "https://www.flintlib.org/";