From 186761aafae442728e72824c36b8f75a1347f94e Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Tue, 26 Nov 2024 18:51:46 +0800
Subject: [PATCH 01/33] python312Packages.hcs-utils: fix build

---
 .../python-modules/hcs-utils/default.nix      | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/hcs-utils/default.nix b/pkgs/development/python-modules/hcs-utils/default.nix
index 0a424e7424bdb..203f98503f62e 100644
--- a/pkgs/development/python-modules/hcs-utils/default.nix
+++ b/pkgs/development/python-modules/hcs-utils/default.nix
@@ -6,7 +6,8 @@
   pythonOlder,
   setuptools,
   six,
-  versioneer,
+  poetry-core,
+  fetchFromGitLab,
 }:
 
 buildPythonPackage rec {
@@ -16,33 +17,32 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.9";
 
-  src = fetchPypi {
-    pname = "hcs_utils";
-    inherit version;
-    hash = "sha256-a2xO+hdyJQjgIEcjtmDZLicyz2kzKRjtpEhge5yaa7M=";
+  src = fetchFromGitLab {
+    owner = "hcs";
+    repo = "hcs_utils";
+    rev = "77668de42895dedb6b4baddf4207f331776de897"; # No tags for 2.1
+    hash = "sha256-T0a2lYi3umRZQInEsxnLf5p6+IxkUmGJhgW8l2ESDd0=";
   };
 
-  postPatch = ''
-    # Remove vendorized versioneer.py
-    rm versioneer.py
-  '';
-
   build-system = [
     setuptools
-    versioneer
+    poetry-core
   ];
 
-  dependencies = [ six ];
+  dependencies = [
+    six
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  disabledTests = [
+    "test_expand" # It depends on FHS
+  ];
 
-  disabledTests = [ "test_expand" ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Library collecting some useful snippets";
     homepage = "https://gitlab.com/hcs/hcs_utils";
-    license = licenses.isc;
-    maintainers = with maintainers; [ lovek323 ];
-    platforms = platforms.unix;
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ lovek323 ];
   };
 }

From 2ffd9decddeadc8b7883ec20fcda98df5f72ab7a Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 11 Dec 2024 08:12:59 +0100
Subject: [PATCH 02/33] moodle: 4.4.4 -> 4.4.5

Undisclosed security fixes are mentioned in the release notes.

Changes:
https://moodledev.io/general/releases/4.4/4.4.5
---
 pkgs/servers/web-apps/moodle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix
index c1fdf27b7a606..90493e72e6084 100644
--- a/pkgs/servers/web-apps/moodle/default.nix
+++ b/pkgs/servers/web-apps/moodle/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }:
 
 let
-  version = "4.4.4";
+  version = "4.4.5";
 
   versionParts = lib.take 2 (lib.splitVersion version);
   # 4.2 -> 402, 3.11 -> 311
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz";
-    hash = "sha256-9ZMQvv0fL6JwUD5ZJnzfzZkiGOfOV9zMc0hX3PKttBw=";
+    hash = "sha256-CronmobN0OFZHhMCmruPae34j1FNrvMLO02q1VlQfgY=";
   };
 
   phpConfig = writeText "config.php" ''

From c66232084acb7077cd8730b03e471e2dbac28821 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Dec 2024 04:53:33 +0000
Subject: [PATCH 03/33] fcgi: 2.4.2 -> 2.4.3

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

diff --git a/pkgs/by-name/fc/fcgi/package.nix b/pkgs/by-name/fc/fcgi/package.nix
index 95ab22961ce47..9096aa413c939 100644
--- a/pkgs/by-name/fc/fcgi/package.nix
+++ b/pkgs/by-name/fc/fcgi/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fcgi";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchFromGitHub {
     owner = "FastCGI-Archives";
     repo = "fcgi2";
     rev = finalAttrs.version;
-    hash = "sha256-4U/Mc2U7tK/fo4B9NBwYKzDuLApvSzWR4mqWzZ00H8o=";
+    hash = "sha256-P8wkiURBc5gV0PxwemkIIpTPOpug6YIZE//3j5U76K0=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From b15bda29660c5e892c89f9f93d16f35c6fc677dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 10:15:53 +0000
Subject: [PATCH 04/33] fflogs: 8.14.49 -> 8.15.4

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

diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix
index 1fa42f43a3d95..ef6bb3d62e485 100644
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "fflogs";
-  version = "8.14.49";
+  version = "8.15.4";
   src = fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-pgI6xiTz1Gm5OMUnJsXD/B2eBm3MkPKIYQ6DgyVdwYo=";
+    hash = "sha256-/lpt4pZT7etNCmT1lg5Vfx0IP9pbaqBUppJlu8HN47E=";
   };
   extracted = appimageTools.extractType2 { inherit pname version src; };
 in

From 0f294077bbb88be504e63f2aed6f8ae350ff8104 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 14:23:37 +0000
Subject: [PATCH 05/33] tomcat: 11.0.0 -> 11.0.2

---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index a0fff7037f6a6..b08c85fa6df8c 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -70,7 +70,7 @@ in
   };
 
   tomcat11 = common {
-    version = "11.0.0";
-    hash = "sha256-0MoxmvNJg49ZAJqcXtNwnwI0QgEFnbwm3OQxPulpzSA=";
+    version = "11.0.2";
+    hash = "sha256-wbMaaYnTCnNEwaNlXadGec6fm0iicehkZHoUHeO3jLg=";
   };
 }

From 998dfeb467bbc4b985dac54963c38655e9af5e5e Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 18 Dec 2024 19:47:13 +0100
Subject: [PATCH 06/33] tomcat9: 9.0.97 -> 9.0.98

Fixes CVE-2024-50379.

Changelog:
https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.98_(remm)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index a0fff7037f6a6..85ab4ea68ef4a 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -60,8 +60,8 @@ let
 in
 {
   tomcat9 = common {
-    version = "9.0.97";
-    hash = "sha256-tV3K9poCQ38ORtlgxaQT6P7SaRUswgrWV2XTGiM6Dec=";
+    version = "9.0.98";
+    hash = "sha256-HZoRBMLiNaW6/26cqOKL49hkgD+vxHj1wTwq5qXtPW8=";
   };
 
   tomcat10 = common {

From a15441672e691c5e523259859dba06533d877d76 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 18 Dec 2024 19:49:53 +0100
Subject: [PATCH 07/33] tomcat10: 10.1.33 -> 10.1.34

Fixes CVE-2024-50379.

Changelog:
https://tomcat.apache.org/tomcat-10.1-doc/changelog.html#Tomcat_10.1.34_(schultz)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 85ab4ea68ef4a..d70ace863d8b9 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -65,8 +65,8 @@ in
   };
 
   tomcat10 = common {
-    version = "10.1.33";
-    hash = "sha256-Oysh1hzVh7X4ONoYQ3Y/6qXoZP4Fl1oQHa3gki3lCJU=";
+    version = "10.1.34";
+    hash = "sha256-95lUE4C//ytnTO/YbFN20tfVZrOi58RXnStJHejsbDY=";
   };
 
   tomcat11 = common {

From 5247d2280ab56e9314488ff5abd6612b17f1402f Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 5 Dec 2024 12:28:54 -0500
Subject: [PATCH 08/33] python312Packages.azure-mgmt-reservations: fix
 dependencies

---
 .../python-modules/azure-mgmt-reservations/default.nix       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
index d382ded7d8103..e39954b333007 100644
--- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
@@ -3,9 +3,9 @@
   buildPythonPackage,
   fetchPypi,
   msrest,
-  msrestazure,
   azure-common,
   azure-mgmt-core,
+  typing-extensions,
   pythonOlder,
 }:
 
@@ -24,10 +24,9 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     msrest
-    msrestazure
     azure-common
     azure-mgmt-core
-  ];
+  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
   # has no tests
   doCheck = false;

From bf2b5c745b0ccb4229a1fe1ce676277100336234 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 5 Dec 2024 12:29:06 -0500
Subject: [PATCH 09/33] python312Packages.azure-mgmt-reservations: modernize

---
 .../azure-mgmt-reservations/default.nix           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
index e39954b333007..d88fccddc20cc 100644
--- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   msrest,
   azure-common,
   azure-mgmt-core,
@@ -12,9 +13,7 @@
 buildPythonPackage rec {
   pname = "azure-mgmt-reservations";
   version = "2.3.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -22,7 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-BHCFEFst5jfyIEo0hm86belpxW7EygZCBJ8PTqzqHKc=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     msrest
     azure-common
     azure-mgmt-core
@@ -31,10 +32,10 @@ buildPythonPackage rec {
   # has no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "This is the Microsoft Azure Reservations Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
-    license = licenses.mit;
-    maintainers = with maintainers; [ maxwilson ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ maxwilson ];
   };
 }

From 040cc793574fab59d914904f6fb7367f805beeaf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 15:15:31 +0000
Subject: [PATCH 10/33] steamguard-cli: 0.14.2 -> 0.15.0

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

diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index 9e8dd22612d36..d8da7cca9fb8e 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "steamguard-cli";
-  version = "0.14.2";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "dyc3";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-SrMg/4bTAvk+2fLck8SJBMQ3bELu1OBB7pDZmk+rCbA=";
+    hash = "sha256-Cxl6FczWr5kAYt+q1m3HLEKCBeQz3TcW/aaOxsBcuwc=";
   };
 
-  cargoHash = "sha256-MSN0xQj6IfOjI0qQqVBaGhh0BQJa4z24El2rGLlFBSM=";
+  cargoHash = "sha256-YKlTEKk2pbwLIFZjK/sBIIYwu0DYarVeJsIB9FSR9XM=";
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

From 65d0417b29f9266f10881431f0a5cf2fbbb66af5 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Thu, 19 Dec 2024 16:03:17 +0100
Subject: [PATCH 11/33] percona-server: add updateScript

---
 pkgs/servers/sql/percona-server/8_0.nix | 9 ++++++++-
 pkgs/servers/sql/percona-server/8_4.nix | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
index 3c9e97d5eea04..e7b948f4e8dbb 100644
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  gitUpdater,
   bison,
   cmake,
   pkg-config,
@@ -182,7 +183,13 @@ stdenv.mkDerivation (finalAttrs: {
     connector-c = finalAttrs.finalPackage;
     server = finalAttrs.finalPackage;
     mysqlVersion = lib.versions.majorMinor finalAttrs.version;
-    tests.percona-server = nixosTests.mysql.percona-server_8_0;
+    tests.percona-server =
+      nixosTests.mysql."percona-server_${lib.versions.major finalAttrs.version}_${lib.versions.minor finalAttrs.version}";
+    updateScript = gitUpdater {
+      url = "https://github.com/percona/percona-server";
+      rev-prefix = "Percona-Server-";
+      allowedVersions = "${lib.versions.major finalAttrs.version}\\.${lib.versions.minor finalAttrs.version}\\..+";
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix
index 9b8621e409004..67376c6f1140e 100644
--- a/pkgs/servers/sql/percona-server/8_4.nix
+++ b/pkgs/servers/sql/percona-server/8_4.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  gitUpdater,
   bison,
   cmake,
   pkg-config,
@@ -204,7 +205,13 @@ stdenv.mkDerivation (finalAttrs: {
     connector-c = finalAttrs.finalPackage;
     server = finalAttrs.finalPackage;
     mysqlVersion = lib.versions.majorMinor finalAttrs.version;
-    tests.percona-server = nixosTests.mysql.percona-server_8_4;
+    tests.percona-server =
+      nixosTests.mysql."percona-server_${lib.versions.major finalAttrs.version}_${lib.versions.minor finalAttrs.version}";
+    updateScript = gitUpdater {
+      url = "https://github.com/percona/percona-server";
+      rev-prefix = "Percona-Server-";
+      allowedVersions = "${lib.versions.major finalAttrs.version}\\.${lib.versions.minor finalAttrs.version}\\..+";
+    };
   };
 
   meta = with lib; {

From 78075270c40294bfbb64977efd2d034ab7270b23 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Thu, 19 Dec 2024 16:05:16 +0100
Subject: [PATCH 12/33] percona-server_8_4: 8.4.2-2 -> 8.4.3-3

release notes:
https://docs.percona.com/percona-server/8.4/release-notes/8.4.3-3.html

Fixed CVEs, taken from 2d69ebbc4ec95f0b5b2cd4fca76cb20ff7e15996:

Fixes:
* https://github.com/advisories/GHSA-m6rg-98pc-7rxm
* https://github.com/advisories/GHSA-97c4-2w4v-c7r8
* https://github.com/advisories/GHSA-m7rw-p49v-xvr4
* https://github.com/advisories/GHSA-cgw6-mmr2-9474
* https://github.com/advisories/GHSA-m2x9-pvwq-m49p
* https://github.com/advisories/GHSA-w76f-wfx3-5qjq
* https://github.com/advisories/GHSA-vqmm-339w-hc7c
* https://github.com/advisories/GHSA-2rhg-4865-8qfj
* https://github.com/advisories/GHSA-vggh-55p7-p625
* https://github.com/advisories/GHSA-j5r3-hxmp-cxpr
* https://github.com/advisories/GHSA-c72q-9j4p-2mp4
* https://github.com/advisories/GHSA-cj7p-fg4w-qrvh
* https://github.com/advisories/GHSA-fv75-hjwp-hmcm
* https://github.com/advisories/GHSA-xhf9-m56c-xh6w
* https://github.com/advisories/GHSA-c494-hg27-rg85
* https://github.com/advisories/GHSA-r97q-xhcv-9xx9
* https://github.com/advisories/GHSA-h3ph-4h6g-xqfq
* https://github.com/advisories/GHSA-mffh-p59m-fv66
* https://github.com/advisories/GHSA-vchj-ggm5-9rcm
* https://github.com/advisories/GHSA-jv2x-g26c-46cq
* https://github.com/advisories/GHSA-xcwx-vhj6-p7m7
* https://github.com/advisories/GHSA-6vrv-p2wx-g2fg
* https://github.com/advisories/GHSA-6pjm-6xcx-c94q
* https://github.com/advisories/GHSA-36gq-2499-pq9x
* https://github.com/advisories/GHSA-6477-mq9q-6867
---
 pkgs/servers/sql/percona-server/8_4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix
index 67376c6f1140e..9fef5c2ca522e 100644
--- a/pkgs/servers/sql/percona-server/8_4.nix
+++ b/pkgs/servers/sql/percona-server/8_4.nix
@@ -51,11 +51,11 @@ assert !(withJemalloc && withTcmalloc);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "percona-server";
-  version = "8.4.2-2";
+  version = "8.4.3-3";
 
   src = fetchurl {
     url = "https://downloads.percona.com/downloads/Percona-Server-${lib.versions.majorMinor finalAttrs.version}/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-KdaF2+vZfWf6fW8HWi+c97SHW+WqmlcpdPzUUgX94EY=";
+    hash = "sha256-37W0b8zYKErToJBU+aYtCmQjorcDtvuG0YbOwJzuZgo=";
   };
 
   nativeBuildInputs = [

From f1d219d74d0b8616a4a807bab7d937a9ac390cc0 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Thu, 19 Dec 2024 16:13:07 +0100
Subject: [PATCH 13/33] percona-xtrabackup_8_4: 8.4.0-1 -> 8.4.0-2

release notes:
https://docs.percona.com/percona-xtrabackup/8.4/release-notes/8.4.0-2.html
---
 pkgs/tools/backup/percona-xtrabackup/8_4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/percona-xtrabackup/8_4.nix b/pkgs/tools/backup/percona-xtrabackup/8_4.nix
index 47efd663a1d4e..82f2ab5ea95d8 100644
--- a/pkgs/tools/backup/percona-xtrabackup/8_4.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/8_4.nix
@@ -3,8 +3,8 @@
 callPackage ./generic.nix (
   args
   // {
-    version = "8.4.0-1";
-    hash = "sha256-2tWRRYH0P0HZsWTxeuvDeVWvDwqjjdv6J7YiZwoTKtM=";
+    version = "8.4.0-2";
+    hash = "sha256-ClW/B175z/sxF/MT9iHW1Wtr0ere63tIgUpcMp1IfTs=";
 
     # includes https://github.com/Percona-Lab/libkmip.git
     fetchSubmodules = true;

From 01a0b3de3128c5fca9d43e530d7380f2327b6208 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 20 Dec 2024 00:15:02 +0100
Subject: [PATCH 14/33] python312Packages.pins: 0.8.6 -> 0.8.7

Diff: https://github.com/rstudio/pins-python/compare/refs/tags/v0.8.6...v0.8.7

Changelog: https://github.com/rstudio/pins-python/releases/tag/v0.8.7
---
 pkgs/development/python-modules/pins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix
index 34d224669b3c6..1db545017f952 100644
--- a/pkgs/development/python-modules/pins/default.nix
+++ b/pkgs/development/python-modules/pins/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "pins";
-  version = "0.8.6";
+  version = "0.8.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "rstudio";
     repo = "pins-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-TRwdd0vxqXZgongjooJG5rzTnopUsjfl2I8z3nBocdg=";
+    hash = "sha256-79TVAfr872Twc7D2iej51jiKNwZ9ESOa66ItNDmyfFM=";
   };
 
   build-system = [

From 7e26745abfc31bcd62da07e3e026c275babeff6b Mon Sep 17 00:00:00 2001
From: thtrf <r3769.tv@gmail.com>
Date: Fri, 20 Dec 2024 00:28:11 +0100
Subject: [PATCH 15/33] vscode-extensions.geequlim.godot-tools: init at 2.3.0

---
 .../editors/vscode/extensions/default.nix        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index de55c8294fb29..6c7d59cabbf0c 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2018,6 +2018,22 @@ let
         };
       };
 
+      geequlim.godot-tools = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "godot-tools";
+          publisher = "geequlim";
+          version = "2.3.0";
+          hash = "sha256-iuSec4PoVxyu1KB2jfCYOd98UrqQjH3q24zOR4VCPgs=";
+        };
+        meta = {
+          description = "VS Code extension for game development with Godot Engine and GDScript";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=geequlim.godot-tools";
+          homepage = "https://github.com/godotengine/godot-vscode-plugin";
+          license = lib.licenses.mit;
+          maintainers = with lib.maintainers; [ thtrf ];
+        };
+      };
+
       gencer.html-slim-scss-css-class-completion = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "html-slim-scss-css-class-completion";

From 213d47367cf094c9afc6ef22659990d24b87b708 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 04:49:29 +0000
Subject: [PATCH 16/33] php82: 8.2.26 -> 8.2.27

---
 pkgs/development/interpreters/php/8.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix
index 6f80ac7be89d5..fda72fbfcd024 100644
--- a/pkgs/development/interpreters/php/8.2.nix
+++ b/pkgs/development/interpreters/php/8.2.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.2.26";
-      hash = "sha256-vlfDR9RRyQW8tDNoMqhk2ZKN0OIJibhycF/qC6ZHbGs=";
+      version = "8.2.27";
+      hash = "sha256-blfbr3aafz3rTw9IuMU15nHMChgCLtf2/yO1DpQdS2A=";
     }
   );
 in

From c10932abcf4b081aa5d7626833559d81571bc844 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 06:57:54 +0000
Subject: [PATCH 17/33] php84: 8.4.1 -> 8.4.2

---
 pkgs/development/interpreters/php/8.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 13c3b101f5aae..f51c712eecfea 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.1";
-      hash = "sha256-74onARjtEot2X8MfGYx/RlDIFxQRsPajoaOroR/KzCM=";
+      version = "8.4.2";
+      hash = "sha256-70/pkhuIXOOwR3kqtgJg6vZX4igSvlEdGdDkXt+YR4M=";
     }
   );
 in

From 2198eca7d87235ce2b2de8b5333206c9c0fb7fd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 07:00:23 +0000
Subject: [PATCH 18/33] buf: 1.47.2 -> 1.48.0

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

diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix
index a61cd55edb7a0..6912f03d05272 100644
--- a/pkgs/by-name/bu/buf/package.nix
+++ b/pkgs/by-name/bu/buf/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "buf";
-  version = "1.47.2";
+  version = "1.48.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
     rev = "v${version}";
-    hash = "sha256-rEz39E6sid9nNV5lzXwLh/GHrz5aVl67+BKfooH3+Nk=";
+    hash = "sha256-F1ZmhVAjm8KVFePXLeOnyvh1TvjXBDCwUizwQSpp6L4=";
   };
 
-  vendorHash = "sha256-dSNmMc7iWtrItFuz341FpYWo5AyExgO7e7Fbib2gCS8=";
+  vendorHash = "sha256-M5q93hJjEsdMG4N+bjHTTUqBLgy2b7oIRmkizuGxeoE=";
 
   patches = [
     # Skip a test that requires networking to be available to work.

From 3ae9a84595cf4c53a9d10ffd5030132dbfbca4ae Mon Sep 17 00:00:00 2001
From: Mario Liguori <76066109+archer-65@users.noreply.github.com>
Date: Fri, 20 Dec 2024 11:56:43 +0100
Subject: [PATCH 19/33] evdi: 1.14.7 -> 1.14.8

---
 pkgs/os-specific/linux/evdi/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 411eef88eb764..9e5ead3264209 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   kernel,
   libdrm,
   python3,
@@ -17,22 +16,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "evdi";
-  version = "1.14.7-unstable-2024-11-30";
+  version = "1.14.8";
 
   src = fetchFromGitHub {
     owner = "DisplayLink";
     repo = "evdi";
-    rev = "59a3a864f7476cd61d9c65bfd012d1e9ed90e2b1";
-    hash = "sha256-0xEh0Tb5QFReW5lXO/Mb3gn1z87+baR8Tix+dQjUZMw=";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-57DP8kKsPEK1C5A6QfoZZDmm76pn4SaUKEKu9cicyKI=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/DisplayLink/evdi/commit/e41240cf62d7188643bc95e5d69e1c4cfa6ddb84.patch?full_index=1";
-      hash = "sha256-6V3QJZMAhXqfGLW2eWkIzJnOdBPvLLNVzg6DW1M3IaA=";
-    })
-  ];
-
   env.NIX_CFLAGS_COMPILE = toString [
     "-Wno-error"
     "-Wno-error=discarded-qualifiers" # for Linux 4.19 compatibility

From 253a78627102ae2a284e7ca6911cf86f080d4ea7 Mon Sep 17 00:00:00 2001
From: Vlad Petrov <oss@ejiek.id>
Date: Fri, 20 Dec 2024 14:20:24 +0300
Subject: [PATCH 20/33] vaultwarden: 1.32.6 -> 1.32.7

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

diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix
index f3a27b5ca4c53..a7fe7db237770 100644
--- a/pkgs/tools/security/vaultwarden/default.nix
+++ b/pkgs/tools/security/vaultwarden/default.nix
@@ -22,17 +22,17 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "vaultwarden";
-  version = "1.32.6";
+  version = "1.32.7";
 
   src = fetchFromGitHub {
     owner = "dani-garcia";
     repo = "vaultwarden";
     rev = version;
-    hash = "sha256-amb2wzCVZPDlR9UbH5jh3IAg0XbJmyQNTSJdZiktWCU=";
+    hash = "sha256-mxZQ1San8zlyvZoBRF9Eb7/mbs374MOgC4baOCFyPoc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-hKnm14OlXDVJcxGKHkvOZWOqAwi1lWBa1IZ0MR+0nso=";
+  cargoHash = "sha256-OKfu+G+bS72HJDDLhRp9PMji/baBsh7JaYEZgQYdjTw=";
 
   # used for "Server Installed" version in admin panel
   env.VW_VERSION = version;

From 185aeeb44101fb4f2449d018ba5a173377e461d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 12:45:46 +0000
Subject: [PATCH 21/33] jcli: 0.0.42 -> 0.0.43

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

diff --git a/pkgs/by-name/jc/jcli/package.nix b/pkgs/by-name/jc/jcli/package.nix
index 6de7a5096d9aa..bcda9582bbd39 100644
--- a/pkgs/by-name/jc/jcli/package.nix
+++ b/pkgs/by-name/jc/jcli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "jcli";
-  version = "0.0.42";
+  version = "0.0.43";
 
   src = fetchFromGitHub {
     owner = "jenkins-zh";
     repo = "jenkins-cli";
     rev = "v${version}";
-    hash = "sha256-t9NE911TjAvoCsmf9F989DNQ+s9GhgUF7cwuyHefWts=";
+    hash = "sha256-IUYkpeWZOuCF0cR664VbwvLuDBQqbTKxn9UUe6G9VEE=";
   };
 
-  vendorHash = "sha256-bmPnxFvdKU5zuMsCDboSOxP5f7NnMRwS/gN0sW7eTRA=";
+  vendorHash = "sha256-f2f/Qi6aav7LPpO9ERYkejygz0XiPQ8YrKLB63EpaoY=";
 
   ldflags = [
     "-s"

From 8788c4bff928039536e5106bf9580d25b9b880e1 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Fri, 20 Dec 2024 20:57:46 +0800
Subject: [PATCH 22/33] lib/customisation.nix: format with nixfmt-rfc-style

---
 lib/customisation.nix | 365 +++++++++++++++++++++++++-----------------
 1 file changed, 220 insertions(+), 145 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 99c02ddeea89a..fe78225703a80 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -2,19 +2,43 @@
 
 let
   inherit (builtins)
-    intersectAttrs;
+    intersectAttrs
+    ;
   inherit (lib)
-    functionArgs isFunction mirrorFunctionArgs isAttrs setFunctionArgs
-    optionalAttrs attrNames filter elemAt concatStringsSep sortOn take length
-    filterAttrs optionalString flip pathIsDirectory head pipe isDerivation listToAttrs
-    mapAttrs seq flatten deepSeq warnIf isInOldestRelease extends
+    functionArgs
+    isFunction
+    mirrorFunctionArgs
+    isAttrs
+    setFunctionArgs
+    optionalAttrs
+    attrNames
+    filter
+    elemAt
+    concatStringsSep
+    sortOn
+    take
+    length
+    filterAttrs
+    optionalString
+    flip
+    pathIsDirectory
+    head
+    pipe
+    isDerivation
+    listToAttrs
+    mapAttrs
+    seq
+    flatten
+    deepSeq
+    warnIf
+    isInOldestRelease
+    extends
     ;
   inherit (lib.strings) levenshtein levenshteinAtMost;
 
 in
 rec {
 
-
   /**
     `overrideDerivation drv f` takes a derivation (i.e., the result
     of a call to the builtin function `derivation`) and returns a new
@@ -40,7 +64,6 @@ rec {
     You should in general prefer `drv.overrideAttrs` over this function;
     see the nixpkgs manual for more information on overriding.
 
-
     # Inputs
 
     `drv`
@@ -74,20 +97,21 @@ rec {
 
     :::
   */
-  overrideDerivation = drv: f:
+  overrideDerivation =
+    drv: f:
     let
       newDrv = derivation (drv.drvAttrs // (f drv));
-    in flip (extendDerivation (seq drv.drvPath true)) newDrv (
-      { meta = drv.meta or {};
-        passthru = if drv ? passthru then drv.passthru else {};
+    in
+    flip (extendDerivation (seq drv.drvPath true)) newDrv (
+      {
+        meta = drv.meta or { };
+        passthru = if drv ? passthru then drv.passthru else { };
       }
-      //
-      (drv.passthru or {})
-      //
-      optionalAttrs (drv ? __spliced) {
-        __spliced = {} // (mapAttrs (_: sDrv: overrideDerivation sDrv f) drv.__spliced);
-      });
-
+      // (drv.passthru or { })
+      // optionalAttrs (drv ? __spliced) {
+        __spliced = { } // (mapAttrs (_: sDrv: overrideDerivation sDrv f) drv.__spliced);
+      }
+    );
 
   /**
     `makeOverridable` takes a function from attribute set to attribute set and
@@ -97,7 +121,6 @@ rec {
     Please refer to  documentation on [`<pkg>.overrideDerivation`](#sec-pkg-overrideDerivation) to learn about `overrideDerivation` and caveats
     related to its use.
 
-
     # Inputs
 
     `f`
@@ -128,37 +151,42 @@ rec {
 
     :::
   */
-  makeOverridable = f:
+  makeOverridable =
+    f:
     let
       # Creates a functor with the same arguments as f
       mirrorArgs = mirrorFunctionArgs f;
     in
-    mirrorArgs (origArgs:
-    let
-      result = f origArgs;
-
-      # Changes the original arguments with (potentially a function that returns) a set of new attributes
-      overrideWith = newArgs: origArgs // (if isFunction newArgs then newArgs origArgs else newArgs);
-
-      # Re-call the function but with different arguments
-      overrideArgs = mirrorArgs (newArgs: makeOverridable f (overrideWith newArgs));
-      # Change the result of the function call by applying g to it
-      overrideResult = g: makeOverridable (mirrorArgs (args: g (f args))) origArgs;
-    in
+    mirrorArgs (
+      origArgs:
+      let
+        result = f origArgs;
+
+        # Changes the original arguments with (potentially a function that returns) a set of new attributes
+        overrideWith = newArgs: origArgs // (if isFunction newArgs then newArgs origArgs else newArgs);
+
+        # Re-call the function but with different arguments
+        overrideArgs = mirrorArgs (newArgs: makeOverridable f (overrideWith newArgs));
+        # Change the result of the function call by applying g to it
+        overrideResult = g: makeOverridable (mirrorArgs (args: g (f args))) origArgs;
+      in
       if isAttrs result then
-        result // {
+        result
+        // {
           override = overrideArgs;
           overrideDerivation = fdrv: overrideResult (x: overrideDerivation x fdrv);
-          ${if result ? overrideAttrs then "overrideAttrs" else null} = fdrv:
-            overrideResult (x: x.overrideAttrs fdrv);
+          ${if result ? overrideAttrs then "overrideAttrs" else null} =
+            fdrv: overrideResult (x: x.overrideAttrs fdrv);
         }
       else if isFunction result then
         # Transform the result into a functor while propagating its arguments
-        setFunctionArgs result (functionArgs result) // {
+        setFunctionArgs result (functionArgs result)
+        // {
           override = overrideArgs;
         }
-      else result);
-
+      else
+        result
+    );
 
   /**
     Call the package function in the file `fn` with the required
@@ -188,7 +216,6 @@ rec {
 
     <!-- TODO: Apply "Example:" tag to the examples above -->
 
-
     # Inputs
 
     `autoArgs`
@@ -209,7 +236,8 @@ rec {
     callPackageWith :: AttrSet -> ((AttrSet -> a) | Path) -> AttrSet -> a
     ```
   */
-  callPackageWith = autoArgs: fn: args:
+  callPackageWith =
+    autoArgs: fn: args:
     let
       f = if isFunction fn then fn else import fn;
       fargs = functionArgs f;
@@ -222,59 +250,72 @@ rec {
       # wouldn't be passed to it
       missingArgs =
         # Filter out arguments that have a default value
-        (filterAttrs (name: value: ! value)
-        # Filter out arguments that would be passed
-        (removeAttrs fargs (attrNames allArgs)));
+        (
+          filterAttrs (name: value: !value)
+            # Filter out arguments that would be passed
+            (removeAttrs fargs (attrNames allArgs))
+        );
 
       # Get a list of suggested argument names for a given missing one
-      getSuggestions = arg: pipe (autoArgs // args) [
-        attrNames
-        # Only use ones that are at most 2 edits away. While mork would work,
-        # levenshteinAtMost is only fast for 2 or less.
-        (filter (levenshteinAtMost 2 arg))
-        # Put strings with shorter distance first
-        (sortOn (levenshtein arg))
-        # Only take the first couple results
-        (take 3)
-        # Quote all entries
-        (map (x: "\"" + x + "\""))
-      ];
-
-      prettySuggestions = suggestions:
-        if suggestions == [] then ""
-        else if length suggestions == 1 then ", did you mean ${elemAt suggestions 0}?"
-        else ", did you mean ${concatStringsSep ", " (lib.init suggestions)} or ${lib.last suggestions}?";
-
-      errorForArg = arg:
+      getSuggestions =
+        arg:
+        pipe (autoArgs // args) [
+          attrNames
+          # Only use ones that are at most 2 edits away. While mork would work,
+          # levenshteinAtMost is only fast for 2 or less.
+          (filter (levenshteinAtMost 2 arg))
+          # Put strings with shorter distance first
+          (sortOn (levenshtein arg))
+          # Only take the first couple results
+          (take 3)
+          # Quote all entries
+          (map (x: "\"" + x + "\""))
+        ];
+
+      prettySuggestions =
+        suggestions:
+        if suggestions == [ ] then
+          ""
+        else if length suggestions == 1 then
+          ", did you mean ${elemAt suggestions 0}?"
+        else
+          ", did you mean ${concatStringsSep ", " (lib.init suggestions)} or ${lib.last suggestions}?";
+
+      errorForArg =
+        arg:
         let
           loc = builtins.unsafeGetAttrPos arg fargs;
           # loc' can be removed once lib/minver.nix is >2.3.4, since that includes
           # https://github.com/NixOS/nix/pull/3468 which makes loc be non-null
-          loc' = if loc != null then loc.file + ":" + toString loc.line
-            else if ! isFunction fn then
+          loc' =
+            if loc != null then
+              loc.file + ":" + toString loc.line
+            else if !isFunction fn then
               toString fn + optionalString (pathIsDirectory fn) "/default.nix"
-            else "<unknown location>";
-        in "Function called without required argument \"${arg}\" at "
+            else
+              "<unknown location>";
+        in
+        "Function called without required argument \"${arg}\" at "
         + "${loc'}${prettySuggestions (getSuggestions arg)}";
 
       # Only show the error for the first missing argument
       error = errorForArg (head (attrNames missingArgs));
 
-    in if missingArgs == {}
-       then makeOverridable f allArgs
-       # This needs to be an abort so it can't be caught with `builtins.tryEval`,
-       # which is used by nix-env and ofborg to filter out packages that don't evaluate.
-       # This way we're forced to fix such errors in Nixpkgs,
-       # which is especially relevant with allowAliases = false
-       else abort "lib.customisation.callPackageWith: ${error}";
-
+    in
+    if missingArgs == { } then
+      makeOverridable f allArgs
+    # This needs to be an abort so it can't be caught with `builtins.tryEval`,
+    # which is used by nix-env and ofborg to filter out packages that don't evaluate.
+    # This way we're forced to fix such errors in Nixpkgs,
+    # which is especially relevant with allowAliases = false
+    else
+      abort "lib.customisation.callPackageWith: ${error}";
 
   /**
     Like callPackage, but for a function that returns an attribute
     set of derivations. The override function is added to the
     individual attributes.
 
-
     # Inputs
 
     `autoArgs`
@@ -295,7 +336,8 @@ rec {
     callPackagesWith :: AttrSet -> ((AttrSet -> AttrSet) | Path) -> AttrSet -> AttrSet
     ```
   */
-  callPackagesWith = autoArgs: fn: args:
+  callPackagesWith =
+    autoArgs: fn: args:
     let
       f = if isFunction fn then fn else import fn;
       auto = intersectAttrs (functionArgs f) autoArgs;
@@ -304,18 +346,19 @@ rec {
       pkgs = f origArgs;
       mkAttrOverridable = name: _: makeOverridable (mirrorArgs (newArgs: (f newArgs).${name})) origArgs;
     in
-      if isDerivation pkgs then throw
-        ("function `callPackages` was called on a *single* derivation "
-          + ''"${pkgs.name or "<unknown-name>"}";''
-          + " did you mean to use `callPackage` instead?")
-      else mapAttrs mkAttrOverridable pkgs;
-
+    if isDerivation pkgs then
+      throw (
+        "function `callPackages` was called on a *single* derivation "
+        + ''"${pkgs.name or "<unknown-name>"}";''
+        + " did you mean to use `callPackage` instead?"
+      )
+    else
+      mapAttrs mkAttrOverridable pkgs;
 
   /**
     Add attributes to each output of a derivation without changing
     the derivation itself and check a given condition when evaluating.
 
-
     # Inputs
 
     `condition`
@@ -336,34 +379,48 @@ rec {
     extendDerivation :: Bool -> Any -> Derivation -> Derivation
     ```
   */
-  extendDerivation = condition: passthru: drv:
+  extendDerivation =
+    condition: passthru: drv:
     let
       outputs = drv.outputs or [ "out" ];
 
-      commonAttrs = drv // (listToAttrs outputsList) //
-        ({ all = map (x: x.value) outputsList; }) // passthru;
+      commonAttrs =
+        drv // (listToAttrs outputsList) // ({ all = map (x: x.value) outputsList; }) // passthru;
 
-      outputToAttrListElement = outputName:
-        { name = outputName;
-          value = commonAttrs // {
+      outputToAttrListElement = outputName: {
+        name = outputName;
+        value =
+          commonAttrs
+          // {
             inherit (drv.${outputName}) type outputName;
             outputSpecified = true;
-            drvPath = assert condition; drv.${outputName}.drvPath;
-            outPath = assert condition; drv.${outputName}.outPath;
-          } //
+            drvPath =
+              assert condition;
+              drv.${outputName}.drvPath;
+            outPath =
+              assert condition;
+              drv.${outputName}.outPath;
+          }
+          //
             # TODO: give the derivation control over the outputs.
             #       `overrideAttrs` may not be the only attribute that needs
             #       updating when switching outputs.
-            optionalAttrs (passthru?overrideAttrs) {
+            optionalAttrs (passthru ? overrideAttrs) {
               # TODO: also add overrideAttrs when overrideAttrs is not custom, e.g. when not splicing.
               overrideAttrs = f: (passthru.overrideAttrs f).${outputName};
             };
-        };
+      };
 
       outputsList = map outputToAttrListElement outputs;
-    in commonAttrs // {
-      drvPath = assert condition; drv.drvPath;
-      outPath = assert condition; drv.outPath;
+    in
+    commonAttrs
+    // {
+      drvPath =
+        assert condition;
+        drv.drvPath;
+      outPath =
+        assert condition;
+        drv.outPath;
     };
 
   /**
@@ -372,7 +429,6 @@ rec {
     result to ensure that there are no thunks kept alive to prevent
     garbage collection.
 
-
     # Inputs
 
     `drv`
@@ -385,21 +441,29 @@ rec {
     hydraJob :: (Derivation | Null) -> (Derivation | Null)
     ```
   */
-  hydraJob = drv:
+  hydraJob =
+    drv:
     let
-      outputs = drv.outputs or ["out"];
+      outputs = drv.outputs or [ "out" ];
 
       commonAttrs =
-        { inherit (drv) name system meta; inherit outputs; }
+        {
+          inherit (drv) name system meta;
+          inherit outputs;
+        }
         // optionalAttrs (drv._hydraAggregate or false) {
           _hydraAggregate = true;
           constituents = map hydraJob (flatten drv.constituents);
         }
         // (listToAttrs outputsList);
 
-      makeOutput = outputName:
-        let output = drv.${outputName}; in
-        { name = outputName;
+      makeOutput =
+        outputName:
+        let
+          output = drv.${outputName};
+        in
+        {
+          name = outputName;
           value = commonAttrs // {
             outPath = output.outPath;
             drvPath = output.drvPath;
@@ -411,8 +475,8 @@ rec {
       outputsList = map makeOutput outputs;
 
       drv' = (head outputsList).value;
-    in if drv == null then null else
-      deepSeq drv' drv';
+    in
+    if drv == null then null else deepSeq drv' drv';
 
   /**
     Make an attribute set (a "scope") from functions that take arguments from that same attribute set.
@@ -538,19 +602,21 @@ rec {
     makeScope :: (AttrSet -> ((AttrSet -> a) | Path) -> AttrSet -> a) -> (AttrSet -> AttrSet) -> scope
     ```
   */
-  makeScope = newScope: f:
-    let self = f self // {
-          newScope = scope: newScope (self // scope);
-          callPackage = self.newScope {};
-          overrideScope = g: makeScope newScope (extends g f);
-          packages = f;
-        };
-    in self;
+  makeScope =
+    newScope: f:
+    let
+      self = f self // {
+        newScope = scope: newScope (self // scope);
+        callPackage = self.newScope { };
+        overrideScope = g: makeScope newScope (extends g f);
+        packages = f;
+      };
+    in
+    self;
 
   /**
     backward compatibility with old uncurried form; deprecated
 
-
     # Inputs
 
     `splicePackages`
@@ -579,9 +645,14 @@ rec {
   */
   makeScopeWithSplicing =
     splicePackages: newScope: otherSplices: keep: extra: f:
-    makeScopeWithSplicing'
-    { inherit splicePackages newScope; }
-    { inherit otherSplices keep extra f; };
+    makeScopeWithSplicing' { inherit splicePackages newScope; } {
+      inherit
+        otherSplices
+        keep
+        extra
+        f
+        ;
+    };
 
   /**
     Like makeScope, but aims to support cross compilation. It's still ugly, but
@@ -608,30 +679,32 @@ rec {
     ```
   */
   makeScopeWithSplicing' =
-    { splicePackages
-    , newScope
+    {
+      splicePackages,
+      newScope,
     }:
-    { otherSplices
-    # Attrs from `self` which won't be spliced.
-    # Avoid using keep, it's only used for a python hook workaround, added in PR #104201.
-    # ex: `keep = (self: { inherit (self) aAttr; })`
-    , keep ? (_self: {})
-    # Additional attrs to add to the sets `callPackage`.
-    # When the package is from a subset (but not a subset within a package IS #211340)
-    # within `spliced0` it will be spliced.
-    # When using an package outside the set but it's available from `pkgs`, use the package from `pkgs.__splicedPackages`.
-    # If the package is not available within the set or in `pkgs`, such as a package in a let binding, it will not be spliced
-    # ex:
-    # ```
-    # nix-repl> darwin.apple_sdk.frameworks.CoreFoundation
-    #   «derivation ...CoreFoundation-11.0.0.drv»
-    # nix-repl> darwin.CoreFoundation
-    #   error: attribute 'CoreFoundation' missing
-    # nix-repl> darwin.callPackage ({ CoreFoundation }: CoreFoundation) { }
-    #   «derivation ...CoreFoundation-11.0.0.drv»
-    # ```
-    , extra ? (_spliced0: {})
-    , f
+    {
+      otherSplices,
+      # Attrs from `self` which won't be spliced.
+      # Avoid using keep, it's only used for a python hook workaround, added in PR #104201.
+      # ex: `keep = (self: { inherit (self) aAttr; })`
+      keep ? (_self: { }),
+      # Additional attrs to add to the sets `callPackage`.
+      # When the package is from a subset (but not a subset within a package IS #211340)
+      # within `spliced0` it will be spliced.
+      # When using an package outside the set but it's available from `pkgs`, use the package from `pkgs.__splicedPackages`.
+      # If the package is not available within the set or in `pkgs`, such as a package in a let binding, it will not be spliced
+      # ex:
+      # ```
+      # nix-repl> darwin.apple_sdk.frameworks.CoreFoundation
+      #   «derivation ...CoreFoundation-11.0.0.drv»
+      # nix-repl> darwin.CoreFoundation
+      #   error: attribute 'CoreFoundation' missing
+      # nix-repl> darwin.callPackage ({ CoreFoundation }: CoreFoundation) { }
+      #   «derivation ...CoreFoundation-11.0.0.drv»
+      # ```
+      extra ? (_spliced0: { }),
+      f,
     }:
     let
       spliced0 = splicePackages {
@@ -648,13 +721,15 @@ rec {
         callPackage = newScope spliced; # == self.newScope {};
         # N.B. the other stages of the package set spliced in are *not*
         # overridden.
-        overrideScope = g: (makeScopeWithSplicing'
-          { inherit splicePackages newScope; }
-          { inherit otherSplices keep extra;
+        overrideScope =
+          g:
+          (makeScopeWithSplicing' { inherit splicePackages newScope; } {
+            inherit otherSplices keep extra;
             f = extends g f;
           });
         packages = f;
       };
-    in self;
+    in
+    self;
 
 }

From e5a9567c3ad7bc88a71a9104a8627ddf87624c96 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Fri, 20 Dec 2024 21:02:54 +0800
Subject: [PATCH 23/33] lib.customisation: remove dead code

Remove unneeded function inheritance in the let-in block.
---
 lib/customisation.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index fe78225703a80..be6585d5fa6e4 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -30,8 +30,6 @@ let
     seq
     flatten
     deepSeq
-    warnIf
-    isInOldestRelease
     extends
     ;
   inherit (lib.strings) levenshtein levenshteinAtMost;

From 793f4348fa04e0b029371254b31d342892578a69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 15:56:59 +0000
Subject: [PATCH 24/33] dftd4: 3.6.0 -> 3.7.0

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

diff --git a/pkgs/by-name/df/dftd4/package.nix b/pkgs/by-name/df/dftd4/package.nix
index 57fa3723d3a67..ecfbda766454d 100644
--- a/pkgs/by-name/df/dftd4/package.nix
+++ b/pkgs/by-name/df/dftd4/package.nix
@@ -18,13 +18,13 @@ assert !blas.isILP64 && !lapack.isILP64;
 
 stdenv.mkDerivation rec {
   pname = "dftd4";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "dftd4";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-VIV9953hx0MZupOARdH+P1h7JtZeJmTlqtO8si+lwdU=";
+    hash = "sha256-dixPCLH5dWkE2/7ghGEXJmX2/g1DN30dB4jX2d7fmio=";
   };
 
   patches = [

From 0f78970f80057f807aaf14d1a6e713f3a9da9143 Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@uni-jena.de>
Date: Fri, 20 Dec 2024 14:46:31 +0100
Subject: [PATCH 25/33] python3Packages.tblite: add setuptools for python 3.11

---
 .../science/chemistry/tblite/python.nix       | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/science/chemistry/tblite/python.nix b/pkgs/development/libraries/science/chemistry/tblite/python.nix
index b0cd26e4c1a7d..09f921cc4ae70 100644
--- a/pkgs/development/libraries/science/chemistry/tblite/python.nix
+++ b/pkgs/development/libraries/science/chemistry/tblite/python.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonAtLeast,
   meson,
   ninja,
   pkg-config,
@@ -28,18 +27,15 @@ buildPythonPackage {
     meta
     ;
 
-  nativeBuildInputs =
-    [
-      tblite
-      meson
-      ninja
-      pkg-config
-      gfortran
-      mctc-lib
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      setuptools
-    ];
+  nativeBuildInputs = [
+    tblite
+    meson
+    ninja
+    pkg-config
+    gfortran
+    mctc-lib
+    setuptools
+  ];
 
   buildInputs = [
     tblite

From 7122d579174416ccf4d6a3043cdbbbb854c463e1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 20 Dec 2024 17:05:23 +0100
Subject: [PATCH 26/33] sd-switch: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/by-name/sd/sd-switch/package.nix b/pkgs/by-name/sd/sd-switch/package.nix
index 2a142f4ad2982..623d138c11c67 100644
--- a/pkgs/by-name/sd/sd-switch/package.nix
+++ b/pkgs/by-name/sd/sd-switch/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.5.2";
+  version = "0.5.3";
 in
 rustPlatform.buildRustPackage {
   pname = "sd-switch";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "~rycee";
     repo = "sd-switch";
     rev = version;
-    hash = "sha256-vxDb5NkzmcWL6ECueultg6NoYMObW/54UuMLJe+AjVs=";
+    hash = "sha256-9aIu37mmf4ZnmZZrU0GA6z+bHKwtfkA5KnLRLY0c2r8=";
   };
 
-  cargoHash = "sha256-Oh4thw4NOjYjdLJWHG4wH7VDYjD89apl4S2JFM14WWw=";
+  cargoHash = "sha256-3XolxgnTIySucopogAzgf13IUCguJE6W17q506tUF6U=";
 
   passthru = {
     updateScript = nix-update-script { };

From bee553b5367b1151f8db08ae15f4b668f62ee59c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 18:30:53 +0000
Subject: [PATCH 27/33] polarity: latest-unstable-2024-12-09 ->
 latest-unstable-2024-12-20

---
 pkgs/by-name/po/polarity/Cargo.lock  | 9 +++++++++
 pkgs/by-name/po/polarity/package.nix | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/polarity/Cargo.lock b/pkgs/by-name/po/polarity/Cargo.lock
index 43879de673ac9..1061dc760357a 100644
--- a/pkgs/by-name/po/polarity/Cargo.lock
+++ b/pkgs/by-name/po/polarity/Cargo.lock
@@ -355,6 +355,14 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
+[[package]]
+name = "backend"
+version = "0.1.0"
+dependencies = [
+ "ast",
+ "url",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.74"
@@ -752,6 +760,7 @@ name = "docs"
 version = "0.1.0"
 dependencies = [
  "askama",
+ "askama_escape",
  "ast",
  "driver",
  "opener",
diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index 99a5b49de1a62..282b4e85e5f66 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "polarity";
-  version = "latest-unstable-2024-12-09";
+  version = "latest-unstable-2024-12-20";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "4ac254214e0b8b1cc0a4782ecac751bc41e514a9";
-    hash = "sha256-vuC40ez45KrB+F4La2SG9XRAhFCaFJQnlRc4kY4Ky0o=";
+    rev = "e679bff1d40b2d145fdc5206c74e59321a70efd2";
+    hash = "sha256-KiwK9rBYfOtsEiUF+e62L/j1Yc4KloRLXbXZ+5axiEM=";
   };
 
   cargoLock = {

From 9a1da01275a91d90e9ff5daef093fe3e4caa371b Mon Sep 17 00:00:00 2001
From: x123 <x123@users.noreply.github.com>
Date: Tue, 29 Oct 2024 13:59:50 +0100
Subject: [PATCH 28/33] dnsdbq: init at 2.6.7

---
 pkgs/by-name/dn/dnsdbq/package.nix | 60 ++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 pkgs/by-name/dn/dnsdbq/package.nix

diff --git a/pkgs/by-name/dn/dnsdbq/package.nix b/pkgs/by-name/dn/dnsdbq/package.nix
new file mode 100644
index 0000000000000..fed65506ec3d2
--- /dev/null
+++ b/pkgs/by-name/dn/dnsdbq/package.nix
@@ -0,0 +1,60 @@
+{
+  curl,
+  dnsdbq,
+  fetchFromGitHub,
+  jansson,
+  lib,
+  nix-update-script,
+  stdenv,
+  testers,
+}:
+stdenv.mkDerivation rec {
+  pname = "dnsdbq";
+  version = "2.6.7";
+
+  src = fetchFromGitHub {
+    owner = "dnsdb";
+    repo = "dnsdbq";
+    rev = "v${version}";
+    hash = "sha256-VeoLgDLly5bDIzvcf6Xb+tqCaQxIzeSpoW3ij+Hq4O8=";
+  };
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      version = testers.testVersion {
+        package = dnsdbq;
+        command = "dnsdbq -v";
+      };
+    };
+  };
+
+  nativeBuildInputs = [
+    curl # curl-config
+  ];
+
+  buildInputs = [
+    curl
+    jansson
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp dnsdbq $out/bin
+    mkdir -p $out/man/man1
+    cp dnsdbq.man $out/man/man1/dnsdbq.1
+    runHook postInstall
+  '';
+
+  extraOutputsToInstall = [ "man" ];
+
+  meta = {
+    description = "C99 program that accesses passive DNS database systems";
+    homepage = "https://github.com/dnsdb/dnsdbq";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ x123 ];
+    mainProgram = "dnsdbq";
+    platforms = lib.platforms.all;
+  };
+}

From cbe221c56ab969e3bb21858fd9a3c96de91e96c3 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 20 Dec 2024 19:17:52 +0000
Subject: [PATCH 29/33] nixos/incus: seabios is x86_64 only

---
 nixos/modules/virtualisation/incus.nix | 66 ++++++++++++++------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 4292662a9152b..1a29e6ee104e1 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -81,38 +81,42 @@ let
     fdSize2MB = true;
   };
   ovmf-prefix = if pkgs.stdenv.hostPlatform.isAarch64 then "AAVMF" else "OVMF";
-  ovmf = pkgs.linkFarm "incus-ovmf" [
-    # 2MB must remain the default or existing VMs will fail to boot. New VMs will prefer 4MB
-    {
-      name = "OVMF_CODE.fd";
-      path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_CODE.fd";
-    }
-    {
-      name = "OVMF_VARS.fd";
-      path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_VARS.fd";
-    }
-    {
-      name = "OVMF_VARS.ms.fd";
-      path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_VARS.fd";
-    }
+  ovmf = pkgs.linkFarm "incus-ovmf" (
+    [
+      # 2MB must remain the default or existing VMs will fail to boot. New VMs will prefer 4MB
+      {
+        name = "OVMF_CODE.fd";
+        path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_CODE.fd";
+      }
+      {
+        name = "OVMF_VARS.fd";
+        path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_VARS.fd";
+      }
+      {
+        name = "OVMF_VARS.ms.fd";
+        path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_VARS.fd";
+      }
 
-    {
-      name = "OVMF_CODE.4MB.fd";
-      path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_CODE.fd";
-    }
-    {
-      name = "OVMF_VARS.4MB.fd";
-      path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd";
-    }
-    {
-      name = "OVMF_VARS.4MB.ms.fd";
-      path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd";
-    }
-    {
-      name = "seabios.bin";
-      path = "${pkgs.seabios-qemu}/share/seabios/bios.bin";
-    }
-  ];
+      {
+        name = "OVMF_CODE.4MB.fd";
+        path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_CODE.fd";
+      }
+      {
+        name = "OVMF_VARS.4MB.fd";
+        path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd";
+      }
+      {
+        name = "OVMF_VARS.4MB.ms.fd";
+        path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd";
+      }
+    ]
+    ++ lib.optionals pkgs.stdenv.hostPlatform.isx86_64 [
+      {
+        name = "seabios.bin";
+        path = "${pkgs.seabios-qemu}/share/seabios/bios.bin";
+      }
+    ]
+  );
 
   environment = lib.mkMerge [
     {

From d41000a5d05f42c704aee7d4eabb2614444592e5 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 20 Dec 2024 23:11:22 +0400
Subject: [PATCH 30/33] =?UTF-8?q?jcli:=200.0.43=20=E2=86=92=200.0.44?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/jc/jcli/package.nix b/pkgs/by-name/jc/jcli/package.nix
index bcda9582bbd39..e1fb1130b73f6 100644
--- a/pkgs/by-name/jc/jcli/package.nix
+++ b/pkgs/by-name/jc/jcli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "jcli";
-  version = "0.0.43";
+  version = "0.0.44";
 
   src = fetchFromGitHub {
     owner = "jenkins-zh";
     repo = "jenkins-cli";
-    rev = "v${version}";
-    hash = "sha256-IUYkpeWZOuCF0cR664VbwvLuDBQqbTKxn9UUe6G9VEE=";
+    tag = "v${version}";
+    hash = "sha256-lsYLUgjpHcURiMTA4we9g+a6dFimOupAYMw0TcmABk4=";
   };
 
   vendorHash = "sha256-f2f/Qi6aav7LPpO9ERYkejygz0XiPQ8YrKLB63EpaoY=";
@@ -43,7 +43,7 @@ buildGoModule rec {
     description = "Jenkins CLI allows you to manage your Jenkins in an easy way";
     mainProgram = "jcli";
     homepage = "https://github.com/jenkins-zh/jenkins-cli";
-    changelog = "https://github.com/jenkins-zh/jenkins-cli/releases/tag/${src.rev}";
+    changelog = "https://github.com/jenkins-zh/jenkins-cli/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sikmir ];
   };

From af37213ffd0c65c455c54a4c011738b2fbfb6ae2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 20:39:14 +0000
Subject: [PATCH 31/33] python312Packages.craft-platforms: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix
index 8b5e5cc5b0f94..90b5686004879 100644
--- a/pkgs/development/python-modules/craft-platforms/default.nix
+++ b/pkgs/development/python-modules/craft-platforms/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "craft-platforms";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-platforms";
     rev = "refs/tags/${version}";
-    hash = "sha256-MzHjnOvsloT1Vf5NjI5jyFBvCo3v5ovvpWuwOJ/O/0A=";
+    hash = "sha256-P7GC+t/rs49/a85Bxy6x4cRyCEaHG4b7SIb85sMj7Yk=";
   };
 
   postPatch = ''

From 99dd39bd64410ad66547a58efec1abb2713c463b Mon Sep 17 00:00:00 2001
From: Yovko Lambrev <yovko@yovko.net>
Date: Sat, 21 Dec 2024 00:32:17 +0200
Subject: [PATCH 32/33] terraform-providers.btp: init at 1.8.0 (#366796)

---
 .../cluster/terraform-providers/providers.json           | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 5c9ad9c8d5e72..f978311a44a9a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -197,6 +197,15 @@
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
   },
+  "btp": {
+    "hash": "sha256-71i7iRTAsSZnq72ew4cEcDGFbsRPKWvEJ7y6onN1V68=",
+    "homepage": "https://registry.terraform.io/providers/SAP/btp",
+    "owner": "SAP",
+    "repo": "terraform-provider-btp",
+    "rev": "v1.8.0",
+    "spdx": "Apache-2.0",
+    "vendorHash": "sha256-A6/YN/iFxdfGjYO8Pum5nWysGmEeLaxgFPe8zaoPfjA="
+  },
   "buildkite": {
     "hash": "sha256-ogwUk5zYE3tdJB8zylkPpzfnUgmAhFQ4K0Vj3Jl0aog=",
     "homepage": "https://registry.terraform.io/providers/buildkite/buildkite",

From 8f85b83ec497f83ad2d5aeb0acedd7bf34062e44 Mon Sep 17 00:00:00 2001
From: Simon Hauser <simon.hauser@helsinki-systems.de>
Date: Sat, 21 Dec 2024 00:56:42 +0100
Subject: [PATCH 33/33] perlPackages.MailDKIM: add missing CryptX dependency
 (#366744)

We've been getting `Can't locate Crypt/PK/Ed25519.pm in @INC` when
trying to `use Mail::DKIM::PrivateKey`. This is especially critical as
this crashed our sympa instance.
---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8d2b3d804705f..e3e73cc3abc3a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15048,7 +15048,7 @@ with self; {
       url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20230911.tar.gz";
       hash = "sha256-kecxcoK3JM+9LJtuZjDvFDKISLb8UgPv1w3sL7hyaMo=";
     };
-    propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNS ];
+    propagatedBuildInputs = [ CryptOpenSSLRSA CryptX MailAuthenticationResults MailTools NetDNS ];
     doCheck = false; # tries to access the domain name system
     buildInputs = [ NetDNSResolverMock TestRequiresInternet YAMLLibYAML ];
     meta = {