From 298e5fddd308a84571066e773299e2dd1abd87d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:48:05 +0000
Subject: [PATCH 001/118] build(deps): bump korthout/backport-action from 2.1.1
 to 2.4.1

Bumps [korthout/backport-action](https://github.com/korthout/backport-action) from 2.1.1 to 2.4.1.
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](https://github.com/korthout/backport-action/compare/08bafb375e6e9a9a2b53a744b987e5d81a133191...e8161d6a0dbfa2651b7daa76cbb75bc7c925bbf3)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/backport.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index c49eeac5a20b..cfe189d7fd80 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Create backport PRs
-        uses: korthout/backport-action@08bafb375e6e9a9a2b53a744b987e5d81a133191 # v2.1.1
+        uses: korthout/backport-action@e8161d6a0dbfa2651b7daa76cbb75bc7c925bbf3 # v2.4.1
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           copy_labels_pattern: 'severity:\ssecurity'

From 33eb2e8a9c60d08b7ef3d77422007105ae3a10de Mon Sep 17 00:00:00 2001
From: NeverBehave <git@never.pet>
Date: Fri, 9 Feb 2024 16:02:21 -0800
Subject: [PATCH 002/118] phpExtensions.ioncube-loader: init at 13.0.2

---
 .../php-packages/ioncube-loader/default.nix   | 57 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/php-packages/ioncube-loader/default.nix

diff --git a/pkgs/development/php-packages/ioncube-loader/default.nix b/pkgs/development/php-packages/ioncube-loader/default.nix
new file mode 100644
index 000000000000..290abdffbedd
--- /dev/null
+++ b/pkgs/development/php-packages/ioncube-loader/default.nix
@@ -0,0 +1,57 @@
+{ stdenv
+, lib
+, fetchzip
+, php
+}:
+
+let
+  phpVersion = lib.versions.majorMinor php.version;
+
+  variant = {
+    "aarch64-darwin" = {
+      url = "https://web.archive.org/web/20240209234707/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_dar_arm64.tar.gz";
+      sha256 = "sha256-J6+bOXX9uRdrGouMAxt7nROjjfH4P2txb1hmPoHUmdM=";
+      prefix = "dar";
+    };
+    "aarch64-linux" = {
+      url = "https://web.archive.org/web/20240209234617/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_aarch64.tar.gz";
+      sha256 = "sha256-oOO4zr0CssxVGIUIfmAujILqOfQf8dJPADkr03a8HAs=";
+      prefix = "lin";
+    };
+    "x86_64-linux" = {
+      url = "https://web.archive.org/web/20240209052345if_/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz";
+      sha256 = "sha256-rsXKgxKHldBKDjJTsOdJP4SxfxLmMPDY+GizBpuDeyw=";
+      prefix = "lin";
+    };
+    "x86_64-darwin" = {
+      url = "https://web.archive.org/web/20240209234406/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_mac_x86-64.tar.gz";
+      sha256 = "sha256-bz2hQOaFbXePa8MhAZHESpZMRjjBH51IgvbR2EfBYMg=";
+      prefix = "mac";
+    };
+  };
+in
+stdenv.mkDerivation {
+  version = "13.0.2";
+  pname = "ioncube-loader";
+  extensionName = "ioncube-loader";
+
+  src = fetchzip {
+    url = variant.${stdenv.hostPlatform.system}.url;
+    sha256 = variant.${stdenv.hostPlatform.system}.sha256;
+  };
+
+  installPhase = ''
+    mkdir -p $out/lib/php/extensions
+    cp $src/ioncube_loader_${variant.${stdenv.hostPlatform.system}.prefix}_${phpVersion}.so $out/lib/php/extensions/ioncube-loader.so
+  '';
+
+  meta = with lib; {
+    description = "Use ionCube-encoded files on a web server";
+    changelog = "https://www.ioncube.com/loaders.php";
+    homepage = "https://www.ioncube.com";
+    sourceProvenance = [ sourceTypes.binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ neverbehave ];
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 345ed56b95e7..a1e9f801e3b0 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -260,6 +260,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
     inotify = callPackage ../development/php-packages/inotify { };
 
+    ioncube-loader = callPackage ../development/php-packages/ioncube-loader { };
+
     mailparse = callPackage ../development/php-packages/mailparse { };
 
     maxminddb = callPackage ../development/php-packages/maxminddb { };

From bc19782e3f918bd05a3afe10a6e3a1357350711b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 Mar 2024 11:00:23 +0000
Subject: [PATCH 003/118] lact: 0.5.0 -> 0.5.3

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

diff --git a/pkgs/tools/system/lact/default.nix b/pkgs/tools/system/lact/default.nix
index 16ce41007ea7..c694b96d85f5 100644
--- a/pkgs/tools/system/lact/default.nix
+++ b/pkgs/tools/system/lact/default.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lact";
-  version = "0.5.0";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "ilya-zlobintsev";
     repo = "LACT";
     rev = "v${version}";
-    hash = "sha256-B3YAlEKELbHGIQ8AIvortYZsHY6wsuaFxm9lC9Uh+Zg=";
+    hash = "sha256-Ts2byWYn1MwQCJPQfwTxezsa/fnwlgVOZyNDUXWgZ0s=";
   };
 
-  cargoHash = "sha256-MbE6OrYJGPoQPQggxa9dssx8Nc6/5w53V58E1yLLeq0=";
+  cargoHash = "sha256-7zGZu3q2CF/xzWjbicEb/JOt6pXEC2Skg7eR2syvUmY=";
 
   nativeBuildInputs = [
     blueprint-compiler

From ffb34be67d93ad895aced8afd378b2604c007997 Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Tue, 5 Mar 2024 13:23:49 +0530
Subject: [PATCH 004/118] syncthing: 1.27.2 -> 1.27.4

Diff: https://github.com/syncthing/syncthing/compare/v1.27.2...v1.27.4
Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.27.4
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 pkgs/applications/networking/syncthing/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 5a3c42f2deb5..89c7147310dc 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -13,16 +13,16 @@ let
   common = { stname, target, postInstall ? "" }:
     buildGoModule rec {
       pname = stname;
-      version = "1.27.2";
+      version = "1.27.4";
 
       src = fetchFromGitHub {
         owner = "syncthing";
         repo = "syncthing";
         rev = "v${version}";
-        hash = "sha256-CDOWN2b7DCRqhbJmiz4zp+q03GwmuVKv1MZT3NaO7lI=";
+        hash = "sha256-TXkZJAN72Qa3Mo2TYvCHNOl3BWfRxu78XXHW48Jjj0M=";
       };
 
-      vendorHash = "sha256-3MWVx0N17YgvFira56gvqMJlR1o/udtmWBn9oEVEp04=";
+      vendorHash = "sha256-ALdmETpEmvA3bTfBRK6LaO7bnlH03fljX1P7rqzskG4=";
 
       nativeBuildInputs = lib.optionals stdenv.isDarwin [
         # Recent versions of macOS seem to require binaries to be signed when

From 1d3263dc98df283112747f40e85e2fdf59209147 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Mar 2024 18:03:31 +0000
Subject: [PATCH 005/118] yaegi: 0.15.1 -> 0.16.0

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

diff --git a/pkgs/development/interpreters/yaegi/default.nix b/pkgs/development/interpreters/yaegi/default.nix
index dcde678338f0..5a9e6949d4c6 100644
--- a/pkgs/development/interpreters/yaegi/default.nix
+++ b/pkgs/development/interpreters/yaegi/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "yaegi";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "traefik";
     repo = "yaegi";
     rev = "v${version}";
-    hash = "sha256-ZV1HidHJvwum18QIIwQiCcRcitZdHk5+FxkPs6YgDac=";
+    hash = "sha256-AplNd9+Z+bVC4/2aFKwhabMvumF9IPcSX8X8H0z/ADA=";
   };
 
   vendorHash = null;

From 6473b3f6b70079acd434ffee931c3e33943dfcf1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Mar 2024 02:37:46 +0000
Subject: [PATCH 006/118] getdp: 3.5.0 -> 3.6.0

---
 pkgs/applications/science/math/getdp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix
index b5f4263c793d..da7ab15b4cd4 100644
--- a/pkgs/applications/science/math/getdp/default.nix
+++ b/pkgs/applications/science/math/getdp/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "getdp";
-  version = "3.5.0";
+  version = "3.6.0";
   src = fetchurl {
     url = "http://getdp.info/src/getdp-${version}-source.tgz";
-    sha256 = "sha256-C/dsSe+puIQBpFfBL3qr2XWXrUnvYy0/uTCKqOpDe9w=";
+    sha256 = "sha256-N1cb72W77Dr+TzeHpLgv5FuFb+SJqyGcfn+kOfEvZgA=";
   };
 
   inherit (petsc) mpiSupport;

From c9f3cc6a29286e480560109dd55b566b2c2d173b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Mar 2024 03:08:36 +0000
Subject: [PATCH 007/118] cfssl: 1.6.4 -> 1.6.5

---
 pkgs/tools/security/cfssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index 903b52f8bd0c..cfc608820aaf 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cfssl";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cfssl";
     rev = "v${version}";
-    sha256 = "sha256-QVKgfwyHzN6n8CnvGT9gg2ncfaDo+Pe4IAQhm4gNiz4=";
+    sha256 = "sha256-Xczpv6tLJiy2dXoGJ0QUmXwOn0p6S+lm2oz61oytQec=";
   };
 
   subPackages = [

From de914786bf90eb173ab99323e9831236064e882e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Mar 2024 03:15:03 +0000
Subject: [PATCH 008/118] tessen: 2.2.1 -> 2.2.3

---
 pkgs/tools/security/tessen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tessen/default.nix b/pkgs/tools/security/tessen/default.nix
index e8517dda9b4e..944695e831dc 100644
--- a/pkgs/tools/security/tessen/default.nix
+++ b/pkgs/tools/security/tessen/default.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "tessen";
-  version = "2.2.1";
+  version = "2.2.3";
 
   src = fetchFromSourcehut {
     owner = "~ayushnix";
     repo  = pname;
     rev = "v${version}";
-    sha256  = "sha256-8hhYOd5h55kl7ChqdyRzsaxzWLpX41aqG8LfznmbFWw=";
+    sha256  = "sha256-mVGsI1JBG7X8J7gqocdfxWuTVSZpxS23QPGHCUofvV8=";
   };
 
   nativeBuildInputs = [ makeWrapper installShellFiles scdoc ];

From 3950337cb954e9e36ab8b030d022dfa82ebe5c4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Mar 2024 03:41:36 +0000
Subject: [PATCH 009/118] ciao: 1.22.0-m7 -> 1.23.0-m1

---
 pkgs/development/compilers/ciao/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix
index bc85f6e1009f..98c26b3e9a08 100644
--- a/pkgs/development/compilers/ciao/default.nix
+++ b/pkgs/development/compilers/ciao/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "ciao";
-  version = "1.22.0-m7";
+  version = "1.23.0-m1";
   src = fetchFromGitHub {
     owner = "ciao-lang";
     repo = "ciao";
     rev = "v${version}";
-    sha256 = "sha256-5LX+NVDAtdffQeLTD4Camp5aNm0K3Cwmavh7OF5XcZU=";
+    sha256 = "sha256-JMHln0nYveEEfEr4AMyrEL9KlCDiqV53BWRNMUL8nN0=";
   };
 
   configurePhase = ''

From 4981f01489c3eae3429f53617a8ca125b7e22f7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Mar 2024 05:39:03 +0000
Subject: [PATCH 010/118] naev: 0.11.3 -> 0.11.4

---
 pkgs/games/naev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix
index 6be1d6700fc4..d6785ca4d817 100644
--- a/pkgs/games/naev/default.nix
+++ b/pkgs/games/naev/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "naev";
-  version = "0.11.3";
+  version = "0.11.4";
 
   src = fetchFromGitHub {
     owner = "naev";
     repo = "naev";
     rev = "v${version}";
-    sha256 = "sha256-2n7i5qCFdpjBpjeMv6aCd0zyD4c60FciHmSafbArnms=";
+    sha256 = "sha256-Cyun9BxIcv5V3HbMuFEhbYZnAuneTUwztc+ZlNaTp70=";
     fetchSubmodules = true;
   };
 

From 135a3edf34da8badaf9a04304bfd831a957dd581 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Mar 2024 09:15:40 +0000
Subject: [PATCH 011/118] jacktrip: 2.2.2 -> 2.2.3

---
 pkgs/applications/audio/jacktrip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix
index fc7b636e97af..b813a397bd43 100644
--- a/pkgs/applications/audio/jacktrip/default.nix
+++ b/pkgs/applications/audio/jacktrip/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.2";
+  version = "2.2.3";
   pname = "jacktrip";
 
   src = fetchFromGitHub {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     repo = "jacktrip";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-idfetMiMqjl9Qrun4hlFhQaGWcvasgjojTts+0F3GGE=";
+    sha256 = "sha256-uUmaTqUiih4nVt4Cba77WDt4xGQixsBe3WNavBDanx0=";
   };
 
   preConfigure = ''

From 5760460e246b9d67355ccbafafdd75e8f05402b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Mar 2024 16:02:31 +0000
Subject: [PATCH 012/118] minizincide: 2.8.2 -> 2.8.3

---
 pkgs/development/tools/minizinc/ide.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix
index ce115971f944..6954156763f8 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/development/tools/minizinc/ide.nix
@@ -5,13 +5,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "minizinc-ide";
-  version = "2.8.2";
+  version = "2.8.3";
 
   src = fetchFromGitHub {
     owner = "MiniZinc";
     repo = "MiniZincIDE";
     rev = version;
-    hash = "sha256-3L/hulNI7e2wE9gMt2h3mS0ubHZ4kcVpwALCmWQtv7A=";
+    hash = "sha256-/x4mWjAk24s6Ax22Q15WUPLLwm7YrzwaoMIINjQr5zU=";
     fetchSubmodules = true;
   };
 

From 665a8341d277550dfa47fb8557dda8bf14d7e3b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 00:17:53 +0000
Subject: [PATCH 013/118] stress-ng: 0.17.05 -> 0.17.06

---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 598078645bd9..81e80bd5e830 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "stress-ng";
-  version = "0.17.05";
+  version = "0.17.06";
 
   src = fetchFromGitHub {
     owner = "ColinIanKing";
     repo = pname;
     rev = "V${version}";
-    hash = "sha256-TlMLCDwFJGEEttdP9Wc0KAtj9Na1NC5E5e2VsTQugG4=";
+    hash = "sha256-69Ckl3n09J25Y0hzkH/RV9hJNlSfYfoxTdWiD5gBlQQ=";
   };
 
   postPatch = ''

From 0ba56d8e1713d574f18da5c53b7241eb1d96b2b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 00:36:50 +0000
Subject: [PATCH 014/118] bililiverecorder: 2.10.1 -> 2.11.0

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

diff --git a/pkgs/servers/bililiverecorder/default.nix b/pkgs/servers/bililiverecorder/default.nix
index e37c357089f0..0f7d6503900d 100644
--- a/pkgs/servers/bililiverecorder/default.nix
+++ b/pkgs/servers/bililiverecorder/default.nix
@@ -13,8 +13,8 @@ let
     aspnetcore_6_0
   ];
 
-  version = "2.10.1";
-  hash = "sha256-7F/Hgt0p73QY5Sa3MRP//x7EpfcHCbnAPKDf00XzUbw=";
+  version = "2.11.0";
+  hash = "sha256-Q2nRljBl+rnf3Q7WFgPJ9b0xDkUTS9DJ7MpvnwV+cMM=";
 
 in
 stdenv.mkDerivation {

From 03f97e690f23ce52729afab6ae266bd45ebc9bfc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 00:36:51 +0000
Subject: [PATCH 015/118] jbang: 0.114.0 -> 0.115.0

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

diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix
index abd08c6c9aa0..836847350e7b 100644
--- a/pkgs/development/tools/jbang/default.nix
+++ b/pkgs/development/tools/jbang/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
 
 stdenv.mkDerivation rec {
-  version = "0.114.0";
+  version = "0.115.0";
   pname = "jbang";
 
   src = fetchzip {
     url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
-    sha256 = "sha256-pLikm68JPG42XE5LCU/PB5rTUywWoQxtmHXYBDPASNE=";
+    sha256 = "sha256-JTyMX3120h+xtXnkTW313zc7OkWMB4DayeRW6hNc4/A=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From bc5f8a8059742b4c778362469adad2d703690744 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 01:18:23 +0000
Subject: [PATCH 016/118] mox: 0.0.9 -> 0.0.10

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

diff --git a/pkgs/servers/mail/mox/default.nix b/pkgs/servers/mail/mox/default.nix
index 8ee46f7faeba..60ed95648ccd 100644
--- a/pkgs/servers/mail/mox/default.nix
+++ b/pkgs/servers/mail/mox/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "mox";
-  version = "0.0.9";
+  version = "0.0.10";
 
   src = fetchFromGitHub {
     owner = "mjl-";
     repo = "mox";
     rev = "v${version}";
-    hash = "sha256-QDDNWGuDWxUBdoYEHQC7Ug0i8NyaqqGVsmFtTWfiM0M=";
+    hash = "sha256-BigxFlMkagw82Lkz1xMMSwAJyfSdSbeQr6G6rCaomNg=";
   };
 
   # set the version during buildtime

From 10b5c19984f56375e58e9a6843d6762961e1c61f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 01:27:34 +0000
Subject: [PATCH 017/118] igir: 2.5.0 -> 2.5.2

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

diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix
index fcd25d1a9481..cf1881f7c396 100644
--- a/pkgs/by-name/ig/igir/package.nix
+++ b/pkgs/by-name/ig/igir/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "igir";
-  version = "2.5.0";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     owner = "emmercm";
     repo = "igir";
     rev = "v${version}";
-    hash = "sha256-7gK3NTjirlaraUWGixDdeQrCip9W3X/18mbzXYOizRs=";
+    hash = "sha256-z70oPKUTVKWQ/BME2ourQZWNmFYRTvSRs+2mKVfoIh8=";
   };
 
-  npmDepsHash = "sha256-2X0zCCHKFps3fN5X7rnOdD//D7RU9m4V9cyr3CgoXOE=";
+  npmDepsHash = "sha256-lTqAUtUv0WmS/TUkPZQyCOYhY5BFz4ZCXqJN5I6l/cI=";
 
   # I have no clue why I have to do this
   postPatch = ''

From f3db387b97b11f945a05f5068e998721372bd8c2 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 9 Mar 2024 23:58:35 -0300
Subject: [PATCH 018/118] fsuae: prepare for by-name migration

- set strictDeps
- meta.mainProgram
- meta.platforms uses lib.systems machinery
---
 pkgs/applications/emulators/fs-uae/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/emulators/fs-uae/default.nix b/pkgs/applications/emulators/fs-uae/default.nix
index 8f22a86283ed..2dd75b57425e 100644
--- a/pkgs/applications/emulators/fs-uae/default.nix
+++ b/pkgs/applications/emulators/fs-uae/default.nix
@@ -1,8 +1,7 @@
 { lib
-, stdenv
-, fetchFromGitHub
 , SDL2
 , autoreconfHook
+, fetchFromGitHub
 , freetype
 , gettext
 , glib
@@ -13,6 +12,7 @@
 , lua
 , openal
 , pkg-config
+, stdenv
 , zip
 , zlib
 }:
@@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs:{
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
+    zip
   ];
 
   buildInputs = [
@@ -44,10 +45,11 @@ stdenv.mkDerivation (finalAttrs:{
     libmpeg2
     lua
     openal
-    zip
     zlib
   ];
 
+  strictDeps = true;
+
   meta = {
     homepage = "https://fs-uae.net";
     description = "An accurate, customizable Amiga Emulator";
@@ -58,7 +60,9 @@ stdenv.mkDerivation (finalAttrs:{
       Amigas.
     '';
     license = lib.licenses.gpl2Plus;
+    mainProgram = "fs-uae";
     maintainers = with lib.maintainers; [ AndersonTorres ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = with lib.systems.inspect;
+      patternLogicalAnd patterns.isx86 patterns.isLinux;
   };
 })

From 91856c93b381f3998738b7ca9468fc473e77cf50 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 10 Mar 2024 00:22:21 -0300
Subject: [PATCH 019/118] fsuae-launcher: prepare for by-name migration

- get rid of libsForQt5.callPackage
- set strictDeps
- meta.mainProgram
- meta.platforms uses lib.systems machinery
---
 .../emulators/fs-uae/launcher.nix             | 21 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix
index 51349182832a..550b0da7af68 100644
--- a/pkgs/applications/emulators/fs-uae/launcher.nix
+++ b/pkgs/applications/emulators/fs-uae/launcher.nix
@@ -1,10 +1,10 @@
 { lib
-, stdenv
 , fetchurl
-, gettext
-, python3
-, wrapQtAppsHook
 , fsuae
+, gettext
+, python3Packages
+, stdenv
+, libsForQt5
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,16 +18,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     gettext
-    python3
-    wrapQtAppsHook
+    python3Packages.python
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = with python3.pkgs; [
+  buildInputs = with python3Packages; [
     pyqt5
     requests
     setuptools
   ];
 
+  strictDeps = true;
+
   makeFlags = [ "prefix=$(out)" ];
 
   dontWrapQtApps = true;
@@ -47,8 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://fs-uae.net";
     description = "Graphical front-end for the FS-UAE emulator";
     license = lib.licenses.gpl2Plus;
+    mainProgram = "fs-uae-launcher";
     maintainers = with lib.maintainers; [ sander AndersonTorres ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = with lib.systems.inspect;
+      patternLogicalAnd patterns.isx86 patterns.isLinux;
   };
 })
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b503f53be773..19b39131ce1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2689,7 +2689,7 @@ with pkgs;
 
   fsuae = callPackage ../applications/emulators/fs-uae { };
 
-  fsuae-launcher = libsForQt5.callPackage ../applications/emulators/fs-uae/launcher.nix { };
+  fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { };
 
   fuc = callPackage ../tools/misc/fuc { };
 

From c2ad2cde3a2ae9831374801970fc07497c334529 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 10 Mar 2024 00:26:28 -0300
Subject: [PATCH 020/118] fsuae: migrate to by-name

---
 .../fs-uae/default.nix => by-name/fs/fsuae/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/emulators/fs-uae/default.nix => by-name/fs/fsuae/package.nix} (100%)

diff --git a/pkgs/applications/emulators/fs-uae/default.nix b/pkgs/by-name/fs/fsuae/package.nix
similarity index 100%
rename from pkgs/applications/emulators/fs-uae/default.nix
rename to pkgs/by-name/fs/fsuae/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19b39131ce1b..7b90903e2482 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2687,8 +2687,6 @@ with pkgs;
 
   fsrx = callPackage ../tools/misc/fsrx { };
 
-  fsuae = callPackage ../applications/emulators/fs-uae { };
-
   fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { };
 
   fuc = callPackage ../tools/misc/fuc { };

From f67c4bbccf1b4bac1d1b26e2812442cbc40f2f59 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 10 Mar 2024 00:27:03 -0300
Subject: [PATCH 021/118] fsuae-launcher: migrate to by-name

---
 .../launcher.nix => by-name/fs/fsuae-launcher/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/emulators/fs-uae/launcher.nix => by-name/fs/fsuae-launcher/package.nix} (100%)

diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/by-name/fs/fsuae-launcher/package.nix
similarity index 100%
rename from pkgs/applications/emulators/fs-uae/launcher.nix
rename to pkgs/by-name/fs/fsuae-launcher/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b90903e2482..839ac2155dca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2687,8 +2687,6 @@ with pkgs;
 
   fsrx = callPackage ../tools/misc/fsrx { };
 
-  fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { };
-
   fuc = callPackage ../tools/misc/fuc { };
 
   fuse-emulator = callPackage ../applications/emulators/fuse-emulator { };

From 773de59c1b602822af1e6ed750481cdcb896b6ac Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 10 Mar 2024 00:31:00 -0300
Subject: [PATCH 022/118] fsuae-launcher: 3.1.68 -> 3.1.70

Co-authored-by: R. RyanTM <ryantm-bot@ryantm.com>
---
 pkgs/by-name/fs/fsuae-launcher/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fs/fsuae-launcher/package.nix b/pkgs/by-name/fs/fsuae-launcher/package.nix
index 550b0da7af68..da6eb5ed35b8 100644
--- a/pkgs/by-name/fs/fsuae-launcher/package.nix
+++ b/pkgs/by-name/fs/fsuae-launcher/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fs-uae-launcher";
-  version = "3.1.68";
+  version = "3.1.70";
 
   src = fetchurl {
     url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${finalAttrs.version}/fs-uae-launcher-${finalAttrs.version}.tar.xz";
-    hash = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA=";
+    hash = "sha256-yvJ8sa44V13SEUJ6C9SgS+N2ZFH5+20TTL2ICY9A36c=";
   };
 
   nativeBuildInputs = [

From d807f03f74e6bd24d5baf2f7396e2b9329747459 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 06:08:31 +0000
Subject: [PATCH 023/118] quick-lint-js: 3.1.0 -> 3.2.0

---
 pkgs/development/tools/quick-lint-js/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix
index 0de8496c014e..0227a00f9d0a 100644
--- a/pkgs/development/tools/quick-lint-js/default.nix
+++ b/pkgs/development/tools/quick-lint-js/default.nix
@@ -1,13 +1,13 @@
 { buildPackages, cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }:
 
 let
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "quick-lint";
     repo = "quick-lint-js";
     rev = version;
-    hash = "sha256-bgyjpFYGU+uZLVBJ3gpl8UOrRzvz+7qibQD2RllSY38=";
+    hash = "sha256-L2LCRm1Fsg+xRdPc8YmgxDnuXJo92nxs862ewzObZ3I=";
   };
 
   quick-lint-js-build-tools = buildPackages.stdenv.mkDerivation {

From 2058a09590653c6cff3470046cc343a1236fe28c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 12:39:34 +0000
Subject: [PATCH 024/118] antimicrox: 3.3.4 -> 3.4.0

---
 pkgs/tools/misc/antimicrox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix
index 85e9af7bb67e..a0bafa726f97 100644
--- a/pkgs/tools/misc/antimicrox/default.nix
+++ b/pkgs/tools/misc/antimicrox/default.nix
@@ -12,13 +12,13 @@
 
 mkDerivation rec {
   pname = "antimicrox";
-  version = "3.3.4";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "AntiMicroX";
     repo = pname;
     rev = version;
-    sha256 = "sha256-WEtKeQKRZcYpZ4mnFdj4ZRApBuD8fByf11Uu6ylbAcY=";
+    sha256 = "sha256-zBIEuZdmcyA99YdwC6tn0I3Ori8VyBOw50ablb/Lmvs=";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ];

From c57c612ba0857dd9e58a64f9a32124f75e0e4893 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 12:43:33 +0000
Subject: [PATCH 025/118] evilwm: 1.4.2 -> 1.4.3

---
 pkgs/applications/window-managers/evilwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix
index a0dbb3660d31..017a1ab0fe95 100644
--- a/pkgs/applications/window-managers/evilwm/default.nix
+++ b/pkgs/applications/window-managers/evilwm/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evilwm";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchurl {
     url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz";
-    sha256 = "sha256-QhLW2QywBbLMiIFLyFN3NrSVCrWCZLu2W4gHrGO9xLk=";
+    sha256 = "sha256-1ZRbILEskdskEvrA29o/ucPsjeu44bEJg4mSsrG75dQ=";
   };
 
   buildInputs = [

From 1f739a607bdae80b7c89bf618fbe07c108cfaa1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 14:38:19 +0000
Subject: [PATCH 026/118] steampipe: 0.21.8 -> 0.22.0

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

diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix
index 31d27ffe8bae..04e4593f1ebd 100644
--- a/pkgs/tools/misc/steampipe/default.nix
+++ b/pkgs/tools/misc/steampipe/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "steampipe";
-  version = "0.21.8";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe";
     rev = "v${version}";
-    hash = "sha256-PY2CpieY1kTuT3Yd6i5hiRjVEwYNHn1GF+E0g6u8BP0=";
+    hash = "sha256-Qmb4dBLtztrhnm8fKEkaxX2tJAXsQ+/C8cweQbRc7uk=";
   };
 
-  vendorHash = "sha256-yS2FiTnK65LAY3tGSlMy0LMg6691tS/9yQ4w7HrW/pw=";
+  vendorHash = "sha256-2p/D/sycx78BXBe+WHeYP4hLz1aX33cCRQ/AbwKkidM=";
   proxyVendor = true;
 
   patchPhase = ''

From aeda0de97acda27ff77e692ee3700dac05bc47e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 17:08:46 +0000
Subject: [PATCH 027/118] popeye: 0.20.5 -> 0.21.0

---
 pkgs/applications/networking/cluster/popeye/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix
index 7cb97701f8d8..cbea60bf151c 100644
--- a/pkgs/applications/networking/cluster/popeye/default.nix
+++ b/pkgs/applications/networking/cluster/popeye/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "popeye";
-  version = "0.20.5";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "derailed";
     repo = "popeye";
-    sha256 = "sha256-e3ANhF2g1YpCipnHej2ZegoAq20MOyTIjxgNMs3qGbk=";
+    sha256 = "sha256-wEOmG15h3YRO/MmMj5QZxmc0itZJeIQs3LuB3GXWWQw=";
   };
 
   ldflags = [
@@ -17,7 +17,7 @@ buildGoModule rec {
     "-X github.com/derailed/popeye/cmd.commit=${version}"
   ];
 
-  vendorHash = "sha256-lRm3cS+VYP9vptr6ixmkni7DpNnexrhyccKDV7TWKg0=";
+  vendorHash = "sha256-qrw/7fauMVb3Ai5E5MXL84yXHcReJZZ1oioB/Cv32Is=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 2c5bf8a1097eca05eee980b4ffd7ebe5515b8f4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 18:38:19 +0000
Subject: [PATCH 028/118] zrok: 0.4.24 -> 0.4.26

---
 pkgs/tools/networking/zrok/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix
index 68d4ad3ba125..6de421dce2d1 100644
--- a/pkgs/tools/networking/zrok/default.nix
+++ b/pkgs/tools/networking/zrok/default.nix
@@ -14,14 +14,14 @@ let
   }.${system} or throwSystem;
 
   hash = {
-    x86_64-linux = "sha256-17RtPUuFmIwxh+9mEsR9vwUHQHnXLIHEEhpV05Q9Ssw=";
-    aarch64-linux = "sha256-bJjhKf8dkOsVaaPikDrPLe+zF5CFvxvEALuzmiQuINY=";
-    armv7l-linux = "sha256-m/Ncr/+5kkC4p1/DhEfWermdsOAuekVECzR7SI1KpIQ=";
+    x86_64-linux = "sha256-XzMd2NgMY8AUSjdYDyOEcK3HlZ5hl+L/ulHgy2iDtKg=";
+    aarch64-linux = "sha256-ypjg73ciUhXIyiNSLzim8AZV0ByU27WRc3PJqTyTllg=";
+    armv7l-linux = "sha256-VgVn5NsGpvGpkLQRZDphOgeZFQzhR2rVfcwi/EkJ/y4=";
   }.${system} or throwSystem;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zrok";
-  version = "0.4.24";
+  version = "0.4.26";
 
   src = fetchzip {
     url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz";

From 64022a296caffc55d1b13d27414aa2783bdf8bad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Mar 2024 19:30:20 +0000
Subject: [PATCH 029/118] terser: 5.28.1 -> 5.29.1

---
 pkgs/development/tools/misc/terser/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/terser/default.nix b/pkgs/development/tools/misc/terser/default.nix
index e51d5328db26..f58473eb54cf 100644
--- a/pkgs/development/tools/misc/terser/default.nix
+++ b/pkgs/development/tools/misc/terser/default.nix
@@ -2,16 +2,16 @@
 
 buildNpmPackage rec {
   pname = "terser";
-  version = "5.28.1";
+  version = "5.29.1";
 
   src = fetchFromGitHub {
     owner = "terser";
     repo = "terser";
     rev = "v${version}";
-    hash = "sha256-iThO12jPzwCyfi69Z0YpttRxhVnSVirKbttN6R5iqRg=";
+    hash = "sha256-1E5sXNKekkxv40FwGBR20LEWbM63SyKOZ7h1pcCqLKA=";
   };
 
-  npmDepsHash = "sha256-CptJkwC0A03v2CeYSCKXq7fOhPdLWPrVJYpayzKbdkQ=";
+  npmDepsHash = "sha256-X37hDDyi0eEWdVoy3vU6+efXgEaLRK81LjfDEWqSFC0=";
 
   meta = with lib; {
     description = "JavaScript parser, mangler and compressor toolkit for ES6+";

From 9901c2f3005d9d9fb754c5a5e45ead6849406491 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Mar 2024 01:01:16 +0000
Subject: [PATCH 030/118] corectrl: 1.3.10 -> 1.3.11

---
 pkgs/applications/misc/corectrl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix
index 2b17ea756878..117bd24152e6 100644
--- a/pkgs/applications/misc/corectrl/default.nix
+++ b/pkgs/applications/misc/corectrl/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec{
   pname = "corectrl";
-  version = "1.3.10";
+  version = "1.3.11";
 
   src = fetchFromGitLab {
     owner = "corectrl";
     repo = "corectrl";
     rev = "v${version}";
-    sha256 = "sha256-fN4dX0Ya2DvPEkuwtKIw1zT+JEbC2zyJKtcGwLVdAUs=";
+    sha256 = "sha256-yca9qzYJlOQak6IMNewgUe+KSUUypj/lLUGGw6R90Ws=";
   };
   patches = [
     ./polkit-dir.patch

From e2d205854e9ffe46d19218bbaf1bd5376341ff9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Mar 2024 02:46:33 +0000
Subject: [PATCH 031/118] wslu: 4.1.1 -> 4.1.2

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

diff --git a/pkgs/by-name/ws/wslu/package.nix b/pkgs/by-name/ws/wslu/package.nix
index 422b8e76efb6..b45d566b0f85 100644
--- a/pkgs/by-name/ws/wslu/package.nix
+++ b/pkgs/by-name/ws/wslu/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wslu";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     owner = "wslutilities";
     repo = "wslu";
     rev = "v${version}";
-    hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc=";
+    hash = "sha256-rmNGKayg8Y872yICilveMpDFBLkDZ6Ox8rqtWrK2om8=";
   };
 
   nativeBuildInputs = [ copyDesktopItems ];

From 7b7b5cd0874c3c7b399dfc60569b541e4e21934d Mon Sep 17 00:00:00 2001
From: Chad Jablonski <chad@jablonski.xyz>
Date: Sun, 10 Mar 2024 22:21:01 -0400
Subject: [PATCH 032/118] vimPlugins.outline-nvim: init at 2024-01-22

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index c5821f51e42c..881e3a2dd009 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8483,6 +8483,18 @@ final: prev:
     meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
   };
 
+  outline-nvim = buildVimPlugin {
+    pname = "outline.nvim";
+    version = "2024-01-22";
+    src = fetchFromGitHub {
+      owner = "hedyhli";
+      repo = "outline.nvim";
+      rev = "a8d40aecb799196303ff3521c0e31c87bba57198";
+      sha256 = "1xhqrgjj37d1wq7vrcw9vwmrvzl5a3vyz4k0dglvgjq5z2g5zb0x";
+    };
+    meta.homepage = "https://github.com/hedyhli/outline.nvim/";
+  };
+
   overseer-nvim = buildVimPlugin {
     pname = "overseer.nvim";
     version = "2024-02-21";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 78c923ef87d5..9f7eb2890934 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -713,6 +713,7 @@ https://github.com/salkin-mada/openscad.nvim/,HEAD,
 https://github.com/nvim-orgmode/orgmode/,,
 https://github.com/rgroli/other.nvim/,HEAD,
 https://github.com/jmbuhr/otter.nvim/,,
+https://github.com/hedyhli/outline.nvim/,HEAD,
 https://github.com/stevearc/overseer.nvim/,HEAD,
 https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD,
 https://github.com/vuki656/package-info.nvim/,,

From 3eb199125cd4cc32d8551e20e75dc8aabfb174f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Mar 2024 18:34:25 +0000
Subject: [PATCH 033/118] pure-maps: 3.2.1 -> 3.3.0

---
 pkgs/applications/misc/pure-maps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix
index d1bfe4132583..1789771ae506 100644
--- a/pkgs/applications/misc/pure-maps/default.nix
+++ b/pkgs/applications/misc/pure-maps/default.nix
@@ -6,13 +6,13 @@
 
 mkDerivation rec {
   pname = "pure-maps";
-  version = "3.2.1";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "rinigus";
     repo = "pure-maps";
     rev = version;
-    hash = "sha256-AZt0JcNegHkUkWy+NW5CNLZfxjjFyKWBrhLJgSTv3to=";
+    hash = "sha256-TeFolD3jXRdLGfXdy+QcwtOcQQVUB5fn8PwoYfRLaPQ=";
     fetchSubmodules = true;
   };
 

From a51ac7ed16a805f5a2b10716c08a1d54afdf61a0 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 13 Mar 2024 10:05:26 +0100
Subject: [PATCH 034/118] linuxPackages_latest.prl-tools: 19.2.1-54832 ->
 19.3.0-54924

---
 pkgs/os-specific/linux/prl-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index f8196dba6157..6acb8eba3863 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -36,13 +36,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prl-tools";
-  version = "19.2.1-54832";
+  version = "19.3.0-54924";
 
   # We download the full distribution to extract prl-tools-lin.iso from
   # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
   src = fetchurl {
     url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
-    hash = "sha256-PmQSGoJbB0+Q7t56FOFxOVQ86CJLqAa6PTnWLx5CzpA=";
+    hash = "sha256-Hj1manQSZHiht6mmWes44RVk2Bdqp6QdNCdK322bzWc=";
   };
 
   hardeningDisable = [ "pic" "format" ];

From 41097934611132590cd7c77285b281e6a0dabf3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Mar 2024 10:35:18 +0000
Subject: [PATCH 035/118] oxlint: 0.2.12 -> 0.2.13

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

diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix
index 0d7eb08b41a1..f1a6c9810b90 100644
--- a/pkgs/development/tools/oxlint/default.nix
+++ b/pkgs/development/tools/oxlint/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oxlint";
-  version = "0.2.12";
+  version = "0.2.13";
 
   src = fetchFromGitHub {
     owner = "web-infra-dev";
     repo = "oxc";
     rev = "oxlint_v${version}";
-    hash = "sha256-uI+zzRRsRaO3OpDhhrp4VW7mHjwmOENHkPl5htYJ2dA=";
+    hash = "sha256-R6RKAOmLjPO1vsM/YMQZpggO98GtecNb+nUf3jC2/+o=";
   };
 
-  cargoHash = "sha256-FV79CORqCXj24CCgGLKew5/tpnjMgVEek0cL2FTFq1A=";
+  cargoHash = "sha256-+bbTPbCKWN+iJkbtDfEE2CuRdLJNAIoAB0+sSd0kgR4=";
 
   buildInputs = [
     rust-jemalloc-sys

From fd5b7188ef74243aedad891441e87624a3cc2598 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Mar 2024 12:21:27 +0000
Subject: [PATCH 036/118] mafft: 7.520 -> 7.525

---
 pkgs/applications/science/biology/mafft/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/mafft/default.nix b/pkgs/applications/science/biology/mafft/default.nix
index e9acd1c88b66..f2e3ead2e913 100644
--- a/pkgs/applications/science/biology/mafft/default.nix
+++ b/pkgs/applications/science/biology/mafft/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mafft";
-  version = "7.520";
+  version = "7.525";
 
   src = fetchFromGitLab {
     owner = "sysimm";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-H+EcKahJWwidAx+IUT4uCZEty+S8hUeMSB8VbTu5SmQ=";
+    sha256 = "sha256-ckBmvFssYAmYcBHAEftjQqBV0MB0theGfemaPx3XUws=";
   };
 
   preBuild = ''

From ddb5ba4187ae8582819910d940c140e85a82bab1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Mar 2024 14:14:16 +0000
Subject: [PATCH 037/118] biome: 1.5.3 -> 1.6.1

---
 pkgs/development/tools/biome/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix
index 2f1a5da293c5..dc49507bb96f 100644
--- a/pkgs/development/tools/biome/default.nix
+++ b/pkgs/development/tools/biome/default.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "biome";
-  version = "1.5.3";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "cli/v${version}";
-    hash = "sha256-70LHsmS01ssD4yCbHfBouV+NyhMIlBbX0jcHFu8aLMw=";
+    hash = "sha256-JApGz2vDGU1IFmhyaT1noCRIP0YoucVvHq395/CJ1zA=";
   };
 
-  cargoHash = "sha256-wf6X6aY1O9EABQ6sDNAb3XsVrC0lgUtpgoieiPZ7r3k=";
+  cargoHash = "sha256-4m2xtj3FHd8DTS3BeUMVoo8Pzjkol96B6tvNyzqPhEo=";
 
   nativeBuildInputs = [
     pkg-config
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [ "-p=biome_cli" ];
   cargoTestFlags = cargoBuildFlags ++
-    # skip a broken test from v1.5.3 release
+    # skip a broken test from v1.6.1 release
     # this will be removed on the next version
     [ "-- --skip=diagnostics::test::termination_diagnostic_size" ];
 

From 8f22f2aefff9d18df80f0504be0ff6fae94419a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Mar 2024 04:21:36 +0000
Subject: [PATCH 038/118] clj-kondo: 2024.02.12 -> 2024.03.13

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

diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix
index a11029c1514f..f1900ed9a330 100644
--- a/pkgs/development/tools/clj-kondo/default.nix
+++ b/pkgs/development/tools/clj-kondo/default.nix
@@ -3,12 +3,12 @@
 
 buildGraalvmNativeImage rec {
   pname = "clj-kondo";
-  version = "2024.02.12";
+  version = "2024.03.13";
 
   src = fetchurl {
     url =
       "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "sha256-up98q1/GWP9wZP95lHNE1z2xhzGzb8ZyTeuhP7a+qHw=";
+    sha256 = "sha256-4V0YtGRbSzebxGYkoyCJEA4e1vtYWNbIHyXOlTfvGTU=";
   };
 
   graalvmDrv = graalvmCEPackages.graalvm-ce;

From 56a235551a6428d594d42077c5b324e2c8431d4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Mar 2024 05:47:10 +0000
Subject: [PATCH 039/118] xpipe: 8.0.1 -> 8.3

---
 pkgs/applications/networking/xpipe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix
index fdd403cd4e0f..e117e6e4a54c 100644
--- a/pkgs/applications/networking/xpipe/default.nix
+++ b/pkgs/applications/networking/xpipe/default.nix
@@ -33,14 +33,14 @@ let
   }.${system} or throwSystem;
 
   hash = {
-    x86_64-linux = "sha256-MtSpyPj2PX8K2e4ZLAmvn0T5bJvPtBbzmn6/cTXGlbc=";
+    x86_64-linux = "sha256-5AxEkGmThLEEw1XGrWuabRcVgYH8OT2cXxyeFrYeBOI=";
   }.${system} or throwSystem;
 
   displayname = "XPipe";
 
 in stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "8.0.1";
+  version = "8.3";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

From 2aaaa26710e0b8009ac9782666e736888f5c1f87 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Thu, 14 Mar 2024 13:06:47 +0100
Subject: [PATCH 040/118] python3Packages.jsonformatter: init at 0.3.2

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 .../python-modules/jsonformatter/default.nix  | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/jsonformatter/default.nix

diff --git a/pkgs/development/python-modules/jsonformatter/default.nix b/pkgs/development/python-modules/jsonformatter/default.nix
new file mode 100644
index 000000000000..f800493b2c93
--- /dev/null
+++ b/pkgs/development/python-modules/jsonformatter/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "jsonformatter";
+  version = "0.3.2";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "MyColorfulDays";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-oK419J/MIxRT+1j/5Yklj1F+4d3wuMXR8IVqJAMKPNw=";
+  };
+
+  nativeBuildInputs = [ setuptools ];
+
+  pythonImportsCheck = [
+    "jsonformatter"
+  ];
+
+  meta = with lib; {
+    description = "jsonformatter is a formatter for python output json log, e.g. output LogStash needed log";
+    homepage = "https://github.com/MyColorfulDays/jsonformatter";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ gador ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 545fe4a7dae3..96fc557382e7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6015,6 +6015,8 @@ self: super: with self; {
 
   jsonable = callPackage ../development/python-modules/jsonable { };
 
+  jsonformatter = callPackage ../development/python-modules/jsonformatter { };
+
   jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; };
 
   jsonpatch = callPackage ../development/python-modules/jsonpatch { };

From f353e79a828d06558d204ce13fced6f0c587878e Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Thu, 14 Mar 2024 13:07:38 +0100
Subject: [PATCH 041/118] pgadmin4: 8.3 -> 8.4

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/tools/admin/pgadmin/default.nix |  22 +++--
 pkgs/tools/admin/pgadmin/yarn.lock   | 136 +++++++++++++++++++++++++--
 2 files changed, 140 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index dcd250b9e837..31093f0497b4 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -14,14 +14,14 @@
 
 let
   pname = "pgadmin";
-  version = "8.3";
-  yarnHash = "sha256-nhHss4YOFu2cGkIhA909lIdnf3H3pD9BQx4PvP9+9c0=";
+  version = "8.4";
+  yarnHash = "sha256-Wizgb3WgNPYOLytEj7hBVMV/U3RqW9vhNnhQU4k+j+8=";
 
   src = fetchFromGitHub {
     owner = "pgadmin-org";
     repo = "pgadmin4";
     rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-2L/JLkuyjx1oD9akQULmzW0FlSq8/MQlZ1HmlO81jj0=";
+    hash = "sha256-kj/a1JjSDFnLY/UQNBqYdhs3J5wi0mlDyJ1jD/L12FM=";
   };
 
   # keep the scope, as it is used throughout the derivation and tests
@@ -54,20 +54,23 @@ pythonPackages.buildPythonApplication rec {
     # patching Makefile, so it doesn't try to build sphinx documentation here
     # (will do so later)
     substituteInPlace Makefile \
-      --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true"
+      --replace-fail 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true"
 
     # fix document which refers a non-existing document and fails
     substituteInPlace docs/en_US/contributions.rst \
-      --replace "code_snippets" ""
+      --replace-fail "code_snippets" ""
     # relax dependencies
     sed 's|==|>=|g' -i requirements.txt
     # fix extra_require error with "*" in match
     sed 's|*|0|g' -i requirements.txt
+    # remove packageManager from package.json so we can work without corepack
+    substituteInPlace web/package.json \
+      --replace-fail "\"packageManager\": \"yarn@3.6.4\"" "\"\": \"\""
     substituteInPlace pkg/pip/setup_pip.py \
-      --replace "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req"
+      --replace-fail "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req"
     ${lib.optionalString (!server-mode) ''
     substituteInPlace web/config.py \
-      --replace "SERVER_MODE = True" "SERVER_MODE = False"
+      --replace-fail "SERVER_MODE = True" "SERVER_MODE = False"
     ''}
   '';
 
@@ -182,6 +185,7 @@ pythonPackages.buildPythonApplication rec {
     keyring
     typer
     rich
+    jsonformatter
   ];
 
   passthru.tests = {
@@ -209,8 +213,8 @@ pythonPackages.buildPythonApplication rec {
     # in /var/lib/pgadmin and /var/log/pgadmin
     # see https://github.com/pgadmin-org/pgadmin4/blob/fd1c26408bbf154fa455a49ee5c12895933833a3/web/regression/runtests.py#L217-L226
     cp -v regression/test_config.json.in regression/test_config.json
-    substituteInPlace regression/test_config.json --replace "localhost" "$PGHOST"
-    substituteInPlace regression/runtests.py --replace "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False"
+    substituteInPlace regression/test_config.json --replace-fail "localhost" "$PGHOST"
+    substituteInPlace regression/runtests.py --replace-fail "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False"
 
     ## Browser test ##
 
diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock
index c6573efabf78..1acf9a14a07c 100644
--- a/pkgs/tools/admin/pgadmin/yarn.lock
+++ b/pkgs/tools/admin/pgadmin/yarn.lock
@@ -1715,6 +1715,82 @@
   resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@codemirror/autocomplete@^6.0.0":
+  version "6.12.0"
+  resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.12.0.tgz#3fa620a8a3f42ded7751749916e8375f6bbbb333"
+  integrity sha512-r4IjdYFthwbCQyvqnSlx0WBHRHi8nBvU+WjJxFUij81qsBfhNudf/XKKmmC2j3m0LaOYUQTf3qiEK1J8lO1sdg==
+  dependencies:
+    "@codemirror/language" "^6.0.0"
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.17.0"
+    "@lezer/common" "^1.0.0"
+
+"@codemirror/commands@^6.0.0":
+  version "6.3.3"
+  resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz#03face5bf5f3de0fc4e09b177b3c91eda2ceb7e9"
+  integrity sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==
+  dependencies:
+    "@codemirror/language" "^6.0.0"
+    "@codemirror/state" "^6.4.0"
+    "@codemirror/view" "^6.0.0"
+    "@lezer/common" "^1.1.0"
+
+"@codemirror/lang-sql@^6.5.5":
+  version "6.5.5"
+  resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.5.5.tgz#85619f4ea6738c07c0241b19c62d8ef86678e672"
+  integrity sha512-DvOaP2RXLb2xlxJxxydTFfwyYw5YDqEFea6aAfgh9UH0kUD6J1KFZ0xPgPpw1eo/5s2w3L6uh5PVR7GM23GxkQ==
+  dependencies:
+    "@codemirror/autocomplete" "^6.0.0"
+    "@codemirror/language" "^6.0.0"
+    "@codemirror/state" "^6.0.0"
+    "@lezer/common" "^1.2.0"
+    "@lezer/highlight" "^1.0.0"
+    "@lezer/lr" "^1.0.0"
+
+"@codemirror/language@^6.0.0":
+  version "6.10.0"
+  resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.10.0.tgz#2d0e818716825ee2ed0dacd04595eaa61bae8f23"
+  integrity sha512-2vaNn9aPGCRFKWcHPFksctzJ8yS5p7YoaT+jHpc0UGKzNuAIx4qy6R5wiqbP+heEEdyaABA582mNqSHzSoYdmg==
+  dependencies:
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.23.0"
+    "@lezer/common" "^1.1.0"
+    "@lezer/highlight" "^1.0.0"
+    "@lezer/lr" "^1.0.0"
+    style-mod "^4.0.0"
+
+"@codemirror/lint@^6.0.0":
+  version "6.4.2"
+  resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.2.tgz#c13be5320bde9707efdc94e8bcd3c698abae0b92"
+  integrity sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==
+  dependencies:
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.0.0"
+    crelt "^1.0.5"
+
+"@codemirror/search@^6.0.0":
+  version "6.5.5"
+  resolved "https://registry.npmjs.org/@codemirror/search/-/search-6.5.5.tgz#cf97e201da364da2285c2a250167af25bbd2a4a2"
+  integrity sha512-PIEN3Ke1buPod2EHbJsoQwlbpkz30qGZKcnmH1eihq9+bPQx8gelauUwLYaY4vBOuBAuEhmpDLii4rj/uO0yMA==
+  dependencies:
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.0.0"
+    crelt "^1.0.5"
+
+"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.npmjs.org/@codemirror/state/-/state-6.4.0.tgz#8bc3e096c84360b34525a84696a84f86b305363a"
+  integrity sha512-hm8XshYj5Fo30Bb922QX9hXB/bxOAVH+qaqHBzw5TKa72vOeslyGwd4X8M0c1dJ9JqxlaMceOQ8RsL9tC7gU0A==
+
+"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0":
+  version "6.23.1"
+  resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.23.1.tgz#1ce3039a588d6b93f153b7c4c035c2075ede34a6"
+  integrity sha512-J2Xnn5lFYT1ZN/5ewEoMBCmLlL71lZ3mBdb7cUEuHhX2ESoSrNEucpsDXpX22EuTGm9LOgC9v4Z0wx+Ez8QmGA==
+  dependencies:
+    "@codemirror/state" "^6.4.0"
+    style-mod "^4.1.0"
+    w3c-keyname "^2.2.4"
+
 "@date-io/core@1.x", "@date-io/core@^1.3.13", "@date-io/core@^1.3.6":
   version "1.3.13"
   resolved "https://registry.npmjs.org/@date-io/core/-/core-1.3.13.tgz#90c71da493f20204b7a972929cc5c482d078b3fa"
@@ -2286,6 +2362,25 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@lezer/common@^1.0.0", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0":
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz#198b278b7869668e1bebbe687586e12a42731049"
+  integrity sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==
+
+"@lezer/highlight@^1.0.0":
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz#e5898c3644208b4b589084089dceeea2966f7780"
+  integrity sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==
+  dependencies:
+    "@lezer/common" "^1.0.0"
+
+"@lezer/lr@^1.0.0":
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz#ed52a75dbbfbb0d1eb63710ea84c35ee647cb67e"
+  integrity sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==
+  dependencies:
+    "@lezer/common" "^1.0.0"
+
 "@material-ui/core@4.12.4":
   version "4.12.4"
   resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73"
@@ -4527,10 +4622,18 @@ co@^4.6.0:
   resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
-codemirror@^5.59.2:
-  version "5.65.13"
-  resolved "https://registry.npmjs.org/codemirror/-/codemirror-5.65.13.tgz#c098a6f409db8b5a7c5722788bd9fa3bb2367f2e"
-  integrity sha512-SVWEzKXmbHmTQQWaz03Shrh4nybG0wXx2MEu3FO4ezbPW8IbnZEd5iGHGEffSUaitKYa3i+pHpBsSvw8sPHtzg==
+codemirror@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz#62b91142d45904547ee3e0e0e4c1a79158035a29"
+  integrity sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==
+  dependencies:
+    "@codemirror/autocomplete" "^6.0.0"
+    "@codemirror/commands" "^6.0.0"
+    "@codemirror/language" "^6.0.0"
+    "@codemirror/lint" "^6.0.0"
+    "@codemirror/search" "^6.0.0"
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.0.0"
 
 collect-v8-coverage@^1.0.0:
   version "1.0.2"
@@ -4797,6 +4900,11 @@ create-ecdh@^4.0.0:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+crelt@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz#7cc898ea74e190fb6ef9dae57f8f81cf7302df72"
+  integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==
+
 cross-env@^7.0.3:
   version "7.0.3"
   resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
@@ -6837,6 +6945,11 @@ hosted-git-info@^4.0.1:
   dependencies:
     lru-cache "^6.0.0"
 
+hotkeys-js@^3.13.3:
+  version "3.13.3"
+  resolved "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.13.3.tgz#b0a9f243bb1e9cacb93d3772a9e1f6013c0698a3"
+  integrity sha512-IEiMBNRJZMhWyNDsvww8LYC8vZYyj2/w2GgXPg0ljq/K3SYvOJH6NRMqzF7z2Fwaq2AzKSvmvECREzFleKSeow==
+
 html-dom-parser@5.0.4:
   version "5.0.4"
   resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-5.0.4.tgz#2941a762317d088e747db31c8cf290987ec30a55"
@@ -8918,11 +9031,6 @@ moo@^0.5.0:
   resolved "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
   integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
 
-mousetrap@^1.6.3:
-  version "1.6.5"
-  resolved "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9"
-  integrity sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==
-
 mozjpeg@^8.0.0:
   version "8.0.0"
   resolved "https://registry.npmjs.org/mozjpeg/-/mozjpeg-8.0.0.tgz#cd990d96581626ca64b877146ce22ba00b3b308c"
@@ -11619,6 +11727,11 @@ style-loader@^3.3.2:
   resolved "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz#bba8daac19930169c0c9c96706749a597ae3acff"
   integrity sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==
 
+"style-mod@^4.0.0", "style-mod@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz#a313a14f4ae8bb4d52878c0053c4327fb787ec09"
+  integrity sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA==
+
 style-to-js@1.1.9:
   version "1.1.9"
   resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.9.tgz#5bdc23ba7624016094a19d6ea90fa3f98bee34c4"
@@ -12354,6 +12467,11 @@ vm-browserify@^1.0.0:
   resolved "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
+w3c-keyname@^2.2.4:
+  version "2.2.8"
+  resolved "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5"
+  integrity sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==
+
 w3c-xmlserializer@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"

From 8bf5cc266685eda1269846bd31e92abf23a8bab8 Mon Sep 17 00:00:00 2001
From: Stzx <silence.m@hotmail.com>
Date: Thu, 14 Mar 2024 21:53:33 +0800
Subject: [PATCH 042/118] pinentry: fix DM option and user conflict

---
 nixos/modules/services/desktop-managers/plasma6.nix     | 2 +-
 nixos/modules/services/x11/desktop-managers/deepin.nix  | 2 +-
 nixos/modules/services/x11/desktop-managers/lxqt.nix    | 2 +-
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +-
 nixos/modules/services/x11/desktop-managers/xfce.nix    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index 1710d28954d6..1cb7a7ea778b 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -215,7 +215,7 @@ in {
       serif = ["Noto Serif"];
     };
 
-    programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
+    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
     programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass";
 
     # Enable helpful DBus services.
diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix
index e6f221201013..902e3a9317dd 100644
--- a/nixos/modules/services/x11/desktop-managers/deepin.nix
+++ b/nixos/modules/services/x11/desktop-managers/deepin.nix
@@ -66,7 +66,7 @@ in
       services.upower.enable = mkDefault config.powerManagement.enable;
       networking.networkmanager.enable = mkDefault true;
       programs.dconf.enable = mkDefault true;
-      programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
+      programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
 
       fonts.packages = with pkgs; [ noto-fonts ];
       xdg.mime.enable = true;
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index d3bdc4326a90..3d02deba6fc7 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -62,7 +62,7 @@ in
     # Link some extra directories in /run/current-system/software/share
     environment.pathsToLink = [ "/share" ];
 
-    programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
+    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
 
     # virtual file systems support for PCManFM-QT
     services.gvfs.enable = true;
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index c884b4487e24..f516a29fb5db 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -336,7 +336,7 @@ in
         serif = [ "Noto Serif" ];
       };
 
-      programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
+      programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
       programs.ssh.askPassword = mkDefault "${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass";
 
       # Enable helpful DBus services.
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 6bc964f4c6ed..3ba27b201507 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -131,7 +131,7 @@ in
         xfdesktop
       ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;
 
-    programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2;
+    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
     programs.xfconf.enable = true;
     programs.thunar.enable = true;
 

From fd68644e20e785b3db312a76073139beb0c2ef92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Mar 2024 15:12:15 +0000
Subject: [PATCH 043/118] atmos: 1.65.0 -> 1.66.0

---
 pkgs/applications/networking/cluster/atmos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix
index a13786c78524..dda42538412d 100644
--- a/pkgs/applications/networking/cluster/atmos/default.nix
+++ b/pkgs/applications/networking/cluster/atmos/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "atmos";
-  version = "1.65.0";
+  version = "1.66.0";
 
   src = fetchFromGitHub {
     owner = "cloudposse";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-KhWi5zxPyBe0xJuJjTROwFIyMPqgUvDeRRIOVowKVxc=";
+    sha256 = "sha256-8cEJw4gCyh3aosck70vdLVYGOL3zR0AOpAMNv/j6rEM=";
   };
 
-  vendorHash = "sha256-imMIxEmMdW8nAsQC4q7TID+c7J8LbdtAWFj8qvPGtyA=";
+  vendorHash = "sha256-k03pRrUzHvVjKt6w40JEiJTvbwhKa/0rjkZQsnmfe68=";
 
   ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];
 

From 53b2e88a743e321d0e72090a7fc8de31ec57651f Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Thu, 14 Mar 2024 17:27:03 +0100
Subject: [PATCH 044/118] calibre: 7.6.0 -> 7.7.0

https://github.com/kovidgoyal/calibre/releases/tag/v7.7.0
---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 6003212d16b5..da1e263107b3 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -32,11 +32,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "calibre";
-  version = "7.6.0";
+  version = "7.7.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
-    hash = "sha256-fD2kTwH692x6Nm93NrUQvmbcXiX9hHBpo4wvUvBqLAM=";
+    hash = "sha256-+kz3Fz1RDQ+ROgv7y0WNAWvIESKvHKID8UnSeCh8yA4=";
   };
 
   patches = [

From 0283bc0b06c9166d6d5585f8d462feda87f3f818 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Mar 2024 20:53:22 +0000
Subject: [PATCH 045/118] goa: 3.15.0 -> 3.15.2

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

diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix
index 4928bf501ab8..2519dff139b4 100644
--- a/pkgs/development/tools/goa/default.nix
+++ b/pkgs/development/tools/goa/default.nix
@@ -5,15 +5,15 @@
 
 buildGoModule rec {
   pname = "goa";
-  version = "3.15.0";
+  version = "3.15.2";
 
   src = fetchFromGitHub {
     owner = "goadesign";
     repo = "goa";
     rev = "v${version}";
-    hash = "sha256-F5ynJn3uuKSNZYZy+S6OV0AGv9HMpp4oo7lacQ+q3bw=";
+    hash = "sha256-jzhvElHOBzekW3cyXf7wJG+8E1GObWVtPbBw18/dpCk=";
   };
-  vendorHash = "sha256-SvNuSSLL/zj7rg+k0wNiJazQgZBWrUrpGgumbADkHQY=";
+  vendorHash = "sha256-Z31hTOMmxFM0zmHoZRJaIz7ka2adV0crdhou6EudDWw=";
 
   subPackages = [ "cmd/goa" ];
 

From dcad284a2c35ea8a0a1e8fd90e7f92a369afab63 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Mar 2024 02:39:03 +0100
Subject: [PATCH 046/118] python3Packages.aioautomower: 2024.2.10 -> 2024.3.0

https://github.com/Thomas55555/aioautomower/releases/tag/2024.3.0
---
 pkgs/development/python-modules/aioautomower/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix
index 486781c4c97d..03f091b79775 100644
--- a/pkgs/development/python-modules/aioautomower/default.nix
+++ b/pkgs/development/python-modules/aioautomower/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aioautomower";
-  version = "2024.2.10";
+  version = "2024.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Thomas55555";
     repo = "aioautomower";
     rev = "refs/tags/${version}";
-    hash = "sha256-NRcLyuU5FFIKJALUrx5iVSihzgO6ljqaqlhbs+y2E4Q=";
+    hash = "sha256-Buvnu1UoTPZcHg5422n/Ms+TGsqjqdJ8RQaEJ1oYM1s=";
   };
 
   postPatch = ''

From 637c95a9458db99d3067aceef661aab6b7f850a2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 14 Mar 2024 16:58:48 +0100
Subject: [PATCH 047/118] python311Packages.aiodhcpwatcher: 0.8.0 -> 0.8.1

Diff: https://github.com/bdraco/aiodhcpwatcher/compare/v0.8.0...v0.8.1

Changelog: https://github.com/bdraco/aiodhcpwatcher/blob/v0.8.1/CHANGELOG.md
---
 pkgs/development/python-modules/aiodhcpwatcher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix
index 9a860cfb832c..4ce243fbec38 100644
--- a/pkgs/development/python-modules/aiodhcpwatcher/default.nix
+++ b/pkgs/development/python-modules/aiodhcpwatcher/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "aiodhcpwatcher";
-  version = "0.8.0";
+  version = "0.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiodhcpwatcher";
     rev = "v${version}";
-    hash = "sha256-zZigXYUDSbXjlH810CgLa56xWYKcStBeKUbgsZ5WjOw=";
+    hash = "sha256-t0roU91WblymcY69ieRq9zjlCq+gdJ0eDCkIoNQNjsc=";
   };
 
   postPatch = ''

From 324df0cf66b30f697b0c5b0432db59069dd5ef8f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 14 Mar 2024 21:13:15 +0100
Subject: [PATCH 048/118] python311Packages.airthings-ble: 0.7.0 -> 0.7.1

https://github.com/vincegio/airthings-ble/releases/tag/v0.7.1
---
 pkgs/development/python-modules/airthings-ble/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix
index 91ceae7ea288..1f9458541065 100644
--- a/pkgs/development/python-modules/airthings-ble/default.nix
+++ b/pkgs/development/python-modules/airthings-ble/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "airthings-ble";
-  version = "0.7.0";
+  version = "0.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "vincegio";
     repo = "airthings-ble";
     rev = "refs/tags/${version}";
-    hash = "sha256-A7Nrg0O+WVoHP+m8pz6idnNcxulwPYmMt9DfhKTHG24=";
+    hash = "sha256-BeOrGRVxvfQR1xqIpOp4tOTvlqTKCZHUjVKDqVjVnYM=";
   };
 
   postPatch = ''

From 207cd90b18fefa056d31c4fe614717da8b9bc41f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 14 Mar 2024 22:12:42 +0100
Subject: [PATCH 049/118] python311Packages.pysnmp-lextudio: 6.0.6 -> 6.0.10

https://github.com/lextudio/pysnmp/blob/v6.0.10/CHANGES.txt
---
 pkgs/development/python-modules/pysnmp-lextudio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysnmp-lextudio/default.nix b/pkgs/development/python-modules/pysnmp-lextudio/default.nix
index 89df55d5fd70..6bcbbc717100 100644
--- a/pkgs/development/python-modules/pysnmp-lextudio/default.nix
+++ b/pkgs/development/python-modules/pysnmp-lextudio/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pysnmp-lextudio";
-  version = "6.0.6";
+  version = "6.0.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lextudio";
     repo = "pysnmp";
     rev = "v${version}";
-    hash = "sha256-Mbzpe2wVoW4m7hnfsdcSO/8uOgWl5f1sLLqvdpQP2gU=";
+    hash = "sha256-zxv/+IhIAnnn6gTyulPCuKainUcGMwRqw6ktYXR+d4Q=";
   };
 
   nativeBuildInputs = [

From 766e4042c39c729dd6ae8da70d3728e7e68394e3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 14 Mar 2024 22:16:05 +0100
Subject: [PATCH 050/118] home-assistant.intents: 2024.2.28 -> 2024.3.12

---
 pkgs/servers/home-assistant/intents.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix
index ddb576795880..d0c77694413c 100644
--- a/pkgs/servers/home-assistant/intents.nix
+++ b/pkgs/servers/home-assistant/intents.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-intents";
-  version = "2024.2.28";
+  version = "2024.3.12";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EmnaYc+L1PHOv6M7odYDl+UBZkLJRtP86xPoqdbuOqU=";
+    hash = "sha256-9oMn5ogHcuopAnXgATu9xlBBBMeWJ9RT5C//xJ5FOBI=";
   };
 
   postPatch = ''

From 0b32d406e991bef3d35bc64d3f9db63711205004 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 14 Mar 2024 22:12:58 +0100
Subject: [PATCH 051/118] home-assistant: 2024.3.0 -> 2024.3.1

https://github.com/home-assistant/core/releases/tag/2024.3.1
---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 pkgs/servers/home-assistant/default.nix            | 6 +++---
 pkgs/servers/home-assistant/frontend.nix           | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 78fbdbadeae2..056e17a2be0d 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2024.3.0";
+  version = "2024.3.1";
   components = {
     "3_day_blinds" = ps: with ps; [
     ];
@@ -2430,6 +2430,7 @@
     "joaoapps_join" = ps: with ps; [
     ]; # missing inputs: python-join-api
     "juicenet" = ps: with ps; [
+      python-juicenet
     ];
     "justnimbus" = ps: with ps; [
       justnimbus
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 1a41629d92c7..2d7b18a10bf0 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -399,7 +399,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2024.3.0";
+  hassVersion = "2024.3.1";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -417,13 +417,13 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-/DCE2IHdS+oImpzwIaFgXotAsoiPPbe3X3HG7RXbv9g=";
+    hash = "sha256-cvzoia2zzqXSDnPQdevfs73H4qITPBpEpzpFKM9jRKs=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-G9M1WV+s4zu9BY10RWmJ71ghafAOHMjnCR6BOlggguM=";
+    hash = "sha256-WK2PTTFDnQMwiXAtxjNOo9u5KVXWnqUXqd286hq0VEc=";
   };
 
   nativeBuildInputs = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 1795e8daa7ba..ec699e83164a 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,7 +4,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20240306.0";
+  version = "20240307.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-eDuJC23PJbjaKC9TBCLg5ML3XR6admKrT9RVgfUQCw8=";
+    hash = "sha256-Wy5TzJ6+Dbkk51TMt9zGIfjI7gMrT4mK0IIRnl4byVE=";
   };
 
   # there is nothing to strip in this package

From 3485030d6f95d96ed366e769f56fa2d5ca1b122c Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Thu, 14 Mar 2024 23:36:13 +0100
Subject: [PATCH 052/118] gns3-gui: 2.2.45 -> 2.2.46

https://github.com/GNS3/gns3-gui/releases/tag/v2.2.46
https://github.com/GNS3/gns3-gui/compare/v2.2.45...v2.2.46
---
 pkgs/applications/networking/gns3/default.nix | 8 ++++----
 pkgs/applications/networking/gns3/gui.nix     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 500d4c169280..efa983c9a033 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -12,14 +12,14 @@ in {
 
   guiStable = mkGui {
     channel = "stable";
-    version = "2.2.45";
-    hash = "sha256-SMnhPz5zTPtidy/BIvauDM60WgDLG+NIr9rdUrQhz0A=";
+    version = "2.2.46";
+    hash = "sha256-i/Eq66dYDGR4RLJ76ZlKruhU0KC9KlMMf8Wb91ZoyY0=";
   };
 
   guiPreview = mkGui {
     channel = "stable";
-    version = "2.2.45";
-    hash = "sha256-SMnhPz5zTPtidy/BIvauDM60WgDLG+NIr9rdUrQhz0A=";
+    version = "2.2.46";
+    hash = "sha256-i/Eq66dYDGR4RLJ76ZlKruhU0KC9KlMMf8Wb91ZoyY0=";
   };
 
   serverStable = mkServer {
diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index 218334bbd92f..895df8abfbc7 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
     inherit hash;
     owner = "GNS3";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From 82b4e7aba9ed117d4cd07e641cb45d69a0df53ce Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Thu, 14 Mar 2024 23:37:36 +0100
Subject: [PATCH 053/118] gns3-server: 2.2.45 -> 2.2.46

https://github.com/GNS3/gns3-server/releases/tag/v2.2.46
https://github.com/GNS3/gns3-server/compare/v2.2.45...v2.2.46
---
 pkgs/applications/networking/gns3/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index efa983c9a033..c039a8885ae0 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -24,13 +24,13 @@ in {
 
   serverStable = mkServer {
     channel = "stable";
-    version = "2.2.45";
-    hash = "sha256-1GwhZEPfRW1e+enJipy7YOnA4QzeqZ7aCG92GrsZhms=";
+    version = "2.2.46";
+    hash = "sha256-A6rAhc/EGvbqVdg1jXxNX3bKQLcGurqa7hKh9LvH+es=";
   };
 
   serverPreview = mkServer {
     channel = "stable";
-    version = "2.2.45";
-    hash = "sha256-1GwhZEPfRW1e+enJipy7YOnA4QzeqZ7aCG92GrsZhms=";
+    version = "2.2.46";
+    hash = "sha256-A6rAhc/EGvbqVdg1jXxNX3bKQLcGurqa7hKh9LvH+es=";
   };
 }

From 2cf82a9ad2a07d664ff78a2f767cf7632c667222 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Mar 2024 00:29:52 +0000
Subject: [PATCH 054/118] gnomeExtensions.unite: 77 -> 78

---
 pkgs/desktops/gnome/extensions/unite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix
index ef975ffddf45..36913e3d4e57 100644
--- a/pkgs/desktops/gnome/extensions/unite/default.nix
+++ b/pkgs/desktops/gnome/extensions/unite/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-unite";
-  version = "77";
+  version = "78";
 
   src = fetchFromGitHub {
     owner = "hardpixel";
     repo = "unite-shell";
     rev = "v${version}";
-    hash = "sha256-5PClGWOxqwTVaqBySu5I+qavaV1vcKHUvoYJ3Qgcq2o=";
+    hash = "sha256-4fOCgStMPzUg2QxYeX6tU/WUaGOn1YUyheZp6YNeODA=";
   };
 
   passthru = {

From 01463448be78f01a89247071aa8062388e5fde3f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 Feb 2024 17:42:58 +0100
Subject: [PATCH 055/118] postgresql: refactor to move locale-binary-path.patch
 into patches/

Seems to have been put in the wrong place.
---
 pkgs/servers/sql/postgresql/default.nix                         | 2 +-
 .../sql/postgresql/{ => patches}/locale-binary-path.patch       | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/servers/sql/postgresql/{ => patches}/locale-binary-path.patch (100%)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 700f0ad99bd1..cfb9553a6d03 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -116,7 +116,7 @@ let
       ./patches/findstring.patch
 
       (substituteAll {
-        src = ./locale-binary-path.patch;
+        src = ./patches/locale-binary-path.patch;
         locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
       })
 
diff --git a/pkgs/servers/sql/postgresql/locale-binary-path.patch b/pkgs/servers/sql/postgresql/patches/locale-binary-path.patch
similarity index 100%
rename from pkgs/servers/sql/postgresql/locale-binary-path.patch
rename to pkgs/servers/sql/postgresql/patches/locale-binary-path.patch

From 9ef7195e08f0a546f4d130c752dfaa21c0ddbfea Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 10 Mar 2024 16:28:01 +0100
Subject: [PATCH 056/118] postgresql: refactor to move packages.nix to
 ext/default.nix (1/2)

This commit is split up into two commits to allow git to detect renames,
make rebasing easier and allow a working entry in .git-blame-ignore-revs.

To allow bisecting we allow evaluation on every commit by moving the extensions
into ext/ext/ first and back to ext/ with the next commit.
---
 pkgs/servers/sql/postgresql/default.nix                         | 2 +-
 pkgs/servers/sql/postgresql/{packages.nix => ext/default.nix}   | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/age.nix               | 0
 .../sql/postgresql/ext/{ => ext}/apache_datasketches.nix        | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/citus.nix             | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/cstore_fdw.nix        | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/h3-pg.nix             | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/hypopg.nix            | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/jsonb_deep_sum.nix    | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/lantern.nix           | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/periods.nix           | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_auto_failover.nix  | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_bigm.nix           | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_cron.nix           | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ed25519.nix        | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_embedding.nix      | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hint_plan.nix      | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hll.nix            | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ivm.nix            | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_net.nix            | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_partman.nix        | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_rational.nix       | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_relusage.nix       | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_repack.nix         | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_safeupdate.nix     | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_similarity.nix     | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_squeeze.nix        | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_topn.nix           | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_uuidv7.nix         | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pgaudit.nix           | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pgjwt.nix             | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pgroonga.nix          | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pgrouting.nix         | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pgsodium.nix          | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pgsql-http.nix        | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pgtap.nix             | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/pgvector.nix          | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/plpgsql_check.nix     | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/plr.nix               | 0
 .../{ => ext}/plv8/0001-build-Allow-using-V8-from-system.patch  | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/plv8/default.nix      | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/postgis.nix           | 0
 .../sql/postgresql/ext/{ => ext}/promscale_extension.nix        | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/repmgr.nix            | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/rum.nix               | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/smlar.nix             | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/tds_fdw.nix           | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/temporal_tables.nix   | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/timescaledb.nix       | 0
 .../sql/postgresql/ext/{ => ext}/timescaledb_toolkit.nix        | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/tsearch_extras.nix    | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/tsja.nix              | 0
 pkgs/servers/sql/postgresql/ext/{ => ext}/wal2json.nix          | 0
 53 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/servers/sql/postgresql/{packages.nix => ext/default.nix} (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/age.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/apache_datasketches.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/citus.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/cstore_fdw.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/h3-pg.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/hypopg.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/jsonb_deep_sum.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/lantern.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/periods.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_auto_failover.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_bigm.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_cron.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ed25519.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_embedding.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hint_plan.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hll.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ivm.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_net.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_partman.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_rational.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_relusage.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_repack.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_safeupdate.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_similarity.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_squeeze.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_topn.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_uuidv7.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgaudit.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgjwt.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgroonga.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgrouting.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgsodium.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgsql-http.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgtap.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgvector.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/plpgsql_check.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/plr.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/plv8/0001-build-Allow-using-V8-from-system.patch (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/plv8/default.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/postgis.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/promscale_extension.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/repmgr.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/rum.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/smlar.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/tds_fdw.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/temporal_tables.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/timescaledb.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/timescaledb_toolkit.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/tsearch_extras.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/tsja.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ => ext}/wal2json.nix (100%)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index cfb9553a6d03..015150bfd7a4 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -283,7 +283,7 @@ let
         };
         newSelf = self // scope;
         newSuper = { callPackage = newScope (scope // this.pkgs); };
-      in import ./packages.nix newSelf newSuper;
+      in import ./ext newSelf newSuper;
 
       withPackages = postgresqlWithPackages {
                        inherit makeWrapper buildEnv;
diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/ext/default.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/packages.nix
rename to pkgs/servers/sql/postgresql/ext/default.nix
diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/ext/age.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/age.nix
rename to pkgs/servers/sql/postgresql/ext/ext/age.nix
diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
rename to pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix
diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/ext/citus.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/citus.nix
rename to pkgs/servers/sql/postgresql/ext/ext/citus.nix
diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
rename to pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix
diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/h3-pg.nix
rename to pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix
diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/ext/hypopg.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/hypopg.nix
rename to pkgs/servers/sql/postgresql/ext/ext/hypopg.nix
diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix
rename to pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix
diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/ext/lantern.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/lantern.nix
rename to pkgs/servers/sql/postgresql/ext/ext/lantern.nix
diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/ext/periods.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/periods.nix
rename to pkgs/servers/sql/postgresql/ext/ext/periods.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_bigm.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_cron.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_embedding.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_hll.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_ivm.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_net.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_net.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_net.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_partman.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_rational.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_relusage.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_repack.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_similarity.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_topn.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pgaudit.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pgjwt.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pgroonga.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pgrouting.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pgsodium.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pgsql-http.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/ext/pgtap.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pgtap.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pgtap.nix
diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/ext/pgvector.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/pgvector.nix
rename to pkgs/servers/sql/postgresql/ext/ext/pgvector.nix
diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
rename to pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix
diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/ext/plr.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/plr.nix
rename to pkgs/servers/sql/postgresql/ext/ext/plr.nix
diff --git a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch b/pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch
rename to pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch
diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/plv8/default.nix
rename to pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/ext/postgis.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/postgis.nix
rename to pkgs/servers/sql/postgresql/ext/ext/postgis.nix
diff --git a/pkgs/servers/sql/postgresql/ext/promscale_extension.nix b/pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/promscale_extension.nix
rename to pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix
diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/ext/repmgr.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/repmgr.nix
rename to pkgs/servers/sql/postgresql/ext/ext/repmgr.nix
diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/ext/rum.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/rum.nix
rename to pkgs/servers/sql/postgresql/ext/ext/rum.nix
diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/ext/smlar.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/smlar.nix
rename to pkgs/servers/sql/postgresql/ext/ext/smlar.nix
diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/tds_fdw.nix
rename to pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix
diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/temporal_tables.nix
rename to pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/timescaledb.nix
rename to pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
rename to pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix
diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
rename to pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix
diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/ext/tsja.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/tsja.nix
rename to pkgs/servers/sql/postgresql/ext/ext/tsja.nix
diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/ext/wal2json.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/wal2json.nix
rename to pkgs/servers/sql/postgresql/ext/ext/wal2json.nix

From 719034f6f6749d624faa28dff259309fc0e3e730 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 Feb 2024 21:15:34 +0100
Subject: [PATCH 057/118] postgresql: refactor to move packages.nix to
 ext/default.nix (2/2)

This aligns more with the commonly used style in nixpkgs.
---
 .../sql/postgresql/ext/{ext => }/age.nix      |   0
 .../ext/{ext => }/apache_datasketches.nix     |   0
 .../sql/postgresql/ext/{ext => }/citus.nix    |   0
 .../postgresql/ext/{ext => }/cstore_fdw.nix   |   0
 pkgs/servers/sql/postgresql/ext/default.nix   | 106 +++++++++---------
 .../sql/postgresql/ext/{ext => }/h3-pg.nix    |   0
 .../sql/postgresql/ext/{ext => }/hypopg.nix   |   0
 .../ext/{ext => }/jsonb_deep_sum.nix          |   0
 .../sql/postgresql/ext/{ext => }/lantern.nix  |   0
 .../sql/postgresql/ext/{ext => }/periods.nix  |   0
 .../ext/{ext => }/pg_auto_failover.nix        |   0
 .../sql/postgresql/ext/{ext => }/pg_bigm.nix  |   0
 .../sql/postgresql/ext/{ext => }/pg_cron.nix  |   0
 .../postgresql/ext/{ext => }/pg_ed25519.nix   |   0
 .../postgresql/ext/{ext => }/pg_embedding.nix |   0
 .../postgresql/ext/{ext => }/pg_hint_plan.nix |   0
 .../sql/postgresql/ext/{ext => }/pg_hll.nix   |   0
 .../sql/postgresql/ext/{ext => }/pg_ivm.nix   |   0
 .../sql/postgresql/ext/{ext => }/pg_net.nix   |   0
 .../postgresql/ext/{ext => }/pg_partman.nix   |   0
 .../postgresql/ext/{ext => }/pg_rational.nix  |   0
 .../postgresql/ext/{ext => }/pg_relusage.nix  |   0
 .../postgresql/ext/{ext => }/pg_repack.nix    |   0
 .../ext/{ext => }/pg_safeupdate.nix           |   0
 .../ext/{ext => }/pg_similarity.nix           |   0
 .../postgresql/ext/{ext => }/pg_squeeze.nix   |   0
 .../sql/postgresql/ext/{ext => }/pg_topn.nix  |   0
 .../postgresql/ext/{ext => }/pg_uuidv7.nix    |   0
 .../sql/postgresql/ext/{ext => }/pgaudit.nix  |   0
 .../sql/postgresql/ext/{ext => }/pgjwt.nix    |   0
 .../sql/postgresql/ext/{ext => }/pgroonga.nix |   0
 .../postgresql/ext/{ext => }/pgrouting.nix    |   0
 .../sql/postgresql/ext/{ext => }/pgsodium.nix |   0
 .../postgresql/ext/{ext => }/pgsql-http.nix   |   0
 .../sql/postgresql/ext/{ext => }/pgtap.nix    |   0
 .../sql/postgresql/ext/{ext => }/pgvector.nix |   0
 .../ext/{ext => }/plpgsql_check.nix           |   0
 .../sql/postgresql/ext/{ext => }/plr.nix      |   0
 ...001-build-Allow-using-V8-from-system.patch |   0
 .../postgresql/ext/{ext => }/plv8/default.nix |   0
 .../sql/postgresql/ext/{ext => }/postgis.nix  |   0
 .../ext/{ext => }/promscale_extension.nix     |   0
 .../sql/postgresql/ext/{ext => }/repmgr.nix   |   0
 .../sql/postgresql/ext/{ext => }/rum.nix      |   0
 .../sql/postgresql/ext/{ext => }/smlar.nix    |   0
 .../sql/postgresql/ext/{ext => }/tds_fdw.nix  |   0
 .../ext/{ext => }/temporal_tables.nix         |   0
 .../postgresql/ext/{ext => }/timescaledb.nix  |   0
 .../ext/{ext => }/timescaledb_toolkit.nix     |   0
 .../ext/{ext => }/tsearch_extras.nix          |   0
 .../sql/postgresql/ext/{ext => }/tsja.nix     |   0
 .../sql/postgresql/ext/{ext => }/wal2json.nix |   0
 52 files changed, 53 insertions(+), 53 deletions(-)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/age.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/apache_datasketches.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/citus.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/cstore_fdw.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/h3-pg.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/hypopg.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/jsonb_deep_sum.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/lantern.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/periods.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_auto_failover.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_bigm.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_cron.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_ed25519.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_embedding.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_hint_plan.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_hll.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_ivm.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_net.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_partman.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_rational.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_relusage.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_repack.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_safeupdate.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_similarity.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_squeeze.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_topn.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_uuidv7.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pgaudit.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pgjwt.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pgroonga.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pgrouting.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pgsodium.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pgsql-http.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pgtap.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/pgvector.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/plpgsql_check.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/plr.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/plv8/0001-build-Allow-using-V8-from-system.patch (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/plv8/default.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/postgis.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/promscale_extension.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/repmgr.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/rum.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/smlar.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/tds_fdw.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/temporal_tables.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/timescaledb.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/timescaledb_toolkit.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/tsearch_extras.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/tsja.nix (100%)
 rename pkgs/servers/sql/postgresql/ext/{ext => }/wal2json.nix (100%)

diff --git a/pkgs/servers/sql/postgresql/ext/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/age.nix
rename to pkgs/servers/sql/postgresql/ext/age.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix
rename to pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/citus.nix
rename to pkgs/servers/sql/postgresql/ext/citus.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix
rename to pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
diff --git a/pkgs/servers/sql/postgresql/ext/default.nix b/pkgs/servers/sql/postgresql/ext/default.nix
index eabcb0613c0d..b6181da6cf02 100644
--- a/pkgs/servers/sql/postgresql/ext/default.nix
+++ b/pkgs/servers/sql/postgresql/ext/default.nix
@@ -1,107 +1,107 @@
 self: super: {
 
-    age = super.callPackage ./ext/age.nix { };
+    age = super.callPackage ./age.nix { };
 
-    anonymizer = super.callPackage ./ext/anonymizer.nix { };
+    anonymizer = super.callPackage ./anonymizer.nix { };
 
-    apache_datasketches = super.callPackage ./ext/apache_datasketches.nix { };
+    apache_datasketches = super.callPackage ./apache_datasketches.nix { };
 
-    citus = super.callPackage ./ext/citus.nix { };
+    citus = super.callPackage ./citus.nix { };
 
-    h3-pg = super.callPackage ./ext/h3-pg.nix { };
+    h3-pg = super.callPackage ./h3-pg.nix { };
 
-    hypopg = super.callPackage ./ext/hypopg.nix { };
+    hypopg = super.callPackage ./hypopg.nix { };
 
-    jsonb_deep_sum = super.callPackage ./ext/jsonb_deep_sum.nix { };
+    jsonb_deep_sum = super.callPackage ./jsonb_deep_sum.nix { };
 
-    lantern = super.callPackage ./ext/lantern.nix { };
+    lantern = super.callPackage ./lantern.nix { };
 
-    periods = super.callPackage ./ext/periods.nix { };
+    periods = super.callPackage ./periods.nix { };
 
-    postgis = super.callPackage ./ext/postgis.nix { };
+    postgis = super.callPackage ./postgis.nix { };
 
-    pg_auto_failover = super.callPackage ./ext/pg_auto_failover.nix { };
+    pg_auto_failover = super.callPackage ./pg_auto_failover.nix { };
 
-    pg_bigm = super.callPackage ./ext/pg_bigm.nix { };
+    pg_bigm = super.callPackage ./pg_bigm.nix { };
 
-    pg_ed25519 = super.callPackage ./ext/pg_ed25519.nix { };
+    pg_ed25519 = super.callPackage ./pg_ed25519.nix { };
 
-    pg_embedding = super.callPackage ./ext/pg_embedding.nix { };
+    pg_embedding = super.callPackage ./pg_embedding.nix { };
 
-    pg_hint_plan = super.callPackage ./ext/pg_hint_plan.nix { };
+    pg_hint_plan = super.callPackage ./pg_hint_plan.nix { };
 
-    pg_ivm = super.callPackage ./ext/pg_ivm.nix { };
+    pg_ivm = super.callPackage ./pg_ivm.nix { };
 
-    pg_rational = super.callPackage ./ext/pg_rational.nix { };
+    pg_rational = super.callPackage ./pg_rational.nix { };
 
-    pg_repack = super.callPackage ./ext/pg_repack.nix { };
+    pg_repack = super.callPackage ./pg_repack.nix { };
 
-    pg_similarity = super.callPackage ./ext/pg_similarity.nix { };
+    pg_similarity = super.callPackage ./pg_similarity.nix { };
 
-    pgaudit = super.callPackage ./ext/pgaudit.nix { };
+    pgaudit = super.callPackage ./pgaudit.nix { };
 
-    pgroonga = super.callPackage ./ext/pgroonga.nix { };
+    pgroonga = super.callPackage ./pgroonga.nix { };
 
-    pgsodium = super.callPackage ./ext/pgsodium.nix { };
+    pgsodium = super.callPackage ./pgsodium.nix { };
 
-    pgsql-http = super.callPackage ./ext/pgsql-http.nix { };
+    pgsql-http = super.callPackage ./pgsql-http.nix { };
 
-    pgvecto-rs = super.callPackage ./ext/pgvecto-rs { };
+    pgvecto-rs = super.callPackage ./pgvecto-rs { };
 
-    pgvector = super.callPackage ./ext/pgvector.nix { };
+    pgvector = super.callPackage ./pgvector.nix { };
 
-    plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { };
+    plpgsql_check = super.callPackage ./plpgsql_check.nix { };
 
-    plr = super.callPackage ./ext/plr.nix { };
+    plr = super.callPackage ./plr.nix { };
 
-    plv8 = super.callPackage ./ext/plv8 { };
+    plv8 = super.callPackage ./plv8 { };
 
-    pgjwt = super.callPackage ./ext/pgjwt.nix { };
+    pgjwt = super.callPackage ./pgjwt.nix { };
 
-    cstore_fdw = super.callPackage ./ext/cstore_fdw.nix { };
+    cstore_fdw = super.callPackage ./cstore_fdw.nix { };
 
-    pg_hll = super.callPackage ./ext/pg_hll.nix { };
+    pg_hll = super.callPackage ./pg_hll.nix { };
 
-    pg_cron = super.callPackage ./ext/pg_cron.nix { };
+    pg_cron = super.callPackage ./pg_cron.nix { };
 
-    pg_topn = super.callPackage ./ext/pg_topn.nix { };
+    pg_topn = super.callPackage ./pg_topn.nix { };
 
-    pg_net = super.callPackage ./ext/pg_net.nix { };
+    pg_net = super.callPackage ./pg_net.nix { };
 
-    pgtap = super.callPackage ./ext/pgtap.nix { };
+    pgtap = super.callPackage ./pgtap.nix { };
 
-    smlar = super.callPackage ./ext/smlar.nix { };
+    smlar = super.callPackage ./smlar.nix { };
 
-    temporal_tables = super.callPackage ./ext/temporal_tables.nix { };
+    temporal_tables = super.callPackage ./temporal_tables.nix { };
 
-    timescaledb = super.callPackage ./ext/timescaledb.nix { };
-    timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; };
+    timescaledb = super.callPackage ./timescaledb.nix { };
+    timescaledb-apache = super.callPackage ./timescaledb.nix { enableUnfree = false; };
 
-    timescaledb_toolkit = super.callPackage ./ext/timescaledb_toolkit.nix { };
+    timescaledb_toolkit = super.callPackage ./timescaledb_toolkit.nix { };
 
-    tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { };
+    tsearch_extras = super.callPackage ./tsearch_extras.nix { };
 
-    tds_fdw = super.callPackage ./ext/tds_fdw.nix { };
+    tds_fdw = super.callPackage ./tds_fdw.nix { };
 
-    pgrouting = super.callPackage ./ext/pgrouting.nix { };
+    pgrouting = super.callPackage ./pgrouting.nix { };
 
-    pg_partman = super.callPackage ./ext/pg_partman.nix { };
+    pg_partman = super.callPackage ./pg_partman.nix { };
 
-    pg_relusage = super.callPackage ./ext/pg_relusage.nix { };
+    pg_relusage = super.callPackage ./pg_relusage.nix { };
 
-    pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { };
+    pg_safeupdate = super.callPackage ./pg_safeupdate.nix { };
 
-    pg_squeeze = super.callPackage ./ext/pg_squeeze.nix { };
+    pg_squeeze = super.callPackage ./pg_squeeze.nix { };
 
-    pg_uuidv7 = super.callPackage ./ext/pg_uuidv7.nix { };
+    pg_uuidv7 = super.callPackage ./pg_uuidv7.nix { };
 
-    promscale_extension = super.callPackage ./ext/promscale_extension.nix { };
+    promscale_extension = super.callPackage ./promscale_extension.nix { };
 
-    repmgr = super.callPackage ./ext/repmgr.nix { };
+    repmgr = super.callPackage ./repmgr.nix { };
 
-    rum = super.callPackage ./ext/rum.nix { };
+    rum = super.callPackage ./rum.nix { };
 
-    tsja = super.callPackage ./ext/tsja.nix { };
+    tsja = super.callPackage ./tsja.nix { };
 
-    wal2json = super.callPackage ./ext/wal2json.nix { };
+    wal2json = super.callPackage ./wal2json.nix { };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix
rename to pkgs/servers/sql/postgresql/ext/h3-pg.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/hypopg.nix
rename to pkgs/servers/sql/postgresql/ext/hypopg.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix
rename to pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/lantern.nix
rename to pkgs/servers/sql/postgresql/ext/lantern.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/periods.nix
rename to pkgs/servers/sql/postgresql/ext/periods.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix
rename to pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix
rename to pkgs/servers/sql/postgresql/ext/pg_bigm.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix
rename to pkgs/servers/sql/postgresql/ext/pg_cron.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix
rename to pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix
rename to pkgs/servers/sql/postgresql/ext/pg_embedding.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix
rename to pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix
rename to pkgs/servers/sql/postgresql/ext/pg_hll.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix
rename to pkgs/servers/sql/postgresql/ext/pg_ivm.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_net.nix
rename to pkgs/servers/sql/postgresql/ext/pg_net.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix
rename to pkgs/servers/sql/postgresql/ext/pg_partman.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix
rename to pkgs/servers/sql/postgresql/ext/pg_rational.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix
rename to pkgs/servers/sql/postgresql/ext/pg_relusage.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix
rename to pkgs/servers/sql/postgresql/ext/pg_repack.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix
rename to pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix
rename to pkgs/servers/sql/postgresql/ext/pg_similarity.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix
rename to pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix
rename to pkgs/servers/sql/postgresql/ext/pg_topn.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix
rename to pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix
rename to pkgs/servers/sql/postgresql/ext/pgaudit.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix
rename to pkgs/servers/sql/postgresql/ext/pgjwt.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix
rename to pkgs/servers/sql/postgresql/ext/pgroonga.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix
rename to pkgs/servers/sql/postgresql/ext/pgrouting.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/pgsodium.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix
rename to pkgs/servers/sql/postgresql/ext/pgsodium.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix
rename to pkgs/servers/sql/postgresql/ext/pgsql-http.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgtap.nix
rename to pkgs/servers/sql/postgresql/ext/pgtap.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgvector.nix
rename to pkgs/servers/sql/postgresql/ext/pgvector.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix
rename to pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/plr.nix
rename to pkgs/servers/sql/postgresql/ext/plr.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch
rename to pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch
diff --git a/pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix
rename to pkgs/servers/sql/postgresql/ext/plv8/default.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/postgis.nix
rename to pkgs/servers/sql/postgresql/ext/postgis.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix b/pkgs/servers/sql/postgresql/ext/promscale_extension.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix
rename to pkgs/servers/sql/postgresql/ext/promscale_extension.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/repmgr.nix
rename to pkgs/servers/sql/postgresql/ext/repmgr.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/rum.nix
rename to pkgs/servers/sql/postgresql/ext/rum.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/smlar.nix
rename to pkgs/servers/sql/postgresql/ext/smlar.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix
rename to pkgs/servers/sql/postgresql/ext/tds_fdw.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix
rename to pkgs/servers/sql/postgresql/ext/temporal_tables.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix
rename to pkgs/servers/sql/postgresql/ext/timescaledb.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix
rename to pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix
rename to pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/tsja.nix
rename to pkgs/servers/sql/postgresql/ext/tsja.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/wal2json.nix
rename to pkgs/servers/sql/postgresql/ext/wal2json.nix

From 4c8e7af9416730d45667ca55c3e3367adceb89be Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 2 Mar 2024 12:43:09 +0100
Subject: [PATCH 058/118] postgresql: refactor to remove useless references to
 "self"

No need to reference self here, because llvmPackages / stdenv' are available
in that scope anyway. Pure refactor, derivations don't change.
---
 pkgs/servers/sql/postgresql/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 015150bfd7a4..c769fff259c7 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -208,18 +208,18 @@ let
         moveToOutput "lib/llvmjit*" "$out"
 
         # In the case of JIT support, prevent a retained dependency on clang-wrapper
-        substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${self.llvmPackages.stdenv.cc}/bin/clang clang
+        substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/clang clang
         nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f)
 
         # Stop out depending on the default output of llvm
         substituteInPlace $out/lib/pgxs/src/Makefile.global \
-          --replace ${self.llvmPackages.llvm.out}/bin "" \
+          --replace ${llvmPackages.llvm.out}/bin "" \
           --replace '$(LLVM_BINPATH)/' ""
 
         # Stop out depending on the -dev output of llvm
         substituteInPlace $out/lib/pgxs/src/Makefile.global \
-          --replace ${self.llvmPackages.llvm.dev}/bin/llvm-config llvm-config \
-          --replace -I${self.llvmPackages.llvm.dev}/include ""
+          --replace ${llvmPackages.llvm.dev}/bin/llvm-config llvm-config \
+          --replace -I${llvmPackages.llvm.dev}/include ""
 
         ${lib.optionalString (!stdenv'.isDarwin) ''
           # Stop lib depending on the -dev output of llvm

From 9af8c0a3b7ef345ff0c32e65f110ac71f8a139a7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 2 Mar 2024 12:19:25 +0100
Subject: [PATCH 059/118] postgresql: refactor to split up default.nix (1/2)

This just renames default.nix to generic.nix, because the biggest chunk
of code should move that way in the next commit. This gives us a much
better diff for the next commit and makes rebasing **much** easier in
case of changes. This commit does not stand on its own and needs to go
in with the next commit (2/2).
---
 pkgs/servers/sql/postgresql/{default.nix => generic.nix} | 0
 pkgs/top-level/all-packages.nix                          | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/servers/sql/postgresql/{default.nix => generic.nix} (100%)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/generic.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/default.nix
rename to pkgs/servers/sql/postgresql/generic.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02964f0d1fd3..00739c166258 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26735,7 +26735,7 @@ with pkgs;
 
   timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };
 
-  inherit (import ../servers/sql/postgresql pkgs)
+  inherit (import ../servers/sql/postgresql/generic.nix pkgs)
     postgresql_12
     postgresql_13
     postgresql_14

From 1d9f2bd7266d46b2f3abaefb5fadba26f0eb8e1a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 Feb 2024 13:47:03 +0100
Subject: [PATCH 060/118] postgresql: refactor to split up default.nix (2/2)

The recommended [1] structure for a package regarding versioning is to have each
version in a separate file. This commit just mechanically copies code around
without any changes.

Pure refactor, not changing any derivations.

[1]: pkgs/README.md
---
 pkgs/servers/sql/postgresql/12.nix      |  5 ++
 pkgs/servers/sql/postgresql/13.nix      |  5 ++
 pkgs/servers/sql/postgresql/14.nix      |  5 ++
 pkgs/servers/sql/postgresql/15.nix      |  5 ++
 pkgs/servers/sql/postgresql/16.nix      |  5 ++
 pkgs/servers/sql/postgresql/default.nix | 43 +++++++++++++++++
 pkgs/servers/sql/postgresql/generic.nix | 63 +++----------------------
 pkgs/top-level/all-packages.nix         |  2 +-
 8 files changed, 75 insertions(+), 58 deletions(-)
 create mode 100644 pkgs/servers/sql/postgresql/12.nix
 create mode 100644 pkgs/servers/sql/postgresql/13.nix
 create mode 100644 pkgs/servers/sql/postgresql/14.nix
 create mode 100644 pkgs/servers/sql/postgresql/15.nix
 create mode 100644 pkgs/servers/sql/postgresql/16.nix
 create mode 100644 pkgs/servers/sql/postgresql/default.nix

diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix
new file mode 100644
index 000000000000..4979df61136e
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/12.nix
@@ -0,0 +1,5 @@
+import ./generic.nix {
+  version = "12.18";
+  psqlSchema = "12";
+  hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo=";
+}
diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix
new file mode 100644
index 000000000000..61985518ce61
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/13.nix
@@ -0,0 +1,5 @@
+import ./generic.nix {
+  version = "13.14";
+  psqlSchema = "13";
+  hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0=";
+}
diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix
new file mode 100644
index 000000000000..efd7da0778ab
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/14.nix
@@ -0,0 +1,5 @@
+import ./generic.nix {
+  version = "14.11";
+  psqlSchema = "14";
+  hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg=";
+}
diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix
new file mode 100644
index 000000000000..4efb790542be
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/15.nix
@@ -0,0 +1,5 @@
+import ./generic.nix {
+  version = "15.6";
+  psqlSchema = "15";
+  hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs=";
+}
diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix
new file mode 100644
index 000000000000..2dfc54277df1
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/16.nix
@@ -0,0 +1,5 @@
+import ./generic.nix {
+  version = "16.2";
+  psqlSchema = "16";
+  hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI=";
+}
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
new file mode 100644
index 000000000000..fc242d08ec0b
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -0,0 +1,43 @@
+let
+  mkPackages = self: {
+    postgresql_12 = import ./12.nix {
+      this = self.postgresql_12;
+      thisAttr = "postgresql_12";
+      inherit self;
+    };
+
+    postgresql_13 = import ./13.nix {
+      this = self.postgresql_13;
+      thisAttr = "postgresql_13";
+      inherit self;
+    };
+
+    postgresql_14 = import ./14.nix {
+      this = self.postgresql_14;
+      thisAttr = "postgresql_14";
+      inherit self;
+    };
+
+    postgresql_15 = import ./15.nix {
+      this = self.postgresql_15;
+      thisAttr = "postgresql_15";
+      inherit self;
+    };
+
+    postgresql_16 = import ./16.nix {
+      this = self.postgresql_16;
+      thisAttr = "postgresql_16";
+      inherit self;
+    };
+  };
+
+in self:
+  let packages = mkPackages self; in
+  packages
+  // self.lib.mapAttrs'
+    (attrName: postgres: self.lib.nameValuePair "${attrName}_jit" (postgres.override rec {
+      jitSupport = true;
+      thisAttr = "${attrName}_jit";
+      this = self.${thisAttr};
+    }))
+    packages
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index c769fff259c7..2e8054060a3a 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -353,60 +353,9 @@ let
     passthru.psqlSchema = postgresql.psqlSchema;
   };
 
-  mkPackages = self: {
-    postgresql_12 = self.callPackage generic {
-      version = "12.18";
-      psqlSchema = "12";
-      hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo=";
-      this = self.postgresql_12;
-      thisAttr = "postgresql_12";
-      inherit self;
-    };
-
-    postgresql_13 = self.callPackage generic {
-      version = "13.14";
-      psqlSchema = "13";
-      hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0=";
-      this = self.postgresql_13;
-      thisAttr = "postgresql_13";
-      inherit self;
-    };
-
-    postgresql_14 = self.callPackage generic {
-      version = "14.11";
-      psqlSchema = "14";
-      hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg=";
-      this = self.postgresql_14;
-      thisAttr = "postgresql_14";
-      inherit self;
-    };
-
-    postgresql_15 = self.callPackage generic {
-      version = "15.6";
-      psqlSchema = "15";
-      hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs=";
-      this = self.postgresql_15;
-      thisAttr = "postgresql_15";
-      inherit self;
-    };
-
-    postgresql_16 = self.callPackage generic {
-      version = "16.2";
-      psqlSchema = "16";
-      hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI=";
-      this = self.postgresql_16;
-      thisAttr = "postgresql_16";
-      inherit self;
-    };
-  };
-
-in self:
-  let packages = mkPackages self; in
-  packages
-  // self.lib.mapAttrs'
-    (attrName: postgres: self.lib.nameValuePair "${attrName}_jit" (postgres.override rec {
-      jitSupport = true;
-      thisAttr = "${attrName}_jit";
-      this = self.${thisAttr};
-    }))
-    packages
+in
+# passed by <major>.nix
+versionArgs:
+# passed by default.nix
+{ self, ... } @defaultArgs:
+self.callPackage generic (defaultArgs // versionArgs)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00739c166258..02964f0d1fd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26735,7 +26735,7 @@ with pkgs;
 
   timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };
 
-  inherit (import ../servers/sql/postgresql/generic.nix pkgs)
+  inherit (import ../servers/sql/postgresql pkgs)
     postgresql_12
     postgresql_13
     postgresql_14

From 62635c9643b6b44d621508324fdc200d46222382 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 Feb 2024 14:05:47 +0100
Subject: [PATCH 061/118] postgresql: refactor mkPackages in default.nix

Refactors some low hanging fruit in default.nix to make it easier to add new
versions later on.

Pure refactor, not changing any derivations.

This change makes it easier to add new versions in default.nix without messing
up - and also prevents us from adding version-specific arguments in default.nix
by accident in the future. Those should be put in the versioned .nix files
instead.
---
 pkgs/servers/sql/postgresql/default.nix | 62 +++++++++----------------
 pkgs/servers/sql/postgresql/generic.nix |  2 +-
 2 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index fc242d08ec0b..d8acae8787a6 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -1,43 +1,25 @@
+self:
 let
-  mkPackages = self: {
-    postgresql_12 = import ./12.nix {
-      this = self.postgresql_12;
-      thisAttr = "postgresql_12";
-      inherit self;
-    };
-
-    postgresql_13 = import ./13.nix {
-      this = self.postgresql_13;
-      thisAttr = "postgresql_13";
-      inherit self;
-    };
-
-    postgresql_14 = import ./14.nix {
-      this = self.postgresql_14;
-      thisAttr = "postgresql_14";
-      inherit self;
-    };
-
-    postgresql_15 = import ./15.nix {
-      this = self.postgresql_15;
-      thisAttr = "postgresql_15";
-      inherit self;
-    };
-
-    postgresql_16 = import ./16.nix {
-      this = self.postgresql_16;
-      thisAttr = "postgresql_16";
-      inherit self;
-    };
+  versions = {
+    postgresql_12 = ./12.nix;
+    postgresql_13 = ./13.nix;
+    postgresql_14 = ./14.nix;
+    postgresql_15 = ./15.nix;
+    postgresql_16 = ./16.nix;
   };
 
-in self:
-  let packages = mkPackages self; in
-  packages
-  // self.lib.mapAttrs'
-    (attrName: postgres: self.lib.nameValuePair "${attrName}_jit" (postgres.override rec {
-      jitSupport = true;
-      thisAttr = "${attrName}_jit";
-      this = self.${thisAttr};
-    }))
-    packages
+  mkAttributes = jitSupport:
+    self.lib.mapAttrs' (version: path:
+      let
+        attrName = if jitSupport then "${version}_jit" else version;
+      in
+      self.lib.nameValuePair attrName (import path {
+        inherit jitSupport self;
+        thisAttr = attrName;
+        this = self.${attrName};
+      })
+    ) versions;
+
+in
+# variations without and with JIT
+(mkAttributes false) // (mkAttributes true)
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 2e8054060a3a..f2f13a5fadba 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -21,7 +21,7 @@ let
       , testers, nixosTests, thisAttr
 
       # JIT
-      , jitSupport ? false
+      , jitSupport
       , nukeReferences, patchelf, llvmPackages
       , makeRustPlatform, buildPgxExtension, cargo, rustc
 

From a92a323a1d0c80aae979112030852ba8b776db4d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 2 Mar 2024 12:31:12 +0100
Subject: [PATCH 062/118] postgresql: refactor to remove passthru's readline
 attribute

This seems to have been introduced 20 years ago in 5863d4f - but
seems to have been a copy&paste mistake from the beginning.
AFAICT, it's not used anywhere.
---
 pkgs/servers/sql/postgresql/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index f2f13a5fadba..9b000274d4fa 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -262,7 +262,7 @@ let
       };
     in
     {
-      inherit readline psqlSchema jitSupport;
+      inherit psqlSchema jitSupport;
 
       withJIT = if jitSupport then this else jitToggle;
       withoutJIT = if jitSupport then jitToggle else this;

From 82e6c4a6094579fa1e3aace27015f5c505e6f6e0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 2 Mar 2024 12:37:04 +0100
Subject: [PATCH 063/118] postgresql: refactor to remove psqlSchema argument

The passthru attribute is still set, but automatically created from
the major version number. Fewer moving parts decrease the chance
for mistakes.
---
 pkgs/servers/sql/postgresql/12.nix      | 1 -
 pkgs/servers/sql/postgresql/13.nix      | 1 -
 pkgs/servers/sql/postgresql/14.nix      | 1 -
 pkgs/servers/sql/postgresql/15.nix      | 1 -
 pkgs/servers/sql/postgresql/16.nix      | 1 -
 pkgs/servers/sql/postgresql/generic.nix | 5 +++--
 6 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix
index 4979df61136e..d29fc7683048 100644
--- a/pkgs/servers/sql/postgresql/12.nix
+++ b/pkgs/servers/sql/postgresql/12.nix
@@ -1,5 +1,4 @@
 import ./generic.nix {
   version = "12.18";
-  psqlSchema = "12";
   hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo=";
 }
diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix
index 61985518ce61..ba458dfd1909 100644
--- a/pkgs/servers/sql/postgresql/13.nix
+++ b/pkgs/servers/sql/postgresql/13.nix
@@ -1,5 +1,4 @@
 import ./generic.nix {
   version = "13.14";
-  psqlSchema = "13";
   hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0=";
 }
diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix
index efd7da0778ab..b0de8af650ae 100644
--- a/pkgs/servers/sql/postgresql/14.nix
+++ b/pkgs/servers/sql/postgresql/14.nix
@@ -1,5 +1,4 @@
 import ./generic.nix {
   version = "14.11";
-  psqlSchema = "14";
   hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg=";
 }
diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix
index 4efb790542be..00dfc0cbbc19 100644
--- a/pkgs/servers/sql/postgresql/15.nix
+++ b/pkgs/servers/sql/postgresql/15.nix
@@ -1,5 +1,4 @@
 import ./generic.nix {
   version = "15.6";
-  psqlSchema = "15";
   hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs=";
 }
diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix
index 2dfc54277df1..cdc37b7c62f5 100644
--- a/pkgs/servers/sql/postgresql/16.nix
+++ b/pkgs/servers/sql/postgresql/16.nix
@@ -1,5 +1,4 @@
 import ./generic.nix {
   version = "16.2";
-  psqlSchema = "16";
   hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI=";
 }
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 9b000274d4fa..3b0a3ea643b2 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -15,7 +15,7 @@ let
       , this, self, newScope, buildEnv
 
       # source specification
-      , version, hash, psqlSchema
+      , version, hash
 
       # for tests
       , testers, nixosTests, thisAttr
@@ -262,7 +262,8 @@ let
       };
     in
     {
-      inherit psqlSchema jitSupport;
+      inherit jitSupport;
+      psqlSchema = lib.versions.major version;
 
       withJIT = if jitSupport then this else jitToggle;
       withoutJIT = if jitSupport then jitToggle else this;

From b301c01e3121068b29c04d26fdcd2a71db92fc4d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 Feb 2024 14:53:46 +0100
Subject: [PATCH 064/118] postgresql: refactor to move musl patches into
 versioned .nix files

This makes it obvious that the required argument muslPatches must be passed when
creating a new version file.

Pure refactor, not changing any derivations.
---
 pkgs/servers/sql/postgresql/12.nix      |  6 ++++
 pkgs/servers/sql/postgresql/13.nix      | 10 ++++++
 pkgs/servers/sql/postgresql/14.nix      | 10 ++++++
 pkgs/servers/sql/postgresql/15.nix      |  6 ++++
 pkgs/servers/sql/postgresql/16.nix      |  6 ++++
 pkgs/servers/sql/postgresql/generic.nix | 45 ++-----------------------
 6 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix
index d29fc7683048..9e0388be0451 100644
--- a/pkgs/servers/sql/postgresql/12.nix
+++ b/pkgs/servers/sql/postgresql/12.nix
@@ -1,4 +1,10 @@
 import ./generic.nix {
   version = "12.18";
   hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo=";
+  muslPatches = {
+    icu-collations-hack = {
+      url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/icu-collations-hack.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174";
+      hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";
+    };
+  };
 }
diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix
index ba458dfd1909..a4870812acdb 100644
--- a/pkgs/servers/sql/postgresql/13.nix
+++ b/pkgs/servers/sql/postgresql/13.nix
@@ -1,4 +1,14 @@
 import ./generic.nix {
   version = "13.14";
   hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0=";
+  muslPatches = {
+    icu-collations-hack = {
+      url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
+      hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";
+    };
+    disable-test-collate-icu-utf8 = {
+      url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";
+      hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y=";
+    };
+  };
 }
diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix
index b0de8af650ae..2de876cf4ad6 100644
--- a/pkgs/servers/sql/postgresql/14.nix
+++ b/pkgs/servers/sql/postgresql/14.nix
@@ -1,4 +1,14 @@
 import ./generic.nix {
   version = "14.11";
   hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg=";
+  muslPatches = {
+    icu-collations-hack = {
+      url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
+      hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";
+    };
+    disable-test-collate-icu-utf8 = {
+      url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
+      hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM=";
+    };
+  };
 }
diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix
index 00dfc0cbbc19..f633dc975085 100644
--- a/pkgs/servers/sql/postgresql/15.nix
+++ b/pkgs/servers/sql/postgresql/15.nix
@@ -1,4 +1,10 @@
 import ./generic.nix {
   version = "15.6";
   hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs=";
+  muslPatches = {
+    icu-collations-hack = {
+      url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/icu-collations-hack.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c";
+      hash = "sha256-HgtmhF4OJYU9macGJbTB9PjQi/yW7c3Akm3U0niWs8I=";
+    };
+  };
 }
diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix
index cdc37b7c62f5..6a6420643b31 100644
--- a/pkgs/servers/sql/postgresql/16.nix
+++ b/pkgs/servers/sql/postgresql/16.nix
@@ -1,4 +1,10 @@
 import ./generic.nix {
   version = "16.2";
   hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI=";
+  muslPatches = {
+    icu-collations-hack = {
+      url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/icu-collations-hack.patch?id=08a24be262339fd093e641860680944c3590238e";
+      hash = "sha256-+urQdVIlADLdDPeT68XYv5rljhbK8M/7mPZn/cF+FT0=";
+    };
+  };
 }
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 3b0a3ea643b2..cdcffc5f135c 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -15,7 +15,7 @@ let
       , this, self, newScope, buildEnv
 
       # source specification
-      , version, hash
+      , version, hash, muslPatches
 
       # for tests
       , testers, nixosTests, thisAttr
@@ -121,48 +121,7 @@ let
       })
 
     ] ++ lib.optionals stdenv'.hostPlatform.isMusl (
-      let
-        self = {
-          "12" = {
-            icu-collations-hack = fetchurl {
-              url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/icu-collations-hack.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174";
-              hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";
-            };
-          };
-          "13" = {
-            inherit (self."14") icu-collations-hack;
-            disable-test-collate-icu-utf8 = fetchurl {
-              url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";
-              hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y=";
-            };
-          };
-          "14" = {
-            icu-collations-hack = fetchurl {
-              url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
-              hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";
-            };
-            disable-test-collate-icu-utf8 = fetchurl {
-              url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
-              hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM=";
-            };
-          };
-          "15" = {
-            icu-collations-hack = fetchurl {
-              url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/icu-collations-hack.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c";
-              hash = "sha256-HgtmhF4OJYU9macGJbTB9PjQi/yW7c3Akm3U0niWs8I=";
-            };
-          };
-          "16" = {
-            icu-collations-hack = fetchurl {
-              url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/icu-collations-hack.patch?id=08a24be262339fd093e641860680944c3590238e";
-              hash = "sha256-+urQdVIlADLdDPeT68XYv5rljhbK8M/7mPZn/cF+FT0=";
-            };
-          };
-        };
-
-        patchesForVersion = self.${lib.versions.major version} or (throw "no musl patches for postgresql ${version}");
-      in
-        lib.attrValues patchesForVersion
+      map fetchurl (lib.attrValues muslPatches)
     ) ++ lib.optionals stdenv'.isLinux  [
       (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch)
     ];

From a4a43c399c4bac2bd20997bf71e08eb32d4ccccd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 15 Mar 2024 19:16:29 +0200
Subject: [PATCH 065/118] libtins: 4.4 -> 4.5

Diff: https://github.com/mfontanini/libtins/compare/v4.4...v4.5

Changelog: https://raw.githubusercontent.com/mfontanini/libtins/v4.5/CHANGES.md

Close #255639
---
 pkgs/development/libraries/libtins/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix
index 1533794bcd1e..dbb4f4d471d0 100644
--- a/pkgs/development/libraries/libtins/default.nix
+++ b/pkgs/development/libraries/libtins/default.nix
@@ -1,25 +1,17 @@
-{ boost, cmake, fetchFromGitHub, fetchpatch, gtest, libpcap, openssl, lib, stdenv }:
+{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   pname = "libtins";
-  version = "4.4";
+  version = "4.5";
 
   src = fetchFromGitHub {
     owner = "mfontanini";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-mXbinXh/CO0SZZ71+K+FozbHCCoi12+AIa2o+P0QmUw=";
+    sha256 = "sha256-zL4C2Cgs9Y3NebL8MPQBO5j8Bm6xhl8ZggQBPJLRn0o=";
   };
 
   patches = [
-    # Pull gcc-13 fixes:
-    #   https://github.com/mfontanini/libtins/pull/496
-    # TODO: remove when upgrade to the next version.
-    (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/mfontanini/libtins/commit/812be7966d445ec56e88eab512f8fd2d57152427.patch";
-      hash = "sha256-5RCFPe95r1CBrAocjTPR2SvUlgaGa1aBc8RazyxUj3M=";
-    })
     # Required for gtest 1.13+.
     ./0001-force-cpp-14.patch
   ];

From 12128314a4445af577222836c9d5e4a78eb004f5 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 15 Mar 2024 19:39:52 +0200
Subject: [PATCH 066/118] libtins: mention upstream issue with gtest

---
 pkgs/development/libraries/libtins/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix
index dbb4f4d471d0..6f195615551f 100644
--- a/pkgs/development/libraries/libtins/default.nix
+++ b/pkgs/development/libraries/libtins/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # Required for gtest 1.13+.
+    # Required for gtest 1.13+, see also upstream report at:
+    # https://github.com/mfontanini/libtins/issues/529
     ./0001-force-cpp-14.patch
   ];
 

From 113f140a152297ca55e364228f5b63ca6bddd360 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 15 Mar 2024 19:30:43 +0200
Subject: [PATCH 067/118] compactor: don't overuse pname

---
 pkgs/applications/networking/compactor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index 84c0f6ae8ba5..12e6f432c5bd 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "dns-stats";
-    repo = pname;
+    repo = "compactor";
     rev = version;
     fetchSubmodules = true;
     hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4=";
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Tools to capture DNS traffic and record it in C-DNS files";
     homepage    = "https://dns-stats.org/";
-    changelog   = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt";
+    changelog   = "https://github.com/dns-stats/compactor/raw/${version}/ChangeLog.txt";
     license     = licenses.mpl20;
     maintainers = with maintainers; [ fdns ];
     platforms   = platforms.unix;

From 14b3ea2789ef6b8bfb39553919708b6b5672ff67 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 2 Mar 2024 14:04:06 +0100
Subject: [PATCH 068/118] postgresql: refactor to pass jitSupport/llvm via
 scope instead of passthru

This makes it less error-prone to use the llvm package in extensions, because
it will always match the package used by the postgresql derivation itself.

Previously, you could've accidentally used llvm instead of postgresql.llvm
with a different result.
---
 nixos/modules/services/databases/postgresql.nix  | 2 +-
 pkgs/servers/sql/postgresql/ext/anonymizer.nix   | 4 ++--
 pkgs/servers/sql/postgresql/ext/plv8/default.nix | 3 ++-
 pkgs/servers/sql/postgresql/ext/postgis.nix      | 4 +++-
 pkgs/servers/sql/postgresql/generic.nix          | 5 ++---
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index c4e76c82ba5c..c3f3b98ae5e7 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -14,7 +14,7 @@ let
       #     package = pkgs.postgresql_<major>;
       #   };
       # works.
-      base = if cfg.enableJIT && !cfg.package.jitSupport then cfg.package.withJIT else cfg.package;
+      base = if cfg.enableJIT then cfg.package.withJIT else cfg.package;
     in
     if cfg.extraPlugins == []
       then base
diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
index 430911d40108..b6ec0256ae09 100644
--- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix
+++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell }:
+{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell, jitSupport, llvm }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "postgresql_anonymizer";
@@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: {
   inherit (pg-dump-anon) version src passthru;
 
   buildInputs = [ postgresql ];
-  nativeBuildInputs = [ postgresql ] ++ lib.optional postgresql.jitSupport postgresql.llvm;
+  nativeBuildInputs = [ postgresql ] ++ lib.optional jitSupport llvm;
 
   strictDeps = true;
 
diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix
index 241aa610c8f9..fa2f1b7ad2d8 100644
--- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix
+++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix
@@ -4,6 +4,7 @@
 , v8
 , perl
 , postgresql
+, jitSupport
 # For test
 , runCommand
 , coreutils
@@ -138,6 +139,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with maintainers; [ marsam ];
     platforms = [ "x86_64-linux" "aarch64-linux" ];
     license = licenses.postgresql;
-    broken = postgresql.jitSupport;
+    broken = jitSupport;
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 87333fe97504..f069a1b7e90d 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -13,6 +13,8 @@
 , libiconv
 , pcre2
 , nixosTests
+, jitSupport
+, llvm
 }:
 
 let
@@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ]
                 ++ lib.optional stdenv.isDarwin libiconv;
-  nativeBuildInputs = [ perl pkg-config ] ++ lib.optional postgresql.jitSupport postgresql.llvm;
+  nativeBuildInputs = [ perl pkg-config ] ++ lib.optional jitSupport llvm;
   dontDisableStatic = true;
 
   # postgis config directory assumes /include /lib from the same root for json-c library
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index cdcffc5f135c..052460da27b2 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -221,7 +221,6 @@ let
       };
     in
     {
-      inherit jitSupport;
       psqlSchema = lib.versions.major version;
 
       withJIT = if jitSupport then this else jitToggle;
@@ -231,6 +230,8 @@ let
 
       pkgs = let
         scope = {
+          inherit jitSupport;
+          inherit (llvmPackages) llvm;
           postgresql = this;
           stdenv = stdenv';
           buildPgxExtension = buildPgxExtension.override {
@@ -257,8 +258,6 @@ let
       } // lib.optionalAttrs jitSupport {
         postgresql-jit = nixosTests.postgresql-jit.${thisAttr};
       };
-    } // lib.optionalAttrs jitSupport {
-      inherit (llvmPackages) llvm;
     };
 
     meta = with lib; {

From 4b6bce5c313f82d57f711be4ca22dccf30d32c35 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 Feb 2024 19:31:41 +0100
Subject: [PATCH 069/118] postgresql: refactor to remove "this" argument

This was proposed by abbradar in #150801, but left out of the follow up PR
#221851 by Ma27 to reduce the size of the diff. Compared to the initial
proposal this includes the callPackage call in the recursion, which avoids
breaking the withJIT/withoutJIT helpers.

In terms of nixpkgs, this is a pure refactor, no derivations change. However,
this makes downstream expressions like the following possible:

  (postgresql.override { jitSupport = true; }).pkgs.postgis

This would have not worked before without passing another "this" argument,
which is error prone as can be seen in this example:

  https://github.com/PostgREST/postgrest/pull/3222/files
---
 nixos/modules/services/databases/postgresql.md | 2 +-
 pkgs/servers/sql/postgresql/default.nix        | 1 -
 pkgs/servers/sql/postgresql/generic.nix        | 6 +++---
 pkgs/top-level/all-packages.nix                | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md
index 7d141f12b5de..3ff1f00fa9cf 100644
--- a/nixos/modules/services/databases/postgresql.md
+++ b/nixos/modules/services/databases/postgresql.md
@@ -277,7 +277,7 @@ self: super: {
 Here's a recipe on how to override a particular plugin through an overlay:
 ```
 self: super: {
-  postgresql_15 = super.postgresql_15.override { this = self.postgresql_15; } // {
+  postgresql_15 = super.postgresql_15// {
     pkgs = super.postgresql_15.pkgs // {
       pg_repack = super.postgresql_15.pkgs.pg_repack.overrideAttrs (_: {
         name = "pg_repack-v20181024";
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index d8acae8787a6..d11a2d06b2d2 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -16,7 +16,6 @@ let
       self.lib.nameValuePair attrName (import path {
         inherit jitSupport self;
         thisAttr = attrName;
-        this = self.${attrName};
       })
     ) versions;
 
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 052460da27b2..a669cbb020fb 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -12,7 +12,7 @@ let
       , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic
 
       # for postgresql.pkgs
-      , this, self, newScope, buildEnv
+      , self, newScope, buildEnv
 
       # source specification
       , version, hash, muslPatches
@@ -32,7 +32,7 @@ let
       # detection of crypt fails when using llvm stdenv, so we add it manually
       # for <13 (where it got removed: https://github.com/postgres/postgres/commit/c45643d618e35ec2fe91438df15abd4f3c0d85ca)
       , libxcrypt
-    }:
+    } @args:
   let
     atLeast = lib.versionAtLeast version;
     olderThan = lib.versionOlder version;
@@ -215,9 +215,9 @@ let
     disallowedReferences = [ stdenv'.cc ];
 
     passthru = let
+      this = self.callPackage generic args;
       jitToggle = this.override {
         jitSupport = !jitSupport;
-        this = jitToggle;
       };
     in
     {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02964f0d1fd3..9a09007b4e42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26748,8 +26748,8 @@ with pkgs;
     postgresql_15_jit
     postgresql_16_jit
   ;
-  postgresql = postgresql_15.override { this = postgresql; };
-  postgresql_jit = postgresql_15_jit.override { this = postgresql_jit; };
+  postgresql = postgresql_15;
+  postgresql_jit = postgresql_15_jit;
   postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
   postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs;
   postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs;

From d7ae1c5143c75e7823a09166f1d62fdcde30c903 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 10 Mar 2024 19:49:39 +0100
Subject: [PATCH 070/118] postgresql: refactor to remove doInstallCheck = false

This is the default anyway.
---
 pkgs/servers/sql/postgresql/generic.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index a669cbb020fb..e2547e5d3f0a 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -210,8 +210,6 @@ let
           --replace "object_address" ""
       '' else null;
 
-    doInstallCheck = false; # needs a running daemon?
-
     disallowedReferences = [ stdenv'.cc ];
 
     passthru = let

From e6bfabf366b7dfdf67e24877dc5a24c5c1f8e62e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 12 Mar 2024 21:16:33 +0100
Subject: [PATCH 071/118] postgresql: rename enableSystemd to systemdSupport
 for consistency

We have gssSupport, jitSupport and pythonSupport - but enableSystemd?

Across nixpkgs there are currently three styles commonly used, about equally
often: withX, xSupport and enableX.

Let's at least use one consistent style in this package.
---
 pkgs/servers/sql/postgresql/generic.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index e2547e5d3f0a..d6f7f3a72fdd 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -8,7 +8,8 @@ let
       , linux-pam
 
       # This is important to obtain a version of `libpq` that does not depend on systemd.
-      , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic
+      , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic
+      , enableSystemd ? null
       , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic
 
       # for postgresql.pkgs
@@ -39,6 +40,8 @@ let
     lz4Enabled = atLeast "14";
     zstdEnabled = atLeast "15";
 
+    systemdSupport' = if enableSystemd == null then systemdSupport else (lib.warn "postgresql: argument enableSystemd is deprecated, please use systemdSupport instead." enableSystemd);
+
     pname = "postgresql";
 
     stdenv' = if jitSupport then llvmPackages.stdenv else stdenv;
@@ -66,7 +69,7 @@ let
       ++ lib.optionals jitSupport [ llvmPackages.llvm ]
       ++ lib.optionals lz4Enabled [ lz4 ]
       ++ lib.optionals zstdEnabled [ zstd ]
-      ++ lib.optionals enableSystemd [ systemd ]
+      ++ lib.optionals systemdSupport' [ systemd ]
       ++ lib.optionals pythonSupport [ python3 ]
       ++ lib.optionals gssSupport [ libkrb5 ]
       ++ lib.optionals stdenv'.isLinux [ linux-pam ]
@@ -97,7 +100,7 @@ let
       "--libdir=$(lib)/lib"
       "--with-system-tzdata=${tzdata}/share/zoneinfo"
       "--enable-debug"
-      (lib.optionalString enableSystemd "--with-systemd")
+      (lib.optionalString systemdSupport' "--with-systemd")
       (if stdenv'.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid")
     ] ++ lib.optionals lz4Enabled [ "--with-lz4" ]
       ++ lib.optionals zstdEnabled [ "--with-zstd" ]

From 58acdb18ded4df20ab2267e804d625e9bc994fff Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Fri, 15 Mar 2024 22:01:36 +0000
Subject: [PATCH 072/118] libdicom: add patch for CVE-2024-24793 &
 CVE-2024-24794

---
 pkgs/development/libraries/libdicom/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/libdicom/default.nix b/pkgs/development/libraries/libdicom/default.nix
index cb4d68121ef5..94dfaf81298d 100644
--- a/pkgs/development/libraries/libdicom/default.nix
+++ b/pkgs/development/libraries/libdicom/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , uthash
 , meson
 , ninja
@@ -19,6 +20,15 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-9n0Gp9+fmTM/shgWC8zpwt1pic9BrvDubOt7f+ZDMeE=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2024-24793.CVE-2024-24794.patch";
+      url = "https://github.com/ImagingDataCommons/libdicom/commit/3661aa4cdbe9c39f67d38ae87520f9e3ed50ab16.patch";
+      excludes = [ "CHANGELOG.md" ];
+      hash = "sha256-/KTp0nKYk6jX4phNHY+nzjEptUBHKM2JkOftS5vHsEw=";
+    })
+  ];
+
   buildInputs = [ uthash ];
 
   nativeBuildInputs = [ meson ninja pkg-config ]

From a6d212c099b2667044ecea1e99eb00ede49b0544 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Sat, 16 Mar 2024 03:34:44 +0100
Subject: [PATCH 073/118] python312Packages.diffimg: fix test

python 3.12 seems to yield a very slightly different result
  change is the least significant digit of a ratio, seems safe

and upgrade to --replace-warn while i'm here
---
 pkgs/development/python-modules/diffimg/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/diffimg/default.nix b/pkgs/development/python-modules/diffimg/default.nix
index e5afcdf8cdf1..c1769d118f90 100644
--- a/pkgs/development/python-modules/diffimg/default.nix
+++ b/pkgs/development/python-modules/diffimg/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , pillow
 , unittestCheckHook
+, pythonAtLeast
 }:
 
 buildPythonPackage rec {
@@ -21,7 +22,10 @@ buildPythonPackage rec {
   # fix offered to upstream https://github.com/nicolashahn/diffimg/pull/6
   postPatch = ''
     substituteInPlace diffimg/test.py \
-      --replace "from diff import diff" "from diffimg.diff import diff"
+      --replace-warn "from diff import diff" "from diffimg.diff import diff"
+  '' + lib.optionalString (pythonAtLeast "3.12") ''
+    substituteInPlace diffimg/test.py \
+      --replace-warn "3503192421617232" "3503192421617233"
   '';
 
   propagatedBuildInputs = [

From 918384cd72386eff4f9b1f0393ca1ef09dc01945 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Mar 2024 02:50:21 +0000
Subject: [PATCH 074/118] wazero: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/interpreters/wazero/default.nix b/pkgs/development/interpreters/wazero/default.nix
index 3dae2234a942..c494499d61f4 100644
--- a/pkgs/development/interpreters/wazero/default.nix
+++ b/pkgs/development/interpreters/wazero/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "wazero";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "tetratelabs";
     repo = "wazero";
     rev = "v${version}";
-    hash = "sha256-s01NoliiS8SqoHUjEUUsFcK82nt3xQgmAQZdrEtrOS0=";
+    hash = "sha256-TBGRO+5PHPna2dNSeNktxALEc6TvJzV+kEiynYqvhgY=";
   };
 
   vendorHash = null;

From 122f35b01970e8c4a24cede8dacce0d488173c1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Mar 2024 09:07:04 +0000
Subject: [PATCH 075/118] plexRaw: 1.40.0.7998-c29d4c0c8 ->
 1.40.1.8227-c0dd5a73e

---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index c6751136dd62..5b5af73e1805 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.40.0.7998-c29d4c0c8";
+  version = "1.40.1.8227-c0dd5a73e";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-    sha256 = "sha256-uVsOI6sItfq7wLP+xPOYSC9ueOv/lcDeL+vnrx1WdRA=";
+    sha256 = "16gc8fwb29x3l9s263xs9c7nb0i1rzgaps2wlx0cil8bs2a9izz8";
   } else fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-    sha256 = "sha256-ucxDtnGpfTpQURaGvLwohHeIZPE3aulXtoITRZCYA9c=";
+    sha256 = "03sx5fvwy2njpfh7k4xvkqscrxnafdvzh42g4hsn2hqxp0bqkl51";
   };
 
   outputs = [ "out" "basedb" ];

From 01444957bad77f93aca788fdbd2eca8e4c4da97e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 16 Mar 2024 11:52:12 +0100
Subject: [PATCH 076/118] postgresql: explain use of fetchurl for alpine
 patches

---
 pkgs/servers/sql/postgresql/generic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index d6f7f3a72fdd..5d93cf9aa31b 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -124,6 +124,7 @@ let
       })
 
     ] ++ lib.optionals stdenv'.hostPlatform.isMusl (
+      # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
       map fetchurl (lib.attrValues muslPatches)
     ) ++ lib.optionals stdenv'.isLinux  [
       (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch)

From 8a7841ceef0a7c7794174178de786ae76cc27457 Mon Sep 17 00:00:00 2001
From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
Date: Fri, 15 Mar 2024 06:06:13 +0000
Subject: [PATCH 077/118] swift: don't pass -march to swiftc

swiftc uses cc-wrapper which sets the -march flag on some systems which
breaks the build. This change adds a flag, disableMarch, to cc-wrapper
which disables using the -march flag.
https://github.com/NixOS/nixpkgs/issues/295322
---
 pkgs/build-support/cc-wrapper/default.nix    |  8 ++++++--
 pkgs/development/compilers/swift/default.nix | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index d788076dda51..c6c70e0d73ee 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -53,6 +53,10 @@
 , gccForLibs ? if useCcForLibs then cc else null
 , fortify-headers ? null
 , includeFortifyHeaders ? null
+
+# https://github.com/NixOS/nixpkgs/issues/295322
+# should -march flag be used
+, disableMarch ? false
 }:
 
 with lib;
@@ -609,7 +613,7 @@ stdenv.mkDerivation {
 
     # TODO: aarch64-darwin has mcpu incompatible with gcc
     + optionalString ((targetPlatform ? gcc.arch) && !isClang && !(stdenv.isDarwin && stdenv.isAarch64) &&
-                      isGccArchSupported targetPlatform.gcc.arch) ''
+                      isGccArchSupported targetPlatform.gcc.arch && !disableMarch) ''
       echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before
     ''
 
@@ -699,7 +703,7 @@ stdenv.mkDerivation {
     + optionalString isClang ''
       # Escape twice: once for this script, once for the one it gets substituted into.
       export march=${lib.escapeShellArg
-        (lib.optionalString (targetPlatform ? gcc.arch)
+        (lib.optionalString (targetPlatform ? gcc.arch && !disableMarch)
           (lib.escapeShellArg "-march=${targetPlatform.gcc.arch}"))}
       export defaultTarget=${targetPlatform.config}
       substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index afb8ce39dcce..bb2ef7fae13f 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -25,9 +25,13 @@ let
     #
     # The following selects the correct Clang version, matching the version
     # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`.
-    clang = if pkgs.stdenv.isDarwin
+    clang = let
+      # https://github.com/NixOS/nixpkgs/issues/295322
+      clangNoMarch = swiftLlvmPackages.clang.override { disableMarch = true; };
+    in
+    if pkgs.stdenv.isDarwin
       then
-        swiftLlvmPackages.clang.override rec {
+        clangNoMarch.override rec {
           libc = apple_sdk.Libsystem;
           bintools = pkgs.bintools.override { inherit libc; };
           # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the
@@ -45,7 +49,7 @@ let
           ];
         }
       else
-        swiftLlvmPackages.clang;
+        clangNoMarch;
 
     # Overrides that create a useful environment for swift packages, allowing
     # packaging with `swiftPackages.callPackage`. These are similar to

From 70990ee74d637c41dc06c5c3f790e60a519fc2ff Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 16 Mar 2024 18:44:34 +0800
Subject: [PATCH 078/118] pantheon.appcenter: 7.4.0-unstable-2023-12-04 ->
 7.4.0-unstable-2024-02-07

https://github.com/elementary/appcenter/compare/d93e135a0b0c9a6e0fbad18fe90d46425823a42c...fce55d9373bfb82953191b32e276a2129ffcb8c1

Use a commit that is actually accepted on upstream.
---
 pkgs/desktops/pantheon/apps/appcenter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index e1e0db005d65..7ee81df4b462 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -24,15 +24,15 @@
 
 stdenv.mkDerivation rec {
   pname = "appcenter";
-  version = "7.4.0-unstable-2023-12-04";
+  version = "7.4.0-unstable-2024-02-07";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     # Add support for AppStream 1.0.
     # https://github.com/elementary/appcenter/pull/2099
-    rev = "d93e135a0b0c9a6e0fbad18fe90d46425823a42c";
-    hash = "sha256-b7xux6MuvYZFxufQ5T7DoDNBlsJ/fDR0aUY2Hk/xJoY=";
+    rev = "fce55d9373bfb82953191b32e276a2129ffcb8c1";
+    hash = "sha256-7VYiE1RkaqN1Yg4pFUBs6k8QjoljYFDgQ9jCTLG3uyk=";
   };
 
   nativeBuildInputs = [

From 4c7ad186a58f25ce06cf2819bf8acbd378b52dad Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 9 Jul 2023 17:34:30 +0800
Subject: [PATCH 079/118] pantheon.elementary-session-settings: 6.0.0 ->
 6.0.0-unstable-2023-09-05

https://github.com/elementary/session-settings/compare/6.0.0...3476c89bbb66564a72c6495ac0c61f8f9ed7a3ec

This brings initial systemd support, this is a preparation of gnome-session 46 --builtin removal.
---
 .../desktop/elementary-session-settings/default.nix       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 620c64f11d80..d1d2b6533e93 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -13,6 +13,7 @@
 , elementary-default-settings
 , gnome-settings-daemon
 , runtimeShell
+, systemd
 , writeText
 , meson
 , ninja
@@ -90,13 +91,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "elementary-session-settings";
-  version = "6.0.0";
+  version = "6.0.0-unstable-2023-09-05";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "session-settings";
-    rev = version;
-    sha256 = "1faglpa7q3a4335gnd074a3lnsdspyjdnskgy4bfnf6xmwjx7kjx";
+    rev = "3476c89bbb66564a72c6495ac0c61f8f9ed7a3ec";
+    sha256 = "sha256-Z1qW6m0XDkB92ZZVKx98JOMXiBDbGpQ0cAXgWdqK27c=";
   };
 
   nativeBuildInputs = [
@@ -111,6 +112,7 @@ stdenv.mkDerivation rec {
     gnome-settings-daemon
     onboard
     orca
+    systemd
   ];
 
   mesonFlags = [

From 7d8ce1444361d4aa4321996c7fdbc98cfdb2c8bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Mar 2024 13:18:53 +0000
Subject: [PATCH 080/118] mautrix-whatsapp: 0.10.5 -> 0.10.6

---
 pkgs/servers/mautrix-whatsapp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 3423985f6584..76ac8bfd5712 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "mautrix-whatsapp";
-  version = "0.10.5";
+  version = "0.10.6";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "whatsapp";
     rev = "v${version}";
-    hash = "sha256-bn9nUTtpaEkzF2SEdCcKG27WQDL7xsgfgA/72wElQqA=";
+    hash = "sha256-foYmHJk25SOCv+o6eiJTeD2VP8vi6PpeeDm845Lq43Y=";
   };
 
   buildInputs = [ olm ];
 
-  vendorHash = "sha256-PDUSjza+0SDanQwKYQRuLzsiA/sHjRnG0xpzlzhkm+U=";
+  vendorHash = "sha256-2xHgGBVFzEnOFiZrg1ClgjUrzKVD3CLxPsvRO2iQBC4=";
 
   doCheck = false;
 

From 19c6347dd3f473c93664b48d9b7e0539dbf28927 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <paveloomm@gmail.com>
Date: Sat, 16 Mar 2024 13:46:40 +0000
Subject: [PATCH 081/118] mold: 2.4.1 -> 2.30.0

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

diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix
index a44c28c18bca..0caa0513d84b 100644
--- a/pkgs/development/tools/mold/default.nix
+++ b/pkgs/development/tools/mold/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mold";
-  version = "2.4.1";
+  version = "2.30.0";
 
   src = fetchFromGitHub {
     owner = "rui314";
     repo = "mold";
     rev = "v${version}";
-    hash = "sha256-wwlpYAWP8sAsEkTq0w3s2jAWGayW3v9QcaVRKWHTlGE=";
+    hash = "sha256-VVgJDKf21V7Mkfalh8tJ0Tx73VG1ong+8C6uPC23154=";
   };
 
   nativeBuildInputs = [

From f8e8b40db295aae1215cc8a38f6cae7502bdfb47 Mon Sep 17 00:00:00 2001
From: Bryan Lai <bryanlais@gmail.com>
Date: Sat, 16 Mar 2024 22:36:43 +0800
Subject: [PATCH 082/118] python311Packages.python-lsp-black: fix build

Some tests are broken in the current staging-next due to black version
bump to v24.2.0. Upstream fix is already available and scheduled for the
next release. Fetch the patch for now until upstream releases 2.0.1.
---
 .../python-modules/python-lsp-black/default.nix      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix
index 59b4cdaa76f0..6387e833b7fc 100644
--- a/pkgs/development/python-modules/python-lsp-black/default.nix
+++ b/pkgs/development/python-modules/python-lsp-black/default.nix
@@ -7,6 +7,7 @@
 , python-lsp-server
 , setuptools
 , tomli
+, fetchpatch
 }:
 
 buildPythonPackage rec {
@@ -22,6 +23,17 @@ buildPythonPackage rec {
     hash = "sha256-nV6mePSWzfPW2RwXg/mxgzfT9wD95mmTuPnPEro1kEY=";
   };
 
+  patches =
+    /** fix test failure with black<24.2.0;
+        remove this patch once python-lsp-black>2.0.0 */
+    lib.optional
+      (with lib; (versionOlder version "2.0.1") && (versionAtLeast black.version "24.2.0"))
+      (fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/python-lsp/python-lsp-black/pull/56.patch";
+        hash = "sha256-38bYU27+xtA8Kq3appXTkNnkG5/XgrUJ2nQ5+yuSU2U=";
+      })
+    ++ [ ];
+
   nativeBuildInputs = [
     setuptools
   ];

From 3213fbef2c7ec5935366709e0ed20d4e7372578d Mon Sep 17 00:00:00 2001
From: Bryan Lai <bryanlais@gmail.com>
Date: Sat, 16 Mar 2024 23:09:16 +0800
Subject: [PATCH 083/118] python311Packages.pylint: disable failing test

Similar failures have been observed upstream, but the fix has not landed
yet, so we disable the failing `test_functional` with a comment linked
to the upstream issues.
---
 pkgs/development/python-modules/pylint/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 948b2afc5a15..52d1f976514f 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -96,6 +96,8 @@ buildPythonPackage rec {
     "test_save_and_load_not_a_linter_stats"
     # Truncated string expectation mismatch
     "test_truncated_compare"
+    # Probably related to pytest versions, see pylint-dev/pylint#9477 and pylint-dev/pylint#9483
+    "test_functional"
     # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')]
     "test_functional_relation_extraction"
   ] ++ lib.optionals stdenv.isDarwin [

From 62f455f63a8242675b2a9e3caf30afadd39c0d2b Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Sat, 16 Mar 2024 20:14:19 +0530
Subject: [PATCH 084/118] delta: 0.16.5 -> 0.17.0

Diff: https://github.com/dandavison/delta/compare/0.16.5...0.17.0
Changelog: https://github.com/dandavison/delta/releases/tag/0.17.0
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 pkgs/applications/version-management/delta/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix
index 7038ed13dc89..3065d5672193 100644
--- a/pkgs/applications/version-management/delta/default.nix
+++ b/pkgs/applications/version-management/delta/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "delta";
-  version = "0.16.5";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "dandavison";
     repo = pname;
     rev = version;
-    hash = "sha256-W6XtfXfOP8QfQ0t5hquFdYvCO9muE50N1fQsNtnOzfM=";
+    hash = "sha256-r0ED9o2UP91fe6Bng5ioJra5S1bg+UEXMLeSQPkMswI=";
   };
 
-  cargoHash = "sha256-SNKbgEyelJCHKCaBRfCGc3RECGABtZzMC2rCbhzqZtU=";
+  cargoHash = "sha256-3CxRNhcjfDK/xUuM3w+GwqE0+X6WT92/LGj/qRp0TwA=";
 
   nativeBuildInputs = [
     installShellFiles

From 1366d907964d5d5748d008980b9249aa48fc0a84 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sat, 16 Mar 2024 15:07:30 -0400
Subject: [PATCH 085/118] texlab: 5.13.0 -> 5.13.1

https://github.com/latex-lsp/texlab/blob/v5.13.1/CHANGELOG.md
---
 pkgs/development/tools/misc/texlab/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index c1ba1b482232..1c504f6fbf68 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -15,16 +15,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "texlab";
-  version = "5.13.0";
+  version = "5.13.1";
 
   src = fetchFromGitHub {
     owner = "latex-lsp";
     repo = "texlab";
     rev = "refs/tags/v${version}";
-    hash = "sha256-k/Hfl9SZxjdNLzvGrMMu/DPQpXsW21FC/WvJbz1IhSY=";
+    hash = "sha256-fmtNalpOOPEiMO5zDD6m01cDfFuaLQsYPk6cc7yvjog=";
   };
 
-  cargoHash = "sha256-tM/y1A/aCkcpU/1nZfUrNYDI0jiGn8qzvmP244tEJac=";
+  cargoHash = "sha256-5ojXplzkBwchnSZLkwR5jz8WgyEA14Y1iVQ+Q19U8Tg=";
 
   outputs = [ "out" ] ++ lib.optional (!isCross) "man";
 
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
   # generate the man page
   postInstall = lib.optionalString (!isCross) ''
     # TexLab builds man page separately in CI:
-    # https://github.com/latex-lsp/texlab/blob/v5.13.0/.github/workflows/publish.yml#L117-L121
+    # https://github.com/latex-lsp/texlab/blob/v5.13.1/.github/workflows/publish.yml#L117-L121
     help2man --no-info "$out/bin/texlab" > texlab.1
     installManPage texlab.1
   '';

From fd1a21f0ae169cb090970b0f0f17c39f694cc845 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Mar 2024 19:21:23 +0000
Subject: [PATCH 086/118] python311Packages.paste: 3.7.1 -> 3.8.0

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

diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix
index 3a8ec63f3e9a..9248eca81255 100644
--- a/pkgs/development/python-modules/paste/default.nix
+++ b/pkgs/development/python-modules/paste/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "paste";
-  version = "3.7.1";
+  version = "3.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "cdent";
     repo = "paste";
     rev = "refs/tags/${version}";
-    hash = "sha256-xp8FU4MR79/leBSJvSk8J2GdWW32AW2I5i3Y6DsRPLw=";
+    hash = "sha256-T9VG91Y8hap1nt3FkuCGsv8nglWNlRajvsvljXexH3Y=";
   };
 
   postPatch = ''

From e9516ea0d4060eb40f8b680b528dc5190913d15c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Mar 2024 19:52:16 +0000
Subject: [PATCH 087/118] oculante: 0.8.13 -> 0.8.16

---
 pkgs/applications/graphics/oculante/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix
index d6f8c1d641cb..f83184a488aa 100644
--- a/pkgs/applications/graphics/oculante/default.nix
+++ b/pkgs/applications/graphics/oculante/default.nix
@@ -22,16 +22,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oculante";
-  version = "0.8.13";
+  version = "0.8.16";
 
   src = fetchFromGitHub {
     owner = "woelper";
     repo = "oculante";
     rev = version;
-    hash = "sha256-RbRvV3OkRZXc0n7qGzqbBtbU81wFc+/Ohg9pbVqdsw4=";
+    hash = "sha256-C8USTDW5C+mjj/fr242is/42RpmUvcK3lUeaq0/BSGA=";
   };
 
-  cargoHash = "sha256-qt4bHCHpiP6yOce9hquVVlLFF906ADwhss4xAP9E0fA=";
+  cargoHash = "sha256-w8k0QG509PRHHB1e4WThYnM6R0PwWMbSBxs2B0zQ0ww=";
 
   nativeBuildInputs = [
     cmake

From 7dde9fa428355b00e1fe1aaa05faab40ac84ff9a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 16 Mar 2024 20:29:17 +0000
Subject: [PATCH 088/118] apptainer.gpuChecks.saxpy: fix the eval

Without the change the eval fails as:

    $ nix build --no-link -f. apptainer.gpuChecks.saxpy
    error:
           error: attribute 'image-saxpy' missing
           at pkgs/applications/virtualization/singularity/generic.nix:303:72:
              302|                 ''
              303|                   ${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.tests.image-saxpy} saxpy
                 |                                                                        ^
              304|                 '';
---
 pkgs/applications/virtualization/singularity/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix
index 85992e2abce9..d16b88adece3 100644
--- a/pkgs/applications/virtualization/singularity/generic.nix
+++ b/pkgs/applications/virtualization/singularity/generic.nix
@@ -300,7 +300,7 @@ in
             let
               unwrapped = writeShellScriptBin "apptainer-cuda-saxpy"
                 ''
-                  ${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.tests.image-saxpy} saxpy
+                  ${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.gpuChecks.image-saxpy} saxpy
                 '';
             in
             runCommand "run-apptainer-cuda-saxpy"

From 9f76751752aa6b52de52461c7fdbf940b15d2b11 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Wed, 14 Feb 2024 20:41:05 -0500
Subject: [PATCH 089/118] python311Packages.debugpy: 1.8.0 -> 1.8.1

https://github.com/microsoft/debugpy/releases/tag/v1.8.1
---
 .../python-modules/debugpy/default.nix        | 56 +++++++++++--------
 .../debugpy/fix-test-pythonpath.patch         |  6 +-
 .../python-modules/debugpy/hardcode-gdb.patch |  4 +-
 .../debugpy/hardcode-lldb.patch               |  4 +-
 .../debugpy/hardcode-version.patch            |  2 +-
 .../debugpy/skip-attach-pid-tests.patch       | 27 +++++++++
 6 files changed, 67 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch

diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 8a01afb3c73b..4ba770e251c6 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -5,15 +5,17 @@
 , fetchFromGitHub
 , substituteAll
 , gdb
-, django
-, flask
-, gevent
-, psutil
-, pytest-timeout
-, pytest-xdist
+, lldb
 , pytestCheckHook
+, pytest-xdist
+, pytest-timeout
+, importlib-metadata
+, psutil
+, django
 , requests
-, llvmPackages
+, gevent
+, numpy
+, flask
 }:
 
 buildPythonPackage rec {
@@ -21,7 +23,7 @@ buildPythonPackage rec {
   version = "1.8.1";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "microsoft";
@@ -46,6 +48,12 @@ buildPythonPackage rec {
     # To avoid this issue, debugpy should be installed using python.withPackages:
     # python.withPackages (ps: with ps; [ debugpy ])
     ./fix-test-pythonpath.patch
+
+    # Attach pid tests are disabled by default on windows & macos,
+    # but are also flaky on linux:
+    # - https://github.com/NixOS/nixpkgs/issues/262000
+    # - https://github.com/NixOS/nixpkgs/issues/251045
+    ./skip-attach-pid-tests.patch
   ] ++ lib.optionals stdenv.isLinux [
     # Hard code GDB path (used to attach to process)
     (substituteAll {
@@ -56,7 +64,7 @@ buildPythonPackage rec {
     # Hard code LLDB path (used to attach to process)
     (substituteAll {
       src = ./hardcode-lldb.patch;
-      inherit (llvmPackages) lldb;
+      inherit lldb;
     })
   ];
 
@@ -66,24 +74,31 @@ buildPythonPackage rec {
     set -x
     cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process
     rm *.so *.dylib *.dll *.exe *.pdb
-    ${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{
+    $CXX linux_and_mac/attach.cpp -Ilinux_and_mac -std=c++11 -fPIC -nostartfiles ${{
       "x86_64-linux"   = "-shared -o attach_linux_amd64.so";
       "i686-linux"     = "-shared -o attach_linux_x86.so";
       "aarch64-linux"  = "-shared -o attach_linux_arm64.so";
-      "x86_64-darwin"  = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86_64.dylib";
-      "i686-darwin"    = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86.dylib";
-      "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_arm64.dylib";
+      "x86_64-darwin"  = "-D_REENTRANT -dynamiclib -lc -o attach_x86_64.dylib";
+      "i686-darwin"    = "-D_REENTRANT -dynamiclib -lc -o attach_x86.dylib";
+      "aarch64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_arm64.dylib";
     }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}
   )'';
 
   nativeCheckInputs = [
+    ## Used to run the tests:
+    pytestCheckHook
+    pytest-xdist
+    pytest-timeout
+
+    ## Used by test helpers:
+    importlib-metadata
+    psutil
+
+    ## Used in Python code that is run/debugged by the tests:
     django
     flask
     gevent
-    psutil
-    pytest-timeout
-    pytest-xdist
-    pytestCheckHook
+    numpy
     requests
   ];
 
@@ -107,13 +122,6 @@ buildPythonPackage rec {
   # Fixes hanging tests on Darwin
   __darwinAllowLocalNetworking = true;
 
-  disabledTests = [
-    # testsuite gets stuck at this one
-    "test_attach_pid_client"
-  ];
-  # TODO? https://github.com/NixOS/nixpkgs/issues/262000
-  doCheck = !stdenv.isLinux;
-
   pythonImportsCheck = [
     "debugpy"
   ];
diff --git a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch
index 7cfb1a49ec38..e368357d5cc2 100644
--- a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch
+++ b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch
@@ -1,12 +1,12 @@
 diff --git a/tests/debug/session.py b/tests/debug/session.py
-index 7dacc1f9..f303e20a 100644
+index d0921956..459c89c0 100644
 --- a/tests/debug/session.py
 +++ b/tests/debug/session.py
-@@ -631,6 +631,7 @@ class Session(object):
+@@ -704,6 +704,7 @@ class Session(object):
          if "PYTHONPATH" in self.config.env:
              # If specified, launcher will use it in lieu of PYTHONPATH it inherited
              # from the adapter when spawning debuggee, so we need to adjust again.
 +            self.config.env.prepend_to("PYTHONPATH", os.environ["PYTHONPATH"])
              self.config.env.prepend_to("PYTHONPATH", DEBUGGEE_PYTHONPATH.strpath)
-         return self._request_start("launch")
  
+         # Adapter is going to start listening for server and spawn the launcher at
diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch
index 2fe09a70151a..5cc68b21b3c6 100644
--- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch
+++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch
@@ -1,8 +1,8 @@
 diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
-index ed43e370..d3d6669a 100644
+index 85f3353b..56fab577 100644
 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
 +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
-@@ -404,7 +404,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
+@@ -410,7 +410,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
      is_debug = 0
      # Note that the space in the beginning of each line in the multi-line is important!
      cmd = [
diff --git a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch
index 3a1013187351..215e7ee0f9ca 100644
--- a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch
+++ b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch
@@ -1,8 +1,8 @@
 diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
-index d3d6669a..2ded8d9c 100644
+index 56fab577..989ede03 100644
 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
 +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
-@@ -494,7 +494,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d
+@@ -500,7 +500,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d
      is_debug = 0
      # Note that the space in the beginning of each line in the multi-line is important!
      cmd = [
diff --git a/pkgs/development/python-modules/debugpy/hardcode-version.patch b/pkgs/development/python-modules/debugpy/hardcode-version.patch
index 11d565b98060..9fa42a0605f8 100644
--- a/pkgs/development/python-modules/debugpy/hardcode-version.patch
+++ b/pkgs/development/python-modules/debugpy/hardcode-version.patch
@@ -1,5 +1,5 @@
 diff --git a/setup.py b/setup.py
-index 3abc811b..91354604 100644
+index 1bfba237..414bb4d5 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -12,7 +12,6 @@ import sys
diff --git a/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch b/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch
new file mode 100644
index 000000000000..a993940f7266
--- /dev/null
+++ b/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch
@@ -0,0 +1,27 @@
+diff --git a/tests/debug/runners.py b/tests/debug/runners.py
+index dc60d0ae..cf4a06a3 100644
+--- a/tests/debug/runners.py
++++ b/tests/debug/runners.py
+@@ -163,7 +163,7 @@ def _attach_common_config(session, target, cwd):
+ @_runner
+ @contextlib.contextmanager
+ def attach_pid(session, target, cwd=None, wait=True):
+-    if wait and not sys.platform.startswith("linux"):
++    if wait:
+         pytest.skip("https://github.com/microsoft/ptvsd/issues/1926")
+ 
+     log.info("Attaching {0} to {1} by PID.", session, target)
+diff --git a/tests/debugpy/test_attach.py b/tests/debugpy/test_attach.py
+index afabc1ac..2fff3982 100644
+--- a/tests/debugpy/test_attach.py
++++ b/tests/debugpy/test_attach.py
+@@ -151,8 +151,7 @@ def test_reattach(pyfile, target, run):
+ 
+ 
+ @pytest.mark.parametrize("pid_type", ["int", "str"])
+-@pytest.mark.skipif(
+-    not sys.platform.startswith("linux"),
++@pytest.mark.skip(
+     reason="https://github.com/microsoft/debugpy/issues/311",
+ )
+ def test_attach_pid_client(pyfile, target, pid_type):

From 143bb150359ea4ab79e1ecabce2acbdb53f01619 Mon Sep 17 00:00:00 2001
From: nwright <nathanwrightbusiness@gmail.com>
Date: Sat, 16 Mar 2024 13:44:03 -0400
Subject: [PATCH 090/118] xone: 0.3 -> 0.3-unstable-2024-03-16

---
 pkgs/os-specific/linux/xone/default.nix | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix
index 104b7952f2be..b1e2ce570a2d 100644
--- a/pkgs/os-specific/linux/xone/default.nix
+++ b/pkgs/os-specific/linux/xone/default.nix
@@ -1,27 +1,18 @@
 { stdenv, lib, fetchFromGitHub, kernel, fetchurl, fetchpatch }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xone";
-  version = "0.3";
+  version = "0.3-unstable-2024-03-16";
 
   src = fetchFromGitHub {
     owner = "medusalix";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-h+j4xCV9R6hp9trsv1NByh9m0UBafOz42ZuYUjclILE=";
+    repo = "xone";
+    rev = "948d2302acdd6333295eaba4da06d96677290ad3";
+    hash = "sha256-srAEw1ai5KT0rmVUL3Dut9R2mNb00AAZVCcINikh2sM=";
   };
 
-  patches = [
-    # Fix build on kernel 6.3
-    (fetchpatch {
-      name = "kernel-6.3.patch";
-      url = "https://github.com/medusalix/xone/commit/bbf0dcc484c3f5611f4e375da43e0e0ef08f3d18.patch";
-      hash = "sha256-A2OzRRk4XT++rS6k6EIyiPy/LJptvVRUxoP7CIGrPWU=";
-    })
-  ];
-
   setSourceRoot = ''
-    export sourceRoot=$(pwd)/${src.name}
+    export sourceRoot=$(pwd)/${finalAttrs.src.name}
   '';
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -30,7 +21,7 @@ stdenv.mkDerivation rec {
     "-C"
     "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "M=$(sourceRoot)"
-    "VERSION=${version}"
+    "VERSION=${finalAttrs.version}"
   ];
 
   buildFlags = [ "modules" ];
@@ -45,4 +36,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
   };
 }
-
+)

From d60fbef7968061e99dc8fb3c73df9b49c77b6ae8 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 17 Mar 2024 00:02:54 +0100
Subject: [PATCH 091/118] python312Packages.gpy: normalize pname

---
 pkgs/development/python-modules/gpy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
index e4fbda924760..33da65d155cc 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -14,7 +14,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "GPy";
+  pname = "gpy";
   version = "1.13.0";
   pyproject = true;
 

From 4ae6b9a4c009d329936412a574aa7dfb07d3c956 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Mar 2024 00:52:55 +0000
Subject: [PATCH 092/118] python312Packages.pyunifiprotect: 4.23.4 -> 5.0.1

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

diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix
index 79b940d5be1d..74be4eeeeb06 100644
--- a/pkgs/development/python-modules/pyunifiprotect/default.nix
+++ b/pkgs/development/python-modules/pyunifiprotect/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "pyunifiprotect";
-  version = "4.23.4";
+  version = "5.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = "briis";
     repo = "pyunifiprotect";
     rev = "refs/tags/v${version}";
-    hash = "sha256-sBdu4XJkEtHf6dlHgJKFQvONp1x89NiS2EgxMiJFX7A=";
+    hash = "sha256-19Ne8Jk0O1DjFVr286wpn9gdheNXOHHrIE9EgQNNB4w=";
   };
 
   env.SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 9897f0579550781a652535072509ff8b6a041c32 Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Sun, 17 Mar 2024 00:55:57 +0000
Subject: [PATCH 093/118] texlive.pkgs."texlive.infra": fix missing
 texlive.tlpdb (#296486)

---
 pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix    | 2 +-
 pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix b/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix
index 4e47feed0cd7..b01e8423e265 100644
--- a/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix
+++ b/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix
@@ -3785,7 +3785,7 @@ texlive-scripts-69407={run="12y5mpwin93asvl0anqs170zixvb29vjakwgagvylhg1ns27lrdc
 texlive-scripts-extra-62517={run="193v0r4i3p4psn5b4q0ggpgaazwn6jadjlzh5gjm3igg9k73i1wj";doc="1izzy295pmxrg0sf2szxxahxm6s8bfi960mbs9z6vy7m5j1szxwl";};
 texlive-sr-54594={doc="0icavs9jkcr5b5cx5kv202k95j0ydgby9lqrw8wm9h936mbn9bkj";};
 texlive-zh-cn-54490={doc="1r8n9k1cy7798g1rg1hyj6g945j9649c5hhqf8hm7a7abzx7w6ll";};
-"texlive.infra-68903.tlpdb69413"={run="1ig9nsyhhgv9vr5hhvzj3asqz75fdjrvgyj1s2z8rbng0y45x8nv";doc="0d6ij3bgna15i5fkg4xwi7155wz891625sy6qh4jfjmi9sda9p2n";tlpkg="07qvyhgbbl4cddhn4wqh1ivp1ifpw5hwv05xywl62zc1swag317x";};
+"texlive.infra-68903.tlpdb69413"={run="1ig9nsyhhgv9vr5hhvzj3asqz75fdjrvgyj1s2z8rbng0y45x8nv";doc="0d6ij3bgna15i5fkg4xwi7155wz891625sy6qh4jfjmi9sda9p2n";tlpkg="141qqpf1kg65kr5rw2rrzspcyhgp9dgndz2md9snqpbspmd92jws";};
 texliveonfly-55777={run="03i9pzqv2dz4z9nlq60kzwiyfvzhhaalhczqa9146jp4wvcib9l3";doc="1fsabzkbcrk42rsp8ssx0kvap31y1rqnkq582129946q3njvmylx";};
 texloganalyser-54526={run="0icav63nll0lj85cqlbg1lx1r6ysjf1lyv5bydxr3flr1c7yqx2r";doc="1s7952n2brrz3s1qca9r5qk8fnjlmrmrn8b06dhjxdb7wdqis6g0";};
 texlogfilter-62792={run="19sxpfyfp2knv8q13sgka5kw74vplr0fnf5c9m599h5kb7v4pcys";doc="1wwhdm7b2rwp9qjpivj3wflwf6q4lcxbc3r52g9c68w7d492v7al";};
diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
index 5ee4d4d6a79f..8ed3bb09c12f 100644
--- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
+++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
@@ -417,7 +417,7 @@ in lib.recursiveUpdate orig rec {
 
     # add minimal texlive.tlpdb
     postUnpack = ''
-      if [[ "$tlType" == "tlpkg" ]] ; then
+      if [[ -d "$out"/TeXLive ]] ; then
         xzcat "${tlpdbxz}" | sed -n -e '/^name \(00texlive.config\|00texlive.installation\)$/,/^$/p' > "$out"/texlive.tlpdb
       fi
     '';

From 299d4668ba61600311553920d9fd9c102145b2cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Mar 2024 00:21:10 +0000
Subject: [PATCH 094/118] calls: 45.0 -> 46.0

---
 pkgs/applications/networking/calls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
index 3546284f99c3..77a80df87ed5 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@@ -34,7 +34,7 @@
 
 stdenv.mkDerivation rec {
   pname = "calls";
-  version = "45.0";
+  version = "46.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     repo = pname;
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-NIQFKVpZSxY2QOb73WfYsCzMQwB9XySoADCL7IlmGe8=";
+    hash = "sha256-ZUVMK0Ex77EQKTGM0gBDHt8W9l4rHspihYduMcwMGho=";
   };
 
   outputs = [ "out" "devdoc" ];

From 2a411ff5d25f6137853bbf819f8293ed1a11c822 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Mar 2024 01:05:42 +0000
Subject: [PATCH 095/118] python312Packages.fake-useragent: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix
index 3b087601453f..7e6d5c76cfb2 100644
--- a/pkgs/development/python-modules/fake-useragent/default.nix
+++ b/pkgs/development/python-modules/fake-useragent/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "fake-useragent";
-  version = "1.5.0";
+  version = "1.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "fake-useragent";
     repo = "fake-useragent";
     rev = "refs/tags/${version}";
-    hash = "sha256-EzSofIHNwn7GPhnTNbo/451szB759w5T8poXj8XVNUU=";
+    hash = "sha256-BDXJJeT29GWkN9DoVl8sxXFpV/eMqu3mqlvMr2lzJM8=";
   };
 
   postPatch = ''

From 0edf928766dd467ad5d3729f9df65d29d470083d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Mar 2024 01:06:19 +0000
Subject: [PATCH 096/118] python312Packages.s3fs: 2024.2.0 -> 2024.3.0

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

diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index 2cc6bb9d7950..510c95fff9b6 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "s3fs";
-  version = "2024.2.0";
+  version = "2024.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+AZPUirQiLVrBDBHyCVzSEfAJp3xnyYTyVbUwg3hW2I=";
+    hash = "sha256-pmMjXIrbfmu8RadSksk5Ww+9WAuzlK3EztnorUvYZNo=";
   };
 
   postPatch = ''

From b1d7482b702fd5935e5aeade802429cacea87390 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Mar 2024 01:16:25 +0000
Subject: [PATCH 097/118] nix-zsh-completions: 0.5.0 -> 0.5.1

---
 pkgs/shells/zsh/nix-zsh-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 32565af35be9..1b5c61218c01 100644
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nix-zsh-completions";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-zsh-completions";
     rev = "refs/tags/${version}";
-    hash = "sha256-DKvCpjAeCiUwD5l6PUW7WlEvM0cNZEOk41IiVXoh9D8=";
+    hash = "sha256-bgbMc4HqigqgdkvUe/CWbUclwxpl17ESLzCIP8Sz+F8=";
   };
 
   strictDeps = true;

From 52b3676ba44203eff44fefda874229f480498b85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Mar 2024 01:19:33 +0000
Subject: [PATCH 098/118] oha: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix
index 28a35929696a..cbe629234b40 100644
--- a/pkgs/tools/networking/oha/default.nix
+++ b/pkgs/tools/networking/oha/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oha";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "hatoo";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-mjQyeotXKF1hohSmPisshR8Cap9K/IEE55cYSk/QxQE=";
+    hash = "sha256-r5jYHs+oVflgFTQZpKvdNs56TmZtyljZKDJMVP+iUNY=";
   };
 
-  cargoHash = "sha256-JZIuKUky8D9Q+1JZQ4Vg8GF6Qkh9hG/FebpqyRzPOcA=";
+  cargoHash = "sha256-Q3ixlB/P/99h6ZuT37KrM9fxyBzcmlmM5jw6xDT2lPE=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [
     pkg-config

From 254540aaf5d51db806783953628d497cc622e0dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Mar 2024 01:25:05 +0000
Subject: [PATCH 099/118] hugo: 0.123.8 -> 0.124.0

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

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 072f36a29759..086b0d0f7fc0 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.123.8";
+  version = "0.124.0";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-sL/LiQwbn3nD2eDFNuAbDHRGemTiBhTfb5IaugYL9dM=";
+    hash = "sha256-LLjIKkNtrnnpIUjdJZJlrsyP4O634/B+cyn8DEYfRdk=";
   };
 
-  vendorHash = "sha256-V7YRrC+6fOIjXOu7E0kIOZZt++4oFLPhmHeWmOVU3Xw=";
+  vendorHash = "sha256-xl3X9AjlDcmjMExHvzgMp2mXJnt3jae6WNQSklHWKPQ=";
 
   doCheck = false;
 

From bf86b51cd2a9e22c0893756f15c5f2c2d5c97308 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Thu, 14 Mar 2024 00:49:17 -0400
Subject: [PATCH 100/118] darwin.moltenvk: clean up derivation

- Drop the patches in favor of patching up the xcodeproj files, which
  should make updates in the future easier (no more patch conflicts);
- Switch to building `MoltenVKPackaging.xcodeproj` instead of building
  the projects individually;
- Link `libMoltenVK.dylib` manually, which is needed for MoltenVK 1.2.8
  due to xcbuild not being able to build the dylib in the xcodeproj;
- Add support for enabling private API usage and default it to `true`.
  This will be a new feature in MoltenVK 1.2.8;
- Use darwin.apple_sdk.libs.simd instead of symlinking from the SDK;
- Filter out rc and beta releases in the update script; and
- Support static builds of MoltenVK.
---
 .../darwin/moltenvk/MoltenVK.xcodeproj.patch  | 100 --------
 .../MoltenVKShaderConverter.xcodeproj.patch   |  84 -------
 pkgs/os-specific/darwin/moltenvk/default.nix  | 230 +++++++++++-------
 pkgs/top-level/darwin-packages.nix            |   3 +-
 4 files changed, 139 insertions(+), 278 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch
 delete mode 100644 pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch

diff --git a/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch b/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch
deleted file mode 100644
index 83e020a1b848..000000000000
--- a/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
-index c23afce4..12ac12f4 100644
---- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
-+++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
-@@ -365,13 +365,6 @@
- /* End PBXBuildFile section */
- 
- /* Begin PBXContainerItemProxy section */
--		2F21D82E24983488009BEA5F /* PBXContainerItemProxy */ = {
--			isa = PBXContainerItemProxy;
--			containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
--			proxyType = 1;
--			remoteGlobalIDString = 2FEA0CFF2490381A00EEF3AD;
--			remoteInfo = "MoltenVKSPIRVToMSLConverter-tvOS";
--		};
- 		2FEA0D1B249040CA00EEF3AD /* PBXContainerItemProxy */ = {
- 			isa = PBXContainerItemProxy;
- 			containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
-@@ -400,27 +393,6 @@
- 			remoteGlobalIDString = A93903C71C57E9ED00FE90DC;
- 			remoteInfo = "MVKSPIRVToMSLConverter-macOS";
- 		};
--		A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */ = {
--			isa = PBXContainerItemProxy;
--			containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
--			proxyType = 1;
--			remoteGlobalIDString = A93903B81C57E9D700FE90DC;
--			remoteInfo = "MVKSPIRVToMSLConverter-iOS";
--		};
--		A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */ = {
--			isa = PBXContainerItemProxy;
--			containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
--			proxyType = 1;
--			remoteGlobalIDString = A9092A8C1A81717B00051823;
--			remoteInfo = MoltenVKShaderConverter;
--		};
--		DCA2CEAE2A45DFD400FB75B6 /* PBXContainerItemProxy */ = {
--			isa = PBXContainerItemProxy;
--			containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
--			proxyType = 1;
--			remoteGlobalIDString = DCFD7F6F2A45BDA0007BBBF7;
--			remoteInfo = "MoltenVKShaderConverter-xrOS";
--		};
-		DCBC41212A45DB1000F49BD1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
-@@ -1019,7 +998,6 @@
- 			buildRules = (
- 			);
- 			dependencies = (
--				2F21D82F24983488009BEA5F /* PBXTargetDependency */,
- 			);
- 			name = "MoltenVK-tvOS";
- 			productName = MoltenVK;
-@@ -1039,7 +1017,6 @@
- 			buildRules = (
- 			);
- 			dependencies = (
--				A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */,
- 			);
- 			name = "MoltenVK-iOS";
- 			productName = MoltenVK;
-@@ -1059,7 +1036,6 @@
- 			buildRules = (
- 			);
- 			dependencies = (
--				A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */,
- 			);
- 			name = "MoltenVK-macOS";
- 			productName = MoltenVK;
-@@ -1476,29 +1452,6 @@
- 		};
- /* End PBXSourcesBuildPhase section */
- 
--/* Begin PBXTargetDependency section */
--		2F21D82F24983488009BEA5F /* PBXTargetDependency */ = {
--			isa = PBXTargetDependency;
--			name = "MoltenVKSPIRVToMSLConverter-tvOS";
--			targetProxy = 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */;
--		};
--		A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */ = {
--			isa = PBXTargetDependency;
--			name = "MVKSPIRVToMSLConverter-iOS";
--			targetProxy = A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */;
--		};
--		A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */ = {
--			isa = PBXTargetDependency;
--			name = MoltenVKShaderConverter;
--			targetProxy = A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */;
--		};
--		DCA2CEAF2A45DFD400FB75B6 /* PBXTargetDependency */ = {
--			isa = PBXTargetDependency;
--			name = "MoltenVKShaderConverter-xrOS";
--			targetProxy = DCA2CEAE2A45DFD400FB75B6 /* PBXContainerItemProxy */;
--		};
--/* End PBXTargetDependency section */
--
- /* Begin XCBuildConfiguration section */
- 		2FEA0AB824902F9F00EEF3AD /* Debug */ = {
- 			isa = XCBuildConfiguration;
diff --git a/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch b/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch
deleted file mode 100644
index 3e48b2b5ba67..000000000000
--- a/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
-index c7842b63..d55f73ed 100644
---- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
-+++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
-@@ -3,7 +3,7 @@
- 	archiveVersion = 1;
- 	classes = {
- 	};
--	objectVersion = 54;
-+	objectVersion = 48;
- 	objects = {
-
- /* Begin PBXBuildFile section */
-@@ -33,9 +33,6 @@
- 		A920A8AC251B75B70076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
- 		A920A8AD251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
- 		A920A8AE251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
--		A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
--		A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
--		A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
- 		A925B71B1C78DEB2006E7ECD /* libMoltenVKShaderConverter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; };
- 		A928C9191D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; };
- 		A928C91A1D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; };
-@@ -55,12 +52,6 @@
- 		A97CC7411C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A97CC73E1C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp */; };
- 		A98149681FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; };
- 		A98149691FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; };
--		A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
--		A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
--		A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
--		A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
--		A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
--		A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
- 		A9A14E332244388700C080F3 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A14E322244388700C080F3 /* Metal.framework */; };
- 		A9B51BDD225E98BB00AC74D2 /* MVKOSExtensions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B51BDB225E98BB00AC74D2 /* MVKOSExtensions.mm */; };
- 		A9F042B21FB4D060009FCCB8 /* MVKCommonEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = A9F042AA1FB4D060009FCCB8 /* MVKCommonEnvironment.h */; };
-@@ -115,9 +106,6 @@
- 			isa = PBXFrameworksBuildPhase;
- 			buildActionMask = 2147483647;
- 			files = (
--				A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
--				A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
--				A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */,
- 			);
- 			runOnlyForDeploymentPostprocessing = 0;
- 		};
-@@ -134,9 +122,6 @@
- 			isa = PBXFrameworksBuildPhase;
- 			buildActionMask = 2147483647;
- 			files = (
--				A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
--				A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
--				A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */,
- 			);
- 			runOnlyForDeploymentPostprocessing = 0;
- 		};
-@@ -144,9 +129,6 @@
- 			isa = PBXFrameworksBuildPhase;
- 			buildActionMask = 2147483647;
- 			files = (
--				A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
--				A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
--				A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */,
- 			);
- 			runOnlyForDeploymentPostprocessing = 0;
- 		};
-@@ -313,7 +295,7 @@
- 				A925B71D1C78DEBF006E7ECD /* PBXTargetDependency */,
- 			);
- 			name = MoltenVKShaderConverter;
--			productName = MetalGLShaderConverterTool;
-+			productName = MoltenVKShaderConverter;
- 			productReference = A964BD5F1C57EFBD00D930D8 /* MoltenVKShaderConverter */;
- 			productType = "com.apple.product-type.tool";
- 		};
-@@ -349,7 +331,7 @@
- 			dependencies = (
- 			);
- 			name = "MoltenVKShaderConverter-macOS";
--			productName = "MetalGLShaderConverter-macOS";
-+			productName = MoltenVKShaderConverter;
- 			productReference = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */;
- 			productType = "com.apple.product-type.library.static";
- 		};
diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix
index c6ada1f55d5f..4e332e6fe557 100644
--- a/pkgs/os-specific/darwin/moltenvk/default.nix
+++ b/pkgs/os-specific/darwin/moltenvk/default.nix
@@ -1,26 +1,31 @@
-{ lib
-, overrideCC
-, stdenv
-, fetchFromGitHub
-, gitUpdater
-, cctools
-, sigtool
-, cereal
-, libcxx
-, glslang
-, spirv-cross
-, spirv-headers
-, spirv-tools
-, vulkan-headers
-, xcbuild
-, AppKit
-, Foundation
-, Libsystem
-, MacOSX-SDK
-, Metal
-, QuartzCore
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gitUpdater,
+  cereal,
+  libcxx,
+  glslang,
+  simd,
+  spirv-cross,
+  spirv-headers,
+  spirv-tools,
+  vulkan-headers,
+  xcbuild,
+  AppKit,
+  Foundation,
+  Metal,
+  QuartzCore,
+  # MoltenVK supports using private APIs to implement some Vulkan functionality.
+  # Applications that use private APIs can’t be distributed on the App Store,
+  # but that’s not really a concern for nixpkgs, so use them by default.
+  # See: https://github.com/KhronosGroup/MoltenVK/blob/main/README.md#metal_private_api
+  enablePrivateAPIUsage ? true,
 }:
 
+let
+  inherit (stdenv.hostPlatform) isStatic;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "MoltenVK";
   version = "1.2.7";
@@ -32,15 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
     QuartzCore
     cereal
     glslang
+    simd
     spirv-cross
     spirv-headers
     spirv-tools
     vulkan-headers
   ];
 
-  nativeBuildInputs = [ cctools sigtool xcbuild ];
+  nativeBuildInputs = [ xcbuild ];
 
-  outputs = [ "out" "bin" "dev" ];
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+  ];
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
@@ -49,106 +59,142 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-0+S/kueV+AEVt+oFnh4cgcDRVtEbUH1QiHFPhGhimCA=";
   };
 
-  patches = [
-    # Fix the Xcode projects to play nicely with `xcbuild`.
-    ./MoltenVKShaderConverter.xcodeproj.patch
-    ./MoltenVK.xcodeproj.patch
-  ];
-
   postPatch = ''
     # Move `mvkGitRevDerived.h` to a stable location
     substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \
       --replace-fail '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \
       --replace-fail '$(git rev-parse HEAD)' ${finalAttrs.src.rev}
-    # Use the SPIRV-Cross packaged in nixpkgs instead of one built specifically for MoltenVK.
-    substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \
-      --replace-fail SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross
+
+    # Modify MoltenVK Xcode projects to build with xcbuild and dependencies from nixpkgs.
+    for proj in MoltenVK MoltenVKShaderConverter; do
+      # Remove xcframework dependencies from the Xcode projects. The basic format is:
+      #     (children|files) = (
+      #         DCFD7F822A45BDA0007BBBF7 /* SPIRVCross.xcframework in Frameworks */,
+      #         etc
+      #     )
+      # This regex will only remove lines matching `xcframework` that are in these blocks
+      # to avoid accidentally corrupting the project.
+      sed -E -e '/(children|files) = /,/;/{/xcframework/d}' \
+        -i "$proj/$proj.xcodeproj/project.pbxproj"
+      # Ensure the namespace used is consistent with the spirv-cross package in nixpkgs.
+      substituteInPlace "$proj/$proj.xcodeproj/project.pbxproj" \
+        --replace-fail SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross
+    done
     substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \
-      --replace-fail SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross
-    # Adding all of `usr/include` from the SDK results in header conflicts with `libcxx.dev`.
-    # Work around it by symlinking just the SIMD stuff needed by MoltenVK.
+      --replace-fail MetalGLShaderConverterTool MoltenVKShaderConverter \
+      --replace-fail MetalGLShaderConverter-macOS MoltenVKShaderConverter
+
+    # Don’t try to build `xcframework`s because `xcbuild` can’t build them.
+    sed -e '/xcframework/d' -i Scripts/package_all.sh
+
+    # Remove vendored dependency links.
+    find . -lname '*/External/*' -delete
+
+    # The library will be linked in the install phase regardless of version,
+    # so truncate it if it exists to avoid link failures.
+    test -f Scripts/create_dylib.sh && truncate --size 0 Scripts/create_dylib.sh
+
+    # Link glslang source because MoltenVK needs non-public headers to build.
     mkdir -p build/include
-    ln -s "${MacOSX-SDK}/usr/include/simd" "build/include"
     ln -s "${glslang.src}" "build/include/glslang"
   '';
 
-  dontConfigure = true;
+  env.NIX_CFLAGS_COMPILE = toString (
+    [
+      "-isystem ${lib.getDev libcxx}/include/c++/v1"
+      "-I${lib.getDev spirv-cross}/include/spirv_cross"
+      "-I${lib.getDev spirv-headers}/include/spirv/unified1"
+    ]
+    ++ lib.optional enablePrivateAPIUsage "-DMVK_USE_METAL_PRIVATE_API=1"
+  );
 
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-isystem ${lib.getDev libcxx}/include/c++/v1"
-    "-I${lib.getDev spirv-cross}/include/spirv_cross"
-    "-I${lib.getDev spirv-headers}/include/spirv/unified1/"
+  env.NIX_LDFLAGS = toString [
+    "-lMachineIndependent"
+    "-lGenericCodeGen"
+    "-lglslang"
+    "-lOSDependent"
+    "-lSPIRV"
+    "-lSPIRV-Tools"
+    "-lSPIRV-Tools-opt"
+    "-lspirv-cross-msl"
+    "-lspirv-cross-core"
+    "-lspirv-cross-glsl"
+    "-lspirv-cross-reflect"
   ];
 
   buildPhase = ''
+    runHook preBuild
+
     NIX_CFLAGS_COMPILE+=" \
       -I$NIX_BUILD_TOP/$sourceRoot/build/include \
       -I$NIX_BUILD_TOP/$sourceRoot/Common"
-    NIX_LDFLAGS+=" -L$NIX_BUILD_TOP/$sourceRoot/build/lib"
 
-    # Build each project on its own because `xcbuild` fails to build `MoltenVKPackaging.xcodeproj`.
-    build=$NIX_BUILD_TOP/$sourceRoot/build
-    mkdir -p "$build/bin" "$build/lib"
-
-    NIX_LDFLAGS+=" \
-      -lMachineIndependent \
-      -lGenericCodeGen \
-      -lglslang \
-      -lOSDependent \
-      -lSPIRV \
-      -lSPIRV-Tools \
-      -lSPIRV-Tools-opt \
-      -lspirv-cross-msl \
-      -lspirv-cross-core \
-      -lspirv-cross-glsl"
-
-    pushd MoltenVKShaderConverter
     xcodebuild build \
+      SYMROOT=$PWD/Products OBJROOT=$PWD/Intermedates \
       -jobs $NIX_BUILD_CORES \
       -configuration Release \
-      -project MoltenVKShaderConverter.xcodeproj \
-      -scheme MoltenVKShaderConverter \
+      -project MoltenVKPackaging.xcodeproj \
+      -scheme 'MoltenVK Package (macOS only)' \
+      -destination generic/platform=macOS \
       -arch ${stdenv.hostPlatform.darwinArch}
-    declare -A products=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib )
-    for product in "''${!products[@]}"; do
-      cp MoltenVKShaderConverter-*/Build/Products/Release/$product "$build/''${products[$product]}/$product"
-    done
-    popd
 
-    NIX_LDFLAGS+=" \
-      -lobjc \
-      -lMoltenVKShaderConverter \
-      -lspirv-cross-reflect"
-
-    pushd MoltenVK
-    xcodebuild build \
-      -jobs $NIX_BUILD_CORES \
-      -configuration Release \
-      -project MoltenVK.xcodeproj \
-      -scheme MoltenVK-macOS \
-      -arch ${stdenv.hostPlatform.darwinArch}
-    cp MoltenVK-*/Build/Products/Release/dynamic/libMoltenVK.dylib "$build/lib/libMoltenVK.dylib"
-    popd
+    runHook postBuild
   '';
 
+  postBuild =
+    if isStatic then
+      ''
+        mkdir -p Package/Release/MoltenVK/static
+        cp Products/Release/libMoltenVK.a Package/Release/MoltenVK/static
+      ''
+    else
+      ''
+        # MoltenVK’s Xcode project builds the dylib, but it doesn’t seem to work with
+        # xcbuild. This is based on the script versions prior to 1.2.8 used.
+        mkdir -p Package/Release/MoltenVK/dynamic/dylib
+        clang++ -Wl,-all_load -Wl,-w \
+          -dynamiclib \
+          -compatibility_version 1.0.0 -current_version 1.0.0 \
+          -LProducts/Release \
+          -framework AppKit \
+          -framework CoreGraphics \
+          -framework Foundation \
+          -framework IOKit \
+          -framework IOSurface \
+          -framework Metal \
+          -framework QuartzCore \
+          -lobjc \
+          -lMoltenVKShaderConverter \
+          -lspirv-cross-reflect \
+          -install_name "$out/lib/libMoltenVK.dylib" \
+          -o Package/Release/MoltenVK/dynamic/dylib/libMoltenVK.dylib \
+          -force_load Products/Release/libMoltenVK.a
+      '';
+
   installPhase = ''
-    mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" "$dev/include/MoltenVK"
-    cp build/bin/MoltenVKShaderConverter "$bin/bin/"
-    cp build/lib/libMoltenVK.dylib "$out/lib/"
-    cp MoltenVK/MoltenVK/API/* "$dev/include/MoltenVK"
-    install -m644 MoltenVK/icd/MoltenVK_icd.json "$out/share/vulkan/icd.d/MoltenVK_icd.json"
-    substituteInPlace $out/share/vulkan/icd.d/MoltenVK_icd.json \
-      --replace-fail ./libMoltenVK.dylib "$out/lib/libMoltenVK.dylib"
-  '';
+    runHook preInstall
 
-  postFixup = ''
-    install_name_tool -id "$out/lib/libMoltenVK.dylib" "$out/lib/libMoltenVK.dylib"
-    codesign -s - -f "$out/lib/libMoltenVK.dylib"
-    codesign -s - -f "$bin/bin/MoltenVKShaderConverter"
+    libraryExtension=${if isStatic then ".a" else ".dylib"}
+    packagePath=${if isStatic then "static" else "dynamic/dylib"}
+
+    mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" "$dev"
+
+    cp Package/Release/MoltenVKShaderConverter/Tools/MoltenVKShaderConverter "$bin/bin"
+    cp -r Package/Release/MoltenVK/include "$dev"
+    cp Package/Release/MoltenVK/$packagePath/libMoltenVK$libraryExtension "$out/lib"
+
+    # Install ICD definition for use with vulkan-loader.
+    install -m644 MoltenVK/icd/MoltenVK_icd.json \
+      "$out/share/vulkan/icd.d/MoltenVK_icd.json"
+    substituteInPlace "$out/share/vulkan/icd.d/MoltenVK_icd.json" \
+      --replace-fail ./libMoltenVK.dylib "$out/lib/libMoltenVK.dylib"
+
+    runHook postInstall
   '';
 
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
+    ignoredVersions = ".*-(beta|rc).*";
   };
 
   meta = {
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 78ad4434f1c3..8fb08c90f70f 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -172,8 +172,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
 
   moltenvk = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/moltenvk {
     inherit (apple_sdk_11_0.frameworks) AppKit Foundation Metal QuartzCore;
-    inherit (apple_sdk_11_0) MacOSX-SDK Libsystem;
-    inherit (pkgs.darwin) cctools sigtool;
+    inherit (apple_sdk_11_0.libs) simd;
   };
 
   opencflite = callPackage ../os-specific/darwin/opencflite { };

From 07224e8649edbf81c147c4ab5fa5a324642d04a0 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Tue, 12 Mar 2024 18:20:25 -0700
Subject: [PATCH 101/118] perf_data_converter: init at unstable-2024-03-12

perf data converter is a utility program used by pprof to be able
to read linux perf.data files (and then display as tree,
flamegraph, ...).
---
 .../pe/perf_data_converter/package.nix        | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/pe/perf_data_converter/package.nix

diff --git a/pkgs/by-name/pe/perf_data_converter/package.nix b/pkgs/by-name/pe/perf_data_converter/package.nix
new file mode 100644
index 000000000000..18b6704877ec
--- /dev/null
+++ b/pkgs/by-name/pe/perf_data_converter/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  buildBazelPackage,
+  fetchFromGitHub,
+  fetchpatch,
+  bazel_6,
+  jdk,
+  elfutils,
+  libcap,
+}:
+
+buildBazelPackage rec {
+  pname = "perf_data_converter";
+  version = "0-unstable-2024-03-12";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "perf_data_converter";
+    rev = "e1cfe1e7e5d8cf3b728a166bf02d4227c82801eb";
+    hash = "sha256-Y3tBLH2jf1f28o6RK2inq9FulKc66qcqwKmxYdFC5tA=";
+  };
+
+  bazel = bazel_6;
+  bazelFlags = [
+    "--java_runtime_version=local_jdk"
+    "--tool_java_runtime_version=local_jdk"
+  ];
+
+  fetchAttrs = {
+    sha256 = "sha256-IauQ4zEn9YHppLgW+4XjPv4N5IZlEkp//tE/Dy7k28s=";
+  };
+
+  nativeBuildInputs = [ jdk ];
+
+  buildInputs = [
+    elfutils
+    libcap
+  ];
+
+  removeRulesCC = false;
+
+  bazelBuildFlags = [ "-c opt" ];
+  bazelTargets = [ "src:perf_to_profile" ];
+
+  bazelTestTargets = [ "src:all" ];
+
+  buildAttrs = {
+    installPhase = ''
+      runHook preInstall
+      install -Dm555 -t "$out/bin" bazel-bin/src/perf_to_profile
+      runHook postInstall
+    '';
+  };
+
+  meta = with lib; {
+    description = "Tool to convert Linux perf files to the profile.proto format used by pprof";
+    homepage = "https://github.com/google/perf_data_converter";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ hzeller ];
+    platforms = platforms.linux;
+  };
+}

From 09ea163a7ddc3efedefdf422a8e9c440a313d919 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Mar 2024 02:31:16 +0000
Subject: [PATCH 102/118] srm-cuarzo: 0.5.4-1 -> 0.5.5-1

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

diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix
index 8255ade26658..1f636e8aaeeb 100644
--- a/pkgs/by-name/sr/srm-cuarzo/package.nix
+++ b/pkgs/by-name/sr/srm-cuarzo/package.nix
@@ -14,9 +14,9 @@
 }:
 stdenv.mkDerivation (self: {
   pname = "srm-cuarzo";
-  version = "0.5.4-1";
+  version = "0.5.5-1";
   rev = "v${self.version}";
-  hash = "sha256-nmYMhX3XtyIyv6Kxi7s+ahkOHfnuLcjpwSU58HcPNeU=";
+  hash = "sha256-4aeKzvhfVmimz4Df7wnyZESAZa7RMjYUqbhFhqPJ59o=";
 
   src = fetchFromGitHub {
     inherit (self) rev hash;

From f83e5b297eec4ee1978849722688974fd1d360e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 17 Mar 2024 07:32:12 +0100
Subject: [PATCH 103/118] python312Packages.pysnmp-lextudio: 6.0.10 -> 6.0.11

Diff: https://github.com/lextudio/pysnmp/compare/refs/tags/v6.0.10...v6.0.11

Changelog: https://github.com/lextudio/pysnmp/blob/refs/tags/v6.0.11/CHANGES.txt
---
 .../python-modules/pysnmp-lextudio/default.nix            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pysnmp-lextudio/default.nix b/pkgs/development/python-modules/pysnmp-lextudio/default.nix
index 6bcbbc717100..ef50f244a430 100644
--- a/pkgs/development/python-modules/pysnmp-lextudio/default.nix
+++ b/pkgs/development/python-modules/pysnmp-lextudio/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pysnmp-lextudio";
-  version = "6.0.10";
+  version = "6.0.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lextudio";
     repo = "pysnmp";
-    rev = "v${version}";
-    hash = "sha256-zxv/+IhIAnnn6gTyulPCuKainUcGMwRqw6ktYXR+d4Q=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-h/FxiGjBZqO82omkVqz+fws398Iz1EkHbZPMYIzG+t0=";
   };
 
   nativeBuildInputs = [
@@ -57,6 +57,8 @@ buildPythonPackage rec {
     # pysnmp.smi.error.MibNotFoundError
     "test_send_v3_trap_notification"
     "test_addAsn1MibSource"
+    "test_v1_walk"
+    "test_v2_walk"
   ];
 
   pythonImportsCheck = [

From 164531fa14dc94c6d1f725a5ff0d7aefe1457691 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 17 Mar 2024 07:32:45 +0100
Subject: [PATCH 104/118] python312Packages.atenpdu: 0.6.1 -> 0.6.2

Changelog: https://github.com/mtdcr/pductl/releases/tag/0.6.2
---
 .../python-modules/atenpdu/default.nix        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix
index f29936d3174a..9397060d4a9c 100644
--- a/pkgs/development/python-modules/atenpdu/default.nix
+++ b/pkgs/development/python-modules/atenpdu/default.nix
@@ -2,28 +2,33 @@
 , buildPythonPackage
 , fetchPypi
 , async-timeout
-, pysnmplib
+, pysnmp-lextudio
 , pythonOlder
+, poetry-core
 }:
 
 buildPythonPackage rec {
   pname = "atenpdu";
-  version = "0.6.1";
-  format = "setuptools";
+  version = "0.6.2";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Of7tQJNqaLDgO8nie6rSd1saMbauXJBp8vWfXYAziEE=";
+    hash = "sha256-KzRoE4tE/tQkKYroq5PbWKREmEl8AwbIOg3IHRZZtsQ=";
   };
 
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
   propagatedBuildInputs = [
     async-timeout
-    pysnmplib
+    pysnmp-lextudio
   ];
 
-  # Project has no test
+  # Module has no test
   doCheck = false;
 
   pythonImportsCheck = [
@@ -33,6 +38,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python interface to control ATEN PE PDUs";
     homepage = "https://github.com/mtdcr/pductl";
+    changelog = "https://github.com/mtdcr/pductl/releases/tag/${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From a48ddbea868a7b51c10a0c7bcecb097113312c0e Mon Sep 17 00:00:00 2001
From: FidgetingBits <fidgetingbits@users.noreply.github.com>
Date: Sun, 17 Mar 2024 15:45:48 +0800
Subject: [PATCH 105/118] tree-sitter-grammars: add talon

---
 .../tools/parsing/tree-sitter/grammars/default.nix   |  1 +
 .../tree-sitter/grammars/tree-sitter-talon.json      | 12 ++++++++++++
 .../development/tools/parsing/tree-sitter/update.nix |  4 ++++
 3 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index 1544e737c0b9..c2c5c2a6e371 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -91,6 +91,7 @@
   tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json;
   tree-sitter-surface = lib.importJSON ./tree-sitter-surface.json;
   tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json;
+  tree-sitter-talon = lib.importJSON ./tree-sitter-talon.json;
   tree-sitter-templ = lib.importJSON ./tree-sitter-templ.json;
   tree-sitter-tiger = lib.importJSON ./tree-sitter-tiger.json;
   tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
new file mode 100644
index 000000000000..baa13c0a37dc
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
@@ -0,0 +1,12 @@
+{
+  "url": "https://github.com/wenkokke/tree-sitter-talon",
+  "rev": "dafc9fabf7acc1a46d51cce379cec00c07661aa7",
+  "date": "2023-11-05T13:07:41+00:00",
+  "path": "/nix/store/df67djinw8sjwf6lbfv6gdckxckv0y65-tree-sitter-talon",
+  "sha256": "1clmmb3pgvc54fsp83f2jmz6n21pmmjkb15yk9bfqlkzdm12sirw",
+  "hash": "sha256-PEctQm1/UuxWmr6ENWWtNwhrfpXCDXS1I4Xtd8eqlbI=",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index aad4a6c9a029..68f5a1dfa66b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -157,6 +157,10 @@ let
       repo = "tree-sitter-sql";
       branch = "gh-pages";
     };
+    "tree-sitter-talon" = {
+      orga = "wenkokke";
+      repo = "tree-sitter-talon";
+    };
     "tree-sitter-typst" = {
       orga = "uben0";
       repo = "tree-sitter-typst";

From 986bd442b96e3b84eb05c2d6a60cab5144517ea4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Mar 2024 01:03:13 +0000
Subject: [PATCH 106/118] mu: 1.12.1 -> 1.12.2

---
 pkgs/tools/networking/mu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index f94e83552130..c4c112e9415b 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   pname = "mu";
-  version = "1.12.1";
+  version = "1.12.2";
 
   outputs = [ "out" "mu4e" ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     owner = "djcb";
     repo = "mu";
     rev = "v${version}";
-    hash = "sha256-JnKvMbgkaZ1MO7cZMb2PGZsNMjV1M+dnaDpsBDsT0L4=";
+    hash = "sha256-ab5nTB7mp9zB53JsPS2aPhbnW4O+56+cWunqTVENMPA=";
   };
 
   postPatch = ''

From 33d82ac2b55434287152b16c78c2e27e9c3042e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 17 Mar 2024 10:33:53 +0100
Subject: [PATCH 107/118] Revert "python3Packages.cffsubr: 0.2.9.post1 ->
 0.3.0"

This reverts commit 46822d90e8266ece0ef9b3d9b9b7f3ec059a08b9.
It didn't build after the update.  Perhaps next time.
---
 pkgs/development/python-modules/cffsubr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix
index d82f3ff012c1..e86277cf2782 100644
--- a/pkgs/development/python-modules/cffsubr/default.nix
+++ b/pkgs/development/python-modules/cffsubr/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "cffsubr";
-  version = "0.3.0";
+  version = "0.2.9.post1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-d0UVC9uBZ5+s3RHB87hwlsT029SVfo/Ou4jEVoeVLvs=";
+    hash = "sha256-azFBLc9JyPqEZkvahn4u3cVbb+b6aW/yU8TxOp/y/Fw=";
   };
 
   patches = [

From f4bc21c1fdd589985cc311d746bf9f1f608e671a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 17 Mar 2024 10:41:27 +0100
Subject: [PATCH 108/118] pipx: add missing dependency

One test is failing, but this still felt worth committing.
---
 pkgs/development/python-modules/pipx/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix
index 8a8e8dc86ce9..a41df0a59285 100644
--- a/pkgs/development/python-modules/pipx/default.nix
+++ b/pkgs/development/python-modules/pipx/default.nix
@@ -3,6 +3,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , hatchling
+, hatch-vcs
 , importlib-metadata
 , packaging
 , pip
@@ -29,6 +30,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     hatchling
+    hatch-vcs
   ];
 
   propagatedBuildInputs = [

From d0f89e785eda20709acdc468d42dc4d95d25ae36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 17 Mar 2024 02:48:14 -0700
Subject: [PATCH 109/118] klipper: unstable-2024-02-17 -> unstable-2024-03-15
 (#296574)

---
 pkgs/servers/klipper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index e1d15d55722c..15b4c9351f30 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "klipper";
-  version = "unstable-2024-02-17";
+  version = "unstable-2024-03-15";
 
   src = fetchFromGitHub {
     owner = "KevinOConnor";
     repo = "klipper";
-    rev = "28f06a104bc0cfe3a7d36db343ade5a805b3e132";
-    sha256 = "sha256-v2nv4g3dQTMbUKIrEJo8s66WRWXnSkWO8K+12fK/cZw=";
+    rev = "bfb71bc2dc63f2911a11ebf580f82b1e8b2706c4";
+    sha256 = "sha256-djF1IOcMCBcsmVV0hgn6QMwDVClxSSithgiRvss9KQc=";
   };
 
   sourceRoot = "${src.name}/klippy";

From 47d58b92dd0f2a1064238fa1e9cc9673a9501b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 17 Mar 2024 10:51:14 +0100
Subject: [PATCH 110/118] cloudflared: base the build expression on go_1_21

It uses some custom fixed source for go.
https://hydra.nixos.org/build/253007930/nixlog/2/tail
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index def6aeb05157..e22f39efa910 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4662,7 +4662,7 @@ with pkgs;
   cloudflared = callPackage ../applications/networking/cloudflared {
     # https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250
     buildGoModule = buildGoModule.override {
-      go = go.overrideAttrs {
+      go = go_1_21.overrideAttrs {
         pname = "cloudflare-go";
         version = "0-unstable-2023-12-06";
         src = fetchFromGitHub {

From 5f30f84648bac2fbcf523c01b37c7a5281f5b143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 17 Mar 2024 10:53:22 +0100
Subject: [PATCH 111/118] Revert "python3Packages.rq: 1.15.1 -> 1.16"

This reverts commit 523357aff05f0a5297d1904009a1056ac9ef62ab.
It didn't build after the update.  Perhaps next time.
---
 pkgs/development/python-modules/rq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index 2c173f1da23e..b8e19d46f790 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "rq";
-  version = "1.16";
+  version = "1.15.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "rq";
     repo = "rq";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2jseFyq4BpVLc7t1Y/O8olC6IM5A4VEI8Fkrb94dyn8=";
+    hash = "sha256-cymNXFI+6YEVw2Pc7u6+vroC0428oW7BTLxyBgPqLng=";
   };
 
   propagatedBuildInputs = [

From 162f9b041655e9917b177ff55ffc0f67980c05db Mon Sep 17 00:00:00 2001
From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com>
Date: Sun, 17 Mar 2024 07:19:03 +0100
Subject: [PATCH 112/118] maintainers: add friedrichaltheide

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 53ae8880787d..07f5874226e4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6653,6 +6653,11 @@
     githubId = 46672819;
     name = "Frido Friedemann";
   };
+  friedrichaltheide = {
+    github = "friedrichaltheide";
+    githubId = 11352905;
+    name = "Friedrich Altheide";
+  };
   frlan = {
     email = "frank@frank.uvena.de";
     github = "frlan";

From 37766ba31091c0331d13592bf6ed8e48fe030e77 Mon Sep 17 00:00:00 2001
From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com>
Date: Sun, 17 Mar 2024 07:19:38 +0100
Subject: [PATCH 113/118] virtualbox: add friedrichaltheide to maintainers

---
 pkgs/applications/virtualization/virtualbox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index f226a32596d3..df2094c3b1fc 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -281,7 +281,7 @@ in stdenv.mkDerivation {
     ];
     license = licenses.gpl2;
     homepage = "https://www.virtualbox.org/";
-    maintainers = with maintainers; [ sander ];
+    maintainers = with maintainers; [ sander friedrichaltheide ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "VirtualBox";
   };

From c19f63e984c63e8ed97d3fa6d6495905dc50968a Mon Sep 17 00:00:00 2001
From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com>
Date: Sun, 17 Mar 2024 07:20:41 +0100
Subject: [PATCH 114/118] virtualboxExtpack: add friedrichaltheide to
 maintainers

---
 pkgs/applications/virtualization/virtualbox/extpack.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 1831d42a129e..fad5aa6e10fb 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -19,7 +19,7 @@ fetchurl rec {
     description = "Oracle Extension pack for VirtualBox";
     license = licenses.virtualbox-puel;
     homepage = "https://www.virtualbox.org/";
-    maintainers = with maintainers; [ sander ];
+    maintainers = with maintainers; [ sander friedrichaltheide ];
     platforms = [ "x86_64-linux" ];
   };
 }

From b7386abb63c8f31326153570364a34b8e708c882 Mon Sep 17 00:00:00 2001
From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com>
Date: Sun, 17 Mar 2024 07:21:00 +0100
Subject: [PATCH 115/118] virtualboxGuestAdditions: add friedrichaltheide to
 maintainers

---
 .../virtualization/virtualbox/guest-additions/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 4f0868730c19..a1c2c8d09e24 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -146,7 +146,7 @@ in stdenv.mkDerivation rec {
     '';
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = "GPL";
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ];
     platforms = [ "i686-linux" "x86_64-linux" ];
     broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10");
   };

From 1f45a867b7fb59f19758272a89b0f4536af60a62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Mar 2024 10:05:14 +0000
Subject: [PATCH 116/118] python311Packages.litellm: 1.31.14 -> 1.32.1

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

diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix
index f0358d979103..4c24fd9b1e05 100644
--- a/pkgs/development/python-modules/litellm/default.nix
+++ b/pkgs/development/python-modules/litellm/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "litellm";
-  version = "1.31.14";
+  version = "1.32.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "BerriAI";
     repo = "litellm";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/K8LhKr7TpOPk1CMqNoFJCF+C0N6A8pDkBmS6JZ0sb0=";
+    hash = "sha256-qIEAtgfzTiUK+HzsocIH3L7z0Wfah3C4GByaA89wvso=";
   };
 
   postPatch = ''

From 6d5111a77f6193c1ac295424a1af217c6843f592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 17 Mar 2024 11:12:02 +0100
Subject: [PATCH 117/118] Revert "python3Packages.rich-pixels: 2.2.0 -> 3.0.0"

This reverts commit 65dc0c2a24f9fee7382bff11656e7f14e31d1a3a.
It didn't build after the update.  Perhaps next time.
---
 pkgs/development/python-modules/rich-pixels/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/rich-pixels/default.nix b/pkgs/development/python-modules/rich-pixels/default.nix
index 8b97f1320c49..7b77e59b6c9f 100644
--- a/pkgs/development/python-modules/rich-pixels/default.nix
+++ b/pkgs/development/python-modules/rich-pixels/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "rich-pixels";
-  version = "3.0.0";
+  version = "2.2.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "darrenburns";
     repo = "rich-pixels";
-    rev = "refs/tags/${version}";
-    hash = "sha256-73CEtK/p4JVOtJgP7CNyee9vEJXaxaAj/kHjWIGETeQ=";
+    rev = version;
+    hash = "sha256-fbpnHEfBPWLSYhgETqKbdmmzt7Lu/4oKgetjgNvv04c=";
   };
 
   patches = [

From 1453c5df1862ec27a27400bdb85b6e6045998fe3 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Sun, 17 Mar 2024 11:11:15 +0100
Subject: [PATCH 118/118] nix-zsh-completions: Add sebtm (repo-maintainer) as
 maintainer

(cherry picked from commit a3f990a0e617b40090d0e58a88e1d41b00730af4)
---
 pkgs/shells/zsh/nix-zsh-completions/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 32565af35be9..70d9f2970bc6 100644
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     description = "ZSH completions for Nix, NixOS, and NixOps";
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ olejorgenb hedning ma27 ];
+    maintainers = with maintainers; [ olejorgenb hedning ma27 sebtm ];
   };
 }