From 831f9b6052383685fb2ab536b10b021405742d9d Mon Sep 17 00:00:00 2001
From: Mathias Sven <mathiassven2@hotmail.com>
Date: Tue, 28 May 2024 18:32:38 +0100
Subject: [PATCH 01/42] languagetool: fix description on allowOrigin option

---
 nixos/modules/services/misc/languagetool.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/languagetool.nix b/nixos/modules/services/misc/languagetool.nix
index ba563dace473..c7c9eef88c2d 100644
--- a/nixos/modules/services/misc/languagetool.nix
+++ b/nixos/modules/services/misc/languagetool.nix
@@ -27,7 +27,7 @@ in {
       description = ''
         Set the Access-Control-Allow-Origin header in the HTTP response,
         used for direct (non-proxy) JavaScript-based access from browsers.
-        `null` to allow access from all sites.
+        `"*"` to allow access from all sites.
       '';
     };
 

From 2a8f33535502cf5918a6636030a8d9ea17b311cd Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Sun, 22 Sep 2024 23:09:55 +0200
Subject: [PATCH 02/42] nixos/postfix: add missing mkDefault for smtpd tls
 config

---
 nixos/modules/services/mail/postfix.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 244ce49ee63b..f842a219910d 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -853,7 +853,8 @@ in
         smtpd_tls_cert_file = cfg.sslCert;
         smtpd_tls_key_file = cfg.sslKey;
 
-        smtpd_tls_security_level = "may";
+        smtpd_tls_security_level = lib.mkDefault "may";
+
       };
 
       services.postfix.masterConfig = {

From 65664d6ba2909eb5a6d3ee260d659b89cccf73e6 Mon Sep 17 00:00:00 2001
From: Enno Richter <enno@nerdworks.de>
Date: Sat, 5 Oct 2024 11:50:55 +0200
Subject: [PATCH 03/42] nixos/gotenberg: fix service config for chromium

---
 nixos/modules/services/misc/gotenberg.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/gotenberg.nix b/nixos/modules/services/misc/gotenberg.nix
index ed8629a7fa46..e92e11b50c71 100644
--- a/nixos/modules/services/misc/gotenberg.nix
+++ b/nixos/modules/services/misc/gotenberg.nix
@@ -228,7 +228,6 @@ in
         ProtectKernelModules = true;
         ProtectKernelTunables = true;
         ProtectProc = "invisible";
-        ProcSubset = "pid";
 
         RestrictAddressFamilies = [
           "AF_UNIX"
@@ -240,11 +239,10 @@ in
         RestrictRealtime = true;
 
         LockPersonality = true;
-        MemoryDenyWriteExecute = true;
 
         SystemCallFilter = [
+          "@sandbox"
           "@system-service"
-          "~@privileged"
         ];
         SystemCallArchitectures = "native";
 

From 4fe3724ce401441e991f63a163e53f3b64883266 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Wed, 16 Oct 2024 16:36:07 +0200
Subject: [PATCH 04/42] joypixels: Reflect redistributability in the license

---
 pkgs/data/fonts/joypixels/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix
index 29e4eb118888..5e999f88dbea 100644
--- a/pkgs/data/fonts/joypixels/default.nix
+++ b/pkgs/data/fonts/joypixels/default.nix
@@ -104,6 +104,7 @@ stdenv.mkDerivation rec {
         url = free-license.url;
         appendixUrl = appendix.url;
         free = false;
+        redistributable = true;
       };
     maintainers = with maintainers; [ toonn jtojnar ];
     # Not quite accurate since it's a font, not a program, but clearly

From 2610a20422b56ef4aaadad4d0d121cefb0d13d49 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Wed, 16 Oct 2024 16:36:45 +0200
Subject: [PATCH 05/42] joypixels: 8.0.0 -> 9.0.0

Resolves #348645
---
 pkgs/data/fonts/joypixels/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix
index 5e999f88dbea..4cbf704bb86f 100644
--- a/pkgs/data/fonts/joypixels/default.nix
+++ b/pkgs/data/fonts/joypixels/default.nix
@@ -63,15 +63,15 @@ in
 
 stdenv.mkDerivation rec {
   pname = "joypixels";
-  version = "8.0.0";
+  version = "9.0.0";
 
   src = assert !acceptLicense -> throwLicense;
     with systemSpecific; fetchurl {
       name = fontFile;
       url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}";
       sha256 = {
-        darwin = "0kj4nck6k91avhan9iy3n8hhk47xr44rd1lzljjx3w2yzw1w9zvv";
-      }.${kernel.name} or "1bkyclgmvl6ppbdvidc5xr1g6f215slf0glnh5p6fsfbxc5h95bw";
+        darwin = "sha256-muUxXzz8BePyPsiZocYvM0ebM1H+u84ysN5YUvsMLiU=";
+      }.${kernel.name} or "sha256-pmGsVgYSK/c5OlhOXhNlRBs/XppMXmsHcZeSmIkuED4=";
     };
 
   dontUnpack = true;
@@ -87,8 +87,8 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Finest emoji you can use legally (formerly EmojiOne)";
     longDescription = ''
-      Updated for 2023! JoyPixels 8.0 includes 3,702 originally crafted icon
-      designs and is 100% Unicode 15.0 compatible. We offer the largest
+      Updated for 2024! JoyPixels 9.0 includes 3,820 originally crafted icon
+      designs and is 100% Unicode 15.1 compatible. We offer the largest
       selection of files ranging from png, svg, iconjar, and fonts (sprites
       available upon request).
     '';

From 563987104e9ce0088f140360edd02458b2266688 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat, 9 Nov 2024 12:00:00 +0000
Subject: [PATCH 06/42] linux config: enable cp15 barrier emulation on aarch64

this fixes the native armv7l build of nodejs on aarch64 remote builders
---
 pkgs/os-specific/linux/kernel/common-config.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 54a9753b5fa1..34eeb745ff36 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1297,6 +1297,13 @@ let
       #  differently when run under aarch64 kernels compared to when
       #  it is run under an aarch32 kernel.
       COMPAT_ALIGNMENT_FIXUPS = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "6.1" yes);
+
+      # requirement for CP15_BARRIER_EMULATION
+      ARMV8_DEPRECATED = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") yes;
+      # emulate a specific armv7 instruction that was removed from armv8
+      # this instruction is required to build a native armv7 nodejs on an
+      # aarch64-linux builder, for example
+      CP15_BARRIER_EMULATION  = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") yes;
     } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
       # Required for various hardware features on Chrome OS devices
       CHROME_PLATFORMS = yes;

From fc3871aa8ad6d9dbfff9bc3be5c131576e0fe8e5 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu, 10 Oct 2024 21:08:20 +0200
Subject: [PATCH 07/42] linux/common-config: enable support for crashkernel
 dumps

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/os-specific/linux/kernel/common-config.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 0676294533a8..5cc96ec5fdc4 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -45,8 +45,8 @@ let
   options = {
 
     debug = {
-      # Necessary for BTF
-      DEBUG_INFO                = whenOlder "5.18" yes;
+      # Necessary for BTF and crashkernel
+      DEBUG_INFO                = yes;
       DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes;
       # Reduced debug info conflict with BTF and have been enabled in
       # aarch64 defconfig since 5.13
@@ -64,7 +64,7 @@ let
       RCU_TORTURE_TEST          = no;
       SCHEDSTATS                = yes;
       DETECT_HUNG_TASK          = yes;
-      CRASH_DUMP                = option no;
+      CRASH_DUMP                = yes;
       # Easier debugging of NFS issues.
       SUNRPC_DEBUG              = yes;
       # Provide access to tunables like sched_migration_cost_ns
@@ -85,6 +85,9 @@ let
 
       # Export known printks in debugfs
       PRINTK_INDEX              = whenAtLeast "5.15" yes;
+
+      # Enable crashkernel support
+      PROC_VMCORE               = yes;
     };
 
     power-management = {

From d8b5f031dc448652ae800a7aa10bfd1313ffa0cc Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu, 10 Oct 2024 21:08:36 +0200
Subject: [PATCH 08/42] nixos/crashdump: remove redundant kernel patch

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 nixos/modules/misc/crashdump.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix
index b0f75d9caaa3..b2464e57d3a0 100644
--- a/nixos/modules/misc/crashdump.nix
+++ b/nixos/modules/misc/crashdump.nix
@@ -60,17 +60,6 @@ in
        "nmi_watchdog=panic"
        "softlockup_panic=1"
       ];
-      kernelPatches = [ {
-        name = "crashdump-config";
-        patch = null;
-        extraConfig = ''
-                CRASH_DUMP y
-                DEBUG_INFO y
-                PROC_VMCORE y
-                LOCKUP_DETECTOR y
-                HARDLOCKUP_DETECTOR y
-              '';
-        } ];
     };
   };
 }

From bff1ad19f9dd6094aadbd3ec9a2e8b546ae6a58b Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 4 Dec 2024 16:49:53 +0800
Subject: [PATCH 09/42] green-pdfviewer: remove

---
 .../misc/green-pdfviewer/default.nix          | 39 -------------
 .../misc/green-pdfviewer/gdk-libs.patch       | 55 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 --
 4 files changed, 1 insertion(+), 98 deletions(-)
 delete mode 100644 pkgs/applications/misc/green-pdfviewer/default.nix
 delete mode 100644 pkgs/applications/misc/green-pdfviewer/gdk-libs.patch

diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
deleted file mode 100644
index 9c3c8c95872e..000000000000
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, poppler, pkg-config, gdk-pixbuf, SDL, gtk2 }:
-
-stdenv.mkDerivation {
-  pname = "green-pdfviewer";
-  version = "nightly-2014-04-22";
-
-  src = fetchFromGitHub {
-    owner = "schandinat";
-    repo = "green";
-    rev = "0b516aec17915d9742d8e505d2ed383a3bdcea61";
-    sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ poppler gdk-pixbuf SDL gtk2 ];
-
-  patches = [
-    ./gdk-libs.patch
-  ];
-
-  buildPhase = ''
-    make PREFIX=$out
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/man1
-    make install PREFIX=$out MANDIR=$out/share
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/schandinat/green/";
-    description = "Viewer for PDF files, uses SDL and libpoppler";
-
-    platforms = platforms.unix;
-    license  = licenses.gpl3;
-    maintainers = [ ];
-    mainProgram = "green";
-  };
-}
diff --git a/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch b/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch
deleted file mode 100644
index cfcab32aac99..000000000000
--- a/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Common subdirectories: green.old/debian and green.new/debian
-diff -u green.old/green.h green.new/green.h
---- green.old/green.h	2016-06-12 18:11:56.779434416 -0700
-+++ green.new/green.h	2016-06-12 18:14:38.830557379 -0700
-@@ -19,7 +19,14 @@
- 
- 
- #include <stdbool.h>
--#include "glib/poppler.h"
-+#include "poppler.h"
-+#include "gdk-pixbuf/gdk-pixbuf.h"
-+#include "gdk-pixbuf/gdk-pixbuf-core.h"
-+#include "gdk-pixbuf/gdk-pixbuf-features.h"
-+#include "gdk-pixbuf/gdk-pixbuf-enum-types.h"
-+ 
-+ #define GREEN_FULLSCREEN	0x0001
-+ 
- 
- 
- #define GREEN_FULLSCREEN	0x0001
-diff -u green.old/Makefile green.new/Makefile
---- green.old/Makefile	2016-06-12 18:11:56.779434416 -0700
-+++ green.new/Makefile	2016-06-12 18:13:09.591974048 -0700
-@@ -17,6 +17,12 @@
- SDL_CFLAGS	:=	$$(sdl-config --cflags)
- SDL_LIBS	:=	$$(sdl-config --libs)
- 
-+GDKPIXBUF_CFLAGS	:=	$$(pkg-config gdk-pixbuf-2.0 --cflags)
-+GDKPIXBUF_LIBS	:=	$$(pkg-config gdk-pixbuf-2.0 --libs)
-+
-+GTK_CFLAGS	:=	$$(pkg-config gtk+-2.0 --cflags)
-+GTK_LIBS	:=	$$(pkg-config gtk+-2.0 --libs)
-+
- 
- all: green
- 
-@@ -28,13 +34,14 @@
- 	$(INSTALL) green.1 $(MANDIR)/man1/
- 
- green: main.o green.o sdl.o
--	$(CC) $^ $(POPPLER_LIBS) $(SDL_LIBS) -o $@
-+	$(CC) $^ $(POPPLER_LIBS) $(SDL_LIBS) $(GDKPIXBUF_LIBS) $(GTK_LIBS) -o $@
- 
- main.o: main.c green.h
--	$(CC) $(CONFIG) $(CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@
-+	$(CC) $(CONFIG) $(CFLAGS) $(GDKPIXBUF_CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@
- 
- green.o: green.c green.h
--	$(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@
-+	$(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS)  $(GDKPIXBUF_CFLAGS) -o $@
- 
- sdl.o: sdl.c green.h
--	$(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) $(SDL_CFLAGS) -o $@
-+	$(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) $(SDL_CFLAGS) $(GDKPIXBUF_CFLAGS) $(GTK_CFLAGS) -o $@
-+
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 35dc2bf8a77a..34cb053b14af 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -512,6 +512,7 @@ mapAliases {
   graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
   graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
   graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15
+  green-pdfviewer = throw "'green-pdfviewer' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   gringo = clingo; # added 2022-11-27
   grub2_full = grub2; # Added 2022-11-18
   gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb7d56216dbf..0c1b1d50a1a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1860,10 +1860,6 @@ with pkgs;
 
   grc = python3Packages.callPackage ../tools/misc/grc { };
 
-  green-pdfviewer = callPackage ../applications/misc/green-pdfviewer {
-    SDL = SDL_sixel;
-  };
-
   gremlin-console = callPackage ../applications/misc/gremlin-console {
     openjdk = openjdk11;
   };

From ad50609fbc7ae7106aad2c372479225a23f77df9 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 4 Dec 2024 16:53:22 +0800
Subject: [PATCH 10/42] crack_attack: remove

https://cdimage.debian.org/mirror/gnu.org/savannah/crack-attack near 20
years.
---
 .../crack-attack-1.1.14-gcc43.patch           | 10 -----
 .../crack-attack-1.1.14-glut.patch            | 10 -----
 pkgs/by-name/cr/crack_attack/package.nix      | 37 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 4 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch
 delete mode 100644 pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch
 delete mode 100644 pkgs/by-name/cr/crack_attack/package.nix

diff --git a/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch b/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch
deleted file mode 100644
index fb2910d128ee..000000000000
--- a/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- crack-attack-1.1.14/src/Game.h
-+++ crack-attack-1.1.14/src/Game.h
-@@ -34,6 +34,7 @@
- #include <climits>
- #include <cstdlib>
- #include <cmath>
-+#include <cstring>
- 
- #ifdef __MINGW32__
- #  include <windows.h>
diff --git a/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch b/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch
deleted file mode 100644
index 4daea4c53a28..000000000000
--- a/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- crack-attack-1.1.14/src/Attack.cxx
-+++ crack-attack-1.1.14/src/Attack.cxx
-@@ -83,6 +83,7 @@
-   int height = -1, width = -1;
-   
-   player_name[0] = '\0';
-+  glutInit(&argc, argv);
-   parseCommandLine(argc, argv, mode, port, host_name, player_name, height, width);
-   run_crack_attack(mode, port, host_name, player_name, height, width);
- 
diff --git a/pkgs/by-name/cr/crack_attack/package.nix b/pkgs/by-name/cr/crack_attack/package.nix
deleted file mode 100644
index d3d347066462..000000000000
--- a/pkgs/by-name/cr/crack_attack/package.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk2, libglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }:
-
-stdenv.mkDerivation rec {
-  pname = "crack-attack";
-  version = "1.1.14";
-
-  src = fetchurl {
-    url = "mirror://savannah/crack-attack/crack-attack-${version}.tar.gz";
-    sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm";
-  };
-
-  patches = [
-    ./crack-attack-1.1.14-gcc43.patch
-    ./crack-attack-1.1.14-glut.patch
-  ];
-
-  configureFlags = [
-    "--enable-sound=yes"
-    "--prefix=${placeholder "out"}"
-    "--datadir=${placeholder "out"}/share"
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gtk2 libglut SDL SDL_mixer libGLU libGL libXi libXmu ];
-
-  hardeningDisable = [ "format" ];
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!";
-    mainProgram = "crack-attack";
-    homepage = "https://www.nongnu.org/crack-attack/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 34cb053b14af..4893b277d2fc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -239,6 +239,7 @@ mapAliases {
   inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17
   concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17
   containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09
+  crack_attack = throw "'crack_attack' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11
   critcl = tclPackages.critcl; # Added 2024-10-02
   cudaPackages_10_0 = throw "CUDA 10.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20

From 97da68eef5631b1fd383f6f71ebb5f1b63523ebd Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 4 Dec 2024 16:56:03 +0800
Subject: [PATCH 11/42] gtk-engine-bluecurve: remove

---
 .../gt/gtk-engine-bluecurve/package.nix       | 22 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 pkgs/by-name/gt/gtk-engine-bluecurve/package.nix

diff --git a/pkgs/by-name/gt/gtk-engine-bluecurve/package.nix b/pkgs/by-name/gt/gtk-engine-bluecurve/package.nix
deleted file mode 100644
index 43cf8675735f..000000000000
--- a/pkgs/by-name/gt/gtk-engine-bluecurve/package.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }:
-
-stdenv.mkDerivation rec {
-  pname = "gtk-engine-bluecurve";
-  version = "1.0";
-
-  src = fetchurl {
-    url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-${version}.tar.bz2";
-    sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm";
-  };
-
-  nativeBuildInputs = [ pkg-config intltool ];
-
-  buildInputs = [ gtk2 ];
-
-  meta = {
-    description = "Original Bluecurve engine from Red Hat's artwork package";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4893b277d2fc..a11a53667b01 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -517,6 +517,7 @@ mapAliases {
   gringo = clingo; # added 2022-11-27
   grub2_full = grub2; # Added 2022-11-18
   gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
+  gtk-engine-bluecurve = "'gtk-engine-bluecurve' has been removed as it has been archived upstream."; # Added 2024-12-04
   gtk2fontsel = throw "'gtk2fontsel' has been removed due to lack of maintenance upstream. GTK now has a built-in font chooser so it's no longer needed for newer apps"; # Added 2024-10-19
   gtkcord4 = dissent; # Added 2024-03-10
   gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14

From 2afe5ab32998116d365cade7e1b65eb597c49805 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 4 Dec 2024 17:02:17 +0800
Subject: [PATCH 12/42] libmx: remove

---
 pkgs/by-name/li/libmx/package.nix | 64 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 pkgs/by-name/li/libmx/package.nix

diff --git a/pkgs/by-name/li/libmx/package.nix b/pkgs/by-name/li/libmx/package.nix
deleted file mode 100644
index 643c671f7792..000000000000
--- a/pkgs/by-name/li/libmx/package.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, libtool, pkg-config, automake, autoconf, intltool
-, gobject-introspection, gtk2, gtk-doc
-, clutter, clutter-gtk
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libmx";
-  version = "1.4.7";
-
-  src = fetchFromGitHub {
-    owner = "clutter-project";
-    repo = "mx";
-    rev = version;
-    sha256 = "sha256-+heIPSkg3d22xsU48UOTJ9FPLXC7zLivcnabQOM9aEk=";
-  };
-
-  # remove the following superfluous checks
-  preConfigure = ''
-    substituteInPlace "autogen.sh" \
-      --replace '`which intltoolize`' '"x"' \
-      --replace '`which gtkdocize`' '"x"' \
-      --replace '`which autoreconf`' '"x"'
-  '';
-
-  configureFlags = [ "--enable-introspection"
-                     "--without-startup-notification"
-                     "--without-dbus"
-                     "--without-glade"
-                     "--without-clutter-imcontext"
-                     "--without-clutter-gesture"
-                   ];
-
-  configureScript = "sh autogen.sh";
-
-  nativeBuildInputs = [ pkg-config automake autoconf intltool gobject-introspection ];
-  buildInputs = [
-    libtool
-    gtk2 gtk-doc clutter clutter-gtk
-  ];
-
-  # patch to resolve GL errors
-  # source : https://github.com/clutter-project/mx/pull/62
-  preBuild = ''
-    sed -i 's/GLushort/gushort/g' mx/mx-deform-texture.c
-    sed -i 's/GLfloat/gfloat/g' mx/mx-texture-frame.c
-  '';
-
-  meta = with lib; {
-    homepage = "http://www.clutter-project.org/";
-    description = "Clutter-based toolkit";
-    mainProgram = "mx-create-image-cache";
-    longDescription = ''
-      Mx is a widget toolkit using Clutter that provides a set of standard
-      interface elements, including buttons, progress bars, scroll bars and
-      others. It also implements some standard managers. One other interesting
-      feature is the possibility setting style properties from a CSS format
-      file.
-    '';
-    license = licenses.lgpl21;
-    maintainers = [ ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a11a53667b01..f0a31c36a0d6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -644,6 +644,7 @@ mapAliases {
   libixp_hg = libixp;
   libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17
   liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17
+  libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14
   libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02
   libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20

From 315788b4cbcba7cee4e9d5cb97c543b3b0866d0c Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 4 Dec 2024 17:03:15 +0800
Subject: [PATCH 13/42] volnoti: remove

---
 pkgs/by-name/vo/volnoti/package.nix | 38 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/vo/volnoti/package.nix

diff --git a/pkgs/by-name/vo/volnoti/package.nix b/pkgs/by-name/vo/volnoti/package.nix
deleted file mode 100644
index 560b9cce3fd4..000000000000
--- a/pkgs/by-name/vo/volnoti/package.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch
-, pkg-config, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg
-, dbus-glib, autoreconfHook, wrapGAppsHook3 }:
-
-stdenv.mkDerivation {
-  pname = "volnoti-unstable";
-  version = "2013-09-23";
-
-  src = fetchFromGitHub {
-    owner = "davidbrazdil";
-    repo = "volnoti";
-    rev = "4af7c8e54ecc499097121909f02ecb42a8a60d24";
-    sha256 = "155lb7w563dkdkdn4752hl0zjhgnq3j4cvs9z98nb25k1xpmpki7";
-  };
-
-  patches = [
-    # Fix dbus interface headers. See
-    # https://github.com/davidbrazdil/volnoti/pull/10
-    (fetchpatch {
-      url = "https://github.com/davidbrazdil/volnoti/commit/623ad8ea5c3ac8720d00a2ced4b6163aae38c119.patch";
-      sha256 = "046zfdjmvhb7jrsgh04vfgi35sgy1zkrhd3bzdby3nvds1wslfam";
-    })
-  ];
-
-  nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 ];
-
-  buildInputs = [
-    dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg
-  ];
-
-  meta = with lib; {
-    description = "Lightweight volume notification for Linux";
-    homepage = "https://github.com/davidbrazdil/volnoti";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f0a31c36a0d6..a756f538ede7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1339,6 +1339,7 @@ mapAliases {
   virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17
   vkBasalt = vkbasalt; # Added 2022-11-22
   vkdt-wayland = vkdt; # Added 2024-04-19
+  volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22
   inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17
 

From 711695813d75308df891208e987604f918438f8a Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 4 Dec 2024 17:12:38 +0800
Subject: [PATCH 14/42] latencytop: remove

---
 pkgs/by-name/la/latencytop/package.nix | 33 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/by-name/la/latencytop/package.nix

diff --git a/pkgs/by-name/la/latencytop/package.nix b/pkgs/by-name/la/latencytop/package.nix
deleted file mode 100644
index bee5fa9f28a7..000000000000
--- a/pkgs/by-name/la/latencytop/package.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2, util-linux }:
-
-stdenv.mkDerivation rec {
-  pname = "latencytop";
-  version = "0.5";
-
-  postPatch = ''
-    sed -i s,/usr,$out, Makefile
-
-    # Fix #171609
-    substituteInPlace fsync.c --replace /bin/mount ${util-linux}/bin/mount
-  '';
-
-  preInstall = "mkdir -p $out/sbin";
-
-  src = fetchurl {
-    urls = [ "http://latencytop.org/download/latencytop-${version}.tar.gz"
-     "http://dbg.download.sourcemage.org/mirror/latencytop-0.5.tar.gz" ];
-    sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ ncurses glib gtk2 ];
-
-  meta = {
-    homepage = "http://latencytop.org";
-    description = "Tool to show kernel reports on latencies (LATENCYTOP option)";
-    mainProgram = "latencytop";
-    license = lib.licenses.gpl2Only;
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a756f538ede7..17eec2342880 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -616,6 +616,7 @@ mapAliases {
   larynx = piper-tts; # Added 2023-05-09
   LASzip = laszip; # Added 2024-06-12
   LASzip2 = laszip_2; # Added 2024-06-12
+  latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   latinmodern-math = lmmath;
   leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19
   ledger_agent = ledger-agent; # Added 2024-01-07

From 3a76a34b27a92774e31bd0aa1d3a15c38c5fc3ab Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 4 Dec 2024 17:14:35 +0800
Subject: [PATCH 15/42] rftg: remove

---
 pkgs/by-name/rf/rftg/package.nix | 23 -----------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 pkgs/by-name/rf/rftg/package.nix

diff --git a/pkgs/by-name/rf/rftg/package.nix b/pkgs/by-name/rf/rftg/package.nix
deleted file mode 100644
index 8e30b7ff9a2e..000000000000
--- a/pkgs/by-name/rf/rftg/package.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, stdenv, fetchurl, gtk2, pkg-config }:
-
-stdenv.mkDerivation rec {
-
-  pname = "rftg";
-  version = "0.9.4";
-
-  src = fetchurl {
-    url = "http://keldon.net/rftg/rftg-${version}.tar.bz2";
-    sha256 = "0j2y6ggpwdlvyqhirp010aix2g6aacj3kvggvpwzxhig30x9vgq8";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gtk2.dev ];
-
-  meta = {
-    homepage = "http://keldon.net/rftg/";
-    description = "Implementation of the card game Race for the Galaxy, including an AI";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
-  };
-
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 17eec2342880..bdc028c56c08 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1101,6 +1101,7 @@ mapAliases {
   retroarchBare = retroarch-bare; # Added 2024-11-23
   retroarchFull = retroarch-full; # Added 2024-11-23
   retroshare06 = retroshare;
+  rftg = throw "'rftg' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   rigsofrods = rigsofrods-bin; # Added 2023-03-22
   ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17
   rippled = throw "rippled has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25

From 628a0d24b0e8beb2b7686ed7b2720eaf7c085f68 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Thu, 5 Dec 2024 17:44:28 +0800
Subject: [PATCH 16/42] deepin.deepin-calculator: 5.8.24 -> 6.5.2

---
 .../deepin/apps/deepin-calculator/default.nix      | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
index d241359a22a6..e9be91858384 100644
--- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
@@ -6,7 +6,6 @@
   qt5integration,
   qt5platform-plugins,
   libsForQt5,
-  dde-qt-dbus-factory,
   cmake,
   pkg-config,
   gtest,
@@ -14,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-calculator";
-  version = "5.8.24";
+  version = "6.5.2";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Gv4X1vT3w3kd1FN6BBpUeG2VBz/e+OWLBQyBL7r3BrI=";
+    hash = "sha256-5igRoyXx71LepvWlS+CDRq0q9BFCDitM+83j3Mt6DxU=";
   };
 
   nativeBuildInputs = [
@@ -36,7 +35,6 @@ stdenv.mkDerivation rec {
     qt5platform-plugins
     libsForQt5.qtbase
     libsForQt5.qtsvg
-    dde-qt-dbus-factory
     gtest
   ];
 
@@ -44,12 +42,12 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DVERSION=${version}" ];
 
-  meta = with lib; {
+  meta = {
     description = "Easy to use calculator for ordinary users";
     mainProgram = "deepin-calculator";
     homepage = "https://github.com/linuxdeepin/deepin-calculator";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }

From 9970958d8d94f2d5798948452d1eab18ea902dca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 14:15:53 +0000
Subject: [PATCH 17/42] parallel: 20240922 -> 20241122

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index a5c49ca7c082..98c397cd4e2a 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "parallel";
-  version = "20240922";
+  version = "20241122";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/parallel-${version}.tar.bz2";
-    hash = "sha256-YyEHFei3xeEp4JjzM8183V/HovMl6OD7ntbtup8ay8Q=";
+    hash = "sha256-Gp51L0LBfKELwH0KY6LKbtzuUyKC5V0rNL2d0UyXilg=";
   };
 
   outputs = [ "out" "man" "doc" ];

From 4ae5e6518e133ba5a6e14d321f6fd1ab9e5a57bb Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 5 Dec 2024 10:19:15 -0500
Subject: [PATCH 18/42] opentofu: 1.8.6 -> 1.8.7

Diff: https://github.com/opentofu/opentofu/compare/v1.8.6...v1.8.7

Changelog: https://github.com/opentofu/opentofu/blob/v1.8.7/CHANGELOG.md
---
 pkgs/by-name/op/opentofu/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix
index 7f4d6e22c01b..9138cd53a823 100644
--- a/pkgs/by-name/op/opentofu/package.nix
+++ b/pkgs/by-name/op/opentofu/package.nix
@@ -15,16 +15,16 @@
 let
   package = buildGoModule rec {
     pname = "opentofu";
-    version = "1.8.6";
+    version = "1.8.7";
 
     src = fetchFromGitHub {
       owner = "opentofu";
       repo = "opentofu";
       rev = "v${version}";
-      hash = "sha256-yJCUWRAntye3Dx2a+s/gNVa+XuCQak24TnFjSY+/3zc=";
+      hash = "sha256-OLXR9aA94KcIsZxk8gOZxZsljMKuymScuYcoj9W5Hj4=";
     };
 
-    vendorHash = "sha256-MHdEY2nlUGTKybMPran5mTXlAlTFilfrY5K2sMlPe5U=";
+    vendorHash = "sha256-6M/uqwhNruIPx5srbimKuDJaFiZkyosoZQXWjxa6GxY=";
     ldflags = [
       "-s"
       "-w"

From acb21107e5eb2d80d84414b74f790eb661bea15a Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 5 Dec 2024 16:21:18 +0000
Subject: [PATCH 19/42] python312Packages.argcomplete: add patch to fix
 downstream issues

https://git.launchpad.net/ubuntu/+source/python-argcomplete/tree/debian/patches/python-3.13-compat.patch?h=ubuntu/plucky
https://bugs.launchpad.net/ubuntu/+source/python-argcomplete/+bug/2088928

fixes checkPhase of python3Packages.traitlets
---
 .../python-modules/argcomplete/default.nix    |  7 +++
 .../argcomplete/python-3.13-compat.patch      | 49 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/argcomplete/python-3.13-compat.patch

diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index d8a96b231c03..bac7379338c9 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -21,6 +21,13 @@ buildPythonPackage rec {
     hash = "sha256-um8iFzEHExTRV1BAl86/XKLc7vmf2Ws1dB83agfvoec=";
   };
 
+  patches = [
+    # fixes issues with python3Packages.traitlets tests
+    # https://git.launchpad.net/ubuntu/+source/python-argcomplete/tree/debian/patches/python-3.13-compat.patch?h=ubuntu/plucky
+    # https://github.com/kislyuk/argcomplete/pull/513
+    ./python-3.13-compat.patch
+  ];
+
   build-system = [
     setuptools
     setuptools-scm
diff --git a/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch b/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch
new file mode 100644
index 000000000000..8a1aa8354135
--- /dev/null
+++ b/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch
@@ -0,0 +1,49 @@
+From 7438d1fa962eb736af9754669f200f29c5b6025d Mon Sep 17 00:00:00 2001
+From: liushuyu <liushuyu011@gmail.com>
+Date: Mon, 18 Nov 2024 16:12:54 -0700
+Subject: [PATCH] Preliminary Python 3.13 compatibility
+
+---
+ argcomplete/packages/_argparse.py | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/argcomplete/packages/_argparse.py b/argcomplete/packages/_argparse.py
+index d10cf01..10ed00c 100644
+--- a/argcomplete/packages/_argparse.py
++++ b/argcomplete/packages/_argparse.py
+@@ -5,6 +5,7 @@
+ 
+ # This file contains argparse introspection utilities used in the course of argcomplete execution.
+ 
++import sys
+ from argparse import (
+     ONE_OR_MORE,
+     OPTIONAL,
+@@ -15,6 +16,7 @@
+     Action,
+     ArgumentError,
+     ArgumentParser,
++    Namespace,
+     _get_action_name,
+     _SubParsersAction,
+ )
+@@ -75,6 +77,19 @@ class IntrospectiveArgumentParser(ArgumentParser):
+     except for the lines that contain the string "Added by argcomplete".
+     '''
+ 
++    def _parse_known_args2(self, args, namespace, intermixed):
++        if args is None:
++            # args default to the system args
++            args = sys.argv[1:]
++        else:
++            # make sure that args are mutable
++            args = list(args)
++
++        # default Namespace built from parser defaults
++        if namespace is None:
++            namespace = Namespace()
++        return self._parse_known_args(args, namespace)
++
+     def _parse_known_args(self, arg_strings, namespace):
+         _num_consumed_args.clear()  # Added by argcomplete
+         self._argcomplete_namespace = namespace

From 4b11103f9da89d4dfb2371eaa68256fdffcd57ab Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 5 Dec 2024 13:16:56 -0500
Subject: [PATCH 20/42] python312Packages.azure-mgmt-logic: remove msrestazure
 dependency

---
 pkgs/development/python-modules/azure-mgmt-logic/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/pkgs/development/python-modules/azure-mgmt-logic/default.nix
index c3e74008da92..326de9b191d5 100644
--- a/pkgs/development/python-modules/azure-mgmt-logic/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-logic/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   msrest,
-  msrestazure,
   azure-common,
   azure-mgmt-core,
   pythonOlder,
@@ -24,7 +23,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     msrest
-    msrestazure
     azure-common
     azure-mgmt-core
   ];

From 11cbbfdd0844086bdc0f6710782123aabfac84a9 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 5 Dec 2024 13:17:59 -0500
Subject: [PATCH 21/42] python312Packages.azure-mgmt-logic: modernize

---
 .../azure-mgmt-logic/default.nix               | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/pkgs/development/python-modules/azure-mgmt-logic/default.nix
index 326de9b191d5..93978474cb93 100644
--- a/pkgs/development/python-modules/azure-mgmt-logic/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-logic/default.nix
@@ -5,15 +5,13 @@
   msrest,
   azure-common,
   azure-mgmt-core,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-logic";
   version = "10.0.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -21,7 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-s/pIZPFKqnr0HXeNkl8FHtKbYBb0Y0R2Xs0PSdDwTdY=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     msrest
     azure-common
     azure-mgmt-core
@@ -30,12 +30,14 @@ buildPythonPackage rec {
   # Module has no tests
   doCheck = false;
 
+  pythonNamespaces = [ "azure.mgmt" ];
+
   pythonImportsCheck = [ "azure.mgmt.logic" ];
 
-  meta = with lib; {
+  meta = {
     description = "This is the Microsoft Azure Logic Apps Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
-    license = licenses.mit;
-    maintainers = with maintainers; [ maxwilson ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ maxwilson ];
   };
 }

From 124b22467423cc1aa1f5b41c7e21c0a7785ba646 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 5 Dec 2024 12:22:23 -0500
Subject: [PATCH 22/42] python312Packages.azure-mgmt-relay: remove unused
 dependencies

---
 .../development/python-modules/azure-mgmt-relay/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix
index 0086fa381973..a01f57711e20 100644
--- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix
@@ -3,10 +3,9 @@
   buildPythonPackage,
   fetchPypi,
   setuptools,
-  msrestazure,
   azure-common,
   azure-mgmt-core,
-  azure-mgmt-nspkg,
+  msrest,
 }:
 
 buildPythonPackage rec {
@@ -23,10 +22,9 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
-    msrestazure
+    msrest
     azure-common
     azure-mgmt-core
-    azure-mgmt-nspkg
   ];
 
   preBuild = ''

From f63243de45c1eb03fc752c5215715bba901dbedf Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 5 Dec 2024 12:23:16 -0500
Subject: [PATCH 23/42] python312Packages.azure-mgmt-relay: slightly modernize

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

diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix
index a01f57711e20..30837b47b0d4 100644
--- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix
@@ -37,10 +37,10 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "azure.mgmt.relay" ];
 
-  meta = with lib; {
+  meta = {
     description = "This is the Microsoft Azure Relay Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
-    license = licenses.mit;
-    maintainers = with maintainers; [ maxwilson ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ maxwilson ];
   };
 }

From 4b641f48a4c21e5cf0855ce3aadfc4edc61c173f Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 5 Dec 2024 16:48:40 -0500
Subject: [PATCH 24/42] nodePackages.webpack-dev-server: drop

---
 .../manual/release-notes/rl-2505.section.md   |   2 +
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 354 ------------------
 4 files changed, 3 insertions(+), 355 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 0a36bf78d52d..d98e9aa36425 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -46,6 +46,8 @@
 
 - `nodePackages.insect` has been removed, as it's deprecated by upstream. The suggested replacement is `numbat`.
 
+- `nodePackages.webpack-dev-server` has been removed, as it should be installed in projects that use it instead.
+
 - The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses.
 
 - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel.
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index ce692ed02c9d..f212bd2347f6 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -215,6 +215,7 @@ mapAliases {
   vue-cli = throw "vue-cli has been removed since upstream no longer recommends using it; consider using create-vue and the new Vite-based tooling instead."; # added 2024-07-12
   inherit (pkgs) web-ext; # added 2023-08-20
   inherit (pkgs) webpack-cli; # added 2024-12-03
+  webpack-dev-server = throw "webpack-dev-server has been removed. You should install it in your JS project instead."; # added 2024-12-05
   inherit (pkgs) wrangler; # added 2024-07-01
   inherit (pkgs) write-good; # added 2023-08-20
   inherit (pkgs) yalc; # added 2024-06-29
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 9a4e51f2d803..58e35b8910ef 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -223,7 +223,6 @@
 , "vscode-json-languageserver"
 , "wavedrom-cli"
 , "webpack"
-, "webpack-dev-server"
 , "copy-webpack-plugin"
 , "webtorrent-cli"
 , "wring"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index b8c463a6ec96..85f6be428f1b 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -6466,33 +6466,6 @@ let
         sha512 = "14OGYM3DjEBjUOUaih+bwPgkhFnR8L9TSNSM0oE0L0hjWscTapvClqOgMDJ1ID52qkROCAgKl1d71Vmm4v0Buw==";
       };
     };
-    "@jsonjoy.com/base64-1.1.2" = {
-      name = "_at_jsonjoy.com_slash_base64";
-      packageName = "@jsonjoy.com/base64";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz";
-        sha512 = "q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==";
-      };
-    };
-    "@jsonjoy.com/json-pack-1.1.0" = {
-      name = "_at_jsonjoy.com_slash_json-pack";
-      packageName = "@jsonjoy.com/json-pack";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz";
-        sha512 = "zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg==";
-      };
-    };
-    "@jsonjoy.com/util-1.3.0" = {
-      name = "_at_jsonjoy.com_slash_util";
-      packageName = "@jsonjoy.com/util";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.3.0.tgz";
-        sha512 = "Cebt4Vk7k1xHy87kHY7KSPLT77A7Ev7IfOblyLZhtYEhrdQ6fX4EoLq3xOQ3O/DRMEh2ok5nyC180E+ABS8Wmw==";
-      };
-    };
     "@kamilkisiela/fast-url-parser-1.1.4" = {
       name = "_at_kamilkisiela_slash_fast-url-parser";
       packageName = "@kamilkisiela/fast-url-parser";
@@ -82478,333 +82451,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  webpack-dev-server = nodeEnv.buildNodePackage {
-    name = "webpack-dev-server";
-    packageName = "webpack-dev-server";
-    version = "5.1.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.1.0.tgz";
-      sha512 = "aQpaN81X6tXie1FoOB7xlMfCsN19pSvRAeYUHOdFWOlhpQ/LlbfTqYwwmEDFV0h8GGuqmCmKmT+pxcUV/Nt2gQ==";
-    };
-    dependencies = [
-      sources."@jridgewell/gen-mapping-0.3.5"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/source-map-0.3.6"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@jsonjoy.com/base64-1.1.2"
-      sources."@jsonjoy.com/json-pack-1.1.0"
-      sources."@jsonjoy.com/util-1.3.0"
-      sources."@leichtgewicht/ip-codec-2.0.5"
-      sources."@types/body-parser-1.19.5"
-      sources."@types/bonjour-3.5.13"
-      sources."@types/connect-3.4.38"
-      sources."@types/connect-history-api-fallback-1.5.4"
-      sources."@types/estree-1.0.6"
-      sources."@types/express-4.17.21"
-      sources."@types/express-serve-static-core-4.19.5"
-      sources."@types/http-errors-2.0.4"
-      sources."@types/http-proxy-1.17.15"
-      sources."@types/json-schema-7.0.15"
-      sources."@types/mime-1.3.5"
-      sources."@types/node-22.5.5"
-      sources."@types/node-forge-1.3.11"
-      sources."@types/qs-6.9.16"
-      sources."@types/range-parser-1.2.7"
-      sources."@types/retry-0.12.2"
-      sources."@types/send-0.17.4"
-      sources."@types/serve-index-1.9.4"
-      sources."@types/serve-static-1.15.7"
-      sources."@types/sockjs-0.3.36"
-      sources."@types/ws-8.5.12"
-      sources."@webassemblyjs/ast-1.12.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.11.6"
-      sources."@webassemblyjs/helper-api-error-1.11.6"
-      sources."@webassemblyjs/helper-buffer-1.12.1"
-      sources."@webassemblyjs/helper-numbers-1.11.6"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.11.6"
-      sources."@webassemblyjs/helper-wasm-section-1.12.1"
-      sources."@webassemblyjs/ieee754-1.11.6"
-      sources."@webassemblyjs/leb128-1.11.6"
-      sources."@webassemblyjs/utf8-1.11.6"
-      sources."@webassemblyjs/wasm-edit-1.12.1"
-      sources."@webassemblyjs/wasm-gen-1.12.1"
-      sources."@webassemblyjs/wasm-opt-1.12.1"
-      sources."@webassemblyjs/wasm-parser-1.12.1"
-      sources."@webassemblyjs/wast-printer-1.12.1"
-      sources."@xtuc/ieee754-1.2.0"
-      sources."@xtuc/long-4.2.2"
-      sources."accepts-1.3.8"
-      sources."acorn-8.12.1"
-      sources."acorn-import-attributes-1.9.5"
-      sources."ajv-8.17.1"
-      sources."ajv-formats-2.1.1"
-      sources."ajv-keywords-5.1.0"
-      sources."ansi-html-community-0.0.8"
-      sources."anymatch-3.1.3"
-      sources."array-flatten-1.1.1"
-      sources."batch-0.6.1"
-      sources."binary-extensions-2.3.0"
-      (sources."body-parser-1.20.3" // {
-        dependencies = [
-          sources."bytes-3.1.2"
-        ];
-      })
-      sources."bonjour-service-1.2.1"
-      sources."braces-3.0.3"
-      sources."browserslist-4.23.3"
-      sources."buffer-from-1.1.2"
-      sources."bufferutil-4.0.8"
-      sources."bundle-name-4.1.0"
-      sources."bytes-3.0.0"
-      sources."call-bind-1.0.7"
-      sources."caniuse-lite-1.0.30001662"
-      sources."chokidar-3.6.0"
-      sources."chrome-trace-event-1.0.4"
-      sources."colorette-2.0.20"
-      sources."commander-2.20.3"
-      sources."compressible-2.0.18"
-      sources."compression-1.7.4"
-      sources."connect-history-api-fallback-2.0.0"
-      (sources."content-disposition-0.5.4" // {
-        dependencies = [
-          sources."safe-buffer-5.2.1"
-        ];
-      })
-      sources."content-type-1.0.5"
-      sources."cookie-0.6.0"
-      sources."cookie-signature-1.0.6"
-      sources."core-util-is-1.0.3"
-      sources."debug-2.6.9"
-      sources."default-browser-5.2.1"
-      sources."default-browser-id-5.0.0"
-      sources."define-data-property-1.1.4"
-      sources."define-lazy-prop-3.0.0"
-      sources."depd-2.0.0"
-      sources."destroy-1.2.0"
-      sources."detect-node-2.1.0"
-      sources."dns-packet-5.6.1"
-      sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.5.26"
-      sources."encodeurl-2.0.0"
-      sources."enhanced-resolve-5.17.1"
-      sources."es-define-property-1.0.0"
-      sources."es-errors-1.3.0"
-      sources."es-module-lexer-1.5.4"
-      sources."escalade-3.2.0"
-      sources."escape-html-1.0.3"
-      sources."eslint-scope-5.1.1"
-      (sources."esrecurse-4.3.0" // {
-        dependencies = [
-          sources."estraverse-5.3.0"
-        ];
-      })
-      sources."estraverse-4.3.0"
-      sources."etag-1.8.1"
-      sources."eventemitter3-4.0.7"
-      sources."events-3.3.0"
-      (sources."express-4.21.0" // {
-        dependencies = [
-          sources."safe-buffer-5.2.1"
-        ];
-      })
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-uri-3.0.1"
-      sources."faye-websocket-0.11.4"
-      sources."fill-range-7.1.1"
-      sources."finalhandler-1.3.1"
-      sources."follow-redirects-1.15.9"
-      sources."forwarded-0.2.0"
-      sources."fresh-0.5.2"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.2.4"
-      sources."glob-parent-5.1.2"
-      sources."glob-to-regexp-0.4.1"
-      sources."gopd-1.0.1"
-      sources."graceful-fs-4.2.11"
-      sources."handle-thing-2.0.1"
-      sources."has-flag-4.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-proto-1.0.3"
-      sources."has-symbols-1.0.3"
-      sources."hasown-2.0.2"
-      (sources."hpack.js-2.1.6" // {
-        dependencies = [
-          sources."readable-stream-2.3.8"
-        ];
-      })
-      sources."html-entities-2.5.2"
-      sources."http-deceiver-1.2.7"
-      sources."http-errors-2.0.0"
-      sources."http-parser-js-0.5.8"
-      sources."http-proxy-1.18.1"
-      sources."http-proxy-middleware-2.0.6"
-      sources."hyperdyperid-1.2.0"
-      sources."iconv-lite-0.4.24"
-      sources."inherits-2.0.4"
-      sources."ipaddr.js-2.2.0"
-      sources."is-binary-path-2.1.0"
-      sources."is-docker-3.0.0"
-      sources."is-extglob-2.1.1"
-      sources."is-glob-4.0.3"
-      sources."is-inside-container-1.0.0"
-      sources."is-network-error-1.1.0"
-      sources."is-number-7.0.0"
-      sources."is-plain-obj-3.0.0"
-      sources."is-wsl-3.1.0"
-      sources."isarray-1.0.0"
-      sources."jest-worker-27.5.1"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."json-schema-traverse-1.0.0"
-      sources."launch-editor-2.9.1"
-      sources."loader-runner-4.3.0"
-      sources."media-typer-0.3.0"
-      sources."memfs-4.12.0"
-      sources."merge-descriptors-1.0.3"
-      sources."merge-stream-2.0.0"
-      sources."methods-1.1.2"
-      sources."micromatch-4.0.8"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."minimalistic-assert-1.0.1"
-      sources."ms-2.0.0"
-      sources."multicast-dns-7.2.5"
-      sources."negotiator-0.6.3"
-      sources."neo-async-2.6.2"
-      sources."node-forge-1.3.1"
-      sources."node-gyp-build-4.8.2"
-      sources."node-releases-2.0.18"
-      sources."normalize-path-3.0.0"
-      sources."object-inspect-1.13.2"
-      sources."obuf-1.1.2"
-      sources."on-finished-2.4.1"
-      sources."on-headers-1.0.2"
-      sources."open-10.1.0"
-      sources."p-retry-6.2.0"
-      sources."parseurl-1.3.3"
-      sources."path-to-regexp-0.1.10"
-      sources."picocolors-1.1.0"
-      sources."picomatch-2.3.1"
-      sources."process-nextick-args-2.0.1"
-      (sources."proxy-addr-2.0.7" // {
-        dependencies = [
-          sources."ipaddr.js-1.9.1"
-        ];
-      })
-      sources."punycode-2.3.1"
-      sources."qs-6.13.0"
-      sources."randombytes-2.1.0"
-      sources."range-parser-1.2.1"
-      (sources."raw-body-2.5.2" // {
-        dependencies = [
-          sources."bytes-3.1.2"
-        ];
-      })
-      sources."readable-stream-3.6.2"
-      sources."readdirp-3.6.0"
-      sources."require-from-string-2.0.2"
-      sources."requires-port-1.0.0"
-      sources."retry-0.13.1"
-      sources."run-applescript-7.0.0"
-      sources."safe-buffer-5.1.2"
-      sources."safer-buffer-2.1.2"
-      sources."schema-utils-4.2.0"
-      sources."select-hose-2.0.0"
-      sources."selfsigned-2.4.1"
-      (sources."send-0.19.0" // {
-        dependencies = [
-          sources."encodeurl-1.0.2"
-          sources."ms-2.1.3"
-        ];
-      })
-      sources."serialize-javascript-6.0.2"
-      (sources."serve-index-1.9.1" // {
-        dependencies = [
-          sources."depd-1.1.2"
-          sources."http-errors-1.6.3"
-          sources."inherits-2.0.3"
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.5.0"
-        ];
-      })
-      sources."serve-static-1.16.2"
-      sources."set-function-length-1.2.2"
-      sources."setprototypeof-1.2.0"
-      sources."shell-quote-1.8.1"
-      sources."side-channel-1.0.6"
-      sources."sockjs-0.3.24"
-      sources."source-map-0.6.1"
-      sources."source-map-support-0.5.21"
-      (sources."spdy-4.0.2" // {
-        dependencies = [
-          sources."debug-4.3.7"
-          sources."ms-2.1.3"
-        ];
-      })
-      (sources."spdy-transport-3.0.0" // {
-        dependencies = [
-          sources."debug-4.3.7"
-          sources."ms-2.1.3"
-        ];
-      })
-      sources."statuses-2.0.1"
-      sources."string_decoder-1.1.1"
-      sources."supports-color-8.1.1"
-      sources."tapable-2.2.1"
-      sources."terser-5.33.0"
-      (sources."terser-webpack-plugin-5.3.10" // {
-        dependencies = [
-          sources."ajv-6.12.6"
-          sources."ajv-keywords-3.5.2"
-          sources."json-schema-traverse-0.4.1"
-          sources."schema-utils-3.3.0"
-        ];
-      })
-      sources."thingies-1.21.0"
-      sources."thunky-1.1.0"
-      sources."to-regex-range-5.0.1"
-      sources."toidentifier-1.0.1"
-      sources."tree-dump-1.0.2"
-      sources."tslib-2.7.0"
-      sources."type-is-1.6.18"
-      sources."undici-types-6.19.8"
-      sources."unpipe-1.0.0"
-      sources."update-browserslist-db-1.1.0"
-      sources."uri-js-4.4.1"
-      sources."utf-8-validate-6.0.4"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-8.3.2"
-      sources."vary-1.1.2"
-      sources."watchpack-2.4.2"
-      sources."wbuf-1.7.3"
-      (sources."webpack-5.94.0" // {
-        dependencies = [
-          sources."ajv-6.12.6"
-          sources."ajv-keywords-3.5.2"
-          sources."json-schema-traverse-0.4.1"
-          sources."schema-utils-3.3.0"
-        ];
-      })
-      sources."webpack-dev-middleware-7.4.2"
-      sources."webpack-sources-3.2.3"
-      sources."websocket-driver-0.7.4"
-      sources."websocket-extensions-0.1.4"
-      sources."ws-8.18.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Serves a webpack app. Updates the browser on changes.";
-      homepage = "https://github.com/webpack/webpack-dev-server#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   copy-webpack-plugin = nodeEnv.buildNodePackage {
     name = "copy-webpack-plugin";
     packageName = "copy-webpack-plugin";

From fb93e0b7c9b3140af69bcd3bbee5393801a2cffe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 00:45:38 +0000
Subject: [PATCH 25/42] phpPackages.phpstan: 2.0.2 -> 2.0.3

---
 pkgs/development/php-packages/phpstan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index f77c7803fd88..1a7b4e3ff790 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -6,16 +6,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpstan";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan-src";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-sLta3LnGtbJ4CMzQ+GRhI13orBvo4Q/kEtCDWcJRSI4=";
+    hash = "sha256-jTyKR1sgRdGTEIhQWlAH1/0gbq5dObxXmLiEcp7+I7c=";
   };
 
-  vendorHash = "sha256-t9KTZUj3FYH9lpQikesZpq180HqQB8hqE0xyneFgbRA=";
+  vendorHash = "sha256-U4J/uHZjCH8S33RdnStzfWW3RrbOPpX5jMC6FTkBYHE=";
   composerStrictValidation = false;
 
   meta = {

From 1566a6b69c47881ba65dac0a42637399de4890ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 01:19:18 +0000
Subject: [PATCH 26/42] phpExtensions.tideways: 5.14.0 -> 5.16.2

---
 pkgs/development/php-packages/tideways/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/php-packages/tideways/default.nix b/pkgs/development/php-packages/tideways/default.nix
index 41f764062555..d63e98750dea 100644
--- a/pkgs/development/php-packages/tideways/default.nix
+++ b/pkgs/development/php-packages/tideways/default.nix
@@ -23,7 +23,7 @@ in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-php";
   extensionName = "tideways";
-  version = "5.14.0";
+  version = "5.16.2";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -43,15 +43,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-x86_64.tar.gz";
-        hash = "sha256-jhTlHkdBqnI+HmEPbawpI0z3tIHUJdTwutLsmA5uBsw=";
+        hash = "sha256-bSLBk4VWRvErmSqXOEFE0N0K06+NRLmsJ76HegFYah8=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-arm64.tar.gz";
-        hash = "sha256-HkYyie3FUIvRwFZ2H/0BuHB+tqrSWSGZYTIAa5HtO6s=";
+        hash = "sha256-nXTk0DlGSEq0bp4+Hls3+epV6JY4H50D6IO/M3evFpE=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-macos-arm.tar.gz";
-        hash = "sha256-qspHSImQHRVPjcSjeARFBdNgYPD3mOoqktA08X8jGqg=";
+        hash = "sha256-IqQ0gtLAx8lVBccaDsum81FmkYXHKQ5zf27F2Y+H45g=";
       };
     };
 

From e7be80fdcdb00cf59c778c4a39ecb75f58615426 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 01:52:26 +0000
Subject: [PATCH 27/42] radicle-httpd: 0.17.1 -> 0.18.0

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

diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index 58d1533e980c..3cc50a87bf12 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -13,19 +13,19 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "radicle-httpd";
-  version = "0.17.1";
+  version = "0.18.0";
   env.RADICLE_VERSION = version;
 
   # You must update the radicle-explorer source hash when changing this.
   src = fetchgit {
     url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git";
     rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}";
-    hash = "sha256-AhiIpNVDL4XYIQ89aYu8Cp2nKhIPYCzyrcG5hw9xsmE=";
+    hash = "sha256-VHfiL0BSJsYS8QgMf+LEa6HvYoc+dxawTcwB4d6sTg8=";
     sparseCheckout = [ "radicle-httpd" ];
   };
 
   sourceRoot = "${src.name}/radicle-httpd";
-  cargoHash = "sha256-TwK2QsoKVWYXn4mZEERQCnMOY4F9+wzjLBtvhH69wAs=";
+  cargoHash = "sha256-LmUZCu10RsuA8Lu3FjWcV8MzjX5FxBCV6+4zG0GEN2c=";
 
   nativeBuildInputs = [
     asciidoctor

From 50d2d70cbabdcfe330474e82bc5be10112d560c3 Mon Sep 17 00:00:00 2001
From: StayBlue <blue@spook.rip>
Date: Thu, 24 Oct 2024 23:24:43 -0700
Subject: [PATCH 28/42] maintainers: add StayBlue

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6e50e5d0e96f..78f15ad34947 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21101,6 +21101,12 @@
     github = "stasjok";
     githubId = 1353637;
   };
+  StayBlue = {
+    name = "StayBlue";
+    email = "blue@spook.rip";
+    github = "StayBlue";
+    githubId = 23127866;
+  };
   steamwalker = {
     email = "steamwalker@xs4all.nl";
     github = "steamwalker";

From 7e78a8175508307cee39bd1c069378723b02d833 Mon Sep 17 00:00:00 2001
From: StayBlue <blue@spook.rip>
Date: Thu, 24 Oct 2024 23:25:19 -0700
Subject: [PATCH 29/42] argon: init at 2.0.21

---
 pkgs/by-name/ar/argon/package.nix | 45 +++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/ar/argon/package.nix

diff --git a/pkgs/by-name/ar/argon/package.nix b/pkgs/by-name/ar/argon/package.nix
new file mode 100644
index 000000000000..46c6364dc70f
--- /dev/null
+++ b/pkgs/by-name/ar/argon/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  udev,
+  zstd,
+  stdenv,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "argon";
+  version = "2.0.21";
+
+  src = fetchFromGitHub {
+    owner = "argon-rbx";
+    repo = "argon";
+    rev = "refs/tags/${version}";
+    hash = "sha256-msKrPLB+38PU7LEw92xEqFy6JxwMjttBaobIOhU7eWw=";
+  };
+
+  cargoHash = "sha256-yXhEgZYtYhrSpwPbL+yi9gaLVVV8sBlF8m3ADUC4kLk=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs =
+    [
+      zstd
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      udev
+    ];
+
+  env = {
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+  };
+
+  meta = {
+    description = "Full featured tool for Roblox development";
+    homepage = "https://github.com/argon-rbx/argon";
+    changelog = "https://github.com/argon-rbx/argon/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ StayBlue ];
+    mainProgram = "argon";
+  };
+}

From b1371135b5db3fcf728114d92d5bd0218109598a Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Fri, 26 Jul 2024 03:00:09 +0800
Subject: [PATCH 30/42] lib.strings.concatMapAttrsStringSep: init

---
 lib/default.nix    |  2 +-
 lib/strings.nix    | 37 +++++++++++++++++++++++++++++++++++++
 lib/tests/misc.nix |  6 ++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/lib/default.nix b/lib/default.nix
index 5b742b195d34..83ce7a6d7ea9 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -100,7 +100,7 @@ let
       length head tail elem elemAt isList;
     inherit (self.strings) concatStrings concatMapStrings concatImapStrings
       stringLength substring isString replaceStrings
-      intersperse concatStringsSep concatMapStringsSep
+      intersperse concatStringsSep concatMapStringsSep concatMapAttrsStringSep
       concatImapStringsSep concatLines makeSearchPath makeSearchPathOutput
       makeLibraryPath makeIncludePath makeBinPath optionalString
       hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
diff --git a/lib/strings.nix b/lib/strings.nix
index d9a2d786ed28..5ea86e0d7e07 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -269,6 +269,43 @@ rec {
     f:
     list: concatStringsSep sep (lib.imap1 f list);
 
+  /**
+    Like [`concatMapStringsSep`](#function-library-lib.strings.concatMapStringsSep)
+    but takes an attribute set instead of a list.
+
+    # Inputs
+
+    `sep`
+    : Separator to add between item strings
+
+    `f`
+    : Function that takes each key and value and return a string
+
+    `attrs`
+    : Attribute set to map from
+
+    # Type
+
+    ```
+    concatMapAttrsStringSep :: String -> (String -> Any -> String) -> AttrSet -> String
+    ```
+
+    # Examples
+
+    :::{.example}
+    ## `lib.strings.concatMapAttrsStringSep` usage example
+
+    ```nix
+    concatMapAttrsStringSep "\n" (name: value: "${name}: foo-${value}") { a = "0.1.0"; b = "0.2.0"; }
+    => "a: foo-0.1.0\nb: foo-0.2.0"
+    ```
+
+    :::
+  */
+  concatMapAttrsStringSep =
+    sep: f: attrs:
+    concatStringsSep sep (lib.attrValues (lib.mapAttrs f attrs));
+
   /**
     Concatenate a list of strings, adding a newline at the end of each one.
     Defined as `concatMapStrings (s: s + "\n")`.
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 72b3d630b8da..6357cc3ec1cf 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -39,6 +39,7 @@ let
     composeManyExtensions
     concatLines
     concatMapAttrs
+    concatMapAttrsStringSep
     concatMapStrings
     concatStrings
     concatStringsSep
@@ -328,6 +329,11 @@ runTests {
     expected = "a,b,c";
   };
 
+  testConcatMapAttrsStringSepExamples = {
+    expr = concatMapAttrsStringSep "\n" (name: value: "${name}: foo-${value}") { a = "0.1.0"; b = "0.2.0"; };
+    expected = "a: foo-0.1.0\nb: foo-0.2.0";
+  };
+
   testConcatLines = {
     expr = concatLines ["a" "b" "c"];
     expected = "a\nb\nc\n";

From 037a7cbe01b02a296a524bff989d13295fdd5ea8 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Fri, 26 Jul 2024 03:15:06 +0800
Subject: [PATCH 31/42] apptainer: singularity: use lib.concatMapAttrsStringSep

Use concatMapAttrsStringSep helper function from the standard library
instead of the locally-improvised one.
---
 pkgs/applications/virtualization/singularity/generic.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix
index 12a9039cb016..a84cc4ad540e 100644
--- a/pkgs/applications/virtualization/singularity/generic.nix
+++ b/pkgs/applications/virtualization/singularity/generic.nix
@@ -102,10 +102,6 @@ in
 }@args:
 
 let
-  concatMapStringAttrsSep =
-    sep: f: attrs:
-    lib.concatMapStringsSep sep (name: f name attrs.${name}) (lib.attrNames attrs);
-
   addShellDoubleQuotes = s: lib.escapeShellArg ''"'' + s + lib.escapeShellArg ''"'';
 in
 (buildGoModule {
@@ -210,7 +206,7 @@ in
     patchShebangs --build "$configureScript" makeit e2e scripts mlocal/scripts
 
     # Patching the hard-coded defaultPath by prefixing the packages in defaultPathInputs
-    ${concatMapStringAttrsSep "\n" (fileName: originalDefaultPaths: ''
+    ${lib.concatMapAttrsStringSep "\n" (fileName: originalDefaultPaths: ''
       substituteInPlace ${lib.escapeShellArg fileName} \
         ${
           lib.concatMapStringsSep " \\\n  " (

From 226b3704236a049fc0aef7f123ac40a8275ea6f9 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 4 Aug 2024 14:37:26 +0800
Subject: [PATCH 32/42] tests.overriding: simplify implementation with
 lib.concatMapStringAttrsSep

---
 pkgs/test/overriding.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index a9fa482e4e58..8fc7274c27c2 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -158,5 +158,5 @@ stdenvNoCC.mkDerivation {
   passthru = { inherit tests; };
   buildCommand = ''
     touch $out
-  '' + lib.concatStringsSep "\n" (lib.attrValues (lib.mapAttrs (name: t: "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)") tests));
+  '' + lib.concatMapAttrsStringSep "\n" (name: t: "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)") tests;
 }

From a35aa06aa73e1971e505747ffdb0b9ea42cd104f Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Fri, 6 Dec 2024 03:11:43 +0000
Subject: [PATCH 33/42] python313Packages.immutables: 0.20 -> 0.21; fix python
 3.13

https://github.com/MagicStack/immutables/releases/tag/v0.21
https://github.com/MagicStack/immutables/compare/v0.20...v0.21
---
 .../development/python-modules/immutables/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix
index 8ea8d2a89020..e2be3e56c744 100644
--- a/pkgs/development/python-modules/immutables/default.nix
+++ b/pkgs/development/python-modules/immutables/default.nix
@@ -2,28 +2,31 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pytestCheckHook,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "immutables";
-  version = "0.20";
-  format = "setuptools";
+  version = "0.21";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "MagicStack";
-    repo = pname;
+    repo = "immutables";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fEECtP6WQVzwSzBYX+CbhQtzkB/1WC3OYKXk2XY//xA=";
+    hash = "sha256-wZuCZEVXzycqA/h27RIe59e2QQALem8mfb3EdjwQr9w=";
   };
 
   postPatch = ''
     rm tests/conftest.py
   '';
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests = [

From 5f9cbf9898b86c8151dde657c2023f3afdb714bf Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.info>
Date: Mon, 2 Dec 2024 17:04:15 +0100
Subject: [PATCH 34/42] emacs: allow wrapped emacs to execute itself again

fixes #145302 #237855

emacsWithPackages wrapper script/`site-start.el` sanitize
EMACSLOADPATH, to make nested emacs invocations independent of the
package set specified in emacsWithPackages.

But there are valid use cases when one needs to call nested emacs with
the same package set. This includes built-in emacs functionality such
as async native compilations, and also external packages like
`emacs-async` and `esup`. In all of these cases
`invocation-directory`/`invocation-name` variables are being used to
launch nested emacs.

With this patch these variables will be populated to point to the
emacsWithPackages wrapper executable, so that executing
`(file-name-concat invocation-directory invocation-name)` will give a
fully functional emacs again.

`EMACSLOADPATH` sanitization was introduced by #106486, this behaviour
stays unchanged. The reasoning was to be able to run different emacs
executables without polluting their EMACSLOADPATH (as described here
https://github.com/NixOS/nixpkgs/pull/106486/commits/23d4bfb6661ca57a9e331a2cf4184232d38ac38b).
The only change is that invoking itself is again feasible (and that's
what emacs actually expects).

Co-authored-by: Lin Jian <me@linj.tech>
---
 .../editors/emacs/build-support/wrapper.nix            |  4 ++++
 .../editors/emacs/build-support/wrapper.sh             |  3 +++
 pkgs/applications/editors/emacs/site-start.el          | 10 ++++++++++
 3 files changed, 17 insertions(+)
 mode change 100644 => 100755 pkgs/applications/editors/emacs/build-support/wrapper.sh

diff --git a/pkgs/applications/editors/emacs/build-support/wrapper.nix b/pkgs/applications/editors/emacs/build-support/wrapper.nix
index 5b325f5e0a9e..81329808716b 100644
--- a/pkgs/applications/editors/emacs/build-support/wrapper.nix
+++ b/pkgs/applications/editors/emacs/build-support/wrapper.nix
@@ -198,6 +198,8 @@ runCommand
         --subst-var-by bash ${emacs.stdenv.shell} \
         --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
         --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \
+        --subst-var-by wrapperInvocationDirectory "$out/bin/" \
+        --subst-var-by wrapperInvocationName "$progname" \
         --subst-var prog
       chmod +x $out/bin/$progname
       # Create a “NOP” binary wrapper for the pure sake of it becoming a
@@ -222,6 +224,8 @@ runCommand
         --subst-var-by bash ${emacs.stdenv.shell} \
         --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
         --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \
+        --subst-var-by wrapperInvocationDirectory "$out/Applications/Emacs.app/Contents/MacOS/" \
+        --subst-var-by wrapperInvocationName "Emacs" \
         --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
       chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
       wrapProgramBinary $out/Applications/Emacs.app/Contents/MacOS/Emacs
diff --git a/pkgs/applications/editors/emacs/build-support/wrapper.sh b/pkgs/applications/editors/emacs/build-support/wrapper.sh
old mode 100644
new mode 100755
index 44762bd4582b..e83308bf5b32
--- a/pkgs/applications/editors/emacs/build-support/wrapper.sh
+++ b/pkgs/applications/editors/emacs/build-support/wrapper.sh
@@ -50,4 +50,7 @@ export emacsWithPackages_siteLisp=@wrapperSiteLisp@
 export EMACSNATIVELOADPATH="${newNativeLoadPath[*]}"
 export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@
 
+export emacsWithPackages_invocationDirectory=@wrapperInvocationDirectory@
+export emacsWithPackages_invocationName=@wrapperInvocationName@
+
 exec @prog@ "$@"
diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el
index c844e703e385..8c7ea3dfc913 100644
--- a/pkgs/applications/editors/emacs/site-start.el
+++ b/pkgs/applications/editors/emacs/site-start.el
@@ -39,6 +39,16 @@ least specific (the system profile)"
       (setenv "EMACSNATIVELOADPATH" (when new-env-list
                                 (mapconcat 'identity new-env-list ":"))))))
 
+(let ((wrapper-invocation-directory (getenv "emacsWithPackages_invocationDirectory")))
+  (when wrapper-invocation-directory
+    (setq invocation-directory (file-name-as-directory wrapper-invocation-directory))
+    (setenv "emacsWithPackages_invocationDirectory" nil)))
+
+(let ((wrapper-invocation-name (getenv "emacsWithPackages_invocationName")))
+  (when wrapper-invocation-name
+    (setq invocation-name wrapper-invocation-name)
+    (setenv "emacsWithPackages_invocationName" nil)))
+
 ;;; Set up native-comp load path.
 (when (featurep 'native-compile)
   ;; Append native-comp subdirectories from `NIX_PROFILES'.

From 77136f2adecba7afa81fb7a63b66c0e221ebe35d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 05:36:17 +0000
Subject: [PATCH 35/42] ledger-live-desktop: 2.89.1 -> 2.92.1

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

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index 22191d32471f..ac4e142078d4 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -2,11 +2,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.89.1";
+  version = "2.92.1";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-PPoQnXDVf6Q6QPVE41guJL1vu7rW7mZdpRZjRME3Ue8=";
+    hash = "sha256-X4jJ7vDoU1CyZQm9Grghn6Rv+7OILE79PbN77BUhzG0=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 5a787efe66e825b7ad4bc3e2a451dba002202ebf Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 6 Dec 2024 10:12:31 +0300
Subject: [PATCH 36/42] linux_6_12: 6.12.2 -> 6.12.3

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index d29ae01c13e7..a3721a4a1462 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -28,7 +28,7 @@
         "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
     },
     "6.12": {
-        "version": "6.12.2",
-        "hash": "sha256:12rx83ryh1i1n79h05zgx1mn60s9fc0p7gh560gpp1ryqw80f7mv"
+        "version": "6.12.3",
+        "hash": "sha256:1bnycpkzcd6qdz4m5rx00wvkh9hs50q8c4aa93mg2l3xfz60k668"
     }
 }

From 2c5f0b0e5f1f065a13eafe944bf305ac0e96b7f7 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 6 Dec 2024 16:50:05 +0800
Subject: [PATCH 37/42] deepin.deepin-turbo: remove

---
 pkgs/desktops/deepin/default.nix              |  2 +-
 .../deepin/misc/deepin-turbo/default.nix      | 41 -------------------
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/desktops/deepin/misc/deepin-turbo/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 21f585da53b3..c86e77e2b9af 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -105,13 +105,13 @@ let
 
       #### MISC
       deepin-desktop-base = callPackage ./misc/deepin-desktop-base { };
-      deepin-turbo = callPackage ./misc/deepin-turbo { };
     }
     // lib.optionalAttrs config.allowAliases {
       dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27
       dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23
       dde-dock = throw "The 'deepin.dde-dock' is no longer maintained. Please use 'deepin.dde-tray-loader' instead."; # added 2024-08-28
       deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23
+      deepin-turbo = throw "The 'deepin.deepin-turbo' package was removed as it is outdated and no longer relevant."; # added 2024-12-06
       go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
       go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31
       go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31
diff --git a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix
deleted file mode 100644
index d6ed1a723334..000000000000
--- a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  dtkwidget,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-turbo";
-  version = "0.0.6.3";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-t6/Ws/Q8DO0zBzrUr/liD61VkxbOv4W4x6VgMWr+Ozk=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [ dtkwidget ];
-
-  postPatch = ''
-    substituteInPlace src/{booster-dtkwidget/CMakeLists.txt,booster-desktop/{CMakeLists.txt,desktop.conf},booster-generic/CMakeLists.txt} --replace "/usr" "$out"
-  '';
-
-  meta = with lib; {
-    description = "Daemon that helps to launch dtk applications faster";
-    homepage = "https://github.com/linuxdeepin/deepin-turbo";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
-  };
-}

From b3ae859368264ccfd5cd6effc9898e7535d6d8da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 09:43:10 +0000
Subject: [PATCH 38/42] python312Packages.publicsuffixlist: 1.0.2.20241203 ->
 1.0.2.20241205

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

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 76c0347248be..a7fbf07ef01b 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20241203";
+  version = "1.0.2.20241205";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-rx0kVdLEFHTVH2TDZBUC8X/BtpUhEK8bpr4Fg8y/IvA=";
+    hash = "sha256-1h6Zdt9TA/7os/Qe3kK8slJUTmErHhEyXlzW+OsB5Yg=";
   };
 
   build-system = [ setuptools ];

From 0a1505336a29255df9f10bcc8b5bde513664b8fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 09:24:47 +0000
Subject: [PATCH 39/42] gh: 2.63.0 -> 2.63.2

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

diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index 8ee42672be39..f99e8f777d3f 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.63.0";
+  version = "2.63.2";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-r60mqFMvgZ39hBjehHrjqDsCzznyQDcXJmqIrn62Jvw=";
+    hash = "sha256-MxgwnRTIJFpYhZZhyc59ZAzgi6ud7mHpdSIImMlkwtg=";
   };
 
-  vendorHash = "sha256-vdyArSBBF6ImYbwzAJCWbLihCtJuvxN6ooymwj32ywQ=";
+  vendorHash = "sha256-UCEtvEpfoyJs5lpoAfMehg5cFQ3XlESRT8XFIwvyYas=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From bce3c80f903de3772113617b9af8f36f0fb01fdd Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Fri, 6 Dec 2024 11:25:05 +0100
Subject: [PATCH 40/42] nixos/release-notes: Fix broken option links

Replace `option.html` with `options.html`, which is the actual filename.
---
 nixos/doc/manual/release-notes/rl-2205.section.md |  2 +-
 nixos/doc/manual/release-notes/rl-2411.section.md | 12 ++++++------
 nixos/doc/manual/release-notes/rl-2505.section.md |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 2f869b07e072..c21e36403161 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -109,7 +109,7 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [Maddy](https://maddy.email/), a free an open source mail server. Available as [services.maddy](#opt-services.maddy.enable).
 
-- [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](option.html#opt-services.matrix-conduit.enable).
+- [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](options.html#opt-services.matrix-conduit.enable).
 
 - [Moosefs](https://moosefs.com), fault tolerant petabyte distributed file system. Available as [moosefs](#opt-services.moosefs.master.enable).
 
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 15dbea0b1283..84c2f6fe344a 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -173,11 +173,11 @@
 
 - [Suricata](https://suricata.io/), a free and open source, mature, fast and robust network threat detection engine. Available as [services.suricata](options.html#opt-services.suricata.enable).
 
-- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld.enable).
+- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](options.html#opt-services.playerctld.enable).
 
-- [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](option.html#opt-services.glance.enable).
+- [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](options.html#opt-services.glance.enable).
 
-- [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](option.html#opt-services.tika.enable).
+- [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](options.html#opt-services.tika.enable).
 
 - [Misskey](https://misskey-hub.net/en/), an interplanetary microblogging platform. Available as [services.misskey](options.html#opt-services.misskey.enable).
 
@@ -199,7 +199,7 @@
 
 - [ToDesk](https://www.todesk.com/linux.html), a remote desktop application. Available as [services.todesk](#opt-services.todesk.enable).
 
-- [Dependency Track](https://dependencytrack.org/), an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Available as [services.dependency-track](option.html#opt-services.dependency-track.enable).
+- [Dependency Track](https://dependencytrack.org/), an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Available as [services.dependency-track](options.html#opt-services.dependency-track.enable).
 
 - [Immich](https://github.com/immich-app/immich), a self-hosted photo and video backup solution. Available as [services.immich](#opt-services.immich.enable).
 
@@ -215,9 +215,9 @@
 
 - [Swapspace](https://github.com/Tookmund/Swapspace), a dynamic swap space manager that turns your unused free space into swap automatically. Available as [services.swapspace](#opt-services.swapspace.enable).
 
-- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](option.html#opt-services.zapret.enable).
+- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](options.html#opt-services.zapret.enable).
 
-- [Glances](https://github.com/nicolargo/glances), an open-source system cross-platform monitoring tool. Available as [services.glances](option.html#opt-services.glances).
+- [Glances](https://github.com/nicolargo/glances), an open-source system cross-platform monitoring tool. Available as [services.glances](options.html#opt-services.glances).
 
 ## Backward Incompatibilities {#sec-release-24.11-incompatibilities}
 
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index d98e9aa36425..32f60ddcf7d9 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -12,15 +12,15 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](option.html#opt-services.kimai).
+- [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](options.html#opt-services.kimai).
 
 - [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable).
 
 - [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable).
 
-- [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](#opt-services.amazon-cloudwatch-agent.enable).
+- [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](options.html#opt-services.amazon-cloudwatch-agent.enable).
 
-- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](#opt-services.agorakit.enable).
+- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable).
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 

From 4f8eb8d6b372addadd81c837afa027c6ff7fd15b Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Fri, 29 Nov 2024 01:22:26 +0100
Subject: [PATCH 41/42] ocamlPackages.reason-react: init at 0.15.0

---
 .../ocaml-modules/reason-react/default.nix    | 23 ++++++++++++++
 .../ocaml-modules/reason-react/ppx.nix        | 31 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 +++
 3 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/reason-react/default.nix
 create mode 100644 pkgs/development/ocaml-modules/reason-react/ppx.nix

diff --git a/pkgs/development/ocaml-modules/reason-react/default.nix b/pkgs/development/ocaml-modules/reason-react/default.nix
new file mode 100644
index 000000000000..340b0c1c27b1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-react/default.nix
@@ -0,0 +1,23 @@
+{
+  buildDunePackage,
+  melange,
+  reason,
+  reason-react-ppx,
+}:
+
+buildDunePackage {
+  pname = "reason-react";
+  inherit (reason-react-ppx) version src;
+  nativeBuildInputs = [
+    reason
+    melange
+  ];
+  buildInputs = [
+    reason-react-ppx
+    melange
+  ];
+  doCheck = true;
+  meta = reason-react-ppx.meta // {
+    description = "Reason bindings for React.js";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/reason-react/ppx.nix b/pkgs/development/ocaml-modules/reason-react/ppx.nix
new file mode 100644
index 000000000000..16068a1e6358
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-react/ppx.nix
@@ -0,0 +1,31 @@
+{
+  buildDunePackage,
+  fetchurl,
+  lib,
+  ppxlib,
+}:
+
+let
+  version = "0.15.0";
+in
+buildDunePackage {
+  pname = "reason-react-ppx";
+  inherit version;
+  minimalOCamlVersion = "4.14";
+  src = fetchurl {
+    url = "https://github.com/reasonml/reason-react/releases/download/${version}/reason-react-${version}.tbz";
+    hash = "sha256-+pPJo/b50vp4pAC/ygI1LHB5O0pDJ1xpcQZOdFP8Q80=";
+  };
+  buildInputs = [
+    ppxlib
+  ];
+  doCheck = false; # Needs to run in reason-react, see default.nix
+  meta = {
+    description = "React.js JSX PPX";
+    homepage = "https://github.com/reasonml/reason-react";
+    license = lib.licenses.mit;
+    maintainers = [
+      lib.maintainers.vog
+    ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 35cb14aff535..85ef3bb1ce10 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1650,6 +1650,10 @@ let
 
     reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { });
 
+    reason-react = callPackage ../development/ocaml-modules/reason-react { };
+
+    reason-react-ppx = callPackage ../development/ocaml-modules/reason-react/ppx.nix { };
+
     rebez = callPackage ../development/ocaml-modules/rebez { };
 
     reperf = callPackage ../development/ocaml-modules/reperf { };

From 13ba4d646c8861b160deddc19fe3aed6d2bb9400 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 10:06:44 +0000
Subject: [PATCH 42/42] kdiff3: 1.11.4 -> 1.11.5

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

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index 69aa0f50e665..f296460e96eb 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kdiff3";
-  version = "1.11.4";
+  version = "1.11.5";
 
   src = fetchurl {
     url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz";
-    hash = "sha256-rt573JqpZ1rukP0qNScFLtMbMJGNQuaQelksunzmp8M=";
+    hash = "sha256-Qg8Ys7lolpigXhAvikFxkEkHTaaPlslL4Y0bgpfutUU=";
   };
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ];