From a0ea2c95092ce9623951c9883f6a22a73d3cd0a2 Mon Sep 17 00:00:00 2001
From: osbm <osmanfbayram@gmail.com>
Date: Mon, 6 Jan 2025 17:08:59 +0300
Subject: [PATCH 01/47] maintainers: add osbm

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 77493c7f1090..01cb6a646eeb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17069,6 +17069,12 @@
     githubId = 7820716;
     name = "orthros";
   };
+  osbm = {
+    email = "osmanfbayram@gmail.com";
+    github = "osbm";
+    githubId = 74963545;
+    name = "Osman Bayram";
+  };
   osener = {
     email = "ozan@ozansener.com";
     github = "ozanmakes";

From a322c9280a96012e3e759e2e4534ed6e5e2b3699 Mon Sep 17 00:00:00 2001
From: Chris Dombroski <cdombroski@gmail.com>
Date: Wed, 21 Aug 2024 22:04:28 -0400
Subject: [PATCH 02/47] zwave-js-ui: init at 9.27.8

Closes #230686
---
 pkgs/by-name/zw/zwave-js-ui/package.nix | 31 +++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/zw/zwave-js-ui/package.nix

diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
new file mode 100644
index 000000000000..7beef4bad52c
--- /dev/null
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nixosTests,
+}:
+
+buildNpmPackage rec {
+  pname = "zwave-js-ui";
+  version = "9.27.8";
+
+  src = fetchFromGitHub {
+    owner = "zwave-js";
+    repo = "zwave-js-ui";
+    tag = "v${version}";
+    hash = "sha256-6Twyzt2BMozph39GMG3JghA54LYi40c1+WfSbAAO2oM=";
+  };
+  npmDepsHash = "sha256-2cDuRCxyn/wNgZks2Qg+iwqRX8CVRz8qVYh4ZlCR55I=";
+
+  passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
+
+  meta = {
+    description = "Full featured Z-Wave Control Panel and MQTT Gateway";
+    homepage = "https://zwave-js.github.io/zwave-js-ui/";
+    license = lib.licenses.mit;
+    downloadPage = "https://github.com/zwave-js/zwave-js-ui/releases";
+    changelog = "https://github.com/zwave-js/zwave-js-ui/blob/v${version}/CHANGELOG.md";
+    mainProgram = "zwave-js-ui";
+    maintainers = with lib.maintainers; [ cdombroski ];
+  };
+}

From 4a6bc638b0341b173995f5bb371108025075b721 Mon Sep 17 00:00:00 2001
From: osbm <osmanfbayram@gmail.com>
Date: Fri, 10 Jan 2025 20:10:18 +0300
Subject: [PATCH 03/47] python312Packages.runstats: init at 2.0.0

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

diff --git a/pkgs/development/python-modules/runstats/default.nix b/pkgs/development/python-modules/runstats/default.nix
new file mode 100644
index 000000000000..019039a3ec1f
--- /dev/null
+++ b/pkgs/development/python-modules/runstats/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  setuptools,
+  cython,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pytest-cov-stub,
+  pytest-xdist,
+}:
+
+buildPythonPackage rec {
+  pname = "runstats";
+  version = "2.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "grantjenks";
+    repo = "python-runstats";
+    tag = "v${version}";
+    hash = "sha256-YF6S5w/ccWM08nl9inWGbaLKJ8/ivW6c7A9Ny20fldU=";
+  };
+
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytest-xdist
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "runstats" ];
+
+  meta = {
+    description = "Python module for computing statistics and regression in a single pass";
+    homepage = "https://github.com/grantjenks/python-runstats";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ osbm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 481a660c4f47..b3a74e6816a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14331,6 +14331,8 @@ self: super: with self; {
 
   runs = callPackage ../development/python-modules/runs { };
 
+  runstats = callPackage ../development/python-modules/runstats { };
+
   ruuvitag-ble = callPackage ../development/python-modules/ruuvitag-ble { };
 
   ruyaml = callPackage ../development/python-modules/ruyaml { };

From a50b5219b7fab362834249e092be8b081786082f Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Sat, 28 Dec 2024 23:25:13 -0500
Subject: [PATCH 04/47] immersed: 10.5.0 -> 10.6.0

---
 pkgs/by-name/im/immersed/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/im/immersed/package.nix b/pkgs/by-name/im/immersed/package.nix
index 6073d60fc309..ed235e9585d9 100644
--- a/pkgs/by-name/im/immersed/package.nix
+++ b/pkgs/by-name/im/immersed/package.nix
@@ -7,16 +7,20 @@
 }:
 let
   pname = "immersed";
-  version = "10.5.0";
+  version = "10.6.0";
 
   sources = rec {
     x86_64-linux = {
-      url = "https://web.archive.org/web/20240909144905if_/https://static.immersed.com/dl/Immersed-x86_64.AppImage";
-      hash = "sha256-/fc/URYJZftZPyVicmZjyvcGPLaHrnlsrERlQFN5E98=";
+      url = "https://web.archive.org/web/20241229041449/https://static.immersed.com/dl/Immersed-x86_64.AppImage";
+      hash = "sha256-u07QpGXEXbp7ApZgerq36x+4Wxsz08YAruIVnZeS0ck=";
+    };
+    aarch64-linux = {
+      url = "https://web.archive.org/web/20241229041902/https://static.immersed.com/dl/Immersed-aarch64.AppImage";
+      hash = "sha256-3BokV30y6QRjE94K7JQ6iIuQw1t+h3BKZY+nEFGTVHI=";
     };
     x86_64-darwin = {
-      url = "https://web.archive.org/web/20240910022037if_/https://static.immersed.com/dl/Immersed.dmg";
-      hash = "sha256-UkfB151bX0D5k0IBZczh36TWOOYJbBe5e6LIErON214=";
+      url = "https://web.archive.org/web/20241229041652/https://static.immersed.com/dl/Immersed.dmg";
+      hash = "sha256-Sgfm0giVR1dDIFIDpNmGmXLXLRgpMXrVxD/oyPc+Lq0=";
     };
     aarch64-darwin = x86_64-darwin;
   };

From d7ba3b54d82829f57d3a3bbdd0bd2b729ec8b0d4 Mon Sep 17 00:00:00 2001
From: Chris Dombroski <cdombroski@gmail.com>
Date: Wed, 21 Aug 2024 22:09:46 -0400
Subject: [PATCH 05/47] nixos/zwave-js-ui: init module

Provides systemd service and allows configuration of data directory
---
 .../manual/release-notes/rl-2505.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/home-automation/zwave-js-ui.nix  | 120 ++++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/zwave-js-ui.nix                   |  31 +++++
 5 files changed, 155 insertions(+)
 create mode 100644 nixos/modules/services/home-automation/zwave-js-ui.nix
 create mode 100644 nixos/tests/zwave-js-ui.nix

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 3586d5788c79..5a118c0f9982 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -22,6 +22,8 @@
 
 - [crab-hole](https://github.com/LuckyTurtleDev/crab-hole), a cross platform Pi-hole clone written in Rust using hickory-dns/trust-dns. Available as [services.crab-hole](#opt-services.crab-hole.enable).
 
+- [zwave-js-ui](https://zwave-js.github.io/zwave-js-ui/), a full featured Z-Wave Control Panel and MQTT Gateway. Available as [services.zwave-js-ui](#opt-services.zwave-js-ui.enable).
+
 - [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](options.html#opt-services.amazon-cloudwatch-agent.enable).
 
 - [Bat](https://github.com/sharkdp/bat), a {manpage}`cat(1)` clone with wings. Available as [programs.bat](options.html#opt-programs.bat).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 31d370ef6ccf..06538f26b4a0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -652,6 +652,7 @@
   ./services/home-automation/wyoming/satellite.nix
   ./services/home-automation/zigbee2mqtt.nix
   ./services/home-automation/zwave-js.nix
+  ./services/home-automation/zwave-js-ui.nix
   ./services/logging/SystemdJournal2Gelf.nix
   ./services/logging/awstats.nix
   ./services/logging/filebeat.nix
diff --git a/nixos/modules/services/home-automation/zwave-js-ui.nix b/nixos/modules/services/home-automation/zwave-js-ui.nix
new file mode 100644
index 000000000000..631986510b4f
--- /dev/null
+++ b/nixos/modules/services/home-automation/zwave-js-ui.nix
@@ -0,0 +1,120 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib)
+    getExe
+    mkIf
+    mkEnableOption
+    mkOption
+    mkPackageOption
+    types
+    ;
+  cfg = config.services.zwave-js-ui;
+in
+{
+  options.services.zwave-js-ui = {
+    enable = mkEnableOption "zwave-js-ui";
+
+    package = mkPackageOption pkgs "zwave-js-ui" { };
+
+    serialPort = mkOption {
+      type = types.path;
+      description = ''
+        Serial port for the Z-Wave controller.
+
+        Only used to grant permissions to the device; must be additionally configured in the application
+      '';
+      example = "/dev/serial/by-id/usb-example";
+    };
+
+    settings = mkOption {
+      type = types.submodule {
+        freeformType =
+          with types;
+          attrsOf (
+            nullOr (oneOf [
+              str
+              path
+              package
+            ])
+          );
+
+        options = {
+          STORE_DIR = mkOption {
+            type = types.str;
+            default = "%S/zwave-js-ui";
+            visible = false;
+            readOnly = true;
+          };
+
+          ZWAVEJS_EXTERNAL_CONFIG = mkOption {
+            type = types.str;
+            default = "%S/zwave-js-ui/.config-db";
+            visible = false;
+            readOnly = true;
+          };
+        };
+      };
+
+      description = ''
+        Extra environment variables passed to the zwave-js-ui process.
+
+        Check <https://zwave-js.github.io/zwave-js-ui/#/guide/env-vars> for possible options
+      '';
+      example = {
+        HOST = "::";
+        PORT = "8091";
+      };
+    };
+  };
+  config = mkIf cfg.enable {
+    systemd.services.zwave-js-ui = {
+      environment = cfg.settings;
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = getExe cfg.package;
+        RuntimeDirectory = "zwave-js-ui";
+        StateDirectory = "zwave-js-ui";
+        RootDirectory = "%t/zwave-js-ui";
+        BindReadOnlyPaths = [
+          "/nix/store"
+        ];
+        DeviceAllow = [ cfg.serialPort ];
+        DynamicUser = true;
+        SupplementaryGroups = [ "dialout" ];
+        CapabilityBoundingSet = [ "" ];
+        RestrictAddressFamilies = "AF_INET AF_INET6";
+        DevicePolicy = "closed";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = false;
+        NoNewPrivileges = true;
+        PrivateUsers = true;
+        PrivateTmp = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernalTunables = true;
+        ProtectProc = "invisible";
+        ProcSubset = "pid";
+        RemoveIPC = true;
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service @pkey"
+          "~@privileged @resources"
+        ];
+        UMask = "0077";
+      };
+    };
+  };
+  meta.maintainers = with lib.maintainers; [ cdombroski ];
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 927382091e72..62ffbbe43238 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1161,4 +1161,5 @@ in {
   zrepl = handleTest ./zrepl.nix {};
   zsh-history = handleTest ./zsh-history.nix {};
   zwave-js = handleTest ./zwave-js.nix {};
+  zwave-js-ui = handleTest ./zwave-js-ui.nix {};
 }
diff --git a/nixos/tests/zwave-js-ui.nix b/nixos/tests/zwave-js-ui.nix
new file mode 100644
index 000000000000..3aa90d75bb2e
--- /dev/null
+++ b/nixos/tests/zwave-js-ui.nix
@@ -0,0 +1,31 @@
+import ./make-test-python.nix (
+  { lib, ... }:
+  {
+    name = "zwave-js-ui";
+    meta.maintainers = with lib.maintainers; [ cdombroski ];
+
+    nodes = {
+      machine =
+        { ... }:
+        {
+          services.zwave-js-ui = {
+            enable = true;
+            serialPort = "/dev/null";
+            settings = {
+              HOST = "::";
+              PORT = "9999";
+            };
+          };
+        };
+    };
+
+    testScript = ''
+      start_all()
+
+      machine.wait_for_unit("zwave-js-ui.service")
+      machine.wait_for_open_port(9999)
+      machine.wait_until_succeeds("journalctl --since -1m --unit zwave-js-ui --grep 'Listening on port 9999host :: protocol HTTP'")
+      machine.wait_for_file("/var/lib/zwave-js-ui/nodes.json")
+    '';
+  }
+)

From d29914fb7510cf2f0fca01925dd209f7b73126ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?=
 <rapiteanu.catalin@gmail.com>
Date: Tue, 14 Jan 2025 21:56:02 +0200
Subject: [PATCH 06/47] quickgui: icon fix

Fix the icon paths for the desktop file.
---
 pkgs/by-name/qu/quickgui/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/qu/quickgui/package.nix b/pkgs/by-name/qu/quickgui/package.nix
index 7a39f648cacf..2080dc8be4e5 100644
--- a/pkgs/by-name/qu/quickgui/package.nix
+++ b/pkgs/by-name/qu/quickgui/package.nix
@@ -31,9 +31,10 @@ flutter.buildFlutterApplication rec {
   nativeBuildInputs = [ copyDesktopItems ];
 
   postFixup = ''
-    for SIZE in 16 32 48 64 128 256 512; do
-      mkdir -p $out/share/icons/hicolor/$SIZEx$SIZE/apps/
-      cp -av assets/resources/quickgui_$SIZE.png $out/share/icons/hicolor/$SIZEx$SIZE/apps/quickgui.png
+    for n in 16 32 48 64 128 256 512; do
+      size=$n"x"$n
+      mkdir -p $out/share/icons/hicolor/$size/apps/
+      cp -av assets/resources/quickgui_$n.png $out/share/icons/hicolor/$size/apps/quickgui.png
     done
   '';
 

From fd49f733fae41ef811575412e51b21762108020a Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 15 Jan 2025 20:24:25 +0800
Subject: [PATCH 07/47] firefox: wrapper: use __structuredAttrs = true

---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 9679e5d039c7..2d90bca10c71 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -181,6 +181,7 @@ let
       #############################
 
     in stdenv.mkDerivation {
+      __structuredAttrs = true;
       inherit pname version;
 
       desktopItem = makeDesktopItem ({

From 57159f9fd82766b60662de8279176c548c853813 Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Wed, 15 Jan 2025 14:18:18 +0100
Subject: [PATCH 08/47] cosmic-store: 1.0.0-alpha.4 -> 1.0.0-alpha.5.1

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

diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index d1bc9f05b928..7c2b2cc0241a 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -25,18 +25,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cosmic-store";
-  version = "1.0.0-alpha.4";
+  version = "1.0.0-alpha.5.1";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
     rev = "epoch-${version}";
-    hash = "sha256-VaOKF3cCnNbfUfJeuhx0wXRvprAnSspTe8gIiR/t2Ng=";
+    hash = "sha256-FK7faWiRNuQT8lIuRciP37U01csvtRGC9LyOXQCTjYk=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Zt2199zlxNbrN/S6bogp4JPM3ZMZpQL5jTXKMki6LQE=";
+  cargoHash = "sha256-8m9zEkaaM0bnA1cOVMyIFE1EdztWqkpGEuHd1fRaass=";
 
   postPatch = ''
     substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"

From 10150633effdd4ee96d75e8680015fcbb5129186 Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Wed, 15 Jan 2025 16:36:01 +0100
Subject: [PATCH 09/47] cosmic-store: Init vergen information

---
 pkgs/by-name/co/cosmic-store/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index 7c2b2cc0241a..f49198525edb 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -100,6 +100,9 @@ rustPlatform.buildRustPackage rec {
       }
   '';
 
+  env.VERGEN_GIT_COMMIT_DATE = "2025-01-13";
+  env.VERGEN_GIT_SHA = src.rev;
+
   passthru = {
     updateScript = nix-update-script { };
   };

From e74b6b40b91247278d7415a893c0360a3efe9fe5 Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Wed, 15 Jan 2025 16:41:30 +0100
Subject: [PATCH 10/47] cosmic-store: Use `tag` in `fetchFromGitHub`

---
 pkgs/by-name/co/cosmic-store/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index f49198525edb..9243b818a1c9 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
-    rev = "epoch-${version}";
+    tag = "epoch-${version}";
     hash = "sha256-FK7faWiRNuQT8lIuRciP37U01csvtRGC9LyOXQCTjYk=";
     fetchSubmodules = true;
   };

From c6e8f39e327b17b4be11329227fa1aa8f85b7a96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jan 2025 02:42:12 +0000
Subject: [PATCH 11/47] blockbench: 4.11.2 -> 4.12.0

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

diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix
index a5efc0611b98..8a5ccf20934a 100644
--- a/pkgs/by-name/bl/blockbench/package.nix
+++ b/pkgs/by-name/bl/blockbench/package.nix
@@ -12,13 +12,13 @@
 
 buildNpmPackage rec {
   pname = "blockbench";
-  version = "4.11.2";
+  version = "4.12.0";
 
   src = fetchFromGitHub {
     owner = "JannisX11";
     repo = "blockbench";
     tag = "v${version}";
-    hash = "sha256-rUMzn+3j+RL8DY8euS6a4MmdoIAVLXxXu9wvKNmK/TU=";
+    hash = "sha256-1pIIy2ifbV05hnmBoUcMfs0KDiBQDS6opwFqj6ECTIA=";
   };
 
   nativeBuildInputs =
@@ -28,7 +28,7 @@ buildNpmPackage rec {
       copyDesktopItems
     ];
 
-  npmDepsHash = "sha256-0hS+AjfYvkdxyM6CtXYgvjt49GmcCvyAdEFWfK8uaHc=";
+  npmDepsHash = "sha256-ytuAyEuf4zZm1hm/RXdltjisPNsmYrVnTfL1U3ULcCw=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 

From 6f10797ac2628a91ab6a051fe396638c34589bb4 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 15 Jan 2025 21:16:51 +0800
Subject: [PATCH 12/47] firefox; wrapper: specify makeWrapperArgs as an
 attribute

Provide a way to override makeWrapperArgs
---
 .../networking/browsers/firefox/wrapper.nix   | 84 ++++++++++++++-----
 1 file changed, 61 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 2d90bca10c71..374d581855e1 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -180,7 +180,7 @@ let
       #                           #
       #############################
 
-    in stdenv.mkDerivation {
+    in stdenv.mkDerivation (finalAttrs: {
       __structuredAttrs = true;
       inherit pname version;
 
@@ -246,6 +246,62 @@ let
       nativeBuildInputs = [ makeWrapper lndir jq ];
       buildInputs = [ browser.gtk3 ];
 
+      makeWrapperArgs = [
+        "--prefix"
+        "LD_LIBRARY_PATH"
+        ":"
+        "${finalAttrs.libs}"
+
+        "--suffix"
+        "GTK_PATH"
+        ":"
+        "${lib.concatStringsSep ":" finalAttrs.gtk_modules}"
+
+        "--suffix" "PATH"
+        ":"
+        "${placeholder "out"}/bin"
+
+        "--set"
+        "MOZ_APP_LAUNCHER"
+        launcherName
+
+        "--set"
+        "MOZ_LEGACY_PROFILES"
+        "1"
+
+        "--set"
+        "MOZ_ALLOW_DOWNGRADE"
+        "1"
+
+        "--suffix"
+        "XDG_DATA_DIRS"
+        ":"
+        "${adwaita-icon-theme}/share"
+
+        "--set-default"
+        "MOZ_ENABLE_WAYLAND"
+        "1"
+
+      ] ++ lib.optionals (!xdg-utils.meta.broken) [
+        # make xdg-open overrideable at runtime
+        "--suffix"
+        "PATH"
+        ":"
+        "${lib.makeBinPath [ xdg-utils ]}"
+
+      ] ++ lib.optionals hasMozSystemDirPatch [
+        "--set"
+        "MOZ_SYSTEM_DIR"
+        "${placeholder "out"}/lib/mozilla"
+
+      ] ++ lib.optionals (!hasMozSystemDirPatch && allNativeMessagingHosts != [ ]) [
+        "--run"
+        ''mkdir -p ''${MOZ_HOME:-~/.mozilla}/native-messaging-hosts''
+
+      ] ++ lib.optionals (!hasMozSystemDirPatch) (lib.concatMap (ext: [
+        "--run"
+        ''ln -sfLt ''${MOZ_HOME:-~/.mozilla}/native-messaging-hosts ${ext}/lib/mozilla/native-messaging-hosts/*''
+      ]) allNativeMessagingHosts);
 
       buildCommand = ''
         if [ ! -x "${browser}/bin/${applicationName}" ]
@@ -314,27 +370,9 @@ let
           mv "$executablePath" "$oldExe"
         fi
 
-        # make xdg-open overrideable at runtime
-        makeWrapper "$oldExe" \
-          "''${executablePath}${nameSuffix}" \
-            --prefix LD_LIBRARY_PATH ':' "$libs" \
-            --suffix-each GTK_PATH ':' "$gtk_modules" \
-            ${lib.optionalString (!xdg-utils.meta.broken) "--suffix PATH ':' \"${xdg-utils}/bin\""} \
-            --suffix PATH ':' "$out/bin" \
-            --set MOZ_APP_LAUNCHER "${launcherName}" \
-        '' + lib.optionalString hasMozSystemDirPatch ''
-            --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
-        '' + ''
-            --set MOZ_LEGACY_PROFILES 1 \
-            --set MOZ_ALLOW_DOWNGRADE 1 \
-            --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-            --suffix XDG_DATA_DIRS : '${adwaita-icon-theme}/share' \
-            --set-default MOZ_ENABLE_WAYLAND 1 \
-        '' + lib.optionalString (!hasMozSystemDirPatch) ''
-            ${lib.optionalString (allNativeMessagingHosts != []) "--run \"mkdir -p \\\${MOZ_HOME:-~/.mozilla}/native-messaging-hosts\""} \
-            ${lib.concatMapStringsSep " " (ext: "--run \"ln -sfLt \\\${MOZ_HOME:-~/.mozilla}/native-messaging-hosts ${ext}/lib/mozilla/native-messaging-hosts/*\"") allNativeMessagingHosts} \
-        '' + ''
-            "''${oldWrapperArgs[@]}"
+        appendToVar makeWrapperArgs --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+        concatTo makeWrapperArgs oldWrapperArgs
+        makeWrapper "$oldExe" "''${executablePath}${nameSuffix}" ''${makeWrapperArgs[@]}
         #############################
         #                           #
         #   END EXTRA PREF CHANGES  #
@@ -432,5 +470,5 @@ let
         hydraPlatforms = [];
         priority = (browser.meta.priority or lib.meta.defaultPriority) - 1; # prefer wrapper over the package
       };
-    };
+    });
 in lib.makeOverridable wrapper

From b4b622dacb618a7ff2cbf4b9a3ba986b7071fcf4 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Thu, 16 Jan 2025 10:27:44 +0100
Subject: [PATCH 13/47] rke2: use nurl instead of nix-prefetch in update script

There was an eval error when prefetching go dependencies with
`nix-prefetch`. Since nix-prefetch hasn't got an update in a long time,
I replaced it with `nurl`.
---
 pkgs/applications/networking/cluster/rke2/update-script.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/rke2/update-script.sh b/pkgs/applications/networking/cluster/rke2/update-script.sh
index 32be34c591a6..14965a066140 100755
--- a/pkgs/applications/networking/cluster/rke2/update-script.sh
+++ b/pkgs/applications/networking/cluster/rke2/update-script.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl git gnugrep gnused yq-go nix-prefetch go
+#!nix-shell -i bash -p curl git gnugrep gnused yq-go nurl go
 
 SHELL_FLAGS=$(set +o)
 set -x -eu -o pipefail
@@ -54,8 +54,7 @@ cat << EOF > "${WORKDIR}/${CHANNEL_NAME}/versions.nix"
 EOF
 
 set +e
-RKE2_VENDOR_HASH=$(nix-prefetch -I nixpkgs=$(git rev-parse --show-toplevel) \
-        "{ sha256 }: rke2_${CHANNEL_NAME}.goModules.overrideAttrs (_: { vendorHash = sha256; })")
+RKE2_VENDOR_HASH=$(nurl -e "(import $(git rev-parse --show-toplevel) {}).rke2_${CHANNEL_NAME}.goModules")
 set -e
 
 if [ -n "${RKE2_VENDOR_HASH:-}" ]; then

From 13e2ba4d716f082a91df641abedcea5795dac6fe Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Thu, 16 Jan 2025 10:30:34 +0100
Subject: [PATCH 14/47] rke2_testing: 1.31.1-rc3+rke2r1 -> 1.31.4-rc3+rke2r1

Release: https://github.com/rancher/rke2/releases/tag/v1.31.4-rc3%2Brke2r1
---
 .../cluster/rke2/testing/versions.nix         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/cluster/rke2/testing/versions.nix b/pkgs/applications/networking/cluster/rke2/testing/versions.nix
index 3e2175dcd472..52f513099516 100644
--- a/pkgs/applications/networking/cluster/rke2/testing/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/testing/versions.nix
@@ -1,14 +1,14 @@
 {
-  rke2Version = "1.31.1-rc3+rke2r1";
-  rke2Commit = "909d20d6a28cd7656b7177190f06f69f57927613";
-  rke2TarballHash = "sha256-9ZryOX6QMNpjDtsOXLOVNPjCc6AMAa+XDLOn1EpyCcg=";
-  rke2VendorHash = "sha256-7nWbWi4oJTOWZ5iZr9ptECDJJakPg4qZ7hW+tU7LBsI=";
-  k8sVersion = "v1.31.1";
-  k8sImageTag = "v1.31.1-rke2r1-build20240912";
-  etcdVersion = "v3.5.13-k3s1-build20240910";
+  rke2Version = "1.31.4-rc3+rke2r1";
+  rke2Commit = "b2d8003d79075e7331ab8f2d1e1a3c494ed944b9";
+  rke2TarballHash = "sha256-eTA+/fF6HuXDT4EUnvPIaJtLfbNGk9BXG+z3zCRPh9s=";
+  rke2VendorHash = "sha256-akP6XLkeBtVVGgaLBcn+e1bwFtMPRs1/NGR9VN5UuCo=";
+  k8sVersion = "v1.31.4";
+  k8sImageTag = "v1.31.4-rke2r1-build20241212";
+  etcdVersion = "v3.5.16-k3s1-build20241106";
   pauseVersion = "3.6";
-  ccmVersion = "v1.31.0-build20240910";
-  dockerizedVersion = "v1.31.1-rc3-rke2r1";
-  golangVersion = "go1.22.6";
+  ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016";
+  dockerizedVersion = "v1.31.4-rc3-rke2r1";
+  golangVersion = "go1.22.9";
   eol = "2025-10-28";
 }

From 49f567167a0f030faeafe5e35e4bda4c0f92f283 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Thu, 16 Jan 2025 10:31:55 +0100
Subject: [PATCH 15/47] rke2_latest: 1.31.1+rke2r1 -> 1.32.0+rke2r1

Release: https://github.com/rancher/rke2/releases/tag/v1.32.0%2Brke2r1
---
 .../cluster/rke2/latest/versions.nix          | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/cluster/rke2/latest/versions.nix b/pkgs/applications/networking/cluster/rke2/latest/versions.nix
index 90019cfa2c46..ebf9231a0fc8 100644
--- a/pkgs/applications/networking/cluster/rke2/latest/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/latest/versions.nix
@@ -1,14 +1,14 @@
 {
-  rke2Version = "1.31.1+rke2r1";
-  rke2Commit = "909d20d6a28cd7656b7177190f06f69f57927613";
-  rke2TarballHash = "sha256-9ZryOX6QMNpjDtsOXLOVNPjCc6AMAa+XDLOn1EpyCcg=";
-  rke2VendorHash = "sha256-7nWbWi4oJTOWZ5iZr9ptECDJJakPg4qZ7hW+tU7LBsI=";
-  k8sVersion = "v1.31.1";
-  k8sImageTag = "v1.31.1-rke2r1-build20240912";
-  etcdVersion = "v3.5.13-k3s1-build20240910";
+  rke2Version = "1.32.0+rke2r1";
+  rke2Commit = "1182e7eb91b27b1686e69306eb2e227928a27a38";
+  rke2TarballHash = "sha256-mmHQxiNcfgZTTdYPJPO7WTIlaCRM4CWsWwfRUcAR8ho=";
+  rke2VendorHash = "sha256-6Y3paEQJ8yHzONqalzoe15TjWhF3zGsM92LS1AcJ2GM=";
+  k8sVersion = "v1.32.0";
+  k8sImageTag = "v1.32.0-rke2r1-build20241212";
+  etcdVersion = "v3.5.16-k3s1-build20241106";
   pauseVersion = "3.6";
-  ccmVersion = "v1.31.0-build20240910";
-  dockerizedVersion = "v1.31.1-rke2r1";
-  golangVersion = "go1.22.6";
-  eol = "2025-10-28";
+  ccmVersion = "v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101";
+  dockerizedVersion = "v1.32.0-rke2r1";
+  golangVersion = "go1.23.3";
+  eol = "2026-02-28";
 }

From d9ad15355f5b15e4b2d09d5072b44d9427f3896d Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Thu, 16 Jan 2025 10:32:51 +0100
Subject: [PATCH 16/47] rke2_stable: 1.30.5+rke2r1 -> 1.31.4+rke2r1

Release: https://github.com/rancher/rke2/releases/tag/v1.31.4%2Brke2r1
---
 .../cluster/rke2/stable/versions.nix          | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/cluster/rke2/stable/versions.nix b/pkgs/applications/networking/cluster/rke2/stable/versions.nix
index 879a54b39937..af3ad0afacd1 100644
--- a/pkgs/applications/networking/cluster/rke2/stable/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/stable/versions.nix
@@ -1,14 +1,14 @@
 {
-  rke2Version = "1.30.5+rke2r1";
-  rke2Commit = "0c83bc82315cd61664880d0b52a7e070e9fbd623";
-  rke2TarballHash = "sha256-K5e7TNlL97PQ13IYnr4PSrXb4XaGJT9bPq55iWL0m1g=";
-  rke2VendorHash = "sha256-QIcVyWnedKNF10OqJ2WmZqZeKA+8hvwDQ4Pl+WUOEJY=";
-  k8sVersion = "v1.30.5";
-  k8sImageTag = "v1.30.5-rke2r1-build20240912";
-  etcdVersion = "v3.5.13-k3s1-build20240910";
+  rke2Version = "1.31.4+rke2r1";
+  rke2Commit = "5142beec71f7a61804840df5b434c2fd7137ce82";
+  rke2TarballHash = "sha256-Lebi3a7kNA9IQCVVkYfUoGEeEiLScqpOx1aTCFElDvw=";
+  rke2VendorHash = "sha256-DGmu1vFNcu1O2wuEwRZRBTL/TP2lJ9ggQ2M/Ix+jknM=";
+  k8sVersion = "v1.31.4";
+  k8sImageTag = "v1.31.4-rke2r1-build20241212";
+  etcdVersion = "v3.5.16-k3s1-build20241106";
   pauseVersion = "3.6";
-  ccmVersion = "v1.30.4-build20240910";
-  dockerizedVersion = "v1.30.5-rke2r1";
-  golangVersion = "go1.22.6";
-  eol = "2025-06-28";
+  ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016";
+  dockerizedVersion = "v1.31.4-rke2r1";
+  golangVersion = "go1.22.9";
+  eol = "2025-10-28";
 }

From d032ecd1b6427e614aea1691bf096538eb5df717 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 01:41:11 +0000
Subject: [PATCH 17/47] obs-studio-plugins.obs-shaderfilter: 2.3.2 -> 2.4.0

---
 .../video/obs-studio/plugins/obs-shaderfilter.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
index aacff57a8b5f..cce98123da02 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-shaderfilter";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-shaderfilter";
     rev = version;
-    sha256 = "sha256-INxz8W4AMKxRcfpZkhqqsWWWQQVEc2G9iFQBit1YA2E=";
+    sha256 = "sha256-k/9/8hMdD5ODNXFBBhaLxc6EjRImO+sGD274SkzenNg=";
   };
 
   nativeBuildInputs = [ cmake ];

From b3b43c13e8ac6d7ffa3ef2efc75c1134692dc93b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 02:14:56 +0000
Subject: [PATCH 18/47] httplib: 0.18.3 -> 0.18.4

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

diff --git a/pkgs/by-name/ht/httplib/package.nix b/pkgs/by-name/ht/httplib/package.nix
index 9620ac4ce1da..caff7ad8ef27 100644
--- a/pkgs/by-name/ht/httplib/package.nix
+++ b/pkgs/by-name/ht/httplib/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "httplib";
-  version = "0.18.3";
+  version = "0.18.4";
 
   src = fetchFromGitHub {
     owner = "yhirose";
     repo = "cpp-httplib";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mErNqoGLRXQ9jkJO87o2LlKZaZm6nb4nNiv4ylLT0pM=";
+    hash = "sha256-gXtp59zEk98n+/+p2YPi91QYNne8ANp+2r2lc4AAQnU=";
   };
 
   nativeBuildInputs = [ cmake ];

From f5e8b7a37093cd690423c50f9e38a2d0892e842a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 02:20:56 +0000
Subject: [PATCH 19/47] multiplex: 0.1.5 -> 0.1.6

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

diff --git a/pkgs/by-name/mu/multiplex/package.nix b/pkgs/by-name/mu/multiplex/package.nix
index f5d13a7570c5..6e09a526741d 100644
--- a/pkgs/by-name/mu/multiplex/package.nix
+++ b/pkgs/by-name/mu/multiplex/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "multiplex";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "pojntfx";
     repo = "multiplex";
     rev = "v${version}";
-    hash = "sha256-qc8RHvU7uGbqtMGy/mYXHCxqvE6gekgfFOWwej33+zQ=";
+    hash = "sha256-zU4Lnc66wY5lFxy82Mg52WSEGRyoEk9LY6E7LmeuKHs=";
   };
 
-  vendorHash = "sha256-VLlco6CeedoUM5gy8+5yLffAtMsjH/RQ+U4VYvY5mcg=";
+  vendorHash = "sha256-fS5wdBe1vuqaUBPcxLzhCMRztW8eq+MGojMVWlOZO+U=";
 
   nativeBuildInputs = [
     pkg-config

From 6a143c95a9195ae885d62d8ad4d31ee81bd39612 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 02:21:47 +0000
Subject: [PATCH 20/47] faas-cli: 0.16.38 -> 0.17.0

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

diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix
index 83adaeb0d99c..babe599b6558 100644
--- a/pkgs/by-name/fa/faas-cli/package.nix
+++ b/pkgs/by-name/fa/faas-cli/package.nix
@@ -18,13 +18,13 @@ let
 in
 buildGoModule rec {
   pname = "faas-cli";
-  version = "0.16.38";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "openfaas";
     repo = "faas-cli";
     rev = version;
-    sha256 = "sha256-X+lPky5oR+ngQ4nRePU0FzMBjJQinhSadoVsXeXzr+Q=";
+    sha256 = "sha256-ZyRKcvHCZ7xpZ2KeQRMYn7W0YI+qp29C3H26Uk55Vuw=";
   };
 
   vendorHash = null;

From 2348402cf9a988c791822dbe2ed02370c18d11ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 02:54:23 +0000
Subject: [PATCH 21/47] function-runner: 7.0.0 -> 7.0.1

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

diff --git a/pkgs/by-name/fu/function-runner/package.nix b/pkgs/by-name/fu/function-runner/package.nix
index 880ea453dc9c..2224285d3b5e 100644
--- a/pkgs/by-name/fu/function-runner/package.nix
+++ b/pkgs/by-name/fu/function-runner/package.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "function-runner";
-  version = "7.0.0";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ZdblRMvUeMcuW6Tji2FQe9Nfg1yRMvbeRiPABsQGBcI=";
+    sha256 = "sha256-i1RxK5NlKNV0mVm4vio557pM2claBTHTo8vmaNQPEvw=";
   };
 
-  cargoHash = "sha256-A30ApbAjPn7d+LzYp+Yms3nydHW9kc7bUmQ3oXMdcyw=";
+  cargoHash = "sha256-tOKNGXT3eyUBQnQSD6lsAzYK8rMKU7dCBsZhQYCSw7Q=";
 
   meta = with lib; {
     description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure";

From 381ff041e1041b0ab2f627c1e8f60bbca7b5fe45 Mon Sep 17 00:00:00 2001
From: Rishik-Y <73787402+Rishik-Y@users.noreply.github.com>
Date: Thu, 16 Jan 2025 22:25:02 +0530
Subject: [PATCH 22/47] gitkraken: add Rishik-Y to maintainers

---
 pkgs/by-name/gi/gitkraken/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 0bbd3e73d186..9e621c2896a3 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -91,6 +91,7 @@ let
       evanjs
       arkivm
       nicolas-goudry
+      Rishik-Y
     ];
     mainProgram = "gitkraken";
   };

From e1a3a64af950591b0e1fc019fefb100963053790 Mon Sep 17 00:00:00 2001
From: Rishik Yalamanchili <73787402+Rishik-Y@users.noreply.github.com>
Date: Wed, 15 Jan 2025 15:34:34 +0530
Subject: [PATCH 23/47] =?UTF-8?q?gitkraken:=2010.6.0=20=E2=86=92=2010.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 9e621c2896a3..8c56ff729866 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -57,24 +57,24 @@
 
 let
   pname = "gitkraken";
-  version = "10.6.0";
+  version = "10.6.1";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-      hash = "sha256-I4Pxz4pH5V4X1vguH1/TwoVDhZseKzkXZobqH/WVxTE=";
+      hash = "sha256-OzVBimAi9vAi6YhSRV0a51MWSmdHmHvvXbimeaNFpBU=";
     };
 
     x86_64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
-      hash = "sha256-k/ilZie8PVo8jjrR/7c0Yw6GpudzgZrc3uMwXeWd76M=";
+      hash = "sha256-MF6H3tNUw4P4BAzScMsolyB9Qage/7aZwe84gCBjyV4=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
-      hash = "sha256-d+CsEPoznjsyhFQHjMxFffT60ak8j9BtTSvDVmvXWDA=";
+      hash = "sha256-Akn8LSSYEj/dUU8iNWm5wO239wKGBmQp9RfzbCjI5Wo=";
     };
   };
 

From de0a499a56ee0d70aef7d6ce15544c7665f51f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Thu, 16 Jan 2025 22:20:46 +0200
Subject: [PATCH 24/47] nixos/headscale: remove much-loosened-up server_url
 check

server_url check [has been loosened upstream][1] and backported to
NixOS[2]. The new, much looser check, is not practical to be implemented
in Nix (you are welcome to give it a try; I've implemented the original
one).

Since the surface area is much smaller now (and the scenario much less
common), I think we can remove this assertion altogether.

[1]: https://github.com/juanfont/headscale/pull/2248
[2]: https://github.com/NixOS/nixpkgs/pull/358255
---
 nixos/modules/services/networking/headscale.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix
index 495dc6650e60..bca8493c867f 100644
--- a/nixos/modules/services/networking/headscale.nix
+++ b/nixos/modules/services/networking/headscale.nix
@@ -559,16 +559,6 @@ in
 
   config = lib.mkIf cfg.enable {
     assertions = [
-      {
-        # This is stricter than it needs to be but is exactly what upstream does:
-        # https://github.com/kradalby/headscale/blob/adc084f20f843d7963c999764fa83939668d2d2c/hscontrol/types/config.go#L799
-        assertion =
-          with cfg.settings;
-          dns.use_username_in_magic_dns or false
-          || dns.base_domain == ""
-          || !lib.hasInfix dns.base_domain server_url;
-        message = "server_url cannot contain the base_domain, this will cause the headscale server and embedded DERP to become unreachable from the Tailscale node.";
-      }
       {
         assertion = with cfg.settings; dns.magic_dns -> dns.base_domain != "";
         message = "dns.base_domain must be set when using MagicDNS";

From 8722653f0e4c4502208e778ad9d8fd1495f772e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 07:24:15 +0000
Subject: [PATCH 25/47] python312Packages.inscriptis: 2.5.0 -> 2.5.3

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

diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix
index bebe4ee0d608..495faf40a615 100644
--- a/pkgs/development/python-modules/inscriptis/default.nix
+++ b/pkgs/development/python-modules/inscriptis/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "inscriptis";
-  version = "2.5.0";
+  version = "2.5.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "weblyzard";
     repo = "inscriptis";
     tag = version;
-    hash = "sha256-9KEkXcdZ7USXfyIXGDrp4p4kJTzF2q30fvOccxF1hBU=";
+    hash = "sha256-s19ldUjJm0dnr0aFiKk0G7sXqnxQPgWo9kJYv96WLjM=";
   };
 
   build-system = [ poetry-core ];

From 56b02a99c516b0d3c538f0468e2f7707693aeee2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Jan 2025 09:04:02 +0100
Subject: [PATCH 26/47] python312Packages.inscriptis: update disabled

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

diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix
index 495faf40a615..cbf5de1d7a14 100644
--- a/pkgs/development/python-modules/inscriptis/default.nix
+++ b/pkgs/development/python-modules/inscriptis/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   version = "2.5.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "weblyzard";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     lxml
     requests
   ];

From d41e182946a8caad994476041f877c3ea365f579 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 08:31:36 +0000
Subject: [PATCH 27/47] python312Packages.spacy-transformers: 1.3.5 -> 1.3.6

---
 .../python-modules/spacy-transformers/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix
index 4f8f4b016896..8254b415a4bd 100644
--- a/pkgs/development/python-modules/spacy-transformers/default.nix
+++ b/pkgs/development/python-modules/spacy-transformers/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "spacy-transformers";
-  version = "1.3.5";
+  version = "1.3.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "explosion";
     repo = "spacy-transformers";
-    tag = "v${version}";
-    hash = "sha256-+KCRbjY4P52SWawU1NoMoe+HOV7iujFkwqVe87fWVTE=";
+    tag = "release-v${version}";
+    hash = "sha256-VZEx7mDTqcJ7c0qqDYc3GZzesqi/MwJawAZDUGdXMB0=";
   };
 
   build-system = [

From e0679e832426389607483e32342cf80208da11b4 Mon Sep 17 00:00:00 2001
From: Arsenii Zorin <me@wrb.bz>
Date: Fri, 17 Jan 2025 12:32:59 +0300
Subject: [PATCH 28/47] pulumi-bin: 3.145.0 -> 3.146.0

---
 pkgs/tools/admin/pulumi-bin/data.nix | 274 +++++++++++++--------------
 1 file changed, 137 insertions(+), 137 deletions(-)

diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
index 47c0ca5cb68a..dc705a85a159 100644
--- a/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,48 +1,48 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.145.0";
+  version = "3.146.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.145.0-linux-x64.tar.gz";
-        sha256 = "1wnwl2idcmxnk86gcm0db6a0qlzmcnb1i6jawpmzmhxpss3zpkwi";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.146.0-linux-x64.tar.gz";
+        sha256 = "0j8sm75njy1vfincnvm4bbm0ifylklxis8ymg3xzxvz2ig4hy8v3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.30.1-linux-amd64.tar.gz";
-        sha256 = "0jd2ywz49y45i9dhmhm1bwa6w7lxddy70g3vydpgl0n80aidq9p7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.31.0-linux-amd64.tar.gz";
+        sha256 = "04hivkbx3pbywbs93q52mdazcp0x7g4fgjwaqipqjhf35081hz09";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-linux-amd64.tar.gz";
         sha256 = "0k5mg57257v9h8njlx943fgrxbvszcqi9bhk41kna8j2claqdzdb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.72.0-linux-amd64.tar.gz";
-        sha256 = "1gw4i7i7krxz2nza313mhwnq08xflm246wsv4p226v6j3hjaxdji";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.73.0-linux-amd64.tar.gz";
+        sha256 = "0zq63rzqhgsxfvhds9hpqwfbjas6fysv21vrbvyxjq63p0lgkn51";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.0-linux-amd64.tar.gz";
-        sha256 = "1w53v3jc7kq2dfmr9agh0mvvflppgi1q5x1z1dpixkwb823pb5p4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.1-linux-amd64.tar.gz";
+        sha256 = "18qcszrd61f2xkf4qsmqgypmv2lsw06rhrp2p7i1igf3n4n9fx0k";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.10.2-linux-amd64.tar.gz";
         sha256 = "1cc8daw9m4gcmlrv3fn57i24mwcknvpcrw6c7g95a55mh33yfsdn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.66.2-linux-amd64.tar.gz";
-        sha256 = "1mvdmh53djs4nx4z4dvhnhgjnhfjwl879p7sqm3hcagmrkm9mnpq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.66.3-linux-amd64.tar.gz";
+        sha256 = "0z2xq9f9i3753dkwrpwpgdmcsi14bzx1dj85nv94ymrwf73vmsvm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.2-linux-amd64.tar.gz";
-        sha256 = "0v27r5izfcxj4kavb2rixlnb5rsz6rrlsib7z5sfj6wsyqmdhj0z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.1.0-linux-amd64.tar.gz";
+        sha256 = "0a04fixh7ncyqcg3r2yxjshf1mii3k2yc95nnh471lnjfp3srsgy";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.5.0-linux-amd64.tar.gz";
         sha256 = "05zhys5p3pssvnqjypcipkyiwpfmbxz578bph09kzsk2ha7fa1xp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.14.0-linux-amd64.tar.gz";
-        sha256 = "1b7wdv0a322xasabbgi1r9hawqjbl5abgqlwxwbvnlkdz18rq30r";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.15.0-linux-amd64.tar.gz";
+        sha256 = "06znd22irjpdm13p2r03a7jxkmx5fx5ky2pqsys979rbv9wgy1fp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.47.0-linux-amd64.tar.gz";
@@ -53,36 +53,36 @@
         sha256 = "0fq1zzbr119zq8minj7rqw5y6552zqqf1lcgy0c059bvd633fxdq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.39.0-linux-amd64.tar.gz";
-        sha256 = "0vw5zf8i2hfgdz8pkb8f2dl315y0ipqa1qg9718kl4y2l1nfcqmj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.40.0-linux-amd64.tar.gz";
+        sha256 = "1zwgh0wl6760inmwmig5fy5gnrmdz3y0ia81yxabcfrqnvm942aq";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.38.0-linux-amd64.tar.gz";
         sha256 = "0irn0vjxj3p89mnkqg08h4c6wjj95xrcnbd48kl7fkd9w986qblm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.8-linux-amd64.tar.gz";
-        sha256 = "1h2vwi6x20zwn6xzgdlxn8qm6qbszzindmwm3nnrjnib5k294y6l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.0-linux-amd64.tar.gz";
+        sha256 = "12jq1ypj4v3zcv25pn8jfcdj2dyg5mwi60jzci1m563b1mlkkqn1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz";
         sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.0-linux-amd64.tar.gz";
-        sha256 = "1jzzhwl3ln64fjjh6s4ln2dgn5lzmyis9c4vhckcx0h5hqwasij5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-linux-amd64.tar.gz";
+        sha256 = "0kk8c2a20ckvgx1afh6n7sm9z5cb3r6gs2c23yaq61yd6bkwklx5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.13.0-linux-amd64.tar.gz";
-        sha256 = "07ayqxdnipbhwmxk1mwpnmsn3z4kbgay0nlbyp0kxkzs4zhq512f";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.14.0-linux-amd64.tar.gz";
+        sha256 = "1p0hq4ahcjlkv80ssqcs1d24qyqhy42w7psp6mw4bv1x8xa00wpj";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.5.0-linux-amd64.tar.gz";
         sha256 = "0mxfvxs1hzs367y7zyqmsq3ns7fg3djva0yn8kpa7f2s2lp73rrd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.7.0-linux-amd64.tar.gz";
-        sha256 = "1v99h2kw7fiphwnw0if5bz6nca8d68g776ycmbw1kxc6807vz370";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.7.1-linux-amd64.tar.gz";
+        sha256 = "02szkajkl6ail4axwz28djxpp6ag19d40qsisy4kb0z6njcs1ng6";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz";
@@ -93,12 +93,12 @@
         sha256 = "01yhg9x4zdgfk1hhwn2l5cyaqp41k48mqdqrsyv64cn5wxwpbcn4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.19.0-linux-amd64.tar.gz";
-        sha256 = "0040jlqvmg1wcg0h1y2n532g900vi65vafnpph0a62yc4bjpn13w";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.21.0-linux-amd64.tar.gz";
+        sha256 = "1lqy4x2gb3q8a06zvxcnkci6gxnnandrvims0wiph45100vmlnyn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.30.1-linux-amd64.tar.gz";
-        sha256 = "004avpda37r482f6pdixdnxj8apx1l7pdmdv2y3ppidpnphlwz1n";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.31.0-linux-amd64.tar.gz";
+        sha256 = "02dpm2qlcwapqllaq6z3pbdki8kssji4q0yjsjgayihwvx901cn1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.7-linux-amd64.tar.gz";
@@ -121,12 +121,12 @@
         sha256 = "1asxa70f97mbcj56gipprfaw4ckwxwknh40j65jcnsgigi2lzq8q";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.0.1-linux-amd64.tar.gz";
-        sha256 = "19dcxf6mac4pi6yxgxx8skhq8bjygxhbmryf3br74ccr7v74zihb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.0-linux-amd64.tar.gz";
+        sha256 = "0vgi3zl9kgzwgpjf820wddmwcbx9yxqy6hgf5kpnsyn595jdpnc1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.106.1-linux-amd64.tar.gz";
-        sha256 = "0gbzfm53m16yrwgshm5smfi0s58wlvz02i7zdvhiyfdhrycfqgjw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.108.0-linux-amd64.tar.gz";
+        sha256 = "05i72hjs2asiay169axdpc1dxq1j4n1fgh6ngr6bpipmd0zkvpw8";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.0-linux-amd64.tar.gz";
@@ -141,8 +141,8 @@
         sha256 = "0n7nmabrrgcxzjplgjdz94krrcn5ymvhlj2p73zav3pjk84baxgr";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.4.0-linux-amd64.tar.gz";
-        sha256 = "18fnfj9d5n029jncl3lpghdp8nbkm51hh2aglbdgnb1x84i6v7a5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.5.0-linux-amd64.tar.gz";
+        sha256 = "0qh18pnvc6lv0c6gpbpxfgn7hzpd5w2k9h6hq349s7ff1ap4zas1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.5-linux-amd64.tar.gz";
@@ -163,44 +163,44 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.145.0-darwin-x64.tar.gz";
-        sha256 = "14v6qnhvj234fklbblvc8f3zalwiaq5fp8mrxq9z5clh6cnhmzwz";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.146.0-darwin-x64.tar.gz";
+        sha256 = "0qcyz6wzyh4m47dxlbwf33fapyqaa90fij3agi5a0ac77bxj9flb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.30.1-darwin-amd64.tar.gz";
-        sha256 = "02ba6d5zhd0nv1bc412fmav94sqjsjv4iv9171w4jgzmiinkxxpg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.31.0-darwin-amd64.tar.gz";
+        sha256 = "1n9b35gp3k615f82j4qgn434m8mlf3c9mvfm1bsgnsg1x3bxkvb3";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-darwin-amd64.tar.gz";
         sha256 = "0nczhgib7hcyh7midm0s5b8zbi76lkyfz76c3lmkqnr0kj5nzb5y";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.72.0-darwin-amd64.tar.gz";
-        sha256 = "02qk68pm4wg51pm17bll6d0n6c6yyz3xxxr01hh3blw2sm7py49l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.73.0-darwin-amd64.tar.gz";
+        sha256 = "0qyh4n7n5i4rf0v9hk47jr966lq5bh1mvrn5idrzcsq1vb0jg1qg";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.0-darwin-amd64.tar.gz";
-        sha256 = "0agi5hj59sgsipwwx53l3lskb6i53h72rhy08vdfj4a0lkpxi27z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.1-darwin-amd64.tar.gz";
+        sha256 = "1pb0ri7lv47mdck67f4rzbzlkfnvyff3m6yigbmcyfzwki0ha0dv";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.10.2-darwin-amd64.tar.gz";
         sha256 = "1jivb6r1jkakcd2ncs1dnmmffmff9a7gcc1pkj9iiamkhdl7v63s";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.66.2-darwin-amd64.tar.gz";
-        sha256 = "0vfwzy13f4s3a9riph68j5hpj7vqprf0vhvsjnw0jm3s950j26z6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.66.3-darwin-amd64.tar.gz";
+        sha256 = "0rlij9ny1nc4nbgnlhx5szi4jj2g87vpqiqzdckvqzcvn1nlc1kv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.2-darwin-amd64.tar.gz";
-        sha256 = "0a8nzr37k5r7csaykpqs9f4l0ihy797gygvq26yvrdkmqpapwmaz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.1.0-darwin-amd64.tar.gz";
+        sha256 = "1y1559jbdlinbp8r9pgdqqfry9qc4f6x9z9gwy78ir7spziqvnkb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.5.0-darwin-amd64.tar.gz";
         sha256 = "0pj7bwii760w3nw5izpn5n0vd9298h747iyqm82x035pzshfg9vq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.14.0-darwin-amd64.tar.gz";
-        sha256 = "1ad87ivxn7g746mp3w6rbrl3vawic4vhflna7bvpqry60yiy48yh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.15.0-darwin-amd64.tar.gz";
+        sha256 = "0rsvdrnpf6qabf3qn0swpnni1b75khg1qaq3r0a6n5wxf2n69r6i";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.47.0-darwin-amd64.tar.gz";
@@ -211,36 +211,36 @@
         sha256 = "15ym540lhzwi5k2nplcsxgf1yxxndiznmjda38wwky9hxxvgc260";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.39.0-darwin-amd64.tar.gz";
-        sha256 = "1h11j3ya8gsivgw9ci1wk4jqdk0mb64c6w65f78mmnmayijmwx9j";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.40.0-darwin-amd64.tar.gz";
+        sha256 = "1bnz8l3jv9w7dk1r7vv9qfzadskqgbj7qs8ch2kpw33yxzvf8d8q";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.38.0-darwin-amd64.tar.gz";
         sha256 = "12gsdn1pa0pk9sjhaizx6mabvzih9j1jndbyzdvi3wja3bzis0kx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.8-darwin-amd64.tar.gz";
-        sha256 = "1nxswkpfidd4g1zvvizv04dxs6vdkbvf4vgz2jy79wzcl15yhy60";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.0-darwin-amd64.tar.gz";
+        sha256 = "0g69kgihhl2bd806gmwfpkcn28q7dcz26p6lrm6cpigg6q85dz3i";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz";
         sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.0-darwin-amd64.tar.gz";
-        sha256 = "1i7pcidm0f0izzk9iwsqfsl6wxicdb0iy60s87zglpkic5r9r1f2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-darwin-amd64.tar.gz";
+        sha256 = "1gk5i030y4jsdzsj8nl90xf0403mlkq1lhc8nqw9a8iyc6m60g3w";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.13.0-darwin-amd64.tar.gz";
-        sha256 = "1p7ppn2ysyjahrcs88iyj4rjjs3dr6729zjwi2fibr5mi4nx17j5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.14.0-darwin-amd64.tar.gz";
+        sha256 = "0b58iwzbayi5i0y8k2n6m1bbk0srm208q19ks9lqzqlz9zxz2zj4";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.5.0-darwin-amd64.tar.gz";
         sha256 = "1bwwavanh5krbldbq1bdw8mph51c6xcr4vpy1lq9m9xkz0pvmv0m";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.7.0-darwin-amd64.tar.gz";
-        sha256 = "1hysxr87616gwh9jl0471aslb0sm8vm8kd2aq1zs1x58i67zyas9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.7.1-darwin-amd64.tar.gz";
+        sha256 = "1c632hwrrn9f9gqsxwf0rbqbpcda4s2d7iwz1yb729k00hc196gs";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz";
@@ -251,12 +251,12 @@
         sha256 = "0xsc5v66wq5zi1gwak7zli7sbixhsxwxcd60z70x71wk9hr2c490";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.19.0-darwin-amd64.tar.gz";
-        sha256 = "0afrav52zmjpqah87cw9pwzi0l3jpkdbgjkkcmvgvfsm101hqlyx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.21.0-darwin-amd64.tar.gz";
+        sha256 = "03qgz82i4agc0ybhx6f4lifk9ilgxy7kllrvc0kag0mm9nnf080a";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.30.1-darwin-amd64.tar.gz";
-        sha256 = "1fny5ls9rwjaplfs983pfcxw3s7jkflqh43f83222m8s3vff4rbx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.31.0-darwin-amd64.tar.gz";
+        sha256 = "1c17pfabh73krhi22v8rzfpica82p95yvi4b6w9ygv6k53psq7ax";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.7-darwin-amd64.tar.gz";
@@ -279,12 +279,12 @@
         sha256 = "0ljc34sqvb87mld58h63fa1g2z0gfx11qhim6dr370ga5jycqiq0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.0.1-darwin-amd64.tar.gz";
-        sha256 = "1rm8whi1hkp3cj00f8nhzjdbw3zm8fvfqly73dgmzd0zmpvipvv5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.0-darwin-amd64.tar.gz";
+        sha256 = "05vl7i2y2l0lxk9qy1cyb917m71v542yc12jd0a7l87gyynmacic";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.106.1-darwin-amd64.tar.gz";
-        sha256 = "1pmd6613b1agpah1nj8l6w1i6lvknz581gvdb24k0372k5mmzk5r";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.108.0-darwin-amd64.tar.gz";
+        sha256 = "14p20qpfj1xqyi2j4bl4zhfbw0fh404lm9bhb2kb6xsgi2b5fkfv";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.0-darwin-amd64.tar.gz";
@@ -299,8 +299,8 @@
         sha256 = "0n6l3i9ysi4r2p27lbmyb0ch9fwl6bm2fzsp0q30dw60fql4a0wa";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.4.0-darwin-amd64.tar.gz";
-        sha256 = "1b4zz500np3sqqp1i0v2prpf2irz9y2cky2fyx78zrzyspvhyqy3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.5.0-darwin-amd64.tar.gz";
+        sha256 = "0bc0mawc1b7v3cvgmj0by6bq9rhhz19v64zrbzqnxyzc8n4z74ni";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.5-darwin-amd64.tar.gz";
@@ -321,44 +321,44 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.145.0-linux-arm64.tar.gz";
-        sha256 = "05wglbxxk5y9892ika2181g0l2ycx82giiyb8c3q8bjvcaayz14r";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.146.0-linux-arm64.tar.gz";
+        sha256 = "043wand15nlhxwr5j6grzgksmllvly6hd95xsmahdbz67jpf0n8a";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.30.1-linux-arm64.tar.gz";
-        sha256 = "19q3z69jws5q42zm11qpj31sl78gwls5xq927782kvvgn1f0ad7z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.31.0-linux-arm64.tar.gz";
+        sha256 = "1m0r3rsqsxllcddfhpidyv5x5j8arjw97qbdz1s1sbf2v9mg57nk";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-linux-arm64.tar.gz";
         sha256 = "054pcilsi1qfnf2him7hb0nw9r1w7q47c60ska3cmw27q1xjvjsk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.72.0-linux-arm64.tar.gz";
-        sha256 = "12awyfdqghs6asv75q0msq003ylwsw7z3imb8xs4cdaivb89ajdy";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.73.0-linux-arm64.tar.gz";
+        sha256 = "1m27ksr9mc8v7n7nwarj0j2zzjpg7wrgfg6lfg0dsldcsj6ikmza";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.0-linux-arm64.tar.gz";
-        sha256 = "0wrkwn38zd6mrs87fy6zzybwilv9syr7xh835az73kixw1jb049x";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.1-linux-arm64.tar.gz";
+        sha256 = "1f1lv8d5sca2n3d6l5yazzrxkcclmfbmay2jgpr01vnlkdj4lkpz";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.10.2-linux-arm64.tar.gz";
         sha256 = "11dpqww3xlmi7lwp2jplj2vasw5r4kas8ap7kcbqg8j8fhbai2nf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.66.2-linux-arm64.tar.gz";
-        sha256 = "057145adn1b0snpl3xwfn8yvgri1wjkb4nwb497srm5rzphik5rh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.66.3-linux-arm64.tar.gz";
+        sha256 = "15f7jnb82j9c1ldypgvz2jxkrhpmp6p7qq06v4ywfjqz014giily";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.2-linux-arm64.tar.gz";
-        sha256 = "1d7gnfnqvndlp9jcj68xfjcmjbz6g1zxavx81jpcnykgxdizvlqf";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.1.0-linux-arm64.tar.gz";
+        sha256 = "149d3cqdvmshn96w2d8xy0z6b1adb1g3wlf0l6ycm6zwgjk7mgyc";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.5.0-linux-arm64.tar.gz";
         sha256 = "1v77n7f3421kpyrfyswy91xzdlasq9ari9fabv2d0qq4hrwvb2yi";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.14.0-linux-arm64.tar.gz";
-        sha256 = "1vkgzm2lwvhkh9cpxs318k5ka2s92pbic94m1g4icifwzbx7wsik";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.15.0-linux-arm64.tar.gz";
+        sha256 = "065x7cf0ifyx2vwqinz9ynri9xqzwc2ygwzg73bq15n435w8dqhr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.47.0-linux-arm64.tar.gz";
@@ -369,36 +369,36 @@
         sha256 = "0i4hwjj4j4q9qrrzb47k243hgcs7rhdk2xir6af5h4nds9z0h4yh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.39.0-linux-arm64.tar.gz";
-        sha256 = "196kjn74hrhiymsgdbr6wff9abyish9qbjvq5khgn8g8z5s57xm3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.40.0-linux-arm64.tar.gz";
+        sha256 = "0wccbp4a8ndjaxccskqdq0703if5aajyq8fj48xpz6vljg519dp9";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.38.0-linux-arm64.tar.gz";
         sha256 = "1di0kh17kmg4b4szy3qzy46j4145sw5yrqq13wv1x5fcsn629lh9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.8-linux-arm64.tar.gz";
-        sha256 = "1vmlx2n2018imnz4gmkzg3ydsw2wmn9chbqnfa8qhyxi6s2x1q33";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.0-linux-arm64.tar.gz";
+        sha256 = "0pf10isc9dj5pbnyc8y330pkfvsk9cs4mz7iflhx74zb12fdb2xi";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz";
         sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.0-linux-arm64.tar.gz";
-        sha256 = "0qwkdav9gjqqzxwkbb8lcaw15f9swzj4g4hfgf0gixm16bahghwq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-linux-arm64.tar.gz";
+        sha256 = "12b7957wk70cw4miymav3asw7xddkx2ivk6v55d8izmiw2lkpfhm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.13.0-linux-arm64.tar.gz";
-        sha256 = "00k72s414i75jj1abindwb0ssacykps5swcfisa6nxgxq5k9wcyg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.14.0-linux-arm64.tar.gz";
+        sha256 = "14wlvpx7c3d83p963ydl1i3gdw9qdllfa71d2mvjbm5pds8vdj0d";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.5.0-linux-arm64.tar.gz";
         sha256 = "1h5alfsyxfimjhalr15ny3qnfiq983srbls66bcpyqdh4936gkc2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.7.0-linux-arm64.tar.gz";
-        sha256 = "1brycq3vpwn5d6wx090vs71h118w6nwfjawbmrcq6zksnrdxlnfa";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.7.1-linux-arm64.tar.gz";
+        sha256 = "18111v3f5w5p01j1qshj9rdx0k9y3avif6irbknlijbns4visaai";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz";
@@ -409,12 +409,12 @@
         sha256 = "1kxkirach4c8jsqm46zqizqp5998i4d5m6paqj8anc0893jcslq4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.19.0-linux-arm64.tar.gz";
-        sha256 = "02lg881llij5n16wyq1ip3vv8v389sczn9f2n8cmpk5xvy403v5p";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.21.0-linux-arm64.tar.gz";
+        sha256 = "1smpbc7j6pnpmk3x8lg1pfvly3pzs841hq4hy6d79yahkk2bha0i";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.30.1-linux-arm64.tar.gz";
-        sha256 = "1m40li98mpldqzx90fraisnm9l0w3m1f5rkigyg40fxkarg7z6gg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.31.0-linux-arm64.tar.gz";
+        sha256 = "01rsxgqkcmlwpz7rpqkwz90hrgd6w8w85vj0k458n0s2qw2c0h9h";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.7-linux-arm64.tar.gz";
@@ -437,12 +437,12 @@
         sha256 = "1q4yz5s9wrnxyrw5vnrnsh9c8lc9jfjwr9zdq85yf1vfbcg65ngn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.0.1-linux-arm64.tar.gz";
-        sha256 = "1vi3rp9kj8rwzxrwr79cbmnl9ycfhny55qnrp7c228vfn7k7a4gj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.0-linux-arm64.tar.gz";
+        sha256 = "1jvswpxks7pvl064ccp17fxqp3sb2r8hq2kdap3p6wp7a0rv3aik";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.106.1-linux-arm64.tar.gz";
-        sha256 = "0rq2bp61v89wijgm0yk4j2rkzca5rq82b0r01q7rv0g8b0ik8i8q";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.108.0-linux-arm64.tar.gz";
+        sha256 = "1f8mvr3v755klcd2agwwr895h5q82dk8iw6ccd2vamwxgnm94d9q";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.0-linux-arm64.tar.gz";
@@ -457,8 +457,8 @@
         sha256 = "0jhzzasspwxkm29liv7rqmc7fgwlc2494b66jdv3hkvk54b6naxf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.4.0-linux-arm64.tar.gz";
-        sha256 = "1ki9fhd3sgbrza2i4a7nyscx17iqml51bjj7fmbxb7bdpcpxw1n3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.5.0-linux-arm64.tar.gz";
+        sha256 = "0nbxzb9s9d0vlrd8f266sw9ri9jrh1fnlpqqjvp9pqyvw7cb3hjv";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.5-linux-arm64.tar.gz";
@@ -479,44 +479,44 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.145.0-darwin-arm64.tar.gz";
-        sha256 = "16n6avp7qg3g480rmmn7nscwn2dbv1m7ng0ddnq98595q2gwb17f";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.146.0-darwin-arm64.tar.gz";
+        sha256 = "134c9xcqjddq3kgjvc70kfr5zpx1wbkfvs7xg464ja624kw7an8c";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.30.1-darwin-arm64.tar.gz";
-        sha256 = "04z67zpkjjfyywydck2yinxcx6cjaxm74d0qk5a40marb6my9m21";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.31.0-darwin-arm64.tar.gz";
+        sha256 = "1r6xwd1w4qs293j291xiidvf0pyjd6z41jmybkb3mzn4rlkpqb4z";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-darwin-arm64.tar.gz";
         sha256 = "1x3jajip18dhs39bpi3yyj3mcwcyyxd4ijnsbq71a98cws55iipq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.72.0-darwin-arm64.tar.gz";
-        sha256 = "1qfmkk6pdjvd057a0wa8d38ia45j3m95zi7mc71vqcdjia2mz54j";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.73.0-darwin-arm64.tar.gz";
+        sha256 = "1zzhl6vpa4bx9kz3kc3l3aaakbw0v4vk9sggk7rgm3xvxp0rczmh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.0-darwin-arm64.tar.gz";
-        sha256 = "0nf76081znvmm9kpfrvs7mzx8nzdlrrsxkg7k5qhmc8ildb1kxck";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.1-darwin-arm64.tar.gz";
+        sha256 = "0azvji0ks38fnvc48sm177k6xnxdjd8bm4wc2shhaq8x02jp9gmq";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.10.2-darwin-arm64.tar.gz";
         sha256 = "0b86vp0kw8xbip2iv8b5jyb0d2ifc7h7ki012xcks2clic75pvhp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.66.2-darwin-arm64.tar.gz";
-        sha256 = "1pqwi3lymdxgjcchjq55wxl9d38wqwj6wvv94kp270qnqzjj7p1j";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.66.3-darwin-arm64.tar.gz";
+        sha256 = "1wxjxk94ib8490diyl9sw71ijqngv27amcbclqrz27bmv9x4yxlb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.2-darwin-arm64.tar.gz";
-        sha256 = "0c8anw7p0lmngw33258s07m6qb2gl4v0lby0lkbsbk4rg3rpi3h2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.1.0-darwin-arm64.tar.gz";
+        sha256 = "0skam4n2q1kk3i8a3yy8w3pci2r4yky7sk92cr50w40w6ridsw4a";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.5.0-darwin-arm64.tar.gz";
         sha256 = "05j1z30z22lxzlpyb2x08vkg1jknqaqmx3wgfz90bh99mmlbriir";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.14.0-darwin-arm64.tar.gz";
-        sha256 = "12819pf9i5fmqyy4wjs2vrvhmf6p7f10jbpkyzfz4a31aqlnb8q5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.15.0-darwin-arm64.tar.gz";
+        sha256 = "05mgbxyykv12l3qjjdqjy5ml3f79nk5qf7843vxd3avwcnf17ac3";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.47.0-darwin-arm64.tar.gz";
@@ -527,36 +527,36 @@
         sha256 = "1ydh3yl29kpqxwsmrrrlghlpmww1s16rjc116wb000gnj60c0bx5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.39.0-darwin-arm64.tar.gz";
-        sha256 = "1ssgx02f9naiiwczfcl7508v763h517yvk8v7bnw30vdgh7cz84y";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.40.0-darwin-arm64.tar.gz";
+        sha256 = "0si21hz3wvi9msvd2faysk8j0cqzxpvii3pha60jgicp7sg37myp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.38.0-darwin-arm64.tar.gz";
         sha256 = "0gq0ahnk79cgi07jicjvdascrxv6wqcg27npd5wqn43nphix7mk6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.8-darwin-arm64.tar.gz";
-        sha256 = "0l4i4cpjbsys7rb7fi0jlll60z2snk304l0v7r1rvfkk56ndhsk9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.0-darwin-arm64.tar.gz";
+        sha256 = "10v1kaxmaxwi0adkf34nqh1pdflw00grr1cym0f7j81lakqfa0xm";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz";
         sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.0-darwin-arm64.tar.gz";
-        sha256 = "0ix0dia9n2ygcvy96syv4z8knkfrlqkvghrhkkqdg2d9hfczpbwv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.1-darwin-arm64.tar.gz";
+        sha256 = "02wcx7m64kifcd93bdfvbhw4fl7wakinwcr0bp739dqwywiz1bad";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.13.0-darwin-arm64.tar.gz";
-        sha256 = "1jlsrrrlabkp4bzmdx6sxi8h6r13qb3ac3743in66f3c3ycfivn7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.14.0-darwin-arm64.tar.gz";
+        sha256 = "1viz6gp6vhwp060f0505amh66knic4n9kv0ypk8b04igyxx1ns8l";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.5.0-darwin-arm64.tar.gz";
         sha256 = "1n33bfvwa605bk60ws2qhr13y13qwgpc6lxqwnb5khix7hwzmhhm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.7.0-darwin-arm64.tar.gz";
-        sha256 = "12129fvw5371n4wlf05dkj6a7akbmiksdkcxlr0kkjr1mz5h0i9s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.7.1-darwin-arm64.tar.gz";
+        sha256 = "1n4cg7j4jg9nzbbxphsz69nhc9rkp5flw4152ynzrf5sh3w2db35";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz";
@@ -567,12 +567,12 @@
         sha256 = "081dkcdjvkvzx8gn3vwhf94xcgml11fn83hylgc8rqh1b0r4x16f";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.19.0-darwin-arm64.tar.gz";
-        sha256 = "02f85m64zps5x6vw9xi5zdj493axfnyhdkbx1i236iz3aij1xis6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.21.0-darwin-arm64.tar.gz";
+        sha256 = "0ygjvdzh1qn06w1vfiyvswxgjik1cf4bdglkdp954m3ik2rxqj01";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.30.1-darwin-arm64.tar.gz";
-        sha256 = "03s4if1xxns3fr6qn976glmah9593nys5j6albhbzxyjfclkbkms";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.31.0-darwin-arm64.tar.gz";
+        sha256 = "1idz9jy229dqv758kvic9j78187v1yp0a2xk7hzsds1ma9kzi52j";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.7-darwin-arm64.tar.gz";
@@ -595,12 +595,12 @@
         sha256 = "0h8mmlxv8xwdfy6yyvc19ffxqs1795sgmk5jz2frscm8nn9vazrl";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.0.1-darwin-arm64.tar.gz";
-        sha256 = "1v9v9bvmblxzk3rc363kmlaf396xw21rfq7mgbkwyhdaps40v9d2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.0-darwin-arm64.tar.gz";
+        sha256 = "0mbszjhmiad7614420zbn9rlxi6x2di23ab4dfrgadhsvk40fc5b";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.106.1-darwin-arm64.tar.gz";
-        sha256 = "0hj2pkvz7wahbqyx5dikjjgx7cflfncm26b2xh5wybjcf451672r";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.108.0-darwin-arm64.tar.gz";
+        sha256 = "0ib85r1967sxrpad1mnwbgr8ga32yg6r3l1pqpbvsk8cik028idm";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.0-darwin-arm64.tar.gz";
@@ -615,8 +615,8 @@
         sha256 = "0qdxm378byic772kw1pwiqn86b8x9cjpq2x8ld3ngbp0j7yw57b6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.4.0-darwin-arm64.tar.gz";
-        sha256 = "0g6agqki3a5liacadswfjc5wbh4d9sv17wng7vbk1bwsmv5r0wl7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.5.0-darwin-arm64.tar.gz";
+        sha256 = "0y4v0am2lwihr1k1qxbiszn0vgmcdgfi7w82lw6vxcdm2sbg8sna";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.5-darwin-arm64.tar.gz";

From b734fd2cafe952e93608ec909ebba2723237fb25 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Dec 2024 13:09:11 +0100
Subject: [PATCH 29/47] python314: 3.14.0a2 -> 3.14.0a3

https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0-alpha-3
---
 pkgs/development/interpreters/python/cpython/default.nix | 9 ++++++++-
 pkgs/development/interpreters/python/default.nix         | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index c5bb4b556432..d0cb05268d43 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -294,7 +294,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
   ] ++ optionals (pythonOlder "3.12") [
     # https://github.com/python/cpython/issues/90656
     ./loongarch-support.patch
-  ] ++ optionals (pythonAtLeast "3.12") [
+  ] ++ optionals (pythonAtLeast "3.12" && pythonOlder "3.14") [
     ./3.12/CVE-2024-12254.patch
   ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [
     # backport fix for https://github.com/python/cpython/issues/95855
@@ -506,6 +506,13 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     # This allows build Python to import host Python's sysconfigdata
     mkdir -p "$out/${sitePackages}"
     ln -s "$out/lib/${libPrefix}/"_sysconfigdata*.py "$out/${sitePackages}/"
+    '' + optionalString (pythonAtLeast "3.14") ''
+    # Get rid of retained dependencies on -dev packages, and remove from _sysconfig_vars*.json introduced with Python3.14
+    for i in $out/lib/${libPrefix}/_sysconfig_vars*.json; do
+       sed -i $i -e "s|$TMPDIR|/no-such-path|g"
+    done
+    find $out/lib -name '_sysconfig_vars*.json*' -print -exec nuke-refs ${keep-references} '{}' +
+    ln -s "$out/lib/${libPrefix}/"_sysconfig_vars*.json "$out/${sitePackages}/"
     '' + optionalString stripConfig ''
     rm -R $out/bin/python*-config $out/lib/python*/config-*
     '' + optionalString stripIdlelib ''
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 9d0034091ffa..b9812e18ee00 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -100,9 +100,9 @@ in {
       major = "3";
       minor = "14";
       patch = "0";
-      suffix = "a2";
+      suffix = "a3";
     };
-    hash = "sha256-L/nhAUc0Kz79afXNnMBuxGJQ8qBGWHWZ0Y4srGnAWSA=";
+    hash = "sha256-lDSd8gdFaldaiGfCC0ykNPhw4ZINzcyP33l+GvSavpA=";
     inherit passthruFun;
   };
   # Minimal versions of Python (built without optional dependencies)

From 6c7c9055de74d3414cfae78272b29eea721daf65 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 17 Jan 2025 19:53:00 +0900
Subject: [PATCH 30/47] python314: 3.14.0a3 -> 3.14.0a4

https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0-alpha-4
---
 pkgs/development/interpreters/python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index b9812e18ee00..582c37cd2c79 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -100,9 +100,9 @@ in {
       major = "3";
       minor = "14";
       patch = "0";
-      suffix = "a3";
+      suffix = "a4";
     };
-    hash = "sha256-lDSd8gdFaldaiGfCC0ykNPhw4ZINzcyP33l+GvSavpA=";
+    hash = "sha256-wk8HiBhzwdRgIoeVymyoyZEw4wx3PJFGPTDX6o/w5ws=";
     inherit passthruFun;
   };
   # Minimal versions of Python (built without optional dependencies)

From 282f064a7bf4b7622f717549653219ceadc81ecb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 11:33:20 +0000
Subject: [PATCH 31/47] python312Packages.python-box: 7.3.1 -> 7.3.2

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

diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix
index af805c336781..80bfb3ef7e05 100644
--- a/pkgs/development/python-modules/python-box/default.nix
+++ b/pkgs/development/python-modules/python-box/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "python-box";
-  version = "7.3.1";
+  version = "7.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "cdgriffith";
     repo = "Box";
     tag = version;
-    hash = "sha256-id1gLT26jETRQ0fyVNTIhSZqM+fDmpaVbB56GxPhYr8=";
+    hash = "sha256-aVPjIoizqC0OcG5ziy/lvp/JsFSUvcLUqJ03mKViKFs=";
   };
 
   build-system = [

From 63ac0242da63f09beebd9ea07db83fa2c8b53dad Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 1 Jan 2025 23:27:43 +0100
Subject: [PATCH 32/47] zed-editor: refactor installPhase

---
 pkgs/by-name/ze/zed-editor/package.nix | 103 ++++++++++++-------------
 1 file changed, 50 insertions(+), 53 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 6644a1c78dd5..e566e9d1523a 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -218,68 +218,65 @@ rustPlatform.buildRustPackage rec {
     ];
 
   installPhase =
-    if stdenv.hostPlatform.isDarwin then
-      ''
-        runHook preInstall
+    ''
+      runHook preInstall
 
-        # cargo-bundle expects the binary in target/release
-        mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed target/release/zed
+      release_target="target/${stdenv.hostPlatform.rust.cargoShortTarget}/release"
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # cargo-bundle expects the binary in target/release
+      mv $release_target/zed target/release/zed
 
-        pushd crates/zed
+      pushd crates/zed
 
-        # Note that this is GNU sed, while Zed's bundle-mac uses BSD sed
-        sed -i "s/package.metadata.bundle-stable/package.metadata.bundle/" Cargo.toml
-        export CARGO_BUNDLE_SKIP_BUILD=true
-        app_path=$(cargo bundle --release | xargs)
+      # Note that this is GNU sed, while Zed's bundle-mac uses BSD sed
+      sed -i "s/package.metadata.bundle-stable/package.metadata.bundle/" Cargo.toml
+      export CARGO_BUNDLE_SKIP_BUILD=true
+      app_path=$(cargo bundle --release | xargs)
 
-        # We're not using Zed's fork of cargo-bundle, so we must manually append their plist extensions
-        # Remove closing tags from Info.plist (last two lines)
-        head -n -2 $app_path/Contents/Info.plist > Info.plist
-        # Append extensions
-        cat resources/info/*.plist >> Info.plist
-        # Add closing tags
-        printf "</dict>\n</plist>\n" >> Info.plist
-        mv Info.plist $app_path/Contents/Info.plist
+      # We're not using Zed's fork of cargo-bundle, so we must manually append their plist extensions
+      # Remove closing tags from Info.plist (last two lines)
+      head -n -2 $app_path/Contents/Info.plist > Info.plist
+      # Append extensions
+      cat resources/info/*.plist >> Info.plist
+      # Add closing tags
+      printf "</dict>\n</plist>\n" >> Info.plist
+      mv Info.plist $app_path/Contents/Info.plist
 
-        popd
+      popd
 
-        mkdir -p $out/Applications $out/bin
-        # Zed expects git next to its own binary
-        ln -s ${git}/bin/git $app_path/Contents/MacOS/git
-        mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $app_path/Contents/MacOS/cli
-        mv $app_path $out/Applications/
+      mkdir -p $out/Applications $out/bin
+      # Zed expects git next to its own binary
+      ln -s ${lib.getExe git} $app_path/Contents/MacOS/git
+      mv $release_target/cli $app_path/Contents/MacOS/cli
+      mv $app_path $out/Applications/
 
-        # Physical location of the CLI must be inside the app bundle as this is used
-        # to determine which app to start
-        ln -s $out/Applications/Zed.app/Contents/MacOS/cli $out/bin/zeditor
+      # Physical location of the CLI must be inside the app bundle as this is used
+      # to determine which app to start
+      ln -s $out/Applications/Zed.app/Contents/MacOS/cli $out/bin/zeditor
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      install -Dm755 $release_target/zed $out/libexec/zed-editor
+      install -Dm755 $release_target/cli $out/bin/zeditor
 
-        runHook postInstall
-      ''
-    else
-      ''
-        runHook preInstall
+      install -Dm644 ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
+      install -Dm644 ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png
 
-        mkdir -p $out/bin $out/libexec
-        cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed $out/libexec/zed-editor
-        cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zeditor
-
-        install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
-        install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png
-
-        # extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux (envsubst)
-        # and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name)
-        (
-          export DO_STARTUP_NOTIFY="true"
-          export APP_CLI="zeditor"
-          export APP_ICON="zed"
-          export APP_NAME="Zed"
-          export APP_ARGS="%U"
-          mkdir -p "$out/share/applications"
-          ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed.desktop"
-        )
-
-        runHook postInstall
-      '';
+      # extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux (envsubst)
+      # and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name)
+      (
+        export DO_STARTUP_NOTIFY="true"
+        export APP_CLI="zeditor"
+        export APP_ICON="zed"
+        export APP_NAME="Zed"
+        export APP_ARGS="%U"
+        mkdir -p "$out/share/applications"
+        ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed.desktop"
+      )
+    ''
+    + ''
+      runHook postInstall
+    '';
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 942e3746d8530b7d889f5faed60a6ef17505bc54 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 17 Jan 2025 13:39:17 +0100
Subject: [PATCH 33/47] python312Packages.awkward: clean derivation

---
 pkgs/development/python-modules/awkward/default.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index 849b4b43b780..8722a72cf635 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -24,8 +24,6 @@
   pyarrow,
   pytest-xdist,
   pytestCheckHook,
-
-  stdenv,
 }:
 
 buildPythonPackage rec {
@@ -73,14 +71,6 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # Need to be run on a GPU platform.
     "tests-cuda"
-    # JAX is broken
-    "tests/test_2603_custom_behaviors_with_jax.py"
-  ];
-
-  disabledTests = [
-    # AssertionError: Regex pattern did not match.
-    "test_serialise_with_nonserialisable_attrs"
-    "test_serialise_with_nonserialisable_attrs"
   ];
 
   meta = {

From 8717537f021bc3642233f340a7febe6cb52ab04b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 12:41:06 +0000
Subject: [PATCH 34/47] tbls: 1.79.4 -> 1.80.0

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

diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix
index 6ef891587148..c667a4f20baf 100644
--- a/pkgs/by-name/tb/tbls/package.nix
+++ b/pkgs/by-name/tb/tbls/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "tbls";
-  version = "1.79.4";
+  version = "1.80.0";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "tbls";
     rev = "v${version}";
-    hash = "sha256-o/ZhXoenK3xlflRMXS9NtnW23VBiDmDPSGlHtE3cNiM=";
+    hash = "sha256-3ix0BmPPHbbQReF5XRlrmIqfYGqcHLCbbe4dcXFF3ys=";
   };
 
-  vendorHash = "sha256-SkddF8ZxvGRQ+/tWnmlcoaTs3MRfVgQWX4MZ05nZ9XA=";
+  vendorHash = "sha256-8Kj4G/oYKaoANU09kI56nF9kURzg+Y8pB7YO1b6nvuA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From cdfff874ae7a5c514522f0293c8513db4f7804e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 12:42:05 +0000
Subject: [PATCH 35/47] procs: 0.14.8 -> 0.14.9

---
 pkgs/tools/admin/procs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 119620766a77..40fa98cab14e 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.14.8";
+  version = "0.14.9";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = "procs";
     rev = "v${version}";
-    hash = "sha256-ShkFUJqjBeaZm0pD1WrUNmHpGP75KnkeBveCFs8UFqE=";
+    hash = "sha256-lm9bGu2AIVulVBcMzEpxxek5g6ajQmBENHeHV210g0k=";
   };
 
-  cargoHash = "sha256-KGeK6fKuVe78Q2k/gx3GNieTit0LxzGJQX5htas3QW0=";
+  cargoHash = "sha256-zruW6Cf7zspqv8LadCIXZ0iQdlQ7CVfWhkxLwDA+IFc=";
 
   nativeBuildInputs = [ installShellFiles ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];

From 6086a8bb0fd097925adf317cae8ddf46a38bcc9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 13:00:16 +0000
Subject: [PATCH 36/47] envconsul: 0.13.2 -> 0.13.3

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

diff --git a/pkgs/by-name/en/envconsul/package.nix b/pkgs/by-name/en/envconsul/package.nix
index 202832ea3ba7..a7144c07e7a1 100644
--- a/pkgs/by-name/en/envconsul/package.nix
+++ b/pkgs/by-name/en/envconsul/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "envconsul";
-  version = "0.13.2";
+  version = "0.13.3";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "envconsul";
     rev = "v${version}";
-    hash = "sha256-GZU1lEAI3k5EUU/z4gHR8plECudwp+YYyPSk7E0NQtI=";
+    hash = "sha256-hPq+r4DOMu2elOpaT0xDQoelUb1D/zYM/a6fZZdu/AY=";
   };
 
-  vendorHash = "sha256-ehxeupO8CrKqkqK11ig7Pj4XTh61VOE4rT2T2SsChxw=";
+  vendorHash = "sha256-0hrZsh08oWqhVqvM6SwUskYToH6Z4YWmV/i0V2MkFMw=";
 
   ldflags = [
     "-s"

From 6fa67ff1adf5c875f541cb79cffb8bf77dde80a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 13:10:01 +0000
Subject: [PATCH 37/47] gomi: 1.1.6 -> 1.1.8

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

diff --git a/pkgs/by-name/go/gomi/package.nix b/pkgs/by-name/go/gomi/package.nix
index 8bcab4cd2d1b..51d5fdf850cd 100644
--- a/pkgs/by-name/go/gomi/package.nix
+++ b/pkgs/by-name/go/gomi/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gomi";
-  version = "1.1.6";
+  version = "1.1.8";
 
   src = fetchFromGitHub {
     owner = "b4b4r07";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-YsR2KU5Np6xQHkjM8KAoDp/XZ/9DkwBlMbu2IX5OQlk=";
+    sha256 = "sha256-AIH5ADJPkZEbYLHPyMRPMeO78Y+JQDTzfvrtLTKjrsY=";
   };
 
-  vendorHash = "sha256-n31LUfdgbLQ/KmcFi8LdqmDHXgzbSCc+dnustGvc5SY=";
+  vendorHash = "sha256-/9VuRb0dtKJccJYM7Jasm+xyFxphtN77YQvQkDZ8FcE=";
 
   subPackages = [ "." ];
 

From 8e192f6e45a4c443168333efc8ef1c310a444da9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 13:24:28 +0000
Subject: [PATCH 38/47] kubernetes-helmPlugins.helm-diff: 3.9.13 -> 3.9.14

---
 .../networking/cluster/helm/plugins/helm-diff.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
index 49ed760ffc8b..934d18d01228 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "helm-diff";
-  version = "3.9.13";
+  version = "3.9.14";
 
   src = fetchFromGitHub {
     owner = "databus23";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-676xMnedfGF3aVub78eQo2KYJgJLxKg9g3Nm6D9lYA0=";
+    hash = "sha256-9YXsbxcth6v+4OW2nJjRK47dR4b8fn5izvjLfGeS5qI=";
   };
 
-  vendorHash = "sha256-qfdxEXiNJlaJPzpwY4GY+mYZAxjkMJyZO8PgcqJCPos=";
+  vendorHash = "sha256-pn5ipX2kXuR2tHO2LE5m34xJLpB7R6jLYW+KALSPgxo=";
 
   ldflags = [
     "-s"

From e5c749464ae3a40797d57098747b5837b43c0550 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 17 Jan 2025 14:48:28 +0100
Subject: [PATCH 39/47] python312Packages.coffea: disable flaky test

https://github.com/scikit-hep/coffea/issues/1246
---
 pkgs/development/python-modules/coffea/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix
index ff4870e21a5f..870c9f3b950f 100644
--- a/pkgs/development/python-modules/coffea/default.nix
+++ b/pkgs/development/python-modules/coffea/default.nix
@@ -97,6 +97,10 @@ buildPythonPackage rec {
     # Requires internet access
     # https://github.com/CoffeaTeam/coffea/issues/1094
     "test_lumimask"
+
+    # Flaky: FileNotFoundError: [Errno 2] No such file or directory: 'nminusone.npz'
+    # https://github.com/scikit-hep/coffea/issues/1246
+    "test_packed_selection_nminusone_dak"
   ];
 
   __darwinAllowLocalNetworking = true;

From 79ff0fcd9ae1d25b85f66196db3f1010959cc29a Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Fri, 17 Jan 2025 15:46:57 +0200
Subject: [PATCH 40/47] xf86videonouveau: unbreak build

Signed-off-by: Alexander V. Nikolaev <avn@avnik.info>
---
 pkgs/servers/x11/xorg/overrides.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 6014bd7fb19c..23fe9de21d6b 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -592,9 +592,12 @@ self: super:
   });
 
   xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];
-    buildInputs =  attrs.buildInputs ++ [ xorg.utilmacros ];
-    # fixes `implicit declaration of function 'wfbScreenInit'; did you mean 'fbScreenInit'?`
+    nativeBuildInputs = attrs.nativeBuildInputs ++ [
+      autoreconfHook
+      buildPackages.xorg.utilmacros # For xorg-utils.m4 macros
+      buildPackages.xorg.xorgserver # For xorg-server.m4 macros
+    ];
+    # fixes `implicit declaration of function 'wfbScreenInit'; did you mean 'fbScreenInit'?
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
   });
 

From 61c8fb4d3731302d0ed612e877ac0d86d22c32d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 14:02:21 +0000
Subject: [PATCH 41/47] python312Packages.gvm-tools: 24.12.1 -> 25.1.0

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

diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index e344f1af9c03..f1e2cbbed7b9 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "gvm-tools";
-  version = "24.12.1";
+  version = "25.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = "gvm-tools";
     tag = "v${version}";
-    hash = "sha256-0YIWfeHd0Z50xschRHrVijhKQdDxvwR+gowEuAIc+OU=";
+    hash = "sha256-+2GoWsGDMrsKyTbDB3MVWRtgqyEZuSWznCW8eUmYVFE=";
   };
 
   __darwinAllowLocalNetworking = true;

From 9407fd5364ab8c5695a33ca7ac29c1e642573f96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 14:07:40 +0000
Subject: [PATCH 42/47] python312Packages.niaaml: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix
index f0f1d6db0d77..33553d8c1121 100644
--- a/pkgs/development/python-modules/niaaml/default.nix
+++ b/pkgs/development/python-modules/niaaml/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "niaaml";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "firefly-cpp";
     repo = "NiaAML";
     tag = version;
-    hash = "sha256-VMZLEirE01Q9eyQIhV18PepGWmBcxLIwNeuVf7EuSWE=";
+    hash = "sha256-3wr+72j/0HR9gRwxdzP4QyLKFaobkrD4QwTtiAUik0Q=";
   };
 
   pythonRelaxDeps = [

From 8e5e031b642b75fa60816c403e2b6cde6fe8a61c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2025 14:27:56 +0000
Subject: [PATCH 43/47] python312Packages.youless-api: 2.1.2 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix
index 9dad2aef7dcd..aab71a4d7b67 100644
--- a/pkgs/development/python-modules/youless-api/default.nix
+++ b/pkgs/development/python-modules/youless-api/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "youless-api";
-  version = "2.1.2";
+  version = "2.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "gjong";
     repo = "youless-python-bridge";
     tag = version;
-    hash = "sha256-MvGLIhkBbcGThKeqtlzVZct2o9PBLwcAELmn5pW3R6I=";
+    hash = "sha256-BAIwShbIZaX5QOkxajwv6vtL8/EouHA3ELCLAm9ylKA=";
   };
 
   build-system = [ setuptools ];

From b681022ae8df3d55cab0b3318d19dd87caf8a163 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 17 Jan 2025 16:06:17 +0100
Subject: [PATCH 44/47] mailmanPackages.python.pkgs.hiredis: fix override

	error: fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both).

Fixes: 0cd04d30366f ("treewide: migrate fetchgit `rev = "refs/tags/..."` to `tag`")
---
 pkgs/servers/mail/mailman/python.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix
index e107bd0bcea8..dc7601afa8da 100644
--- a/pkgs/servers/mail/mailman/python.nix
+++ b/pkgs/servers/mail/mailman/python.nix
@@ -24,7 +24,7 @@ lib.fix (self: python3.override {
       hiredis = super.hiredis.overrideAttrs (new: { src, ... }: {
         version = "3.1.0";
         src = src.override {
-          rev = "refs/tags/v${new.version}";
+          tag = new.version;
           hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg=";
         };
       });

From b4c31cf7436e389b8c16a6fc58ccd61a924db11f Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 1 Jan 2025 16:39:10 +0100
Subject: [PATCH 45/47] zed-editor: add remote_server

---
 pkgs/by-name/ze/zed-editor/package.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index e566e9d1523a..5394efcf7073 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -39,8 +39,10 @@
   libX11,
   libXext,
   livekit-libwebrtc,
+  testers,
 
   withGLES ? false,
+  buildRemoteServer ? true,
 }:
 
 assert withGLES -> stdenv.hostPlatform.isLinux;
@@ -95,6 +97,8 @@ rustPlatform.buildRustPackage rec {
   pname = "zed-editor";
   version = "0.169.2";
 
+  outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";
+
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
@@ -168,7 +172,7 @@ rustPlatform.buildRustPackage rec {
   cargoBuildFlags = [
     "--package=zed"
     "--package=cli"
-  ];
+  ] ++ lib.optional buildRemoteServer "--package=remote_server";
 
   # Required on darwin because we don't have access to the
   # proprietary Metal shader compiler.
@@ -274,6 +278,9 @@ rustPlatform.buildRustPackage rec {
         ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed.desktop"
       )
     ''
+    + lib.optionalString buildRemoteServer ''
+      install -Dm755 $release_target/remote_server $remote_server/bin/zed-remote-server-stable-$version
+    ''
     + ''
       runHook postInstall
     '';
@@ -302,6 +309,12 @@ rustPlatform.buildRustPackage rec {
     };
     fhs = fhs { };
     fhsWithPackages = f: fhs { additionalPkgs = f; };
+    tests = {
+      remoteServerVersion = testers.testVersion {
+        package = zed-editor.remote_server;
+        command = "zed-remote-server-stable-${version} version";
+      };
+    };
   };
 
   meta = {

From 8bcc7e660d56689c1092d37be433469deeff12d6 Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Fri, 17 Jan 2025 23:52:36 +0800
Subject: [PATCH 46/47] ast-grep: add xiaoxiangmoe as maintainer

---
 pkgs/by-name/as/ast-grep/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index 070f2bd0e195..b97c17d3996e 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -56,6 +56,7 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/ast-grep/ast-grep/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
+      xiaoxiangmoe
       montchr
       lord-valen
       cafkafk

From 59233ebe4d4a41b282d7cb381eda8c0598fccac9 Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Fri, 17 Jan 2025 23:53:04 +0800
Subject: [PATCH 47/47] ast-grep: ast-grep: rename command sg to ast-grep

---
 .../manual/release-notes/rl-2505.section.md   |  2 +
 pkgs/by-name/as/ast-grep/package.nix          | 37 +++++++++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index d6cf4e149779..9aa01ef0b4b7 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -115,6 +115,8 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
+- `ast-grep` remove `sg` command to prevent conflict with `sg` command from shadow-utils. If you need legacy sg command compatibility with old code, you can use `ast-grep.override { enableLegacySg = true; }`
+
 - `binwalk` was updated to 3.1.0, which has been rewritten in rust. The python module is no longer available.
   See the release notes of [3.1.0](https://github.com/ReFirmLabs/binwalk/releases/tag/v3.1.0) for more information.
 
diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index b97c17d3996e..4dc3ff39490c 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -4,6 +4,9 @@
   fetchFromGitHub,
   stdenv,
   installShellFiles,
+  buildPackages,
+  versionCheckHook,
+  enableLegacySg ? false,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -26,12 +29,27 @@ rustPlatform.buildRustPackage rec {
     rm .cargo/config.toml
   '';
 
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd sg \
-      --bash <($out/bin/sg completions bash) \
-      --fish <($out/bin/sg completions fish) \
-      --zsh <($out/bin/sg completions zsh)
-  '';
+  cargoBuildFlags = [
+    "--package ast-grep --bin ast-grep"
+  ] ++ lib.optionals enableLegacySg [ "--package ast-grep --bin sg" ];
+
+  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
+    let
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
+    ''
+      installShellCompletion --cmd ast-grep \
+        --bash <(${emulator} $out/bin/ast-grep completions bash) \
+        --fish <(${emulator} $out/bin/ast-grep completions fish) \
+        --zsh <(${emulator} $out/bin/ast-grep completions zsh)
+    ''
+    + lib.optionalString enableLegacySg ''
+      installShellCompletion --cmd sg \
+        --bash <(${emulator} $out/bin/sg completions bash) \
+        --fish <(${emulator} $out/bin/sg completions fish) \
+        --zsh <(${emulator} $out/bin/sg completions zsh)
+    ''
+  );
 
   checkFlags =
     [
@@ -48,9 +66,14 @@ rustPlatform.buildRustPackage rec {
       "--skip=test::test_load_parser"
       "--skip=test::test_register_lang"
     ];
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
 
   meta = with lib; {
-    mainProgram = "sg";
+    mainProgram = "ast-grep";
     description = "Fast and polyglot tool for code searching, linting, rewriting at large scale";
     homepage = "https://ast-grep.github.io/";
     changelog = "https://github.com/ast-grep/ast-grep/blob/${src.rev}/CHANGELOG.md";