From 0a8b014f67f1d42a7153179097e61f78ae54f630 Mon Sep 17 00:00:00 2001
From: phaer <hello@phaer.org>
Date: Fri, 25 Apr 2025 21:46:15 +0200
Subject: [PATCH 01/66] image/file-options: use defaultText

---
 nixos/modules/image/file-options.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/image/file-options.nix b/nixos/modules/image/file-options.nix
index dff30e7408af..4a6b377111a0 100644
--- a/nixos/modules/image/file-options.nix
+++ b/nixos/modules/image/file-options.nix
@@ -9,6 +9,7 @@
     baseName = lib.mkOption {
       type = lib.types.str;
       default = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
+      defaultText = lib.literalExpression "nixos-image-\${config.system.nixos.label}-\${pkgs.stdenv.hostPlatform.system}";
       description = ''
         Basename of the image filename without any extension (e.g. `image_1`).
       '';
@@ -29,6 +30,7 @@
     fileName = lib.mkOption {
       type = lib.types.str;
       default = "${config.image.baseName}.${config.image.extension}";
+      defaultText = lib.literalExpression "\${config.image.baseName}.\${config.image.extension}";
       description = ''
         Filename of the image including all extensions (e.g `image_1.raw` or
         `image_1.raw.zst`).
@@ -38,6 +40,7 @@
     filePath = lib.mkOption {
       type = lib.types.str;
       default = config.image.fileName;
+      defaultText = lib.literalExpression "config.image.fileName";
       description = ''
         Path of the image, relative to `$out` in `system.build.image`.
         While it defaults to `config.image.fileName`, it can be different for builders where

From 1df1c8828d2866c3ac8556c8ec1ca6bcbbfc3a1b Mon Sep 17 00:00:00 2001
From: phaer <hello@phaer.org>
Date: Fri, 25 Apr 2025 21:28:01 +0200
Subject: [PATCH 02/66] image/repart: run nixfmt

---
 nixos/modules/image/repart.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix
index db026870d4fc..d8acf89a8c7c 100644
--- a/nixos/modules/image/repart.nix
+++ b/nixos/modules/image/repart.nix
@@ -95,7 +95,7 @@ in
     name = lib.mkOption {
       type = lib.types.str;
       description = ''
-        Name of the image.
+          Name of the image.
 
         If this option is unset but config.system.image.id is set,
         config.system.image.id is used as the default value.
@@ -152,7 +152,7 @@ in
       # Generated with `uuidgen`. Random but fixed to improve reproducibility.
       default = "0867da16-f251-457d-a9e8-c31f9a3c220b";
       description = ''
-        A UUID to use as a seed. You can set this to `null` to explicitly
+          A UUID to use as a seed. You can set this to `null` to explicitly
         randomize the partition UUIDs.
       '';
     };
@@ -161,7 +161,7 @@ in
       type = lib.types.bool;
       default = false;
       description = ''
-        Enables generation of split artifacts from partitions. If enabled, for
+          Enables generation of split artifacts from partitions. If enabled, for
         each partition with SplitName= set, a separate output file containing
         just the contents of that partition is generated.
       '';
@@ -172,7 +172,7 @@ in
       default = 512;
       example = lib.literalExpression "4096";
       description = ''
-        The sector size of the disk image produced by systemd-repart. This
+          The sector size of the disk image produced by systemd-repart. This
         value must be a power of 2 between 512 and 4096.
       '';
     };
@@ -191,7 +191,7 @@ in
       type = with lib.types; attrsOf (submodule partitionOptions);
       default = { };
       example = lib.literalExpression ''
-        {
+          {
           "10-esp" = {
             contents = {
               "/EFI/BOOT/BOOTX64.EFI".source =
@@ -213,7 +213,7 @@ in
         };
       '';
       description = ''
-        Specify partitions as a set of the names of the partitions with their
+          Specify partitions as a set of the names of the partitions with their
         configuration as the key.
       '';
     };
@@ -222,12 +222,12 @@ in
       type = with lib.types; attrsOf (listOf str);
       default = { };
       example = lib.literalExpression ''
-        {
+          {
           vfat = [ "-S 512" "-c" ];
         }
       '';
       description = ''
-        Specify extra options for created file systems. The specified options
+          Specify extra options for created file systems. The specified options
         are converted to individual environment variables of the format
         `SYSTEMD_REPART_MKFS_OPTIONS_<FSTYPE>`.
 

From 9e6e5152ba5099f6694ddd412ea9e1c21efb2d4d Mon Sep 17 00:00:00 2001
From: phaer <hello@phaer.org>
Date: Fri, 25 Apr 2025 21:45:59 +0200
Subject: [PATCH 03/66] image/repart: repart.imageFile(BaseName) ->
 image.baseName, etc

Replace image-specific options for file name (and basename) with
unified options for basename and extension in order to increase
compatibility with nixos-rebuild build-image
---
 nixos/modules/image/repart.nix | 59 +++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix
index d8acf89a8c7c..891bfeb30449 100644
--- a/nixos/modules/image/repart.nix
+++ b/nixos/modules/image/repart.nix
@@ -88,6 +88,31 @@ in
 {
   imports = [
     ./repart-verity-store.nix
+    ./file-options.nix
+    (lib.mkRenamedOptionModuleWith {
+      sinceRelease = 2411;
+      from = [
+        "image"
+        "repart"
+        "imageFileBasename"
+      ];
+      to = [
+        "image"
+        "baseName"
+      ];
+    })
+    (lib.mkRenamedOptionModuleWith {
+      sinceRelease = 2411;
+      from = [
+        "image"
+        "repart"
+        "imageFile"
+      ];
+      to = [
+        "image"
+        "fileName"
+      ];
+    })
   ];
 
   options.image.repart = {
@@ -109,23 +134,6 @@ in
       description = "Version of the image";
     };
 
-    imageFileBasename = lib.mkOption {
-      type = lib.types.str;
-      readOnly = true;
-      description = ''
-        Basename of the image filename without any extension (e.g. `image_1`).
-      '';
-    };
-
-    imageFile = lib.mkOption {
-      type = lib.types.str;
-      readOnly = true;
-      description = ''
-        Filename of the image including all extensions (e.g `image_1.raw` or
-        `image_1.raw.zst`).
-      '';
-    };
-
     compression = {
       enable = lib.mkEnableOption "Image compression";
 
@@ -253,7 +261,6 @@ in
   };
 
   config = {
-
     assertions = lib.mapAttrsToList (
       fileName: partitionConfig:
       let
@@ -295,10 +302,14 @@ in
       ) cfg.partitions
     );
 
-    image.repart =
+    image.baseName =
       let
         version = config.image.repart.version;
         versionInfix = if version != null then "_${version}" else "";
+      in
+      cfg.name + versionInfix;
+    image.extension =
+      let
         compressionSuffix =
           lib.optionalString cfg.compression.enable
             {
@@ -308,6 +319,11 @@ in
             }
             ."${cfg.compression.algorithm}";
 
+      in
+      "raw" + compressionSuffix;
+
+    image.repart =
+      let
         makeClosure = paths: pkgs.closureInfo { rootPaths = paths; };
 
         # Add the closure of the provided Nix store paths to cfg.partitions so
@@ -321,9 +337,6 @@ in
       in
       {
         name = lib.mkIf (config.system.image.id != null) (lib.mkOptionDefault config.system.image.id);
-        imageFileBasename = cfg.name + versionInfix;
-        imageFile = cfg.imageFileBasename + ".raw" + compressionSuffix;
-
         compression = {
           # Generally default to slightly faster than default compression
           # levels under the assumption that most of the building will be done
@@ -357,10 +370,10 @@ in
       in
       pkgs.callPackage ./repart-image.nix {
         systemd = cfg.package;
+        imageFileBasename = config.image.baseName;
         inherit (cfg)
           name
           version
-          imageFileBasename
           compression
           split
           seed

From a49872dd4cb781cf01a53496421680c09374190f Mon Sep 17 00:00:00 2001
From: Dominik Gleich <dominikgleich@gmail.com>
Date: Sat, 3 May 2025 01:37:23 +0200
Subject: [PATCH 04/66] openrazer-daemon: Add missing dependency

---
 pkgs/development/python-modules/openrazer/daemon.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix
index a6a089bd2845..92d240f46a63 100644
--- a/pkgs/development/python-modules/openrazer/daemon.nix
+++ b/pkgs/development/python-modules/openrazer/daemon.nix
@@ -13,6 +13,7 @@
   wrapGAppsNoGuiHook,
   notify2,
   glib,
+  libnotify,
 }:
 
 let
@@ -56,6 +57,7 @@ buildPythonPackage (
       pyudev
       setproctitle
       notify2
+      libnotify
     ];
 
     postInstall = ''

From c14bdb2352f01e83bd868a9630e6846ab28c5be8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 3 May 2025 13:28:56 +0200
Subject: [PATCH 05/66] python312Packages.sqlframe: 3.31.2 -> 3.31.3

Diff: https://github.com/eakmanrq/sqlframe/compare/refs/tags/v3.31.2...refs/tags/v3.31.3

Changelog: https://github.com/eakmanrq/sqlframe/releases/tag/v3.31.3
---
 pkgs/development/python-modules/sqlframe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlframe/default.nix b/pkgs/development/python-modules/sqlframe/default.nix
index b09674bbe8ac..84885a2767cc 100644
--- a/pkgs/development/python-modules/sqlframe/default.nix
+++ b/pkgs/development/python-modules/sqlframe/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "sqlframe";
-  version = "3.31.2";
+  version = "3.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eakmanrq";
     repo = "sqlframe";
     tag = "v${version}";
-    hash = "sha256-X7KZSbq9KKUE4lXZIHj++koJmjWYI1sMhA6LfClr9pU=";
+    hash = "sha256-x9ILbtl71Xp4p5OWQ/goays5W6uE17FCes7ZVfWZBwY=";
   };
 
   build-system = [

From 9ac74b8f6a7fe6a0c3306fee615f8c9e2a6b6890 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Thu, 24 Apr 2025 13:29:25 -0300
Subject: [PATCH 06/66] kcl-language-server: init 0.11.2

https://github.com/kcl-lang/kcl/releases/tag/v0.11.2

Co-authored-by: aldoborrero
---
 .../kc/kcl-language-server/package.nix        | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/kc/kcl-language-server/package.nix

diff --git a/pkgs/by-name/kc/kcl-language-server/package.nix b/pkgs/by-name/kc/kcl-language-server/package.nix
new file mode 100644
index 000000000000..22108ca4195e
--- /dev/null
+++ b/pkgs/by-name/kc/kcl-language-server/package.nix
@@ -0,0 +1,53 @@
+{
+  fetchFromGitHub,
+  kcl,
+  lib,
+  pkg-config,
+  protobuf,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "kcl-language-server";
+  version = "0.11.2";
+
+  src = fetchFromGitHub {
+    owner = "kcl-lang";
+    repo = "kcl";
+    rev = "v${version}";
+    hash = "sha256-6XDLxTpgENhP7F51kicAJB7BNMtX4cONKJApAhqgdno=";
+  };
+
+  sourceRoot = "${src.name}/kclvm";
+
+  cargoHash = "sha256-eJ3Gh2l6T2DxJRQRHamPOr/ILtzsqFB497DdXVJ90RE=";
+
+  PROTOC = "${protobuf}/bin/protoc";
+  PROTOC_INCLUDE = "${protobuf}/include";
+
+  buildAndTestSubdir = "tools/src/LSP";
+
+  buildPhaseCargoFlags = [
+    "--profile"
+    "release"
+    "--offline"
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    protobuf
+  ];
+
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/kcl-lang/kcl/releases/tag/v${version}";
+    description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend";
+    downloadPage = "https://github.com/kcl-lang/kcl/tree/v${version}/kclvm/tools/src/LSP";
+    homepage = "https://www.kcl-lang.io/";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = kcl.meta.maintainers;
+    mainProgram = "kcl-language-server";
+  };
+}

From 45087aabe46e72d0497e410f1452de861c9f85b3 Mon Sep 17 00:00:00 2001
From: Valery Ivanov <ivalery111@gmail.com>
Date: Mon, 5 May 2025 08:56:28 +0300
Subject: [PATCH 07/66] maintainer-list: add ivalery111

Signed-off-by: Valery Ivanov <ivalery111@gmail.com>
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c5bdd834fd57..6fbc745a7c6a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10717,6 +10717,12 @@
     githubId = 49885246;
     keys = [ { fingerprint = "6358 EF87 86E0 EF2F 1628  103F BAB5 F165 1C71 C9C3"; } ];
   };
+  ivalery111 = {
+    name = "Valery";
+    email = "ivalery111@gmail.com";
+    github = "ivalery111";
+    githubId = 37245535;
+  };
   ivan = {
     email = "ivan@ludios.org";
     github = "ivan";

From 2c503c36992b46d392e39e29bd9c055df29f4842 Mon Sep 17 00:00:00 2001
From: Valery Ivanov <ivalery111@gmail.com>
Date: Mon, 5 May 2025 08:59:55 +0300
Subject: [PATCH 08/66] sobjectizer: init at 5.8.4

Signed-off-by: Valery Ivanov <ivalery111@gmail.com>
---
 pkgs/by-name/so/sobjectizer/package.nix | 60 +++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 pkgs/by-name/so/sobjectizer/package.nix

diff --git a/pkgs/by-name/so/sobjectizer/package.nix b/pkgs/by-name/so/sobjectizer/package.nix
new file mode 100644
index 000000000000..e46c47baafab
--- /dev/null
+++ b/pkgs/by-name/so/sobjectizer/package.nix
@@ -0,0 +1,60 @@
+{
+  pkgs,
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  withStatic ? stdenv.hostPlatform.isStatic,
+  withShared ? !withStatic,
+  buildExamples ? false,
+}:
+
+# Ensure build examples with static library.
+assert buildExamples -> withStatic;
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sobjectizer";
+  version = "5.8.4";
+
+  src = fetchFromGitHub {
+    owner = "Stiffstream";
+    repo = "sobjectizer";
+    tag = "v.${finalAttrs.version}";
+    hash = "sha256-tIqWgd6TppHfqZk3XHzhG0t+Nn8BQCTP81UD7ls67UE=";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "tests-do-not-require-static-library.patch";
+      url = "https://github.com/Stiffstream/sobjectizer/commit/10eb34c65ccdaa4fea62d0c4354b83104256370d.patch";
+      hash = "sha256-a2g6jDGDC/y8cmbAD0KtVQKhVS5ZAjKtMhbAUyoQIvg=";
+    })
+  ];
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeDir = "../dev";
+
+  cmakeFlags = [
+    (lib.cmakeBool "SOBJECTIZER_BUILD_STATIC" withStatic)
+    (lib.cmakeBool "SOBJECTIZER_BUILD_SHARED" withShared)
+    (lib.cmakeBool "BUILD_EXAMPLES" (buildExamples && withStatic))
+    (lib.cmakeBool "BUILD_TESTS" (finalAttrs.doCheck && withShared))
+  ];
+
+  # The tests require the shared library thanks to the patch.
+  doCheck = withShared;
+
+  # Receive semi-automated updates.
+  passthru.updateScript = pkgs.nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/Stiffstream/sobjectizer/tree/master";
+    changelog = "https://github.com/Stiffstream/sobjectizer/releases/tag/v.${finalAttrs.version}";
+    description = "Implementation of Actor, Publish-Subscribe, and CSP models in one rather small C++ framework";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.ivalery111 ];
+    platforms = lib.platforms.all;
+  };
+})

From f9e97cc9beb5fc1ec80684705979f5fb9d612eea Mon Sep 17 00:00:00 2001
From: supinie <86788874+supinie@users.noreply.github.com>
Date: Tue, 6 May 2025 10:20:29 +0100
Subject: [PATCH 09/66] servo: aarch64 use system allocator

specifies component for feature
---
 pkgs/by-name/se/servo/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index a22a0bf5ae54..667369b201d3 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -132,6 +132,11 @@ rustPlatform.buildRustPackage {
       apple-sdk_14
     ];
 
+  # Builds with additional features for aarch64, see https://github.com/servo/servo/issues/36819
+  buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [
+    "servo_allocator/use-system-allocator"
+  ];
+
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";
 
   # copy resources into `$out` to be used during runtime

From 0e2662ccb92b82b1e4193757ea0dd6253b21c2ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 06:45:06 +0000
Subject: [PATCH 10/66] zabbix-agent2-plugin-postgresql: 7.2.5 -> 7.2.6

---
 pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
index 6dd39d334b27..3247710fa10a 100644
--- a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
+++ b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
@@ -6,11 +6,11 @@
 
 buildGoModule rec {
   pname = "zabbix-agent2-plugin-postgresql";
-  version = "7.2.5";
+  version = "7.2.6";
 
   src = fetchurl {
     url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz";
-    hash = "sha256-FJf7rjghYe0paIzjzdkiummzPcBFaH7fcfTJ+pTSZUE=";
+    hash = "sha256-ZDSz+zCH9nHbcRYG1GR+TH+S7VV4nI1HSomNL3Un0/A=";
   };
 
   vendorHash = null;

From 8c4ec38841e7760cfe01a16b9b478bc0e8ce8cd2 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Tue, 6 May 2025 22:13:43 +0200
Subject: [PATCH 11/66] netdata: 2.4.0 -> 2.5.1

---
 nixos/tests/netdata.nix               |  8 ++++----
 pkgs/tools/system/netdata/default.nix | 18 ++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix
index 97a033f831a1..77c34e70e7d0 100644
--- a/nixos/tests/netdata.nix
+++ b/nixos/tests/netdata.nix
@@ -33,12 +33,12 @@ import ./make-test-python.nix (
     };
 
     testScript = ''
-        start_all()
+      start_all()
 
-        netdata.wait_for_unit("netdata.service")
+      netdata.wait_for_unit("netdata.service")
 
-        # wait for the service to listen before sending a request
-        netdata.wait_for_open_port(19999)
+      # wait for the service to listen before sending a request
+      netdata.wait_for_open_port(19999)
 
       # check if the netdata main page loads.
       netdata.succeed("curl --fail http://127.0.0.1:19999")
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index dc2f5a516949..1c298715b44a 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -44,7 +44,7 @@
   withConnPrometheus ? false,
   withConnPubSub ? false,
   withCups ? false,
-  withDBengine ? false,
+  withDBengine ? true,
   withDebug ? false,
   withEbpf ? false,
   withIpmi ? (stdenv.hostPlatform.isLinux),
@@ -57,14 +57,14 @@
   withML ? true,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  version = "2.4.0";
+  version = "2.5.1";
   pname = "netdata";
 
   src = fetchFromGitHub {
     owner = "netdata";
     repo = "netdata";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-egHsWmhnrl8D59gr7uD5hBnleCOI8gVEBGwdO5GSnOg=";
+    hash = "sha256-77k93mg7iED53k38jATbS2Y1N0eLKhjo0RYyinApkuE=";
     fetchSubmodules = true;
   };
 
@@ -133,10 +133,10 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional withCloudUi (
       replaceVars ./dashboard-v3-add.patch {
         # FIXME web.archive.org link can be replace once https://github.com/netdata/netdata-cloud/issues/1081 resolved
-        # last update 03/16/2025 23:56:24
+        # last update 04/01/2025 04:45:14
         dashboardTarball = fetchurl {
-          url = "https://web.archive.org/web/20250316235624/https://app.netdata.cloud/agent.tar.gz";
-          hash = "sha256-Vtw+CbBgqGRenkis0ZR2/TLsoM83NjNA6mbndb95EK8=";
+          url = "https://web.archive.org/web/20250401044514/https://app.netdata.cloud/agent.tar.gz";
+          hash = "sha256-NtmM1I3VrvFErMoBl+w63Nt0DzOOsaB98cxE/axm8mE=";
         };
       }
     );
@@ -220,9 +220,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     "-DWEB_DIR=share/netdata/web"
     (lib.cmakeBool "ENABLE_DASHBOARD" withCloudUi)
-    # FIXME uncomment when https://github.com/netdata/netdata/issues/19901#issuecomment-2819701451 resolved
-    (lib.cmakeBool "ENABLE_DBENGINE" true)
-    # (lib.cmakeBool "ENABLE_DBENGINE" withDBengine)
+    (lib.cmakeBool "ENABLE_DBENGINE" withDBengine)
     (lib.cmakeBool "ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE" withConnPrometheus)
     (lib.cmakeBool "ENABLE_JEMALLOC" true)
     (lib.cmakeBool "ENABLE_LIBBACKTRACE" withLibbacktrace)
@@ -260,7 +258,7 @@ stdenv.mkDerivation (finalAttrs: {
 
         sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d";
 
-        vendorHash = "sha256-PgQs3+++iD9Lg8psTBVzF4b+kGJzhV5yNQBkw/+Dqks=";
+        vendorHash = "sha256-N03IGTtF78PCo4kf0Sdtzv6f8z47ohg8g3YIXtINRjU=";
         doCheck = false;
         proxyVendor = true;
 

From c678c9cc55fcba36d1fff830a95ee088956386ac Mon Sep 17 00:00:00 2001
From: Katalin Rebhan <me@dblsaiko.net>
Date: Fri, 9 May 2025 00:38:47 +0200
Subject: [PATCH 12/66] maintainers: update dblsaiko

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 18664befdbbe..60e968fd8e35 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5739,7 +5739,7 @@
     email = "me@dblsaiko.net";
     github = "2xsaiko";
     githubId = 3987560;
-    name = "Marco Rebhan";
+    name = "Katalin Rebhan";
   };
   dbohdan = {
     email = "dbohdan@dbohdan.com";

From 5906e399d20b9884867b0458361ba450aa2360dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 23:32:21 +0000
Subject: [PATCH 13/66] python3Packages.coiled: 1.93.0 -> 1.95.0

---
 pkgs/development/python-modules/coiled/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix
index d2e0ff36effb..8b6ddd80424b 100644
--- a/pkgs/development/python-modules/coiled/default.nix
+++ b/pkgs/development/python-modules/coiled/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage rec {
   pname = "coiled";
-  version = "1.93.0";
+  version = "1.95.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3vniVOW4byF+J2dsnhNp2qvEPzeONbpZ760z9wIYDRA=";
+    hash = "sha256-+YmBKfiJYJVjpSrPGXlzMbQtweObLrLZr1c+aJ58fu4=";
   };
 
   build-system = [

From 38a360d64e2e922ff7022182c4c6b06797530f68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 06:31:16 +0000
Subject: [PATCH 14/66] aws-sso-cli: 1.17.0 -> 2.0.0

---
 pkgs/by-name/aw/aws-sso-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/aw/aws-sso-cli/package.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix
index 99412edca5e0..edbaed61c55f 100644
--- a/pkgs/by-name/aw/aws-sso-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sso-cli/package.nix
@@ -9,15 +9,15 @@
 }:
 buildGoModule rec {
   pname = "aws-sso-cli";
-  version = "1.17.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "synfinatic";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-VEI+vCNeNoFOE+2j/OUjRszXsUQP2E1iUdPUW9X3tHk=";
+    hash = "sha256-D6ytiuh335r1XHwX6riI5OkpA8C1Ta0EwD1yPwob2ms=";
   };
-  vendorHash = "sha256-a57RtK8PxwaRrSA6W6R//GacZ+pK8mBi4ZASS5NvShE=";
+  vendorHash = "sha256-SNMU7qDfLRGUSLjzrJHtIMgbcRc2DxXwWEUaUEY6PME=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 7a564cf0cd0efc816fa1a5579d3655948cd822a5 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Thu, 2 Jan 2025 20:50:29 +0100
Subject: [PATCH 15/66] nixos/networkd-dispatcher: use writeShellApplication to
 ease use

---
 .../networking/networkd-dispatcher.nix        | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix
index 99b56609a70f..eb874447bb3a 100644
--- a/nixos/modules/services/networking/networkd-dispatcher.nix
+++ b/nixos/modules/services/networking/networkd-dispatcher.nix
@@ -103,21 +103,29 @@ in
 
     services.networkd-dispatcher.extraArgs =
       let
-        scriptDir = pkgs.symlinkJoin {
-          name = "networkd-dispatcher-script-dir";
-          paths = lib.mapAttrsToList (
-            name: cfg:
-            (map (
-              state:
-              pkgs.writeTextFile {
-                inherit name;
-                text = cfg.script;
-                destination = "/${state}.d/${name}";
-                executable = true;
-              }
-            ) cfg.onState)
-          ) cfg.rules;
-        };
+        scriptDir = pkgs.runCommand "networkd-dispatcher-script-dir" { } (
+          ''
+            mkdir $out
+          ''
+          + (lib.concatStrings (
+            lib.mapAttrsToList (
+              name: cfg:
+              (lib.concatStrings (
+                map (state: ''
+                  mkdir -p $out/${state}.d
+                  ln -s ${
+                    lib.getExe (
+                      pkgs.writeShellApplication {
+                        inherit name;
+                        text = cfg.script;
+                      }
+                    )
+                  } $out/${state}.d/${name}
+                '') cfg.onState
+              ))
+            ) cfg.rules
+          ))
+        );
       in
       [
         "--verbose"

From 16c816d534ee5193bc7ddad85d4d7663cb361c82 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 11 May 2025 23:42:35 +0800
Subject: [PATCH 16/66] libchewing: 0.6.0 -> 0.9.1

---
 pkgs/by-name/li/libchewing/package.nix | 43 +++++++++++++++++++-------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix
index 65d60e19eaff..a7d80e3a8a08 100644
--- a/pkgs/by-name/li/libchewing/package.nix
+++ b/pkgs/by-name/li/libchewing/package.nix
@@ -4,31 +4,52 @@
   fetchFromGitHub,
   cmake,
   sqlite,
+  corrosion,
+  rustPlatform,
+  cargo,
+  rustc,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libchewing";
-  version = "0.6.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "chewing";
     repo = "libchewing";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-X+4Rr5Mfc4qeJxmHczu4MKgHBvQN1rhqUrJSx8SFnDk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5aeAsvTiUMTm+ibNfJI57rzSUpJB7luhA/aWmTcnBj4=";
   };
 
-  buildInputs = [ sqlite ];
+  # ld: unknown option: -version-script
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "if(CMAKE_C_COMPILER_ID MATCHES GNU|^Clang)" "if((CMAKE_C_COMPILER_ID MATCHES GNU|^Clang) AND NOT APPLE)"
+  '';
 
-  nativeBuildInputs = [ cmake ];
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src;
+    hash = "sha256-LTuUhQ0ZeyGloNvVs+6OGjFvPdBsQNZupwC8QTjUfyk=";
+  };
 
-  meta = with lib; {
+  nativeBuildInputs = [
+    cmake
+    rustPlatform.cargoSetupHook
+    cargo
+    rustc
+  ];
+
+  buildInputs = [
+    sqlite
+    corrosion
+  ];
+
+  meta = {
     description = "Intelligent Chinese phonetic input method";
     homepage = "https://chewing.im/";
-    license = licenses.lgpl21Only;
-    maintainers = with maintainers; [
-      ShamrockLee
-    ];
-    platforms = platforms.all;
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ ShamrockLee ];
+    platforms = lib.platforms.all;
     # compile time tools init_database, dump_database are built for host
     broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
   };

From 143898cad89f23fab3742de03330e120be2b678e Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Sun, 11 May 2025 15:52:09 +0000
Subject: [PATCH 17/66] cudaPackages: multiplex builder provides broken
 attributes rather than no attributes

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/cudnn/shims.nix |  3 +-
 .../generic-builders/multiplex.nix            | 40 ++++++++++++++-----
 .../cuda-modules/tensorrt/shims.nix           |  3 +-
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/cuda-modules/cudnn/shims.nix b/pkgs/development/cuda-modules/cudnn/shims.nix
index 9cb879b363bf..0a7f09bc9f0f 100644
--- a/pkgs/development/cuda-modules/cudnn/shims.nix
+++ b/pkgs/development/cuda-modules/cudnn/shims.nix
@@ -1,13 +1,12 @@
 # Shims to mimic the shape of ../modules/generic/manifests/{feature,redistrib}/release.nix
 {
-  lib,
   package,
   # redistArch :: String
   # String is "unsupported" if the given architecture is unsupported.
   redistArch,
 }:
 {
-  featureRelease = lib.optionalAttrs (redistArch != "unsupported") {
+  featureRelease = {
     inherit (package) minCudaVersion maxCudaVersion;
     ${redistArch}.outputs = {
       lib = true;
diff --git a/pkgs/development/cuda-modules/generic-builders/multiplex.nix b/pkgs/development/cuda-modules/generic-builders/multiplex.nix
index 3e2958449dc0..8d5c7c1e359d 100644
--- a/pkgs/development/cuda-modules/generic-builders/multiplex.nix
+++ b/pkgs/development/cuda-modules/generic-builders/multiplex.nix
@@ -52,12 +52,27 @@ let
     lib.versionAtLeast cudaMajorMinorVersion package.minCudaVersion
     && lib.versionAtLeast package.maxCudaVersion cudaMajorMinorVersion;
 
-  # Releases for our platform and CUDA version.
+  # Releases for our CUDA version.
+  # Collapses the releases into a single list of packages, filtering out packages for unsupported CUDA versions and
+  # augmenting those supporting the current CUDA version with the redistArch to which the package belongs.
   # See ../modules/${pname}/releases/releases.nix
-  # allPackages :: List Package
-  allPackages = lib.filter satisfiesCudaVersion (
-    evaluatedModules.config.${pname}.releases.${redistArch} or [ ]
-  );
+  # allPackages :: List (Package + { redistArch: String })
+  allPackages =
+    let
+      redistArchs = lib.attrNames evaluatedModules.config.${pname}.releases;
+    in
+    lib.concatMap (
+      redistArch:
+      let
+        packages = evaluatedModules.config.${pname}.releases.${redistArch};
+      in
+      lib.concatMap (
+        package: lib.optionals (satisfiesCudaVersion package) [ ({ inherit redistArch; } // package) ]
+      ) packages
+    ) redistArchs;
+
+  packageOlder = p1: p2: lib.versionOlder p1.version p2.version;
+  packageSupportedPlatform = p: p.redistArch == redistArch;
 
   # Compute versioned attribute name to be used in this package set
   # Patch version changes should not break the build, so we only use major and minor
@@ -77,8 +92,15 @@ let
         newestPackages
         // {
           ${majorMinorVersion} =
-            # Only keep the existing package if it is newer than the one we are considering.
-            if existingPackage != null && lib.versionOlder package.version existingPackage.version then
+            # Only keep the existing package if it is newer than the one we are considering or it is supported on the
+            # current platform and the one we are considering is not.
+            if
+              existingPackage != null
+              && (
+                packageOlder package existingPackage
+                || (!packageSupportedPlatform package && packageSupportedPlatform existingPackage)
+              )
+            then
               existingPackage
             else
               package;
@@ -87,9 +109,7 @@ let
     in
     # Sort the packages by version so the newest is first.
     # NOTE: builtins.sort requires a strict weak ordering, so we must use versionOlder rather than versionAtLeast.
-    lib.sort (p1: p2: lib.versionOlder p2.version p1.version) (
-      lib.attrValues newestForEachMajorMinorVersion
-    );
+    lib.sort (lib.flip packageOlder) (lib.attrValues newestForEachMajorMinorVersion);
 
   extension =
     final: _:
diff --git a/pkgs/development/cuda-modules/tensorrt/shims.nix b/pkgs/development/cuda-modules/tensorrt/shims.nix
index 7832f8e97c51..d347ef7e294c 100644
--- a/pkgs/development/cuda-modules/tensorrt/shims.nix
+++ b/pkgs/development/cuda-modules/tensorrt/shims.nix
@@ -1,13 +1,12 @@
 # Shims to mimic the shape of ../modules/generic/manifests/{feature,redistrib}/release.nix
 {
-  lib,
   package,
   # redistArch :: String
   # String is `"unsupported"` if the given architecture is unsupported.
   redistArch,
 }:
 {
-  featureRelease = lib.optionalAttrs (redistArch != "unsupported") {
+  featureRelease = {
     inherit (package) cudnnVersion minCudaVersion maxCudaVersion;
     ${redistArch}.outputs = {
       bin = true;

From 19d4f53b72f8526f1aa27712d40fdc77f2262839 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Sun, 11 May 2025 17:27:19 +0000
Subject: [PATCH 18/66] fixup! cudaPackages: multiplex builder provides broken
 attributes rather than no attributes

fixup! cudaPackages: simplify multiplex builder's allPackages

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../generic-builders/multiplex.nix            | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/cuda-modules/generic-builders/multiplex.nix b/pkgs/development/cuda-modules/generic-builders/multiplex.nix
index 8d5c7c1e359d..816a375e620f 100644
--- a/pkgs/development/cuda-modules/generic-builders/multiplex.nix
+++ b/pkgs/development/cuda-modules/generic-builders/multiplex.nix
@@ -52,24 +52,17 @@ let
     lib.versionAtLeast cudaMajorMinorVersion package.minCudaVersion
     && lib.versionAtLeast package.maxCudaVersion cudaMajorMinorVersion;
 
-  # Releases for our CUDA version.
-  # Collapses the releases into a single list of packages, filtering out packages for unsupported CUDA versions and
-  # augmenting those supporting the current CUDA version with the redistArch to which the package belongs.
-  # See ../modules/${pname}/releases/releases.nix
-  # allPackages :: List (Package + { redistArch: String })
-  allPackages =
-    let
-      redistArchs = lib.attrNames evaluatedModules.config.${pname}.releases;
-    in
-    lib.concatMap (
-      redistArch:
-      let
-        packages = evaluatedModules.config.${pname}.releases.${redistArch};
-      in
-      lib.concatMap (
-        package: lib.optionals (satisfiesCudaVersion package) [ ({ inherit redistArch; } // package) ]
-      ) packages
-    ) redistArchs;
+  # FIXME: do this at the module system level
+  propagatePlatforms = lib.mapAttrs (redistArch: lib.map (p: { inherit redistArch; } // p));
+
+  # Releases for all platforms and all CUDA versions.
+  allReleases = propagatePlatforms evaluatedModules.config.${pname}.releases;
+
+  # Releases for all platforms and our CUDA version.
+  allReleases' = lib.mapAttrs (_: lib.filter satisfiesCudaVersion) allReleases;
+
+  # Packages for all platforms and our CUDA versions.
+  allPackages = lib.concatLists (lib.attrValues allReleases');
 
   packageOlder = p1: p2: lib.versionOlder p1.version p2.version;
   packageSupportedPlatform = p: p.redistArch == redistArch;
@@ -109,6 +102,7 @@ let
     in
     # Sort the packages by version so the newest is first.
     # NOTE: builtins.sort requires a strict weak ordering, so we must use versionOlder rather than versionAtLeast.
+    # See https://github.com/NixOS/nixpkgs/commit/9fd753ea84e5035b357a275324e7fd7ccfb1fc77.
     lib.sort (lib.flip packageOlder) (lib.attrValues newestForEachMajorMinorVersion);
 
   extension =

From 0d8f50763e7199dea91dce478aa8422366de1f50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 19:22:12 +0000
Subject: [PATCH 19/66] mympd: 20.1.3 -> 21.0.0

---
 pkgs/by-name/my/mympd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix
index a6c8196d8f16..d04843e56c44 100644
--- a/pkgs/by-name/my/mympd/package.nix
+++ b/pkgs/by-name/my/mympd/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mympd";
-  version = "20.1.3";
+  version = "21.0.0";
 
   src = fetchFromGitHub {
     owner = "jcorporation";
     repo = "myMPD";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-CLhlGwr7W3GW8V+wqMXHfKbU2dmMWlgEmo4QohcPAwo=";
+    sha256 = "sha256-K86kOCJ9Fnf/ZvS11Tyf81mdKA9R5pgBz1XzDY4N/8E=";
   };
 
   nativeBuildInputs = [

From 910d2c2e41d450e1095398b8bb233056e7d6ee5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 19:50:06 +0000
Subject: [PATCH 20/66] python3Packages.jupyter-collaboration-ui: 2.0.1 ->
 2.0.2

---
 .../python-modules/jupyter-collaboration-ui/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix
index cdc6e1086c21..7c3b703a4d96 100644
--- a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix
+++ b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "jupyter-collaboration-ui";
-  version = "2.0.1";
+  version = "2.0.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "jupyter_collaboration_ui";
     inherit version;
-    hash = "sha256-9UONyyhvhpywCVNbGtZz9eL8EGUS4XBM1zEY1RWsomY=";
+    hash = "sha256-YaNUu0+g5DgcqfLUte7pwsEvwyKCmxBjiOgQmVl/H/o=";
   };
 
   postPatch = ''

From 456a4697b1bbafb6c85c0632ad1fca1d6aa0c24a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 11 May 2025 20:55:26 +0200
Subject: [PATCH 21/66] workflows/eval: load supportedSystems from JSON file

This is a refactor to prepare the next commit. It doesn't do much on its
own, but is separated for ease of review.
---
 .github/workflows/eval.yml             |  7 ++-----
 .github/workflows/get-merge-commit.yml | 10 +++++++++-
 ci/eval/README.md                      |  2 +-
 ci/eval/default.nix                    |  7 ++-----
 ci/supportedSystems.json               |  6 ++++++
 ci/supportedSystems.nix                |  6 ------
 pkgs/top-level/release-haskell.nix     |  2 +-
 pkgs/top-level/release-outpaths.nix    |  2 +-
 pkgs/top-level/release.nix             |  2 +-
 9 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 ci/supportedSystems.json
 delete mode 100644 ci/supportedSystems.nix

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 8cc523d1bef3..95130ec85d6b 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -26,7 +26,6 @@ jobs:
     if: needs.get-merge-commit.outputs.mergedSha
     outputs:
       targetSha: ${{ steps.targetSha.outputs.targetSha }}
-      systems: ${{ steps.systems.outputs.systems }}
     steps:
       - name: Check out the PR at the test merge commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -47,11 +46,9 @@ jobs:
         with:
           extra_nix_config: sandbox = true
 
-      - name: Evaluate the list of all attributes and get the systems matrix
-        id: systems
+      - name: Evaluate the list of all attributes
         run: |
           nix-build nixpkgs/ci -A eval.attrpathsSuperset
-          echo "systems=$(<result/systems.json)" >> "$GITHUB_OUTPUT"
 
       - name: Upload the list of all attributes
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -66,7 +63,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        system: ${{ fromJSON(needs.attrs.outputs.systems) }}
+        system: ${{ fromJSON(needs.get-merge-commit.outputs.systems) }}
     steps:
       - name: Enable swap
         run: |
diff --git a/.github/workflows/get-merge-commit.yml b/.github/workflows/get-merge-commit.yml
index cb38438cae3b..7ce1d53b0249 100644
--- a/.github/workflows/get-merge-commit.yml
+++ b/.github/workflows/get-merge-commit.yml
@@ -6,6 +6,9 @@ on:
       mergedSha:
         description: "The merge commit SHA"
         value: ${{ jobs.resolve-merge-commit.outputs.mergedSha }}
+      systems:
+        description: "The supported systems"
+        value: ${{ jobs.resolve-merge-commit.outputs.systems }}
 
 permissions: {}
 
@@ -14,6 +17,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     outputs:
       mergedSha: ${{ steps.merged.outputs.mergedSha }}
+      systems: ${{ steps.systems.outputs.systems }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -40,4 +44,8 @@ jobs:
               fi
               ;;
           esac
-          rm -rf base
+
+      - name: Load supported systems
+        id: systems
+        run: |
+          echo "systems=$(jq -c <base/ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
diff --git a/ci/eval/README.md b/ci/eval/README.md
index 0436a028ed69..011f3dd74ed0 100644
--- a/ci/eval/README.md
+++ b/ci/eval/README.md
@@ -11,7 +11,7 @@ nix-build ci -A eval.full \
   --arg evalSystems '["x86_64-linux" "aarch64-darwin"]'
 ```
 
-- `--max-jobs`: The maximum number of derivations to run at the same time. Only each [supported system](../supportedSystems.nix) gets a separate derivation, so it doesn't make sense to set this higher than that number.
+- `--max-jobs`: The maximum number of derivations to run at the same time. Only each [supported system](../supportedSystems.json) gets a separate derivation, so it doesn't make sense to set this higher than that number.
 - `--cores`: The number of cores to use for each job. Recommended to set this to the amount of cores on your system divided by `--max-jobs`.
 - `chunkSize`: The number of attributes that are evaluated simultaneously on a single core. Lowering this decreases memory usage at the cost of increased evaluation time. If this is too high, there won't be enough chunks to process them in parallel, and will also increase evaluation time.
 - `evalSystems`: The set of systems for which `nixpkgs` should be evaluated. Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 639e75ec4211..99445e953183 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -26,14 +26,14 @@ let
           "nixos"
           "pkgs"
           ".version"
-          "ci/supportedSystems.nix"
+          "ci/supportedSystems.json"
         ]
       );
     };
 
   nix = nixVersions.nix_2_24;
 
-  supportedSystems = import ../supportedSystems.nix;
+  supportedSystems = builtins.fromJSON (builtins.readFile ../supportedSystems.json);
 
   attrpathsSuperset =
     runCommand "attrpaths-superset.json"
@@ -43,8 +43,6 @@ let
           nix
           time
         ];
-        env.supportedSystems = builtins.toJSON supportedSystems;
-        passAsFile = [ "supportedSystems" ];
       }
       ''
         export NIX_STATE_DIR=$(mktemp -d)
@@ -58,7 +56,6 @@ let
             --option restrict-eval true \
             --option allow-import-from-derivation false \
             --arg enableWarnings false > $out/paths.json
-        mv "$supportedSystemsPath" $out/systems.json
       '';
 
   singleSystem =
diff --git a/ci/supportedSystems.json b/ci/supportedSystems.json
new file mode 100644
index 000000000000..44c18f1abf0e
--- /dev/null
+++ b/ci/supportedSystems.json
@@ -0,0 +1,6 @@
+[
+  "aarch64-linux",
+  "aarch64-darwin",
+  "x86_64-linux",
+  "x86_64-darwin"
+]
diff --git a/ci/supportedSystems.nix b/ci/supportedSystems.nix
deleted file mode 100644
index 471f84b92fc2..000000000000
--- a/ci/supportedSystems.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  "aarch64-linux"
-  "aarch64-darwin"
-  "x86_64-linux"
-  "x86_64-darwin"
-]
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index deb2290fb521..59ee41b013ea 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -10,7 +10,7 @@
   $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix
 */
 {
-  supportedSystems ? import ../../ci/supportedSystems.nix,
+  supportedSystems ? builtins.fromJSON (builtins.readFile ../../ci/supportedSystems.json),
 }:
 
 let
diff --git a/pkgs/top-level/release-outpaths.nix b/pkgs/top-level/release-outpaths.nix
index e6caabec04e9..8ca14fc95007 100644
--- a/pkgs/top-level/release-outpaths.nix
+++ b/pkgs/top-level/release-outpaths.nix
@@ -13,7 +13,7 @@
   attrNamesOnly ? false,
 
   # Set this to `null` to build for builtins.currentSystem only
-  systems ? import ../../ci/supportedSystems.nix,
+  systems ? builtins.fromJSON (builtins.readFile ../../ci/supportedSystems.json),
 }:
 let
   lib = import (path + "/lib");
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 31fe8fb38e13..7126252d7976 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -19,7 +19,7 @@
   system ? builtins.currentSystem,
   officialRelease ? false,
   # The platform doubles for which we build Nixpkgs.
-  supportedSystems ? import ../../ci/supportedSystems.nix,
+  supportedSystems ? builtins.fromJSON (builtins.readFile ../../ci/supportedSystems.json),
   # The platform triples for which we build bootstrap tools.
   bootstrapConfigs ? [
     "aarch64-apple-darwin"

From 962836d4d0bdad936e973194a8935363f34a2678 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 11 May 2025 21:28:40 +0200
Subject: [PATCH 22/66] workflows/get-merge-commit: return targetSha

We can fetch the targetSha directly with the mergedSha from the API.
This avoids a checkout with fetch-depth: 2 for a small performance
improvement.
---
 .github/workflows/eval.yml             | 20 +++++---------------
 .github/workflows/get-merge-commit.yml | 10 +++++++---
 ci/README.md                           |  4 ++--
 ci/get-merge-commit.sh                 |  5 ++++-
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 95130ec85d6b..024e7b823b62 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -24,23 +24,13 @@ jobs:
     runs-on: ubuntu-24.04-arm
     needs: get-merge-commit
     if: needs.get-merge-commit.outputs.mergedSha
-    outputs:
-      targetSha: ${{ steps.targetSha.outputs.targetSha }}
     steps:
       - name: Check out the PR at the test merge commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
-          fetch-depth: 2
           path: nixpkgs
 
-      - name: Determine target commit
-        if: github.event_name == 'pull_request_target'
-        id: targetSha
-        run: |
-          targetSha=$(git -C nixpkgs rev-parse HEAD^1)
-          echo "targetSha=$targetSha" >> "$GITHUB_OUTPUT"
-
       - name: Install Nix
         uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
@@ -143,7 +133,7 @@ jobs:
           path: prResult/*
 
       - name: Get target run id
-        if: needs.attrs.outputs.targetSha
+        if: needs.get-merge-commit.outputs.targetSha
         id: targetRunId
         run: |
           # Get the latest eval.yml workflow run for the PR's target commit
@@ -172,7 +162,7 @@ jobs:
           echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"
         env:
           REPOSITORY: ${{ github.repository }}
-          TARGET_SHA: ${{ needs.attrs.outputs.targetSha }}
+          TARGET_SHA: ${{ needs.get-merge-commit.outputs.targetSha }}
           GH_TOKEN: ${{ github.token }}
 
       - uses: actions/download-artifact@v4
@@ -186,8 +176,8 @@ jobs:
       - name: Compare against the target branch
         if: steps.targetRunId.outputs.targetRunId
         run: |
-          git -C nixpkgs worktree add ../target ${{ needs.attrs.outputs.targetSha }}
-          git -C nixpkgs diff --name-only ${{ needs.attrs.outputs.targetSha }} \
+          git -C nixpkgs worktree add ../target ${{ needs.get-merge-commit.outputs.targetSha }}
+          git -C nixpkgs diff --name-only ${{ needs.get-merge-commit.outputs.targetSha }} \
             | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
 
           # Use the target branch to get accurate maintainer info
@@ -241,7 +231,7 @@ jobs:
       - name: Check out Nixpkgs at the base commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ needs.attrs.outputs.targetSha }}
+          ref: ${{ needs.get-merge-commit.outputs.targetSha }}
           path: base
           sparse-checkout: ci
 
diff --git a/.github/workflows/get-merge-commit.yml b/.github/workflows/get-merge-commit.yml
index 7ce1d53b0249..7d8dd03fbf66 100644
--- a/.github/workflows/get-merge-commit.yml
+++ b/.github/workflows/get-merge-commit.yml
@@ -6,6 +6,9 @@ on:
       mergedSha:
         description: "The merge commit SHA"
         value: ${{ jobs.resolve-merge-commit.outputs.mergedSha }}
+      targetSha:
+        description: "The target commit SHA"
+        value: ${{ jobs.resolve-merge-commit.outputs.targetSha }}
       systems:
         description: "The supported systems"
         value: ${{ jobs.resolve-merge-commit.outputs.systems }}
@@ -17,6 +20,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     outputs:
       mergedSha: ${{ steps.merged.outputs.mergedSha }}
+      targetSha: ${{ steps.merged.outputs.targetSha }}
       systems: ${{ steps.systems.outputs.systems }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -35,9 +39,9 @@ jobs:
               echo "mergedSha=${{ github.sha }}" >> "$GITHUB_OUTPUT"
               ;;
             pull_request_target)
-              if mergedSha=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then
-                echo "Checking the merge commit $mergedSha"
-                echo "mergedSha=$mergedSha" >> "$GITHUB_OUTPUT"
+              if commits=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then
+                echo "Checking the commits:\n$commits"
+                echo "$commits" >> "$GITHUB_OUTPUT"
               else
                 # Skipping so that no notifications are sent
                 echo "Skipping the rest..."
diff --git a/ci/README.md b/ci/README.md
index a1b327de4e5d..6ef665e8b099 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -44,14 +44,14 @@ Why not just build the tooling right from the PRs Nixpkgs version?
 ## `get-merge-commit.sh GITHUB_REPO PR_NUMBER`
 
 Check whether a PR is mergeable and return the test merge commit as
-[computed by GitHub](https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests).
+[computed by GitHub](https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests) and its parent.
 
 Arguments:
 - `GITHUB_REPO`: The repository of the PR, e.g. `NixOS/nixpkgs`
 - `PR_NUMBER`: The PR number, e.g. `1234`
 
 Exit codes:
-- 0: The PR can be merged, the test merge commit hash is returned on stdout
+- 0: The PR can be merged, the hashes of the test merge commit and the target commit are returned on stdout
 - 1: The PR cannot be merged because it's not open anymore
 - 2: The PR cannot be merged because it has a merge conflict
 - 3: The merge commit isn't being computed, GitHub is likely having internal issues, unknown if the PR is mergeable
diff --git a/ci/get-merge-commit.sh b/ci/get-merge-commit.sh
index c62bb56dd993..c233f7f91691 100755
--- a/ci/get-merge-commit.sh
+++ b/ci/get-merge-commit.sh
@@ -55,7 +55,10 @@ done
 
 if [[ "$mergeable" == "true" ]]; then
     log "The PR can be merged"
-    jq -r .merge_commit_sha <<< "$prInfo"
+    mergedSha="$(jq -r .merge_commit_sha <<< "$prInfo")"
+    echo "mergedSha=$mergedSha"
+    targetSha="$(gh api "/repos/$repo/commits/$mergedSha" --jq '.parents[0].sha')"
+    echo "targetSha=$targetSha"
 else
     log "The PR has a merge conflict"
     exit 2

From af6faf876022f53031aee0bf9fdb6aa1b0842995 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 11 May 2025 19:49:54 +0200
Subject: [PATCH 23/66] workflows/eval: remove attrs step

Previously, the attrs step consisted of:
- 7s queue time
- 1m 15s run time

Only 25s of this were spent preparing the attr paths. A bit more than a
minute was just spent for queuing, checking out the repo, downloading
nix, downloading dependencies, uploading the artifacts - and then
downloading them again in the next step. All of that can be avoided if
we collect the attrs as part of the outpaths job.

By running the attrs step as part of each outpaths step the attrpaths
will be collected 4x, but:
- We save a minute for each eval run to complete.
- We save a full job, giving us more free runners and *possibly* less
queue times for other jobs in the repo.
- We reduce complexity in the workflow file.
---
 .github/workflows/eval.yml | 40 +++-----------------------------------
 ci/eval/default.nix        |  3 +--
 2 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 024e7b823b62..c887638ab9b8 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -19,37 +19,10 @@ jobs:
   get-merge-commit:
     uses: ./.github/workflows/get-merge-commit.yml
 
-  attrs:
-    name: Attributes
-    runs-on: ubuntu-24.04-arm
-    needs: get-merge-commit
-    if: needs.get-merge-commit.outputs.mergedSha
-    steps:
-      - name: Check out the PR at the test merge commit
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
-          path: nixpkgs
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
-        with:
-          extra_nix_config: sandbox = true
-
-      - name: Evaluate the list of all attributes
-        run: |
-          nix-build nixpkgs/ci -A eval.attrpathsSuperset
-
-      - name: Upload the list of all attributes
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: paths
-          path: result/*
-
   outpaths:
     name: Outpaths
     runs-on: ubuntu-24.04-arm
-    needs: [ attrs, get-merge-commit ]
+    needs: [ get-merge-commit ]
     strategy:
       fail-fast: false
       matrix:
@@ -62,12 +35,6 @@ jobs:
           sudo mkswap /swap
           sudo swapon /swap
 
-      - name: Download the list of all attributes
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          name: paths
-          path: paths
-
       - name: Check out the PR at the test merge commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -85,7 +52,6 @@ jobs:
         run: |
           nix-build nixpkgs/ci -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
-            --arg attrpathFile ./paths/paths.json \
             --arg chunkSize 10000
           # If it uses too much memory, slightly decrease chunkSize
 
@@ -98,7 +64,7 @@ jobs:
   process:
     name: Process
     runs-on: ubuntu-24.04-arm
-    needs: [ outpaths, attrs, get-merge-commit ]
+    needs: [ outpaths, get-merge-commit ]
     outputs:
       targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
     steps:
@@ -200,7 +166,7 @@ jobs:
   tag:
     name: Tag
     runs-on: ubuntu-24.04-arm
-    needs: [ attrs, process ]
+    needs: [ process ]
     if: needs.process.outputs.targetRunId
     permissions:
       pull-requests: write
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 99445e953183..e3f035e18d56 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -65,7 +65,7 @@ let
       # because `--argstr system` would only be passed to the ci/default.nix file!
       evalSystem,
       # The path to the `paths.json` file from `attrpathsSuperset`
-      attrpathFile,
+      attrpathFile ? "${attrpathsSuperset}/paths.json",
       # The number of attributes per chunk, see ./README.md for more info.
       chunkSize,
       checkMeta ? true,
@@ -286,7 +286,6 @@ let
           name = evalSystem;
           path = singleSystem {
             inherit quickTest evalSystem chunkSize;
-            attrpathFile = attrpathsSuperset + "/paths.json";
           };
         }) evalSystems
       );

From 80a9c0d2dba09d6f5d5ed915309df58d254a946d Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 11 May 2025 12:02:36 +0200
Subject: [PATCH 24/66] cmctl: modernize, disable integration test differently

---
 pkgs/by-name/cm/cmctl/package.nix | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/cm/cmctl/package.nix b/pkgs/by-name/cm/cmctl/package.nix
index c1c7bdc16b41..a443b7df1faf 100644
--- a/pkgs/by-name/cm/cmctl/package.nix
+++ b/pkgs/by-name/cm/cmctl/package.nix
@@ -7,34 +7,35 @@
   nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "cmctl";
   version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "cert-manager";
     repo = "cmctl";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Kr7vwVW6v08QRbJDs2u0vK241ljNfhLVYIQCBl31QSs=";
   };
 
-  vendorHash = "sha256-D83Ufpa7PLQWBCHX5d51me3aYprGzc9RoKVma2Ax1Is=";
+  vendorHash = "sha256-SYCWvt2K3MEow4cDKxLSK+Bp0hZG9rNI9PoXdPcPESg=";
 
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/cert-manager/cert-manager/pkg/util.AppVersion=v${version}"
-    "-X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=${src.rev}"
+    "-X github.com/cert-manager/cert-manager/pkg/util.AppVersion=v${finalAttrs.version}"
+    "-X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=${finalAttrs.src.rev}"
   ];
 
+  # integration tests require running etcd, kubernetes
+  postPatch = ''
+    rm -r test/integration
+  '';
+
   nativeBuildInputs = [
     installShellFiles
   ];
 
-  checkPhase = ''
-    go test --race $(go list ./... | grep -v /test/)
-  '';
-
   # Trusted by this computer: no: x509: “cert-manager” certificate is not
   # trusted
   doCheck = !stdenv.hostPlatform.isDarwin;
@@ -46,7 +47,9 @@ buildGoModule rec {
         --zsh <($out/bin/cmctl completion zsh)
   '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Command line utility to interact with a cert-manager instalation on Kubernetes";
     mainProgram = "cmctl";
     longDescription = ''
@@ -63,8 +66,8 @@ buildGoModule rec {
       resources inside your Kubernetes cluster.
     '';
     downloadPage = "https://github.com/cert-manager/cmctl";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://cert-manager.io/";
-    maintainers = with maintainers; [ joshvanl ];
+    maintainers = with lib.maintainers; [ joshvanl ];
   };
-}
+})

From 50fc3f69b075c89900830d32c561c58714ff8b49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 11 May 2025 14:50:22 -0700
Subject: [PATCH 25/66] 
 home-assistant-custom-components.waste_collection_schedule: 2.7.0 -> 2.8.0

Diff: https://github.com/mampfes/hacs_waste_collection_schedule/compare/refs/tags/2.7.0...refs/tags/2.8.0

Changelog: https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/2.8.0
---
 .../custom-components/waste_collection_schedule/package.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
index 43f69ac891f2..84f605d84536 100644
--- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent rec {
   owner = "mampfes";
   domain = "waste_collection_schedule";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hacs_waste_collection_schedule";
     tag = version;
-    hash = "sha256-llrECprqzjioEAF+eGbDJ8pkyG3ejTrQd5L60JpPp/Y=";
+    hash = "sha256-2dsuDVk2vFZPKLuFdNISg3b3z7PI+Ag3c2IZRbQnrgg=";
   };
 
   dependencies = [

From e43a2f6ed893f668411f07fa5dd236e27ff38c2b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 May 2025 00:40:23 +0200
Subject: [PATCH 26/66] esphome: 2025.4.1 -> 2025.4.2

https://github.com/esphome/esphome/releases/tag/2025.4.2
---
 pkgs/by-name/es/esphome/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 9a60b0d10629..60de831b46f1 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -22,14 +22,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.4.1";
+  version = "2025.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     tag = version;
-    hash = "sha256-EWSV87z0Npsf/1lDzbk2s4Phx0tZJZnMzubaX+W6fAY=";
+    hash = "sha256-vy/wjtl/IbdSOxAUsV4bl7VNEBTetsvIDh2V1gDHSMs=";
   };
 
   build-systems = with python.pkgs; [

From 73c8c68a350aea9eef7686ef54fc860d50b2ea2b Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <yang-bo@yang-bo.com>
Date: Sun, 11 May 2025 22:34:42 +0000
Subject: [PATCH 27/66] fix: add sscg to dependencies and build inputs for
 cockpit

---
 pkgs/by-name/co/cockpit/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index b9f696dc1eb6..30777342646c 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -32,6 +32,7 @@
   pkg-config,
   polkit,
   python3Packages,
+  sscg,
   systemd,
   udev,
   xmlto,
@@ -167,6 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix PATH : ${
         lib.makeBinPath [
           coreutils
+          sscg
           openssl
         ]
       } \

From 100f83ff87f6e10926dcde54275695ad0511d50b Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Sun, 11 May 2025 13:46:33 -0400
Subject: [PATCH 28/66] haskellPackages: remove darwin override for
 with-utf8_1_1_0_0

Attribute was removed in 7e2a5a598c4f759c200142d0753215a20647eb65.
---
 pkgs/development/haskell-modules/configuration-darwin.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 005afaa1ab85..1abc538fe663 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -62,7 +62,6 @@ self: super:
 
     # issues finding libcharset.h without libiconv in buildInputs on darwin.
     with-utf8 = addExtraLibrary pkgs.libiconv super.with-utf8;
-    with-utf8_1_1_0_0 = addExtraLibrary pkgs.libiconv super.with-utf8_1_1_0_0;
 
     git-annex = overrideCabal (drv: {
       # We can't use testFlags since git-annex side steps the Cabal test mechanism

From eb1a756b6680050da0c6351dc170a431808899d1 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 11 May 2025 12:12:42 -0400
Subject: [PATCH 29/66] pay-respects: modernize

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/pa/pay-respects/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix
index 0c9ffdb2eb4e..b42da4e1ebb5 100644
--- a/pkgs/by-name/pa/pay-respects/package.nix
+++ b/pkgs/by-name/pa/pay-respects/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitea,
   rustPlatform,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pay-respects";
   version = "0.7.6";
 
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "iff";
     repo = "pay-respects";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-+50MKpZgJqjuUvJeFFv8fMILkJ3cOAN7R7kmlR+98II=";
   };
 
@@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "pay-respects";
   };
-}
+})

From d169b41a44c9aedd647063ca5cf09c029401db8f Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 11 May 2025 12:28:30 -0400
Subject: [PATCH 30/66] pay-respects: add versionCheckHook for greater coverage

More tests are always a good thing.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/pa/pay-respects/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix
index b42da4e1ebb5..ec08ffbdca7e 100644
--- a/pkgs/by-name/pa/pay-respects/package.nix
+++ b/pkgs/by-name/pa/pay-respects/package.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitea,
   rustPlatform,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pay-respects";
@@ -18,6 +19,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-TJP+GPkXwPvnBwiF0SCkn8NGz/xyrYjbUZKCbUUSqHQ=";
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   meta = {
     description = "Terminal command correction, alternative to `thefuck`, written in Rust";
     homepage = "https://codeberg.org/iff/pay-respects";

From 7d5d18a426aad32774d81246d5b360ba55a38195 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 11 May 2025 12:30:11 -0400
Subject: [PATCH 31/66] pay-respects: add changelog

Upstream repo includes a changelog.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/pa/pay-respects/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix
index ec08ffbdca7e..b55fc286458b 100644
--- a/pkgs/by-name/pa/pay-respects/package.nix
+++ b/pkgs/by-name/pa/pay-respects/package.nix
@@ -25,6 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Terminal command correction, alternative to `thefuck`, written in Rust";
     homepage = "https://codeberg.org/iff/pay-respects";
+    changelog = "https://codeberg.org/iff/pay-respects/src/tag/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [
       sigmasquadron

From 95f3b07d06851beedef2ea013d394a7c544c62ef Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 11 May 2025 20:02:33 -0400
Subject: [PATCH 32/66] pay-respects: remove backticks in description

search.nixos.org does not render the backticks as codeblocks in the
description unlike the longDescription.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/pa/pay-respects/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix
index b55fc286458b..a98ae0d5c4e7 100644
--- a/pkgs/by-name/pa/pay-respects/package.nix
+++ b/pkgs/by-name/pa/pay-respects/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
 
   meta = {
-    description = "Terminal command correction, alternative to `thefuck`, written in Rust";
+    description = "Terminal command correction, alternative to thefuck, written in Rust";
     homepage = "https://codeberg.org/iff/pay-respects";
     changelog = "https://codeberg.org/iff/pay-respects/src/tag/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.agpl3Plus;

From db37d30508236d871c45f2a80d75acf7b4548dcd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 01:39:44 +0000
Subject: [PATCH 33/66] gitlab-ci-ls: 1.0.4 -> 1.0.5

---
 pkgs/by-name/gi/gitlab-ci-ls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
index c38041e4f577..29a8de572a53 100644
--- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gitlab-ci-ls";
-  version = "1.0.4";
+  version = "1.0.5";
   src = fetchFromGitHub {
     owner = "alesbrelih";
     repo = "gitlab-ci-ls";
     rev = "${version}";
-    hash = "sha256-rgdrbPqpdQlIVcQMLAi2rtTPpeWj+azbm6FaqUBHIIw=";
+    hash = "sha256-nfcG1fGmWutWwyROlTEnKN2+wPVmDkN0Z1VKdZDHGmU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-WjTfIKWu5fivPXmlGXduHWA5dKmKz2620tprtuoJbD4=";
+  cargoHash = "sha256-I8LSN50uSEAGAlaQzscAZWUqRpLUq+7gfzdj0UPkg4o=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];

From b81e7f8894d24f50acc9f82c62f5c036d3c37104 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 02:16:58 +0000
Subject: [PATCH 34/66] ripgrep-all: 0.10.6 -> 0.10.9

---
 pkgs/by-name/ri/ripgrep-all/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ri/ripgrep-all/package.nix b/pkgs/by-name/ri/ripgrep-all/package.nix
index 4e317167864d..49f1342c7641 100644
--- a/pkgs/by-name/ri/ripgrep-all/package.nix
+++ b/pkgs/by-name/ri/ripgrep-all/package.nix
@@ -23,17 +23,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "ripgrep-all";
-  version = "0.10.6";
+  version = "0.10.9";
 
   src = fetchFromGitHub {
     owner = "phiresky";
     repo = "ripgrep-all";
     rev = "v${version}";
-    hash = "sha256-ns7RL7kiG72r07LkF6RzShNg8M2SU6tU5+gXDxzUQHM=";
+    hash = "sha256-r/+u76Qxat6U0Hb3Xh31K/F0dNSPzteFzoE69NNCerI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-VbkLs5TuDSY7UHh2hA8R4dp99RU7pMmGhS1P9U9osq8=";
+  cargoHash = "sha256-nTCqqTFt87snzOXkjablaX9ZMGu/s88ZnUVr5uYrzPs=";
 
   # override debug=true set in Cargo.toml upstream
   RUSTFLAGS = "-C debuginfo=none";

From 870c36b75eb9564469e09dee727915603ba932fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 02:33:14 +0000
Subject: [PATCH 35/66] python3Packages.psygnal: 0.11.1 -> 0.13.0

---
 pkgs/development/python-modules/psygnal/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix
index ae913b1935ab..3db8b1f6da4f 100644
--- a/pkgs/development/python-modules/psygnal/default.nix
+++ b/pkgs/development/python-modules/psygnal/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "psygnal";
-  version = "0.11.1";
+  version = "0.13.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "pyapp-kit";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-eGJWtmw2Ps3jII4T8E6s3djzxfqcSdyPemvejal0cn4=";
+    hash = "sha256-ZEN8S2sI1usXl5A1Ow1+l4BBB6qNnlVt/nvFtAX4maY=";
   };
 
   build-system = [
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Implementation of Qt Signals";
     homepage = "https://github.com/pyapp-kit/psygnal";
-    changelog = "https://github.com/pyapp-kit/psygnal/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/pyapp-kit/psygnal/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ SomeoneSerge ];
   };

From 48adf63a43758a88f8ea0cc6933e36d58e9ae7e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 03:48:10 +0000
Subject: [PATCH 36/66] nextcloud-talk-desktop: 1.1.7 -> 1.1.8

---
 pkgs/by-name/ne/nextcloud-talk-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
index 3e4177fa421d..391a454af7dc 100644
--- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
+++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextcloud-talk-desktop";
-  version = "1.1.7";
+  version = "1.1.8";
 
   # Building from source would require building also building Server and Talk components
   # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
   src = fetchzip {
     url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip";
-    hash = "sha256-tcg3ctqbarJKJ9oROI+PHVTddJoioA1rF/QLR659q0Q=";
+    hash = "sha256-rKUf6BQk/snwI6Sf67+PbNEnoZZY1u+EOEWE11p3dYw=";
     stripRoot = false;
   };
 

From 82d3aa6a2ceccd116ffa7163f14848acdfa57bc0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 04:05:31 +0000
Subject: [PATCH 37/66] woodpecker-server: 3.5.2 -> 3.6.0

---
 .../tools/continuous-integration/woodpecker/common.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index c9b4b501b7b5..ce8da507630c 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 let
-  version = "3.5.2";
-  srcHash = "sha256-aHzaBYQ+IHen15FwmSIHaRLe8oWm3BpADrmqW4UWwj0=";
+  version = "3.6.0";
+  srcHash = "sha256-/vBWuCHvVaFqCbwZAXgkHpfAQaOt4dtqeCXmDuQzBoc=";
   # The tarball contains vendored dependencies
   vendorHash = null;
 in

From a7e1282e91b53f529d0efa15ccaf9ecbba035227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 11 May 2025 21:51:10 -0700
Subject: [PATCH 38/66] routino: 3.4.2 -> 3.4.3

Changelog: http://routino.org/software/NEWS.txt
---
 pkgs/by-name/ro/routino/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ro/routino/package.nix b/pkgs/by-name/ro/routino/package.nix
index 2844356923b5..a40a2397f8a7 100644
--- a/pkgs/by-name/ro/routino/package.nix
+++ b/pkgs/by-name/ro/routino/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "routino";
-  version = "3.4.2";
+  version = "3.4.3";
 
   src = fetchurl {
     url = "https://routino.org/download/routino-${version}.tgz";
-    hash = "sha256-Dms1u/KuS6qFYcslKfsvIFPx0ApdyWtKK/XlgW+kToI=";
+    hash = "sha256-TroGfTLJfKk4itbpfA9aPBDUiCk2ckDXjFE3XYzBHlQ=";
   };
 
   patchFlags = [ "-p0" ];

From ad8ef7cf1a6962c4c4240d85debe55015a133c42 Mon Sep 17 00:00:00 2001
From: 9R <git@9-r.net>
Date: Fri, 9 May 2025 23:41:19 +0200
Subject: [PATCH 39/66] python3Packages.rctclient: init at 0.0.4

---
 .../python-modules/rctclient/default.nix      | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/rctclient/default.nix

diff --git a/pkgs/development/python-modules/rctclient/default.nix b/pkgs/development/python-modules/rctclient/default.nix
new file mode 100644
index 000000000000..803af987c96a
--- /dev/null
+++ b/pkgs/development/python-modules/rctclient/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  click,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "rctclient";
+  version = "0.0.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "svalouch";
+    repo = "python-rctclient";
+    tag = "v${version}";
+    hash = "sha256-QPla5h8wSM9Ynj44Uwc1a2yAnu8TXbyBWzVHQeW6jnI=";
+  };
+
+  build-system = [ setuptools ];
+
+  optional-dependencies.cli = [ click ];
+
+  pythonImportsCheck = [ "rctclient" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "Python implementation of the RCT Power GmbH Serial Communication Protocol";
+    homepage = "https://github.com/svalouch/python-rctclient";
+    changelog = "https://github.com/svalouch/python-rctclient/releases/tag/${src.tag}";
+    license = with licenses; [ gpl3Only ];
+    maintainers = with maintainers; [ _9R ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c0eb34fc8f6f..f01b22228935 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14831,6 +14831,8 @@ self: super: with self; {
 
   rcssmin = callPackage ../development/python-modules/rcssmin { };
 
+  rctclient = callPackage ../development/python-modules/rctclient { };
+
   rdbtools = callPackage ../development/python-modules/rdbtools { };
 
   rdflib = callPackage ../development/python-modules/rdflib { };

From 98e026135c22f265d9688fc9de3b26011ebc53a7 Mon Sep 17 00:00:00 2001
From: 9R <git@9-r.net>
Date: Fri, 9 May 2025 22:50:49 +0200
Subject: [PATCH 40/66] home-assistant-custom-components.rct-power: init at
 v0.14.1

---
 .../custom-components/rct_power/package.nix   | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/rct_power/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/rct_power/package.nix b/pkgs/servers/home-assistant/custom-components/rct_power/package.nix
new file mode 100644
index 000000000000..c9d04886b0df
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/rct_power/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+  rctclient,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "weltenwort";
+  domain = "rct_power";
+  version = "v0.14.1";
+
+  src = fetchFromGitHub {
+    owner = "weltenwort";
+    repo = "home-assistant-rct-power-integration";
+    tag = version;
+    hash = "sha256-wM66MyRhBsMfUr+KlqV4jSuXcnKfW0fkbDAyuU2crsc=";
+  };
+
+  dependencies = [
+    rctclient
+  ];
+
+  doCheck = false; # no tests
+
+  meta = with lib; {
+    changelog = "https://github.com/weltenwort/home-assistant-rct-power-integration/releases/tag/${src.tag}";
+    description = "Custom integration for RCT Power Inverters";
+    homepage = "https://github.com/weltenwort/home-assistant-rct-power-integration";
+    maintainers = with maintainers; [ _9R ];
+    license = licenses.mit;
+  };
+}

From 047a80444950005004b423b09c1c0a5531e7cab3 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Mon, 12 May 2025 09:51:17 +0200
Subject: [PATCH 41/66] nixos/postsrsd: expose socketPath via module option

Services utilising postsrsd need to connect to it via a Unix socket.
While the path to that socket is static as of now, the discoverability
of that path suffers from the lack of module documentation and a
scattered definition of the individual path components over at least
three lines, even when reading the module source.

By exposing the socket path as a readOnly NixOS option, that value shows
up in the options overview and can be re-used in other parts of NixOS
config.
---
 nixos/modules/services/mail/postsrsd.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix
index e7c133bceac1..bc91edbbe000 100644
--- a/nixos/modules/services/mail/postsrsd.nix
+++ b/nixos/modules/services/mail/postsrsd.nix
@@ -22,7 +22,7 @@ let
     secrets-file = "''${CREDENTIALS_DIRECTORY}/secrets-file"
     domains = ${libconfuseDomains}
     separator = "${cfg.separator}"
-    socketmap = "unix:${runtimeDirectory}/socket"
+    socketmap = "unix:${cfg.socketPath}"
 
     # Disable postsrsd's jailing in favor of confinement with systemd.
     unprivileged-user = ""
@@ -93,6 +93,15 @@ in
         default = "postsrsd";
         description = "Group for the daemon";
       };
+
+      socketPath = lib.mkOption {
+        type = lib.types.path;
+        default = "${runtimeDirectory}/socket";
+        readOnly = true;
+        description = ''
+          Path to the Unix socket for connecting to postsrsd.
+          Read-only, intended for usage when integrating postsrsd into other NixOS config.'';
+      };
     };
   };
 

From 5879040d0506062505beda1f728a469a03fb65de Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Mon, 12 May 2025 10:16:55 +0200
Subject: [PATCH 42/66] minio-warp: 1.1.2 -> 1.1.4

Changelog: https://github.com/minio/warp/releases/tag/v1.1.4

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/mi/minio-warp/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix
index 45c438eb41da..b72fbfae26cb 100644
--- a/pkgs/by-name/mi/minio-warp/package.nix
+++ b/pkgs/by-name/mi/minio-warp/package.nix
@@ -4,20 +4,28 @@
   buildGoModule,
   versionCheckHook,
   nix-update-script,
+  fetchpatch,
 }:
 
 buildGoModule rec {
   pname = "minio-warp";
-  version = "1.1.2";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "warp";
     rev = "v${version}";
-    hash = "sha256-loyEGnJ6ExWMUyArNNpQGzpagFgwlNzaNBO8EPXkMws=";
+    hash = "sha256-KOhBSxR9P3Q6DpC8QCRaiw6Y51OyHLRlhr0WmXE74PI=";
   };
 
-  vendorHash = "sha256-/+vKs5NzzyP9Ihz+zbxGf/OEHD0kaf0wZzE0Sg++3bE=";
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/minio/warp/commit/c830e94367efce6e6d70c337d490a3b6eba5e558.patch";
+      hash = "sha256-LXkgwpTPe4WvU+nAsYfjs38uXiBoeoavnxliw8nweRQ=";
+    })
+  ];
+
+  vendorHash = "sha256-duEd5uss6mS2aTOTsI3dzZV2TEDHyKN5QKWb4Tt5+7s=";
 
   # See .goreleaser.yml
   ldflags = [

From a6ac34725e6f7dbfa75888d8584844d32055cd6a Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Mon, 12 May 2025 10:22:28 +0200
Subject: [PATCH 43/66] minio-warp: add `meta.changelog`

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/mi/minio-warp/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix
index b72fbfae26cb..869c12017efa 100644
--- a/pkgs/by-name/mi/minio-warp/package.nix
+++ b/pkgs/by-name/mi/minio-warp/package.nix
@@ -19,6 +19,7 @@ buildGoModule rec {
   };
 
   patches = [
+    # upstream ships a broken go.sum file in the release and fixes it one commit later ..
     (fetchpatch {
       url = "https://github.com/minio/warp/commit/c830e94367efce6e6d70c337d490a3b6eba5e558.patch";
       hash = "sha256-LXkgwpTPe4WvU+nAsYfjs38uXiBoeoavnxliw8nweRQ=";
@@ -51,6 +52,7 @@ buildGoModule rec {
   meta = {
     description = "S3 benchmarking tool";
     homepage = "https://github.com/minio/warp";
+    changelog = "https://github.com/minio/warp/releases/tag/v${version}";
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ christoph-heiss ];
     mainProgram = "minio-warp";

From 712f8aacf2f585678cea6b57fefee7375be0029c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 08:44:38 +0000
Subject: [PATCH 44/66] readarr: 0.4.15.2787 -> 0.4.16.2793

---
 pkgs/by-name/re/readarr/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/readarr/package.nix b/pkgs/by-name/re/readarr/package.nix
index 6bacf19c5f6f..30b5a3de57bf 100644
--- a/pkgs/by-name/re/readarr/package.nix
+++ b/pkgs/by-name/re/readarr/package.nix
@@ -24,15 +24,15 @@ let
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   hash =
     {
-      x64-linux_hash = "sha256-pkFyal2u/2YeKuv8QwZNvO1HBT4lpNSw+M2u6isDK5s=";
-      arm64-linux_hash = "sha256-NPBUmeAihbS8qMML3E/9QEmOfgdH2fzaWtA4vV1TIK8=";
-      x64-osx_hash = "sha256-6urFLKOL63xAUQHDqDq8NkFUnQuOC5i+MI3ANJUU1Vg=";
+      x64-linux_hash = "sha256-sJcnCysBNRL0rY+leTW9oTmHPa1Ook8oC6ateAyP58A=";
+      arm64-linux_hash = "sha256-PQYWApDyl5HFv+lNFi/VQ0suG32QHm0icjsEjHopf/U=";
+      x64-osx_hash = "sha256-NBy3shWURHQdZauTqeZMi7OMfGkBmJjhF/l4oX2xTp4=";
     }
     ."${arch}-${os}_hash";
 in
 stdenv.mkDerivation rec {
   pname = "readarr";
-  version = "0.4.15.2787";
+  version = "0.4.16.2793";
 
   src = fetchurl {
     url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz";

From 3a116ccca7a1ef78bca515de8ccb4d7df0ee4183 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 10 May 2025 15:24:01 -0700
Subject: [PATCH 45/66] python3Packages.django-q2: disable failing tests on
 darwin tests

---
 .../python-modules/django-q2/default.nix      | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/django-q2/default.nix b/pkgs/development/python-modules/django-q2/default.nix
index a3768637324a..3b388ab34cf5 100644
--- a/pkgs/development/python-modules/django-q2/default.nix
+++ b/pkgs/development/python-modules/django-q2/default.nix
@@ -14,6 +14,7 @@
   poetry-core,
   pytest-django,
   pytestCheckHook,
+  stdenv,
 }:
 
 buildPythonPackage rec {
@@ -78,10 +79,21 @@ buildPythonPackage rec {
     REDIS_HOST = "127.0.0.1";
   };
 
-  disabledTests = [
-    # requires a running mongodb
-    "test_mongo"
-  ];
+  disabledTests =
+    [
+      # requires a running mongodb
+      "test_mongo"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # fails with an assertion
+      "test_max_rss"
+      "test_recycle"
+      # cannot connect to redis
+      "test_broker"
+      "test_custom"
+      "test_redis"
+      "test_redis_connection"
+    ];
 
   disabledTestPaths = [
     "django_q/tests/test_commands.py"
@@ -89,11 +101,13 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "-vv" ];
 
-  meta = with lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
     description = "Multiprocessing distributed task queue for Django based on Django-Q";
     homepage = "https://github.com/django-q2/django-q2";
     changelog = "https://github.com/django-q2/django-q2/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
 }

From 654f57cd39519651ff9f35930b220813ac337aff Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Sun, 11 May 2025 18:16:30 +0200
Subject: [PATCH 46/66] timg: 1.6.1 -> 1.6.2

Co-authored-by: Pol Dellaiera <pol.dellaiera@protonmail.com>
---
 pkgs/by-name/ti/timg/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/timg/package.nix b/pkgs/by-name/ti/timg/package.nix
index 70d9c4557a54..bc9206b1af25 100644
--- a/pkgs/by-name/ti/timg/package.nix
+++ b/pkgs/by-name/ti/timg/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "timg";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "timg";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-D5pQozxy5eSKVaV5qhoneG/b2yKcPQWD8OHs8MsGL1w=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UiQ8CW0mxjjQM6XLN0FL2v7ccYq2EmIy/3pm+yKQh8w=";
   };
 
   buildInputs = [

From 7a07421c76d002ba97a986b90d6e0a55100b7900 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 11 May 2025 12:33:40 +0800
Subject: [PATCH 47/66] nbfc-linux: 0.2.7 -> 0.3.15

Diff: https://github.com/nbfc-linux/nbfc-linux/compare/0.2.7...0.3.15
---
 pkgs/by-name/nb/nbfc-linux/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/nb/nbfc-linux/package.nix b/pkgs/by-name/nb/nbfc-linux/package.nix
index 2ae265b615db..8f3d6e7be515 100644
--- a/pkgs/by-name/nb/nbfc-linux/package.nix
+++ b/pkgs/by-name/nb/nbfc-linux/package.nix
@@ -3,21 +3,24 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
+  curl,
 }:
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "nbfc-linux";
-  version = "0.2.7";
+  version = "0.3.15";
 
   src = fetchFromGitHub {
     owner = "nbfc-linux";
     repo = "nbfc-linux";
-    rev = "${finalAttrs.version}";
-    hash = "sha256-1tLW/xEh01y8BjVbgIa95DkYWf7CDVSo/lI/1U28Xs8=";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-i6G7r9Mg90WMWjSIDDbyNLAr2ZxJX9D02bNaL5EY48I=";
   };
 
-  nativeBuildInputs = [
-    autoreconfHook
-  ];
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ curl ];
+
   configureFlags = [
     "--prefix=${placeholder "out"}"
     "--sysconfdir=${placeholder "out"}/etc"

From ad7e3ecf88795823711a22473e22aacfd10645b1 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@slow.janky.email>
Date: Sun, 4 May 2025 11:24:48 +0100
Subject: [PATCH 48/66] execline: add passthru.writeScript

---
 .../skaware-packages/execline/default.nix     | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix
index 500d39b773c0..6adf4a2895fe 100644
--- a/pkgs/development/skaware-packages/execline/default.nix
+++ b/pkgs/development/skaware-packages/execline/default.nix
@@ -2,11 +2,12 @@
   lib,
   skawarePackages,
   skalibs,
+  execline,
+  writeTextFile,
 }:
 
 let
   version = "2.9.6.1";
-
 in
 skawarePackages.buildPackage {
   inherit version;
@@ -75,4 +76,24 @@ skawarePackages.buildPackage {
       ${./execlineb-wrapper.c} \
       -lskarnet
   '';
+
+  # Write an execline script.
+  # Documented in ../../../../doc/build-helpers/trivial-build-helpers.chapter.md
+  passthru.writeScript =
+    name: options: script:
+    writeTextFile {
+      inherit name;
+      text = ''
+        #!${execline}/bin/execlineb ${toString options}
+        ${script}
+      '';
+
+      executable = true;
+      derivationArgs.nativeBuildInputs = [ execline ];
+      checkPhase = ''
+        echo redirfd -w 1 /dev/null echo >test.el
+        cat <$target >>test.el
+        execlineb -W test.el
+      '';
+    };
 }

From b9992ea9c1ebd847e1a45f498e53aa1fac548eab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 13:04:20 +0000
Subject: [PATCH 49/66] zizmor: 1.6.0 -> 1.7.0

---
 pkgs/by-name/zi/zizmor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index bf266e8c6e5b..7353eca54b8a 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zizmor";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "woodruffw";
     repo = "zizmor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Has3PrXJIKQh6FdhZ3aGvqJ5keHTRqa+nDAb4fv3xWg=";
+    hash = "sha256-HDQDaIZVxMTkVTwCNyevSdVZELw8e6hIN/NhaHLcT24=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uXUvEbQpY9E7kTOeXMFN/9b4u4tn/S3HCs0a65Hssn4=";
+  cargoHash = "sha256-hr/1RFXvbsRLxlmXNPuU3x+i41byE+v5k2aBg5UIbvM=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From 2d1675a0d63feee5d83f59f03075bb873bcf19a2 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 12 May 2025 15:10:44 +0200
Subject: [PATCH 50/66] vscode-extensions.amazonwebservices.amazon-q-vscode:
 init at 1.66.0

---
 .../default.nix                               | 22 +++++++++++++++++++
 .../editors/vscode/extensions/default.nix     |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
new file mode 100644
index 000000000000..306df8c3cb55
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  vscode-utils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
+  mktplcRef = {
+    name = "amazon-q-vscode";
+    publisher = "AmazonWebServices";
+    version = "1.66.0";
+    hash = "sha256-EnNwlSmJWBcSfFCayxJS94qVUqgQlbX0RLCB4jJsn+4=";
+  };
+
+  meta = {
+    changelog = "https://github.com/aws/aws-toolkit-vscode/releases/tag/amazonq%2Fv${finalAttrs.version}";
+    description = "Amazon Q, CodeCatalyst, Local Lambda debug, SAM/CFN syntax, ECS Terminal, AWS resources";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode";
+    homepage = "https://github.com/aws/aws-toolkit-vscode";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+})
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index d7af32418e9a..d8ab642fff23 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -254,6 +254,8 @@ let
         };
       };
 
+      amazonwebservices.amazon-q-vscode = callPackage ./amazonwebservices.amazon-q-vscode { };
+
       angular.ng-template = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "ng-template";

From baf84b92e97ec44845a3317574c73cc5712f92d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 13:32:44 +0000
Subject: [PATCH 51/66] mountpoint-s3: 1.16.2 -> 1.17.0

---
 pkgs/by-name/mo/mountpoint-s3/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix
index 0d18d51179e7..113178672eb1 100644
--- a/pkgs/by-name/mo/mountpoint-s3/package.nix
+++ b/pkgs/by-name/mo/mountpoint-s3/package.nix
@@ -9,18 +9,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mountpoint-s3";
-  version = "1.16.2";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "mountpoint-s3";
     rev = "v${version}";
-    hash = "sha256-5zib6F+OtOqxJei4+HzzEEMvjOoltdcPfIc6kzUJYgw=";
+    hash = "sha256-uV0umUoJkYgmjWjv8GMnk5TRRbCCJS1ut3VV1HvkaAw=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3wEmtBEYvvHZ0Tde+o//YW8J20o6t/v8C0vq/CICHD0=";
+  cargoHash = "sha256-zDgAGOuK0Jkmm554qZsaA/ABFhuupJ+WToO8HSPp7Xc=";
 
   # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
   # cargo metadata failure: error: none of the selected packages contains these features: libfuse3

From 20357e7254d1598527bf548c306b64ff452d5d16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 13:40:40 +0000
Subject: [PATCH 52/66] imposm: 0.14.1 -> 0.14.2

---
 pkgs/by-name/im/imposm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/im/imposm/package.nix b/pkgs/by-name/im/imposm/package.nix
index b10bc79f450e..c09ae89cadd5 100644
--- a/pkgs/by-name/im/imposm/package.nix
+++ b/pkgs/by-name/im/imposm/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "imposm";
-  version = "0.14.1";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "omniscale";
     repo = "imposm3";
     tag = "v${version}";
-    hash = "sha256-PF7pi2UTZJe7WzfaJrQrOGusO/RRfh8KNz8YyrVcBvg=";
+    hash = "sha256-Bl6LSF/aN/c0lH93fxm2HGvxs7Grv4qJc/iN04AlQP0=";
   };
 
   vendorHash = null;

From 9a79275905bb533af304d51dd770aca23f0b1ace Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Mon, 12 May 2025 14:43:22 +0100
Subject: [PATCH 53/66] karabiner-elements: 15.0.0 -> 15.3.0 (#405631)

---
 pkgs/by-name/ka/karabiner-elements/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ka/karabiner-elements/package.nix b/pkgs/by-name/ka/karabiner-elements/package.nix
index f7c02f9bf9fa..881b6c3f6816 100644
--- a/pkgs/by-name/ka/karabiner-elements/package.nix
+++ b/pkgs/by-name/ka/karabiner-elements/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "karabiner-elements";
-  version = "15.0.0";
+  version = "15.3.0";
 
   src = fetchurl {
     url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${finalAttrs.version}/Karabiner-Elements-${finalAttrs.version}.dmg";
-    hash = "sha256-xWCsbkP9cVnDjWFTgWl5KrR7wEpcQYM4Md99pTI/l14=";
+    hash = "sha256-Szf2mBC8c4JA3Ky4QPTvS4GJ0PXFbN0Y7Rpum9lRABE=";
   };
 
   outputs = [

From 22c7f2157bfcc48076fba75019308ade228bb408 Mon Sep 17 00:00:00 2001
From: Brian McGee <brian@bmcgee.ie>
Date: Mon, 12 May 2025 14:43:33 +0100
Subject: [PATCH 54/66] nixos-facter: 0.3.2 -> 0.4.0

---
 pkgs/by-name/ni/nixos-facter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
index 91b9c2588009..f762d2f78a22 100644
--- a/pkgs/by-name/ni/nixos-facter/package.nix
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -23,13 +23,13 @@ let
 in
 buildGoModule rec {
   pname = "nixos-facter";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "nixos-facter";
     rev = "v${version}";
-    hash = "sha256-QD9b3r91ukGbAg+ZWj9cdBsXb6pl3wlVgEY3zF+tDQI=";
+    hash = "sha256-SuD6FTyCGT+H5uEPkPmBSI00R87weAoO5xZHPJElSu8=";
   };
 
   vendorHash = "sha256-A7ZuY8Gc/a0Y8O6UG2WHWxptHstJOxi4n9F8TY6zqiw=";

From 3f1be28fb1b88a60bbc1f41c1ed0d496617192c4 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 12 May 2025 14:06:51 +0000
Subject: [PATCH 55/66] clorinde: 0.14.4 -> 0.15.0

---
 pkgs/by-name/cl/clorinde/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix
index f1e211b01386..c6a4052d8999 100644
--- a/pkgs/by-name/cl/clorinde/package.nix
+++ b/pkgs/by-name/cl/clorinde/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clorinde";
-  version = "0.14.4";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "halcyonnouveau";
     repo = "clorinde";
     tag = "clorinde-v${finalAttrs.version}";
-    hash = "sha256-ZCD8unHHA1yFKlmAaQw9zlJWAecu+j3/fwlp/ro2IFc=";
+    hash = "sha256-PUAySbgmbulSlkabABiSFeDDa+o0tQ2uQtiQGSqO1/w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-V69c/Ks9qNmwqH4IV0uNDRc2eH7HMHpupE3liZofJhA=";
+  cargoHash = "sha256-zSeAD3MBflO+lhuLxH57YhR6wxsqZn62XQ0dgImdNLE=";
 
   cargoBuildFlags = [ "--package=clorinde" ];
 

From fddf18a8fc616cf8f706ae58b95489ce87588faf Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 11 May 2025 19:52:06 +0200
Subject: [PATCH 56/66] btrfs-progs.meta.mainProgram: init

---
 pkgs/by-name/bt/btrfs-progs/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix
index 2cb63e250917..dead16e648bf 100644
--- a/pkgs/by-name/bt/btrfs-progs/package.nix
+++ b/pkgs/by-name/bt/btrfs-progs/package.nix
@@ -96,6 +96,7 @@ stdenv.mkDerivation rec {
     homepage = "https://btrfs.readthedocs.io/en/latest/";
     changelog = "https://github.com/kdave/btrfs-progs/raw/v${version}/CHANGES";
     license = licenses.gpl2Only;
+    mainProgram = "btrfs";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
   };

From 01c978969c36179642c0eb696f0efb13659b9f42 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 11 May 2025 22:49:17 -0700
Subject: [PATCH 57/66] llvmPackages_git: 21.0.0-unstable-2025-05-04 ->
 21.0.0-unstable-2025-05-11

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 7ba0957b615e..8800a6408c01 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.4".officialRelease.sha256 = "sha256-/WomqG2DdnUHwlVsMfpzaK/dhGV3zychfU0wLmihQac=";
     "21.0.0-git".gitRelease = {
-      rev = "b3e8b21c57cc5549767d21a2be43baeec431c6f7";
-      rev-version = "21.0.0-unstable-2025-05-04";
-      sha256 = "sha256-4fe6xaE5FEvHRFDcs9mNE08b54Cq3lzEezyI2hs2e/8=";
+      rev = "5b91756c0ca7ef4d75c33c2617bfd0f9719907dc";
+      rev-version = "21.0.0-unstable-2025-05-11";
+      sha256 = "sha256-5e72pOZO2/hYY7/1Kt0ITtEjJzWwKR58ufCU/9EkdS0=";
     };
   } // llvmVersions;
 

From 4f3c83c83139e121ebfcfea49157f58a95931871 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Mon, 12 May 2025 16:24:15 +0200
Subject: [PATCH 58/66] zizmor: update information

update meta information and owner name
---
 pkgs/by-name/zi/zizmor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index bf266e8c6e5b..70f56bcca5a6 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "1.6.0";
 
   src = fetchFromGitHub {
-    owner = "woodruffw";
+    owner = "zizmorcore";
     repo = "zizmor";
     tag = "v${finalAttrs.version}";
     hash = "sha256-Has3PrXJIKQh6FdhZ3aGvqJ5keHTRqa+nDAb4fv3xWg=";
@@ -28,8 +28,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Tool for finding security issues in GitHub Actions setups";
-    homepage = "https://woodruffw.github.io/zizmor/";
-    changelog = "https://github.com/woodruffw/zizmor/releases/tag/v${finalAttrs.version}";
+    homepage = "https://docs.zizmor.sh/";
+    changelog = "https://github.com/zizmorcore/zizmor/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lesuisse ];
     mainProgram = "zizmor";

From bfa36d71ff0b6b0f907a25456f2e49be7bfe08d7 Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Mon, 12 May 2025 10:35:52 -0400
Subject: [PATCH 59/66] jai: 0.2.010 -> 0.2.011

---
 pkgs/by-name/ja/jai/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix
index 6ca0060f3c64..cd255c330a8d 100644
--- a/pkgs/by-name/ja/jai/package.nix
+++ b/pkgs/by-name/ja/jai/package.nix
@@ -9,7 +9,7 @@
 let
   pname = "jai";
   minor = "2";
-  patch = "010";
+  patch = "011";
   version = "0.${minor}.${patch}";
   zipName = "jai-beta-${minor}-${patch}.zip";
   jai = stdenv.mkDerivation {
@@ -20,7 +20,7 @@ let
           nix-store --add-fixed sha256 ${zipName}
       '';
       name = zipName;
-      sha256 = "sha256-7S0DFvmiKEvmCT12ukwLu+SSitk4y6BuS6WWCImeOhc=";
+      sha256 = "sha256-Du4rTA2g7hjlsUA/hvPY6O6L34e/MmnUN8rzi1jF/dY";
     };
     nativeBuildInputs = [ unzip ];
     buildCommand = "unzip $src -d $out";

From f395b190c3443e4b1926428e89dc019b41529d3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 10:23:21 +0000
Subject: [PATCH 60/66] lemminx: 0.30.1 -> 0.31.0

---
 pkgs/by-name/le/lemminx/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix
index 74ec6ee81028..d8725383d944 100644
--- a/pkgs/by-name/le/lemminx/package.nix
+++ b/pkgs/by-name/le/lemminx/package.nix
@@ -25,13 +25,13 @@ let
 in
 maven.buildMavenPackage rec {
   pname = "lemminx";
-  version = "0.30.1";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "lemminx";
     rev = version;
-    hash = "sha256-DkJaSEWmQV1vkC+knJNIDzVPyAYtf2lFZUpGhDTJXLE=";
+    hash = "sha256-a+9RN1265fsmYAUMuUTxA+VqJv7xPlzuc8HqoZwmR4M=";
     # Lemminx reads this git information at runtime from a git.properties
     # file on the classpath
     leaveDotGit = true;

From 4e4d97aa546928d031320b6b7d378875520f05dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 15:20:00 +0000
Subject: [PATCH 61/66] beam26Packages.hex: 2.1.1 -> 2.2.1

---
 pkgs/development/beam-modules/hex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index 74de36b9269e..13863f70044b 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -18,13 +18,13 @@ let
     self:
     stdenv.mkDerivation rec {
       pname = "hex";
-      version = "2.1.1";
+      version = "2.2.1";
 
       src = fetchFromGitHub {
         owner = "hexpm";
         repo = "hex";
         rev = "v${version}";
-        sha256 = "sha256-pEfd2BqkVwZVbnka98MafJ/NRn94BHh+wM0i2Q5duTo=";
+        sha256 = "sha256-a4VNBlvW+IM7HuI66dYGqOmIF9kO6wWFqVz4vYtQOhw=";
       };
 
       setupHook = writeText "setupHook.sh" ''

From 4bcf18c127eef075b6f56c96c8d5e3d5847f70c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 15:23:47 +0000
Subject: [PATCH 62/66] vimPlugins.avante-nvim: 0.0.23-unstable-2025-05-10 ->
 0.0.23-unstable-2025-05-12

---
 .../vim/plugins/non-generated/avante-nvim/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index c8e73a2f51b9..f038c61b53b5 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.23-unstable-2025-05-10";
+  version = "0.0.23-unstable-2025-05-12";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "adae032f5fbc611d59545792d3c5bb1c9ddc3fdb";
-    hash = "sha256-v99yu5LvwdmHBcH61L6JIqjQkZR8Lm2fR/uzQZNPo38=";
+    rev = "aae4cc4014149e544fb00e78687bcdef8335dd10";
+    hash = "sha256-ixJcD8V2rCLCrqE7hHtHfEtQuHeVyIDgyZ1VOY1jmD0=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";

From 3f4f2285f9607cd4c3dbdd97c3c6cd8f5928c3fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 15:16:41 +0000
Subject: [PATCH 63/66] hyprprop: 0.1-unstable-2025-03-31 ->
 0.1-unstable-2025-05-12

---
 pkgs/by-name/hy/hyprprop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix
index eaecba550352..6ce676e19d7a 100644
--- a/pkgs/by-name/hy/hyprprop/package.nix
+++ b/pkgs/by-name/hy/hyprprop/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "hyprprop";
-  version = "0.1-unstable-2025-03-31";
+  version = "0.1-unstable-2025-05-12";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "contrib";
-    rev = "bc2ad24e0b2e66c3e164994c4897cd94a933fd10";
-    hash = "sha256-YItzk1pj8Kz+b7VlC9zN1pSZ6CuX35asYy3HuMQ3lBQ=";
+    rev = "8e6c02ac3dfbff878ef300266598737ee9cedf94";
+    hash = "sha256-VKs/GtedyOrcWiEOf9JPPX6ZgKzngXTVMUlqsL60G/c=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/hyprprop";

From eccf782a9f58cd2e30172e5b9a04f1613f89d369 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 May 2025 18:04:20 +0200
Subject: [PATCH 64/66] python313Packages.spidev: 3.6 -> 3.7

https://github.com/doceme/py-spidev/releases/tag/v3.7
---
 .../python-modules/spidev/default.nix         | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/spidev/default.nix b/pkgs/development/python-modules/spidev/default.nix
index 1e62e9b3f988..aaa0db17b597 100644
--- a/pkgs/development/python-modules/spidev/default.nix
+++ b/pkgs/development/python-modules/spidev/default.nix
@@ -1,25 +1,31 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "spidev";
-  version = "3.6";
-  format = "setuptools";
+  version = "3.7";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-FNvDdZSkqu+FQDq2F5hdPD70ZNYrybdp71UttTcBEVs=";
+
+  src = fetchFromGitHub {
+    owner = "doceme";
+    repo = "py-spidev";
+    tag = "v${version}";
+    hash = "sha256-XLCWuLjBpsEGjP3yUNbFMxJQ1m9S7TY0LfVVteUU2bY=";
   };
 
-  # package does not include tests
-  doCheck = false;
+  build-system = [ setuptools ];
+
+  doCheck = false; # no tests
 
   pythonImportsCheck = [ "spidev" ];
 
   meta = with lib; {
+    changelog = "https://github.com/doceme/py-spidev/releases/tag/${src.tag}";
     homepage = "https://github.com/doceme/py-spidev";
     description = "Python bindings for Linux SPI access through spidev";
     license = licenses.mit;

From cbbee4641ef3321011091ba0afe1777359e7e70d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 May 2025 18:35:24 +0200
Subject: [PATCH 65/66] python313Packages.spidev: nixfmt

---
 pkgs/development/python-modules/spidev/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/spidev/default.nix b/pkgs/development/python-modules/spidev/default.nix
index aaa0db17b597..346ebc5a60e6 100644
--- a/pkgs/development/python-modules/spidev/default.nix
+++ b/pkgs/development/python-modules/spidev/default.nix
@@ -10,7 +10,6 @@ buildPythonPackage rec {
   version = "3.7";
   pyproject = true;
 
-
   src = fetchFromGitHub {
     owner = "doceme";
     repo = "py-spidev";

From 8ae4c6fdd64488377db6f3bab2ed98de820ef3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Sun, 11 May 2025 12:53:59 +0200
Subject: [PATCH 66/66] jjui: 0.8.6 -> 0.8.8

---
 pkgs/by-name/jj/jjui/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index 11db8c5557ad..71da7705ebd3 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "jjui";
-  version = "0.8.6";
+  version = "0.8.8";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FfodDPHMNiB4vh+v+m2k6x9o82idHM68Os9OuXpyVGY=";
+    hash = "sha256-5gDEcwS14Hur/Mw/vALPU+EVC5BJxdgjFbpzz1kcSKM=";
   };
 
   vendorHash = "sha256-YlOK+NvyH/3uvvFcCZixv2+Y2m26TP8+ohUSdl3ppro=";