From e445971f487b50f9ed3f4bd77df8b77c64405990 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Thu, 3 Oct 2024 14:29:08 +0200
Subject: [PATCH 001/229] physfs: don't set CMAKE_SKIP_RPATH

---
 pkgs/development/libraries/physfs/default.nix    |  4 ++++
 .../physfs/dont-set-cmake-skip-rpath-2.1.1.patch | 16 ++++++++++++++++
 .../physfs/dont-set-cmake-skip-rpath-3.2.0.patch | 13 +++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch
 create mode 100644 pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch

diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix
index e00be9c841f9d..efe5b4bc6a274 100644
--- a/pkgs/development/libraries/physfs/default.nix
+++ b/pkgs/development/libraries/physfs/default.nix
@@ -13,6 +13,10 @@ let
       inherit sha256;
     };
 
+    patches = [
+      ./dont-set-cmake-skip-rpath-${version}.patch
+    ];
+
     nativeBuildInputs = [ cmake doxygen ];
 
     buildInputs = [ zlib ]
diff --git a/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch
new file mode 100644
index 0000000000000..fbd048499cf35
--- /dev/null
+++ b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b4ef61e..7b2f26c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,11 +29,6 @@ if(APPLE)
+     set(PHYSFS_M_SRCS src/physfs_platform_apple.m)
+ endif()
+ 
+-if(CMAKE_COMPILER_IS_GNUCC)
+-    # Don't use -rpath.
+-    set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
+-endif()
+-
+ if(CMAKE_C_COMPILER_ID STREQUAL "SunPro")
+     add_definitions(-erroff=E_EMPTY_TRANSLATION_UNIT)
+     add_definitions(-xldscope=hidden)
diff --git a/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch
new file mode 100644
index 0000000000000..3811d1bd2e9de
--- /dev/null
+++ b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b3291cc..11e7ad1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,8 +32,6 @@ endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+     add_compile_options(-Wall)
+-    # Don't use -rpath.
+-    set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
+ endif()
+ 
+ if(CMAKE_C_COMPILER_ID STREQUAL "SunPro")

From a4008da2d49de77e0da4391db1ae681a143233a3 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Wed, 9 Oct 2024 15:07:58 +0200
Subject: [PATCH 002/229] nixos/systemd-boot: Don't write to /etc/machine-id

This reverts commit 4daccf208feccb027731d3fc8dc2686ab9ef3428

The reverted commit claims that bootctl fails if machine-id is not set.
I can not reproduce this. I think this has since been fixed now that
bootctl has support for arbtirary entry-tokens and not just machine-id.

In the case of NixOS the entry-token is the string "nixos"
---
 .../boot/loader/systemd-boot/systemd-boot-builder.py      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index d2ba1e54e22e7..421fde5b07af2 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -159,7 +159,7 @@ def copy_from_file(file: str, dry_run: bool = False) -> str:
 
 
 def write_entry(profile: str | None, generation: int, specialisation: str | None,
-                machine_id: str, bootspec: BootSpec, current: bool) -> None:
+                machine_id: str | None, bootspec: BootSpec, current: bool) -> None:
     if specialisation:
         bootspec = bootspec.specialisations[specialisation]
     kernel = copy_from_file(bootspec.kernel)
@@ -281,11 +281,7 @@ def install_bootloader(args: argparse.Namespace) -> None:
     except IOError as e:
         if e.errno != errno.ENOENT:
             raise
-        # Since systemd version 232 a machine ID is required and it might not
-        # be there on newly installed systems, so let's generate one so that
-        # bootctl can find it and we can also pass it to write_entry() later.
-        cmd = [f"{SYSTEMD}/bin/systemd-machine-id-setup", "--print"]
-        machine_id = run(cmd, stdout=subprocess.PIPE).stdout.rstrip()
+        machine_id = None
 
     if os.getenv("NIXOS_INSTALL_GRUB") == "1":
         warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning)

From 627221c26208d7ed3db88bb4b07cf4e40e4e7a7f Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Wed, 9 Oct 2024 15:09:24 +0200
Subject: [PATCH 003/229] nixos/make-disk-image: Remove hack that cleans up
 machine-id

machine-id is not written by the install bootloader step anymore
so this step is also not needed
---
 nixos/lib/make-disk-image.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index a943edb7b574e..10e3b22f4cec2 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -616,9 +616,6 @@ let format' = format; in let
         # __noChroot for example).
         export HOME=$TMPDIR
         NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root $mountPoint -- /nix/var/nix/profiles/system/bin/switch-to-configuration boot
-
-        # The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images
-        rm -f $mountPoint/etc/machine-id
       ''}
 
       # Set the ownerships of the contents. The modes are set in preVM.

From c258e18f67a5d39d4d2902f84201af4b6dac40b8 Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Mon, 21 Oct 2024 19:00:20 +0000
Subject: [PATCH 004/229] nixos/auto-cpufreq: init vm test

Even though cpufreq cannot be adjusted within qemu this test is still
useful to ensure that the service is running and the auto-cpufreq cli is
able to interact with the auto-cpufreq service.
---
 nixos/tests/all-tests.nix    |  1 +
 nixos/tests/auto-cpufreq.nix | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 nixos/tests/auto-cpufreq.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 8b674bfb73423..c9cab8bb41af1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -141,6 +141,7 @@ in {
   audiobookshelf = handleTest ./audiobookshelf.nix {};
   auth-mysql = handleTest ./auth-mysql.nix {};
   authelia = handleTest ./authelia.nix {};
+  auto-cpufreq = handleTest ./auto-cpufreq.nix {};
   avahi = handleTest ./avahi.nix {};
   avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };
   ayatana-indicators = runTest ./ayatana-indicators.nix;
diff --git a/nixos/tests/auto-cpufreq.nix b/nixos/tests/auto-cpufreq.nix
new file mode 100644
index 0000000000000..79129cf1ffaf2
--- /dev/null
+++ b/nixos/tests/auto-cpufreq.nix
@@ -0,0 +1,33 @@
+import ./make-test-python.nix (
+  { pkgs, ... }:
+
+  {
+    name = "auto-cpufreq-server";
+
+    nodes = {
+      machine =
+        { pkgs, ... }:
+        {
+          # service will still start but since vm inside qemu cpufreq adjustments
+          # cannot be made. This will resource in the following error but the service
+          # remains up:
+          #   ERROR:
+          #   Couldn't find any of the necessary scaling governors.
+          services.auto-cpufreq = {
+            enable = true;
+            settings = {
+              charger = {
+                turbo = "auto";
+              };
+            };
+          };
+        };
+    };
+
+    testScript = ''
+      machine.start()
+      machine.wait_for_unit("auto-cpufreq.service")
+      machine.succeed("auto-cpufreq --force reset")
+    '';
+  }
+)

From c574adecc908290bbe53437e6c7f2ae19bb29548 Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Tue, 29 Oct 2024 13:52:28 +0000
Subject: [PATCH 005/229] auto-cpufreq: add passthru.tests

---
 pkgs/by-name/au/auto-cpufreq/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix
index 15db7faa4089b..512d2fc3c788b 100644
--- a/pkgs/by-name/au/auto-cpufreq/package.nix
+++ b/pkgs/by-name/au/auto-cpufreq/package.nix
@@ -7,6 +7,7 @@
   wrapGAppsHook3,
   gtk3,
   getent,
+  nixosTests,
 }:
 python3Packages.buildPythonPackage rec {
   pname = "auto-cpufreq";
@@ -93,6 +94,10 @@ python3Packages.buildPythonPackage rec {
     cp scripts/org.auto-cpufreq.pkexec.policy $out/share/polkit-1/actions
   '';
 
+  passthru.tests = {
+    inherit (nixosTests) auto-cpufreq;
+  };
+
   meta = {
     mainProgram = "auto-cpufreq";
     homepage = "https://github.com/AdnanHodzic/auto-cpufreq";

From 745f78a683e893579e19540b2571693c06799026 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 30 Sep 2024 21:37:08 +0100
Subject: [PATCH 006/229] nixos/komga: introduce 'settings' option

---
 nixos/modules/services/web-apps/komga.nix | 62 ++++++++++++++++++++---
 1 file changed, 54 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/web-apps/komga.nix b/nixos/modules/services/web-apps/komga.nix
index d7ab2a9e612ef..5245552b21305 100644
--- a/nixos/modules/services/web-apps/komga.nix
+++ b/nixos/modules/services/web-apps/komga.nix
@@ -9,18 +9,31 @@ let
   cfg = config.services.komga;
   inherit (lib) mkOption mkEnableOption maintainers;
   inherit (lib.types) port str bool;
+
+  settingsFormat = pkgs.formats.yaml { };
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [
+        "services"
+        "komga"
+        "port"
+      ]
+      [
+        "services"
+        "komga"
+        "settings"
+        "server"
+        "port"
+      ]
+    )
+  ];
+
   options = {
     services.komga = {
       enable = mkEnableOption "Komga, a free and open source comics/mangas media server";
 
-      port = mkOption {
-        type = port;
-        default = 8080;
-        description = "The port that Komga will listen on.";
-      };
-
       user = mkOption {
         type = str;
         default = "komga";
@@ -39,10 +52,25 @@ in
         description = "State and configuration directory Komga will use.";
       };
 
+      settings = lib.mkOption {
+        inherit (settingsFormat) type;
+        default = { };
+        defaultText = lib.literalExpression ''
+          {
+            server.port = 8080;
+          }
+        '';
+        description = ''
+          Komga configuration.
+
+          See [documentation](https://komga.org/docs/installation/configuration).
+        '';
+      };
+
       openFirewall = mkOption {
         type = bool;
         default = false;
-        description = "Whether to open the firewall for the port in {option}`services.komga.port`.";
+        description = "Whether to open the firewall for the port in {option}`services.komga.settings.server.port`.";
       };
     };
   };
@@ -52,6 +80,16 @@ in
       inherit (lib) mkIf getExe;
     in
     mkIf cfg.enable {
+      assertions = [
+        {
+          assertion = (cfg.settings.komga.config-dir or cfg.stateDir) == cfg.stateDir;
+          message = "You must use the `services.komga.stateDir` option to properly configure `komga.config-dir`.";
+        }
+      ];
+
+      services.komga.settings = {
+        server.port = lib.mkDefault 8080;
+      };
 
       networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
 
@@ -66,9 +104,17 @@ in
         };
       };
 
+      systemd.tmpfiles.settings."10-komga" = {
+        ${cfg.stateDir}.d = {
+          inherit (cfg) user group;
+        };
+        "${cfg.stateDir}/application.yml"."L+" = {
+          argument = builtins.toString (settingsFormat.generate "application.yml" cfg.settings);
+        };
+      };
+
       systemd.services.komga = {
         environment = {
-          SERVER_PORT = builtins.toString cfg.port;
           KOMGA_CONFIGDIR = cfg.stateDir;
         };
 

From 3f182f399fc9667a23aac32bc1108002f1ccbae2 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 30 Sep 2024 21:38:17 +0100
Subject: [PATCH 007/229] nixos/tests/komga: fix renamed 'port' option

---
 nixos/tests/komga.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/komga.nix b/nixos/tests/komga.nix
index d48d19bbbdd37..e5eee346350d0 100644
--- a/nixos/tests/komga.nix
+++ b/nixos/tests/komga.nix
@@ -8,7 +8,7 @@ import ./make-test-python.nix ({ lib, ... }:
     { pkgs, ... }:
     { services.komga = {
         enable = true;
-        port = 1234;
+        settings.server.port = 1234;
       };
     };
 

From 197e68c0d34ae1ae91e50dbf57918d13a681d7ed Mon Sep 17 00:00:00 2001
From: KSJ2000 <katsho123@outlook.com>
Date: Thu, 14 Nov 2024 11:06:11 +0200
Subject: [PATCH 008/229] dmg2img: 1.6.7 -> 1.6.7-unstable-2020-12-27

---
 pkgs/by-name/dm/dmg2img/package.nix | 55 +++++++++++++++++++----------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/dm/dmg2img/package.nix b/pkgs/by-name/dm/dmg2img/package.nix
index 8b1e997ff7367..ff93db42d28e5 100644
--- a/pkgs/by-name/dm/dmg2img/package.nix
+++ b/pkgs/by-name/dm/dmg2img/package.nix
@@ -1,33 +1,50 @@
-{ lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }:
+{
+  bzip2,
+  fetchFromGitHub,
+  lib,
+  openssl,
+  stdenv,
+  unstableGitUpdater,
+  zlib,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dmg2img";
-  version = "1.6.7";
+  version = "1.6.7-unstable-2020-12-27";
 
-  src = fetchurl {
-    url = "http://vu1tur.eu.org/tools/dmg2img-${version}.tar.gz";
-    sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2";
+  src = fetchFromGitHub {
+    owner = "Lekensteyn";
+    repo = "dmg2img";
+    rev = "a3e413489ccdd05431401357bf21690536425012";
+    hash = "sha256-DewU5jz2lRjIRiT0ebjPRArsoye33xlEGfhzd4xnT4A=";
   };
 
-  buildInputs = [ zlib bzip2 openssl ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/dmg2img/openssl-1.1.diff";
-      sha256 = "076sz69hf3ryylplg025vl8sj991cb81g3yazsmrf8anrd7ffmxx";
-    })
+  buildInputs = [
+    bzip2
+    openssl
+    zlib
   ];
 
-  patchFlags = [ "-p0" ];
+  preBuild = ''
+    sed -i "s/1.6.5/${finalAttrs.version}/" dmg2img.c
+  '';
 
   installPhase = ''
-    install -D dmg2img $out/bin/dmg2img
-    install -D vfdecrypt $out/bin/vfdecrypt
+    runHook preInstall
+
+    install -Dm755 dmg2img vfdecrypt -t $out/bin
+
+    runHook postInstall
   '';
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = {
+    description = "Tool which allows converting Apple compressed dmg archives to standard (hfsplus) image disk files";
+    homepage = "https://github.com/Lekensteyn/dmg2img";
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
-    description = "Apple's compressed dmg to standard (hfsplus) image disk file convert tool";
-    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ KSJ2000 ];
+    mainProgram = "dmg2img";
   };
-}
+})

From 1714b4c1755f57b57299e7ead398b74d74e34206 Mon Sep 17 00:00:00 2001
From: Anna Aurora <anna@annaaurora.eu>
Date: Mon, 4 Nov 2024 19:07:07 +0100
Subject: [PATCH 009/229] kaufkauflist: 4.0.0 -> 4.0.2

---
 pkgs/by-name/ka/kaufkauflist/package.nix | 47 ++++++++++++++----------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ka/kaufkauflist/package.nix b/pkgs/by-name/ka/kaufkauflist/package.nix
index 895567ba659b3..8fb3073405a44 100644
--- a/pkgs/by-name/ka/kaufkauflist/package.nix
+++ b/pkgs/by-name/ka/kaufkauflist/package.nix
@@ -1,37 +1,44 @@
-{ lib
-, buildPackages
-, fetchFromGitHub
-, buildNpmPackage
-, fetchFromGitea
-, nix-update-script
+{
+  lib,
+  buildPackages,
+  fetchFromGitHub,
+  buildNpmPackage,
+  fetchFromGitea,
+  nix-update-script,
 }:
 
 let
   esbuild' = buildPackages.esbuild.override {
-    buildGoModule = args: buildPackages.buildGoModule (args // rec {
-      version = "0.19.11";
-      src = fetchFromGitHub {
-        owner = "evanw";
-        repo = "esbuild";
-        rev = "v${version}";
-        hash = "sha256-NUwjzOpHA0Ijuh0E69KXx8YVS5GTnKmob9HepqugbIU=";
-      };
-      vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
-    });
+    buildGoModule =
+      args:
+      buildPackages.buildGoModule (
+        args
+        // rec {
+          version = "0.21.5";
+          src = fetchFromGitHub {
+            owner = "evanw";
+            repo = "esbuild";
+            rev = "v${version}";
+            hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";
+          };
+          vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+        }
+      );
   };
-in buildNpmPackage rec {
+in
+buildNpmPackage rec {
   pname = "kaufkauflist";
-  version = "4.0.0";
+  version = "4.0.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "annaaurora";
     repo = "kaufkauflist";
     rev = "v${version}";
-    hash = "sha256-x30K2dYxawfebdq//9OmCCG48w0V04tDTXpvRW7lfJI=";
+    hash = "sha256-tvkicYFQewQdcz3e+ETLiCK/c3eNPlxxZNzt+OpIbN0=";
   };
 
-  npmDepsHash = "sha256-E3AXFwiRvrE2Swt7BfSfAoU5mQplSaSJ4q56pVfoEkQ=";
+  npmDepsHash = "sha256-HDv6sW6FmKZpUjymrUjz/WG9XrKgLmM6qHMAxP6gBtU=";
 
   ESBUILD_BINARY_PATH = lib.getExe esbuild';
 

From 83149d48fd418792b7d3aeb9a3809fe49f83afae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 17:27:44 +0000
Subject: [PATCH 010/229] python312Packages.openturns: 1.23 -> 1.24

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

diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix
index 5d62a61c2e951..17b192621e26b 100644
--- a/pkgs/by-name/op/openturns/package.nix
+++ b/pkgs/by-name/op/openturns/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openturns";
-  version = "1.23";
+  version = "1.24";
 
   src = fetchFromGitHub {
     owner = "openturns";
     repo = "openturns";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-csl5cZvxU8fdLKvh04ZWKizClrHqF79c7tAMSejo2lk=";
+    hash = "sha256-88wxgifLuF/P/qeMLVP0S5Agutf022Dsysu38mh9+8w=";
   };
 
   nativeBuildInputs = [

From e77fad204986754611f5ce95e4f315d0f8a0d8c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 17:24:15 +0000
Subject: [PATCH 011/229] python312Packages.cheetah3: 3.3.3.post1 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
index 6c89ea73cdbf5..0352fd8714d04 100644
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "cheetah3";
-  version = "3.3.3.post1";
+  version = "3.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "CheetahTemplate3";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-0NVKie/6Fp8T1O1fvrVorycybLrEXMY1yXZBDyxjpbE=";
+    hash = "sha256-yIdswcCuoDR3R/Subl22fKB55pgw/sDkrPy+vwNgaxI=";
   };
 
   doCheck = false; # Circular dependency

From 33d4a53bcbe432bdb4e9c160cf06af124a59ffbc Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Fri, 13 Dec 2024 20:43:49 +0100
Subject: [PATCH 012/229] tsm-client: update support URLs

IBM changed their website URLs.

The previous link to "Hardware and Software Requirements"
(explaining optional dependencies like acl and lvm)
disappeared and I can't find a new public link.
As the information still seems correct
(e.g. libdevmapper still enables additional functionality,
as can be deduced from
https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=errors-resolving-linux-image-backup ),
I replaced the URL with a link to the web archive.

The download explanation is no longer necessary;
new versions can be found directly on the `downloadPage` now.
---
 pkgs/by-name/ts/tsm-client/package.nix | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ts/tsm-client/package.nix b/pkgs/by-name/ts/tsm-client/package.nix
index 4faf16f63af39..be8a2c0f29a34 100644
--- a/pkgs/by-name/ts/tsm-client/package.nix
+++ b/pkgs/by-name/ts/tsm-client/package.nix
@@ -23,7 +23,7 @@
 
 # For an explanation of optional packages
 # (features provided by them, version limits), see
-# https://www.ibm.com/support/pages/node/660813#Version%208.1
+# https://web.archive.org/web/20240118051918/https://www.ibm.com/support/pages/node/660813#Version%208.1
 
 # IBM Tivoli Storage Manager Client uses a system-wide
 # client system-options file `dsm.sys` and expects it
@@ -46,24 +46,11 @@
 # depending on local configuration or usage; see:
 # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=solaris-set-api-environment-variables
 
-# The newest version of TSM client should be discoverable by
-# going to the `downloadPage` (see `meta` below).
-# Find the "Backup-archive client" table on that page.
-# Look for "Download Documents" of the latest release.
-# Follow the "Download Information" link.
-# Look for the "Linux x86_64 ..." rows in the table at
-# the bottom of the page and follow their "HTTPS" links (one
-# link per row -- each link might point to the latest release).
-# In the directory listings to show up,
-# check the big `.tar` file.
-#
-# (as of 2023-07-01)
-
 let
 
   meta = {
     homepage = "https://www.ibm.com/products/storage-protect";
-    downloadPage = "https://www.ibm.com/support/pages/ibm-storage-protect-downloads-latest-fix-packs-and-interim-fixes";
+    downloadPage = "https://www.ibm.com/support/fixcentral/swg/selectFixes?product=ibm/StorageSoftware/IBM+Spectrum+Protect";
     platforms = [ "x86_64-linux" ];
     mainProgram = "dsmc";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

From 2f85e9679c8c8974f85e4db9be9138134d539637 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Fri, 13 Dec 2024 20:53:32 +0100
Subject: [PATCH 013/229] tsm-client: 8.1.24.0 -> 8.1.25.0

Readme: https://www.ibm.com/support/pages/node/597891#Readme_8125
(At the time of this writingn,
most URLs in there lead to a login portal.
This might change with time.)
---
 nixos/modules/programs/tsm-client.nix  | 2 +-
 nixos/modules/services/backup/tsm.nix  | 2 +-
 pkgs/by-name/ts/tsm-client/package.nix | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix
index 9e50e38acc924..abbcfa9055eb4 100644
--- a/nixos/modules/programs/tsm-client.nix
+++ b/nixos/modules/programs/tsm-client.nix
@@ -75,7 +75,7 @@ let
     {
       freeformType = attrsOf (either scalarType (listOf scalarType));
       # Client system-options file directives are explained here:
-      # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=commands-processing-options
+      # https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=commands-processing-options
       options.servername = mkOption {
         type = servernameType;
         default = name;
diff --git a/nixos/modules/services/backup/tsm.nix b/nixos/modules/services/backup/tsm.nix
index 8dd27ccd23424..697f798b7fcfa 100644
--- a/nixos/modules/services/backup/tsm.nix
+++ b/nixos/modules/services/backup/tsm.nix
@@ -89,7 +89,7 @@ in
       environment.HOME = "/var/lib/tsm-backup";
       serviceConfig = {
         # for exit status description see
-        # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=clients-client-return-codes
+        # https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=clients-client-return-codes
         SuccessExitStatus = "4 8";
         # The `-se` option must come after the command.
         # The `-optfile` option suppresses a `dsm.opt`-not-found warning.
diff --git a/pkgs/by-name/ts/tsm-client/package.nix b/pkgs/by-name/ts/tsm-client/package.nix
index be8a2c0f29a34..4a0c20b02e3d2 100644
--- a/pkgs/by-name/ts/tsm-client/package.nix
+++ b/pkgs/by-name/ts/tsm-client/package.nix
@@ -44,7 +44,7 @@
 # point to this derivations `/dsmi_dir` directory symlink.
 # Other environment variables might be necessary,
 # depending on local configuration or usage; see:
-# https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=solaris-set-api-environment-variables
+# https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=solaris-set-api-environment-variables
 
 let
 
@@ -91,10 +91,10 @@ let
 
   unwrapped = stdenv.mkDerivation (finalAttrs: {
     name = "tsm-client-${finalAttrs.version}-unwrapped";
-    version = "8.1.24.0";
+    version = "8.1.25.0";
     src = fetchurl {
       url = mkSrcUrl finalAttrs.version;
-      hash = "sha512-TqTDE2oJK/Wu/MNYUCqxmOE6asAqDLz4GtdcFZuKqvfT8pJUCYKz9yjRPIrM3u2XfLH0wDq+Q8ER4ui680mswA==";
+      hash = "sha512-OPNjSMnWJ/8Ogy9O0wG0H4cEbYiOwyCVzkWhpG00v/Vm0LDxLzPteMnMOyH8L1egIDhy7lmQYSzI/EC4WWUDDA==";
     };
     inherit meta passthru;
 

From b0a3a9a52f0ac9bef834a3e45d511776afe95aad Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Fri, 13 Dec 2024 21:51:49 -0800
Subject: [PATCH 014/229] nixos/lib/eval-config: Add warning when masking pkgs

---
 nixos/lib/eval-config.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 8bab3752073ff..ad028013f65f8 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -65,6 +65,14 @@ let
   withWarnings = x:
     lib.warnIf (evalConfigArgs?extraArgs) "The extraArgs argument to eval-config.nix is deprecated. Please set config._module.args instead."
     lib.warnIf (evalConfigArgs?check) "The check argument to eval-config.nix is deprecated. Please set config._module.check instead."
+    lib.warnIf (specialArgs?pkgs) ''
+      You have set specialArgs.pkgs, which means that options like nixpkgs.config
+      and nixpkgs.overlays will be ignored. If you wish to reuse an already created
+      pkgs, which you know is configured correctly for this NixOS configuration,
+      please import the `nixosModules.pkgsReadOnly` module from the nixpkgs flake or
+      `(modulesPath + "/misc/nixpkgs/read-only.nix"), and set `{ nixpkgs.pkgs = <your pkgs>; }`.
+      This properly disables the ignored options to prevent future surprises.
+    ''
     x;
 
   legacyModules =

From a8f9a8d18febe4179defb145a7d426f4051e7694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 14 Dec 2024 12:28:50 -0800
Subject: [PATCH 015/229] python312Packages.netcdf4: 1.7.1.post2 -> 1.7.2

Diff: https://github.com/Unidata/netcdf4-python/compare/v1.7.1.post2...v1.7.2rel

Changelog: https://github.com/Unidata/netcdf4-python/raw/v1.7.2rel/Changelog
---
 .../python-modules/netcdf4/default.nix        | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 056949ef2f971..1ce4ac8c01f38 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -5,7 +5,7 @@
   cftime,
   curl,
   cython,
-  fetchPypi,
+  fetchFromGitHub,
   hdf5,
   isPyPy,
   libjpeg,
@@ -20,16 +20,23 @@
   zlib,
 }:
 
-buildPythonPackage rec {
+let
+  version = "1.7.2";
+  suffix = lib.optionalString (lib.match ''.*\.post[0-9]+'' version == null) "rel";
+  tag = "v${version}${suffix}";
+in
+buildPythonPackage {
   pname = "netcdf4";
-  version = "1.7.1.post2";
+  inherit version;
   pyproject = true;
 
   disabled = isPyPy || pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-N9VX42ZUiJ1wIBkr+1b51fk4lMsymX64N65YbFOP17Y=";
+  src = fetchFromGitHub {
+    owner = "Unidata";
+    repo = "netcdf4-python";
+    inherit tag;
+    hash = "sha256-orwCHKOSam+2eRY/yAduFYWREOkJlWIJGIZPZwQZ/RI=";
   };
 
   postPatch = ''
@@ -43,20 +50,27 @@ buildPythonPackage rec {
     wheel
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     certifi
     cftime
+    numpy
+  ];
+
+  buildInputs = [
     curl
     hdf5
     libjpeg
     netcdf
-    numpy
     zlib
   ];
 
   checkPhase = ''
+    runHook preCheck
+
     pushd test/
     NO_NET=1 NO_CDL=1 ${python.interpreter} run_all.py
+
+    runHook postCheck
   '';
 
   env = {
@@ -73,7 +87,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Interface to netCDF library (versions 3 and 4)";
     homepage = "https://github.com/Unidata/netcdf4-python";
-    changelog = "https://github.com/Unidata/netcdf4-python/raw/v${version}/Changelog";
+    changelog = "https://github.com/Unidata/netcdf4-python/raw/${tag}/Changelog";
     maintainers = [ ];
     license = licenses.mit;
   };

From 54f369fab9768dca493a6a61e49a8136b8794608 Mon Sep 17 00:00:00 2001
From: Dopplerian <dopplerian+git@proton.me>
Date: Mon, 16 Dec 2024 13:00:54 +0100
Subject: [PATCH 016/229] maintainers: add dopplerian

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0fd6c5d4807f5..82926fa6f0f1b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5860,6 +5860,12 @@
     githubId = 57304299;
     keys = [ { fingerprint = "33CD 5C0A 673C C54D 661E  5E4C 0DB5 361B EEE5 30AB"; } ];
   };
+  dopplerian = {
+    name = "Dopplerian";
+    github = "Dopplerian";
+    githubId = 53937537;
+    keys = [ { fingerprint = "BBC4 C071 516B A147 8D07  F9DC D2FD E6EC 2E8C 2BF4"; } ];
+  };
   doriath = {
     email = "tomasz.zurkowski@gmail.com";
     github = "doriath";

From 802a0aca8d7fdec58710cf0cdc55d83ccc2707f6 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Wed, 18 Dec 2024 19:21:05 +0000
Subject: [PATCH 017/229] regripper: fix perl libs not in path

This prevented the program from working at all.
For perl libs to be loaded, they have to be in PERL5PATH.
---
 pkgs/by-name/re/regripper/package.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/re/regripper/package.nix b/pkgs/by-name/re/regripper/package.nix
index ac5405d72fda7..4f0b9e429fac7 100644
--- a/pkgs/by-name/re/regripper/package.nix
+++ b/pkgs/by-name/re/regripper/package.nix
@@ -2,12 +2,17 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  makeWrapper,
   perl,
   perlPackages,
-  runtimeShell,
 }:
 
-stdenv.mkDerivation rec {
+let
+  perlDeps = [
+    perlPackages.ParseWin32Registry
+  ];
+in
+stdenv.mkDerivation {
   pname = "regripper";
   version = "0-unstable-2024-11-02";
 
@@ -18,26 +23,24 @@ stdenv.mkDerivation rec {
     hash = "sha256-dW3Gr4HQH484i47Bg+CEnBYoGQQRMBJr88+YeuU+iV4=";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   propagatedBuildInputs = [
     perl
-    perlPackages.ParseWin32Registry
-  ];
+  ] ++ perlDeps;
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/{bin,share}
 
-    rm -r *.md *.exe *.bat *.dll
+    rm -r *.md *.exe *.bat *.dll *.zip
 
     cp -aR . "$out/share/regripper/"
 
-    cat > "$out/bin/regripper" << EOF
-    #!${runtimeShell}
-    exec ${perl}/bin/perl $out/share/regripper/rip.pl "\$@"
-    EOF
-
-    chmod u+x  "$out/bin/regripper"
+    makeWrapper ${perl}/bin/perl $out/bin/regripper \
+      --add-flags "$out/share/regripper/rip.pl" \
+      --set PERL5LIB ${perlPackages.makeFullPerlPath perlDeps}
 
     runHook postInstall
   '';

From 5613d83ba6753d6a50a641dcb894b5b2d01f9dfa Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Wed, 18 Dec 2024 19:25:19 +0000
Subject: [PATCH 018/229] regripper: 0-unstable-2024-11-02 ->
 0-unstable-2024-12-12

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

diff --git a/pkgs/by-name/re/regripper/package.nix b/pkgs/by-name/re/regripper/package.nix
index 4f0b9e429fac7..82f615ea1dd64 100644
--- a/pkgs/by-name/re/regripper/package.nix
+++ b/pkgs/by-name/re/regripper/package.nix
@@ -14,13 +14,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "regripper";
-  version = "0-unstable-2024-11-02";
+  version = "0-unstable-2024-12-12";
 
   src = fetchFromGitHub {
     owner = "keydet89";
     repo = "RegRipper3.0";
-    rev = "89f3cac57e10bce1a79627e6038353e8e8a0c378";
-    hash = "sha256-dW3Gr4HQH484i47Bg+CEnBYoGQQRMBJr88+YeuU+iV4=";
+    rev = "bdf7ac2500a41319479846fe07202b7e8a61ca1f";
+    hash = "sha256-JEBwTpDck0w85l0q5WjF1d20NyU+GJ89yAzbkUVOsu0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b9d800d46814e44db4d0a0104141aeb54e0c3c9a Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@tweag.io>
Date: Thu, 28 Nov 2024 22:57:12 +0100
Subject: [PATCH 019/229] workflows/eval: Request reviews from changed package
 maintainers

Currently we need to rely on ofborg requesting reviews from package
maintainers, which takes a while with ofborg's eval queue. Since
recently we're doing faster evaluations with GitHub Actions, which contain all
necessary information to determine reviewers of changed packages the
same way ofborg does. This PR takes advantage of that.
---
 .github/workflows/codeowners-v2.yml |   2 +
 .github/workflows/eval.yml          |  26 +++++-
 ci/eval/compare/default.nix         |  22 ++++-
 ci/eval/compare/maintainers.nix     | 123 ++++++++++++++++++++++++++++
 ci/eval/compare/utils.nix           |  40 +++++----
 5 files changed, 189 insertions(+), 24 deletions(-)
 create mode 100644 ci/eval/compare/maintainers.nix

diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index 5cfeafa8489e2..8c1782437a80f 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -19,6 +19,8 @@ name: Codeowners v2
 #
 # This split is done because checking code owners requires handling untrusted PR input,
 # while requesting code owners requires PR write access, and those shouldn't be mixed.
+#
+# Note that the latter is also used for ./eval.yml requesting reviewers.
 
 on:
   pull_request_target:
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index bac9394500ac6..a0604bbc8fcd4 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -132,6 +132,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
+          fetch-depth: 2
           path: nixpkgs
 
       - name: Install Nix
@@ -193,12 +194,18 @@ jobs:
       - name: Compare against the base branch
         if: steps.baseRunId.outputs.baseRunId
         run: |
-          nix-build nixpkgs/ci -A eval.compare \
+          git -C nixpkgs worktree add ../base ${{ needs.attrs.outputs.baseSha }}
+          git -C nixpkgs diff --name-only ${{ needs.attrs.outputs.baseSha }} ${{ needs.attrs.outputs.mergedSha }} \
+            | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
+
+          # Use the base branch to get accurate maintainer info
+          nix-build base/ci -A eval.compare \
             --arg beforeResultDir ./baseResult \
             --arg afterResultDir ./prResult \
+            --arg touchedFilesJson ./touched-files.json \
             -o comparison
+
           cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
-          # TODO: Request reviews from maintainers for packages whose files are modified in the PR
 
       - name: Upload the combined results
         if: steps.baseRunId.outputs.baseRunId
@@ -217,6 +224,14 @@ jobs:
       pull-requests: write
       statuses: write
     steps:
+      # See ./codeowners-v2.yml, reuse the same App because we need the same permissions
+      # Can't use the token received from permissions above, because it can't get enough permissions
+      - uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
+        id: app-token
+        with:
+          app-id: ${{ vars.OWNER_APP_ID }}
+          private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
+
       - name: Download process result
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
@@ -251,6 +266,13 @@ jobs:
               /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \
               -f "labels[]=$toAdd"
           done < <(comm -13 before after)
+
+          # Request reviewers from maintainers of changed output paths
+          GH_TOKEN=${{ steps.app-token.outputs.token }} gh api \
+            --method POST \
+            /repos/${{ github.repository }}/pulls/${{ github.event.number }}/requested_reviewers \
+            --input <(jq '{ reviewers: keys }' comparison/maintainers.json)
+
         env:
           GH_TOKEN: ${{ github.token }}
           REPOSITORY: ${{ github.repository }}
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 4f3b943a5a135..712a656d11add 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -5,7 +5,11 @@
   writeText,
   ...
 }:
-{ beforeResultDir, afterResultDir }:
+{
+  beforeResultDir,
+  afterResultDir,
+  touchedFilesJson,
+}:
 let
   /*
     Derivation that computes which packages are affected (added, changed or removed) between two revisions of nixpkgs.
@@ -77,11 +81,11 @@ let
   # - values: lists of `packagePlatformPath`s
   diffAttrs = diff beforeAttrs afterAttrs;
 
+  rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed);
+  rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
+
   changed-paths =
     let
-      rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed);
-      rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
-
       rebuildsByPlatform = groupByPlatform rebuildsPackagePlatformAttrs;
       rebuildsByKernel = groupByKernel rebuildsPackagePlatformAttrs;
       rebuildCountByKernel = lib.mapAttrs (
@@ -99,10 +103,17 @@ let
         labels = getLabels rebuildCountByKernel;
       }
     );
+
+  maintainers = import ./maintainers.nix {
+    changedattrs = lib.unique (map (a: a.packagePath) rebuildsPackagePlatformAttrs);
+    changedpathsjson = touchedFilesJson;
+  };
 in
 runCommand "compare"
   {
     nativeBuildInputs = [ jq ];
+    maintainers = builtins.toJSON maintainers;
+    passAsFile = [ "maintainers" ];
   }
   ''
     mkdir $out
@@ -110,5 +121,8 @@ runCommand "compare"
     cp ${changed-paths} $out/changed-paths.json
 
     jq -r -f ${./generate-step-summary.jq} < ${changed-paths} > $out/step-summary.md
+
+    cp "$maintainersPath" "$out/maintainers.json"
+
     # TODO: Compare eval stats
   ''
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
new file mode 100644
index 0000000000000..0c08f85cec43b
--- /dev/null
+++ b/ci/eval/compare/maintainers.nix
@@ -0,0 +1,123 @@
+# Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix
+{ changedattrs, changedpathsjson }:
+let
+  pkgs = import ../../.. {
+    system = "x86_64-linux";
+    config = { };
+    overlays = [ ];
+  };
+  inherit (pkgs) lib;
+
+  changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson);
+
+  anyMatchingFile =
+    filename:
+    let
+      matching = builtins.filter (changed: lib.strings.hasSuffix changed filename) changedpaths;
+    in
+    (builtins.length matching) > 0;
+
+  anyMatchingFiles = files: (builtins.length (builtins.filter anyMatchingFile files)) > 0;
+
+  enrichedAttrs = builtins.map (path: {
+    path = path;
+    name = builtins.concatStringsSep "." path;
+  }) changedattrs;
+
+  validPackageAttributes = builtins.filter (
+    pkg:
+    if (lib.attrsets.hasAttrByPath pkg.path pkgs) then
+      (
+        if (builtins.tryEval (lib.attrsets.attrByPath pkg.path null pkgs)).success then
+          true
+        else
+          builtins.trace "Failed to access ${pkg.name} even though it exists" false
+      )
+    else
+      builtins.trace "Failed to locate ${pkg.name}." false
+  ) enrichedAttrs;
+
+  attrsWithPackages = builtins.map (
+    pkg: pkg // { package = lib.attrsets.attrByPath pkg.path null pkgs; }
+  ) validPackageAttributes;
+
+  attrsWithMaintainers = builtins.map (
+    pkg: pkg // { maintainers = (pkg.package.meta or { }).maintainers or [ ]; }
+  ) attrsWithPackages;
+
+  attrsWeCanPing = builtins.filter (
+    pkg:
+    if (builtins.length pkg.maintainers) > 0 then
+      true
+    else
+      builtins.trace "Package has no maintainers: ${pkg.name}" false
+  ) attrsWithMaintainers;
+
+  relevantFilenames =
+    drv:
+    (lib.lists.unique (
+      builtins.map (pos: lib.strings.removePrefix (toString ../..) pos.file) (
+        builtins.filter (x: x != null) [
+          (builtins.unsafeGetAttrPos "maintainers" (drv.meta or { }))
+          (builtins.unsafeGetAttrPos "src" drv)
+          # broken because name is always set by stdenv:
+          #    # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
+          #    # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
+          #    name = assert validity.handled; name + lib.optionalString
+          #(builtins.unsafeGetAttrPos "name" drv)
+          (builtins.unsafeGetAttrPos "pname" drv)
+          (builtins.unsafeGetAttrPos "version" drv)
+
+          # Use ".meta.position" for cases when most of the package is
+          # defined in a "common" section and the only place where
+          # reference to the file with a derivation the "pos"
+          # attribute.
+          #
+          # ".meta.position" has the following form:
+          #   "pkgs/tools/package-management/nix/default.nix:155"
+          # We transform it to the following:
+          #   { file = "pkgs/tools/package-management/nix/default.nix"; }
+          { file = lib.head (lib.splitString ":" (drv.meta.position or "")); }
+        ]
+      )
+    ));
+
+  attrsWithFilenames = builtins.map (
+    pkg: pkg // { filenames = relevantFilenames pkg.package; }
+  ) attrsWithMaintainers;
+
+  attrsWithModifiedFiles = builtins.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames;
+
+  listToPing = lib.lists.flatten (
+    builtins.map (
+      pkg:
+      builtins.map (maintainer: {
+        handle = lib.toLower maintainer.github;
+        packageName = pkg.name;
+        dueToFiles = pkg.filenames;
+      }) pkg.maintainers
+    ) attrsWithModifiedFiles
+  );
+
+  byMaintainer = lib.lists.foldr (
+    ping: collector:
+    collector
+    // {
+      "${ping.handle}" = [
+        { inherit (ping) packageName dueToFiles; }
+      ] ++ (collector."${ping.handle}" or [ ]);
+    }
+  ) { } listToPing;
+
+  textForPackages =
+    packages: lib.strings.concatStringsSep ", " (builtins.map (pkg: pkg.packageName) packages);
+
+  textPerMaintainer = lib.attrsets.mapAttrs (
+    maintainer: packages: "- @${maintainer} for ${textForPackages packages}"
+  ) byMaintainer;
+
+  packagesPerMaintainer = lib.attrsets.mapAttrs (
+    maintainer: packages: builtins.map (pkg: pkg.packageName) packages
+  ) byMaintainer;
+in
+packagesPerMaintainer
diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix
index 82ba64e06a173..04ac4f6e61629 100644
--- a/ci/eval/compare/utils.nix
+++ b/ci/eval/compare/utils.nix
@@ -11,6 +11,7 @@ rec {
     into
       {
         name = "hello";
+        packagePath = [ "hello" ];
         platform = "aarch64-linux";
       }
   */
@@ -30,6 +31,9 @@ rec {
       null
     else
       {
+        # [ "python312Packages" "numpy" ]
+        inherit packagePath;
+
         # python312Packages.numpy
         inherit name;
 
@@ -52,12 +56,12 @@ rec {
       ]
     into
       [
-        { name = "hello"; platform = "aarch64-linux"; }
-        { name = "hello"; platform = "x86_64-linux"; }
-        { name = "hello"; platform = "aarch64-darwin"; }
-        { name = "hello"; platform = "x86_64-darwin"; }
-        { name = "bye"; platform = "aarch64-darwin"; }
-        { name = "bye"; platform = "x86_64-darwin"; }
+        { name = "hello"; platform = "aarch64-linux"; packagePath = [ "hello" ]; }
+        { name = "hello"; platform = "x86_64-linux"; packagePath = [ "hello" ]; }
+        { name = "hello"; platform = "aarch64-darwin"; packagePath = [ "hello" ]; }
+        { name = "hello"; platform = "x86_64-darwin"; packagePath = [ "hello" ]; }
+        { name = "bye"; platform = "aarch64-darwin"; packagePath = [ "hello" ]; }
+        { name = "bye"; platform = "x86_64-darwin"; packagePath = [ "hello" ]; }
       ]
   */
   convertToPackagePlatformAttrs =
@@ -120,12 +124,12 @@ rec {
 
     Turns
       [
-        { name = "hello"; platform = "aarch64-linux"; }
-        { name = "hello"; platform = "x86_64-linux"; }
-        { name = "hello"; platform = "aarch64-darwin"; }
-        { name = "hello"; platform = "x86_64-darwin"; }
-        { name = "bye"; platform = "aarch64-darwin"; }
-        { name = "bye"; platform = "x86_64-darwin"; }
+        { name = "hello"; platform = "aarch64-linux"; ... }
+        { name = "hello"; platform = "x86_64-linux"; ... }
+        { name = "hello"; platform = "aarch64-darwin"; ... }
+        { name = "hello"; platform = "x86_64-darwin"; ... }
+        { name = "bye"; platform = "aarch64-darwin"; ... }
+        { name = "bye"; platform = "x86_64-darwin"; ... }
       ]
     into
       {
@@ -145,12 +149,12 @@ rec {
 
   # Turns
   # [
-  #   { name = "hello"; platform = "aarch64-linux"; }
-  #   { name = "hello"; platform = "x86_64-linux"; }
-  #   { name = "hello"; platform = "aarch64-darwin"; }
-  #   { name = "hello"; platform = "x86_64-darwin"; }
-  #   { name = "bye"; platform = "aarch64-darwin"; }
-  #   { name = "bye"; platform = "x86_64-darwin"; }
+  #   { name = "hello"; platform = "aarch64-linux"; ... }
+  #   { name = "hello"; platform = "x86_64-linux"; ... }
+  #   { name = "hello"; platform = "aarch64-darwin"; ... }
+  #   { name = "hello"; platform = "x86_64-darwin"; ... }
+  #   { name = "bye"; platform = "aarch64-darwin"; ... }
+  #   { name = "bye"; platform = "x86_64-darwin"; ... }
   # ]
   #
   # into

From b844cba4e6fcac4c4ceef81e481a5f93a01e4631 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@tweag.io>
Date: Wed, 18 Dec 2024 22:05:49 +0100
Subject: [PATCH 020/229] workflows/eval: Use maintainer GitHub IDs for review
 requests of changed packages

The handles can change over time and there's nothing guaranteeing the
ones in the maintainer list are up-to-date. In comparison GitHub IDs
never change.
---
 .github/workflows/eval.yml      | 9 ++++++++-
 ci/eval/compare/maintainers.nix | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index a0604bbc8fcd4..487c70f267c9d 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -267,11 +267,18 @@ jobs:
               -f "labels[]=$toAdd"
           done < <(comm -13 before after)
 
+          # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
+          # There appears to be no API to request reviews based on GitHub IDs
+          jq -r 'keys[]' comparison/maintainers.json \
+            | while read -r id; do gh api /user/"$id"; done \
+            | jq -s '{ reviewers: map(.login) }' \
+            > reviewers.json
+
           # Request reviewers from maintainers of changed output paths
           GH_TOKEN=${{ steps.app-token.outputs.token }} gh api \
             --method POST \
             /repos/${{ github.repository }}/pulls/${{ github.event.number }}/requested_reviewers \
-            --input <(jq '{ reviewers: keys }' comparison/maintainers.json)
+            --input reviewers.json
 
         env:
           GH_TOKEN: ${{ github.token }}
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 0c08f85cec43b..6728929952d40 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -92,7 +92,7 @@ let
     builtins.map (
       pkg:
       builtins.map (maintainer: {
-        handle = lib.toLower maintainer.github;
+        id = maintainer.githubId;
         packageName = pkg.name;
         dueToFiles = pkg.filenames;
       }) pkg.maintainers
@@ -103,9 +103,9 @@ let
     ping: collector:
     collector
     // {
-      "${ping.handle}" = [
+      "${toString ping.id}" = [
         { inherit (ping) packageName dueToFiles; }
-      ] ++ (collector."${ping.handle}" or [ ]);
+      ] ++ (collector."${toString ping.id}" or [ ]);
     }
   ) { } listToPing;
 

From 42df0b494b2e4d60a755488a6b7a333235c29458 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 20 Dec 2024 22:21:09 -0500
Subject: [PATCH 021/229] {itk_5_2, python312Packages.itk}: unbreak by
 disabling RTK cmake module

---
 pkgs/development/libraries/itk/generic.nix | 34 +++++++++++++---------
 pkgs/top-level/all-packages.nix            |  1 +
 pkgs/top-level/python-packages.nix         |  1 +
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix
index b569c84e4ed61..3d7c6eb738458 100644
--- a/pkgs/development/libraries/itk/generic.nix
+++ b/pkgs/development/libraries/itk/generic.nix
@@ -32,6 +32,7 @@
   zlib,
   Cocoa,
   enablePython ? false,
+  enableRtk ? true,
 }:
 
 let
@@ -129,6 +130,8 @@ stdenv.mkDerivation {
       "-DModule_MGHIO=ON"
       "-DModule_AdaptiveDenoising=ON"
       "-DModule_GenericLabelInterpolator=ON"
+    ]
+    ++ lib.optionals enableRtk [
       "-DModule_RTK=ON"
     ]
     ++ lib.optionals enablePython [
@@ -166,20 +169,23 @@ stdenv.mkDerivation {
   # These deps were propagated from VTK 9 in https://github.com/NixOS/nixpkgs/pull/206935,
   # so we simply propagate them again from ITK.
   # This admittedly is a hack and seems like an issue with VTK 9's CMake configuration.
-  propagatedBuildInputs = [
-    # The dependencies we've un-vendored from ITK, such as GDCM, must be propagated,
-    # otherwise other software built against ITK fails to configure since ITK headers
-    # refer to these previously vendored libraries:
-    expat
-    fftw
-    gdcm
-    hdf5-cpp
-    libjpeg
-    libminc
-    libpng
-    libtiff
-    zlib
-  ] ++ lib.optionals withVtk vtk.propagatedBuildInputs ++ lib.optionals enablePython [ numpy ];
+  propagatedBuildInputs =
+    [
+      # The dependencies we've un-vendored from ITK, such as GDCM, must be propagated,
+      # otherwise other software built against ITK fails to configure since ITK headers
+      # refer to these previously vendored libraries:
+      expat
+      fftw
+      gdcm
+      hdf5-cpp
+      libjpeg
+      libminc
+      libpng
+      libtiff
+      zlib
+    ]
+    ++ lib.optionals withVtk vtk.propagatedBuildInputs
+    ++ lib.optionals enablePython [ numpy ];
 
   postInstall = lib.optionalString enablePython ''
     substitute \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 800bd0284480f..65ecfd1220a4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9566,6 +9566,7 @@ with pkgs;
 
   itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
+    enableRtk = false;
   };
 
   itk_5 = callPackage ../development/libraries/itk/5.x.nix {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 720602c1ffa8d..990ac312b51dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6474,6 +6474,7 @@ self: super: with self; {
   itk = toPythonModule (pkgs.itk.override {
     inherit python numpy;
     enablePython = true;
+    enableRtk = false;
   });
 
 

From 3fd20a94c0f21d9de73f4c58e10badb27e8ea296 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Sun, 22 Dec 2024 07:11:34 +0000
Subject: [PATCH 022/229] python312Packages.pytorch: just disable -Werror; fix
 darwin x64 build

pytorch and many of the vendored libs build with -Werror and the
derivation meticulously then disables any warning that results in a
build failure. Just disable -Werror and fix the x64 darwin build.
---
 .../python-modules/torch/default.nix          | 54 ++-----------------
 1 file changed, 3 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix
index f85ccc9e85f40..961bccd18389a 100644
--- a/pkgs/development/python-modules/torch/default.nix
+++ b/pkgs/development/python-modules/torch/default.nix
@@ -454,59 +454,11 @@ buildPythonPackage rec {
 
   env =
     {
-      # Suppress a weird warning in mkl-dnn, part of ideep in pytorch
-      # (upstream seems to have fixed this in the wrong place?)
-      # https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc
-      # https://github.com/pytorch/pytorch/issues/22346
-      #
+      # disable warnings as errors as they break the build on every compiler
+      # bump, among other things.
       # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++:
       # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17
-      NIX_CFLAGS_COMPILE = toString (
-        (
-          lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ]
-          # Suppress gcc regression: avx512 math function raises uninitialized variable warning
-          # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105593
-          # See also: Fails to compile with GCC 12.1.0 https://github.com/pytorch/pytorch/issues/77939
-          ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12.0.0") [
-            "-Wno-error=maybe-uninitialized"
-            "-Wno-error=uninitialized"
-          ]
-          # Since pytorch 2.0:
-          # gcc-12.2.0/include/c++/12.2.0/bits/new_allocator.h:158:33: error: ‘void operator delete(void*, std::size_t)’
-          # ... called on pointer ‘<unknown>’ with nonzero offset [1, 9223372036854775800] [-Werror=free-nonheap-object]
-          ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "12") [
-            "-Wno-error=free-nonheap-object"
-          ]
-          # .../source/torch/csrc/autograd/generated/python_functions_0.cpp:85:3:
-          # error: cast from ... to ... converts to incompatible function type [-Werror,-Wcast-function-type-strict]
-          ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16") [
-            "-Wno-error=cast-function-type-strict"
-            # Suppresses the most spammy warnings.
-            # This is mainly to fix https://github.com/NixOS/nixpkgs/issues/266895.
-          ]
-          ++ lib.optionals rocmSupport [
-            "-Wno-#warnings"
-            "-Wno-cpp"
-            "-Wno-unknown-warning-option"
-            "-Wno-ignored-attributes"
-            "-Wno-deprecated-declarations"
-            "-Wno-defaulted-function-deleted"
-            "-Wno-pass-failed"
-          ]
-          ++ [
-            "-Wno-unused-command-line-argument"
-            "-Wno-uninitialized"
-            "-Wno-array-bounds"
-            "-Wno-free-nonheap-object"
-            "-Wno-unused-result"
-          ]
-          ++ lib.optionals stdenv.cc.isGNU [
-            "-Wno-maybe-uninitialized"
-            "-Wno-stringop-overflow"
-          ]
-        )
-      );
-
+      NIX_CFLAGS_COMPILE = "-Wno-error";
       USE_VULKAN = setBool vulkanSupport;
     }
     // lib.optionalAttrs vulkanSupport {

From 5c165277e629e5f0f9bf26eba488b7e2ecd7965b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 03:46:05 +0000
Subject: [PATCH 023/229] python312Packages.croniter: 3.0.3 -> 6.0.0

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

diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix
index 2437785db5b28..5492e118943f4 100644
--- a/pkgs/development/python-modules/croniter/default.nix
+++ b/pkgs/development/python-modules/croniter/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "croniter";
-  version = "3.0.3";
+  version = "6.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NBF+wXQfEKe9DsOtfY8OuPpFei/rm+MuaiJQ4ViVdmg=";
+    hash = "sha256-N8UEsxOVYRSpg+ziwrB3kLHxCU/p2BzJRzkhR0glVXc=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 7438a7b794f92b2469cf25e92f3ba5581eed6e42 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 25 Dec 2024 19:41:20 +0800
Subject: [PATCH 024/229] gradm: 3.1-202102241600 -> 3.1-202111052217

---
 pkgs/by-name/gr/gradm/package.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/gr/gradm/package.nix b/pkgs/by-name/gr/gradm/package.nix
index 0197e3ded81c6..d92f7c90119c2 100644
--- a/pkgs/by-name/gr/gradm/package.nix
+++ b/pkgs/by-name/gr/gradm/package.nix
@@ -7,25 +7,26 @@
   pam,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gradm";
-  version = "3.1-202102241600";
+  version = "3.1-202111052217";
 
   src = fetchurl {
-    url = "https://grsecurity.net/stable/${pname}-${version}.tar.gz";
-    sha256 = "02ni34hpggv00140p9gvh0lqi173zdddd2qhfi96hyr1axd5pl50";
+    url = "https://grsecurity.net/stable/gradm-${finalAttrs.version}.tar.gz";
+    hash = "sha256-JFkpDzZ6R8ihzk6i7Ag1l5nqM9wV7UQ2Q5WWzogoT7k=";
   };
 
   nativeBuildInputs = [
     bison
     flex
   ];
+
   buildInputs = [ pam ];
 
   enableParallelBuilding = true;
 
   makeFlags = [
-    "DESTDIR=$(out)"
+    "DESTDIR=${placeholder "out"}"
     "LEX=${flex}/bin/flex"
     "MANDIR=/share/man"
     "MKNOD=true"
@@ -48,14 +49,14 @@ stdenv.mkDerivation rec {
 
   postInstall = "rmdir $out/dev";
 
-  meta = with lib; {
+  meta = {
     description = "grsecurity RBAC administration and policy analysis utility";
     homepage = "https://grsecurity.net";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       thoughtpolice
       joachifm
     ];
   };
-}
+})

From 40effac24bad6f1f3bcfb326fb2226477c728776 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 25 Dec 2024 21:58:28 +0800
Subject: [PATCH 025/229] aerogramme: re-enable build

---
 pkgs/by-name/ae/aerogramme/package.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ae/aerogramme/package.nix b/pkgs/by-name/ae/aerogramme/package.nix
index a8643ba1b6cf9..b28ebe1eb61cc 100644
--- a/pkgs/by-name/ae/aerogramme/package.nix
+++ b/pkgs/by-name/ae/aerogramme/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchgit {
     url = "https://git.deuxfleurs.fr/Deuxfleurs/aerogramme/";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ER+P/XGqNzTLwDLK5EBZq/Dl29ZZKl2FdxDb+oLEJ8Y=";
   };
 
@@ -20,16 +20,8 @@ rustPlatform.buildRustPackage rec {
     ./0001-update-time-rs.patch
   ];
 
-  # must use our own Cargo.lock due to git dependencies
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "imap-codec-2.0.0" = "sha256-o64Q74Q84xLRfU4K4JtcjyS0J8mfoApvUs9siscd0RA=";
-      "imap-flow-0.1.0" = "sha256-IopxybuVt5OW6vFiw/4MxojzaNZrKu2xyfaX6F8IYlA=";
-      "k2v-client-0.0.4" = "sha256-V71FCIsgK3VStFOzVntm8P0vXRobF5rQ74qar+cKyik=";
-      "smtp-message-0.1.0" = "sha256-FoSakm3D1xg1vefLf/zkyvzsij1G0QstK3CRo+LbByE=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-GPj8qhfKgfAadQD9DJafN4ec8L6oY62PS/w/ljkPHpw=";
 
   # disable network tests as Nix sandbox breaks them
   doCheck = false;
@@ -50,6 +42,5 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ supinie ];
     mainProgram = "aerogramme";
     platforms = lib.platforms.linux;
-    broken = true; # https://github.com/rust-lang/rust/issues/129811
   };
 }

From ef63f5b6fe7179015af8a2cba8e9ce3b6f1933b1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 18 Oct 2024 23:28:51 +0200
Subject: [PATCH 026/229] python312Packages.torchmetrics: 1.4.3 -> 1.6.0

Diff:
https://github.com/Lightning-AI/torchmetrics/compare/refs/tags/v1.4.3...v1.6.1

Changelog:
https://github.com/Lightning-AI/torchmetrics/releases/tag/v1.6.1
---
 .../python-modules/torchmetrics/default.nix   | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix
index 52f905878ae0a..5f996b4d0a2ee 100644
--- a/pkgs/development/python-modules/torchmetrics/default.nix
+++ b/pkgs/development/python-modules/torchmetrics/default.nix
@@ -7,59 +7,48 @@
   numpy,
   lightning-utilities,
   packaging,
-  pretty-errors,
 
   # buildInputs
   torch,
 
   # tests
-  cloudpickle,
-  psutil,
   pytestCheckHook,
   pytest-doctestplus,
   pytest-xdist,
   pytorch-lightning,
   scikit-image,
-  scikit-learn,
 
   # passthru
   torchmetrics,
 }:
 
-let
+buildPythonPackage rec {
   pname = "torchmetrics";
-  version = "1.4.3";
-in
-buildPythonPackage {
-  inherit pname version;
+  version = "1.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lightning-AI";
     repo = "torchmetrics";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-527cHPFdFw/JajHe7Kkz7+zl4EfePaLx77I2OTjjxaA=";
+    tag = "v${version}";
+    hash = "sha256-itLFJB920hQGX2VLOLolHhmXFVHAOkfRRFtUGB9neKM=";
   };
 
   dependencies = [
     numpy
     lightning-utilities
     packaging
-    pretty-errors
   ];
 
   # Let the user bring their own instance
   buildInputs = [ torch ];
 
   nativeCheckInputs = [
-    cloudpickle
-    psutil
     pytestCheckHook
     pytest-doctestplus
     pytest-xdist
     pytorch-lightning
     scikit-image
-    scikit-learn
   ];
 
   # A cyclic dependency in: integrations/test_lightning.py
@@ -73,16 +62,20 @@ buildPythonPackage {
     dontInstall = true;
   });
 
-  disabledTests = [
-    # `IndexError: list index out of range`
-    "test_metric_lightning_log"
-  ];
-
   disabledTestPaths = [
     # These require too many "leftpad-level" dependencies
     # Also too cross-dependent
     "tests/unittests"
 
+    # AttributeError: partially initialized module 'pesq' has no attribute 'pesq' (most likely due to a circular import)
+    "examples/audio/pesq.py"
+
+    # Require internet access
+    "examples/text/bertscore.py"
+    "examples/image/clip_score.py"
+    "examples/text/perplexity.py"
+    "examples/text/rouge.py"
+
     # A trillion import path mismatch errors
     "src/torchmetrics"
   ];

From 9cf8344f7173e451790bad06dd9e14c40c2d62dc Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Thu, 26 Dec 2024 17:50:39 +0530
Subject: [PATCH 027/229] nixos/google-compute-image: fix image build

---
 nixos/modules/virtualisation/google-compute-image.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 8bdbd75783a41..98190e7e22760 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -88,9 +88,13 @@ in
           ]
         }
         pushd $out
-        tar -Sc $diskImage | gzip -${toString cfg.compressionLevel} > \
+        # RTFM:
+        # https://cloud.google.com/compute/docs/images/create-custom
+        # https://cloud.google.com/compute/docs/import/import-existing-image
+        mv $diskImage disk.raw
+        tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \
           ${config.image.fileName}
-        rm $diskImage
+        rm disk.raw
         popd
       '';
       format = "raw";

From 1882405e66542ccbc56cfef1728a9043262e4ceb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 12:30:17 +0000
Subject: [PATCH 028/229] python312Packages.ipympl: 0.9.4 -> 0.9.5

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

diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix
index f9905bdfc4461..aff2fe112b470 100644
--- a/pkgs/development/python-modules/ipympl/default.nix
+++ b/pkgs/development/python-modules/ipympl/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "ipympl";
-  version = "0.9.4";
+  version = "0.9.5";
   format = "wheel";
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version format;
-    hash = "sha256-WwwIxvT26mVbpYI5NjRXwQ+5IVV/UDjBpG20RX1taw4=";
+    hash = "sha256-/xSjV/Q1UuySWC64svdrhEtGmqL6doM/FerX+lhMGfw=";
     dist = "py3";
     python = "py3";
   };

From b57b45463cd1af467faddd2602ee568f45ce4e39 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 26 Dec 2024 11:45:08 -0800
Subject: [PATCH 029/229] libpoly: remove -Werror; fix clang-19

---
 pkgs/by-name/li/libpoly/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/li/libpoly/package.nix b/pkgs/by-name/li/libpoly/package.nix
index f11ce14ce59d7..2ffc34ba5a551 100644
--- a/pkgs/by-name/li/libpoly/package.nix
+++ b/pkgs/by-name/li/libpoly/package.nix
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-7aFz+6XJOVEA/Fmi0ywd6rZdTW8sHq8MoHqXR0Hc2o4=";
   };
 
+  postPatch = ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace-warn " -Werror " " "
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [

From d955fd520a9acaeba72869b210e855f7a0de84f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 00:50:24 +0000
Subject: [PATCH 030/229] python312Packages.griffe: 1.5.1 -> 1.5.4

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

diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix
index aed63cf3ef413..524e77f9ea729 100644
--- a/pkgs/development/python-modules/griffe/default.nix
+++ b/pkgs/development/python-modules/griffe/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "griffe";
-  version = "1.5.1";
+  version = "1.5.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,8 +22,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "griffe";
-    rev = "refs/tags/${version}";
-    hash = "sha256-DeXmKswapXPYGTiJLq2yvCwJywCNl79XYHSau0VCCIY=";
+    tag = version;
+    hash = "sha256-F1/SjWy32d/CU86ZR/PK0QPiRMEbUNNeomZOBP/3K/k=";
   };
 
   build-system = [ pdm-backend ];

From b7cb1ebcb9c7c991986c08f8da23b67ce75f2e4b Mon Sep 17 00:00:00 2001
From: Ben Millwood <thebenmachine+git@gmail.com>
Date: Sat, 30 Nov 2024 15:19:53 +0000
Subject: [PATCH 031/229] rubyPackages.gettext: init at 3.4.9

---
 .../ruby-modules/with-packages/Gemfile        |  1 +
 pkgs/top-level/ruby-packages.nix              | 62 +++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile
index b668a9b8862a1..99d59f734563f 100644
--- a/pkgs/development/ruby-modules/with-packages/Gemfile
+++ b/pkgs/development/ruby-modules/with-packages/Gemfile
@@ -58,6 +58,7 @@ gem 'ffi'
 gem 'ffi-rzmq-core'
 gem 'fog-dnsimple'
 gem 'gdk_pixbuf2'
+gem 'gettext'
 gem 'gio2'
 gem 'git'
 gem 'github-pages'
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 8e8904bd9a20f..5c6a9e9966be3 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -1113,6 +1113,16 @@
     };
     version = "1.1.0";
   };
+  forwardable = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b5g1i3xdvmxxpq4qp0z4v78ivqnazz26w110fh4cvzsdayz8zgi";
+      type = "gem";
+    };
+    version = "1.3.3";
+  };
   forwardable-extended = {
     groups = ["default"];
     platforms = [];
@@ -1155,6 +1165,17 @@
     };
     version = "3.0.1";
   };
+  gettext = {
+    dependencies = ["erubi" "locale" "prime" "racc" "text"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16h0kda5z4s4zqygyk0f52xzs9mlz9r4lnhjwk729hhmdbz68a19";
+      type = "gem";
+    };
+    version = "3.4.9";
+  };
   gio2 = {
     dependencies = ["fiddle" "gobject-introspection"];
     groups = ["default"];
@@ -2141,6 +2162,16 @@
     };
     version = "0.5.0";
   };
+  locale = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "107pm4ccmla23z963kyjldgngfigvchnv85wr6m69viyxxrrjbsj";
+      type = "gem";
+    };
+    version = "2.1.4";
+  };
   loofah = {
     dependencies = ["crass" "nokogiri"];
     groups = ["default"];
@@ -2748,6 +2779,17 @@
     };
     version = "1.2.1";
   };
+  prime = {
+    dependencies = ["forwardable" "singleton"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qsk9q2n4yb80f5mwslxzfzm2ckar25grghk95cj7sbc1p2k3w5s";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
   prism = {
     groups = ["default"];
     platforms = [];
@@ -3600,6 +3642,16 @@
     };
     version = "4.0.0";
   };
+  singleton = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y2pc7lr979pab5n5lvk3jhsi99fhskl5f2s6004v8sabz51psl3";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
   slather = {
     dependencies = ["clamp" "xcodeproj"];
     groups = ["default"];
@@ -3779,6 +3831,16 @@
     };
     version = "1.6.0";
   };
+  text = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
   thor = {
     groups = ["default"];
     platforms = [];

From 31ff5c6c897c9ddd0dc2800ee611d86452574f05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 01:45:37 +0000
Subject: [PATCH 032/229] python312Packages.wagtail-localize: 1.10 -> 1.11.1

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

diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix
index 43aa722abdaad..bd492a5171b88 100644
--- a/pkgs/development/python-modules/wagtail-localize/default.nix
+++ b/pkgs/development/python-modules/wagtail-localize/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "wagtail-localize";
-  version = "1.10";
+  version = "1.11.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,8 +26,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "wagtail-localize";
     owner = "wagtail";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-khGzJj7LBxz5WPU8l20CmQjC9p5umk6spSyMMHBBguc=";
+    tag = "v${version}";
+    hash = "sha256-HBc5t74zA7kUE8pvaYRZtslVInWrTw0UkmrGd+xaW0Q=";
   };
 
   build-system = [ flit-core ];

From 4d527a2a22c6f943522330f607ec6d7ddaf6d287 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:29:17 +0000
Subject: [PATCH 033/229] python312Packages.gotenberg-client: 0.7.0 -> 0.8.2

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

diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix
index 10d29ac87177b..196385c2413a8 100644
--- a/pkgs/development/python-modules/gotenberg-client/default.nix
+++ b/pkgs/development/python-modules/gotenberg-client/default.nix
@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
   pname = "gotenberg-client";
-  version = "0.7.0";
+  version = "0.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stumpylog";
     repo = "gotenberg-client";
-    rev = "refs/tags/${version}";
-    hash = "sha256-pkxu9WIsyHW2iTepv5B2naKkK+yw8lT+i3EwobE+u1M=";
+    tag = version;
+    hash = "sha256-EMukzSY8nfm1L1metGhiEc9VqnI/vaLz7ITgbZi0fBw=";
   };
 
   nativeBuildInputs = [ hatchling ];

From dee63cb9ec3ec5080b01efb80fd76c7a25ad203e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:48:28 +0000
Subject: [PATCH 034/229] python312Packages.tika-client: 0.7.0 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix
index 7b1614e9c2568..56f98fcf93fc8 100644
--- a/pkgs/development/python-modules/tika-client/default.nix
+++ b/pkgs/development/python-modules/tika-client/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "tika-client";
-  version = "0.7.0";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stumpylog";
     repo = "tika-client";
-    rev = "refs/tags/${version}";
-    hash = "sha256-0cv2HaquIUQOb5CPkCxSYvXDzu3OV7WKIT80jI+pjpY=";
+    tag = version;
+    hash = "sha256-UXd6GnwwFVUbBXhskBXDQaYlURQyrhgvMsncOwaLT1o=";
   };
 
   build-system = [ hatchling ];

From c445caabf1a7bcd9dae489c3188c5a1f9bb67100 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:51:39 +0000
Subject: [PATCH 035/229] python312Packages.craft-cli: 2.12.0 -> 2.13.0

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

diff --git a/pkgs/development/python-modules/craft-cli/default.nix b/pkgs/development/python-modules/craft-cli/default.nix
index ff5b86d6adec0..dcd466c6877be 100644
--- a/pkgs/development/python-modules/craft-cli/default.nix
+++ b/pkgs/development/python-modules/craft-cli/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "craft-cli";
-  version = "2.12.0";
+  version = "2.13.0";
 
   pyproject = true;
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-cli";
     rev = "refs/tags/${version}";
-    hash = "sha256-edN0eEXBaYDUqSc7Xv22MpG9wkHqI6x1HtRkQ468yH8=";
+    hash = "sha256-IqK+eU2z63yDMJrHAhETHWoTz5lWK1er9bwYH9Oml18=";
   };
 
   postPatch = ''

From 552fcd0015230194f2dfbc0c5270a9388a2e3c35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:54:24 +0000
Subject: [PATCH 036/229] python312Packages.greatfet: 2024.0.3 -> 2024.0.4

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

diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix
index 1e73858510942..bbe8269f12031 100644
--- a/pkgs/development/python-modules/greatfet/default.nix
+++ b/pkgs/development/python-modules/greatfet/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "greatfet";
-  version = "2024.0.3";
+  version = "2024.0.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "greatfet";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-jdOTEOotLiIxA9TxmFGOjP8IZ/8xo7mzXSJRg3A5Ri4=";
+    tag = "v${version}";
+    hash = "sha256-3ClM4UzVIDEkVBrFwzvLokbxUHXqdQWyNVqcFtiXCOQ=";
   };
 
   sourceRoot = "${src.name}/host";

From 01ea54baa838c9cef64f62c4f4b896391adbbb7d Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Fri, 27 Dec 2024 23:12:56 +0100
Subject: [PATCH 037/229] python3Packages.loguru: 0.7.2 -> 0.7.3 & cleanups

---
 .../python-modules/loguru/default.nix         | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index d3776308759cd..5fa1a0251bc5c 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -3,37 +3,42 @@
   stdenv,
   buildPythonPackage,
   colorama,
+  exceptiongroup,
   fetchFromGitHub,
+  flit-core,
   freezegun,
+  pytest-mypy-plugins,
+  pytest-xdist,
   pytestCheckHook,
   pythonOlder,
-  pytest-xdist,
 }:
 
 buildPythonPackage rec {
   pname = "loguru";
-  version = "0.7.2";
-  format = "setuptools";
+  version = "0.7.3";
+
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "Delgan";
     repo = pname;
-    rev = "refs/tags/${version}";
-    hash = "sha256-1xcPAOOhjFmWSxmPj6NICRur3ITOuQRNNKPJlfp89Jw=";
+    tag = version;
+    hash = "sha256-tccEzzs9TtFAZM9s43cskF9llc81Ng28LqedjLiE1m4=";
   };
 
+  build-system = [ flit-core ];
+
   nativeCheckInputs = [
     pytestCheckHook
     pytest-xdist # massive speedup, not tested by upstream
     colorama
     freezegun
-  ];
+    pytest-mypy-plugins
+  ] ++ lib.optional (pythonOlder "3.10") exceptiongroup;
 
-  disabledTestPaths = [
-    "tests/test_type_hinting.py" # avoid dependency on mypy
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ];
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ];
 
   disabledTests =
     [
@@ -52,12 +57,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "loguru" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python logging made (stupidly) simple";
     homepage = "https://github.com/Delgan/loguru";
     changelog = "https://github.com/delgan/loguru/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       jakewaksbaum
       rmcgibbo
     ];

From cff5c37e92e04657e69ff85193410f8602c1c152 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Fri, 27 Dec 2024 22:22:12 +0000
Subject: [PATCH 038/229] freeplane: add copyDesktopItems

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

diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix
index a92d25976e3fb..6ba59f984aa4c 100644
--- a/pkgs/by-name/fr/freeplane/package.nix
+++ b/pkgs/by-name/fr/freeplane/package.nix
@@ -7,6 +7,7 @@
   jdk17,
   gradle_8,
   which,
+  copyDesktopItems,
 }:
 
 let
@@ -31,6 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     makeBinaryWrapper
     jdk
     gradle
+    copyDesktopItems
   ];
 
   mitmCache = gradle.fetchDeps {

From 592da03a8e4b4f455007a6d460b11af72b654914 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Mon, 23 Dec 2024 01:50:22 -0800
Subject: [PATCH 039/229] arpack: use openblas on darwin

Change 07cdea2ae5005c6396eafd9d87e1cdec6c0c2a4b uncovered a bug in how
we build arpack on darwin with the Accelerate. Disable the Accelerate
framework and use openblas the default nixpkgs blas/lapack
implementation.
---
 pkgs/by-name/ar/arpack/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix
index d8da13ac5680c..f4c45e7de2f83 100644
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
     "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}"
     "-DMPI=${if useMpi then "ON" else "OFF"}"
     "-DICB=ON"
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # prevent cmake from using Accelerate, which causes single precision tests
+    # to segfault
+    "-DBLA_VENDOR=Generic"
   ];
 
   preCheck = ''

From c52b77e1659c49d8bdefe48978c3b7b15d14e172 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 06:51:35 +0000
Subject: [PATCH 040/229] python312Packages.minio: 7.2.12 -> 7.2.13

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

diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix
index 4c086580a467b..f78839c9b84b7 100644
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "minio";
-  version = "7.2.12";
+  version = "7.2.13";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,8 +30,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio-py";
-    rev = "refs/tags/${version}";
-    hash = "sha256-8CthbR62TZ7MFC3OCwtbHtGwmlQeFLgBtkyRX1P5SYU=";
+    tag = version;
+    hash = "sha256-RauPMoqVp4xnS4CXLH0HVTjA8o/BstoEWKWFHvjVllA=";
   };
 
   postPatch = ''

From 00baa26ab41dfa7b6eb304467e94fcc2d9d5e592 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Fri, 27 Dec 2024 21:43:56 -0800
Subject: [PATCH 041/229] arpack: minor cleanups

use ninja, cmakeBool and remove unneeded install_name_tool usage in
postFixup as the library name is already properly set by the build
---
 pkgs/by-name/ar/arpack/package.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix
index f4c45e7de2f83..28c4c77c5dd3e 100644
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake, ninja
 , gfortran, blas, lapack, eigen
 , useMpi ? false
 , mpi
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-HCvapLba8oLqx9I5+KDAU0s/dTmdWOEilS75i4gyfC0=";
   };
 
-  nativeBuildInputs = [ cmake gfortran ];
+  nativeBuildInputs = [ cmake gfortran ninja ];
   buildInputs = assert (blas.isILP64 == lapack.isILP64); [
     blas
     lapack
@@ -33,10 +33,10 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=ON"
-    "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}"
-    "-DMPI=${if useMpi then "ON" else "OFF"}"
-    "-DICB=ON"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+    (lib.cmakeBool "ICB" true)
+    (lib.cmakeBool "INTERFACE64" blas.isILP64)
+    (lib.cmakeBool "MPI" useMpi)
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # prevent cmake from using Accelerate, which causes single precision tests
     # to segfault
@@ -48,10 +48,6 @@ stdenv.mkDerivation rec {
     export OMP_NUM_THREADS=2
   '';
 
-  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib
-  '';
-
   passthru = {
     inherit (blas) isILP64;
     tests = {

From 89e9ea24c773e80a19962fe489c017c4df959b2d Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Fri, 27 Dec 2024 21:44:48 -0800
Subject: [PATCH 042/229] arpack: Enable eigenvalue-problems solver based on
 ICB and eigen

The arpack package included the eigen library and added it to the build
inputs but neglected to enable its use by setting `EIGEN=ON` in the
build flags.  Enable support for eigenvalue-problems solver based on ICB
and eigen and disable parallel checking as the tests fail when run in
parallel.
---
 pkgs/by-name/ar/arpack/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix
index 28c4c77c5dd3e..3023e9a3e9b54 100644
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -30,10 +30,14 @@ stdenv.mkDerivation rec {
 
   nativeCheckInputs = lib.optional useMpi openssh;
 
+  # a couple tests fail when run in parallel
   doCheck = true;
+  enableParallelChecking = false;
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+    (lib.cmakeBool "EIGEN" true)
+    (lib.cmakeBool "EXAMPLES" true)
     (lib.cmakeBool "ICB" true)
     (lib.cmakeBool "INTERFACE64" blas.isILP64)
     (lib.cmakeBool "MPI" useMpi)
@@ -43,11 +47,6 @@ stdenv.mkDerivation rec {
     "-DBLA_VENDOR=Generic"
   ];
 
-  preCheck = ''
-    # Prevent tests from using all cores
-    export OMP_NUM_THREADS=2
-  '';
-
   passthru = {
     inherit (blas) isILP64;
     tests = {

From 2f215b76aeda958c64130fe4f2805e8e754d988f Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Fri, 27 Dec 2024 22:14:47 -0800
Subject: [PATCH 043/229] arpack: add option to use macOS Accelerate

Copy darwin flags `-ff2c -fno-second-underscore` from workflow to use
Accelerate without segfaulting / failing tests and enable the Accelerate
framework when `useAccel` is true.
https://github.com/opencollab/arpack-ng/blob/804fa3149a0f773064198a8e883bd021832157ca/.github/workflows/jobs.yml#L184-L192
---
 pkgs/by-name/ar/arpack/package.nix | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix
index 3023e9a3e9b54..4e059b3ea95c2 100644
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -4,11 +4,13 @@
 , mpi
 , openssh
 , igraph
+, useAccel ? false #use Accelerate framework on darwin
 }:
 
 # MPI version can only be built with LP64 interface.
 # See https://github.com/opencollab/arpack-ng#readme
 assert useMpi -> !blas.isILP64;
+assert useAccel -> stdenv.hostPlatform.isDarwin;
 
 stdenv.mkDerivation rec {
   pname = "arpack";
@@ -22,11 +24,11 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake gfortran ninja ];
-  buildInputs = assert (blas.isILP64 == lapack.isILP64); [
-    blas
-    lapack
+  buildInputs = [
     eigen
-  ] ++ lib.optional useMpi mpi;
+  ] ++ lib.optionals (!useAccel) (assert (blas.isILP64 == lapack.isILP64); [
+    blas lapack
+  ]) ++ lib.optional useMpi mpi;
 
   nativeCheckInputs = lib.optional useMpi openssh;
 
@@ -34,21 +36,26 @@ stdenv.mkDerivation rec {
   doCheck = true;
   enableParallelChecking = false;
 
+  env = lib.optionalAttrs useAccel {
+    # Without these flags some tests will fail / segfault when using Accelerate
+    # framework. They were pulled from the CI Workflow
+    # https://github.com/opencollab/arpack-ng/blob/804fa3149a0f773064198a8e883bd021832157ca/.github/workflows/jobs.yml#L184-L192
+    FFLAGS = "-ff2c -fno-second-underscore";
+  };
+
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
     (lib.cmakeBool "EIGEN" true)
     (lib.cmakeBool "EXAMPLES" true)
     (lib.cmakeBool "ICB" true)
-    (lib.cmakeBool "INTERFACE64" blas.isILP64)
+    (lib.cmakeBool "INTERFACE64" (!useAccel && blas.isILP64))
     (lib.cmakeBool "MPI" useMpi)
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # prevent cmake from using Accelerate, which causes single precision tests
-    # to segfault
-    "-DBLA_VENDOR=Generic"
+    "-DBLA_VENDOR=${if useAccel then "Apple" else "Generic"}"
   ];
 
   passthru = {
-    inherit (blas) isILP64;
+    isILP64 = !useAccel && blas.isILP64;
     tests = {
       inherit igraph;
     };

From aa103048c0bb17dbea901a0b4b767865e72d58c0 Mon Sep 17 00:00:00 2001
From: willifan <willifan@pm.me>
Date: Sat, 28 Dec 2024 15:40:15 +0100
Subject: [PATCH 044/229] autofs: patch cryus_sals function pointer types

---
 pkgs/by-name/au/autofs5/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/au/autofs5/package.nix b/pkgs/by-name/au/autofs5/package.nix
index f570fcdb32f3e..3b053f0d0165a 100644
--- a/pkgs/by-name/au/autofs5/package.nix
+++ b/pkgs/by-name/au/autofs5/package.nix
@@ -44,6 +44,10 @@ stdenv.mkDerivation rec {
       url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-fix-crash-in-make_options_string.patch";
       hash = "sha256-YjTdJ50iNhJ2UjFdrKYEFNt04z0PfmElbFa4GuSskLA=";
     })
+    (fetchpatch {
+      url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-Fix-incompatible-function-pointer-types-in-cyrus-sasl-module.patch";
+      hash = "sha256-erLlqZtVmYqUOsk3S7S50yA0VB8Gzibsv+X50+gcA58=";
+    })
   ];
 
   preConfigure = ''

From 9e3db9e5f923f07f9ec7341e6466686b05606e6e Mon Sep 17 00:00:00 2001
From: Karl Hallsby <karl@hallsby.com>
Date: Fri, 27 Dec 2024 11:07:34 -0600
Subject: [PATCH 045/229] octave: Do not --enable-link-all-dependencies on
 Darwin

It seems like upstream Octave removed the requirement that Darwin
default to linking all of its dependencies[1]. Some packages (ltfat)
cannot link against Octave for some reason. Removing this optinal
configure flag fixes this issue.

[1] https://github.com/gnu-octave/octave/commit/d4479bd8aef35911e07851ef3aee89ef3954604b
---
 pkgs/development/interpreters/octave/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 9b0fb1eeeb9b5..204b96fb0712e 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -183,7 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
       "--with-lapack=lapack"
       (if use64BitIdx then "--enable-64" else "--disable-64")
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-link-all-dependencies" ]
     ++ lib.optionals enableReadline [ "--enable-readline" ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-x=no" ]
     ++ lib.optionals enableQt [ "--with-qt=5" ];

From 36836da3efb42aabe836d7dadf9b2f903fab88a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 15:47:19 +0000
Subject: [PATCH 046/229] pyenv: 2.4.23 -> 2.5.0

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

diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix
index 1389fe87c783d..86fac71de8759 100644
--- a/pkgs/by-name/py/pyenv/package.nix
+++ b/pkgs/by-name/py/pyenv/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyenv";
-  version = "2.4.23";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "pyenv";
     repo = "pyenv";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4IqHJpnGQKo/1U/Zkzg0mzm4xFbDC28F9ixgw+C0hAc=";
+    hash = "sha256-2khf1yGq+SXyOC7NAcjfzvscGg9Kay/8fMM7b0WMh8A=";
   };
 
   nativeBuildInputs = [

From 79b1e564ee00247c4ab365f0e71f6898ba07e956 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 00:31:11 +0000
Subject: [PATCH 047/229] btrfs-list: 2.3 -> 2.4

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

diff --git a/pkgs/by-name/bt/btrfs-list/package.nix b/pkgs/by-name/bt/btrfs-list/package.nix
index cbe4f01a4423e..597f326df58ef 100644
--- a/pkgs/by-name/bt/btrfs-list/package.nix
+++ b/pkgs/by-name/bt/btrfs-list/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "btrfs-list";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "speed47";
     repo = "btrfs-list";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cWzDRop0cyrjVIJzuZxTqELgec66GiPAUJY1xIBr3OY=";
+    hash = "sha256-K6/xFR4Qmr6ynH5rZfOTN8nkl99iqcJPmKPwtp9FYyc=";
   };
 
   buildInputs = [ perl ];

From c6496737d34776ce04de868da09c90d3d6bead12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 07:16:21 +0000
Subject: [PATCH 048/229] k6: 0.55.1 -> 0.55.2

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

diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix
index 6cc6563f41c6c..150347afe0f3c 100644
--- a/pkgs/by-name/k6/k6/package.nix
+++ b/pkgs/by-name/k6/k6/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "k6";
-  version = "0.55.1";
+  version = "0.55.2";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-29lb8vCMe6BcGeSlfMQm3w+UsD9n3FCljRiT51QNiLU=";
+    hash = "sha256-BuZsz5+vp4obL/Gj/gJSgA0xxdYmqd+MKggS62Jo+bM=";
   };
 
   subPackages = [ "./" ];

From 4cb1802986df40bf983f0d1257b4749765f0be41 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 25 Dec 2024 21:54:09 +0100
Subject: [PATCH 049/229] azure-cli-extensions.qumulo: 1.0.0 -> 2.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index b6e9b9477a59a..04ae894497548 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -841,9 +841,9 @@
   },
   "qumulo": {
     "pname": "qumulo",
-    "version": "1.0.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-1.0.0-py3-none-any.whl",
-    "hash": "sha256-mXP1gKP8IMwv5VWKHP3BDd/GVnmC0S83AIu/7Hqvz5s=",
+    "version": "2.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-2.0.0-py3-none-any.whl",
+    "hash": "sha256-fsUZyd0s+Rv1Sy6Lm2iq2xNMsrv+xU6KLLCOo6DkfmI=",
     "description": "Microsoft Azure Command-Line Tools Qumulo Extension"
   },
   "quota": {

From 0ef3a7271f2f82534c0c0e418e3ffcda789f050c Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 25 Dec 2024 21:54:11 +0100
Subject: [PATCH 050/229] azure-cli-extensions.managednetworkfabric: 6.4.0 ->
 7.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 04ae894497548..ad9850e69f1e9 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -645,10 +645,10 @@
   },
   "managednetworkfabric": {
     "pname": "managednetworkfabric",
-    "version": "6.4.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-6.4.0-py3-none-any.whl",
-    "hash": "sha256-nUEHjgZUqq42pfDyg/Ud6YzENgWCkgU2VCVG7TTKC8Q=",
-    "description": "Support for managednetworkfabric commands based on 2023-06-15 API version"
+    "version": "7.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-7.0.0-py3-none-any.whl",
+    "hash": "sha256-I+K24xxpm8DoyNsvqjv9Yi1ewVZeCDCVIizYUB7TKW8=",
+    "description": "Support for managednetworkfabric commands based on 2024-02-15-preview API version"
   },
   "managementpartner": {
     "pname": "managementpartner",

From 2bc1bc7002e3ac6b8007a5ae76450490f8bb0063 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 25 Dec 2024 21:54:13 +0100
Subject: [PATCH 051/229] azure-cli-extensions.networkcloud: 2.0.0b6 -> 2.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index ad9850e69f1e9..b71275415a1e7 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -729,9 +729,9 @@
   },
   "networkcloud": {
     "pname": "networkcloud",
-    "version": "2.0.0b6",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b6-py3-none-any.whl",
-    "hash": "sha256-1T+IepVTU7DLHQ7CfcEltQG+/lryktzUFB7RY9O9hzM=",
+    "version": "2.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0-py3-none-any.whl",
+    "hash": "sha256-8ntKTSkGJwdhHJCeClEd7A0cUgRed8sV/l7qP5jAQhQ=",
     "description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version"
   },
   "new-relic": {

From d9f4358b36095018856b7efb92a6120710c48327 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 25 Dec 2024 21:54:15 +0100
Subject: [PATCH 052/229] azure-cli-extensions.stack-hci-vm: 1.4.3 -> 1.5.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index b71275415a1e7..bf4c4b52064df 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -953,9 +953,9 @@
   },
   "stack-hci-vm": {
     "pname": "stack-hci-vm",
-    "version": "1.4.3",
-    "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.4.3-py3-none-any.whl",
-    "hash": "sha256-T1ulOOgw3O8ZUUfIunHHObK9SUy7moq1HoMcQLwfMyk=",
+    "version": "1.5.0",
+    "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.5.0-py3-none-any.whl",
+    "hash": "sha256-otixJPDbQp0+eugYFcVEzgAjGrFkDCHdqRUwT3WQ+Pg=",
     "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"
   },
   "standbypool": {

From 35a0745ba5323910efed309e44e2d4bb1c2ea5c5 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon@is.currently.online>
Date: Mon, 30 Dec 2024 07:27:24 -0500
Subject: [PATCH 053/229] usbkvm: fix non-null vendorHash for release tarball

---
 pkgs/by-name/us/usbkvm/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/us/usbkvm/package.nix b/pkgs/by-name/us/usbkvm/package.nix
index 4a24905574e6b..19547c8fcacf7 100644
--- a/pkgs/by-name/us/usbkvm/package.nix
+++ b/pkgs/by-name/us/usbkvm/package.nix
@@ -28,7 +28,7 @@ let
 
     inherit src;
     sourceRoot = "source/ms-tools";
-    vendorHash = "sha256-imHpsos7RDpATSZFWRxug67F7VgjRTT1SkLt7cWk6tU=";
+    vendorHash = null; # dependencies are vendored in the release tarball
 
     buildInputs = [
       hidapi

From 2dcf60e6a55a81fca0c3021b908ed7c96e580129 Mon Sep 17 00:00:00 2001
From: Liam Murphy <liampm32@gmail.com>
Date: Mon, 30 Dec 2024 23:21:10 +0000
Subject: [PATCH 054/229] sby: 0.47 -> 0.48

Its tag naming was changed the same as Yosys, so r-ryantm couldn't
update it either.

This also gets sby working with Yosys 0.48; I didn't notice it being
broken in #368946 because I only ran `nixpkgs-review` on macOS where sby
doesn't build due to broken dependencies anyway. Sorry!
---
 pkgs/by-name/sb/sby/package.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index ca9687a2e70d2..8cd9215be74dd 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sby";
-  version = "0.47";
+  version = "0.48";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
-    rev = "yosys-${version}";
-    hash = "sha256-Il2pXw2doaoZrVme2p0dSUUa8dCQtJJrmYitn1MkTD4=";
+    tag = "v${version}";
+    hash = "sha256-icOlWutvajHMCi2YUIGU4v5S63YobXw4fYYUvPoSzo4=";
   };
 
   nativeBuildInputs = [ bash ];
@@ -89,12 +89,7 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version-regex"
-      "yosys-([0-9].*)"
-    ];
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "SymbiYosys, a front-end for Yosys-based formal verification flows";

From d1a62051ae2900236f90ccda72e8adbfe35f46e4 Mon Sep 17 00:00:00 2001
From: Dee Anzorge <d.anzorge@gmail.com>
Date: Tue, 31 Dec 2024 03:29:30 +0100
Subject: [PATCH 055/229] streamlink: 7.0.0 -> 7.1.1

Changes:
https://github.com/streamlink/streamlink/releases/tag/7.1.0
https://github.com/streamlink/streamlink/releases/tag/7.1.1

7.1.0 dropped typing-extensions as runtime dependency
---
 pkgs/by-name/st/streamlink/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix
index 54f951e847515..b9482571febe2 100644
--- a/pkgs/by-name/st/streamlink/package.nix
+++ b/pkgs/by-name/st/streamlink/package.nix
@@ -8,12 +8,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "streamlink";
-  version = "7.0.0";
+  version = "7.1.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UaQGKGLmeV1pQEbKbnBUnW0TWDxkDRUFlmgEsOA/7/I=";
+    hash = "sha256-wYge0LulNhLZedmpGLfewFb8k80gKlsHoIDlVo29q0w=";
   };
 
   patches = [
@@ -50,7 +50,6 @@ python3Packages.buildPythonApplication rec {
     requests
     trio
     trio-websocket
-    typing-extensions
     urllib3
     websocket-client
   ];

From 980477eaee7b9e90ec436061da08daa9b6d4e9d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 03:20:56 +0000
Subject: [PATCH 056/229] reindeer: 2024.12.16.00 -> 2024.12.30.00

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

diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index 8228554457857..146b685ffbc64 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2024.12.16.00";
+  version = "2024.12.30.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-yM+iVX+5caiSW6K45EbkHgHEhceIvauCIYwlLTYpzbQ=";
+    hash = "sha256-o8PHtGG3Ndz6Ei9ZBoAdeNmBb70m4c+jCvHCGOjaA+w=";
   };
 
-  cargoHash = "sha256-TWu2p6d/jec7zZpFP8Gly4RdgkL18yU2VWsFHVZLDJY=";
+  cargoHash = "sha256-guRi+kYLjPHFLm4eN3kJ2kHYIBZ5JXMb3ii8416e+IA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 4418f26ed1e232739c720b10418281a4a39fd652 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 03:24:39 +0000
Subject: [PATCH 057/229] tflint-plugins.tflint-ruleset-aws: 0.36.0 -> 0.37.0

---
 .../tools/analysis/tflint-plugins/tflint-ruleset-aws.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
index 850f1d0d158c1..36dce0297e6e0 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "tflint-ruleset-aws";
-  version = "0.36.0";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-cGtxxSHdl7xtBdhQ591Xt6udUwwO6uAtudt1Hj4LzZQ=";
+    hash = "sha256-7xS1V7Ec3eWiVjMB/4MLeKlGxNKRYeHVFc61dpoBU/8=";
   };
 
-  vendorHash = "sha256-1T50kynzbL1p/9N8lmkxFmTHujDNTaTRcWnJVrWVslQ=";
+  vendorHash = "sha256-XUGcRky0GMV2RSahUk6k/KWkWvxdCLi/7TpXn2MdNoM=";
 
   # upstream Makefile also does a  go test $(go list ./... | grep -v integration)
   preCheck = ''

From bdddc01368c999336b77a829c09ed1968afba3ed Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 12:59:18 +0100
Subject: [PATCH 058/229] python312Packages.slixmpp: 1.8.5 -> 1.8.6

Changelog: https://codeberg.org/poezio/slixmpp/releases/tag/slix-1.8.6
---
 pkgs/development/python-modules/slixmpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix
index e487f91d05a76..c86de6bd6157f 100644
--- a/pkgs/development/python-modules/slixmpp/default.nix
+++ b/pkgs/development/python-modules/slixmpp/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "slixmpp";
-  version = "1.8.5";
+  version = "1.8.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dePwrUhVX39ckijnBmwdQ1izPWQLT753PsNLA7f66aM=";
+    hash = "sha256-YK/Kp8laD7nn8RWctwRkpVWIBterrinNMeP8iD+biws=";
   };
 
   propagatedBuildInputs = [

From 4dc54944730bb719cae22668d587ebfa104b2661 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 30 Dec 2024 14:54:02 -0700
Subject: [PATCH 059/229] zsync: fix build

---
 pkgs/by-name/zs/zsync/package.nix             | 40 ++++++++++++++-----
 .../read-blocksums-declaration-fix.patch      | 13 ++++++
 .../zs/zsync/remove-inexisting-rsumtest.patch | 17 ++++++++
 3 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch
 create mode 100644 pkgs/by-name/zs/zsync/remove-inexisting-rsumtest.patch

diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix
index d4f57f0a750ca..d0ea03519de40 100644
--- a/pkgs/by-name/zs/zsync/package.nix
+++ b/pkgs/by-name/zs/zsync/package.nix
@@ -1,26 +1,46 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "zsync";
-  version = "0.6.2";
+  version = "0.6.2-unstable-2017-04-25";
 
-  src = fetchurl {
-    url = "http://zsync.moria.org.uk/download/zsync-${version}.tar.bz2";
-    hash = "sha256-C51TQzOHqk8EY0psY6XvqCAwcPIpivcqcF+b492mWvI=";
+  src = fetchFromGitHub {
+    owner = "cph6";
+    repo = "zsync";
+    rev = "6cfe374f8f2310cbd624664ca98e5bb28244ba7a";
+    hash = "sha256-SnCzNDMyhMx+2JmgsrjtYDa31Ki1EWix9iBfaduDnro=";
   };
 
-  env = lib.optionalAttrs stdenv.cc.isClang {
-    # Suppress error "call to undeclared library function 'strcasecmp'" during compilation.
-    # The function is found by the linker correctly, so this doesn't introduce any issues.
-    NIX_CFLAGS_COMPILE = " -Wno-implicit-function-declaration";
-  };
+  sourceRoot = "${src.name}/c";
+
+  patches = [
+    ./remove-inexisting-rsumtest.patch
+    ./read-blocksums-declaration-fix.patch
+  ];
 
   makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
 
+  # Suppress error "call to undeclared library function 'strcasecmp'" during compilation.
+  # The function is found by the linker correctly, so this doesn't introduce any issues.
+  # Also supress errors that come from incompatible pointer types due to GCC 14 changes.
+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optionals stdenv.cc.isClang [
+      "-Wno-implicit-function-declaration"
+    ]
+    ++ lib.optionals stdenv.cc.isGNU [
+      "-Wno-error=incompatible-pointer-types"
+    ]
+  );
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
   meta = with lib; {
     homepage = "http://zsync.moria.org.uk/";
     description = "File distribution system using the rsync algorithm";
diff --git a/pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch b/pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch
new file mode 100644
index 0000000000000..d4e8e638af495
--- /dev/null
+++ b/pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/libzsync/zsync.c b/libzsync/zsync.c
+index 793a426..783c349 100644
+--- a/libzsync/zsync.c
++++ b/libzsync/zsync.c
+@@ -116,7 +116,7 @@ struct zsync_state {
+ };
+ 
+ static int zsync_read_blocksums(struct zsync_state *zs, FILE * f,
+-                                int rsum_bytes, int checksum_bytes,
++                                int rsum_bytes, unsigned int checksum_bytes,
+                                 int seq_matches);
+ static int zsync_sha1(struct zsync_state *zs, int fh);
+ static int zsync_recompress(struct zsync_state *zs);
diff --git a/pkgs/by-name/zs/zsync/remove-inexisting-rsumtest.patch b/pkgs/by-name/zs/zsync/remove-inexisting-rsumtest.patch
new file mode 100644
index 0000000000000..2e16b58d1f8a2
--- /dev/null
+++ b/pkgs/by-name/zs/zsync/remove-inexisting-rsumtest.patch
@@ -0,0 +1,17 @@
+diff --git a/c/librcksum/Makefile.am b/c/librcksum/Makefile.am
+index 0216e49..f4fce72 100644
+--- a/librcksum/Makefile.am
++++ b/librcksum/Makefile.am
+@@ -2,9 +2,8 @@
+ 
+ noinst_LIBRARIES = librcksum.a
+ 
+-TESTS = md4test rsumtest
+-noinst_PROGRAMS = md4test rsumtest
++TESTS = md4test
++noinst_PROGRAMS = md4test
+ 
+ md4test_SOURCES = md4test.c md4.h md4.c
+-rsumtest_SOURCES = rsum.c rsumtest.c hash.c range.c state.c md4.c ../progress.c
+ librcksum_a_SOURCES = internal.h rcksum.h md4.h rsum.c hash.c state.c range.c md4.c
+

From 071f88331374e1120c58cc29cc7b4d8c60c79548 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 30 Dec 2024 14:55:41 -0700
Subject: [PATCH 060/229] zsync: add ryand56 as maintainer

---
 pkgs/by-name/zs/zsync/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix
index d0ea03519de40..359707c0731f4 100644
--- a/pkgs/by-name/zs/zsync/package.nix
+++ b/pkgs/by-name/zs/zsync/package.nix
@@ -41,11 +41,14 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with lib; {
-    homepage = "http://zsync.moria.org.uk/";
+  meta = {
+    homepage = "https://github.com/cph6/zsync";
     description = "File distribution system using the rsync algorithm";
-    license = licenses.artistic2;
-    maintainers = with maintainers; [ viric ];
-    platforms = with platforms; all;
+    license = lib.licenses.artistic2;
+    maintainers = with lib.maintainers; [
+      viric
+      ryand56
+    ];
+    platforms = with lib.platforms; all;
   };
 }

From fde138989e7005225ab1832ea9a1115af2959b80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 13:42:15 +0000
Subject: [PATCH 061/229] fluent-bit: 3.2.3 -> 3.2.4

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

diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index 388996131179c..93638c5efab35 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-5Oyw3nHlAyywF+G0UiGyi1v+jAr8eyKt/1cDT5FdJXQ=";
+    hash = "sha256-oTCGjDmGVovsfj+4fjIKy/xpiuYc0Q44LYwYPI4dSF8=";
   };
 
   # optional only to avoid linux rebuild

From 8112df3f902c2db910367c3b3c5295d3ba2bd674 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Fri, 20 Dec 2024 22:42:58 +0100
Subject: [PATCH 062/229] gdal: switch to openexr_3

There are several CVEs affecting openexr v2 and it seems to disturb
people. As gdal supports openexr v3, let's live in the future and
upgrade this dep.

Fix #366916
---
 pkgs/development/libraries/gdal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index d88527b138c2a..f4d02c2c72aa1 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -60,7 +60,7 @@
   libxml2,
   lz4,
   netcdf,
-  openexr,
+  openexr_3,
   openjpeg,
   openssl,
   pcre2,
@@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
       nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) (
         [
           # tests for formats enabled by these packages fail on macos
-          openexr
+          openexr_3
           xercesc
         ]
         ++ arrowDeps

From 6fba45b6e5a3130eb8f37250bc5f7d012ad09856 Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:23:50 +0100
Subject: [PATCH 063/229] antora-ui-default: update hash

Fixes: 518ba1789aa2 ("antora-ui-default: 0-unstable-2024-09-20 -> 0-unstable-2024-12-26")
---
 pkgs/by-name/an/antora-ui-default/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/antora-ui-default/package.nix b/pkgs/by-name/an/antora-ui-default/package.nix
index 329841bd4d439..33c7346ebf9f3 100644
--- a/pkgs/by-name/an/antora-ui-default/package.nix
+++ b/pkgs/by-name/an/antora-ui-default/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   srcFetchFromGitLab = {
-    hash = "sha256-q2FwkwzjanxTIxjMpCyMpzPt782uYZiWVdZ7Eev79oM=";
+    hash = "sha256-gUQLLjnWZ1OsAe005IOPIfoM0qmjoevcUuGBRD3oHXA=";
     owner = "trueNAHO";
     repo = "antora-ui-default";
     rev = "11f563294248e9b64124b9289d639e349f2e9f5f";

From 68891b69f167489906dd634168e58b4bbb3281a6 Mon Sep 17 00:00:00 2001
From: Liam Murphy <liampm32@gmail.com>
Date: Tue, 31 Dec 2024 19:21:06 +0000
Subject: [PATCH 064/229] sby: cleanup

---
 pkgs/by-name/sb/sby/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index 8cd9215be74dd..922056fc94fba 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
     hash = "sha256-icOlWutvajHMCi2YUIGU4v5S63YobXw4fYYUvPoSzo4=";
   };
 
-  nativeBuildInputs = [ bash ];
-  buildInputs = [
-    pythonEnv
+  nativeCheckInputs = [
+    python3
+    python3.pkgs.xmlschema
     yosys
     boolector
     yices
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    patchShebangs docs/source/conf.py \
+    patchShebangs --build \
+      docs/source/conf.py \
       docs/source/conf.diff \
       tests/autotune/*.sh \
       tests/keepgoing/*.sh \
@@ -64,8 +65,6 @@ stdenv.mkDerivation rec {
       --replace-fail '/usr/bin/env python3' '${pythonEnv}/bin/python'
     substituteInPlace sbysrc/sby_autotune.py \
       --replace-fail '["btorsim", "--vcd"]' '["${btor2tools}/bin/btorsim", "--vcd"]'
-    substituteInPlace tests/make/required_tools.py \
-      --replace-fail '["btorsim", "--vcd"]' '["${btor2tools}/bin/btorsim", "--vcd"]'
   '';
 
   dontBuild = true;

From 43d9c292916b4f8d21bfda5cedecba3aae07cd39 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Tue, 31 Dec 2024 22:07:57 +0000
Subject: [PATCH 065/229] python312Packages.open-interpreter: fix build

add `tiktoken` to `pythonRelaxDeps`

> Checking runtime dependencies for open_interpreter-0.3.6-py3-none-any.whl
> - tiktoken<0.8.0,>=0.7.0 not satisfied by version 0.8.0
---
 pkgs/development/python-modules/open-interpreter/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/open-interpreter/default.nix b/pkgs/development/python-modules/open-interpreter/default.nix
index d771128a79034..dcd9ec37333c5 100644
--- a/pkgs/development/python-modules/open-interpreter/default.nix
+++ b/pkgs/development/python-modules/open-interpreter/default.nix
@@ -53,6 +53,7 @@ buildPythonPackage rec {
     "google-generativeai"
     "psutil"
     "pynput"
+    "tiktoken"
     "yaspin"
   ];
 

From 75679255a870dbec863c0cd76a521b4fe5b0f565 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Tue, 31 Dec 2024 22:19:18 +0000
Subject: [PATCH 066/229] xzoom: fix gcc-14

include `unistd.h` to fix implicit function declaration errors
---
 pkgs/by-name/xz/xzoom/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/xz/xzoom/package.nix b/pkgs/by-name/xz/xzoom/package.nix
index 6f456b8d8129d..5cd13fc5a7129 100644
--- a/pkgs/by-name/xz/xzoom/package.nix
+++ b/pkgs/by-name/xz/xzoom/package.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  postPatch = ''
+    sed -i 1i'#include <unistd.h>' xzoom.c
+  '';
+
   nativeBuildInputs = [
     imake
     gccmakedep

From 79d83ef4cf2b52ae527c1d3ee347147a512a38ef Mon Sep 17 00:00:00 2001
From: Misael Aguayo <aguayo.misael@gmail.com>
Date: Tue, 31 Dec 2024 19:12:14 -0600
Subject: [PATCH 067/229] harper: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index d60c74fedb680..679c5686eba7a 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "elijah-potter";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-X1mTqaqOqeAM7mq3nNrE2ULZ1zaAxZIqp0p1wdlDwgk=";
+    hash = "sha256-YKfhvwm8TuKpM81qcVgL15AdiQaI7PXvRq1pWThwmo0=";
   };
 
-  cargoHash = "sha256-0RJ0Kpht4gqZTBdjld1Wi5r9FN5RB74KboxODmlHoko=";
+  cargoHash = "sha256-Gf0GJVWefZlMXpnJytAdmM/I9y7bXoCilUZs/HK0Vdw=";
 
   meta = {
     description = "Grammar Checker for Developers";

From 4e22b5fc6bca2b55126fd97842d7947814050ae8 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Tue, 31 Dec 2024 06:49:39 +0000
Subject: [PATCH 068/229] cgal_4: drop

cgal_4 has no consumers in nixpkgs, last update was 2020-02-25 and has
since been replaced by cgal 5. remove it from nixpkgs
---
 .../science/misc/gplates/default.nix          |  6 +-
 pkgs/by-name/op/openscad-unstable/package.nix |  4 +-
 pkgs/development/libraries/CGAL/4.nix         | 61 -------------------
 pkgs/top-level/aliases.nix                    |  2 +
 pkgs/top-level/all-packages.nix               |  5 +-
 5 files changed, 8 insertions(+), 70 deletions(-)
 delete mode 100644 pkgs/development/libraries/CGAL/4.nix

diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 33468a311162b..2c49536d993d8 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -7,7 +7,7 @@
   doxygen,
   graphviz,
   boost,
-  cgal_5,
+  cgal,
   gdal,
   glew,
   gmp,
@@ -32,7 +32,7 @@ let
     enablePython = true;
     inherit python;
   };
-  cgal = cgal_5.override {
+  cgal' = cgal.override {
     boost = boost';
   };
 in
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     boost'
-    cgal
+    cgal'
     gdal
     glew
     gmp
diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 4981984732918..d9c612e39ba46 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -9,7 +9,7 @@
   bison,
   boost,
   cairo,
-  cgal_5,
+  cgal,
   clipper2,
   double-conversion,
   eigen,
@@ -83,7 +83,7 @@ clangStdenv.mkDerivation rec {
       mimalloc
       boost
       cairo
-      cgal_5
+      cgal
       double-conversion
       eigen
       fontconfig
diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix
deleted file mode 100644
index 5d6ca6e89fbe7..0000000000000
--- a/pkgs/development/libraries/CGAL/4.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  cmake,
-  boost,
-  gmp,
-  mpfr,
-}:
-
-stdenv.mkDerivation rec {
-  version = "4.14.3";
-  pname = "cgal";
-
-  src = fetchurl {
-    url = "https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-${version}/CGAL-${version}.tar.xz";
-    hash = "sha256-W6/nq+hDW+yhehCCBi02M2jsHj8NZYG7DaiwEPs4n+Q=";
-  };
-
-  patches = [
-    ./cgal_path.patch
-
-    # Pull upstream fix for c++17 (gcc-12):
-    #  https://github.com/CGAL/cgal/pull/6109
-    (fetchpatch {
-      name = "gcc-12-prereq.patch";
-      url = "https://github.com/CGAL/cgal/commit/4581f1b7a8e97d1a136830e64b77cdae3546c4bf.patch";
-      relative = "CGAL_Core"; # Upstream slightly reordered directory structure since.
-      sha256 = "sha256-4+7mzGSBwAv5RHBQPAecPPKNN/LQBgvYq5mq+fHAteo=";
-    })
-    (fetchpatch {
-      name = "gcc-12.patch";
-      url = "https://github.com/CGAL/cgal/commit/6680a6e6f994b2c5b9f068eb3014d12ee1134d53.patch";
-      relative = "CGAL_Core"; # Upstream slightly reordered directory structure since.
-      sha256 = "sha256-8kxJDT47jXI9kQNFI/ARWl9JBNS4AfU57/D0tYlgW0M=";
-    })
-  ];
-
-  # note: optional component libCGAL_ImageIO would need zlib and opengl;
-  #   there are also libCGAL_Qt{3,4} omitted ATM
-  buildInputs = [
-    boost
-    gmp
-    mpfr
-  ];
-  nativeBuildInputs = [ cmake ];
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Computational Geometry Algorithms Library";
-    homepage = "http://cgal.org";
-    license = with licenses; [
-      gpl3Plus
-      lgpl3Plus
-    ];
-    platforms = platforms.all;
-    maintainers = [ maintainers.raskin ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9ae158a5ae5a6..f0445cf28187a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -201,6 +201,8 @@ mapAliases {
   cargo-espflash = espflash;
   cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API";
   certmgr-selfsigned = certmgr; # Added 2023-11-30
+  cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30
+  cgal_5 = cgal; # Added 2024-12-30
   challenger = taler-challenger; # Added 2024-09-04
   check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03
   check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c69e89c679381..1364b8040f118 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8768,10 +8768,7 @@ with pkgs;
     certbot-dns-route53
   ]);
 
-  # CGAL 5 has API changes
-  cgal_4 = callPackage ../development/libraries/CGAL/4.nix { };
-  cgal_5 = callPackage ../development/libraries/CGAL { };
-  cgal = cgal_5;
+  cgal = callPackage ../development/libraries/CGAL { };
 
   check = callPackage ../development/libraries/check {
     inherit (darwin.apple_sdk.frameworks) CoreServices;

From ef133575fe3aba14f0febac4f2bfcd3ebfd20a5d Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 13:35:21 +0900
Subject: [PATCH 069/229] python312Packages.flask-sockets: remove

flask-sockets has been removed as the upstream repository was archived in 2022
---
 .../python-modules/flask-sockets/default.nix  | 36 -------------------
 .../python-modules/slack-bolt/default.nix     |  2 --
 .../python-modules/slack-sdk/default.nix      |  2 --
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 5 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/development/python-modules/flask-sockets/default.nix

diff --git a/pkgs/development/python-modules/flask-sockets/default.nix b/pkgs/development/python-modules/flask-sockets/default.nix
deleted file mode 100644
index 6879b64fdb75f..0000000000000
--- a/pkgs/development/python-modules/flask-sockets/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  flask,
-  gevent,
-  gevent-websocket,
-}:
-
-buildPythonPackage rec {
-  pname = "Flask-Sockets";
-  version = "0.2.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "072927da8edca0e81e024f5787e643c87d80b351b714de95d723becb30e0643b";
-  };
-
-  propagatedBuildInputs = [
-    flask
-    gevent
-    gevent-websocket
-  ];
-
-  # upstream doesn't have any tests, single file
-  doCheck = false;
-
-  pythonImportsCheck = [ "flask_sockets" ];
-
-  meta = with lib; {
-    description = "Elegant WebSockets for your Flask apps";
-    homepage = "https://github.com/heroku-python/flask-sockets";
-    license = licenses.mit;
-    maintainers = [ maintainers.prusnak ];
-  };
-}
diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix
index 62ee94e72ba4a..fe71e07bd36ae 100644
--- a/pkgs/development/python-modules/slack-bolt/default.nix
+++ b/pkgs/development/python-modules/slack-bolt/default.nix
@@ -21,7 +21,6 @@
   falcon,
   fastapi,
   flask,
-  flask-sockets,
   gunicorn,
   moto,
   pyramid,
@@ -73,7 +72,6 @@ buildPythonPackage rec {
       falcon
       fastapi
       flask
-      flask-sockets
       gunicorn
       moto
       pyramid
diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index b1f155488f572..f116779a6a087 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -6,7 +6,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   flake8,
-  flask-sockets,
   moto,
   psutil,
   pytest-asyncio,
@@ -49,7 +48,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     flake8
-    flask-sockets
     moto
     psutil
     pytest-asyncio
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 83264b2be12a7..9a392e655c03d 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -223,6 +223,7 @@ mapAliases ({
   flask-autoindex = throw "flask-autoindex was removed, as it is not compatible with flask 3.0 and unmaintained since 2020.";
   flask-basicauth = throw "flask-basicauth was removed, as it is not compatible with flask 3.0 and unmaintained since 2016.";
   flask-sessionstore = throw "flask-sessionstore was removed, as it is not compatible with flask 3.0 and unmaintained since 2017.";
+  flask-sockets = throw "flask-sockets has been removed as the upstream repository was archived in 2022"; # Added 2025-01-01
   flowlogs_reader = flowlogs-reader; # added 2024-01-03
   flufl_bounce = flufl-bounce; # added 2023-11-03
   flufl_i18n = flufl-i18n; # added 2023-11-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acc79f773b74c..e6abfb58d135e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4736,8 +4736,6 @@ self: super: with self; {
 
   flask-socketio = callPackage ../development/python-modules/flask-socketio { };
 
-  flask-sockets = callPackage ../development/python-modules/flask-sockets { };
-
   flask-sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { };
 
   flask-sqlalchemy-lite = callPackage ../development/python-modules/flask-sqlalchemy-lite { };

From 169ee736fcb7e5134d8dd7cc52e7a8eb0786f429 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 15:11:48 +0900
Subject: [PATCH 070/229] python312Packages.macaroonbakery: fix version string

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

diff --git a/pkgs/development/python-modules/macaroonbakery/default.nix b/pkgs/development/python-modules/macaroonbakery/default.nix
index e9eb357839964..991c9bfa02a4d 100644
--- a/pkgs/development/python-modules/macaroonbakery/default.nix
+++ b/pkgs/development/python-modules/macaroonbakery/default.nix
@@ -28,6 +28,12 @@ buildPythonPackage rec {
     hash = "sha256-NEhr8zkrHceeLbAyuUvc7U6dyQxkpkj0m5LlnBMafA0=";
   };
 
+  # fix version string
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "VERSION = (1, 3, 3)" "VERSION = (1, 3, 4)"
+  '';
+
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [

From 217bf120c02801425afa52c3504e98af0c59e309 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 15:13:30 +0900
Subject: [PATCH 071/229] python312Packages.macaroonbakery: refactor

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

diff --git a/pkgs/development/python-modules/macaroonbakery/default.nix b/pkgs/development/python-modules/macaroonbakery/default.nix
index 991c9bfa02a4d..f1598d432e1bf 100644
--- a/pkgs/development/python-modules/macaroonbakery/default.nix
+++ b/pkgs/development/python-modules/macaroonbakery/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "go-macaroon-bakery";
     repo = "py-macaroon-bakery";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NEhr8zkrHceeLbAyuUvc7U6dyQxkpkj0m5LlnBMafA0=";
   };
 
@@ -34,9 +34,9 @@ buildPythonPackage rec {
       --replace-fail "VERSION = (1, 3, 3)" "VERSION = (1, 3, 4)"
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     protobuf
     pymacaroons
     pynacl

From c2924cef015556ac42c2b67a4c8660182b40661c Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 14:52:40 +0900
Subject: [PATCH 072/229] python312Packages.craft-store: 3.0.2 -> 3.1.0

Diff: https://github.com/canonical/craft-store/compare/refs/tags/3.0.2...3.1.0

Changelog: https://github.com/canonical/craft-store/releases/tag/3.1.0
---
 .../python-modules/craft-store/default.nix    | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix
index f9f8f73e8eb04..4c44e30fa5141 100644
--- a/pkgs/development/python-modules/craft-store/default.nix
+++ b/pkgs/development/python-modules/craft-store/default.nix
@@ -6,55 +6,67 @@
   setuptools,
   setuptools-scm,
   pytest-check,
+  pytest-httpx,
   pytest-mock,
-  pydantic,
   pyyaml,
   pytestCheckHook,
-  keyring_24,
+  annotated-types,
+  httpx,
+  jaraco-classes,
+  keyring,
   macaroonbakery,
   overrides,
+  pydantic,
   pyxdg,
   requests,
   requests-toolbelt,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "craft-store";
-  version = "3.0.2";
+  version = "3.1.0";
 
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-store";
-    rev = "refs/tags/${version}";
-    hash = "sha256-l8WnuaMJN4/nZRkWoU6omgbd4hKR2m7YC+YVcvAqzcA=";
+    tag = version;
+    hash = "sha256-pTG0JJRoHjmcLg+lAgg53rvC+7d3TLlTLe+Rxhy8wqg=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==" "setuptools>="
+      --replace-fail "setuptools==75.6.0" "setuptools"
   '';
 
-  build-system = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonRelaxDeps = [ "httpx" ];
 
   dependencies = [
-    keyring_24
+    annotated-types
+    httpx
+    jaraco-classes
+    keyring
     macaroonbakery
     overrides
     pydantic
     pyxdg
     requests
     requests-toolbelt
+    typing-extensions
   ];
 
-  pythonRelaxDeps = [ "macaroonbakery" ];
-
   pythonImportsCheck = [ "craft_store" ];
 
   nativeCheckInputs = [
-    pydantic
     pytest-check
+    pytest-httpx
     pytest-mock
     pytestCheckHook
     pyyaml

From c465daf0fa5d314d9a85112a346c4c49acbca6e1 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 15:19:42 +0900
Subject: [PATCH 073/229] python312Packages.keyring_24: remove

keyring_24 has been removed, use keyring instead
---
 .../python-modules/keyring_24/default.nix     | 81 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 pkgs/development/python-modules/keyring_24/default.nix

diff --git a/pkgs/development/python-modules/keyring_24/default.nix b/pkgs/development/python-modules/keyring_24/default.nix
deleted file mode 100644
index 05fbb3178147a..0000000000000
--- a/pkgs/development/python-modules/keyring_24/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
-  installShellFiles,
-  setuptools,
-  setuptools-scm,
-  shtab,
-  importlib-metadata,
-  jaraco-classes,
-  jaraco-context,
-  jaraco-functools,
-  jeepney,
-  secretstorage,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "keyring_24";
-  # nixpkgs-update: no auto update
-  version = "24.3.1";
-  pyproject = true;
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "keyring";
-    hash = "sha256-wzJ7b/r8DovvvbWXys20ko/+XBIS92RfGG5tmVeomNs=";
-  };
-
-  nativeBuildInputs = [
-    installShellFiles
-    shtab
-  ];
-
-  build-system = [
-    setuptools
-    setuptools-scm
-  ];
-
-  dependencies =
-    [
-      jaraco-classes
-      jaraco-context
-      jaraco-functools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      jeepney
-      secretstorage
-    ]
-    ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ];
-
-  postInstall = ''
-    installShellCompletion --cmd keyring \
-      --bash <($out/bin/keyring --print-completion bash) \
-      --zsh <($out/bin/keyring --print-completion zsh)
-  '';
-
-  pythonImportsCheck = [
-    "keyring"
-    "keyring.backend"
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  disabledTestPaths =
-    [ "tests/backends/test_macOS.py" ]
-    # These tests fail when sandboxing is enabled because they are unable to get a password from keychain.
-    ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py";
-
-  meta = with lib; {
-    description = "Store and access your passwords safely";
-    homepage = "https://github.com/jaraco/keyring";
-    changelog = "https://github.com/jaraco/keyring/blob/v${version}/NEWS.rst";
-    license = licenses.mit;
-    mainProgram = "keyring";
-    maintainers = with maintainers; [ jnsgruk ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 83264b2be12a7..e029b854387f7 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -316,6 +316,7 @@ mapAliases ({
   Kajiki = kajiki; # added 2023-02-19
   keepkey_agent = keepkey-agent; # added 2024-01-06
   Keras = keras; # added 2021-11-25
+  keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01
   ldap = python-ldap; # added 2022-09-16
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
   langchainplus-sdk = langsmith; # added 2023-08-01
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acc79f773b74c..00a1779a5c095 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6949,8 +6949,6 @@ self: super: with self; {
 
   keyring = callPackage ../development/python-modules/keyring { };
 
-  keyring_24 = callPackage ../development/python-modules/keyring_24 { };
-
   keyring-pass = callPackage ../development/python-modules/keyring-pass { };
 
   keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { };

From 7016fe9d74d694b0bafcb9018dec9c663a902ff1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 10:14:47 +0000
Subject: [PATCH 074/229] bonsai: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/by-name/bo/bonsai/package.nix b/pkgs/by-name/bo/bonsai/package.nix
index 186c77f6c81c6..a8cb48e552945 100644
--- a/pkgs/by-name/bo/bonsai/package.nix
+++ b/pkgs/by-name/bo/bonsai/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bonsai";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromSourcehut {
     owner = "~stacyharper";
     repo = "bonsai";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ggk+OKaRE+kVa8/ij3znuY3b0dT2F5F1CSse4l0MAA8=";
+    hash = "sha256-WAne0628lELQanUv2lg8Y9QEikZVAT7Xtkndhs8Ozjw=";
   };
 
   nativeBuildInputs = [

From a846ccc8806b0c12d9c73b30815e67e5d3621bd3 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Tue, 31 Dec 2024 19:01:57 +0100
Subject: [PATCH 075/229] openroad: 2.0-unstable-2024-12-22 ->
 2.0-unstable-2024-12-31

---
 .../science/electronics/openroad/default.nix  | 23 +++++++++-----
 .../electronics/openroad/swig43-compat.patch  | 30 +++++++++++++++++++
 2 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/science/electronics/openroad/swig43-compat.patch

diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix
index e86b68202ceb8..4558a9f69b4b9 100644
--- a/pkgs/applications/science/electronics/openroad/default.nix
+++ b/pkgs/applications/science/electronics/openroad/default.nix
@@ -15,6 +15,7 @@
   clp, # for or-tools
   cudd,
   eigen,
+  gtest,
   glpk,
   lcov,
   lemon-graph,
@@ -43,22 +44,27 @@ let
 in
 mkDerivation rec {
   pname = "openroad";
-  version = "2.0-unstable-2024-12-22";
+  version = "2.0-unstable-2024-12-31";
 
   src = fetchFromGitHub {
     owner = "The-OpenROAD-Project";
     repo = "OpenROAD";
-    rev = "51302eb80b11576a01171d33452c362301d55143";
+    rev = "21cf29eda317e0c7777fbfaa3f384ec9fab1a0f9";
     fetchSubmodules = true;
-    hash = "sha256-xFeZo6GjKKee7fTrzN4TNNL8eeTDJXyQGPkIKU/WvIc=";
+    hash = "sha256-cRETSW8cG/Q0hgxaFJjtnBqsIU0r6/kCRy1+5gJfC9o=";
   };
 
+  patches = [
+    ./swig43-compat.patch # https://github.com/The-OpenROAD-Project/OpenROAD/issues/6451
+  ];
+
   nativeBuildInputs = [
     bison
     cmake
     doxygen
     flex
     git
+    gtest
     pkg-config
     swig
   ];
@@ -95,15 +101,13 @@ mkDerivation rec {
     patchShebangs --build etc/find_messages.py
   '';
 
-  # Enable output images from the placer.
   cmakeFlags = [
-    # Tries to download gtest 1.13 as part of the build. We currently rely on
-    # the regression tests so we can get by without building unit tests.
-    "-DENABLE_TESTS=OFF"
+    "-DENABLE_TESTS=ON"
     "-DUSE_SYSTEM_BOOST=ON"
     "-DUSE_SYSTEM_ABC=OFF"
     "-DUSE_SYSTEM_OPENSTA=OFF"
-    "-DOPENROAD_VERSION=${src.rev}"
+    "-DOPENROAD_VERSION=${version}_${src.rev}"
+    "-DCMAKE_RULE_MESSAGES=OFF"
     "-DTCL_LIBRARY=${tcl}/lib/libtcl.so"
     "-DTCL_HEADER=${tcl}/include/tcl.h"
   ];
@@ -115,6 +119,9 @@ mkDerivation rec {
   # to see if there are any breaking changes in unstable that should be vendored as well.
   doCheck = true;
   checkPhase = ''
+    # Disable two tests that are failing curently.
+    sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CTestTestfile.cmake
+    make test
     ../test/regression
   '';
 
diff --git a/pkgs/applications/science/electronics/openroad/swig43-compat.patch b/pkgs/applications/science/electronics/openroad/swig43-compat.patch
new file mode 100644
index 0000000000000..97456f84d4d53
--- /dev/null
+++ b/pkgs/applications/science/electronics/openroad/swig43-compat.patch
@@ -0,0 +1,30 @@
+diff --git a/src/odb/src/swig/python/dbtypes.i b/src/odb/src/swig/python/dbtypes.i
+index 37305d55e..d85f2915e 100644
+--- a/src/odb/src/swig/python/dbtypes.i
++++ b/src/odb/src/swig/python/dbtypes.i
+@@ -271,7 +271,7 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return)
+   swig_type_info *tf = SWIG_TypeQuery("odb::dbShape" "*");
+   for(std::vector<odb::dbShape>::iterator it = $1->begin(); it != $1->end(); it++) {
+     PyObject *o = SWIG_NewInstanceObj(&(*it), tf, 0);
+-    $result = SWIG_Python_AppendOutput($result, o);
++    $result = SWIG_Python_AppendOutput($result, o, 0);
+   }
+ }
+ 
+@@ -283,14 +283,14 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return)
+     auto layer = it->second;
+     PyObject *layer_swig = SWIG_NewInstanceObj(layer, tf, 0);
+     PyObject *tuple = PyTuple_Pack(2, PyFloat_FromDouble(value), layer_swig);
+-    $result = SWIG_Python_AppendOutput($result, tuple);
++    $result = SWIG_Python_AppendOutput($result, tuple, 0);
+   }
+ }
+ 
+ %typemap(argout) std::vector<int> &OUTPUT {
+   for(auto it = $1->begin(); it != $1->end(); it++) {
+     PyObject *obj = PyInt_FromLong((long)*it);
+-    $result = SWIG_Python_AppendOutput($result, obj);
++    $result = SWIG_Python_AppendOutput($result, obj, 0);
+   }
+ }
+ 

From 87c9626b22879ee03f7300f64249ef251ab73d56 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 5 Apr 2024 00:59:43 +0200
Subject: [PATCH 076/229] mesen: init at 2.0.0-unstable-2024-12-25

---
 pkgs/by-name/me/mesen/deps.json               | 272 ++++++++++++++++++
 ...dont-use-alternative-restore-sources.patch |  16 ++
 .../by-name/me/mesen/dont-zip-libraries.patch |  74 +++++
 pkgs/by-name/me/mesen/package.nix             |  82 ++++++
 4 files changed, 444 insertions(+)
 create mode 100644 pkgs/by-name/me/mesen/deps.json
 create mode 100644 pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch
 create mode 100644 pkgs/by-name/me/mesen/dont-zip-libraries.patch
 create mode 100644 pkgs/by-name/me/mesen/package.nix

diff --git a/pkgs/by-name/me/mesen/deps.json b/pkgs/by-name/me/mesen/deps.json
new file mode 100644
index 0000000000000..8b22846368733
--- /dev/null
+++ b/pkgs/by-name/me/mesen/deps.json
@@ -0,0 +1,272 @@
+[
+  {
+    "pname": "Avalonia",
+    "version": "11.2.0",
+    "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q="
+  },
+  {
+    "pname": "Avalonia.Angle.Windows.Natives",
+    "version": "2.1.22045.20230930",
+    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
+  },
+  {
+    "pname": "Avalonia.AvaloniaEdit",
+    "version": "11.1.0",
+    "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.29",
+    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
+  },
+  {
+    "pname": "Avalonia.Controls.ColorPicker",
+    "version": "11.2.0",
+    "hash": "sha256-x6IdcSo3e2Pq/En9/N80HpPblEXSAv51VRlBrF8wlVM="
+  },
+  {
+    "pname": "Avalonia.Controls.DataGrid",
+    "version": "11.2.0",
+    "hash": "sha256-pd/cD82onMZ0iMLl9TOCl35PEvAPbyX2lUj49lrBpOA="
+  },
+  {
+    "pname": "Avalonia.Controls.ProportionalStackPanel",
+    "version": "11.2.0",
+    "hash": "sha256-Y8tX7dBzSl69NOSNdpNGzGetc6wQtKnFy/KRnV0SKhQ="
+  },
+  {
+    "pname": "Avalonia.Controls.Recycling",
+    "version": "11.2.0",
+    "hash": "sha256-ylsPhtILO0pk+5uPZKB5L1o7X8JTiOe48czPPLYLyVs="
+  },
+  {
+    "pname": "Avalonia.Controls.Recycling.Model",
+    "version": "11.2.0",
+    "hash": "sha256-zAleY6ryWIexJAzz4BpT/Xd3iDgNL624YW5sIBJ0Sv8="
+  },
+  {
+    "pname": "Avalonia.Desktop",
+    "version": "11.2.0",
+    "hash": "sha256-+5ISi6WXe8AIjClVo3UqZHgzZpFbMgFk13YvHHhx9MM="
+  },
+  {
+    "pname": "Avalonia.Diagnostics",
+    "version": "11.2.0",
+    "hash": "sha256-k60HGDKnsXiDOnxSH+Hx2ihyqmxSSeWIBJx2XD1ELW0="
+  },
+  {
+    "pname": "Avalonia.FreeDesktop",
+    "version": "11.2.0",
+    "hash": "sha256-u4CQvG6EdsyaHSWa+Y704sDiWZlqbArB0g4gcoCFwQo="
+  },
+  {
+    "pname": "Avalonia.MarkupExtension",
+    "version": "11.2.0",
+    "hash": "sha256-BUEMX+YThWmxh9X50bGsFtclLFVSIITMlAf0iq2vApk="
+  },
+  {
+    "pname": "Avalonia.Native",
+    "version": "11.2.0",
+    "hash": "sha256-fMikurP2RAnOahZkORxuGOKGn5iQ0saZCEYsvoFiFQI="
+  },
+  {
+    "pname": "Avalonia.ReactiveUI",
+    "version": "11.2.0",
+    "hash": "sha256-6GXX1ZA6gS9CpkQnGepx1PFNoKiwcHQyLSK5qOGmjYo="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.2.0",
+    "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM="
+  },
+  {
+    "pname": "Avalonia.Skia",
+    "version": "11.2.0",
+    "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o="
+  },
+  {
+    "pname": "Avalonia.Themes.Fluent",
+    "version": "11.2.0",
+    "hash": "sha256-Ate6KC61pwXmTAk5h1uh7rjwAViuiO/qgAVMl3F1BA8="
+  },
+  {
+    "pname": "Avalonia.Themes.Simple",
+    "version": "11.2.0",
+    "hash": "sha256-l88ZX50Nao8wjtRnyZxNFFgRpJ/yxxNki6NY48dyTUg="
+  },
+  {
+    "pname": "Avalonia.Win32",
+    "version": "11.2.0",
+    "hash": "sha256-A9PB6Bt61jLdQlMOkchWy/3BwROgxS9BP8FObs/KFiU="
+  },
+  {
+    "pname": "Avalonia.X11",
+    "version": "11.2.0",
+    "hash": "sha256-EP9cCqriEh8d+Wwyv27QGK/CY6w2LcCjtcIv79PZqkM="
+  },
+  {
+    "pname": "CommunityToolkit.Mvvm",
+    "version": "8.0.0",
+    "hash": "sha256-G+PXrc2sr2pdy+JCr3t/Ge6nTDtuoWf1Eypu5HufAxw="
+  },
+  {
+    "pname": "Dock.Avalonia",
+    "version": "11.2.0",
+    "hash": "sha256-Q8YUsH+hfnL9VDMPTJSAms7xb+hr42p7scWqu2c2eD4="
+  },
+  {
+    "pname": "Dock.Model",
+    "version": "11.2.0",
+    "hash": "sha256-+PSgjxvHIJBQRn8naGgSfYyArImVLwy6ftm9FoQc+lA="
+  },
+  {
+    "pname": "Dock.Model.Mvvm",
+    "version": "11.2.0",
+    "hash": "sha256-iO67eWHoxsB51Wx5KIK4dwVkU9qwrja7pYsQWTs/8sA="
+  },
+  {
+    "pname": "Dock.Settings",
+    "version": "11.2.0",
+    "hash": "sha256-esCRl7Trdv2bu2ayLw5kXVtCskXLar1asykkfWnqhug="
+  },
+  {
+    "pname": "DotNet.Bundle",
+    "version": "0.9.13",
+    "hash": "sha256-VA7wFPC2V4JudQ+edk6lFkklDPIHZYVWql8/KMzcnys="
+  },
+  {
+    "pname": "DynamicData",
+    "version": "8.3.27",
+    "hash": "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac="
+  },
+  {
+    "pname": "DynamicData",
+    "version": "8.4.1",
+    "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4="
+  },
+  {
+    "pname": "ELFSharp",
+    "version": "2.17.3",
+    "hash": "sha256-8OaAkLxpa5rIhxbmDSnKLeY06jS7nV66LjBjXxHnOb0="
+  },
+  {
+    "pname": "Fody",
+    "version": "6.8.0",
+    "hash": "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "7.3.0.2",
+    "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "7.3.0.2",
+    "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "7.3.0.2",
+    "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
+    "version": "7.3.0.3-preview.2.2",
+    "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "7.3.0.2",
+    "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="
+  },
+  {
+    "pname": "MicroCom.Runtime",
+    "version": "0.11.0",
+    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+  },
+  {
+    "pname": "ReactiveUI",
+    "version": "19.5.41",
+    "hash": "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk="
+  },
+  {
+    "pname": "ReactiveUI",
+    "version": "20.1.1",
+    "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE="
+  },
+  {
+    "pname": "ReactiveUI.Fody",
+    "version": "19.5.41",
+    "hash": "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.8",
+    "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.8",
+    "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.8",
+    "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "2.88.8",
+    "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.8",
+    "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
+  },
+  {
+    "pname": "Splat",
+    "version": "14.8.12",
+    "hash": "sha256-9KTsYPHVN/wiL8/Yy1KQafrFRy7x8VCEHdzgB+9+8SU="
+  },
+  {
+    "pname": "Splat",
+    "version": "15.1.1",
+    "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg="
+  },
+  {
+    "pname": "System.ComponentModel.Annotations",
+    "version": "5.0.0",
+    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.1",
+    "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "8.0.0",
+    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "8.0.0",
+    "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
+  },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.20.0",
+    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
+  }
+]
diff --git a/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch b/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch
new file mode 100644
index 0000000000000..1c194a4a3084f
--- /dev/null
+++ b/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch
@@ -0,0 +1,16 @@
+diff --git a/UI/UI.csproj b/UI/UI.csproj
+index 2a0eb78..74751bc 100644
+--- a/UI/UI.csproj
++++ b/UI/UI.csproj
+@@ -90,11 +90,6 @@
+ 	  <None Remove="Styles\StartupStyles.xaml" />
+ 	  <None Remove="Utilities\DipSwitchDefinitions.xml" />
+ 	</ItemGroup>
+-	<PropertyGroup>
+-		<RestoreSources>
+-			https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json
+-		</RestoreSources>
+-	</PropertyGroup>
+ 	<ItemGroup>
+ 		<TrimmerRootAssembly Include="Mesen" />
+ 		<TrimmerRootAssembly Include="AvaloniaEdit" />
diff --git a/pkgs/by-name/me/mesen/dont-zip-libraries.patch b/pkgs/by-name/me/mesen/dont-zip-libraries.patch
new file mode 100644
index 0000000000000..6aeed6c3e757f
--- /dev/null
+++ b/pkgs/by-name/me/mesen/dont-zip-libraries.patch
@@ -0,0 +1,74 @@
+diff --git a/UI/Config/ConfigManager.cs b/UI/Config/ConfigManager.cs
+index 56c1ff1..ed5fe8a 100644
+--- a/UI/Config/ConfigManager.cs
++++ b/UI/Config/ConfigManager.cs
+@@ -51,7 +51,6 @@ namespace Mesen.Config
+ 			} else {
+ 				homeFolder = DefaultDocumentsFolder;
+ 			}
+-			Program.ExtractNativeDependencies(homeFolder);
+ 			_homeFolder = homeFolder;
+ 			Config.Save();
+ 		}
+diff --git a/UI/Program.cs b/UI/Program.cs
+index dfc4ba3..632cef2 100644
+--- a/UI/Program.cs
++++ b/UI/Program.cs
+@@ -54,8 +54,6 @@ namespace Mesen
+ 			Environment.CurrentDirectory = ConfigManager.HomeFolder;
+ 
+ 			if(!File.Exists(ConfigManager.GetConfigFile())) {
+-				//Could not find configuration file, show wizard
+-				ExtractNativeDependencies(ConfigManager.HomeFolder);
+ 				App.ShowConfigWindow = true;
+ 				BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnMainWindowClose);
+ 				if(File.Exists(ConfigManager.GetConfigFile())) {
+@@ -68,9 +66,6 @@ namespace Mesen
+ 			//Start loading config file in a separate thread
+ 			Task.Run(() => ConfigManager.LoadConfig());
+ 
+-			//Extract core dll & other native dependencies
+-			ExtractNativeDependencies(ConfigManager.HomeFolder);
+-
+ 			if(CommandLineHelper.IsTestRunner(args)) {
+ 				return TestRunner.Run(args);
+ 			}
+@@ -147,7 +142,7 @@ namespace Mesen
+ 						libraryName = libraryName + ".dylib";
+ 					}
+ 				}
+-				return NativeLibrary.Load(Path.Combine(ConfigManager.HomeFolder, libraryName));
++				return NativeLibrary.Load(Path.Combine(AppContext.BaseDirectory, libraryName));
+ 			}
+ 			return IntPtr.Zero;
+ 		}
+diff --git a/UI/UI.csproj b/UI/UI.csproj
+index 053d495..2a0eb78 100644
+--- a/UI/UI.csproj
++++ b/UI/UI.csproj
+@@ -634,7 +634,6 @@
+     <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NtscSafeArea.lua" />
+     <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NesPianoRoll.lua" />
+     <EmbeddedResource Include="Debugger\Utilities\LuaScripts\ReverseMode.lua" />
+-    <EmbeddedResource Include="Dependencies.zip" />
+     <EmbeddedResource Include="Localization\resources.en.xml" WithCulture="false" Type="Non-Resx" />
+     <EmbeddedResource Include="Utilities\DipSwitchDefinitions.xml" />
+   </ItemGroup>
+@@ -644,16 +643,5 @@
+     </AvaloniaXaml>
+   </ItemGroup>
+ 
+-  <Target Name="PreBuildWindows" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='win-x64'">
+-    <Exec Command="cd $(OutDir)&#xD;&#xA;rd Dependencies /s /q&#xD;&#xA;md Dependencies&#xD;&#xA;xcopy /s $(ProjectDir)Dependencies\* Dependencies&#xD;&#xA;copy libHarfBuzzSharp.dll Dependencies&#xD;&#xA;copy libSkiaSharp.dll Dependencies&#xD;&#xA;copy MesenCore.dll Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;del ..\Dependencies.zip&#xD;&#xA;powershell Compress-Archive -Path * -DestinationPath '..\Dependencies.zip' -Force&#xD;&#xA;copy ..\Dependencies.zip $(ProjectDir)" />
+-  </Target>
+-
+-	<Target Name="PreBuildLinux" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='linux-x64'">
+-    <Exec Command="cd $(OutDir)&#xD;&#xA;rm -rf Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.so Dependencies&#xD;&#xA;cp libSkiaSharp.so Dependencies&#xD;&#xA;cp MesenCore.so Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" />
+-  </Target>
+-  
+-	<Target Name="PreBuildOsx" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='osx-x64' Or '$(RuntimeIdentifier)'=='osx-arm64'">
+-    <Exec Command="cp ./Assets/MesenIcon.icns $(OutDir)&#xD;&#xA;cd $(OutDir)&#xD;&#xA;rm -R Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.dylib Dependencies&#xD;&#xA;cp libSkiaSharp.dylib Dependencies&#xD;&#xA;cp MesenCore.dylib Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" />
+-  </Target>
+ 
+ </Project>
+
diff --git a/pkgs/by-name/me/mesen/package.nix b/pkgs/by-name/me/mesen/package.nix
new file mode 100644
index 0000000000000..43957a1c7004a
--- /dev/null
+++ b/pkgs/by-name/me/mesen/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  clangStdenv,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  wrapGAppsHook3,
+  gtk3,
+  SDL2,
+}:
+
+buildDotnetModule rec {
+  pname = "mesen";
+  version = "2.0.0-unstable-2024-12-25";
+
+  src = fetchFromGitHub {
+    owner = "SourMesen";
+    repo = "Mesen2";
+    rev = "6820db37933002089a04d356d8469481e915a359";
+    hash = "sha256-TzGMZr351XvVj/wARWJxRisRb5JlkyzdjCVYbwydBVE=";
+  };
+
+  patches = [
+    # the nightly avalonia repository url is still queried, which errors out
+    # even if we don't actually need any nightly versions
+    ./dont-use-alternative-restore-sources.patch
+    # upstream has a weird library loading mechanism, which we override with a more sane alternative
+    ./dont-zip-libraries.patch
+  ];
+
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.runtime_8_0;
+
+  projectFile = [ "UI/UI.csproj" ];
+
+  dotnetFlags = [
+    "-p:RuntimeIdentifier=${dotnetCorePackages.systemToDotnetRid clangStdenv.hostPlatform.system}"
+  ];
+
+  executables = [ "Mesen" ];
+
+  nugetDeps = ./deps.json;
+
+  nativeBuildInputs = [ wrapGAppsHook3 ];
+
+  runtimeDeps = [ gtk3 ];
+
+  postInstall = ''
+    ln -s ${passthru.core}/lib/MesenCore.* $out/lib/mesen
+  '';
+
+  # according to upstream, compiling with clang creates a faster binary
+  passthru.core = clangStdenv.mkDerivation {
+    pname = "mesen-core";
+    inherit version src;
+
+    enableParallelBuilding = true;
+
+    strictDeps = true;
+
+    nativeBuildInputs = [ SDL2 ];
+
+    buildInputs = [ SDL2 ];
+
+    makeFlags = [ "core" ];
+
+    installPhase = ''
+      runHook preInstall
+      install -Dm755 InteropDLL/obj.*/MesenCore.* -t $out/lib
+      runHook postInstall
+    '';
+  };
+
+  meta = {
+    badPlatforms = [ "aarch64-linux" ]; # not sure what the issue is
+    description = "Multi-system emulator that supports NES, SNES, Game Boy (Color) and PC Engine games";
+    homepage = "https://www.mesen.ca";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "Mesen";
+    maintainers = with lib.maintainers; [ tomasajt ];
+  };
+}

From 1f2141968a4962a65f8caa262f1113d75da8c88a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 12:30:20 +0000
Subject: [PATCH 077/229] abracadabra: 2.8.0 -> 2.9.0

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

diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix
index c5d1d649fdb60..30f14f074c94b 100644
--- a/pkgs/by-name/ab/abracadabra/package.nix
+++ b/pkgs/by-name/ab/abracadabra/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abracadabra";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "KejPi";
     repo = "AbracaDABra";
     rev = "v${version}";
-    hash = "sha256-bzRXGxSWoiBqvx8r2coNVPQKilOAKFoqBcB4F0uAV8g=";
+    hash = "sha256-PPG71W5HeLr4R8je88K4VXPiSbJn5T7dP3M05C+bkv0=";
   };
 
   nativeBuildInputs = [

From 984ed569b2d7d8ff4a831f6b774464907855e0d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 13:03:38 +0000
Subject: [PATCH 078/229] sirikali: 1.7.2 -> 1.8.0

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

diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix
index e122665acb4c6..692a27cdb4d88 100644
--- a/pkgs/by-name/si/sirikali/package.nix
+++ b/pkgs/by-name/si/sirikali/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sirikali";
-  version = "1.7.2";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "mhogomchungu";
     repo = "sirikali";
     rev = version;
-    hash = "sha256-UtgK+q06J6T6RJ8jQiwzg5yVtgGZaZzmfadNyXxTCIk=";
+    hash = "sha256-zEiX0eAsmfWDXehxetkqXbdXhB53DE5LDyglMBijckI=";
   };
 
   buildInputs =

From 972b05a0e77aef8af84257486a8bbff1c516d880 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 1 Jan 2025 06:06:06 -0800
Subject: [PATCH 079/229] dbip-asn-lite: 2024-12 -> 2025-01

---
 pkgs/by-name/db/dbip-asn-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix
index 471f81965a7c8..b5ca33f499069 100644
--- a/pkgs/by-name/db/dbip-asn-lite/package.nix
+++ b/pkgs/by-name/db/dbip-asn-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-asn-lite";
-  version = "2024-12";
+  version = "2025-01";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-tzeXJzgTG6AB46dCYqtdECqMm2nh9PfPigMvRif2+cM=";
+    hash = "sha256-cRlhlP5ml+swBZGiLpVH5s7nvPiHUi7qxM2GajoeK+Y=";
   };
 
   dontUnpack = true;

From 7b55a95f4a3048974f8505befefe452dc013d2b7 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 1 Jan 2025 06:06:24 -0800
Subject: [PATCH 080/229] dbip-city-lite: 2024-12 -> 2025-01

---
 pkgs/by-name/db/dbip-city-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix
index 57665c88c9389..521d3cebf20e6 100644
--- a/pkgs/by-name/db/dbip-city-lite/package.nix
+++ b/pkgs/by-name/db/dbip-city-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-city-lite";
-  version = "2024-12";
+  version = "2025-01";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-IkZ6d9CP+AgYXaWmQTfTz2MTHEV7h/f1HiOAGXxBH+g=";
+    hash = "sha256-fBS2JASkZaLNCjNAadNkrctixTkDvpkTUYP0yUHBXnw=";
   };
 
   dontUnpack = true;

From f003ce29e9593c5dc5b203c48f21a062dbf0378c Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 1 Jan 2025 06:06:29 -0800
Subject: [PATCH 081/229] dbip-country-lite: 2024-12 -> 2025-01

---
 pkgs/by-name/db/dbip-country-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix
index d7642c25bd0a2..00f29f3674d77 100644
--- a/pkgs/by-name/db/dbip-country-lite/package.nix
+++ b/pkgs/by-name/db/dbip-country-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-country-lite";
-  version = "2024-12";
+  version = "2025-01";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-58g4ch1N1vPPymYx6M7X3Q6l6Sbr5GkEXv/Vi7K9Ivk=";
+    hash = "sha256-PVpqo1t6V0kdVqA1aEgU0UqwhzmLLMHYB6gyoMusVv8=";
   };
 
   dontUnpack = true;

From 88eaedddc76dfb99201fd0e43815e083386c2c2d Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 1 Jan 2025 06:07:43 -0800
Subject: [PATCH 082/229] v2ray-domain-list-community: 20241210004721 ->
 20241221105938

Diff: https://github.com/v2fly/domain-list-community/compare/20241210004721...20241221105938
---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index 5373233bd890b..b7439e413c9a4 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20241210004721";
+    version = "20241221105938";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-CiIjD6hI2rdulK/rqViLqB2YotpHd5ftOOxJncIcYS4=";
+      hash = "sha256-k42qnHQY9bfSjyGGtaqKdIxlvU/C7TiN8sD0AiRQmVU=";
     };
     vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
     meta = with lib; {

From 211e54889a60754cf224a2b2af9d7f9371d9f032 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 14:22:41 +0000
Subject: [PATCH 083/229] ecapture: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix
index 3922bab9b40fc..091c65abdaf41 100644
--- a/pkgs/by-name/ec/ecapture/package.nix
+++ b/pkgs/by-name/ec/ecapture/package.nix
@@ -21,13 +21,13 @@
 
 buildGoModule rec {
   pname = "ecapture";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "gojue";
     repo = "ecapture";
     tag = "v${version}";
-    hash = "sha256-ucauZ1nvsiNxeqMcMHbUaKidAGF/XW7hi04W+Bv6I6Q=";
+    hash = "sha256-UPWREeyB2YLYU3B4Rxr5oPoOfksL/lnllWyaFxhAe/0=";
     fetchSubmodules = true;
   };
 
@@ -106,7 +106,7 @@ buildGoModule rec {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  vendorHash = "sha256-A+0ASVHMzNcuLsP9F55hvGjflLg68p0ckj6kPbjdg4E=";
+  vendorHash = "sha256-8ilfqPt5Phuj5Uaf90+Ir/DFN27oW5Fd+Wsp34/EU9M=";
 
   passthru.updateScript = nix-update-script { };
 

From 3daabfe6f9685f6c6dbd112a131ef3a3945efc3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 15:08:05 +0000
Subject: [PATCH 084/229] spectra: 1.0.1 -> 1.1.0

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

diff --git a/pkgs/by-name/sp/spectra/package.nix b/pkgs/by-name/sp/spectra/package.nix
index 0cc351f13e2d2..fc3a1512923ee 100644
--- a/pkgs/by-name/sp/spectra/package.nix
+++ b/pkgs/by-name/sp/spectra/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "spectra";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "yixuan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-HaJmMo4jYmO/j53/nHrL3bvdQMAvp4Nuhhe8Yc7pL88=";
+    sha256 = "sha256-ut6nEOpzIoFy+IUWQy9x2pJ4+sA0d/Dt8WaNq5AFCFg=";
   };
 
   nativeBuildInputs = [ cmake ];

From 82bdfc5bfb0b47b7256d4f4d278fd255f485a062 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 15:32:53 +0000
Subject: [PATCH 085/229] yacreader: 9.14.2 -> 9.15.0

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

diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index af1d7579bbcac..692463174da68 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -16,13 +16,13 @@
 
 mkDerivation rec {
   pname = "yacreader";
-  version = "9.14.2";
+  version = "9.15.0";
 
   src = fetchFromGitHub {
     owner = "YACReader";
     repo = pname;
     rev = version;
-    sha256 = "sha256-gQ4Aaapini6j3lCtowFbrfwbe91aFl50hp1EfxTO8uY=";
+    sha256 = "sha256-5vCjr8WRwa7Q/84Itgg07K1CJKGnWA1z53et2IxxReE=";
   };
 
   nativeBuildInputs = [

From f76083988fe3534f840e33323b7039d65280b63a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 17:52:08 +0100
Subject: [PATCH 086/229] urlfinder: init at 0.0.2

Tool for passively gathering URLs without active scanning

https://github.com/projectdiscovery/urlfinder
---
 pkgs/by-name/ur/urlfinder/package.nix | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/by-name/ur/urlfinder/package.nix

diff --git a/pkgs/by-name/ur/urlfinder/package.nix b/pkgs/by-name/ur/urlfinder/package.nix
new file mode 100644
index 0000000000000..8ffd59e9e3263
--- /dev/null
+++ b/pkgs/by-name/ur/urlfinder/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "urlfinder";
+  version = "0.0.2";
+
+  src = fetchFromGitHub {
+    owner = "projectdiscovery";
+    repo = "urlfinder";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hORZzeGNcRTcFsvY8pfs8f1JNpdTJjMdO/lJHR83DfY=";
+  };
+
+  vendorHash = "sha256-Wu9itQfcrwWuzRHtTKk+lF7n6eIzSfATWtI+8xLQQsI=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Tool for passively gathering URLs without active scanning";
+    homepage = "https://github.com/projectdiscovery/urlfinder";
+    changelog = "https://github.com/projectdiscovery/urlfinder/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "urlfinder";
+  };
+}

From 3b0d5f365e1b3ba3c648ed4cd321388f7901ceed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20N=C3=BCtzi?= <gnuetzi@gmail.com>
Date: Wed, 1 Jan 2025 18:27:45 +0100
Subject: [PATCH 087/229] buildGoModule: remove some unnecessary quotes

---
 pkgs/build-support/go/module.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index 3a3ae71de508b..35bc2a0b42a2e 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -130,7 +130,7 @@ in
 
       export GIT_SSL_CAINFO=$NIX_SSL_CERT_FILE
       ${if finalAttrs.proxyVendor then ''
-        mkdir -p "''${GOPATH}/pkg/mod/cache/download"
+        mkdir -p "$GOPATH/pkg/mod/cache/download"
         go mod download
       '' else ''
         if (( "''${NIX_DEBUG:-0}" >= 1 )); then
@@ -148,8 +148,8 @@ in
       runHook preInstall
 
       ${if finalAttrs.proxyVendor then ''
-        rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb"
-        cp -r --reflink=auto "''${GOPATH}/pkg/mod/cache/download" $out
+        rm -rf "$GOPATH/pkg/mod/cache/download/sumdb"
+        cp -r --reflink=auto "$GOPATH/pkg/mod/cache/download" $out
       '' else ''
         cp -r --reflink=auto vendor $out
       ''}

From 760d6269f0ea0fb0bc9f02536f9b267c72102703 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 15:19:50 +0100
Subject: [PATCH 088/229] wxGTK31: use new darwin sdk pattern

---
 .../libraries/wxwidgets/wxGTK31.nix            | 18 ------------------
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 19 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
index 1c72e919aed53..fdc8c67038485 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
@@ -23,14 +23,6 @@
   withWebKit ? stdenv.hostPlatform.isDarwin,
   webkitgtk_4_0,
   setfile,
-  AGL,
-  Carbon,
-  Cocoa,
-  Kernel,
-  QTKit,
-  AVFoundation,
-  AVKit,
-  WebKit,
 }:
 
 stdenv.mkDerivation rec {
@@ -68,20 +60,10 @@ stdenv.mkDerivation rec {
     ++ lib.optional withCurl curl
     ++ lib.optional withMesa libGLU
     ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0
-    ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       setfile
-      Carbon
-      Cocoa
-      Kernel
-      QTKit
-      AVFoundation
-      AVKit
-      WebKit
     ];
 
-  propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL;
-
   configureFlags =
     [
       "--disable-precomp-headers"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ed3cf54d85b8..de141175ed325 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10965,7 +10965,6 @@ with pkgs;
 
   wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix {
     inherit (darwin.stubs) setfile;
-    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;
   };
 
   wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix {

From 90660e8d394859aa85271345017533a4b3bb3bb4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 15:19:58 +0100
Subject: [PATCH 089/229] wxGTK32: use new darwin sdk pattern

---
 .../libraries/wxwidgets/wxGTK32.nix            | 18 ------------------
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 19 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix
index 84263f4c2f4e8..bf53ecc7ad59d 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix
@@ -25,14 +25,6 @@
 , withWebKit ? true
 , webkitgtk_4_0
 , setfile
-, AGL
-, Carbon
-, Cocoa
-, Kernel
-, QTKit
-, AVFoundation
-, AVKit
-, WebKit
 }:
 let
   catch = fetchFromGitHub {
@@ -81,21 +73,11 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optional withMesa libGLU
   ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0
-  ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     expat
     setfile
-    Carbon
-    Cocoa
-    Kernel
-    QTKit
-    AVFoundation
-    AVKit
-    WebKit
   ];
 
-  propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL;
-
   configureFlags = [
     "--disable-precomp-headers"
     # This is the default option, but be explicit
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de141175ed325..33e5f27c60d6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10969,7 +10969,6 @@ with pkgs;
 
   wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix {
     inherit (darwin.stubs) setfile;
-    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;
   };
 
   wxSVG = callPackage ../development/libraries/wxSVG {

From 98fe668bb66b62077edf1b068edee92b5bfe6b84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 18:40:26 +0000
Subject: [PATCH 090/229] notmuch-mailmover: 0.5.0 -> 0.6.0

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

diff --git a/pkgs/by-name/no/notmuch-mailmover/package.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix
index 3380ea217a223..73e5ea5e6632b 100644
--- a/pkgs/by-name/no/notmuch-mailmover/package.nix
+++ b/pkgs/by-name/no/notmuch-mailmover/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "notmuch-mailmover";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "michaeladler";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ionqR60mI/oHnqVqtdIeIU1HeCbXfLGIHqaHDYEZONk=";
+    hash = "sha256-v70R6CgN4RzG6L8LUg3ZvW895+G4eU8HZ0TI+jRxZ10=";
   };
 
-  cargoHash = "sha256-tUhdfmYAdDlDMez03+ObX9PEU0CML12c5D8N95xiErI=";
+  cargoHash = "sha256-ys8fupS78yxgFBPCCB2JbGADNSEefrEEEGBgzWcLCnI=";
 
   nativeBuildInputs = [
     installShellFiles

From 0f360a3912d102220e655d7a40b9bc8096a9565c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 18:41:24 +0000
Subject: [PATCH 091/229] lock: 1.3.6 -> 1.3.7

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

diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix
index ecc6bc7b2313e..6cea78ab82521 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lock";
-  version = "1.3.6";
+  version = "1.3.7";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-Zd0fVCeE/QTvptoxbyDxcPiBrZ/qZMx/A0tB1wZbX6A=";
+    hash = "sha256-UZt8SlkwhtVRLUMf1uYNLchzkWnL+6e7xLYZ81+YQsw=";
   };
 
   strictDeps = true;

From 3550cccc94a3c60abd05e7015eb94fdbb7cfe76f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:48:46 +0100
Subject: [PATCH 092/229] wxGTK31: fix darwin build

---
 pkgs/development/libraries/wxwidgets/wxGTK31.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
index fdc8c67038485..0f0595783c3df 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
@@ -23,6 +23,7 @@
   withWebKit ? stdenv.hostPlatform.isDarwin,
   webkitgtk_4_0,
   setfile,
+  libpng,
 }:
 
 stdenv.mkDerivation rec {
@@ -62,6 +63,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       setfile
+      libpng
     ];
 
   configureFlags =

From e7e5b31fe4e8cca48c0a22b681f8e1e4eb1cd76e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 1 Jan 2025 10:36:52 -0800
Subject: [PATCH 093/229] python312Packages.pydevccu: 0.1.8 -> 0.1.9

Diff: https://github.com/SukramJ/pydevccu/compare/refs/tags/0.1.8...0.1.9

Changelog: https://github.com/SukramJ/pydevccu/releases/tag/0.1.9
---
 .../python-modules/pydevccu/default.nix       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix
index b1af673ed6fd5..e849fd96974fa 100644
--- a/pkgs/development/python-modules/pydevccu/default.nix
+++ b/pkgs/development/python-modules/pydevccu/default.nix
@@ -8,18 +8,23 @@
 
 buildPythonPackage rec {
   pname = "pydevccu";
-  version = "0.1.8";
+  version = "0.1.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
-    owner = "danielperna84";
+    owner = "SukramJ";
     repo = "pydevccu";
-    rev = "refs/tags/${version}";
-    hash = "sha256-WguSTtWxkiDs5nK5eiaarfD0CBxzIxQR9fxjuW3wMGc=";
+    tag = version;
+    hash = "sha256-s1u9+w0sPpXuqAET4k5VPWP+VoPqB08dZa9oY4UFXc8=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools==75.6.0" setuptools
+  '';
+
   build-system = [ setuptools ];
 
   # Module has no tests
@@ -29,8 +34,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "HomeMatic CCU XML-RPC Server with fake devices";
-    homepage = "https://github.com/danielperna84/pydevccu";
-    changelog = "https://github.com/danielperna84/pydevccu/releases/tag/${version}";
+    homepage = "https://github.com/SukramJ/pydevccu";
+    changelog = "https://github.com/SukramJ/pydevccu/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };

From c368e0a128a487e37e30fa4b4ac8c2e3fe69c06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 1 Jan 2025 05:24:20 -0800
Subject: [PATCH 094/229] python312Packages.hahomematic: 2024.12.5 ->
 2024.12.13

Diff: https://github.com/SukramJ/hahomematic/compare/refs/tags/2024.12.5...2024.12.13

Changelog: https://github.com/SukramJ/hahomematic/blob/refs/tags/2024.12.13/changelog.md
---
 .../python-modules/hahomematic/default.nix         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 11fb16c44a6fb..999001916eb2b 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -7,6 +7,7 @@
   orjson,
   pydevccu,
   pytest-aiohttp,
+  pytest-socket,
   pytestCheckHook,
   python-slugify,
   pythonOlder,
@@ -16,16 +17,16 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "2024.12.5";
+  version = "2024.12.13";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
-    owner = "danielperna84";
+    owner = "SukramJ";
     repo = "hahomematic";
-    rev = "refs/tags/${version}";
-    hash = "sha256-jC9IXkl80pspqc9m0U6mspp5QSGG6u9Y6ANMK8WAG5s=";
+    tag = version;
+    hash = "sha256-qHB47S5bU+353deoq4B8XwPYfUoU940Y3hl8u3gGrNs=";
   };
 
   __darwinAllowLocalNetworking = true;
@@ -48,6 +49,7 @@ buildPythonPackage rec {
     freezegun
     pydevccu
     pytest-aiohttp
+    pytest-socket
     pytestCheckHook
   ];
 
@@ -55,8 +57,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python module to interact with HomeMatic devices";
-    homepage = "https://github.com/danielperna84/hahomematic";
-    changelog = "https://github.com/danielperna84/hahomematic/blob/${src.rev}/changelog.md";
+    homepage = "https://github.com/SukramJ/hahomematic";
+    changelog = "https://github.com/SukramJ/hahomematic/blob/${src.tag}/changelog.md";
     license = licenses.mit;
     maintainers = with maintainers; [
       dotlambda

From 1e0b0c05f70808d6f56375e7e91455c740ec1068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 1 Jan 2025 05:29:00 -0800
Subject: [PATCH 095/229] home-assistant-custom-components.homematicip_local:
 1.75.0 -> 1.76.1

Diff: https://github.com/SukramJ/custom_homematic/compare/refs/tags/1.75.0...1.76.1

Changelog: https://github.com/SukramJ/custom_homematic/blob/1.76.1/changelog.md
---
 .../homematicip_local/package.nix                  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index 29fd801e38aae..643b58e3ae7de 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -7,15 +7,15 @@
 }:
 
 buildHomeAssistantComponent rec {
-  owner = "danielperna84";
+  owner = "SukramJ";
   domain = "homematicip_local";
-  version = "1.75.0";
+  version = "1.76.1";
 
   src = fetchFromGitHub {
-    owner = "danielperna84";
+    owner = "SukramJ";
     repo = "custom_homematic";
-    rev = "refs/tags/${version}";
-    hash = "sha256-H5Gf09C9/s2JYVTjgiYNe28mV18mqTiJ0ZDR6rnuojo=";
+    tag = version;
+    hash = "sha256-dBNZFYoi6tA9waV/yPCkgLu+ADxq09UKsOBHWOOBRJY=";
   };
 
   postPatch = ''
@@ -30,9 +30,9 @@ buildHomeAssistantComponent rec {
   ];
 
   meta = {
-    changelog = "https://github.com/danielperna84/custom_homematic/blob/${version}/changelog.md";
+    changelog = "https://github.com/SukramJ/custom_homematic/blob/${src.tag}/changelog.md";
     description = "Custom Home Assistant Component for HomeMatic";
-    homepage = "https://github.com/danielperna84/custom_homematic";
+    homepage = "https://github.com/SukramJ/custom_homematic";
     maintainers = with lib.maintainers; [ dotlambda ];
     license = lib.licenses.mit;
   };

From 01a3482008ad1738e111965cc2588c42741198d1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 27 Nov 2024 07:54:38 +0000
Subject: [PATCH 096/229] python312Packages.python-mapnik: unpin Boost

Marked as broken, but compiles successfully and gets to the same
failing test even with Boost unpinned.
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 094d527016920..0c0876640148d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13191,7 +13191,7 @@ self: super: with self; {
 
   python-mapnik = callPackage ../development/python-modules/python-mapnik rec {
     inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib;
-    boost = pkgs.boost182.override {
+    boost = pkgs.boost.override {
       enablePython = true;
       inherit python;
     };

From dc213dbe001b01ebec8429c70ab721b9ee1a60ec Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 27 Nov 2024 07:54:38 +0000
Subject: [PATCH 097/229] python312Packages.rdkit: unpin Boost

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0c0876640148d..15475d6aae870 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13830,7 +13830,7 @@ self: super: with self; {
   rdflib = callPackage ../development/python-modules/rdflib { };
 
   rdkit = callPackage ../development/python-modules/rdkit {
-    boost = pkgs.boost182.override {
+    boost = pkgs.boost.override {
       enablePython = true;
       inherit python;
     };

From 6f2b12dd6a37561b6e21cc88cfec180f828b39d0 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 27 Nov 2024 07:54:38 +0000
Subject: [PATCH 098/229] =?UTF-8?q?python312Packages.ifcopenshell:=20add?=
 =?UTF-8?q?=20upstream=20patch=20for=20Boost=20=E2=89=A5=201.86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../python-modules/ifcopenshell/default.nix   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix
index c9b5183e4f9e0..8f373abdbaffc 100644
--- a/pkgs/development/python-modules/ifcopenshell/default.nix
+++ b/pkgs/development/python-modules/ifcopenshell/default.nix
@@ -8,13 +8,14 @@
   pytestCheckHook,
   # fetchers
   fetchFromGitHub,
+  fetchpatch,
   gitUpdater,
   # build tools
   cmake,
   swig,
   # native dependencies
   eigen,
-  boost179,
+  boost,
   cgal,
   gmp,
   hdf5,
@@ -65,6 +66,20 @@ buildPythonPackage rec {
     hash = "sha256-tnj14lBEkUZNDM9J1sRhNA7OkWTWa5JPTSF8hui3q7k=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "ifcopenshell-boost-1.86-mt19937.patch";
+      url = "https://github.com/IfcOpenShell/IfcOpenShell/commit/1fe168d331123920eeb9a96e542fcc1453de57fe.patch";
+      hash = "sha256-oZDEL8cPcEu83lW+qSvCbmDGYpaNNRrptW9MLu2pN70=";
+    })
+
+    (fetchpatch {
+      name = "ifcopenshell-boost-1.86-json.patch";
+      url = "https://github.com/IfcOpenShell/IfcOpenShell/commit/88b861737c7c206d0e7307f90d37467e9585515c.patch";
+      hash = "sha256-zMoQcBWRdtavL0xdsr53SqyG6CZoeon8/mmJhrw85lc=";
+    })
+  ];
+
   nativeBuildInputs = [
     # c++
     cmake
@@ -77,7 +92,7 @@ buildPythonPackage rec {
   buildInputs = [
     # ifcopenshell needs stdc++
     (lib.getLib stdenv.cc.cc)
-    boost179
+    boost
     cgal
     eigen
     gmp

From c309e66419ee30d9b9d07773ed4e3f14e4ef42ff Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 1 Jan 2025 19:45:42 +0100
Subject: [PATCH 099/229] emacs30.pkgs.aio: Fix build

---
 .../editors/emacs/elisp-packages/melpa-packages.nix            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 02932d6a8ee75..317ed3f73f28c 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -761,6 +761,9 @@ let
         # Optimizer error: too much on the stack
         ack-menu = ignoreCompilationError super.ack-menu;
 
+        # https://github.com/skeeto/emacs-aio/issues/31
+        aio = ignoreCompilationError super.aio;
+
         # https://github.com/gongo/airplay-el/issues/2
         airplay = addPackageRequires super.airplay [ self.request-deferred ];
 

From 2756e29d887d9358ce2ad4a92dbf0af8a4d7a8fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 20:01:58 +0000
Subject: [PATCH 100/229] flyctl: 0.3.53 -> 0.3.56

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

diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index d8ce4a9f323b8..51fbf03d91720 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.3.53";
+  version = "0.3.56";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-B6Qku84vUy2KtAWQ3mpbOd1G14xAw0FFuB02fDvFE84=";
+    hash = "sha256-l413128FjVflVKHAYJspK63UP8IomNimIeJi3xyYmxw=";
   };
 
-  vendorHash = "sha256-B7COrPKxTBDdFehBcNKt47I1ZslBHjWc+ibPiCpIocU=";
+  vendorHash = "sha256-/YP9qx6OS2OcPSF1BgEZ4l+nSwg+T5rKOHjdDHlNy+k=";
 
   subPackages = [ "." ];
 

From a97234e2fdc84169e49ad675e66aec37f0500389 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Thu, 2 Jan 2025 08:55:02 +1300
Subject: [PATCH 101/229] heroic: fix packaging

Make this package closer to the upstream release build by running the
electron-build task.
---
 pkgs/games/heroic/default.nix | 49 +++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix
index d3a51d82cb6c2..db33d84856844 100644
--- a/pkgs/games/heroic/default.nix
+++ b/pkgs/games/heroic/default.nix
@@ -5,6 +5,7 @@
   nix-update-script,
   pnpm,
   nodejs,
+  python3,
   makeWrapper,
   electron,
   vulkan-helper,
@@ -33,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     nodejs
     pnpm.configHook
+    python3
     makeWrapper
   ];
 
@@ -41,21 +43,25 @@ stdenv.mkDerivation (finalAttrs: {
     ./fix-non-steam-shortcuts.patch
   ];
 
-  postPatch = ''
-    # We are not packaging this as an Electron application bundle, so Electron
-    # reports to the application that is is not "packaged", which causes Heroic
-    # to take some incorrect codepaths meant for development environments.
-    substituteInPlace src/**/*.ts --replace-quiet 'app.isPackaged' 'true'
-  '';
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
   buildPhase = ''
     runHook preBuild
 
+    # set nodedir to prevent node-gyp from downloading headers
+    # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific
+    mkdir -p $HOME/.node-gyp/${nodejs.version}
+    echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
+    ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
+    export npm_config_nodedir=${nodejs}
+
     pnpm --offline electron-vite build
-    # Remove dev dependencies.
-    pnpm --ignore-scripts prune --prod
-    # Clean up broken symlinks left behind by `pnpm prune`
-    find node_modules/.bin -xtype l -delete
+    pnpm --offline electron-builder \
+      --linux \
+      --dir \
+      -c.asarUnpack="**/*.node" \
+      -c.electronDist=${electron.dist} \
+      -c.electronVersion=${electron.version}
 
     runHook postBuild
   '';
@@ -65,33 +71,32 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/share/{applications,heroic}
-    cp -r . $out/share/heroic
-    rm -rf $out/share/heroic/{.devcontainer,.vscode,.husky,.idea,.github}
+    mkdir -p "$out/opt/heroic"
+    cp -r dist/linux-unpacked/resources "$out/opt/heroic"
 
-    chmod -R u+w "$out/share/heroic/public/bin" "$out/share/heroic/build/bin"
-    rm -rf "$out/share/heroic/public/bin" "$out/share/heroic/build/bin"
-    mkdir -p "$out/share/heroic/build/bin/x64/linux"
+    cp -r public "$out/opt/heroic/resources/app.asar.unpacked/build"
+    rm -rf "$out/opt/heroic/resources/app.asar.unpacked/build/bin"
+    mkdir -p "$out/opt/heroic/resources/app.asar.unpacked/build/bin/x64/linux"
     ln -s \
       "${lib.getExe gogdl}" \
       "${lib.getExe legendary-gl}" \
       "${lib.getExe nile}" \
       "${lib.getExe comet-gog}" \
       "${lib.getExe vulkan-helper}" \
-      "$out/share/heroic/build/bin/x64/linux/"
+      "$out/opt/heroic/resources/app.asar.unpacked/build/bin/x64/linux"
 
     makeWrapper "${electron}/bin/electron" "$out/bin/heroic" \
       --inherit-argv0 \
+      --set ELECTRON_FORCE_IS_PACKAGED 1 \
       --add-flags --disable-gpu-compositing \
-      --add-flags $out/share/heroic \
+      --add-flags $out/opt/heroic/resources/app.asar \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
 
-    substituteInPlace "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.desktop" \
+    install -D "flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications/com.heroicgameslauncher.hgl.desktop"
+    install -D "src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg"
+    substituteInPlace "$out/share/applications/com.heroicgameslauncher.hgl.desktop" \
       --replace-fail "StartupWMClass=Heroic" "StartupWMClass=heroic" \
       --replace-fail "Exec=heroic-run" "Exec=heroic"
-    mkdir -p "$out/share/applications" "$out/share/icons/hicolor/scalable/apps"
-    ln -s "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications"
-    ln -s "$out/share/heroic/src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg"
 
     runHook postInstall
   '';

From 5916b2a824319da05d70dcb415efe5e2a061e5c2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 21:25:52 +0100
Subject: [PATCH 102/229] cve-prioritizer: init at 1.8.0

Vulnerability patching with CVSS, EPSS, and CISA's Known Exploited Vulnerabilities

https://github.com/TURROKS/CVE_Prioritizer
---
 pkgs/by-name/cv/cve-prioritizer/package.nix | 58 +++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 pkgs/by-name/cv/cve-prioritizer/package.nix

diff --git a/pkgs/by-name/cv/cve-prioritizer/package.nix b/pkgs/by-name/cv/cve-prioritizer/package.nix
new file mode 100644
index 0000000000000..705951a13d3c5
--- /dev/null
+++ b/pkgs/by-name/cv/cve-prioritizer/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  python3,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "cve-prioritizer";
+  version = "1.8.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "TURROKS";
+    repo = "CVE_Prioritizer";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ade/gcRrdvVsp5F61ZndsNL3s3gq8TDk/dZvPc55S/8=";
+  };
+
+  patches = [
+    # Add script, https://github.com/TURROKS/CVE_Prioritizer/pull/33
+    (fetchpatch {
+      name = "add-script.patch";
+      url = "https://github.com/TURROKS/CVE_Prioritizer/commit/c29f2332cde7d79e0c9f34c0a1811611a8fb73c9.patch";
+      hash = "sha256-/hnS+YKO4zNGVGTG+KsugJH7Bt2OE8Q2F+7ZX+uhFlU=";
+    })
+  ];
+
+  postPatch = ''
+    # https://github.com/TURROKS/CVE_Prioritizer/pull/32
+    substituteInPlace pyproject.toml \
+      --replace-fail "CVE Prioritizer" "cve-prioritizer"
+  '';
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
+    click
+    pandas
+    python-dotenv
+    requests
+    termcolor
+  ];
+
+  # Project has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "cve_prioritizer" ];
+
+  meta = {
+    description = "Vulnerability patching with CVSS, EPSS, and CISA's Known Exploited Vulnerabilities";
+    homepage = "https://github.com/TURROKS/CVE_Prioritizer";
+    changelog = "https://github.com/TURROKS/CVE_Prioritizer/releases/tag/v${version}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "cve-prioritizer";
+  };
+}

From 94ae419b96b80b486180920899df9cfa65714c9c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 22:08:50 +0100
Subject: [PATCH 103/229] python312Packages.diagrams: 0.23.4 -> 0.24.2

---
 .../diagrams/build_poetry.patch               | 12 -----
 .../python-modules/diagrams/default.nix       | 51 ++++++++++---------
 2 files changed, 26 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/python-modules/diagrams/build_poetry.patch

diff --git a/pkgs/development/python-modules/diagrams/build_poetry.patch b/pkgs/development/python-modules/diagrams/build_poetry.patch
deleted file mode 100644
index b2e3d39dae110..0000000000000
--- a/pkgs/development/python-modules/diagrams/build_poetry.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 2c93a39..6c800e2 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -24,3 +24,7 @@ isort = "^4.3"
- 
- [tool.black]
- line-length = 120
-+
-+[build-system]
-+requires = ["poetry_core>=1.0.0"]
-+build-backend = "poetry.core.masonry.api"
diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix
index 85eafa12893b6..551430eebaa6a 100644
--- a/pkgs/development/python-modules/diagrams/default.nix
+++ b/pkgs/development/python-modules/diagrams/default.nix
@@ -1,47 +1,52 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
-  jinja2,
-  poetry-core,
-  round,
+  fetchpatch,
   graphviz,
-  inkscape,
   imagemagick,
+  inkscape,
+  jinja2,
+  poetry-core,
   pytestCheckHook,
-  typed-ast,
+  pythonOlder,
+  round,
 }:
 
 buildPythonPackage rec {
   pname = "diagrams";
-  version = "0.23.4";
-  format = "pyproject";
+  version = "0.24.2";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "mingrammer";
-    repo = pname;
+    repo = "diagrams";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2jRWN2glGEr51fzny8nkqa5c2EdJG5aZPG2eTD7AISY=";
+    hash = "sha256-xdc8qHvLKy5QV/1c87o7H/VhitUhpH/+VgqBHn2a8lg=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'graphviz = ">=0.13.2,<0.20.0"' 'graphviz = "*"'
-  '';
+  patches = [
+    # Add build-system, https://github.com/mingrammer/diagrams/pull/1089
+    (fetchpatch {
+      name = "add-build-system.patch";
+      url = "https://github.com/mingrammer/diagrams/commit/59b84698b142f5a0998ee9e395df717a1b77e9b2.patch";
+      hash = "sha256-/zV5X4qgHJs+KO9gHyu6LqQ3hB8Zx+BzOFo7K1vQK78=";
+    })
+    ./remove-black-requirement.patch
+  ];
+
+  pythonRemoveDeps = [ "pre-commit" ];
+
+  pythonRelaxDeps = [ "graphviz" ];
 
   preConfigure = ''
     patchShebangs autogen.sh
     ./autogen.sh
   '';
 
-  patches = [
-    # The build-system section is missing
-    ./build_poetry.patch
-    ./remove-black-requirement.patch
-  ];
+  build-system = [ poetry-core ];
 
   # Despite living in 'tool.poetry.dependencies',
   # these are only used at build time to process the image resource files
@@ -49,14 +54,10 @@ buildPythonPackage rec {
     inkscape
     imagemagick
     jinja2
-    poetry-core
     round
   ];
 
-  propagatedBuildInputs = [
-    graphviz
-    typed-ast
-  ];
+  dependencies = [ graphviz ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 5ab7ac6886342f59496a221bb17d370c1432580c Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Wed, 1 Jan 2025 22:20:25 +0100
Subject: [PATCH 104/229] antora-ui-default: conventionally sort fetch
 attributes

---
 pkgs/by-name/an/antora-ui-default/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/antora-ui-default/package.nix b/pkgs/by-name/an/antora-ui-default/package.nix
index 33c7346ebf9f3..7da104702a55b 100644
--- a/pkgs/by-name/an/antora-ui-default/package.nix
+++ b/pkgs/by-name/an/antora-ui-default/package.nix
@@ -5,10 +5,10 @@
 }:
 let
   srcFetchFromGitLab = {
-    hash = "sha256-gUQLLjnWZ1OsAe005IOPIfoM0qmjoevcUuGBRD3oHXA=";
     owner = "trueNAHO";
     repo = "antora-ui-default";
     rev = "11f563294248e9b64124b9289d639e349f2e9f5f";
+    hash = "sha256-gUQLLjnWZ1OsAe005IOPIfoM0qmjoevcUuGBRD3oHXA=";
   };
 in
 stdenvNoCC.mkDerivation {

From 031e8ea9ef4c3135588e1272f4f2b3456cacb337 Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Wed, 1 Jan 2025 22:20:47 +0100
Subject: [PATCH 105/229] antora-lunr-extension: conventionally sort fetch
 attributes

---
 pkgs/by-name/an/antora-lunr-extension/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/antora-lunr-extension/package.nix b/pkgs/by-name/an/antora-lunr-extension/package.nix
index c4eb14a9996fa..35948b865d8fa 100644
--- a/pkgs/by-name/an/antora-lunr-extension/package.nix
+++ b/pkgs/by-name/an/antora-lunr-extension/package.nix
@@ -10,10 +10,10 @@ buildNpmPackage rec {
   version = "1.0.0-alpha.8";
 
   src = fetchFromGitLab {
-    hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4=";
     owner = "antora";
     repo = pname;
     rev = "v${version}";
+    hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4=";
   };
 
   npmDepsHash = "sha256-EtjZL6U/uSGSYSqtuatCkdWP0NHxRuht13D9OaM4x00=";

From 2390809980a276226c53e3e07d169fdc45de7c13 Mon Sep 17 00:00:00 2001
From: Jacob Moody <moody@posixcafe.org>
Date: Wed, 1 Jan 2025 15:24:47 -0600
Subject: [PATCH 106/229] tlsclient: 1.6.5 -> 1.6.6

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

diff --git a/pkgs/by-name/tl/tlsclient/package.nix b/pkgs/by-name/tl/tlsclient/package.nix
index 20bbacd0c27a3..2d829c518a688 100644
--- a/pkgs/by-name/tl/tlsclient/package.nix
+++ b/pkgs/by-name/tl/tlsclient/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tlsclient";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromSourcehut {
     owner = "~moody";
     repo = "tlsclient";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ff41LZ5jbrqni2ptsUlI3L17SCHnGo4utg8etFubRNI=";
+    hash = "sha256-nUvOmEwdMKuPM9KaMGxmW0Lvo3968wjDc95pLB17YnM=";
   };
 
   strictDeps = true;

From 0b22020d8841d3b2e342567bdabfb6c5575edfa1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 1 Jan 2025 22:37:44 +0100
Subject: [PATCH 107/229] vscode-extensions.visualjj.visualjj: switch to VSCode
 marketplace

---
 .../extensions/visualjj.visualjj/default.nix  | 38 +------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index 9d2dd8d9ba281..2950e7ab0006e 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -1,48 +1,14 @@
 {
   lib,
-  stdenv,
   vscode-utils,
-  fetchurl,
 }:
 
-let
-  version = "0.13.4";
-
-  sources = {
-    "x86_64-linux" = {
-      arch = "linux-x64";
-      url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix";
-      hash = "sha256-q9ubYkhrV28sB9CV1dyBEIFEkTrkGHRXdz5+4xjeVzI=";
-    };
-    "x86_64-darwin" = {
-      arch = "darwin-x64";
-      url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix";
-      hash = "sha256-vV5u1QBICz3GIYRgH9UWM38a8YXtvW0u8r7c1SaKwxM=";
-    };
-    "aarch64-linux" = {
-      arch = "linux-arm64";
-      url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix";
-      hash = "sha256-fgT4brIhHI6gNCcsbHpz+v4/diyox2VoFlvCnhPIbPM=";
-    };
-    "aarch64-darwin" = {
-      arch = "darwin-arm64";
-      url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix";
-      hash = "sha256-/uuLRkEY430R5RS7B6972iginpA3pWpApjI6RUTxcHM=";
-    };
-  };
-in
 vscode-utils.buildVscodeMarketplaceExtension {
-  vsix = fetchurl {
-    url = sources.${stdenv.hostPlatform.system}.url;
-    hash = sources.${stdenv.hostPlatform.system}.hash;
-    name = "visualjj-visualjj-${version}.zip";
-  };
-
   mktplcRef = {
-    inherit version;
     name = "visualjj";
     publisher = "visualjj";
-    arch = sources.${stdenv.hostPlatform.system}.arch;
+    version = "0.13.4";
+    hash = "sha256-/uuLRkEY430R5RS7B6972iginpA3pWpApjI6RUTxcHM=";
   };
 
   meta = {

From dd2f21b54cbfde064fe70dbe7585194d8b00afc2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 22:44:41 +0100
Subject: [PATCH 108/229] python312Packages.slixmpp: update disabled

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

diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix
index c86de6bd6157f..02070116ebdac 100644
--- a/pkgs/development/python-modules/slixmpp/default.nix
+++ b/pkgs/development/python-modules/slixmpp/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   version = "1.8.6";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;

From 3fdfa094a1ac69185184dbdfb679c500dbed8e01 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 22:51:10 +0100
Subject: [PATCH 109/229] python312Packages.zabbix-utils: init at 2.0.2

Library for zabbix

https://github.com/zabbix/python-zabbix-utils
---
 .../python-modules/zabbix-utils/default.nix   | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/zabbix-utils/default.nix

diff --git a/pkgs/development/python-modules/zabbix-utils/default.nix b/pkgs/development/python-modules/zabbix-utils/default.nix
new file mode 100644
index 0000000000000..6b8d71d2cf1d0
--- /dev/null
+++ b/pkgs/development/python-modules/zabbix-utils/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "zabbix-utils";
+  version = "2.0.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "zabbix";
+    repo = "python-zabbix-utils";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-rRPen/FzWT0cCnXWiSdoybtXeP1pxYqnjq5b0QPVs1I=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "zabbix_utils" ];
+
+  meta = {
+    description = "Library for zabbix";
+    homepage = "https://github.com/zabbix/python-zabbix-utils";
+    changelog = "https://github.com/zabbix/python-zabbix-utils/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 094d527016920..e675ef39a59ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18366,6 +18366,8 @@ self: super: with self; {
     pname = "z3-solver";
   }))).python;
 
+  zabbix-utils = callPackage ../development/python-modules/zabbix-utils { };
+
   zadnegoale = callPackage ../development/python-modules/zadnegoale { };
 
   zamg = callPackage ../development/python-modules/zamg { };

From 9695e75dde3197dd10e3a4d9883e2daaeb6ee2f7 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 1 Jan 2025 12:26:06 +0800
Subject: [PATCH 110/229] nixos/kmonad: create determinate symlinks

---
 nixos/doc/manual/release-notes/rl-2505.section.md |  2 ++
 nixos/modules/services/hardware/kmonad.nix        | 11 +++++++++++
 nixos/tests/kmonad.nix                            |  2 ++
 3 files changed, 15 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 9b39fb1869ea7..bd7937aa7f932 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -306,6 +306,8 @@
 
 - For matrix homeserver Synapse we are now following the upstream recommendation to enable jemalloc as the memory allocator by default.
 
+- `services.kmonad` now creates a determinate symlink (in `/dev/input/by-id/`) to each of KMonad virtual devices.
+
 - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.
 
 - Caddy can now be built with plugins by using `caddy.withPlugins`, a `passthru` function that accepts an attribute set as a parameter. The `plugins` argument represents a list of Caddy plugins, with each Caddy plugin being a versioned module. The `hash` argument represents the `vendorHash` of the resulting Caddy source code with the plugins added.
diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 687224fae2e92..363a8e7028744 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -195,6 +195,17 @@ in
   config = lib.mkIf cfg.enable {
     hardware.uinput.enable = true;
 
+    services.udev.extraRules =
+      let
+        mkRule = name: ''
+          ACTION=="add", KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="${name}", ATTRS{id/product}=="5679", ATTRS{id/vendor}=="1235", SYMLINK+="input/by-id/${name}"
+        '';
+      in
+      lib.foldlAttrs (
+        rules: _: keyboard:
+        rules + "\n" + mkRule (mkName keyboard.name)
+      ) "" cfg.keyboards;
+
     systemd = {
       paths = lib.mapAttrs' (_: mkPath) cfg.keyboards;
       services = lib.mapAttrs' (_: mkService) cfg.keyboards;
diff --git a/nixos/tests/kmonad.nix b/nixos/tests/kmonad.nix
index e0150cb99f183..9b0d47e578e42 100644
--- a/nixos/tests/kmonad.nix
+++ b/nixos/tests/kmonad.nix
@@ -43,5 +43,7 @@
 
     with subtest("kmonad is running"):
          machine.succeed(f"systemctl status {service_name}")
+    with subtest("kmonad symlink is created"):
+         machine.wait_for_file(f"/dev/input/by-id/{service_name}", timeout=5)
   '';
 }

From f6d3c5c227a39c920246484b6fa683f2d84d1161 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 22:08:05 +0000
Subject: [PATCH 111/229] chirp: 0.4.0-unstable-2024-12-17 ->
 0.4.0-unstable-2024-12-26

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

diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index 984d459ec3f0a..092ce48b52dc1 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2024-12-17";
+  version = "0.4.0-unstable-2024-12-26";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "605037deb68994bbb3114c2a35db7a7a7e4755a6";
-    hash = "sha256-5AwoXX5Qa4ROjt5wSdcElLJ7ZVguKK3urn0ygVDJiGQ=";
+    rev = "43449629fb3c2ae0b71e8b7cb7d49e8e97a00c64";
+    hash = "sha256-zn9pInfJ/QbwgvBqkqzdW7txVGZVU1EPDo4I4ZQDdLY=";
   };
 
   nativeBuildInputs = [

From e089eb4cafdbd23331bbac20790c7ed991872e6a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 23:08:53 +0100
Subject: [PATCH 112/229] python312Packages.tencentcloud-sdk-python: 3.0.1293
 -> 3.0.1294

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1293...3.0.1294

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1294/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index ff12a60017928..7b2d029eab501 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1293";
+  version = "3.0.1294";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-ho1RneF7xRO6Lc7i4BxAVjHA9UZiEZA2+olnasv4RSw=";
+    hash = "sha256-6Xuih0E+i5dxTlkYzYa0J3T0aNpCoGnnBo1tpfuzWQM=";
   };
 
   build-system = [ setuptools ];

From 05176adfbd5983430b4790c071e7aa3dc3480d32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 22:10:23 +0000
Subject: [PATCH 113/229] roddhjav-apparmor-rules: 0-unstable-2024-12-13 ->
 0-unstable-2024-12-25

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

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 8f182baa67eb9..efe2cdb64926f 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2024-12-13";
+  version = "0-unstable-2024-12-25";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "edaa45067abd5f18fa702ca3f08897d93425bbc5";
-    hash = "sha256-um00IUuYmDh9lilaUxklrgbFgJVBojSDMov3q5y4FkY=";
+    rev = "2560e9645ff11d4fd24c69ef8145adf9bc8f817c";
+    hash = "sha256-pPA9/QF3ftCjW7TZKWBHOvEE49XtcBSl7X5IugumCEg=";
   };
 
   dontConfigure = true;

From 29f2c03f1610d0f35ce8901db3ef6798d7982118 Mon Sep 17 00:00:00 2001
From: myypo <nikirsmcgl@gmail.com>
Date: Sun, 22 Dec 2024 21:24:07 +0200
Subject: [PATCH 114/229] maintainers: add myypo

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b1246893c90b6..6c292846f9026 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15563,6 +15563,12 @@
     githubId = 9636071;
     name = "Myrl Hex";
   };
+  myypo = {
+    email = "nikirsmcgl@gmail.com";
+    github = "myypo";
+    githubId = 110892040;
+    name = "Mykyta Polchanov";
+  };
   mzacho = {
     email = "nixpkgs@martinzacho.net";
     github = "mzacho";

From fac4c997a615d68e6606f7ab9ce2206b46e31cbc Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 23:38:20 +0100
Subject: [PATCH 115/229] python312Packages.strawberry-graphql: fix build

---
 pkgs/development/python-modules/strawberry-graphql/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index 986b87ef7273a..370d5ab068c3a 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -147,6 +147,7 @@ buildPythonPackage rec {
     "tests/cli/"
     "tests/django/test_dataloaders.py"
     "tests/exceptions/"
+    "tests/experimental/pydantic/test_fields.py"
     "tests/http/"
     "tests/schema/extensions/"
     "tests/schema/test_dataloaders.py"

From 93ccd7bb6f387df8b53b34cc53a4c57b3ba20940 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 00:42:15 +0100
Subject: [PATCH 116/229] sound-of-sorting: fix darwin build

---
 pkgs/by-name/so/sound-of-sorting/package.nix | 32 ++++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/so/sound-of-sorting/package.nix b/pkgs/by-name/so/sound-of-sorting/package.nix
index a953651717874..735416282a9d1 100644
--- a/pkgs/by-name/so/sound-of-sorting/package.nix
+++ b/pkgs/by-name/so/sound-of-sorting/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   SDL2,
   wxGTK32,
-  darwin,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,18 +19,32 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/freebsd/freebsd-ports/raw/31ec0266e31910c16b0f69e16a2a693aae20abdf/math/sound-of-sorting/files/patch-src_SortAlgo.cpp";
+      extraPrefix = "";
+      hash = "sha256-mOo3GsEZ8r8p9ROoel2TO9Z4yF5SmCN0/fUn/2qUKAo=";
+    })
+    (fetchpatch {
+      url = "https://github.com/freebsd/freebsd-ports/raw/31ec0266e31910c16b0f69e16a2a693aae20abdf/math/sound-of-sorting/files/patch-src_SortAlgo.h";
+      extraPrefix = "";
+      hash = "sha256-NNSPs0gT6ndeMQWHLHAwLR5nMQGP880Qd6kulDYJYF0=";
+    })
+    (fetchpatch {
+      url = "https://github.com/freebsd/freebsd-ports/raw/31ec0266e31910c16b0f69e16a2a693aae20abdf/math/sound-of-sorting/files/patch-src_SortArray.cpp";
+      extraPrefix = "";
+      hash = "sha256-WxqwcZ2L9HPG4QNf1Xi624aKTM3cRBWN+W00htcIJ5k=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
   ];
 
-  buildInputs =
-    [
-      wxGTK32
-      SDL2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.Cocoa
-    ];
+  buildInputs = [
+    wxGTK32
+    SDL2
+  ];
 
   meta = {
     description = "Audibilization and Visualization of Sorting Algorithms";

From 709930aaf6d5b55c8635b2bac7eb92191e6f214f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 00:32:33 +0000
Subject: [PATCH 117/229] beam27Packages.elixir-ls: 0.25.0 -> 0.26.1

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

diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix
index 0accce293d296..7ca9fda3490ab 100644
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@@ -11,12 +11,12 @@
 
 let
   pname = "elixir-ls";
-  version = "0.25.0";
+  version = "0.26.1";
   src = fetchFromGitHub {
     owner = "elixir-lsp";
     repo = "elixir-ls";
     rev = "v${version}";
-    hash = "sha256-7Lrv62R0otFPAfUAip1H4VcnBaV4QyDZkcBZTW7yq8I=";
+    hash = "sha256-fGjHDzQUBROFlv+AIzArRv+Q7RWPTizMFyYXQJGQzjA=";
   };
 in
 mixRelease {
@@ -32,7 +32,7 @@ mixRelease {
   mixFodDeps = fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version elixir;
-    hash = "sha256-yR2ttnrtYcWFotBMIfOLmJzEO9NKy3SqiKJZ4mmlkdA=";
+    hash = "sha256-EUWySBI082cNXbHZKQKEisXffe0/UpupNcHj1GT7Mek=";
   };
 
   # elixir-ls is an umbrella app

From 93e7e39c71b13a406ea70b3da1808f56be207b24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 01:53:18 +0000
Subject: [PATCH 118/229] mieru: 3.9.0 -> 3.10.0

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index ce770989c8e6d..a8babccde6d69 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mieru";
-  version = "3.9.0";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${version}";
-    hash = "sha256-59TWABRIH3FEOyLvZ+jn7b3jhI0comjU4Mrl4Ggx2eA=";
+    hash = "sha256-4uJi8+kpVBjigTkLmV9fL0igmcOt5Gb40qkQHYR8kCU=";
   };
 
   vendorHash = "sha256-hSTKhn39xKZx1N9x66EH/ql4oP4qn0eysGTbUk9mRAk=";

From 67aa530f56ecfdc33d6b369f86dadbdaa064d483 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 01:59:37 +0000
Subject: [PATCH 119/229] sarasa-gothic: 1.0.26 -> 1.0.27

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

diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix
index 2113f014e93d6..66b69ce36ae02 100644
--- a/pkgs/by-name/sa/sarasa-gothic/package.nix
+++ b/pkgs/by-name/sa/sarasa-gothic/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sarasa-gothic";
-  version = "1.0.26";
+  version = "1.0.27";
 
   src = fetchurl {
     # Use the 'ttc' files here for a smaller closure size.
     # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
     url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
-    hash = "sha256-Z2J8yW9yLnkGh+nNb57+xyz8uZFwePpuSlBdRxfPABA=";
+    hash = "sha256-/pN3NIwkJZ4a5g87Z3kr71Xvef0TIbN2UzsfvXJryNk=";
   };
 
   sourceRoot = ".";

From 137419b48bbcaa12d7876d81caa9842927733662 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 03:20:03 +0100
Subject: [PATCH 120/229] python313Packages.google-auth: fix build

---
 pkgs/development/python-modules/google-auth/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index b7b77f32137f9..4813fd2f091e3 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -70,7 +70,11 @@ buildPythonPackage rec {
       freezegun
       grpcio
       mock
+    ]
+    ++ lib.optionals (pythonOlder "3.13") [
       oauth2client
+    ]
+    ++ [
       pytest-asyncio
       pytest-localserver
       pytestCheckHook

From aa6e01dbf7105956b15f96cad60d922529a3be03 Mon Sep 17 00:00:00 2001
From: "\"wrvsrx\"" <"wrvsrx@outlook.com">
Date: Thu, 2 Jan 2025 10:22:39 +0800
Subject: [PATCH 121/229] vimPlugins.nvim-numbertoggle: init at 2024-03-29

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

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 8848db05fb557..0bb30fcad4393 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -9389,6 +9389,18 @@ final: prev:
     meta.homepage = "https://github.com/LhKipp/nvim-nu/";
   };
 
+  nvim-numbertoggle = buildVimPlugin {
+    pname = "nvim-numbertoggle";
+    version = "2024-03-29";
+    src = fetchFromGitHub {
+      owner = "sitiom";
+      repo = "nvim-numbertoggle";
+      rev = "c5827153f8a955886f1b38eaea6998c067d2992f";
+      sha256 = "18nxqi3a3xamrjzpsabww411ix6vr44smprqi9prd47238lpshi2";
+    };
+    meta.homepage = "https://github.com/sitiom/nvim-numbertoggle/";
+  };
+
   nvim-osc52 = buildVimPlugin {
     pname = "nvim-osc52";
     version = "2024-05-24";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 599d52852a3ea..bb4f07a44edf2 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -779,6 +779,7 @@ https://github.com/nvim-neotest/nvim-nio/,HEAD,
 https://github.com/ya2s/nvim-nonicons/,,
 https://github.com/rcarriga/nvim-notify/,,
 https://github.com/LhKipp/nvim-nu/,HEAD,
+https://github.com/sitiom/nvim-numbertoggle/,HEAD,
 https://github.com/ojroques/nvim-osc52/,,
 https://github.com/julienvincent/nvim-paredit/,,
 https://github.com/gpanders/nvim-parinfer/,HEAD,

From 755e20ecdba7a27ad80e9f9ce17b97c2c86157c4 Mon Sep 17 00:00:00 2001
From: "\"wrvsrx\"" <"wrvsrx@outlook.com">
Date: Thu, 2 Jan 2025 10:22:56 +0800
Subject: [PATCH 122/229] vimPlugins.linediff-vim: init at 2024-04-22

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

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 0bb30fcad4393..5a9bd0328c259 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6062,6 +6062,18 @@ final: prev:
     meta.homepage = "https://github.com/junegunn/limelight.vim/";
   };
 
+  linediff-vim = buildVimPlugin {
+    pname = "linediff.vim";
+    version = "2024-04-22";
+    src = fetchFromGitHub {
+      owner = "AndrewRadev";
+      repo = "linediff.vim";
+      rev = "ddae71ef5f94775d101c1c70032ebe8799f32745";
+      sha256 = "01dshpxm1svfhw9l447mz224qbvlbvywd7ai4wxwyjzgkhp36937";
+    };
+    meta.homepage = "https://github.com/AndrewRadev/linediff.vim/";
+  };
+
   lingua-franca-vim = buildVimPlugin {
     pname = "lingua-franca.vim";
     version = "2021-09-05";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index bb4f07a44edf2..46f11e2e3b4cc 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -502,6 +502,7 @@ https://github.com/spywhere/lightline-lsp/,,
 https://github.com/itchyny/lightline.vim/,,
 https://github.com/ggandor/lightspeed.nvim/,,
 https://github.com/junegunn/limelight.vim/,,
+https://github.com/AndrewRadev/linediff.vim/,HEAD,
 https://github.com/lf-lang/lingua-franca.vim/,,
 https://github.com/tamago324/lir.nvim/,,
 https://github.com/kkharji/lispdocs.nvim/,,

From 0d1111fb417de5be3347dd51f16058759b1c75ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 03:09:58 +0000
Subject: [PATCH 123/229] rip2: 0.9.0 -> 0.9.2

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

diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix
index fcce093a2b230..3fe2076154206 100644
--- a/pkgs/by-name/ri/rip2/package.nix
+++ b/pkgs/by-name/ri/rip2/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rip2";
-  version = "0.9.0";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "MilesCranmer";
     repo = "rip2";
     rev = "v${version}";
-    hash = "sha256-9leLWfPilDQHzQRzTUjAFt9olTPEL4GcQgYFWZu3dug=";
+    hash = "sha256-OZsiAh0sQygLdVdA1QxCf7FTvP5CrlDNeOQLv2G2X3U=";
   };
 
-  cargoHash = "sha256-l6rbeiyIsr1csBcp+428TpQYSs9RvfJutGoL/wtSGR8=";
+  cargoHash = "sha256-9wbHXgjOWyQS8JOMQQTVetMacdjWD9C4NBWxUpcjbdg=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From e48d27cb8f382d5e7c190095a5f2cc22e9a18f7d Mon Sep 17 00:00:00 2001
From: Daniel Baker <daniel.n.baker@gmail.com>
Date: Wed, 1 Jan 2025 21:02:01 -0800
Subject: [PATCH 124/229] formatjson5: fix missing_docs error

Rust 1.83 introduced changes to how `missing_docs` works.
https://releases.rs/docs/1.83.0/

This commit introduces a patch from a PR made against the upstream
source repository to fix the issue.
---
 pkgs/by-name/fo/formatjson5/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix
index 112f94aa8358e..c82393ab490e8 100644
--- a/pkgs/by-name/fo/formatjson5/package.nix
+++ b/pkgs/by-name/fo/formatjson5/package.nix
@@ -5,6 +5,7 @@
   stdenv,
   darwin,
   nix-update-script,
+  fetchpatch,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -19,6 +20,13 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Lredw/Fez+2U2++ShZcKTFCv8Qpai9YUvqvpGjG5W0o=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/google/json5format/commit/32914546e7088b3d9173ae9a2f307effa87917bf.patch";
+      hash = "sha256-kAbRUL/FuhnxkC9Xo4J2bXt9nkMOLeJvgMmOoKnSxKc=";
+    })
+  ];
+
   cargoHash = "sha256-zPgaZPDyNVPmBXz6QwOYnmh/sbJ8aPST8znLMfIWejk=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];

From 8b9f8cac1c1108d0d5340bbe0845c3049c1d2c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christina=20S=C3=B8rensen?= <ces@fem.gg>
Date: Thu, 2 Jan 2025 06:39:09 +0100
Subject: [PATCH 125/229] eza: 0.20.14 -> 0.20.15

changelog: https://github.com/eza-community/eza/releases/tag/v0.20.15
---
 pkgs/by-name/ez/eza/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index db32be221bc0b..3313fe74ebd40 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "eza";
-  version = "0.20.14";
+  version = "0.20.15";
 
   src = fetchFromGitHub {
     owner = "eza-community";
     repo = "eza";
     rev = "v${version}";
-    hash = "sha256-5sZlpJ7xzQsjvECN4pjPndM39qonbgNy4zew6AE06D0=";
+    hash = "sha256-r68zuMCFIccA0cRLC2RNYCWoFh7tYiGu97Kid4hh0Uw=";
   };
 
-  cargoHash = "sha256-A8vE2Q/HEMgX6HC+nwR63Kr84gy2iZ5BzYDzaZz/h9Q=";
+  cargoHash = "sha256-hBsb62fcIrSR2w9O5+UaMUadyUUtu2PLODRg70wG/Xc=";
 
   nativeBuildInputs = [
     cmake

From 8a5e208a0f15f555f37e0b471a90feba5d33ed1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 06:28:52 +0000
Subject: [PATCH 126/229] spacevim: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/by-name/sp/spacevim/package.nix b/pkgs/by-name/sp/spacevim/package.nix
index 82268cc69616e..104e30e50d1c6 100644
--- a/pkgs/by-name/sp/spacevim/package.nix
+++ b/pkgs/by-name/sp/spacevim/package.nix
@@ -23,12 +23,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "spacevim";
-  version = "2.3.0";
+  version = "2.4.0";
   src = fetchFromGitHub {
     owner = "SpaceVim";
     repo = "SpaceVim";
     rev = "v${version}";
-    hash = "sha256-MHsAA0x/rfwRupe8aW1JVKGiYkySAX0AhOkBuScpn7I=";
+    hash = "sha256-qiNadhQJjU9RY14X8+pd4Ul+NLoNqbxuh3Kenw1dHDc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ba58e46cc70cdaf6b046df1f2d20fc47f6698b49 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Wed, 1 Jan 2025 21:30:24 -0800
Subject: [PATCH 127/229] ckan: Install desktop file and icons

---
 pkgs/by-name/ck/ckan/package.nix | 41 +++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ck/ckan/package.nix b/pkgs/by-name/ck/ckan/package.nix
index ba33a67375823..d7e846f579a6a 100644
--- a/pkgs/by-name/ck/ckan/package.nix
+++ b/pkgs/by-name/ck/ckan/package.nix
@@ -6,6 +6,9 @@
   mono,
   gtk2,
   curl,
+  imagemagick,
+  copyDesktopItems,
+  makeDesktopItem,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,9 +20,19 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-SK2eKdH/bm+W+qU8XUHRD9uffmfp5bR4dBvBEUKCm8E=";
   };
 
+  icon = fetchurl {
+    url = "https://raw.githubusercontent.com/KSP-CKAN/CKAN/450e2f960e1a3fee4ab7cf74ad56bddc5296fc7e/assets/ckan-256.png";
+    hash = "sha256-BJvuOz8NWmzpYzzhveeq6rcuqXIxQqxtBIcRvobx+TY=";
+  };
+
   dontUnpack = true;
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    imagemagick
+    makeWrapper
+  ];
+
   buildInputs = [ mono ];
 
   libraries = lib.makeLibraryPath [
@@ -30,12 +43,38 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
+    runHook preInstall
+    for size in 16 24 48 64 96 128 256; do
+      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+      magick -background none ${icon} -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
+    done
     install -m 644 -D $src $out/bin/ckan.exe
     makeWrapper ${mono}/bin/mono $out/bin/ckan \
       --add-flags $out/bin/ckan.exe \
       --set LD_LIBRARY_PATH $libraries
+    runHook postInstall
   '';
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = "ckan";
+      comment = "The Comprehensive Kerbal Archive Network Client";
+      desktopName = "CKAN";
+      categories = [
+        "Game"
+        "PackageManager"
+      ];
+      exec = "ckan";
+      icon = "ckan";
+      keywords = [
+        "Kerbal Space Program"
+        "KSP"
+        "Mod"
+      ];
+      extraConfig.X-GNOME-SingleWindow = "true";
+    })
+  ];
+
   meta = with lib; {
     description = "Mod manager for Kerbal Space Program";
     mainProgram = "ckan";

From 559ebf51a9ba65aa751e7ec58c8405b7671f0ab7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 01:38:42 +0000
Subject: [PATCH 128/229] dosbox-x: 2024.12.04 -> 2025.01.01

---
 pkgs/applications/emulators/dosbox-x/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix
index a7cc9b5ea6a34..4b6ffafb93638 100644
--- a/pkgs/applications/emulators/dosbox-x/default.nix
+++ b/pkgs/applications/emulators/dosbox-x/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dosbox-x";
-  version = "2024.12.04";
+  version = "2025.01.01";
 
   src = fetchFromGitHub {
     owner = "joncampbell123";
     repo = "dosbox-x";
     rev = "dosbox-x-v${finalAttrs.version}";
-    hash = "sha256-wZCLwEInUfzuOCcUsz8W+Gi00lp4Nwc0QZjLF8/e9iM=";
+    hash = "sha256-3zE/VDCFNQRgqpIL5hRAafDoc7agX2LIsiL4xwDBLJY=";
   };
 
   # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants

From 737defd4cd97ada9a268bde05603eee367425f1c Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Wed, 1 Jan 2025 13:20:05 -0800
Subject: [PATCH 129/229] ncps: init at 0.1.1

---
 pkgs/by-name/nc/ncps/package.nix | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/nc/ncps/package.nix

diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix
new file mode 100644
index 0000000000000..b66c1d3ae1f2b
--- /dev/null
+++ b/pkgs/by-name/nc/ncps/package.nix
@@ -0,0 +1,47 @@
+{
+  buildGoModule,
+  dbmate,
+  fetchFromGitHub,
+  lib,
+}:
+
+let
+  finalAttrs = {
+    pname = "ncps";
+    version = "v0.1.1";
+
+    src = fetchFromGitHub {
+      owner = "kalbasit";
+      repo = "ncps";
+      rev = finalAttrs.version;
+      hash = "sha256-Vr/thppCABdZDl1LEc7l7c7Ih55U/EFwJInWSUWoLJA";
+    };
+
+    ldflags = [
+      "-X github.com/kalbasit/ncps/cmd.Version=${finalAttrs.version}"
+    ];
+
+    subPackages = [ "." ];
+
+    vendorHash = "sha256-xPrWofNyDFrUPQ42AYDs2x2gGoQ2w3tRrMIsu3SVyHA=";
+    doCheck = true;
+
+    nativeBuildInputs = [
+      dbmate # used for testing
+    ];
+
+    postInstall = ''
+      mkdir -p $out/share/ncps
+      cp -r db $out/share/ncps/db
+    '';
+
+    meta = {
+      description = "Nix binary cache proxy service";
+      homepage = "https://github.com/kalbasit/ncps";
+      license = lib.licenses.mit;
+      mainProgram = "ncps";
+      maintainers = [ lib.maintainers.kalbasit ];
+    };
+  };
+in
+buildGoModule finalAttrs

From 3b7f0c3b4d322ed3832efa78e4d6b82613ccea6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 07:47:01 +0000
Subject: [PATCH 130/229] git-delete-merged-branches: 7.4.1 -> 7.4.2

---
 pkgs/by-name/gi/git-delete-merged-branches/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-delete-merged-branches/package.nix b/pkgs/by-name/gi/git-delete-merged-branches/package.nix
index 0287e5ed59030..945cdb11f85c7 100644
--- a/pkgs/by-name/gi/git-delete-merged-branches/package.nix
+++ b/pkgs/by-name/gi/git-delete-merged-branches/package.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "git-delete-merged-branches";
-  version = "7.4.1";
+  version = "7.4.2";
 
   src = fetchFromGitHub {
     owner = "hartwork";
     repo = pname;
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-1CUwac2TPU5s1uLS1zPvtXZEGCWYwm1y935jqbI173Q=";
+    tag = version;
+    sha256 = "sha256-l+R4gINZJ8bJdhcK+U9jOuIoAm2/bd5P+w9AbwPZMrk=";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 83af87a20653e11be4cc0d39c9c3fce38c36c039 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 08:48:22 +0100
Subject: [PATCH 131/229] nixos/zfs-replication: use expanded arguments for
 clarity

---
 nixos/modules/services/backup/zfs-replication.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix
index ed635a35617be..063ddf6a79d72 100644
--- a/nixos/modules/services/backup/zfs-replication.nix
+++ b/nixos/modules/services/backup/zfs-replication.nix
@@ -80,9 +80,9 @@ in
         let
           args = lib.map lib.escapeShellArg (
             [
-              "-l"
+              "--user"
               cfg.username
-              "-i"
+              "--identity-file"
               cfg.identityFilePath
               cfg.host
               cfg.remoteFilesystem

From 28f43d4628fc7f1d039efde754fce409a7788994 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 08:48:37 +0100
Subject: [PATCH 132/229] nixos/zfs-replication: add --verbose to command line
 arguments

---
 nixos/modules/services/backup/zfs-replication.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix
index 063ddf6a79d72..3828db386f662 100644
--- a/nixos/modules/services/backup/zfs-replication.nix
+++ b/nixos/modules/services/backup/zfs-replication.nix
@@ -80,6 +80,7 @@ in
         let
           args = lib.map lib.escapeShellArg (
             [
+              "--verbose"
               "--user"
               cfg.username
               "--identity-file"

From f837172930e0132e9cf8266bb63ba4e3ebaab8bb Mon Sep 17 00:00:00 2001
From: myypo <nikirsmcgl@gmail.com>
Date: Sun, 22 Dec 2024 21:23:29 +0200
Subject: [PATCH 133/229] restate: init at 1.1.6

---
 pkgs/by-name/re/restate/package.nix | 121 ++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 pkgs/by-name/re/restate/package.nix

diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix
new file mode 100644
index 0000000000000..efb80b0cf9135
--- /dev/null
+++ b/pkgs/by-name/re/restate/package.nix
@@ -0,0 +1,121 @@
+{
+  lib,
+  stdenv,
+  testers,
+  versionCheckHook,
+  nix-update-script,
+  rustPlatform,
+  fetchFromGitHub,
+  protobuf,
+  restate,
+  pkg-config,
+  openssl,
+  perl,
+  cmake,
+  cacert,
+  rdkafka,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "restate";
+  version = "1.1.6";
+
+  src = fetchFromGitHub {
+    owner = "restatedev";
+    repo = "restate";
+    tag = "v${version}";
+    hash = "sha256-uDNPIL9Ox5rwWVzqWe74elHPGy6lSvWR1S7HsY6ATjc=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-z7VAKU4bi6pX2z4jCKWDfQt8FFLN7ugnW2LOy6IHz/w=";
+
+  env = {
+    PROTOC = lib.getExe protobuf;
+    PROTOC_INCLUDE = "${protobuf}/include";
+
+    VERGEN_GIT_COMMIT_DATE = "2024-12-23";
+    VERGEN_GIT_SHA = "v${version}";
+
+    # rustflags as defined in the upstream's .cargo/config.toml
+    RUSTFLAGS =
+      let
+        target = stdenv.hostPlatform.config;
+        targetFlags = rec {
+          build = [
+            "-C force-unwind-tables"
+            "-C debug-assertions"
+            "--cfg uuid_unstable"
+            "--cfg tokio_unstable"
+          ];
+
+          "aarch64-unknown-linux-gnu" = build ++ [
+            # Enable frame pointers to support Parca (https://github.com/parca-dev/parca-agent/pull/1805)
+            "-C force-frame-pointers=yes"
+          ];
+
+          "x86_64-unknown-linux-musl" = build ++ [
+            "-C link-self-contained=yes"
+          ];
+
+          "aarch64-unknown-linux-musl" = build ++ [
+            # Enable frame pointers to support Parca (https://github.com/parca-dev/parca-agent/pull/1805)
+            "-C force-frame-pointers=yes"
+            "-C link-self-contained=yes"
+          ];
+        };
+      in
+      lib.concatStringsSep " " (lib.attrsets.attrByPath [ target ] targetFlags.build targetFlags);
+
+    # Have to be set to dynamically link librdkafka
+    CARGO_FEATURE_DYNAMIC_LINKING = 1;
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    openssl
+    perl
+    rustPlatform.bindgenHook
+    cmake
+  ];
+  buildInputs = [ rdkafka ];
+  nativeCheckInputs = [
+    cacert
+  ];
+
+  useNextest = true;
+  # Feature resolution seems to be failing due to this https://github.com/rust-lang/cargo/issues/7754
+  auditable = false;
+
+  __darwinAllowLocalNetworking = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    tests.restateCliVersion = testers.testVersion {
+      package = restate;
+      command = "restate --version";
+    };
+    tests.restateServerVersion = testers.testVersion {
+      package = restate;
+      command = "restate-server --version";
+    };
+    tests.restateCtlVersion = testers.testVersion {
+      package = restate;
+      command = "restatectl --version";
+    };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Restate is a platform for developing distributed fault-tolerant applications.";
+    homepage = "https://restate.dev";
+    changelog = "https://github.com/restatedev/restate/releases/tag/v${version}";
+    mainProgram = "restate";
+    license = lib.licenses.bsl11;
+    maintainers = with lib.maintainers; [ myypo ];
+  };
+}

From 57cb0844450ac2fd8ebc72899e987a53b55ae806 Mon Sep 17 00:00:00 2001
From: Misael Aguayo <aguayo.misael@gmail.com>
Date: Thu, 2 Jan 2025 02:54:02 -0600
Subject: [PATCH 134/229] jj: 0.24.0 -> 0.25.0

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

diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index 750ce685575bb..c096701c143e2 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -21,7 +21,7 @@
 }:
 
 let
-  version = "0.24.0";
+  version = "0.25.0";
 in
 
 rustPlatform.buildRustPackage {
@@ -32,10 +32,10 @@ rustPlatform.buildRustPackage {
     owner = "jj-vcs";
     repo = "jj";
     tag = "v${version}";
-    hash = "sha256-XsD4P2UygZFcnlV2o3E/hRRgsGjwKw1r9zniEeAk758";
+    hash = "sha256-5J1ZfPNyniUK5D3Pt1aKuJ+/8vad3JPxCztBRY591N8=";
   };
 
-  cargoHash = "sha256-9JwRdeHo8JkwRQwPA+UsIEWar4gYQS4SIM/uj1TU2yg";
+  cargoHash = "sha256-kuZ1zvb6H5QWjJSUYMq5tEywsQMC6187YJPUT1r4S5o=";
 
   nativeBuildInputs = [
     installShellFiles

From a5ca2074895abb48e0745412df495df9cdb345c1 Mon Sep 17 00:00:00 2001
From: Phani Rithvij <phanirithvij2000@gmail.com>
Date: Thu, 2 Jan 2025 14:51:03 +0530
Subject: [PATCH 135/229] dprint-plugins: init (#369415)

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
Co-authored-by: Jonas Chevalier <zimbatm@zimbatm.com>
---
 pkgs/by-name/dp/dprint/plugins/default.nix    |  44 +++++
 .../dp/dprint/plugins/dprint-plugin-biome.nix |  21 +++
 .../plugins/dprint-plugin-dockerfile.nix      |  14 ++
 .../dp/dprint/plugins/dprint-plugin-json.nix  |  14 ++
 .../dprint/plugins/dprint-plugin-jupyter.nix  |  14 ++
 .../dprint/plugins/dprint-plugin-markdown.nix |  14 ++
 .../dp/dprint/plugins/dprint-plugin-ruff.nix  |  17 ++
 .../dp/dprint/plugins/dprint-plugin-toml.nix  |  14 ++
 .../plugins/dprint-plugin-typescript.nix      |  21 +++
 .../dp/dprint/plugins/g-plane-malva.nix       |  19 +++
 .../dp/dprint/plugins/g-plane-markup_fmt.nix  |  24 +++
 .../dprint/plugins/g-plane-pretty_graphql.nix |  17 ++
 .../dp/dprint/plugins/g-plane-pretty_yaml.nix |  17 ++
 .../dp/dprint/plugins/update-plugins.py       | 156 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 15 files changed, 408 insertions(+)
 create mode 100644 pkgs/by-name/dp/dprint/plugins/default.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
 create mode 100755 pkgs/by-name/dp/dprint/plugins/update-plugins.py

diff --git a/pkgs/by-name/dp/dprint/plugins/default.nix b/pkgs/by-name/dp/dprint/plugins/default.nix
new file mode 100644
index 0000000000000..cefe95973b8dd
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/default.nix
@@ -0,0 +1,44 @@
+{ lib, fetchurl }:
+let
+  mkDprintPlugin =
+    {
+      url,
+      hash,
+      pname,
+      version,
+      description,
+      initConfig,
+      updateUrl,
+      license ? lib.licenses.mit,
+      maintainers ? [ lib.maintainers.phanirithvij ],
+    }:
+    fetchurl {
+      inherit hash url;
+      name = "${pname}-${version}.wasm";
+      meta = {
+        inherit
+          description
+          license
+          maintainers
+          ;
+      };
+      passthru = {
+        updateScript = ./update-plugins.py;
+        inherit initConfig updateUrl;
+      };
+    };
+  inherit (lib)
+    filterAttrs
+    mapAttrs'
+    nameValuePair
+    removeSuffix
+    ;
+  files = filterAttrs (
+    name: type: type == "regular" && name != "default.nix" && lib.hasSuffix ".nix" name
+  ) (builtins.readDir ./.);
+  plugins = mapAttrs' (
+    name: _:
+    nameValuePair (removeSuffix ".nix" name) (import (./. + "/${name}") { inherit mkDprintPlugin; })
+  ) files;
+in
+plugins // { inherit mkDprintPlugin; }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
new file mode 100644
index 0000000000000..4f1087505d523
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
@@ -0,0 +1,21 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "Biome (JS/TS) wrapper plugin.";
+  hash = "sha256-+zY+myazFAUxeNuWFigkvF4zpKBs+jzVYQT09jRWFKI=";
+  initConfig = {
+    configExcludes = [ "**/node_modules" ];
+    configKey = "biome";
+    fileExtensions = [
+      "ts"
+      "tsx"
+      "js"
+      "jsx"
+      "cjs"
+      "mjs"
+    ];
+  };
+  pname = "dprint-plugin-biome";
+  updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
+  url = "https://plugins.dprint.dev/biome-0.7.1.wasm";
+  version = "0.7.1";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
new file mode 100644
index 0000000000000..76e62aceecd79
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
@@ -0,0 +1,14 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "Dockerfile code formatter.";
+  hash = "sha256-gsfMLa4zw8AblOS459ZS9OZrkGCQi5gBN+a3hvOsspk=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "dockerfile";
+    fileExtensions = [ "dockerfile" ];
+  };
+  pname = "dprint-plugin-dockerfile";
+  updateUrl = "https://plugins.dprint.dev/dprint/dockerfile/latest.json";
+  url = "https://plugins.dprint.dev/dockerfile-0.3.2.wasm";
+  version = "0.3.2";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
new file mode 100644
index 0000000000000..2d8702539a0a9
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
@@ -0,0 +1,14 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "JSON/JSONC code formatter.";
+  hash = "sha256-Sw+HkUb4K2wrLuQRZibr8gOCR3Rz36IeId4Vd4LijmY=";
+  initConfig = {
+    configExcludes = [ "**/*-lock.json" ];
+    configKey = "json";
+    fileExtensions = [ "json" ];
+  };
+  pname = "dprint-plugin-json";
+  updateUrl = "https://plugins.dprint.dev/dprint/json/latest.json";
+  url = "https://plugins.dprint.dev/json-0.19.4.wasm";
+  version = "0.19.4";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix
new file mode 100644
index 0000000000000..f1ac0eae9708a
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix
@@ -0,0 +1,14 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "Jupyter notebook code block formatter.";
+  hash = "sha256-877CEZbMlj9cHkFtl16XCnan37SeEGUL3BHaUKUv8S4=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "jupyter";
+    fileExtensions = [ "ipynb" ];
+  };
+  pname = "dprint-plugin-jupyter";
+  updateUrl = "https://plugins.dprint.dev/dprint/jupyter/latest.json";
+  url = "https://plugins.dprint.dev/jupyter-0.1.5.wasm";
+  version = "0.1.5";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
new file mode 100644
index 0000000000000..0d17600f68278
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
@@ -0,0 +1,14 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "Markdown code formatter.";
+  hash = "sha256-PIEN9UnYC8doJpdzS7M6QEHQNQtj7WwXAgvewPsTjqs=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "markdown";
+    fileExtensions = [ "md" ];
+  };
+  pname = "dprint-plugin-markdown";
+  updateUrl = "https://plugins.dprint.dev/dprint/markdown/latest.json";
+  url = "https://plugins.dprint.dev/markdown-0.17.8.wasm";
+  version = "0.17.8";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
new file mode 100644
index 0000000000000..deee9292f48f2
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
@@ -0,0 +1,17 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "Ruff (Python) wrapper plugin.";
+  hash = "sha256-15InHQgF9c0Js4yUJxmZ1oNj1O16FBU12u/GOoaSAJ8=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "ruff";
+    fileExtensions = [
+      "py"
+      "pyi"
+    ];
+  };
+  pname = "dprint-plugin-ruff";
+  updateUrl = "https://plugins.dprint.dev/dprint/ruff/latest.json";
+  url = "https://plugins.dprint.dev/ruff-0.3.9.wasm";
+  version = "0.3.9";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix
new file mode 100644
index 0000000000000..3eef32b0e3bdb
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix
@@ -0,0 +1,14 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "TOML code formatter.";
+  hash = "sha256-aDfo/sKfOeNpyfd/4N1LgL1bObTTnviYrA8T7M/1KNs=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "toml";
+    fileExtensions = [ "toml" ];
+  };
+  pname = "dprint-plugin-toml";
+  updateUrl = "https://plugins.dprint.dev/dprint/toml/latest.json";
+  url = "https://plugins.dprint.dev/toml-0.6.3.wasm";
+  version = "0.6.3";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
new file mode 100644
index 0000000000000..a3a805827ec0c
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
@@ -0,0 +1,21 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "TypeScript/JavaScript code formatter.";
+  hash = "sha256-urgKQOjgkoDJCH/K7DWLJCkD0iH0Ok+rvrNDI0i4uS0=";
+  initConfig = {
+    configExcludes = [ "**/node_modules" ];
+    configKey = "typescript";
+    fileExtensions = [
+      "ts"
+      "tsx"
+      "js"
+      "jsx"
+      "cjs"
+      "mjs"
+    ];
+  };
+  pname = "dprint-plugin-typescript";
+  updateUrl = "https://plugins.dprint.dev/dprint/typescript/latest.json";
+  url = "https://plugins.dprint.dev/typescript-0.93.3.wasm";
+  version = "0.93.3";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
new file mode 100644
index 0000000000000..c01cad63c064d
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
@@ -0,0 +1,19 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "CSS, SCSS, Sass and Less formatter.";
+  hash = "sha256-zt7F1tgPhPAn+gtps6+JB5RtvjIZw2n/G85Bv6kazgU=";
+  initConfig = {
+    configExcludes = [ "**/node_modules" ];
+    configKey = "malva";
+    fileExtensions = [
+      "css"
+      "scss"
+      "sass"
+      "less"
+    ];
+  };
+  pname = "g-plane-malva";
+  updateUrl = "https://plugins.dprint.dev/g-plane/malva/latest.json";
+  url = "https://plugins.dprint.dev/g-plane/malva-v0.11.1.wasm";
+  version = "0.11.1";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
new file mode 100644
index 0000000000000..b948d3569013d
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
@@ -0,0 +1,24 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, and Vento formatter.";
+  hash = "sha256-G8UnJbc+oZ60V3oi8W2SS6H06zEYfY3wpmSUp+1GF8k=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "markup";
+    fileExtensions = [
+      "html"
+      "vue"
+      "svelte"
+      "astro"
+      "jinja"
+      "jinja2"
+      "twig"
+      "njk"
+      "vto"
+    ];
+  };
+  pname = "g-plane-markup_fmt";
+  updateUrl = "https://plugins.dprint.dev/g-plane/markup_fmt/latest.json";
+  url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.18.0.wasm";
+  version = "0.18.0";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
new file mode 100644
index 0000000000000..38d7326ab4169
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
@@ -0,0 +1,17 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "GraphQL formatter.";
+  hash = "sha256-PlQwpR0tMsghMrOX7is+anN57t9xa9weNtoWpc0E9ec=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "graphql";
+    fileExtensions = [
+      "graphql"
+      "gql"
+    ];
+  };
+  pname = "g-plane-pretty_graphql";
+  updateUrl = "https://plugins.dprint.dev/g-plane/pretty_graphql/latest.json";
+  url = "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.1.wasm";
+  version = "0.2.1";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
new file mode 100644
index 0000000000000..a303b945d5e72
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
@@ -0,0 +1,17 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "YAML formatter.";
+  hash = "sha256-6ua021G7ZW7Ciwy/OHXTA1Joj9PGEx3SZGtvaA//gzo=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "yaml";
+    fileExtensions = [
+      "yaml"
+      "yml"
+    ];
+  };
+  pname = "g-plane-pretty_yaml";
+  updateUrl = "https://plugins.dprint.dev/g-plane/pretty_yaml/latest.json";
+  url = "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm";
+  version = "0.5.0";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/update-plugins.py b/pkgs/by-name/dp/dprint/plugins/update-plugins.py
new file mode 100755
index 0000000000000..9a3bd7e38cae2
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/update-plugins.py
@@ -0,0 +1,156 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python -p nix nixfmt-rfc-style 'python3.withPackages (pp: [ pp.requests ])'
+
+import json
+import os
+from pathlib import Path
+import sys
+import subprocess
+import requests
+
+USAGE = """Usage: {0} [ | plugin-name | plugin-file-path]
+
+eg.
+  {0}
+  {0} dprint-plugin-json
+  {0} /path/to/dprint-plugin-json.nix"""
+
+FILE_PATH = Path(os.path.realpath(__file__))
+SCRIPT_DIR = FILE_PATH.parent
+
+pname = ""
+if len(sys.argv) > 1:
+    if "-help" in "".join(sys.argv):
+        print(USAGE.format(FILE_PATH.name))
+        exit(0)
+    pname = sys.argv[1]
+else:
+    pname = os.environ.get("UPDATE_NIX_PNAME", "")
+
+
+# get sri hash for a url, no unpack
+def nix_prefetch_url(url, name, algo="sha256"):
+    hash = (
+        subprocess.check_output(
+            ["nix-prefetch-url", "--type", algo, "--name", name, url]
+        )
+        .decode("utf-8")
+        .rstrip()
+    )
+    sri = (
+        subprocess.check_output(
+            # split by space is enough for this command
+            "nix --extra-experimental-features nix-command "
+            f"hash convert --hash-algo {algo} --to sri {hash}".split(" ")
+        )
+        .decode("utf-8")
+        .rstrip()
+    )
+    return sri
+
+
+# json object to nix string
+def json_to_nix(jsondata):
+    # to quote strings, dumps twice does it
+    json_str = json.dumps(json.dumps(jsondata))
+    return (
+        subprocess.check_output(
+            "nix --extra-experimental-features nix-command eval "
+            f"--expr 'builtins.fromJSON ''{json_str}''' --impure | nixfmt",
+            shell=True,
+        )
+        .decode("utf-8")
+        .rstrip()
+    )
+
+
+# nix string to json object
+def nix_to_json(nixstr):
+    return json.loads(
+        subprocess.check_output(
+            f"nix --extra-experimental-features nix-command eval --json --expr '{nixstr}'",
+            shell=True,
+        )
+        .decode("utf-8")
+        .rstrip()
+    )
+
+
+# nixfmt a file
+def nixfmt(nixfile):
+    subprocess.run(["nixfmt", nixfile])
+
+
+def get_update_url(plugin_url):
+    """Get a single plugin's update url given the plugin's url"""
+
+    # remove -version.wasm at the end
+    url = "-".join(plugin_url.split("-")[:-1])
+    names = url.split("/")[3:]
+    # if single name then -> dprint/<name>
+    if len(names) == 1:
+        names.insert(0, "dprint")
+    return "https://plugins.dprint.dev/" + "/".join(names) + "/latest.json"
+
+
+def write_plugin_derivation(drv_attrs):
+    drv = f"{{ mkDprintPlugin }}: mkDprintPlugin {json_to_nix(drv_attrs)}"
+    filepath = SCRIPT_DIR / f"{drv_attrs["pname"]}.nix"
+    with open(filepath, "w+", encoding="utf8") as f:
+        f.write(drv)
+    nixfmt(filepath)
+
+
+def update_plugin_by_name(name):
+    """Update a single plugin by name"""
+
+    # allow passing in filename as well as pname
+    if name.endswith(".nix"):
+        name = Path(name[:-4]).name
+    try:
+        p = (SCRIPT_DIR / f"{name}.nix").read_text().replace("\n", "")
+    except OSError as e:
+        print(f"failed to update plugin {name}: error: {e}")
+        exit(1)
+
+    start_idx = p.find("mkDprintPlugin {") + len("mkDprintPlugin {")
+    p = nix_to_json("{" + p[start_idx:].strip())
+
+    data = requests.get(p["updateUrl"]).json()
+    p["url"] = data["url"]
+    p["version"] = data["version"]
+    p["hash"] = nix_prefetch_url(data["url"], f"{name}-{data["version"]}.wasm")
+
+    write_plugin_derivation(p)
+
+
+def update_plugins():
+    """Update all the plugins"""
+
+    data = requests.get("https://plugins.dprint.dev/info.json").json()["latest"]
+
+    for e in data:
+        update_url = get_update_url(e["url"])
+        pname = e["name"]
+        if "/" in e["name"]:
+            pname = pname.replace("/", "-")
+        drv_attrs = {
+            "url": e["url"],
+            "hash": nix_prefetch_url(e["url"], f"{pname}-{e["version"]}.wasm"),
+            "updateUrl": update_url,
+            "pname": pname,
+            "version": e["version"],
+            "description": e["description"],
+            "initConfig": {
+                "configKey": e["configKey"],
+                "configExcludes": e["configExcludes"],
+                "fileExtensions": e["fileExtensions"],
+            },
+        }
+        write_plugin_derivation(drv_attrs)
+
+
+if pname != "":
+    update_plugin_by_name(pname)
+else:
+    update_plugins()
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ed3cf54d85b8..d4e45f4de4f12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5907,6 +5907,8 @@ with pkgs;
 
   devpi-server = python3Packages.callPackage ../development/tools/devpi-server { };
 
+  dprint-plugins = recurseIntoAttrs (callPackage ../by-name/dp/dprint/plugins { });
+
   elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix;
 
   elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { });

From 041cda876a039c2e254c740b431224584c1c8f48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 09:30:57 +0000
Subject: [PATCH 136/229] iosevka: 32.2.1 -> 32.3.1

---
 pkgs/data/fonts/iosevka/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 9ffade535fc4d..4b4ce4f1e47e6 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "32.2.1";
+  version = "32.3.1";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-z0S38X2A0rfGFNTr/Ym0VHfOhzdz/q42QL3tVf+m5FQ=";
+    hash = "sha256-WoRBDLCqLglTXeXtC8ZVELgDOv18dsCDvToUq3iPoDU=";
   };
 
-  npmDepsHash = "sha256-dFVhoBf4v0K1mqbiysZNk4yCt4Ars0Pgnr63xIsavDo=";
+  npmDepsHash = "sha256-gmaFzcTbocx3RYW4G4Lw/08f3c71draxRwzV0BA2/KY=";
 
   nativeBuildInputs =
     [

From a0919c7eeda731b1f8e2948d9feebb4ad9b89aab Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 25 Dec 2024 11:21:20 +0100
Subject: [PATCH 137/229] postgresql_14: fix build

Building postgresql_14 currently fails with this on master:

  error: derivation contains an illegal reference specifier 'man'

The reason seems to be a bug in nix, where outputChecks are run
improperly when one of the outputs can already be substituted. Why the
man output can be substituted from hydra is unknown, but adding more
outputChecks for the the man and doc outputs should work around the
problem until nix is fixed.
---
 pkgs/servers/sql/postgresql/generic.nix | 68 ++++++++++++++++---------
 1 file changed, 45 insertions(+), 23 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 10cf487ad4a31..2effd687e8e48 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -146,29 +146,51 @@ let
         "lib"
         "man"
       ];
-      outputChecks.out = {
-        disallowedReferences = [
-          "dev"
-          "doc"
-          "man"
-        ];
-        disallowedRequisites = [
-          stdenv'.cc
-          llvmPackages.llvm.out
-        ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
-      };
-      outputChecks.lib = {
-        disallowedReferences = [
-          "out"
-          "dev"
-          "doc"
-          "man"
-        ];
-        disallowedRequisites = [
-          stdenv'.cc
-          llvmPackages.llvm.out
-        ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
-      };
+      outputChecks =
+        {
+          out = {
+            disallowedReferences = [
+              "dev"
+              "doc"
+              "man"
+            ];
+            disallowedRequisites = [
+              stdenv'.cc
+              llvmPackages.llvm.out
+            ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
+          };
+
+          lib = {
+            disallowedReferences = [
+              "out"
+              "dev"
+              "doc"
+              "man"
+            ];
+            disallowedRequisites = [
+              stdenv'.cc
+              llvmPackages.llvm.out
+            ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
+          };
+        }
+        // lib.optionalAttrs (atLeast "14" && olderThan "15") {
+          # TODO: Make this unconditional via staging because of number of rebuilds.
+          doc = {
+            disallowedReferences = [
+              "out"
+              "dev"
+              "man"
+            ];
+          };
+
+          man = {
+            disallowedReferences = [
+              "out"
+              "dev"
+              "doc"
+            ];
+          };
+        };
 
       strictDeps = true;
 

From 297e71258a7bc903f28ef5be37d14fc9e8175a50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 09:58:55 +0000
Subject: [PATCH 138/229] python312Packages.marimo: 0.10.5 -> 0.10.9

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

diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 7958d63eb9ee8..a2d391e263e70 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -30,13 +30,13 @@
 
 buildPythonPackage rec {
   pname = "marimo";
-  version = "0.10.5";
+  version = "0.10.9";
   pyproject = true;
 
   # The github archive does not include the static assets
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KJKnGVOM0ahZOWDXHyS5meRS1xXypKzgo3X9RvD1tJs=";
+    hash = "sha256-WoMfybvKlD8Gy2sc3/EhQZVN9WPh8eEVPlG5ksyjjGc=";
   };
 
   build-system = [ hatchling ];

From 7f338aad226d63423d512a3e79035f0837c7a07f Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 1 Jan 2025 23:45:48 +0100
Subject: [PATCH 139/229] vectorscan: fix cross-compile

---
 pkgs/by-name/ve/vectorscan/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix
index 860ea03f7a2de..7ac93806d0062 100644
--- a/pkgs/by-name/ve/vectorscan/package.nix
+++ b/pkgs/by-name/ve/vectorscan/package.nix
@@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-wz2oIhau/vjnri3LOyPZSCFAWg694FTLVt7+SZYEsL4=";
   };
 
+  postPatch = ''
+    substituteInPlace cmake/build_wrapper.sh \
+      --replace-fail 'nm' '${stdenv.cc.targetPrefix}nm' \
+      --replace-fail 'objcopy' '${stdenv.cc.targetPrefix}objcopy'
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 0f3c1d31bfb512edfca8a28ce19a8a5bc69f8eb7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 10:05:48 +0000
Subject: [PATCH 140/229] renode-dts2repl: 0-unstable-2024-12-20 ->
 0-unstable-2024-12-28

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

diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index f749546b3271e..94d33583ba402 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2024-12-20";
+  version = "0-unstable-2024-12-28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "323cc41b6864e53cb1b99bf909c779b739a8fccb";
-    hash = "sha256-CYgQ5CMVkHqOEPPaG74GVNhm8pa6ZpAtt54JrrDn+2M=";
+    rev = "f655a1380364fdab9fa0f72909c19ab8ff16dbb6";
+    hash = "sha256-mErr95/Ew9HwKDJhQy7V86H1MJb5Y7IFzg7Id8Llqy8=";
   };
 
   nativeBuildInputs = [

From 4d3b1bcad8797b28a4cf744fdad043b4f438ba32 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 2 Jan 2025 02:12:46 -0800
Subject: [PATCH 141/229] singular: fix clang-19 build

remove dead code with invalid member reference
https://github.com/Singular/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9

enable local networking in darwin sandbox

note: the darwin build is still broken due a link error which occurs due
to combining -flat_namespace and libgfortran.dylib -- gfortran/libs
are usings `@rpaths/libname.dylib` rather than full path names. However,
once this is fix the build succeeds.
---
 pkgs/by-name/si/singular/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix
index 47e6c2445191a..40fa34b877610 100644
--- a/pkgs/by-name/si/singular/package.nix
+++ b/pkgs/by-name/si/singular/package.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   gmp,
   bison,
   perl,
@@ -48,6 +49,15 @@ stdenv.mkDerivation rec {
     forceFetchGit = true;
   };
 
+  patches = [
+    (fetchpatch {
+      # removes dead code with invalid member reference in gfanlib
+      name = "clang-19.patch";
+      url = "https://github.com/Singular/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9.patch";
+      hash = "sha256-1KOk+yrTvHWY4aSK9QcByHIwKwe71QIYTMx8zo7XNos=";
+    })
+  ];
+
   configureFlags =
     [
       "--enable-gfanlib"
@@ -173,6 +183,7 @@ stdenv.mkDerivation rec {
   '';
 
   enableParallelBuilding = true;
+  __darwinAllowLocalNetworking = true;
 
   meta = with lib; {
     description = "CAS for polynomial computations";

From b287c667e03207351291e8c84bd5a5384470ecd9 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 2 Jan 2025 02:16:18 -0800
Subject: [PATCH 142/229] gfan: fix clang-19 build

remove dead code with invalid member reference
https://github.com/Singular/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9
---
 pkgs/by-name/gf/gfan/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/gf/gfan/package.nix b/pkgs/by-name/gf/gfan/package.nix
index 9410d7d2e4916..a4b202e829daf 100644
--- a/pkgs/by-name/gf/gfan/package.nix
+++ b/pkgs/by-name/gf/gfan/package.nix
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
   patches =
     [
       ./gfan-0.6.2-cddlib-prefix.patch
+      (fetchpatch {
+        # removes dead code with invalid member reference in gfanlib
+        name = "clang-19.patch";
+        url = "https://github.com/Singular/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9.patch";
+        stripLen = 2;
+        extraPrefix = "src/";
+        hash = "sha256-jPGMYx/GOFV7Tk3CqaRWeX/UHkzjeL57eZj4r40s8/g=";
+      })
     ]
     ++ lib.optionals (stdenv.cc.isClang) [
       (fetchpatch {

From 41f7b3d67bf62aaf4b7494c06c35b66d1d473358 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 10:23:29 +0000
Subject: [PATCH 143/229] factoriolab: 3.8.9 -> 3.8.10

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

diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix
index c096519a05383..92c4dc66836f4 100644
--- a/pkgs/by-name/fa/factoriolab/package.nix
+++ b/pkgs/by-name/fa/factoriolab/package.nix
@@ -10,13 +10,13 @@
 }:
 buildNpmPackage rec {
   pname = "factoriolab";
-  version = "3.8.9";
+  version = "3.8.10";
 
   src = fetchFromGitHub {
     owner = "factoriolab";
     repo = "factoriolab";
     rev = "refs/tags/v${version}";
-    hash = "sha256-H+l/eDdTc/IMqE85Xh4IAo2ZWZRYKKUnH3rXkON2L1s=";
+    hash = "sha256-vwcqUsqlggmqqlQ3fyn+s3NKQ0oNcVztfjTpJPW1mFs=";
   };
   buildInputs = [ vips ];
   nativeBuildInputs = [

From 2eecf15ad7776f924f8fc01e329d9bd17fbd6bf5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 11:36:22 +0100
Subject: [PATCH 144/229] python312Packages.deepdish: fix build

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

diff --git a/pkgs/development/python-modules/deepdish/default.nix b/pkgs/development/python-modules/deepdish/default.nix
index 04062db872a79..119defd7ea174 100644
--- a/pkgs/development/python-modules/deepdish/default.nix
+++ b/pkgs/development/python-modules/deepdish/default.nix
@@ -1,7 +1,12 @@
 {
   lib,
-  fetchPypi,
   buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   numpy,
   scipy,
   tables,
@@ -10,14 +15,23 @@
 buildPythonPackage rec {
   pname = "deepdish";
   version = "0.3.7";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wqzwh3y0mjdyba5kfbvlamn561d3afz50zi712c7klkysz3mzva";
+    hash = "sha256-av86vvaTzsNEOPGD8p0aLZhiq6J7uVnU8k1W4AfkH/M=";
   };
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    substituteInPlace deepdish/core.py \
+      --replace-fail "np.ComplexWarning" "np.exceptions.ComplexWarning"
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     numpy
     scipy
     tables
@@ -32,11 +46,11 @@ buildPythonPackage rec {
   # The tests are broken: `ModuleNotFoundError: No module named 'deepdish.six.conf'`
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Flexible HDF5 saving/loading and other data science tools from the University of Chicago";
     mainProgram = "ddls";
     homepage = "https://github.com/uchicago-cs/deepdish";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ndl ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ndl ];
   };
 }

From 3aee503522c4e9ddb4c0ee4943484af7d92139e4 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 21 Dec 2024 13:07:45 +0100
Subject: [PATCH 145/229] voicevox-core: 0.15.4 -> 0.15.7, make sources easier
 to fetch

---
 pkgs/by-name/vo/voicevox-core/package.nix | 75 +++++++++++++----------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix
index 0283b9cbfb4cb..556eb756424d2 100644
--- a/pkgs/by-name/vo/voicevox-core/package.nix
+++ b/pkgs/by-name/vo/voicevox-core/package.nix
@@ -1,45 +1,18 @@
 {
   lib,
   stdenv,
-  fetchzip,
+  fetchurl,
+  unzip,
   autoPatchelfHook,
 }:
 
-let
-  platformInfoTable = {
-    "x86_64-linux" = {
-      id = "linux-x64";
-      hash = "sha256-/PD5e0bWgnIsIrvyOypoJw30VkgbOFWV1NJpPS2G0WM=";
-    };
-    "aarch64-linux" = {
-      id = "linux-arm64";
-      hash = "sha256-zfiorXZyIISZPXPwmcdYeHceDmQXkUhsvTkNZScg648=";
-    };
-    "x86_64-darwin" = {
-      id = "osx-x64";
-      hash = "sha256-cdNdV1fVPkz6B7vtKZiPsLQGqnIiDtYa9KTcwSkjdJg=";
-    };
-    "aarch64-darwin" = {
-      id = "osx-arm64";
-      hash = "sha256-Z1dq2t/HBQulbPF23ZCihOrcZHMpTXEQ6yXKORZaFPk=";
-    };
-  };
-
-  platformInfo =
-    platformInfoTable.${stdenv.hostPlatform.system}
-      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "voicevox-core";
-  version = "0.15.4";
+  version = "0.15.7";
 
-  # Note: Only the prebuilt binaries are able to decrypt the encrypted voice models
-  src = fetchzip {
-    url = "https://github.com/VOICEVOX/voicevox_core/releases/download/${finalAttrs.version}/voicevox_core-${platformInfo.id}-cpu-${finalAttrs.version}.zip";
-    inherit (platformInfo) hash;
-  };
+  src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
 
-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
   buildInputs = [ stdenv.cc.cc.lib ];
 
@@ -54,6 +27,37 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  # When updating, run the following command to fetch all FODs:
+  # nix-build -A voicevox-core.sources --keep-going
+  passthru.sources =
+    let
+      # Note: Only the prebuilt binaries are able to decrypt the encrypted voice models
+      fetchCoreArtifact =
+        { id, hash }:
+        fetchurl {
+          url = "https://github.com/VOICEVOX/voicevox_core/releases/download/${finalAttrs.version}/voicevox_core-${id}-cpu-${finalAttrs.version}.zip";
+          inherit hash;
+        };
+    in
+    {
+      "x86_64-linux" = fetchCoreArtifact {
+        id = "linux-x64";
+        hash = "sha256-7FgrJ1HlB8l5MHd2KM4lYRx2bYdxrD2+su1G33/ugUA=";
+      };
+      "aarch64-linux" = fetchCoreArtifact {
+        id = "linux-arm64";
+        hash = "sha256-fD7YMTo9jeB4vJibnVwX8VrukCUeAwS6VXGOr3VXG+c=";
+      };
+      "x86_64-darwin" = fetchCoreArtifact {
+        id = "osx-x64";
+        hash = "sha256-5h9qEKbdcvip50TLs3vf6lXkSv24VEjOrx6CTUo7Q4Q=";
+      };
+      "aarch64-darwin" = fetchCoreArtifact {
+        id = "osx-arm64";
+        hash = "sha256-0bFLhvP7LqDzuk3pyM9QZfc8eLMW0IgqVkaXsuS3qlY=";
+      };
+    };
+
   meta = {
     changelog = "https://github.com/VOICEVOX/voicevox_core/releases/tag/${finalAttrs.version}";
     description = "Core library for the VOICEVOX speech synthesis software";
@@ -67,8 +71,11 @@ stdenv.mkDerivation (finalAttrs: {
         redistributable = true;
       })
     ];
-    maintainers = with lib.maintainers; [ tomasajt ];
-    platforms = lib.attrNames platformInfoTable;
+    maintainers = with lib.maintainers; [
+      tomasajt
+      eljamm
+    ];
+    platforms = lib.attrNames finalAttrs.passthru.sources;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })

From 6be536c0d86750d4daecfaa10fecb0fa0c906978 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 21 Dec 2024 13:08:17 +0100
Subject: [PATCH 146/229] voicevox-engine: 0.20.0 -> 0.22.2

---
 pkgs/by-name/vo/voicevox-engine/package.nix | 22 ++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix
index bc9a67617e9fb..e9f3e56a73f7d 100644
--- a/pkgs/by-name/vo/voicevox-engine/package.nix
+++ b/pkgs/by-name/vo/voicevox-engine/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "voicevox-engine";
-  version = "0.20.0";
+  version = "0.22.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "VOICEVOX";
     repo = "voicevox_engine";
-    rev = "refs/tags/${version}";
-    hash = "sha256-Gib5R7oleg+XXyu2V65EqrflQ1oiAR7a09a0MFhSITc=";
+    tag = version;
+    hash = "sha256-TZycd3xX5d4dNk4ze2JozyO7zDpGAuO+O7xHAx7QXUI=";
   };
 
   patches = [
@@ -95,6 +95,10 @@ python3Packages.buildPythonApplication rec {
     # this test checks the behaviour of openapi
     # one of the functions returns a slightly different output due to openapi version differences
     "test_OpenAPIの形が変わっていないことを確認"
+
+    # these tests fail due to some tiny floating point discrepancies
+    "test_upspeak_voiced_last_mora"
+    "test_upspeak_voiced_N_last_mora"
   ];
 
   nativeCheckInputs = with python3Packages; [
@@ -105,22 +109,26 @@ python3Packages.buildPythonApplication rec {
 
   passthru = {
     resources = fetchFromGitHub {
+      name = "voicevox-resource-${version}"; # this contains ${version} to invalidate the hash upon updating the package
       owner = "VOICEVOX";
       repo = "voicevox_resource";
-      rev = "refs/tags/${version}";
-      hash = "sha256-m888DF9qgGbK30RSwNnAoT9D0tRJk6cD5QY72FRkatM=";
+      tag = version;
+      hash = "sha256-oeWJESm1v0wicAXXFAyZT8z4QRVv9c+3vsWksmuY5wY=";
     };
 
     pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { };
   };
 
   meta = {
-    changelog = "https://github.com/VOICEVOX/voicevox_engine/releases/tag/${version}";
+    changelog = "https://github.com/VOICEVOX/voicevox_engine/releases/tag/${src.tag}";
     description = "Engine for the VOICEVOX speech synthesis software";
     homepage = "https://github.com/VOICEVOX/voicevox_engine";
     license = lib.licenses.lgpl3Only;
     mainProgram = "voicevox-engine";
-    maintainers = with lib.maintainers; [ tomasajt ];
+    maintainers = with lib.maintainers; [
+      tomasajt
+      eljamm
+    ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From 1c90438fd833f11d06431acdd3453c46305b5455 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 21 Dec 2024 13:08:22 +0100
Subject: [PATCH 147/229] voicevox: 0.20.0 -> 0.22.3

---
 pkgs/by-name/vo/voicevox/hardcode-paths.patch | 21 ++++++++---------
 pkgs/by-name/vo/voicevox/package.nix          | 23 ++++++++++++++-----
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/vo/voicevox/hardcode-paths.patch b/pkgs/by-name/vo/voicevox/hardcode-paths.patch
index 844a3e5884c45..91d862602bff1 100644
--- a/pkgs/by-name/vo/voicevox/hardcode-paths.patch
+++ b/pkgs/by-name/vo/voicevox/hardcode-paths.patch
@@ -12,30 +12,29 @@ index 5b0dcb0..5848ccd 100644
          "host": "http://127.0.0.1:50021"
      }
 diff --git a/electron-builder.config.js b/electron-builder.config.js
-index 462e6f2..10a9bff 100644
+index 196a0d7..7e313c2 100644
 --- a/electron-builder.config.js
 +++ b/electron-builder.config.js
-@@ -35,19 +35,6 @@ const isMac = process.platform === "darwin";
+@@ -37,18 +37,7 @@ const isArm64 = process.arch === "arm64";
  // cf: https://k-hyoda.hatenablog.com/entry/2021/10/23/000349#%E8%BF%BD%E5%8A%A0%E5%B1%95%E9%96%8B%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E5%85%88%E3%81%AE%E8%A8%AD%E5%AE%9A
  const extraFilePrefix = isMac ? "MacOS/" : "";
  
 -const sevenZipFile = fs
--  .readdirSync(path.resolve(__dirname, "build", "vendored", "7z"))
+-  .readdirSync(path.resolve(__dirname, "vendored", "7z"))
 -  .find(
 -    // Windows: 7za.exe, Linux: 7zzs, macOS: 7zz
 -    (fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName),
 -  );
--
+ 
 -if (!sevenZipFile) {
 -  throw new Error(
--    "7z binary file not found. Run `node ./build/download7z.js` first.",
+-    "7z binary file not found. Run `node ./tools/download7z.js` first.",
 -  );
 -}
--
+ 
  /** @type {import("electron-builder").Configuration} */
  const builderOptions = {
-   beforeBuild: async () => {
-@@ -88,14 +75,6 @@ const builderOptions = {
+@@ -90,14 +79,6 @@ const builderOptions = {
        from: "build/README.txt",
        to: extraFilePrefix + "README.txt",
      },
@@ -44,17 +43,17 @@ index 462e6f2..10a9bff 100644
 -      to: path.join(extraFilePrefix, "vv-engine"),
 -    },
 -    {
--      from: path.resolve(__dirname, "build", "vendored", "7z", sevenZipFile),
+-      from: path.resolve(__dirname, "vendored", "7z", sevenZipFile),
 -      to: extraFilePrefix + sevenZipFile,
 -    },
    ],
    // electron-builder installer
    productName: "VOICEVOX",
 diff --git a/src/backend/electron/manager/vvppManager.ts b/src/backend/electron/manager/vvppManager.ts
-index 6aa17b6..b8b52b7 100644
+index edd3177..22d0114 100644
 --- a/src/backend/electron/manager/vvppManager.ts
 +++ b/src/backend/electron/manager/vvppManager.ts
-@@ -196,16 +196,8 @@ export class VvppManager {
+@@ -184,16 +184,8 @@ export class VvppManager {
  
          const args = ["x", "-o" + outputDir, archiveFile, "-t" + format];
  
diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix
index e4935091c87bd..a12fcef8e1c03 100644
--- a/pkgs/by-name/vo/voicevox/package.nix
+++ b/pkgs/by-name/vo/voicevox/package.nix
@@ -10,17 +10,18 @@
   electron,
   _7zz,
   voicevox-engine,
+  dart-sass,
 }:
 
 buildNpmPackage rec {
   pname = "voicevox";
-  version = "0.20.0";
+  version = "0.22.3";
 
   src = fetchFromGitHub {
     owner = "VOICEVOX";
     repo = "voicevox";
-    rev = "refs/tags/${version}";
-    hash = "sha256-05WTecNc1xxe7SGDPZbLtRELNghFkMTqI4pkX4PsVWI=";
+    tag = version;
+    hash = "sha256-6z+A4bJIDfN/K8IjEdt2TqEa/EDt4uQpGh+zSWfP74I=";
   };
 
   patches = [
@@ -36,7 +37,10 @@ buildNpmPackage rec {
         --replace-fail "postinstall" "_postinstall"
   '';
 
-  npmDepsHash = "sha256-g3avCj3S96qYPAyGXn4yvrZ4gteJld+g4eV4aRtv/3g=";
+  npmDepsHash = "sha256-NuKFhDb/J6G3pFYHZedKnY2hDC5GCp70DpqrST4bJMA=";
+
+  # unlock very specific node version bounds specified by upstream
+  npmInstallFlags = [ "--engine-strict=false" ];
 
   nativeBuildInputs =
     [
@@ -54,6 +58,10 @@ buildNpmPackage rec {
   buildPhase = ''
     runHook preBuild
 
+    # force sass-embedded to use our own sass instead of the bundled one
+    substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
+        --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];'
+
     # build command taken from the definition of the `electron:build` npm script
     VITE_TARGET=electron npm exec vite build
 
@@ -105,12 +113,15 @@ buildNpmPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/VOICEVOX/voicevox/releases/tag/${version}";
+    changelog = "https://github.com/VOICEVOX/voicevox/releases/tag/${src.tag}";
     description = "Editor for the VOICEVOX speech synthesis software";
     homepage = "https://github.com/VOICEVOX/voicevox";
     license = lib.licenses.lgpl3Only;
     mainProgram = "voicevox";
-    maintainers = with lib.maintainers; [ tomasajt ];
+    maintainers = with lib.maintainers; [
+      tomasajt
+      eljamm
+    ];
     platforms = electron.meta.platforms;
   };
 }

From 8474f557efabe0741d87ace6571ee1614d8d53e8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Jan 2025 10:50:20 +0100
Subject: [PATCH 148/229] rspamd: build with vectorscan

---
 pkgs/by-name/rs/rspamd/package.nix | 41 ++++++++++++++----------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix
index 853b9cae4c778..1288743c3c1fc 100644
--- a/pkgs/by-name/rs/rspamd/package.nix
+++ b/pkgs/by-name/rs/rspamd/package.nix
@@ -14,7 +14,7 @@
   sqlite,
   ragel,
   icu,
-  hyperscan,
+  vectorscan,
   jemalloc,
   blas,
   lapack,
@@ -24,13 +24,10 @@
   zstd,
   libarchive,
   withBlas ? true,
-  withHyperscan ? stdenv.hostPlatform.isx86_64,
   withLuaJIT ? stdenv.hostPlatform.isx86_64,
   nixosTests,
 }:
 
-assert withHyperscan -> stdenv.hostPlatform.isx86_64;
-
 stdenv.mkDerivation rec {
   pname = "rspamd";
   version = "3.11.0";
@@ -48,7 +45,9 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     perl
+    ragel
   ];
+
   buildInputs =
     [
       doctest
@@ -64,8 +63,8 @@ stdenv.mkDerivation rec {
       xxHash
       zstd
       libarchive
+      vectorscan
     ]
-    ++ lib.optional withHyperscan hyperscan
     ++ lib.optionals withBlas [
       blas
       lapack
@@ -73,23 +72,21 @@ stdenv.mkDerivation rec {
     ++ lib.optional withLuaJIT luajit
     ++ lib.optional (!withLuaJIT) lua;
 
-  cmakeFlags =
-    [
-      # pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908
-      "-DENABLE_PCRE2=OFF"
-      "-DDEBIAN_BUILD=ON"
-      "-DRUNDIR=/run/rspamd"
-      "-DDBDIR=/var/lib/rspamd"
-      "-DLOGDIR=/var/log/rspamd"
-      "-DLOCAL_CONFDIR=/etc/rspamd"
-      "-DENABLE_JEMALLOC=ON"
-      "-DSYSTEM_DOCTEST=ON"
-      "-DSYSTEM_FMT=ON"
-      "-DSYSTEM_XXHASH=ON"
-      "-DSYSTEM_ZSTD=ON"
-    ]
-    ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"
-    ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF";
+  cmakeFlags = [
+    # pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908
+    "-DENABLE_PCRE2=OFF"
+    "-DDEBIAN_BUILD=ON"
+    "-DRUNDIR=/run/rspamd"
+    "-DDBDIR=/var/lib/rspamd"
+    "-DLOGDIR=/var/log/rspamd"
+    "-DLOCAL_CONFDIR=/etc/rspamd"
+    "-DENABLE_JEMALLOC=ON"
+    "-DSYSTEM_DOCTEST=ON"
+    "-DSYSTEM_FMT=ON"
+    "-DSYSTEM_XXHASH=ON"
+    "-DSYSTEM_ZSTD=ON"
+    "-DENABLE_HYPERSCAN=ON"
+  ] ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF";
 
   passthru.tests.rspamd = nixosTests.rspamd;
 

From fac85fd1fccae52b528c0ed8cc04b6c404ae6e38 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Jan 2025 10:48:35 +0100
Subject: [PATCH 149/229] vectorscan: fix pkg-config

---
 pkgs/by-name/hy/hyperscan/package.nix  | 4 ++--
 pkgs/by-name/ve/vectorscan/package.nix | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix
index b9ba8e7b8ddaa..bce1ead253fdb 100644
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     sed -i '/examples/d' CMakeLists.txt
     substituteInPlace libhs.pc.in \
-      --replace "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \
-      --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
+      --replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \
+      --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
   '';
 
   doCheck = true;
diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix
index 7ac93806d0062..e2554d526f25b 100644
--- a/pkgs/by-name/ve/vectorscan/package.nix
+++ b/pkgs/by-name/ve/vectorscan/package.nix
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
+    sed -i '/examples/d' CMakeLists.txt
+    substituteInPlace libhs.pc.in \
+      --replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \
+      --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
     substituteInPlace cmake/build_wrapper.sh \
       --replace-fail 'nm' '${stdenv.cc.targetPrefix}nm' \
       --replace-fail 'objcopy' '${stdenv.cc.targetPrefix}objcopy'

From 3b11e0c595be016251ebc641ca523bc95aa01e17 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Jan 2025 10:50:03 +0100
Subject: [PATCH 150/229] vectorscan: reformat

---
 pkgs/by-name/ve/vectorscan/package.nix | 75 +++++++++++++++++---------
 1 file changed, 50 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix
index e2554d526f25b..206fb21b02eb9 100644
--- a/pkgs/by-name/ve/vectorscan/package.nix
+++ b/pkgs/by-name/ve/vectorscan/package.nix
@@ -1,15 +1,16 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
-, ragel
-, util-linux
-, python3
-, boost
-, sqlite
-, pcre
-, enableShared ? !stdenv.hostPlatform.isStatic
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  ragel,
+  util-linux,
+  python3,
+  boost,
+  sqlite,
+  pcre,
+  enableShared ? !stdenv.hostPlatform.isStatic,
 }:
 
 stdenv.mkDerivation rec {
@@ -55,18 +56,35 @@ stdenv.mkDerivation rec {
   #
   # For generic builds (e.g. x86_64) this can mean using an implementation not optimized for the
   # potentially available more modern hardware extensions (e.g. x86_64 with AVX512).
-  cmakeFlags = [ (if enableShared then "-DBUILD_SHARED_LIBS=ON" else "BUILD_STATIC_LIBS=ON") ]
-    ++
-    (if lib.elem stdenv.hostPlatform.system [ "x86_64-linux" "i686-linux" ] then
-      [ "-DBUILD_AVX2=ON" "-DBUILD_AVX512=ON" "-DBUILD_AVX512VBMI=ON" "-DFAT_RUNTIME=ON" ]
-    else
-      (if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then
-        [ "-DBUILD_SVE=ON" "-DBUILD_SVE2=ON" "-DBUILD_SVE2_BITPERM=ON" "-DFAT_RUNTIME=ON" ]
+  cmakeFlags =
+    [ (if enableShared then "-DBUILD_SHARED_LIBS=ON" else "BUILD_STATIC_LIBS=ON") ]
+    ++ (
+      if
+        lib.elem stdenv.hostPlatform.system [
+          "x86_64-linux"
+          "i686-linux"
+        ]
+      then
+        [
+          "-DBUILD_AVX2=ON"
+          "-DBUILD_AVX512=ON"
+          "-DBUILD_AVX512VBMI=ON"
+          "-DFAT_RUNTIME=ON"
+        ]
       else
-        [ "-DFAT_RUNTIME=OFF" ]
-          ++ lib.optional stdenv.hostPlatform.avx2Support "-DBUILD_AVX2=ON"
-          ++ lib.optional stdenv.hostPlatform.avx512Support "-DBUILD_AVX512=ON"
-      )
+        (
+          if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then
+            [
+              "-DBUILD_SVE=ON"
+              "-DBUILD_SVE2=ON"
+              "-DBUILD_SVE2_BITPERM=ON"
+              "-DFAT_RUNTIME=ON"
+            ]
+          else
+            [ "-DFAT_RUNTIME=OFF" ]
+            ++ lib.optional stdenv.hostPlatform.avx2Support "-DBUILD_AVX2=ON"
+            ++ lib.optional stdenv.hostPlatform.avx512Support "-DBUILD_AVX512=ON"
+        )
     );
 
   doCheck = true;
@@ -95,7 +113,14 @@ stdenv.mkDerivation rec {
     homepage = "https://www.vectorcamp.gr/vectorscan/";
     changelog = "https://github.com/VectorCamp/vectorscan/blob/${src.rev}/CHANGELOG-vectorscan.md";
     platforms = platforms.unix;
-    license = with licenses; [ bsd3 /* and */ bsd2 /* and */ licenses.boost ];
-    maintainers = with maintainers; [ tnias vlaci ];
+    license = with licenses; [
+      bsd3 # and
+      bsd2 # and
+      licenses.boost
+    ];
+    maintainers = with maintainers; [
+      tnias
+      vlaci
+    ];
   };
 }

From 22274d9c68c66e798a97191f4fea322d223fccbb Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Thu, 2 Jan 2025 12:59:22 +0200
Subject: [PATCH 151/229] yarn-berry: move to `pkgs/by-name`

---
 .../default.nix => by-name/ya/yarn-berry/package.nix}           | 0
 pkgs/{development/tools => by-name/ya}/yarn-berry/update.sh     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{development/tools/yarn-berry/default.nix => by-name/ya/yarn-berry/package.nix} (100%)
 rename pkgs/{development/tools => by-name/ya}/yarn-berry/update.sh (100%)

diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/by-name/ya/yarn-berry/package.nix
similarity index 100%
rename from pkgs/development/tools/yarn-berry/default.nix
rename to pkgs/by-name/ya/yarn-berry/package.nix
diff --git a/pkgs/development/tools/yarn-berry/update.sh b/pkgs/by-name/ya/yarn-berry/update.sh
similarity index 100%
rename from pkgs/development/tools/yarn-berry/update.sh
rename to pkgs/by-name/ya/yarn-berry/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index faf644bc957ba..a357a180f8266 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5665,8 +5665,6 @@ with pkgs;
 
   yapf = with python3Packages; toPythonApplication yapf;
 
-  yarn-berry = callPackage ../development/tools/yarn-berry { };
-
   yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { pkgs = pkgs.__splicedPackages; };
 
   inherit (yarn2nix-moretea)

From 1833a29ada0ef0a34af80de337a22bbeab570af0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 11:16:47 +0000
Subject: [PATCH 152/229] bacon: 3.6.0 -> 3.7.0

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

diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix
index 9de29879ee74b..39cdac8e7beb1 100644
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bacon";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "bacon";
     rev = "refs/tags/v${version}";
-    hash = "sha256-L+LVD7ceKUQ+nVyepusrv9Zz4BSGjXucnimsf+abM2k=";
+    hash = "sha256-pw+EfmpDvMCKSHOeHiv06x13/tRuf053Zcj8z0eWnPs=";
   };
 
-  cargoHash = "sha256-NUCy3DZ1uV1iPanHGbK/TSY6oS3zSQxVpmnw7Aon+pw=";
+  cargoHash = "sha256-W1bDZSUBjPmb/7bOnE+E5byA0clJZ+qGJ4XYASAjfeU=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = [ "--version" ];

From 2fd3c5e63d91c0019693b67e8467df225dba9109 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 11:16:49 +0000
Subject: [PATCH 153/229] gotrue-supabase: 2.166.0 -> 2.167.0

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

diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix
index cf37dbabfb415..0bccd3c1165ac 100644
--- a/pkgs/tools/security/gotrue/supabase.nix
+++ b/pkgs/tools/security/gotrue/supabase.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "auth";
-  version = "2.166.0";
+  version = "2.167.0";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "auth";
     rev = "v${version}";
-    hash = "sha256-e4PLop+enPt0IkPYRNH0UyZwiBhQKsk0mTFXokGcLug=";
+    hash = "sha256-L5yhrlbZk5R1f21rLpaskg/CW1ITt51sfgXu0DdSD3M=";
   };
 
   vendorHash = "sha256-em1dBnNHsVPI7owd2gjERcJnrQbiVtZGtIqnFyker6M=";

From 5f7fc7beb0ea15bf33927735576a175b1edc253f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 12:20:21 +0100
Subject: [PATCH 154/229] python312Packages.plotnine: 0.14.4 -> 0.14.5

Diff: https://github.com/has2k1/plotnine/compare/refs/tags/v0.14.4...v0.14.5

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

diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix
index 6fd63a35390c1..53a0d1e6d940d 100644
--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "plotnine";
-  version = "0.14.4";
+  version = "0.14.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "plotnine";
     tag = "v${version}";
-    hash = "sha256-pNbnbzmY3WMCfmuvaVa0JRuyadlvnVCIx5jtni/VcVI=";
+    hash = "sha256-3ImNLmZ8RhhqRGv/FtdjbHmdOtgQC7hjUsViEQYE8Ao=";
   };
 
   postPatch = ''

From 501e5ba9ceb02d3209c2dc12df3df26ff00884a2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 17 Sep 2024 09:11:36 +0200
Subject: [PATCH 155/229] python312Packages.mmcv: clean derivation

---
 .../python-modules/mmcv/default.nix           | 141 ++++++++++--------
 1 file changed, 75 insertions(+), 66 deletions(-)

diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix
index ba3a72976f582..c86ea25b50c04 100644
--- a/pkgs/development/python-modules/mmcv/default.nix
+++ b/pkgs/development/python-modules/mmcv/default.nix
@@ -2,82 +2,56 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
-  pythonOlder,
-  torch,
-  torchvision,
-  opencv4,
-  yapf,
-  packaging,
-  pillow,
-  addict,
+
+  # nativeBuildInputs
   ninja,
   which,
+
+  # buildInputs
   pybind11,
+  torch,
+
+  # dependencies
+  addict,
+  mmengine,
+  numpy,
+  packaging,
+  pillow,
+  pyyaml,
+  yapf,
+
+  # tests
+  lmdb,
   onnx,
   onnxruntime,
-  scipy,
+  pytestCheckHook,
   pyturbojpeg,
+  scipy,
   tifffile,
-  lmdb,
-  mmengine,
+  torchvision,
 }:
 
 let
   inherit (torch) cudaCapabilities cudaPackages cudaSupport;
   inherit (cudaPackages) backendStdenv;
-
 in
 buildPythonPackage rec {
   pname = "mmcv";
   version = "2.2.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "open-mmlab";
     repo = "mmcv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NNF9sLJWV1q6uBE73LUW4UWwYm4TBMTBJjJkFArBmsc=";
   };
 
-  env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc);
-
-  preConfigure =
-    ''
-      export MMCV_WITH_OPS=1
-    ''
-    + lib.optionalString cudaSupport ''
-      export CC=${backendStdenv.cc}/bin/cc
-      export CXX=${backendStdenv.cc}/bin/c++
-      export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
-      export FORCE_CUDA=1
-    '';
-
   postPatch = ''
-    substituteInPlace setup.py --replace-fail "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES"
-  '';
-
-  preCheck = ''
-    # remove the conflicting source directory
-    rm -rf mmcv
+    substituteInPlace setup.py \
+      --replace-fail "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES"
   '';
 
-  # test_cnn test_ops really requires gpus to be useful.
-  # some of the tests take exceedingly long time.
-  # the rest of the tests are disabled due to sandbox env.
-  disabledTests = [
-    "test_cnn"
-    "test_ops"
-    "test_fileclient"
-    "test_load_model_zoo"
-    "test_processing"
-    "test_checkpoint"
-    "test_hub"
-    "test_reader"
-  ];
-
   nativeBuildInputs = [
     ninja
     which
@@ -99,34 +73,69 @@ buildPythonPackage rec {
       ]
     );
 
+  dependencies = [
+    addict
+    mmengine
+    numpy
+    packaging
+    pillow
+    pyyaml
+    yapf
+
+    # opencv4
+    # torch
+  ];
+
+  env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc);
+
+  preConfigure =
+    ''
+      export MMCV_WITH_OPS=1
+    ''
+    + lib.optionalString cudaSupport ''
+      export CC=${lib.getExe' backendStdenv.cc "cc"}
+      export CXX=${lib.getExe' backendStdenv.cc "c++"}
+      export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
+      export FORCE_CUDA=1
+    '';
+
+  pythonImportsCheck = [ "mmcv" ];
+
   nativeCheckInputs = [
-    pytestCheckHook
-    torchvision
     lmdb
     onnx
     onnxruntime
-    scipy
+    pytestCheckHook
     pyturbojpeg
+    scipy
     tifffile
+    torchvision
   ];
 
-  propagatedBuildInputs = [
-    mmengine
-    torch
-    opencv4
-    yapf
-    packaging
-    pillow
-    addict
-  ];
+  # remove the conflicting source directory
+  preCheck = ''
+    rm -rf mmcv
+  '';
 
-  pythonImportsCheck = [ "mmcv" ];
+  # test_cnn test_ops really requires gpus to be useful.
+  # some of the tests take exceedingly long time.
+  # the rest of the tests are disabled due to sandbox env.
+  disabledTests = [
+    "test_cnn"
+    "test_ops"
+    "test_fileclient"
+    "test_load_model_zoo"
+    "test_processing"
+    "test_checkpoint"
+    "test_hub"
+    "test_reader"
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "Foundational Library for Computer Vision Research";
     homepage = "https://github.com/open-mmlab/mmcv";
     changelog = "https://github.com/open-mmlab/mmcv/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ rxiao ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ rxiao ];
   };
 }

From 5651648b38a4b112049e0cbf8d2deaddc0140982 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 11:56:20 +0000
Subject: [PATCH 156/229] sgt-puzzles: 20241223.5eea14c -> 20241230.79be403

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

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index ae07af273f13b..257bad506f5d8 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sgt-puzzles";
-  version = "20241223.5eea14c";
+  version = "20241230.79be403";
 
   src = fetchurl {
     url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-    hash = "sha256-c9cPPxjU7O+uAp6jzCkfv8ZJeVrcLmEfD+lUK0l+X9w=";
+    hash = "sha256-gWt328Ic0+ctcptnhnTprAEmMpcpfAAyTEqRuKF0gVY=";
   };
 
   sgt-puzzles-menu = fetchurl {

From 8c30dd41a7f580b2eac5fecfc872daed3c233dd3 Mon Sep 17 00:00:00 2001
From: Jonas Fierlings <fnoegip@gmail.com>
Date: Wed, 1 Jan 2025 23:00:38 +0100
Subject: [PATCH 157/229] python312Packages.blockdiag: fix missing runtime
 dependency

The `blockdiag.imagedraw` module has a runtime dependency on
[`pkg_resources`], which is part of the `setuptools` package.

[`pkg_resources`]: https://github.com/blockdiag/blockdiag/blob/3.0.0/src/blockdiag/imagedraw/__init__.py#L16
---
 pkgs/development/python-modules/blockdiag/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix
index 5859e00c6cd80..149d30c1dda6b 100644
--- a/pkgs/development/python-modules/blockdiag/default.nix
+++ b/pkgs/development/python-modules/blockdiag/default.nix
@@ -58,6 +58,7 @@ buildPythonPackage rec {
     funcparserlib
     pillow
     reportlab
+    setuptools
     webcolors
   ];
 

From 6e95ad3b2b49d5da92feb3c310286a650c349dd6 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 2 Jan 2025 02:26:58 -0800
Subject: [PATCH 158/229] lcalc: workaround for vendored <complex>

https://gitlab.com/sagemath/lcalc/-/issues/16

add -D_GLIBCXX_COMPLEX -D_LIBCPP_COMPLEX -D_LIBCPP___FWD_COMPLEX_H to
prevent including system <complex> and use the vendored copy.
---
 pkgs/by-name/lc/lcalc/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix
index f81ea501270fc..22f326219a475 100644
--- a/pkgs/by-name/lc/lcalc/package.nix
+++ b/pkgs/by-name/lc/lcalc/package.nix
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc=";
   };
 
+  # workaround for vendored GCC 3.5 <complex>
+  # https://gitlab.com/sagemath/lcalc/-/issues/16
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-D_GLIBCXX_COMPLEX"
+    "-D_LIBCPP_COMPLEX"
+    "-D_LIBCPP___FWD_COMPLEX_H"
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     gengetopt

From d1c6a9c6af4ae4aa299846a7070a5d25f044434a Mon Sep 17 00:00:00 2001
From: pcboy <david.hagege@gmail.com>
Date: Thu, 2 Jan 2025 21:22:40 +0900
Subject: [PATCH 159/229] ruby-packages.prism: 0.24.0 -> 1.3.0 (#369508)

---
 pkgs/top-level/ruby-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 8e8904bd9a20f..13ad49b50b2e0 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -2753,10 +2753,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pgxgng905jbhp0pr54w4w2pr4nqcq80ijj48204bj4x4nigj8ji";
+      sha256 = "sRYggpgxsct+bJtGyB/4puNsyz+IjxZEhetzUfOGJzo=";
       type = "gem";
     };
-    version = "0.24.0";
+    version = "1.3.0";
   };
   pry = {
     dependencies = ["coderay" "method_source"];

From ee99d1de6df33a1661673ff4e1b91b1f8bd33f0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 12:28:27 +0000
Subject: [PATCH 160/229] satty: 0.15.0 -> 0.16.0

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

diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix
index fb3b1295d6bed..73aad9079f755 100644
--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@@ -17,16 +17,16 @@
 rustPlatform.buildRustPackage rec {
 
   pname = "satty";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "gabm";
     repo = "Satty";
     rev = "v${version}";
-    hash = "sha256-SfZgvCtociQ0JbUTDVlXZPLHbyG0oxSSUqNXBHMDYNU=";
+    hash = "sha256-81WX9GAZ0mPai1/4FrqDGDu6k4OVYrKSJSC/FkPkZmE=";
   };
 
-  cargoHash = "sha256-OP19bIwRCqZdQUAvc6pTf0oTL7Jy+OUuVdnddrbxrys=";
+  cargoHash = "sha256-ZMtOo7AgEza1OptBXAUZ590xf6znN6ZNrC9bhk4nR94=";
 
   nativeBuildInputs = [
     copyDesktopItems

From 01ff4040a971787e1c2395418cc8e00137f7e717 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 13:28:42 +0100
Subject: [PATCH 161/229] ruff: 0.8.4 -> 0.8.5

Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.8.4...0.8.5

Changelog: https://github.com/astral-sh/ruff/releases/tag/0.8.5
---
 pkgs/by-name/ru/ruff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 662b7409ec8ec..fd0f0aab7057a 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ruff";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = version;
-    hash = "sha256-c5d2XaoEjCHWMdjTLD6CnwP8rpSXTUrmKSs0QWQ6UG0=";
+    hash = "sha256-Y6J7hW+VYePhKH+5YXfuGuVB0WjYjUg8mM3kQBUnv/U=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-jbUjsIJRpkKYc+qHN8tkcZrcjPTFJfdCsatezzdX4Ss=";
+  cargoHash = "sha256-nEpVAdo/awRxwBvYd8EpTzXdWho3+yuItCp8km+s2uM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 41ea9f469098acee3c247bf3860610ee74adefa7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 11:40:37 +0100
Subject: [PATCH 162/229] python312Packages.pyedflib: init at 0.1.38

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

diff --git a/pkgs/development/python-modules/pyedflib/default.nix b/pkgs/development/python-modules/pyedflib/default.nix
new file mode 100644
index 0000000000000..a83fe89795b06
--- /dev/null
+++ b/pkgs/development/python-modules/pyedflib/default.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  numpy,
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pyedflib";
+  version = "0.1.38";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "holgern";
+    repo = "pyedflib";
+    tag = "v${version}";
+    hash = "sha256-sj2O5ISAy12u4GdtucLaRfOeSA6o6FJpZWTyiLq5B3U=";
+  };
+
+  build-system = [
+    cython
+    numpy
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "pyedflib"
+  ];
+
+  # Otherwise, the module is imported from source and lacks the compiled artifacts
+  # By moving to the pyedflib directory, python imports the installed package instead of the module
+  # from the local files
+  preCheck = ''
+    cd pyedflib
+  '';
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Python library to read/write EDF+/BDF+ files based on EDFlib";
+    homepage = "https://github.com/holgern/pyedflib";
+    changelog = "https://github.com/holgern/pyedflib/releases/tag/v${version}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7db18e654520..b5a48837f2345 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11619,6 +11619,8 @@ self: super: with self; {
 
   pyecowitt = callPackage ../development/python-modules/pyecowitt { };
 
+  pyedflib = callPackage ../development/python-modules/pyedflib { };
+
   pyedimax = callPackage ../development/python-modules/pyedimax { };
 
   pyee = callPackage ../development/python-modules/pyee { };

From 6a22aaca7219ede672ab5361b30a3b472223d5fd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 14 Sep 2024 21:06:55 +0200
Subject: [PATCH 163/229] python312Packages.pyseries: init at 1.0.26

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

diff --git a/pkgs/development/python-modules/pyseries/default.nix b/pkgs/development/python-modules/pyseries/default.nix
new file mode 100644
index 0000000000000..76003eb105af5
--- /dev/null
+++ b/pkgs/development/python-modules/pyseries/default.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  deepdish,
+  matplotlib,
+  numpy,
+  obspy,
+  pandas,
+  pyedflib,
+  scikit-learn,
+  scipy,
+  seaborn,
+  tabulate,
+}:
+
+buildPythonPackage rec {
+  pname = "pyseries";
+  version = "1.0.26";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Cq+DXt0/6Ncae8OO+kaPuTCxouh0cFPHP+T8tGVXxXo=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonRemoveDeps = [
+    # sklearn is the old name of the scikit-learn package
+    "sklearn"
+  ];
+
+  dependencies = [
+    deepdish
+    matplotlib
+    numpy
+    obspy
+    pandas
+    pyedflib
+    scikit-learn
+    scipy
+    seaborn
+    tabulate
+  ];
+
+  pythonImportsCheck = [ "pyseries" ];
+
+  # no tests in the pypi archive
+  doCheck = false;
+
+  meta = {
+    description = "Package for statistical analysis of time-series data";
+    homepage = "https://pypi.org/project/pyseries/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5a48837f2345..151fcf870f82c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10649,6 +10649,8 @@ self: super: with self; {
 
   pysequoia = callPackage ../development/python-modules/pysequoia { };
 
+  pyseries = callPackage ../development/python-modules/pyseries { };
+
   pyschemes = callPackage ../development/python-modules/pyschemes { };
 
   pyschlage = callPackage ../development/python-modules/pyschlage { };

From dcbd560920fad8463ccadfdb656dc28f69ba12d3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 13:47:54 +0100
Subject: [PATCH 164/229] prism: minor refactoring

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

diff --git a/pkgs/by-name/pr/prism/package.nix b/pkgs/by-name/pr/prism/package.nix
index 86227fdb840ed..2d4b513466b9c 100644
--- a/pkgs/by-name/pr/prism/package.nix
+++ b/pkgs/by-name/pr/prism/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 buildGoModule rec {
@@ -10,18 +11,21 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "muesli";
-    repo = pname;
-    rev = "v${version}";
+    repo = "prism";
+    tag = "v${version}";
     hash = "sha256-IRR7Gu+wGUUYyFfhc003QVlEaWCJPmi6XYVUN6Q6+GA=";
   };
 
   vendorHash = "sha256-uKtVifw4dxJdVvHxytL+9qjXHEdTyiz8U8n/95MObdY=";
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "RTMP stream recaster/splitter";
     homepage = "https://github.com/muesli/prism";
-    license = licenses.mit;
-    maintainers = with maintainers; [ paperdigits ];
+    changelog = "https://github.com/muesli/prism/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ paperdigits ];
     mainProgram = "prism";
   };
 }

From e18aa0b180a55d09032382d4e76ba3b582cd7e59 Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Thu, 2 Jan 2025 20:47:44 +0800
Subject: [PATCH 165/229] nerd-fonts: change pname, version and license schema

Fix issue #370117.
---
 pkgs/data/fonts/nerd-fonts/default.nix        | 22 +++++++++++--------
 .../fonts/nerd-fonts/manifests/release.json   |  3 +--
 pkgs/data/fonts/nerd-fonts/update.py          |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/fonts/nerd-fonts/default.nix b/pkgs/data/fonts/nerd-fonts/default.nix
index e7b2d449a554c..6d10cb0719465 100644
--- a/pkgs/data/fonts/nerd-fonts/default.nix
+++ b/pkgs/data/fonts/nerd-fonts/default.nix
@@ -17,11 +17,7 @@ let
     if builtins.match "[[:digit:]].*" lowerName != null then "_" + lowerName else lowerName;
 
   convertVersion =
-    version: date:
-    if builtins.match "[[:digit:]].*" version != null then
-      version
-    else
-      "0-unstable-" + builtins.head (lib.strings.splitString "T" date);
+    version: if builtins.match "[[:digit:]].*" version != null then "+" + version else "";
 
   convertLicense = import ./convert-license.nix lib;
 
@@ -36,8 +32,8 @@ let
       ...
     }:
     stdenvNoCC.mkDerivation {
-      pname = lib.strings.toLower caskName;
-      version = convertVersion version releaseInfo.published_at;
+      pname = "nerd-fonts-" + lib.strings.toLower caskName;
+      version = (lib.removePrefix "v" releaseInfo.tag_name) + convertVersion version;
 
       src =
         let
@@ -74,7 +70,15 @@ let
 
       meta = {
         description = "Nerd Fonts: " + description;
-        license = convertLicense licenseId;
+        license = lib.unique (
+          (with lib.licenses; [
+            # > Nerd Fonts source fonts, patched fonts, and folders with explict OFL SIL files
+            ofl
+            # > Nerd Fonts original source code files (such as `.sh`, `.py`, `font-patcher` and others)
+            mit
+          ])
+          ++ lib.toList (convertLicense licenseId)
+        );
         homepage = "https://nerdfonts.com/";
         changelog = "https://github.com/ryanoasis/nerd-fonts/blob/${releaseInfo.tag_name}/changelog.md";
         platforms = lib.platforms.all;
@@ -86,7 +90,7 @@ let
     };
 
   nerdFonts = lib.trivial.pipe fontsInfo [
-    (map (font: lib.attrsets.nameValuePair (convertAttrName font.caskName) (makeNerdFont font)))
+    (map (font: lib.nameValuePair (convertAttrName font.caskName) (makeNerdFont font)))
     builtins.listToAttrs
   ];
 in
diff --git a/pkgs/data/fonts/nerd-fonts/manifests/release.json b/pkgs/data/fonts/nerd-fonts/manifests/release.json
index 428f1edccec2e..0073a9ea0d40a 100644
--- a/pkgs/data/fonts/nerd-fonts/manifests/release.json
+++ b/pkgs/data/fonts/nerd-fonts/manifests/release.json
@@ -1,4 +1,3 @@
 {
-  "tag_name": "v3.3.0",
-  "published_at": "2024-11-18T12:43:12Z"
+  "tag_name": "v3.3.0"
 }
diff --git a/pkgs/data/fonts/nerd-fonts/update.py b/pkgs/data/fonts/nerd-fonts/update.py
index 026e293c05695..e070d1ceebe03 100755
--- a/pkgs/data/fonts/nerd-fonts/update.py
+++ b/pkgs/data/fonts/nerd-fonts/update.py
@@ -40,7 +40,7 @@ def slicedict(d, ks):
 
 release_info = slicedict(
     fetchjson(RELEASE_INFO_URL),
-    ["tag_name", "published_at"]
+    ["tag_name"]
 )
 
 tag_name = release_info["tag_name"]

From 06d52b09a2e425de9be8dae109d66524b559d34d Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Thu, 2 Jan 2025 20:49:53 +0800
Subject: [PATCH 166/229] nerd-fonts: fix attr name and version handling

---
 pkgs/data/fonts/nerd-fonts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/nerd-fonts/default.nix b/pkgs/data/fonts/nerd-fonts/default.nix
index 6d10cb0719465..6fa4633a0b453 100644
--- a/pkgs/data/fonts/nerd-fonts/default.nix
+++ b/pkgs/data/fonts/nerd-fonts/default.nix
@@ -14,10 +14,10 @@ let
     let
       lowerName = lib.strings.toLower name;
     in
-    if builtins.match "[[:digit:]].*" lowerName != null then "_" + lowerName else lowerName;
+    if builtins.match "^[[:digit:]].*" lowerName != null then "_" + lowerName else lowerName;
 
   convertVersion =
-    version: if builtins.match "[[:digit:]].*" version != null then "+" + version else "";
+    version: if builtins.match "^[[:digit:]].*" version != null then "+" + version else "";
 
   convertLicense = import ./convert-license.nix lib;
 

From d37ad3d28fae19036467ae3ded7792478f8b2c1f Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Thu, 2 Jan 2025 21:11:06 +0800
Subject: [PATCH 167/229] nerd-fonts: add releaseVersion to passthru

---
 pkgs/data/fonts/nerd-fonts/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/nerd-fonts/default.nix b/pkgs/data/fonts/nerd-fonts/default.nix
index 6fa4633a0b453..27595a1fb4f6f 100644
--- a/pkgs/data/fonts/nerd-fonts/default.nix
+++ b/pkgs/data/fonts/nerd-fonts/default.nix
@@ -9,6 +9,8 @@ let
   fontsInfo = lib.trivial.importJSON ./manifests/fonts.json;
   checksums = lib.trivial.importJSON ./manifests/checksums.json;
 
+  releaseVersion = lib.removePrefix "v" releaseInfo.tag_name;
+
   convertAttrName =
     name:
     let
@@ -33,7 +35,7 @@ let
     }:
     stdenvNoCC.mkDerivation {
       pname = "nerd-fonts-" + lib.strings.toLower caskName;
-      version = (lib.removePrefix "v" releaseInfo.tag_name) + convertVersion version;
+      version = releaseVersion + convertVersion version;
 
       src =
         let
@@ -63,9 +65,12 @@ let
           runHook postInstall
         '';
 
-      passthru.updateScript = {
-        command = ./update.py;
-        supportedFeatures = [ "commit" ];
+      passthru = {
+        inherit releaseVersion;
+        updateScript = {
+          command = ./update.py;
+          supportedFeatures = [ "commit" ];
+        };
       };
 
       meta = {

From 403f488b80fd97cf60e8e5924fdcedb82f09a082 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Thu, 2 Jan 2025 16:11:32 +0300
Subject: [PATCH 168/229] numbat: 1.14.0 -> 1.15.0

---
 pkgs/by-name/nu/numbat/package.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index bb0424d357e37..cd9248f394937 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -1,30 +1,24 @@
 {
   lib,
-  stdenv,
   testers,
   fetchFromGitHub,
   rustPlatform,
-  darwin,
   numbat,
   tzdata,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "numbat";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "numbat";
-    rev = "v${version}";
-    hash = "sha256-TmzM541S2W5Cy8zHEWKRE2Zj2bSgrM4vbsWw3zbi3LQ=";
+    tag = "v${version}";
+    hash = "sha256-5XsrOAvBrmCG6k7YRwGZZtBP/o1jVVtBBTrwIT5CDX8=";
   };
 
-  cargoHash = "sha256-exvJJsGIj6KhmMcwhPjXMELvisuUtl17BAO6XEJSJmI=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
+  cargoHash = "sha256-RMON7JThY6Ad1QHQFiNbTb2PUsfviR2t+55k1ZtlOd8=";
 
   env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules";
 

From d19c3249afd168fdc5d5787c615447b0bed590f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 13:13:06 +0000
Subject: [PATCH 169/229] go-callvis: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/by-name/go/go-callvis/package.nix b/pkgs/by-name/go/go-callvis/package.nix
index 47834b5e8d68f..4a06f4d363a80 100644
--- a/pkgs/by-name/go/go-callvis/package.nix
+++ b/pkgs/by-name/go/go-callvis/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-callvis";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "ofabry";
     repo = "go-callvis";
     rev = "v${version}";
-    hash = "sha256-PIzmnqlK+uFtzZW4H0xpP5c+X30hFvOjQydvreJn4xM=";
+    hash = "sha256-gCQjxJH03QAg6MZx5NJUJR6tKP02ThIa5BGN6A/0ejM=";
   };
 
-  vendorHash = "sha256-AfbUxA5C5dH70+vqC+1RGaTt7S0FL9CBcxel0ifmHKs=";
+  vendorHash = "sha256-IS8lkDBy7Y/qAaDxmWRfrVQEF9OFo7VofqSNgNTEQQw=";
 
   ldflags = [
     "-s"

From 6d17306e6761abb7175f7a090559a0453787a53e Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Thu, 2 Jan 2025 16:12:55 +0300
Subject: [PATCH 170/229] numbat: use version check hook, nix update script

---
 pkgs/by-name/nu/numbat/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index cd9248f394937..2b3c0ddea1899 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  testers,
   fetchFromGitHub,
   rustPlatform,
-  numbat,
   tzdata,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -34,11 +34,12 @@ rustPlatform.buildRustPackage rec {
     export TZDIR=${tzdata}/share/zoneinfo
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = numbat;
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = [ "--version" ];
 
   meta = with lib; {
+  passthru.updateScript = nix-update-script { };
     description = "High precision scientific calculator with full support for physical units";
     longDescription = ''
       A statically typed programming language for scientific computations

From 1514589aa6f001b1214afee2df9283fc06cdcd91 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Thu, 2 Jan 2025 16:14:39 +0300
Subject: [PATCH 171/229] numbat: refactor meta

---
 pkgs/by-name/nu/numbat/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index 2b3c0ddea1899..da0e75d1a3a61 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -38,8 +38,9 @@ rustPlatform.buildRustPackage rec {
   doInstallCheck = true;
   versionCheckProgramArg = [ "--version" ];
 
-  meta = with lib; {
   passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "High precision scientific calculator with full support for physical units";
     longDescription = ''
       A statically typed programming language for scientific computations
@@ -47,14 +48,14 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://numbat.dev";
     changelog = "https://github.com/sharkdp/numbat/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    mainProgram = "numbat";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       giomf
       atemu
     ];
+    mainProgram = "numbat";
   };
 }

From eadbe6c73c7e18e4f52ad3f50b0939371045bd22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 13:26:02 +0000
Subject: [PATCH 172/229] iay: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/tools/misc/iay/default.nix b/pkgs/tools/misc/iay/default.nix
index 22b1846858300..01f1205f9dc2b 100644
--- a/pkgs/tools/misc/iay/default.nix
+++ b/pkgs/tools/misc/iay/default.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "iay";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "aaqaishtyaq";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-vk+1RbAmzRf2bbvbSpO+upVW4VrtYWM+5iiH73N+dsc=";
+    sha256 = "sha256-oNUK2ROcocKoIlAuNZcJczDYtSchzpB1qaYbSYsjN50=";
   };
 
-  cargoHash = "sha256-+PpmxVPyRx/xF7jQGy/07xqALmdNp2uL3HZVOeRicqY=";
+  cargoHash = "sha256-bcMi8967dsJ3fL28XiUXfHz6CPB/RKSKsRvwMJtxEUA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 87ba234f1bcb9fb80e87754dac9828196103aeba Mon Sep 17 00:00:00 2001
From: Jack Wilsdon <jack@wilsdon.me>
Date: Thu, 2 Jan 2025 13:26:24 +0000
Subject: [PATCH 173/229] beets: fix building in 2025

---
 pkgs/tools/audio/beets/default.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 9bd644c3d1155..74abd34e13b74 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -3,6 +3,7 @@
   callPackage,
   fetchFromGitHub,
   python3Packages,
+  fetchpatch,
 }:
 /*
   ** To customize the enabled beets plugins, use the pluginOverrides input to the
@@ -17,11 +18,22 @@
   **   alternatives = { enable = true; propagatedBuildInputs = [ beetsPackages.alternatives ]; };
   ** }; }
 */
+let
+  extraPatches = [
+    # Bash completion fix for Nix
+    ./patches/bash-completion-always-print.patch
+    # Remove after next release.
+    (fetchpatch {
+      url = "https://github.com/beetbox/beets/commit/bcc79a5b09225050ce7c88f63dfa56f49f8782a8.patch?full_index=1";
+      hash = "sha256-Y2Q5Co3UlDGKuzfxUvdUY3rSMNpsBoDW03ZWZOfzp3Y=";
+    })
+  ];
+in
 lib.makeExtensible (self: {
   beets = self.beets-stable;
 
   beets-stable = callPackage ./common.nix rec {
-    inherit python3Packages;
+    inherit python3Packages extraPatches;
     version = "2.2.0";
     src = fetchFromGitHub {
       owner = "beetbox";
@@ -29,16 +41,12 @@ lib.makeExtensible (self: {
       rev = "v${version}";
       hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
     };
-    extraPatches = [
-      # Bash completion fix for Nix
-      ./patches/bash-completion-always-print.patch
-    ];
   };
 
   beets-minimal = self.beets.override { disableAllPlugins = true; };
 
   beets-unstable = callPackage ./common.nix {
-    inherit python3Packages;
+    inherit python3Packages extraPatches;
     version = "2.2.0-unstable-2024-12-02";
     src = fetchFromGitHub {
       owner = "beetbox";
@@ -46,10 +54,6 @@ lib.makeExtensible (self: {
       rev = "f92c0ec8b14fbd59e58374fd123563123aef197b";
       hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
     };
-    extraPatches = [
-      # Bash completion fix for Nix
-      ./patches/bash-completion-always-print.patch
-    ];
   };
 
   alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };

From 4fd0ac47d1905f930fda61f194e7b362d6429d6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 13:42:16 +0000
Subject: [PATCH 174/229] mill: 0.12.4 -> 0.12.5

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

diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix
index 241f3b4169f1f..7db92e52beeb7 100644
--- a/pkgs/by-name/mi/mill/package.nix
+++ b/pkgs/by-name/mi/mill/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mill";
-  version = "0.12.4";
+  version = "0.12.5";
 
   src = fetchurl {
     url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly";
-    hash = "sha256-WlykyNyXUitR6FHbhZXOeJKtMCrvoJK1gruh+G/hkb8=";
+    hash = "sha256-DHslQS/uzwbZVdATQY3pqQgM51W+26x2AckQnDPVoFc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b754b036e3f77973bbc2a482c7085692194c2962 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:19:17 +0200
Subject: [PATCH 175/229] titaniumenv: remove

---
 doc/languages-frameworks/index.md             |   1 -
 doc/languages-frameworks/titanium.section.md  | 110 -----------
 doc/redirects.json                            |   9 -
 .../mobile/titaniumenv/build-app.nix          | 186 ------------------
 .../mobile/titaniumenv/default.nix            |  20 --
 .../mobile/titaniumenv/titaniumsdk-8.2.nix    | 113 -----------
 .../mobile/titaniumenv/titaniumsdk-8.3.nix    | 102 ----------
 pkgs/top-level/all-packages.nix               |   2 -
 8 files changed, 543 deletions(-)
 delete mode 100644 doc/languages-frameworks/titanium.section.md
 delete mode 100644 pkgs/development/mobile/titaniumenv/build-app.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/default.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix

diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md
index a8a13ce5b9e29..fe5f0e65a52e3 100644
--- a/doc/languages-frameworks/index.md
+++ b/doc/languages-frameworks/index.md
@@ -95,6 +95,5 @@ scheme.section.md
 swift.section.md
 tcl.section.md
 texlive.section.md
-titanium.section.md
 vim.section.md
 ```
diff --git a/doc/languages-frameworks/titanium.section.md b/doc/languages-frameworks/titanium.section.md
deleted file mode 100644
index 306ad86627673..0000000000000
--- a/doc/languages-frameworks/titanium.section.md
+++ /dev/null
@@ -1,110 +0,0 @@
-# Titanium {#titanium}
-
-The Nixpkgs repository contains facilities to deploy a variety of versions of
-the [Titanium SDK](https://www.appcelerator.com) versions, a cross-platform
-mobile app development framework using JavaScript as an implementation language,
-and includes a function abstraction making it possible to build Titanium
-applications for Android and iOS devices from source code.
-
-Not all Titanium features supported -- currently, it can only be used to build
-Android and iOS apps.
-
-## Building a Titanium app {#building-a-titanium-app}
-
-We can build a Titanium app from source for Android or iOS and for debugging or
-release purposes by invoking the `titaniumenv.buildApp {}` function:
-
-```nix
-titaniumenv.buildApp {
-  name = "myapp";
-  src = ./myappsource;
-
-  preBuild = "";
-  target = "android"; # or 'iphone'
-  tiVersion = "7.1.0.GA";
-  release = true;
-
-  androidsdkArgs = {
-    platformVersions = [ "25" "26" ];
-  };
-  androidKeyStore = ./keystore;
-  androidKeyAlias = "myfirstapp";
-  androidKeyStorePassword = "secret";
-
-  xcodeBaseDir = "/Applications/Xcode.app";
-  xcodewrapperArgs = {
-    version = "9.3";
-  };
-  iosMobileProvisioningProfile = ./myprovisioning.profile;
-  iosCertificateName = "My Company";
-  iosCertificate = ./mycertificate.p12;
-  iosCertificatePassword = "secret";
-  iosVersion = "11.3";
-  iosBuildStore = false;
-
-  enableWirelessDistribution = true;
-  installURL = "/installipa.php";
-}
-```
-
-The `titaniumenv.buildApp {}` function takes the following parameters:
-
-* The `name` parameter refers to the name in the Nix store.
-* The `src` parameter refers to the source code location of the app that needs
-  to be built.
-* `preRebuild` contains optional build instructions that are carried out before
-  the build starts.
-* `target` indicates for which device the app must be built. Currently only
-  'android' and 'iphone' (for iOS) are supported.
-* `tiVersion` can be used to optionally override the requested Titanium version
-  in `tiapp.xml`. If not specified, it will use the version in `tiapp.xml`.
-* `release` should be set to true when building an app for submission to the
-  Google Playstore or Apple Appstore. Otherwise, it should be false.
-
-When the `target` has been set to `android`, we can configure the following
-parameters:
-
-* The `androidSdkArgs` parameter refers to an attribute set that propagates all
-  parameters to the `androidenv.composeAndroidPackages {}` function. This can
-  be used to install all relevant Android plugins that may be needed to perform
-  the Android build. If no parameters are given, it will deploy the platform
-  SDKs for API-levels 25 and 26 by default.
-
-When the `release` parameter has been set to true, you need to provide
-parameters to sign the app:
-
-* `androidKeyStore` is the path to the keystore file
-* `androidKeyAlias` is the key alias
-* `androidKeyStorePassword` refers to the password to open the keystore file.
-
-When the `target` has been set to `iphone`, we can configure the following
-parameters:
-
-* The `xcodeBaseDir` parameter refers to the location where Xcode has been
-  installed. When none value is given, the above value is the default.
-* The `xcodewrapperArgs` parameter passes arbitrary parameters to the
-  `xcodeenv.composeXcodeWrapper {}` function. This can, for example, be used
-  to adjust the default version of Xcode.
-
-When `release` has been set to true, you also need to provide the following
-parameters:
-
-* `iosMobileProvisioningProfile` refers to a mobile provisioning profile needed
-  for signing.
-* `iosCertificateName` refers to the company name in the P12 certificate.
-* `iosCertificate` refers to the path to the P12 file.
-* `iosCertificatePassword` contains the password to open the P12 file.
-* `iosVersion` refers to the iOS SDK version to use. It defaults to the latest
-  version.
-* `iosBuildStore` should be set to `true` when building for the Apple Appstore
-  submission. For enterprise or ad-hoc builds it should be set to `false`.
-
-When `enableWirelessDistribution` has been enabled, you must also provide the
-path of the PHP script (`installURL`) (that is included with the iOS build
-environment) to enable wireless ad-hoc installations.
-
-## Emulating or simulating the app {#emulating-or-simulating-the-app}
-
-It is also possible to simulate the correspond iOS simulator build by using
-`xcodeenv.simulateApp {}` and emulate an Android APK by using
-`androidenv.emulateApp {}`.
diff --git a/doc/redirects.json b/doc/redirects.json
index e86ad9f7e9d7e..4b05cb27d1c64 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -3736,15 +3736,6 @@
   "sec-language-texlive-lualatex-font-cache": [
     "index.html#sec-language-texlive-lualatex-font-cache"
   ],
-  "titanium": [
-    "index.html#titanium"
-  ],
-  "building-a-titanium-app": [
-    "index.html#building-a-titanium-app"
-  ],
-  "emulating-or-simulating-the-app": [
-    "index.html#emulating-or-simulating-the-app"
-  ],
   "vim": [
     "index.html#vim"
   ],
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
deleted file mode 100644
index ef36dced9a314..0000000000000
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ /dev/null
@@ -1,186 +0,0 @@
-{stdenv, lib, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
-{ name, src, preBuild ? "", target, tiVersion ? null
-, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
-, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false
-, enableWirelessDistribution ? false, installURL ? null
-, xcodeBaseDir ? "/Applications/Xcode.app"
-, androidsdkArgs ? {}
-, xcodewrapperArgs ? {}
-, ...
-}@args:
-
-assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
-assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null;
-assert enableWirelessDistribution -> installURL != null;
-
-let
-  realAndroidsdkArgs = {
-    platformVersions = [ "28" ];
-  } // androidsdkArgs;
-
-  androidsdk = (composeAndroidPackages realAndroidsdkArgs).androidsdk;
-
-  xcodewrapper = composeXcodeWrapper xcodewrapperArgs;
-
-  deleteKeychain = ''
-    if [ -f $HOME/lock-keychain ]
-    then
-        security default-keychain -s login.keychain
-        security delete-keychain $keychainName
-        rm -f $HOME/lock-keychain
-    fi
-  '';
-
-  extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ];
-in
-stdenv.mkDerivation ({
-  name = lib.replaceStrings [" "] [""] name;
-
-  buildInputs = [ nodejs titanium alloy python which file jdk ];
-
-  buildPhase = ''
-    ${preBuild}
-
-    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error.
-      alloy=$(dirname $(type -p alloy))/..
-      cp -rv $alloy/* alloy
-      chmod -R u+w alloy
-      export PATH=$(pwd)/alloy/bin:$PATH
-    ''}
-
-    export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"}
-
-    ${lib.optionalString (tiVersion != null) ''
-      # Replace titanium version by the provided one
-      sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml
-    ''}
-
-    # Simulate a login
-    mkdir -p $HOME/.titanium
-    cat > $HOME/.titanium/auth_session.json <<EOF
-    { "loggedIn": true }
-    EOF
-
-    # Configure the paths to the Titanium SDK and modules
-    echo "{}" > $TMPDIR/config.json
-    titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk}
-    titanium --config-file $TMPDIR/config.json --no-colors config paths.modules ${titaniumsdk}
-
-    mkdir -p $out
-
-    ${if target == "android" then ''
-      titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdk}/libexec/android-sdk
-
-      export PATH=${androidsdk}/libexec/android-sdk/tools:$(echo ${androidsdk}/libexec/android-sdk/build-tools/android-*):$PATH
-      export GRADLE_USER_HOME=$TMPDIR/gradle
-
-      ${if release then ''
-        ${lib.optionalString stdenv.hostPlatform.isDarwin ''
-          # Signing the app does not work with OpenJDK on macOS, use host SDK instead
-          export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
-        ''}
-        titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias "${androidKeyAlias}" --store-password "${androidKeyStorePassword}" --output-dir $out
-      '' else ''
-        titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out
-      ''}
-    ''
-    else if target == "iphone" then ''
-      # Be sure that the Xcode wrapper has priority over everything else.
-      # When using buildInputs this does not seem to be the case.
-      export PATH=${xcodewrapper}/bin:$PATH
-
-      # Configure the path to Xcode
-      titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir}
-
-      # Link the modules folder
-      if [ ! -e modules ]
-      then
-          ln -s ${titaniumsdk}/modules modules
-          createdModulesSymlink=1
-      fi
-
-      ${if release then ''
-        # Create a keychain with the component hash name (should always be unique)
-        export keychainName=$(basename $out)
-
-        security create-keychain -p "" $keychainName
-        security default-keychain -s $keychainName
-        security unlock-keychain -p "" $keychainName
-        security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
-        security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
-        provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
-
-        # Ensure that the requested provisioning profile can be found
-
-        if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
-        then
-            mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
-            cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
-        fi
-
-        # Take precautions to prevent concurrent builds blocking the keychain
-        while [ -f $HOME/lock-keychain ]
-        do
-            echo "Keychain locked, waiting for a couple of seconds, or remove $HOME/lock-keychain to unblock..."
-            sleep 3
-        done
-
-        touch $HOME/lock-keychain
-
-        security default-keychain -s $keychainName
-
-        # Do the actual build
-        titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target ${if iosBuildStore then "dist-appstore" else "dist-adhoc"} --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out
-
-        # Remove our generated keychain
-        ${deleteKeychain}
-      '' else ''
-        # Copy all sources to the output store directory.
-        # Why? Debug application include *.js files, which are symlinked into their
-        # sources. If they are not copied, we have dangling references to the
-        # temp folder.
-
-        cp -av * $out
-        cd $out
-
-        # Execute the build
-        titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --ios-version ${iosVersion} --output-dir $out
-
-        # Remove the modules symlink
-        if [ "$createdModulesSymlink" = "1" ]
-        then
-            rm $out/modules
-        fi
-      ''}
-    '' else throw "Target: ${target} is not supported!"}
-  '';
-
-  installPhase = ''
-    ${if target == "android" then ''
-      ${lib.optionalString (!release) ''
-        cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out
-      ''}
-
-      mkdir -p $out/nix-support
-      echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products
-    ''
-    else if target == "iphone" then
-      lib.optionalString release ''
-        mkdir -p $out/nix-support
-        echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
-
-        ${lib.optionalString enableWirelessDistribution ''
-          appname="$(basename $out/*.ipa .ipa)"
-          bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
-          version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
-
-          sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&amp;version=$version\&amp;title=$appname|" ${../xcodeenv/install.html.template} > "$out/$appname.html"
-          echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
-        ''}
-      ''
-    else throw "Target: ${target} is not supported!"}
-  '';
-
-  failureHook = lib.optionalString (release && target == "iphone") deleteKeychain;
-} // extraArgs)
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
deleted file mode 100644
index 74865edab54cf..0000000000000
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{pkgs, androidenv, xcodeenv, tiVersion ? "8.3.2.GA"}:
-
-rec {
-  titaniumsdk = let
-    titaniumSdkFile = if tiVersion == "8.2.1.GA" then ./titaniumsdk-8.2.nix
-      else if tiVersion == "8.3.2.GA" then ./titaniumsdk-8.3.nix
-      else throw "Titanium version not supported: "+tiVersion;
-    in
-    import titaniumSdkFile {
-      inherit (pkgs) stdenv lib fetchurl unzip makeWrapper;
-    };
-
-  buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv lib python which file jdk nodejs titanium;
-    alloy = pkgs.titanium-alloy;
-    inherit (androidenv) composeAndroidPackages;
-    inherit (xcodeenv) composeXcodeWrapper;
-    inherit titaniumsdk;
-  };
-}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
deleted file mode 100644
index a0907881d1685..0000000000000
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ stdenv, lib, fetchurl, unzip, makeWrapper }:
-
-let
-  # Gradle is a build system that bootstraps itself. This is what it actually
-  # downloads in the bootstrap phase.
-  gradleAllZip = fetchurl {
-    url = "http://services.gradle.org/distributions/gradle-4.1-all.zip";
-    sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw";
-  };
-
-  # A Titanium-Android build requires proguard plugins. We create a fake
-  # repository so that Gradle does not attempt to download them in the builder.
-  # Since there are only 3 plugins required, this is still (sort of) manageable
-  # without a generator.
-  proguardVersion = "5.3.3";
-
-  proguardGradlePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
-    sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
-  };
-  proguardGradleJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
-    sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
-  };
-  proguardParentPOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
-    sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
-  };
-  proguardBasePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
-    sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
-  };
-  proguardBaseJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
-    sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
-  };
-
-  # Put the downloaded plugins in a fake Maven repository
-  fakeMavenRepo = stdenv.mkDerivation {
-    name = "fake-maven-repo";
-    buildCommand = ''
-      mkdir -p $out
-      cd $out
-      mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion}
-      cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom
-      cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar
-      mkdir -p net/sf/proguard/proguard-parent/${proguardVersion}
-      cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom
-      mkdir -p net/sf/proguard/proguard-base/${proguardVersion}
-      cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom
-      cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar
-    '';
-  };
-in
-stdenv.mkDerivation {
-  pname = "mobilesdk";
-  version = "8.2.1.GA";
-
-  src =
-    if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip";
-        sha256 = "1nvcmm6cby6bmwdiacq46n5y4zjpz9qlipakvglw27j3p4rbmkwl";
-      }
-    else if stdenv.system == "x86_64-darwin" then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip";
-        sha256 = "1nxwmyw3vqc5wghj38kpksisy0i808x0x3pa8w3p290w709g311l";
-      }
-    else throw "Platform: ${stdenv.system} not supported!";
-
-  nativeBuildInputs = [ makeWrapper unzip ];
-
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    (yes y | unzip $src) || true
-
-    # Rename ugly version number
-    cd mobilesdk/*
-    mv * 8.2.1.GA
-    cd *
-
-    # Patch bundled gradle build infrastructure to make shebangs work
-    patchShebangs android/templates/gradle
-
-    # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app
-    sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-    cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip
-    echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-
-    # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
-    sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
-
-    ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
-      # Patch the strip frameworks script in the iPhone build template to not let
-      # it skip the strip phase. This is caused by an assumption on the file
-      # permissions in which Nix deviates from the standard.
-      sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh
-    ''}
-
-    # Patch some executables
-
-    ${if stdenv.system == "i686-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32
-      ''
-      else lib.optionalString (stdenv.system == "x86_64-linux") ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64
-      ''
-    }
-  '';
-}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
deleted file mode 100644
index eadbad7e0f5f4..0000000000000
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{ stdenv, lib, fetchurl, unzip, makeWrapper }:
-
-let
-  # Gradle is a build system that bootstraps itself. This is what it actually
-  # downloads in the bootstrap phase.
-  gradleAllZip = fetchurl {
-    url = "http://services.gradle.org/distributions/gradle-4.1-all.zip";
-    sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw";
-  };
-
-  # A Titanium-Android build requires proguard plugins. We create a fake
-  # repository so that Gradle does not attempt to download them in the builder.
-  # Since there are only 3 plugins required, this is still (sort of) manageable
-  # without a generator.
-  proguardVersion = "5.3.3";
-
-  proguardGradlePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
-    sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
-  };
-  proguardGradleJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
-    sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
-  };
-  proguardParentPOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
-    sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
-  };
-  proguardBasePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
-    sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
-  };
-  proguardBaseJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
-    sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
-  };
-
-  # Put the downloaded plugins in a fake Maven repository
-  fakeMavenRepo = stdenv.mkDerivation {
-    name = "fake-maven-repo";
-    buildCommand = ''
-      mkdir -p $out
-      cd $out
-      mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion}
-      cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom
-      cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar
-      mkdir -p net/sf/proguard/proguard-parent/${proguardVersion}
-      cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom
-      mkdir -p net/sf/proguard/proguard-base/${proguardVersion}
-      cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom
-      cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar
-    '';
-  };
-in
-stdenv.mkDerivation {
-  pname = "mobilesdk";
-  version = "8.3.2.GA";
-
-  src =
-    if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-linux.zip";
-        sha256 = "04pfw21jrx9w259lphynwykqjk4c9hm0zix4d40s7mf8mmh3xdx9";
-      }
-    else if stdenv.system == "x86_64-darwin" then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-osx.zip";
-        sha256 = "1zflq5hc96lrriw71ya623kkskkisi9yayg8qs03zimi0gksizxw";
-      }
-    else throw "Platform: ${stdenv.system} not supported!";
-
-  nativeBuildInputs = [ makeWrapper unzip ];
-
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    unzip $src
-
-    # Rename ugly version number
-    cd mobilesdk/*
-    mv * 8.3.2.GA
-    cd *
-
-    # Patch bundled gradle build infrastructure to make shebangs work
-    patchShebangs android/templates/gradle
-
-    # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app
-    sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-    cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip
-    echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-
-    # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
-    sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
-
-    ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
-      # Patch the strip frameworks script in the iPhone build template to not let
-      # it skip the strip phase. This is caused by an assumption on the file
-      # permissions in which Nix deviates from the standard.
-      sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh
-    ''}
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index faf644bc957ba..490abbd856f8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1911,8 +1911,6 @@ with pkgs;
 
   gomobile = callPackage ../development/mobile/gomobile { };
 
-  titaniumenv = callPackage ../development/mobile/titaniumenv { };
-
   adb-sync = callPackage ../development/mobile/adb-sync {
     inherit (androidenv.androidPkgs) platform-tools;
   };

From d2f4842daa9556df09d908423058817a8154254e Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:19:18 +0200
Subject: [PATCH 176/229] titanium-alloy: remove

---
 pkgs/by-name/ti/titanium-alloy/package.nix | 29 ----------------------
 pkgs/development/node-packages/aliases.nix |  1 -
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/by-name/ti/titanium-alloy/package.nix

diff --git a/pkgs/by-name/ti/titanium-alloy/package.nix b/pkgs/by-name/ti/titanium-alloy/package.nix
deleted file mode 100644
index e0e534db5d53b..0000000000000
--- a/pkgs/by-name/ti/titanium-alloy/package.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-}:
-
-buildNpmPackage rec {
-  pname = "alloy";
-  version = "2.0.2";
-
-  src = fetchFromGitHub {
-    owner = "tidev";
-    repo = "alloy";
-    rev = version;
-    hash = "sha256-s1hAbbUy7k/GacBIk8OMD48/1IUcRcpV3LnrCCZim1A=";
-  };
-
-  npmDepsHash = "sha256-YNyFrO6+oFluyk3TlUf/0vdHrgTJ3l5DN801wnpBa6s=";
-
-  dontNpmBuild = true;
-
-  meta = {
-    changelog = "https://github.com/tidev/alloy/blob/${src.rev}/CHANGELOG.md";
-    description = "MVC framework for the Appcelerator Titanium SDK";
-    homepage = "https://github.com/tidev/alloy";
-    license = lib.licenses.asl20;
-    mainProgram = "alloy";
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 6a1059896ef7b..270385e8c4050 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -53,7 +53,6 @@ mapAliases {
   "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15
   "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25
   "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09
-  alloy = pkgs.titanium-alloy; # added 2023-08-17
   antennas = pkgs.antennas; # added 2023-07-30
   inherit (pkgs) autoprefixer; # added 2024-06-25
   inherit (pkgs) asar; # added 2023-08-26

From 91a004b943e9b88a8f24adb4b8917d05734827e7 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:19:18 +0200
Subject: [PATCH 177/229] titanium: remove

---
 pkgs/by-name/ti/titanium/package.nix       | 29 ----------------------
 pkgs/development/node-packages/aliases.nix |  1 -
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/by-name/ti/titanium/package.nix

diff --git a/pkgs/by-name/ti/titanium/package.nix b/pkgs/by-name/ti/titanium/package.nix
deleted file mode 100644
index 28a92af107d18..0000000000000
--- a/pkgs/by-name/ti/titanium/package.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-}:
-
-buildNpmPackage rec {
-  pname = "titanium";
-  version = "6.1.1";
-
-  src = fetchFromGitHub {
-    owner = "tidev";
-    repo = "titanium-cli";
-    rev = "v${version}";
-    hash = "sha256-eJHf4vbapCaIVk0Xc0sml14jkFCsS/Gv7ftaFakB5rI=";
-  };
-
-  npmDepsHash = "sha256-60r+zqUCSDvQgrjg5SGfZiv87AoGx1XcnbW1ki1sbCM=";
-
-  dontNpmBuild = true;
-
-  meta = {
-    changelog = "https://github.com/tidev/titanium-cli/blob/${src.rev}/CHANGELOG.md";
-    description = "Command Line Tool for creating and building Titanium Mobile applications and modules";
-    homepage = "https://github.com/tidev/titanium-cli";
-    license = lib.licenses.asl20;
-    mainProgram = "titanium";
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 270385e8c4050..d187b9ee4378e 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -201,7 +201,6 @@ mapAliases {
   inherit (pkgs) textlint-rule-write-good; # Added 2024-05-16
   thelounge = pkgs.thelounge; # Added 2023-05-22
   three = throw "three was removed because it was no longer needed"; # Added 2023-09-08
-  inherit (pkgs) titanium; # added 2023-08-17
   triton = pkgs.triton; # Added 2023-05-06
   typescript = pkgs.typescript; # Added 2023-06-21
   inherit (pkgs) typescript-language-server; # added 2024-02-27

From 9516e693c6bb03a922992d037ef9dd35aaa03567 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:19:18 +0200
Subject: [PATCH 178/229] doc/rl-2505: mention removal of titaniumenv,
 titanium, and titanium-alloy

---
 nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 9b39fb1869ea7..473b3ecc365c0 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -221,6 +221,8 @@
 
 - `docker_24` has been removed, as it was EOL with vulnerabilites since June 08, 2024.
 
+- `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs.
+
 - `containerd` has been updated to v2, which contains breaking changes. See the [containerd
   2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more
   details.

From 10a75ab5b2c237e3c30556d65de3ee49ff4b6830 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:19:18 +0200
Subject: [PATCH 179/229] doc: titanium tombstone

---
 doc/manual.md.in                              |  4 ++++
 doc/redirects.json                            | 21 +++++++++++++++++++
 doc/release-notes/release-notes.md            |  7 +++++++
 doc/release-notes/rl-2505.section.md          | 19 +++++++++++++++++
 nixos/doc/manual/default.nix                  |  2 ++
 nixos/doc/manual/redirects.json               | 20 ++++++++++++++----
 .../manual/release-notes/rl-2505.section.md   | 12 +++--------
 7 files changed, 72 insertions(+), 13 deletions(-)
 create mode 100644 doc/release-notes/release-notes.md
 create mode 100644 doc/release-notes/rl-2505.section.md

diff --git a/doc/manual.md.in b/doc/manual.md.in
index e5f58a23a3995..07e587190d846 100644
--- a/doc/manual.md.in
+++ b/doc/manual.md.in
@@ -14,3 +14,7 @@ development.md
 contributing.md
 interoperability.md
 ```
+
+```{=include=} appendix html:into-file=//release-notes.html
+release-notes/release-notes.md
+```
diff --git a/doc/redirects.json b/doc/redirects.json
index 4b05cb27d1c64..330c25effc146 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -1,4 +1,7 @@
 {
+  "chap-release-notes": [
+    "release-notes.html#chap-release-notes"
+  ],
   "nixpkgs-manual": [
     "index.html#nixpkgs-manual"
   ],
@@ -50,6 +53,24 @@
   "chap-overlays": [
     "index.html#chap-overlays"
   ],
+  "sec-nixpkgs-release-25.05": [
+    "release-notes.html#sec-nixpkgs-release-25.05"
+  ],
+  "sec-nixpkgs-release-25.05-incompatibilities": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities"
+  ],
+  "sec-nixpkgs-release-25.05-incompatibilities-titanium-removed": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed",
+    "index.html#titanium",
+    "index.html#building-a-titanium-app",
+    "index.html#emulating-or-simulating-the-app"
+  ],
+  "sec-nixpkgs-release-25.05-lib": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib"
+  ],
+  "sec-nixpkgs-release-25.05-lib-breaking": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib-breaking"
+  ],
   "sec-overlays-install": [
     "index.html#sec-overlays-install"
   ],
diff --git a/doc/release-notes/release-notes.md b/doc/release-notes/release-notes.md
new file mode 100644
index 0000000000000..454ea7c50a9ed
--- /dev/null
+++ b/doc/release-notes/release-notes.md
@@ -0,0 +1,7 @@
+# Release Notes {#chap-release-notes}
+
+This section lists the release notes for each stable version of Nixpkgs and current unstable revision.
+
+```{=include=} sections
+rl-2505.section.md
+```
diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
new file mode 100644
index 0000000000000..9fa72cc1f484f
--- /dev/null
+++ b/doc/release-notes/rl-2505.section.md
@@ -0,0 +1,19 @@
+# Nixpkgs 25.05 (2025.05/??) {#sec-nixpkgs-release-25.05}
+
+## Backward Incompatibilities {#sec-nixpkgs-release-25.05-incompatibilities}
+
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
+### Titanium removed {#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}
+
+- `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs.
+
+## Nixpkgs Library {#sec-nixpkgs-release-25.05-lib}
+
+### Breaking changes {#sec-nixpkgs-release-25.05-lib-breaking}
+
+- Structure of the `functor` of some types has changed. `functor` is an implementation detail and should not be relied upon. If you did rely on it let us know in this [PR](https://github.com/NixOS/nixpkgs/pull/363565).
+  - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute.
+  - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute.
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 177a05b375328..5b171420b24d4 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -79,6 +79,8 @@ let
   prepareManualFromMD = ''
     cp -r --no-preserve=all $inputs/* .
 
+    cp -r ${../../../doc/release-notes} ./release-notes-nixpkgs
+
     substituteInPlace ./manual.md \
       --replace-fail '@NIXOS_VERSION@' "${version}"
     substituteInPlace ./configuration/configuration.md \
diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 428dbdcc54c29..106148d1dd041 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -1886,11 +1886,23 @@
   "sec-release-25.05-notable-changes": [
     "release-notes.html#sec-release-25.05-notable-changes"
   ],
-  "sec-release-25.05-lib": [
-    "release-notes.html#sec-release-25.05-lib"
+  "sec-nixpkgs-release-25.05": [
+    "release-notes.html#sec-nixpkgs-release-25.05"
   ],
-  "sec-release-25.05-lib-breaking": [
-    "release-notes.html#sec-release-25.05-lib-breaking"
+  "sec-nixpkgs-release-25.05-incompatibilities": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities"
+  ],
+  "sec-nixpkgs-release-25.05-incompatibilities-titanium-removed": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed",
+    "index.html#titanium",
+    "index.html#building-a-titanium-app",
+    "index.html#emulating-or-simulating-the-app"
+  ],
+  "sec-nixpkgs-release-25.05-lib": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib"
+  ],
+  "sec-nixpkgs-release-25.05-lib-breaking": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib-breaking"
   ],
   "sec-release-24.11": [
     "release-notes.html#sec-release-24.11"
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 473b3ecc365c0..2d108ac7ce00d 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -221,8 +221,6 @@
 
 - `docker_24` has been removed, as it was EOL with vulnerabilites since June 08, 2024.
 
-- `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs.
-
 - `containerd` has been updated to v2, which contains breaking changes. See the [containerd
   2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more
   details.
@@ -342,10 +340,6 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-## Nixpkgs Library {#sec-release-25.05-lib}
-
-### Breaking changes {#sec-release-25.05-lib-breaking}
-
-- Structure of the `functor` of some types has changed. `functor` is an implementation detail and should not be relied upon. If you did rely on it let us know in this [PR](https://github.com/NixOS/nixpkgs/pull/363565).
-  - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute.
-  - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute.
+```{=include=} sections
+../release-notes-nixpkgs/rl-2505.section.md
+```

From 6ff39470d983d4861165dc3734c13f6aa9243fbe Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 2 Jan 2025 17:08:20 +0300
Subject: [PATCH 180/229] linux_testing: 6.13-rc4 -> 6.13-rc5

---
 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 3b5c5feea1b5b..5dd1a3fba12b3 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "6.13-rc4",
-        "hash": "sha256:0ca986ycx3k69j1km1j4fyjh0d1wvxnyx1fzlb52g930r1jymp39"
+        "version": "6.13-rc5",
+        "hash": "sha256:02rasg3dyzq0cfqj74rn98xm2amhw3djd4dd0nvf5syha91l81rr"
     },
     "6.1": {
         "version": "6.1.122",

From 1ba73a81a6c20bf998ae685561e4534f03b85743 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 2 Jan 2025 17:08:25 +0300
Subject: [PATCH 181/229] linux_6_12: 6.12.7 -> 6.12.8

---
 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 5dd1a3fba12b3..e8ed63ee0dd5f 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.7",
-        "hash": "sha256:1kx0kmc8xlx5kpvfplawk05wjqpdnsj2hcmv8flnc2qfi9jgp1gp"
+        "version": "6.12.8",
+        "hash": "sha256:0y992b484rkkaqdkz5mw2is1l0izxhm3cl7fi5f72jx0bh3dm492"
     }
 }

From 71435ccf3eeeeb2e1a4dd0f8149df574d28d18c5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 2 Jan 2025 17:08:31 +0300
Subject: [PATCH 182/229] linux_6_6: 6.6.68 -> 6.6.69

---
 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 e8ed63ee0dd5f..d0f555c529733 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:1zhsb6gwhb6cvijzh7s8rnm4b06klyhb2mxb06gcyfvj0givlvw7"
     },
     "6.6": {
-        "version": "6.6.68",
-        "hash": "sha256:1qj0b2n4ck9qrgpqcgmhkl2jc4rh4000rqqs2vnwwlpkwc8g8gr8"
+        "version": "6.6.69",
+        "hash": "sha256:0d2gilgh8myavzfdjnx7az4dbwvkk7irvsz6rla9bnbmgdb0aqww"
     },
     "6.11": {
         "version": "6.11.11",

From d798810f57742f2dfafaa3966cc7abfb9d6036b9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 2 Jan 2025 17:08:38 +0300
Subject: [PATCH 183/229] linux_6_1: 6.1.122 -> 6.1.123

---
 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 d0f555c529733..11bec459af644 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:02rasg3dyzq0cfqj74rn98xm2amhw3djd4dd0nvf5syha91l81rr"
     },
     "6.1": {
-        "version": "6.1.122",
-        "hash": "sha256:0l3frvlzpl23f9j1vjm2y29d1ppv0ynq40h695i7w2qhh2rw14p8"
+        "version": "6.1.123",
+        "hash": "sha256:1g5k9q113nyid3a347abb36v2xfv5vf74ic88af7kf04kzbsr9rk"
     },
     "5.15": {
         "version": "5.15.175",

From 04c5813ba200257d968d719982d899de22f531af Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 15:10:22 +0100
Subject: [PATCH 184/229] tinymist: 0.12.14 -> 0.12.16

Diff: https://github.com/Myriad-Dreamin/tinymist/compare/refs/tags/v0.12.14...v0.12.16

Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/v0.12.16/CHANGELOG.md
---
 .../vscode/extensions/myriad-dreamin.tinymist/default.nix   | 2 +-
 pkgs/by-name/ti/tinymist/package.nix                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index 79001403f3faa..a8aa75ababa35 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-nMuK51ktoJQTgJEfFivOjDmnMUx/lWNsIPZ7ZmreqYo=";
+    hash = "sha256-8QwUZfR0eTjXE6IgjpYx9TcWf8WrrVWA0VfTUX+WVCc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index 1bcb45a8c615c..88d407b868b13 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -18,17 +18,17 @@ rustPlatform.buildRustPackage rec {
   pname = "tinymist";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.12.14";
+  version = "0.12.16";
 
   src = fetchFromGitHub {
     owner = "Myriad-Dreamin";
     repo = "tinymist";
     tag = "v${version}";
-    hash = "sha256-F6nJH3JU8NxyxFevYMaQnPDTIcjcqM779CP4M1zp1rU=";
+    hash = "sha256-DwekAk1LkpK/48yzKc6Ry5GZ3oR/uH7+xpvT0LlSF00=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-+Ce9qIETGFZXG4RX5GP8tpmH4fkpbPkDS1FX64NQ6/4=";
+  cargoHash = "sha256-LlZD/amKO/4dOo6xB5kz51igTDrkHbVQDquRpkMujVU=";
 
   nativeBuildInputs = [
     installShellFiles

From f59c7b1923ebbcdecd734e83601648c9e078c29f Mon Sep 17 00:00:00 2001
From: thtrf <r3769.tv@gmail.com>
Date: Thu, 2 Jan 2025 14:49:42 +0000
Subject: [PATCH 185/229] vscode-extensions.egirlcatnip.adwaita-github-theme:
 init at 1.0.5

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b49e0786f8e7e..09df2534f2c8f 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1672,6 +1672,22 @@ let
         };
       };
 
+      egirlcatnip.adwaita-github-theme = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "adwaita-github-theme";
+          publisher = "egirlcatnip";
+          version = "1.0.5";
+          hash = "sha256-OvonS6137ICRUV5Tx4gD3we8nrza6ZgnRSs2SxFiCjU=";
+        };
+        meta = {
+          description = "Adwaita VS Code theme with Github syntax highlighting";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=egirlcatnip.adwaita-github-theme";
+          homepage = "https://github.com/egirlcatnip/adwaita-github-theme";
+          license = lib.licenses.gpl3;
+          maintainers = with lib.maintainers; [ thtrf ];
+        };
+      };
+
       elixir-lsp.vscode-elixir-ls = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "elixir-ls";

From 0ce76d75325dacc66080e6904c01557032ef4ea1 Mon Sep 17 00:00:00 2001
From: Barry Moore <chiroptical@gmail.com>
Date: Thu, 2 Jan 2025 09:53:05 -0500
Subject: [PATCH 186/229] ex_doc: disable nix-update-script

---
 pkgs/development/beam-modules/ex_doc/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index b46d7fee6ef49..fbc1f8a0da92f 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -1,4 +1,4 @@
-{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease, nix-update-script }:
+{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease }:
 # Based on ../elixir-ls/default.nix
 
 let
@@ -51,5 +51,4 @@ mixRelease {
     mainProgram = "ex_doc";
     maintainers = with maintainers; [chiroptical];
   };
-  passthru.updateScript = nix-update-script { };
 }

From 25e041f5e5fa7bcf78a58b3ad66234b642aa3429 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 15:13:10 +0000
Subject: [PATCH 187/229] rustmission: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix
index 6a883d1292812..8790b4f8a499a 100644
--- a/pkgs/by-name/ru/rustmission/package.nix
+++ b/pkgs/by-name/ru/rustmission/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rustmission";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "intuis";
     repo = "rustmission";
     rev = "v${version}";
-    hash = "sha256-V9sy3rkoI3mKpeZjXT4D3Bs4NVETJ8h43iwOoDx1MKU=";
+    hash = "sha256-vQ6MBbzmOBgD1kcF62NmQys737QEN9isvFN7L7mP8mk=";
   };
 
-  cargoHash = "sha256-KYg+SVAvlQn77kI1gyzXlzhKgPECYPZKICnmkcEnuh8=";
+  cargoHash = "sha256-yelDzx/5SxZ+DT9Rvx3tuSp/yDLfVOYmexa9ZqeUT88=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 81485e446839a9687526f5bc7a4d489715b29b4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 15:18:30 +0000
Subject: [PATCH 188/229] templ: 0.2.793 -> 0.3.819

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

diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix
index eb5265268b1a0..c537e95b39886 100644
--- a/pkgs/by-name/te/templ/package.nix
+++ b/pkgs/by-name/te/templ/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "templ";
-  version = "0.2.793";
+  version = "0.3.819";
 
   src = fetchFromGitHub {
     owner = "a-h";
     repo = "templ";
     rev = "v${version}";
-    hash = "sha256-0KGht5IMbJV8KkXgT5qJxA9bcmWevzXXAVPMQTm0ccw=";
+    hash = "sha256-kTP/DLnou3KETZRtvHdeiMmRW6xldgZBAn9O9p9s/MA=";
   };
 
-  vendorHash = "sha256-ZWY19f11+UI18jeHYIEZjdb9Ii74mD6w+dYRLPkdfBU=";
+  vendorHash = "sha256-ipLn52MsgX7KQOJixYcwMR9TCeHz55kQQ7fgkIgnu7w=";
 
   subPackages = [ "cmd/templ" ];
 

From 0725951bfc4bbc2efff3a537837ca13159b4aec9 Mon Sep 17 00:00:00 2001
From: andre4ik3 <andre4ik3@fastmail.com>
Date: Thu, 2 Jan 2025 19:21:44 +0400
Subject: [PATCH 189/229] nixos/libvirtd: link Microsoft-templated OVMF files
 to shared folder (#346904)

Link MS OVMF files to shared folder as well
---
 nixos/modules/virtualisation/libvirtd.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 35f5c4070b5ae..1658769107495 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -13,7 +13,12 @@ let
   '';
   qemuConfigFile = pkgs.writeText "qemu.conf" ''
     ${optionalString cfg.qemu.ovmf.enable ''
-      nvram = [ "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd", "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd" ]
+      nvram = [
+        "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd",
+        "/run/libvirt/nix-ovmf/AAVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.ms.fd",
+        "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd",
+        "/run/libvirt/nix-ovmf/OVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/OVMF_VARS.ms.fd"
+      ]
     ''}
     ${optionalString (!cfg.qemu.runAsRoot) ''
       user = "qemu-libvirtd"
@@ -451,10 +456,10 @@ in
           };
         in
           ''
-          ln -s --force ${ovmfpackage}/FV/AAVMF_CODE.fd /run/${dirName}/nix-ovmf/
-          ln -s --force ${ovmfpackage}/FV/OVMF_CODE.fd /run/${dirName}/nix-ovmf/
-          ln -s --force ${ovmfpackage}/FV/AAVMF_VARS.fd /run/${dirName}/nix-ovmf/
-          ln -s --force ${ovmfpackage}/FV/OVMF_VARS.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/AAVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/OVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/AAVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/OVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/
         '')}
 
         # Symlink hooks to /var/lib/libvirt

From 2c43f705d0e60dbd6cc807b928f48d4c5072cd9a Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Thu, 2 Jan 2025 16:08:30 +0100
Subject: [PATCH 190/229] mobilizon: fix internal version

---
 pkgs/servers/mobilizon/0001-fix-version.patch | 13 +++++++++++++
 pkgs/servers/mobilizon/default.nix            |  5 +++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/servers/mobilizon/0001-fix-version.patch

diff --git a/pkgs/servers/mobilizon/0001-fix-version.patch b/pkgs/servers/mobilizon/0001-fix-version.patch
new file mode 100644
index 0000000000000..da4d8f436a52e
--- /dev/null
+++ b/pkgs/servers/mobilizon/0001-fix-version.patch
@@ -0,0 +1,13 @@
+diff --git a/mix.exs b/mix.exs
+index 8338abf8..883e6987 100644
+--- a/mix.exs
++++ b/mix.exs
+@@ -1,7 +1,7 @@
+ defmodule Mobilizon.Mixfile do
+   use Mix.Project
+ 
+-  @version "5.1.0"
++  @version "5.1.1"
+ 
+   def project do
+     [
diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix
index a007a30f6f260..efd40acbfeefb 100644
--- a/pkgs/servers/mobilizon/default.nix
+++ b/pkgs/servers/mobilizon/default.nix
@@ -19,6 +19,11 @@ in
 mixRelease rec {
   inherit (common) pname version src;
 
+  # Version 5.1.1 failed to bump their internal package version,
+  # which causes issues with static file serving in the NixOS module.
+  # See https://github.com/NixOS/nixpkgs/pull/370277
+  patches = [ ./0001-fix-version.patch ];
+
   nativeBuildInputs = [
     git
     cmake

From 8fd76e7819d116847cae2c8157c19e667577292f Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 2 Jan 2025 16:40:44 +0100
Subject: [PATCH 191/229] vscode-extensions.saoudrizwan.claude-dev: init at
 3.0.12

---
 .../editors/vscode/extensions/default.nix     |  2 ++
 .../saoudrizwan.claude-dev/default.nix        | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b49e0786f8e7e..e3cdfd4b1cd62 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4271,6 +4271,8 @@ let
         };
       };
 
+      saoudrizwan.claude-dev = callPackage ./saoudrizwan.claude-dev { };
+
       sainnhe.gruvbox-material = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "gruvbox-material";
diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
new file mode 100644
index 0000000000000..90a62814d9735
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  vscode-utils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "claude-dev";
+    publisher = "saoudrizwan";
+    version = "3.0.12";
+    hash = "sha256-GlBo4MIoIazKEYHv4yXpRGLVElOnjYgD9gB6rMQxeGg=";
+  };
+
+  meta = {
+    description = "A VSCode extension providing an autonomous coding agent right in your IDE, capable of creating/editing files, executing commands, using the browser, and more with your permission every step of the way";
+    downloadPage = "https://github.com/cline/cline";
+    homepage = "https://github.com/cline/cline";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.drupol ];
+  };
+}

From 1227084c58918525780997af4e814395885d7cd6 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 2 Jan 2025 16:52:41 +0100
Subject: [PATCH 192/229] maintainers: update jopejoe1

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 10f6a88385b8b..d3f96a51a540e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11135,11 +11135,11 @@
     githubId = 13179;
   };
   jopejoe1 = {
-    email = "johannes@joens.email";
+    email = "nixpkgs@missing.ninja";
     matrix = "@jopejoe1:matrix.org";
     github = "jopejoe1";
     githubId = 34899572;
-    name = "Johannes Jöns";
+    name = "jopejoe1";
   };
   jordanisaacs = {
     name = "Jordan Isaacs";

From a35271af53ba19f95e82335db1ac8a5dc5aa1aed Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 2 Jan 2025 16:54:52 +0100
Subject: [PATCH 193/229] mailmap: add jopejoe1

---
 .mailmap | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index 5dab7144bb1a0..9004483d70558 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,6 +10,9 @@ Fiona Behrens <me@kloenk.dev>
 Fiona Behrens <me@kloenk.dev> <me@kloenk.de>
 goatastronaut0212 <goatastronaut0212@outlook.com> <goatastronaut0212@proton.me>
 Janne Heß <janne@hess.ooo> <dasJ@users.noreply.github.com>
+jopejoe1 <nixpkgs@missing.ninja>
+jopejoe1 <nixpkgs@missing.ninja> <johannes@joens.email>
+jopejoe1 <nixpkgs@missing.ninja> <34899572+jopejoe1@users.noreply.github.com>
 Jörg Thalheim <joerg@thalheim.io> <Mic92@users.noreply.github.com>
 Lin Jian <me@linj.tech> <linj.dev@outlook.com>
 Lin Jian <me@linj.tech> <75130626+jian-lin@users.noreply.github.com>

From c4f5b7c0e7b51c77db71c0d48b5723130d73e8b8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 17:40:18 +0100
Subject: [PATCH 194/229] python312Packages.safetensors: 0.4.5 -> 0.5.0

Diff: https://github.com/huggingface/safetensors/compare/refs/tags/v0.4.5...v0.5.0

Changelog: https://github.com/huggingface/safetensors/releases/tag/v0.5.0
---
 .../python-modules/safetensors/default.nix          | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix
index 584cc1e7d6af1..ceb01938be6c0 100644
--- a/pkgs/development/python-modules/safetensors/default.nix
+++ b/pkgs/development/python-modules/safetensors/default.nix
@@ -10,9 +10,6 @@
   rustc,
   setuptools-rust,
 
-  # buildInputs
-  libiconv,
-
   # tests
   h5py,
   numpy,
@@ -22,20 +19,20 @@
 
 buildPythonPackage rec {
   pname = "safetensors";
-  version = "0.4.5";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "safetensors";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-gr4hBbecaGHaoNhRQQXWfLfNB0/wQPKftSiTnGgngog=";
+    tag = "v${version}";
+    hash = "sha256-rs9mYl/2KNdV9e+L/kZr59kLw7ckW9UQPZwkaGyl1Iw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     sourceRoot = "${src.name}/bindings/python";
-    hash = "sha256-zDXzEVvmJF1dEVUFGBc3losr9U1q/qJCjNFkdJ/pCd4=";
+    hash = "sha256-bQkLBiuhVm2dzrf6hq+S04+zoXUszA7be8iS0WJSoOU=";
   };
 
   sourceRoot = "${src.name}/bindings/python";
@@ -48,8 +45,6 @@ buildPythonPackage rec {
     setuptools-rust
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
   nativeCheckInputs = [
     h5py
     numpy

From 97a24017577fc4a260057736bcc14d484627a505 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 16:42:26 +0000
Subject: [PATCH 195/229] siyuan: 3.1.16 -> 3.1.18

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

diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index 1b7ace038950f..e86b092545bd8 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -35,20 +35,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.1.16";
+  version = "3.1.18";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8+Gz9AuxmK2hOApRZ2b1+rROOG94EBJR3pyp8YwtgiA=";
+    hash = "sha256-hUPHWVULyHQgGNTpLZKDk6hUlBIK1ouYAYecr0oUe/M=";
   };
 
   kernel = buildGo123Module {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-B2pGXs0IN5WhNHoFgTufd46q60RNvWzNdwoCxpayYC8=";
+    vendorHash = "sha256-1JwUQ/WhR1O3LTevI2kWk+FNpH4FBVgF46d+W6M7UBg=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = "sha256-LlQdfRGsBn3IZWKSUqH5tAljXnWanuFXO2x+Wi3on7E=";
+    hash = "sha256-357iBgxevtXus0Dpa8+LHKsO42HoHibkhRSy+tpD8jo=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";

From 7b55ce8367e077969fc7ed3ca4caee8b8a5d060e Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 2 Jan 2025 15:32:12 +0100
Subject: [PATCH 196/229] fsg: fix cross build

---
 pkgs/by-name/fs/fsg/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/fs/fsg/package.nix b/pkgs/by-name/fs/fsg/package.nix
index 5f7340f9f0398..0a8048d5e6f85 100644
--- a/pkgs/by-name/fs/fsg/package.nix
+++ b/pkgs/by-name/fs/fsg/package.nix
@@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
 
   patches = [ ./wxgtk-3.2.patch ];
 
+  # use correct wx-config for cross-compiling
+  postPatch = ''
+    substituteInPlace makefile \
+      --replace-fail 'wx-config' "${lib.getExe' wxGTK32 "wx-config"}"
+  '';
+
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ pkg-config ];
@@ -45,6 +51,10 @@ stdenv.mkDerivation rec {
     sed -re '/ctrans_prob/s/energy\[center][+]energy\[other]/(int)(fmin(energy[center]+energy[other],99))/g' -i Canvas.cpp
   '';
 
+  makeFlags = [
+    "CPP=${stdenv.cc.targetPrefix}c++"
+  ];
+
   installPhase = ''
     mkdir -p $out/bin $out/libexec
     cp sand $out/libexec

From 7f2713dcb9518cd93b2892aee9aa84e7552e6029 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 2 Jan 2025 15:32:12 +0100
Subject: [PATCH 197/229] fairymax: fix build with GCC 14

---
 pkgs/by-name/fa/fairymax/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/fa/fairymax/package.nix b/pkgs/by-name/fa/fairymax/package.nix
index 5950e0b3591f1..572d5505c20d9 100644
--- a/pkgs/by-name/fa/fairymax/package.nix
+++ b/pkgs/by-name/fa/fairymax/package.nix
@@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
       -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"'
   '';
 
+  # errors by default in GCC 14
+  NIX_CFLAGS_COMPILE = "-Wno-error=return-mismatch -Wno-error=implicit-int";
+
   installPhase = ''
     mkdir -p "$out"/{bin,share/fairymax}
     cp fairymax "$out/bin"

From df553a0b34b5e9851565d1d76a6bb47d0328c0ae Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 2 Jan 2025 18:07:59 +0100
Subject: [PATCH 198/229] koreader: fix hash (#370115)

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

diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix
index 169b083878ad6..bb1969b3ac19e 100644
--- a/pkgs/by-name/ko/koreader/package.nix
+++ b/pkgs/by-name/ko/koreader/package.nix
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
     {
       aarch64-linux = fetchurl {
         url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb";
-        hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk=";
+        hash = "sha256-uy+4+pNyz10xrGM0QF9q0y6UpQK1B9PGNqrcK6nENQY=";
       };
       armv7l-linux = fetchurl {
         url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb";
-        hash = "sha256-LgeWQcHm5Qq/7MUuidjily0WsOFZAWGWeO52jNHWKMw=";
+        hash = "sha256-lTc12qmoe0kGUhrStlGfDRw+cNJnX7F09/jKKc/1U9g=";
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     owner = "koreader";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-gHn1xqBc7M9wkek1Ja1gry8TKIuUxQP8T45x3z2S4uc=";
+    sha256 = "sha256-EI8UOQuwhJqcAp8QnLYhI0K+uV/7ZqxdHNk8mPkDWA0=";
   };
 
   nativeBuildInputs = [

From 3ab766775d37c0b6f39506db6319d87260e81906 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 03:09:29 +1000
Subject: [PATCH 199/229] _7zz: 24.08 -> 24.09 (#360699)

_7zz: 24.08 -> 24.09
---
 pkgs/tools/archivers/7zz/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix
index d23ec4af02ee4..db6c8883c0002 100644
--- a/pkgs/tools/archivers/7zz/default.nix
+++ b/pkgs/tools/archivers/7zz/default.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "7zz";
-  version = "24.08";
+  version = "24.09";
 
   src = fetchzip {
     url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz";
     hash = {
-      free = "sha256-2lv2Z4rrjmawD6aI8TmrACgo62StD720WQWOa0/u7KE=";
-      unfree = "sha256-f6hibHeTlF6RRnFiC7tOZ/A+IQdjhIrxYq6JrDVhnYI=";
+      free = "sha256-iQJ2m2OZrdkzf2sDIbKuyu0wIUktfvySTpsGFSLDZOM=";
+      unfree = "sha256-HVSu5GvdCY3lVXLUkHxaXco22WO52J2ldkGgfsyMVVg=";
     }.${if enableUnfree then "unfree" else "free"};
     stripRoot = false;
     # remove the unRAR related code from the src drv

From 5fbbc60571844845dd1e5abf9e9829e9c47e55e8 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Mon, 30 Dec 2024 14:44:15 +0100
Subject: [PATCH 200/229] tcl-8_5: fix build

---
 pkgs/development/interpreters/tcl/generic.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 86bc54b9ceb3d..11a12c6eac04d 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -62,6 +62,10 @@ let
         # Don't install tzdata because NixOS already has a more up-to-date copy.
         "--with-tzdata=no"
       ]
+      ++ lib.optionals (lib.versionOlder version "8.6") [
+        # configure check broke due to GCC 14
+        "ac_cv_header_stdc=yes"
+      ]
       ++ lib.optionals (lib.versionAtLeast version "9.0") [
         # By default, tcl libraries get zipped and embedded into libtcl*.so,
         # which gets `zipfs mount`ed at runtime. This is fragile (for example

From e162494ac40ce637fd5cdcb87a83038255ed6abc Mon Sep 17 00:00:00 2001
From: MakiseKurisu <MakiseKurisu@users.noreply.github.com>
Date: Wed, 1 Jan 2025 00:28:55 +0800
Subject: [PATCH 201/229] pykms: unstable-2021-01-25 -> 0-unstable-2024-07-06

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

diff --git a/pkgs/by-name/py/pykms/package.nix b/pkgs/by-name/py/pykms/package.nix
index ba8710caeba36..a00cdbe4b45c7 100644
--- a/pkgs/by-name/py/pykms/package.nix
+++ b/pkgs/by-name/py/pykms/package.nix
@@ -36,13 +36,13 @@ let
 in
 pypkgs.buildPythonApplication rec {
   pname = "pykms";
-  version = "unstable-2021-01-25";
+  version = "0-unstable-2024-07-06";
 
   src = fetchFromGitHub {
     owner = "Py-KMS-Organization";
     repo = "py-kms";
-    rev = "1435c86fe4f11aa7fd42d77fa61715ca3015eeab";
-    hash = "sha256-9KiMbS0uKTbWSZVIv5ziIeR9c8+EKfKd20yPmjCX7GQ=";
+    rev = "465f4d14c728819d4eb00e3419bd1cb98af7f81c";
+    hash = "sha256-/XbMbcBcZPO7joHyaprJ29Cq4gNpuuzTzj2x1XDIyj8=";
   };
 
   sourceRoot = "${src.name}/py-kms";

From 0826de34a5452a77edb56aadbed7f0574af55009 Mon Sep 17 00:00:00 2001
From: MakiseKurisu <MakiseKurisu@users.noreply.github.com>
Date: Wed, 1 Jan 2025 00:35:10 +0800
Subject: [PATCH 202/229] nixos/pykms: allow overriding default package

---
 nixos/modules/services/misc/pykms.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix
index c9613f684e842..059fb9e660926 100644
--- a/nixos/modules/services/misc/pykms.nix
+++ b/nixos/modules/services/misc/pykms.nix
@@ -24,6 +24,8 @@ in
         description = "Whether to enable the PyKMS service.";
       };
 
+      package = lib.mkPackageOption pkgs "pykms" { };
+
       listenAddress = lib.mkOption {
         type = lib.types.str;
         default = "0.0.0.0";
@@ -78,13 +80,13 @@ in
       wantedBy = [ "multi-user.target" ];
       # python programs with DynamicUser = true require HOME to be set
       environment.HOME = libDir;
-      serviceConfig = with pkgs; {
+      serviceConfig = {
         DynamicUser = true;
         StateDirectory = baseNameOf libDir;
-        ExecStartPre = "${lib.getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db";
+        ExecStartPre = "${lib.getBin cfg.package}/libexec/create_pykms_db.sh ${libDir}/clients.db";
         ExecStart = lib.concatStringsSep " " (
           [
-            "${lib.getBin pykms}/bin/server"
+            "${lib.getBin cfg.package}/bin/server"
             "--logfile=STDOUT"
             "--loglevel=${cfg.logLevel}"
             "--sqlite=${libDir}/clients.db"

From 92242097202b12f1224481f5d71ec6348eb34843 Mon Sep 17 00:00:00 2001
From: MakiseKurisu <MakiseKurisu@users.noreply.github.com>
Date: Wed, 1 Jan 2025 00:59:56 +0800
Subject: [PATCH 203/229] nixos/pykms: suggest dual stack binding

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

diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix
index 059fb9e660926..a8f08e5ab1862 100644
--- a/nixos/modules/services/misc/pykms.nix
+++ b/nixos/modules/services/misc/pykms.nix
@@ -29,6 +29,7 @@ in
       listenAddress = lib.mkOption {
         type = lib.types.str;
         default = "0.0.0.0";
+        example = "::";
         description = "The IP address on which to listen.";
       };
 

From dac39cc53a2fdff63f6c61771805cd3dd2414d8e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 03:16:14 +1000
Subject: [PATCH 204/229] python312Packages.pyspark: 3.5.3 -> 3.5.4 (#368497)

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

diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index e06ab29324830..58afd33217fb4 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pyspark";
-  version = "3.5.3";
+  version = "3.5.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aLfMDAxXCn2GRPSfQNLahwmwHTDJEmzIz5O0+E89l0c=";
+    hash = "sha256-HCkm1jAgkCFj9YIiRmrfb4AW9sQ8HzGbjnpx26oF/FE=";
   };
 
   # pypandoc is broken with pandoc2, so we just lose docs.

From a00976b3883b7e8627a10d45e3c1f8969ec3b148 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 12:22:19 +0000
Subject: [PATCH 205/229] bloat: 0-unstable-2024-10-28 -> 0-unstable-2024-12-27

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

diff --git a/pkgs/by-name/bl/bloat/package.nix b/pkgs/by-name/bl/bloat/package.nix
index bfb5b1f133950..e2efe3f83307b 100644
--- a/pkgs/by-name/bl/bloat/package.nix
+++ b/pkgs/by-name/bl/bloat/package.nix
@@ -7,12 +7,12 @@
 
 buildGoModule {
   pname = "bloat";
-  version = "0-unstable-2024-10-28";
+  version = "0-unstable-2024-12-27";
 
   src = fetchgit {
     url = "git://git.freesoftwareextremist.com/bloat";
-    rev = "68d7acc2f7266c47001445229ff235546c8c71b4";
-    hash = "sha256-VLyL1tnb3/qsDFp8s84XTj1Ohl/ajD+tn7V8iBp3ppY=";
+    rev = "d171b6c2d50500cdfd2f3308bf82a5f79e22cd8b";
+    hash = "sha256-a9nL6NvZLQZLOuoqdDbZTH9dVtQ6guKopkAHughINcg=";
   };
 
   vendorHash = null;

From ab065822e58d98cec1c0e919ecd5aa79fafa6dd5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 14:47:26 +0000
Subject: [PATCH 206/229] ft2-clone: 1.89 -> 1.93

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

diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index b444aa92a9685..431fe22a86944 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ft2-clone";
-  version = "1.89";
+  version = "1.93";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${version}";
-    hash = "sha256-s2HMzHJB85kLe3TuKH3oFloWUirmbSYDwh298dZlP6M=";
+    hash = "sha256-B91kLShg3nvOyOlBkLSpTydhUs5yHa+C/OWe8N+MB9c=";
   };
 
   nativeBuildInputs = [ cmake ];

From 7b40f54d169aab9b92926baad02ffb2ebbf489e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 06:15:50 +0000
Subject: [PATCH 207/229] python312Packages.ntc-templates: 6.0.0 -> 7.5.0

---
 .../python-modules/ntc-templates/default.nix       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix
index 4b0936f22948d..668e0af417538 100644
--- a/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/pkgs/development/python-modules/ntc-templates/default.nix
@@ -14,19 +14,19 @@
 
 buildPythonPackage rec {
   pname = "ntc-templates";
-  version = "6.0.0";
-  format = "pyproject";
+  version = "7.5.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "networktocode";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-E8n4ZcCH8xxU5XXVxQUl8844RnRpnbHy/LnjHlz7Eeg=";
+    repo = "ntc-templates";
+    tag = "v${version}";
+    hash = "sha256-VRkWjhl/7qDwXTWQ5ZhIS7JMuxJWlWkqwjoSo1DXOQE=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   propagatedBuildInputs = [ textfsm ];
 

From 6e0d5066693daf94584b84d65d90f1d18073fb8f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 19:08:24 +0100
Subject: [PATCH 208/229] python312Packages.gotenberg-client: drop support for
 python 3.8

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

diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix
index 196385c2413a8..7d5785eb90bdd 100644
--- a/pkgs/development/python-modules/gotenberg-client/default.nix
+++ b/pkgs/development/python-modules/gotenberg-client/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   version = "0.8.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "stumpylog";

From 040ef3ec0856211d627bbfc57aaaf64b7f727755 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 19:09:55 +0100
Subject: [PATCH 209/229] python312Packages.tika-client: drop support for
 python 3.8

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

diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix
index 56f98fcf93fc8..4b01da1d5551e 100644
--- a/pkgs/development/python-modules/tika-client/default.nix
+++ b/pkgs/development/python-modules/tika-client/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   version = "0.8.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "stumpylog";

From 0299c518a464172d783bb7382096a345fc4bb089 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:28:31 +0000
Subject: [PATCH 210/229] python312Packages.ytmusicapi: 1.8.2 -> 1.9.1

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

diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix
index 78218a379fef3..45df43e2e4d08 100644
--- a/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "ytmusicapi";
-  version = "1.8.2";
+  version = "1.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sigma67";
     repo = "ytmusicapi";
-    rev = "refs/tags/${version}";
-    hash = "sha256-SZ5YsQNrE91ycSXy/NjtjXp0E6msVKlV0f+Td0AwYpQ=";
+    tag = version;
+    hash = "sha256-yg8wjJTbx6LaVrln+Qdfn7XKnnI2n4W56YQZRYXrtLI=";
   };
 
   build-system = [ setuptools-scm ];

From ed3f112a0e6bafe629f602fd7b1e313ed1a57ad6 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 2 Jan 2025 06:11:49 +0800
Subject: [PATCH 211/229] nixos/kmonad: remove unnecessary cli flag --input

input has already been set in the config file.
---
 nixos/modules/services/hardware/kmonad.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 687224fae2e92..86e9e32012cf1 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -122,8 +122,6 @@ let
       cmd =
         [
           (lib.getExe cfg.package)
-          "--input"
-          ''device-file "${keyboard.device}"''
         ]
         ++ cfg.extraArgs
         ++ [ "${mkCfg keyboard}" ];

From c3588cf2c5fb41bb1759fd0b46820384625c8120 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 2 Jan 2025 06:42:32 +0800
Subject: [PATCH 212/229] nixos/kmonad: avoid running an unnecessary bash

---
 nixos/modules/services/hardware/kmonad.nix | 14 +++++---------
 nixos/tests/kmonad.nix                     |  3 +++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 86e9e32012cf1..df60f07d3890f 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  utils,
   ...
 }:
 
@@ -118,17 +119,8 @@ let
   # Build a systemd service that starts KMonad:
   mkService =
     keyboard:
-    let
-      cmd =
-        [
-          (lib.getExe cfg.package)
-        ]
-        ++ cfg.extraArgs
-        ++ [ "${mkCfg keyboard}" ];
-    in
     lib.nameValuePair (mkName keyboard.name) {
       description = "KMonad for ${keyboard.device}";
-      script = lib.escapeShellArgs cmd;
       unitConfig = {
         # Control rate limiting.
         # Stop the restart logic if we restart more than
@@ -137,6 +129,10 @@ let
         StartLimitBurst = 5;
       };
       serviceConfig = {
+        ExecStart = ''
+          ${lib.getExe cfg.package} ${mkCfg keyboard} \
+            ${utils.escapeSystemdExecArgs cfg.extraArgs}
+        '';
         Restart = "always";
         # Restart at increasing intervals from 2s to 1m
         RestartSec = 2;
diff --git a/nixos/tests/kmonad.nix b/nixos/tests/kmonad.nix
index e0150cb99f183..57bb9249397c2 100644
--- a/nixos/tests/kmonad.nix
+++ b/nixos/tests/kmonad.nix
@@ -11,6 +11,9 @@
     machine = {
       services.kmonad = {
         enable = true;
+        extraArgs = [
+          "--log-level=debug"
+        ];
         keyboards = {
           defaultKbd = {
             device = "/dev/input/by-id/vm-default-kbd";

From 9e8ed1f41185f962919e3db121266ea30bf27bde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 18:25:18 +0000
Subject: [PATCH 213/229] legcord: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix
index df4b73bacb215..ae70d077a298e 100644
--- a/pkgs/by-name/le/legcord/package.nix
+++ b/pkgs/by-name/le/legcord/package.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "legcord";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "Legcord";
     repo = "Legcord";
     rev = "v${version}";
-    hash = "sha256-9CicqDZDetxElD36OLizyVNxkqz3rQOjAtUNTGWVwss=";
+    hash = "sha256-0dVuSqViMqhWBMEY36ZcXM1FYnMcDH5brp5gsMWg3Rc=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
-    hash = "sha256-5GE/I2xLmu2Wu9mjzZMk1YZvtS5PgpwgXnxuY+4nimQ=";
+    hash = "sha256-QTePf/QE85OzXIcnwLJsCJJyRxwoV+FNef2Z9nAt35E=";
   };
 
   ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

From 66ddf84c33620c69bbb6be6b86252c7b4ce0460d Mon Sep 17 00:00:00 2001
From: Alexandru Scvortov <code@scvalex.net>
Date: Thu, 19 Dec 2024 16:48:06 +0000
Subject: [PATCH 214/229] kubernetes: kubelet.extraConfig should be `attrsOf
 json.type`

---
 nixos/modules/services/cluster/kubernetes/kubelet.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index 98f601d8886e0..aa759e20f49fc 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -205,9 +205,14 @@ in
     };
 
     extraConfig = mkOption {
-      description = "Kubernetes kubelet extra configuration file entries.";
+      description = ''
+        Kubernetes kubelet extra configuration file entries.
+
+        See also [Set Kubelet Parameters Via A Configuration File](https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/)
+        and [Kubelet Configuration](https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/).
+      '';
       default = { };
-      type = attrsOf attrs;
+      type = attrsOf ((pkgs.formats.json { }).type);
     };
 
     featureGates = mkOption {

From ccfdbc34fd402c227559dcede15ba28f1a65be50 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Tue, 31 Dec 2024 20:58:37 +0100
Subject: [PATCH 215/229] docs: add references to module system section

---
 doc/module-system/module-system.chapter.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md
index 927f66073748f..d24faa2552599 100644
--- a/doc/module-system/module-system.chapter.md
+++ b/doc/module-system/module-system.chapter.md
@@ -7,9 +7,12 @@ The module system is a language for handling configuration, implemented as a Nix
 Compared to plain Nix, it adds documentation, type checking and composition or extensibility.
 
 ::: {.note}
-This chapter is new and not complete yet. For a gentle introduction to the module system, in the context of NixOS, see [Writing NixOS Modules](https://nixos.org/manual/nixos/unstable/index.html#sec-writing-modules) in the NixOS manual.
-:::
+This chapter is new and not complete yet.
 
+See also:
+- Introduction to the module system, in the context of NixOS, see [Writing NixOS Modules](https://nixos.org/manual/nixos/unstable/index.html#sec-writing-modules) in the NixOS manual.
+- Generic guide to the module system on [nix.dev](https://nix.dev/tutorials/module-system/index.html).
+:::
 
 ## `lib.evalModules` {#module-system-lib-evalModules}
 

From 1ac626c6821b6f9b0bbcfee902e070b3e4d45a7d Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Thu, 2 Jan 2025 14:37:08 -0300
Subject: [PATCH 216/229] pmbootstrap: 3.0.0 -> 3.1.0, fix build, tweaking

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/pm/pmbootstrap/package.nix | 91 +++++--------------------
 1 file changed, 18 insertions(+), 73 deletions(-)

diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index 8cff6df159f23..35f1299c39ba9 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -9,18 +9,20 @@
   sudo,
   python3Packages,
   gitUpdater,
+  util-linux,
+  versionCheckHook,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "pmbootstrap";
-  version = "3.0.0";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "postmarketOS";
     repo = pname;
-    rev = version;
-    hash = "sha256-hUrWMU4V7tf/qVR4geR5FsCQ+BZA+zCPTdCZGN1PMKk=";
+    tag = version;
+    hash = "sha256-ijXyX+VJqiS0z5IOXGjeL2SGZ/4ledhnq/Zr1ZLW/Io=";
     domain = "gitlab.postmarketos.org";
   };
 
@@ -34,103 +36,46 @@ python3Packages.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = [
-    python3Packages.pytestCheckHook
     git
+    multipath-tools
     openssl
     ps
+    python3Packages.pytestCheckHook
     sudo
+    util-linux
+    versionCheckHook
   ];
 
   # Add test dependency in PATH
-  preCheck = "export PYTHONPATH=$PYTHONPATH:${pmb_test}";
+  preCheck = ''
+    export PYTHONPATH=$PYTHONPATH:${pmb_test}
+  '';
 
   # skip impure tests
   disabledTests = [
-    "test_apk_static"
-    "test_aportgen"
-    "test_aportgen_device_wizard"
-    "test_bootimg"
-    "test_build_abuild_leftovers"
-    "test_build_depends_binary_outdated"
-    "test_build_depends_high_level"
-    "test_build_depends_no_binary_error"
-    "test_build_is_necessary"
-    "test_build_local_source_high_level"
-    "test_build_src_invalid_path"
-    "test_check"
-    "test_can_fast_forward"
-    "test_check_build_for_arch"
-    "test_check_config"
-    "test_chroot_arguments"
-    "test_chroot_interactive_shell"
-    "test_chroot_interactive_shell_user"
-    "test_chroot_mount"
-    "test_clean_worktree"
-    "test_config_user"
-    "test_cross_compile_distcc"
-    "test_crossdirect"
-    "test_extract_arch"
-    "test_extract_version"
-    "test_file"
-    "test_filter_aport_packages"
-    "test_filter_missing_packages_binary_exists"
-    "test_filter_missing_packages_invalid"
-    "test_filter_missing_packages_pmaports"
-    "test_finish"
-    "test_folder_size"
-    "test_get_all_component_names"
-    "test_get_apkbuild"
-    "test_get_depends"
-    "test_get_upstream_remote"
-    "test_helpers_lint"
-    "test_helpers_package_get_apkindex"
-    "test_helpers_repo"
-    "test_helpers_ui"
-    "test_init_buildenv"
-    "test_kconfig_check"
-    "test_keys"
-    "test_newapkbuild"
-    "test_package"
-    "test_package_from_aports"
     "test_pkgrepo_pmaports"
-    "test_pkgrel_bump"
-    "test_pmbootstrap_status"
-    "test_print_checks_git_repo"
-    "test_proxy"
-    "test_pull"
-    "test_qemu_running_processes"
-    "test_questions_additional_options"
-    "test_questions_bootimg"
-    "test_questions_channel"
-    "test_questions_keymaps"
-    "test_questions_work_path"
-    "test_read_config_channel"
-    "test_recurse_invalid"
-    "test_run_abuild"
-    "test_run_core"
-    "test_shell_escape"
-    "test_skip_already_built"
-    "test_switch_to_channel_branch"
-    "test_version"
   ];
 
+  versionCheckProgramArg = "--version";
+
   makeWrapperArgs = [
     "--prefix PATH : ${
       lib.makeBinPath [
         git
         openssl
         multipath-tools
+        util-linux
       ]
     }"
   ];
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Sophisticated chroot/build/flash tool to develop and install postmarketOS";
     homepage = "https://gitlab.com/postmarketOS/pmbootstrap";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       onny
       lucasew
     ];

From d7e545210a327ff4247112f53babf3cdf473e55d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 19:12:19 +0000
Subject: [PATCH 217/229] tdlib: 1.8.41 -> 1.8.42

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

diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix
index 7c308bec90980..e096cab47e7f9 100644
--- a/pkgs/by-name/td/tdlib/package.nix
+++ b/pkgs/by-name/td/tdlib/package.nix
@@ -35,7 +35,7 @@ in
 
 stdenv.mkDerivation {
   pname = "tdlib";
-  version = "1.8.41";
+  version = "1.8.42";
 
   src = fetchFromGitHub {
     owner = "tdlib";
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
     # The tdlib authors do not set tags for minor versions, but
     # external programs depending on tdlib constrain the minor
     # version, hence we set a specific commit with a known version.
-    rev = "5b974c298d4ed551d3ad2c061ad7b8280d137c7e";
-    hash = "sha256-1TyGv2yMjX75+ccZSox/2m6SMmwEZAkShIhLfCeNmZg=";
+    rev = "ef580cd3dd0e5223c2be503342dc29e128be866e";
+    hash = "sha256-k1YQpQXYmEdoiyWeAcj2KRU+BcWuWbHpd4etxLspEoo=";
   };
 
   buildInputs = [

From 27a515f9dd89103d14f2b5182b2cb7460d80c2d2 Mon Sep 17 00:00:00 2001
From: Troels Henriksen <athas@sigkill.dk>
Date: Wed, 1 Jan 2025 22:44:30 +0100
Subject: [PATCH 218/229] mosml: pass -fpermissive to C compiler

The MosML build system relies on some terrible C that GCC 14 now
refuses to compile. This has supposedly been fixed in MosML upstream,
but the fix is not yet in any released version. It is not so easy to
simply cherry-pick the changes necessary to make GCC 14 work, since
they seem spread over various different commits. This change serves to
make this rather obscure derivation work for a little while longer.
---
 pkgs/by-name/mo/mosml/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/mo/mosml/package.nix b/pkgs/by-name/mo/mosml/package.nix
index 755a002ebff50..2bd5a6b1c0a0c 100644
--- a/pkgs/by-name/mo/mosml/package.nix
+++ b/pkgs/by-name/mo/mosml/package.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     "CC=${stdenv.cc.targetPrefix}cc"
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-fpermissive";
+
   src = fetchFromGitHub {
     owner = "kfl";
     repo = "mosml";

From a4c6e4d715f9da7cc66c75ff224c681f841dcd8f Mon Sep 17 00:00:00 2001
From: Nigel Banks <nigelgbanks@users.noreply.github.com>
Date: Thu, 2 Jan 2025 21:03:01 +0100
Subject: [PATCH 219/229] vscode-extensions.vadimcn.vscode-lldb: remove
 nigelgbanks as maintainer (#370342)

---
 .../editors/vscode/extensions/vadimcn.vscode-lldb/default.nix   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
index 20b81c3c70cdf..a4dec529aba67 100644
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
@@ -199,7 +199,7 @@ stdenv.mkDerivation {
     description = "Native debugger extension for VSCode based on LLDB";
     homepage = "https://github.com/vadimcn/vscode-lldb";
     license = [ lib.licenses.mit ];
-    maintainers = [ lib.maintainers.nigelgbanks ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 }

From 6118a3d758d113db7a72dc425afbd6237d0a6803 Mon Sep 17 00:00:00 2001
From: Dopplerian <dopplerian+git@proton.me>
Date: Mon, 16 Dec 2024 13:13:21 +0100
Subject: [PATCH 220/229] bashrun2: init at 0.2.6

---
 pkgs/by-name/ba/bashrun2/package.nix          | 90 +++++++++++++++++++
 .../ba/bashrun2/remote-permissions.patch      | 12 +++
 2 files changed, 102 insertions(+)
 create mode 100644 pkgs/by-name/ba/bashrun2/package.nix
 create mode 100644 pkgs/by-name/ba/bashrun2/remote-permissions.patch

diff --git a/pkgs/by-name/ba/bashrun2/package.nix b/pkgs/by-name/ba/bashrun2/package.nix
new file mode 100644
index 0000000000000..057d1e3894a45
--- /dev/null
+++ b/pkgs/by-name/ba/bashrun2/package.nix
@@ -0,0 +1,90 @@
+{
+  fetchFromGitHub,
+  lib,
+  stdenv,
+  makeWrapper,
+  xorg,
+  ncurses,
+  coreutils,
+  bashInteractive,
+  gnused,
+  gnugrep,
+  glibc,
+  xterm,
+  util-linux,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bashrun2";
+  version = "0.2.6";
+
+  src = fetchFromGitHub {
+    owner = "hbekel";
+    repo = "bashrun2";
+    tag = "v${version}";
+    hash = "sha256-U2ntplhyv8KAkaMd2D6wRsUIYkhJzxdgHo2xsbNRfqM=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  buildInputs = [
+    xorg.libX11
+  ];
+
+  patches = [
+    ./remote-permissions.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace \
+      man/bashrun2.1 \
+      --replace-fail '/usr/bin/brwctl' "$out/bin/brwctl"
+
+    substituteInPlace \
+      src/bindings \
+      src/registry \
+      src/utils \
+      src/bashrun2 \
+      src/frontend \
+      src/remote \
+      src/plugin \
+      src/engine \
+      src/bookmarks \
+      --replace-fail '/bin/rm' '${coreutils}/bin/rm'
+
+    substituteInPlace \
+      src/bashrun2 \
+      --replace-fail '#!/usr/bin/env bash' '#!${lib.getExe bashInteractive}'
+
+    substituteInPlace \
+      src/remote \
+      --replace-fail '/bin/cp' '${coreutils}/bin/cp'
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/bashrun2 \
+      --prefix PATH : "$out/bin:${
+        lib.makeBinPath [
+          ncurses
+          coreutils
+          gnused
+          gnugrep
+          glibc
+          bashInteractive
+          xterm
+          util-linux
+        ]
+      }" \
+      --prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
+  '';
+
+  meta = {
+    maintainers = with lib.maintainers; [ dopplerian ];
+    mainProgram = "bashrun2";
+    homepage = "http://henning-liebenau.de/bashrun2/";
+    license = lib.licenses.gpl2Plus;
+    description = "Application launcher based on a modified bash session in a small terminal window";
+  };
+}
diff --git a/pkgs/by-name/ba/bashrun2/remote-permissions.patch b/pkgs/by-name/ba/bashrun2/remote-permissions.patch
new file mode 100644
index 0000000000000..888280feaa2d9
--- /dev/null
+++ b/pkgs/by-name/ba/bashrun2/remote-permissions.patch
@@ -0,0 +1,12 @@
+diff --git a/src/remote b/src/remote
+index 07674ca..07a6b25 100644
+--- a/src/remote
++++ b/src/remote
+@@ -97,6 +97,7 @@ function §remote.interface.create {
+     local bookmarks="$bashrun_cache_home/remote-bookmarks.bash"
+ 
+     /bin/cp "$bashrun_site/interface" "$interface"
++    chmod +w "$interface"
+     printf '%s\n' "$bashrun_remote_interface" >> "$interface"
+ 
+     printf '%s\n' "source $bindings" >> "$interface"

From 080f7e9b06ff531439ff78385f97f5e0d8fa2bfa Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 2 Jan 2025 20:02:29 +0000
Subject: [PATCH 221/229] openroad: unpin Boost
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Doesn’t fully build for me due to the tests mentioned in
<https://github.com/NixOS/nixpkgs/pull/369735#issuecomment-2568320644>,
but gets past all the C++ compilation and fails on the same tests
as without this change, so this seeems safe to get rid of the sole
remaining user of Boost 1.80. Upstream pins no specific version in
their build system (though their Dockerfile installs the version from
CentOS 7, which is the truly ancient Boost 1.53).
---
 pkgs/applications/science/electronics/openroad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix
index 4558a9f69b4b9..e6278d57f1601 100644
--- a/pkgs/applications/science/electronics/openroad/default.nix
+++ b/pkgs/applications/science/electronics/openroad/default.nix
@@ -9,7 +9,7 @@
   git,
   python3,
   swig,
-  boost180,
+  boost,
   cbc, # for clp
   cimg,
   clp, # for or-tools
@@ -70,7 +70,7 @@ mkDerivation rec {
   ];
 
   buildInputs = [
-    boost180
+    boost
     cbc
     cimg
     clp

From bf9cdfc24c3d5b8088bb8ed3e0958d3f586c7d60 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 2 Jan 2025 14:46:23 -0400
Subject: [PATCH 222/229] dotnetCorePackages.dotnet_8.vmr: fix build on llvm 19

This is a backport of [1], which fixes:

> comreflectioncache.hpp:40:15: error: no member named 'EnterRead' in 'ReflectionCache<Element, CacheType, CacheSize>'; did you mean 'TryEnterRead'?

[1] https://github.com/dotnet/runtime/commit/043ae8c50dbe1c7377cf5ad436c5ac1c226aef79
---
 .../compilers/dotnet/fix-clang19-build.patch  | 48 +++++++++++++++++++
 pkgs/development/compilers/dotnet/vmr.nix     |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/compilers/dotnet/fix-clang19-build.patch

diff --git a/pkgs/development/compilers/dotnet/fix-clang19-build.patch b/pkgs/development/compilers/dotnet/fix-clang19-build.patch
new file mode 100644
index 0000000000000..40964acb24dd4
--- /dev/null
+++ b/pkgs/development/compilers/dotnet/fix-clang19-build.patch
@@ -0,0 +1,48 @@
+From 36354a7aca58753893148d62a889ca9e27381ac0 Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Thu, 2 Jan 2025 15:30:16 -0400
+Subject: [PATCH] fix clang19 build
+
+---
+ src/runtime/src/coreclr/vm/comreflectioncache.hpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/runtime/src/coreclr/vm/comreflectioncache.hpp b/src/runtime/src/coreclr/vm/comreflectioncache.hpp
+index 08d173e616..12db55251d 100644
+--- a/src/runtime/src/coreclr/vm/comreflectioncache.hpp
++++ b/src/runtime/src/coreclr/vm/comreflectioncache.hpp
+@@ -26,6 +26,7 @@ public:
+ 
+     void Init();
+ 
++#ifndef DACCESS_COMPILE
+     BOOL GetFromCache(Element *pElement, CacheType& rv)
+     {
+         CONTRACTL
+@@ -102,6 +103,7 @@ public:
+         AdjustStamp(TRUE);
+         this->LeaveWrite();
+     }
++#endif // !DACCESS_COMPILE
+ 
+ private:
+     // Lock must have been taken before calling this.
+@@ -141,6 +143,7 @@ private:
+         return CacheSize;
+     }
+ 
++#ifndef DACCESS_COMPILE
+     void AdjustStamp(BOOL hasWriterLock)
+     {
+         CONTRACTL
+@@ -170,6 +173,7 @@ private:
+         if (!hasWriterLock)
+             this->LeaveWrite();
+     }
++#endif // !DACCESS_COMPILE
+ 
+     void UpdateHashTable(SIZE_T hash, int slot)
+     {
+-- 
+2.47.0
+
diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index 45c10ebd3b390..1e71d0bd6509e 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -148,6 +148,7 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals (lib.versionOlder version "9") [
       ./fix-aspnetcore-portable-build.patch
+      ./fix-clang19-build.patch
     ];
 
   postPatch =

From 595b69c36596a3814bf09193ee735e904907db96 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Thu, 2 Jan 2025 16:15:51 -0300
Subject: [PATCH 223/229] livebook: 0.14.4 -> 0.14.5, tweak, fix update script

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/li/livebook/package.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/li/livebook/package.nix b/pkgs/by-name/li/livebook/package.nix
index c346aa664be09..8dfe7a9cf5cc8 100644
--- a/pkgs/by-name/li/livebook/package.nix
+++ b/pkgs/by-name/li/livebook/package.nix
@@ -7,10 +7,11 @@
   erlang,
   fetchFromGitHub,
   nixosTests,
+  nix-update-script,
 }:
 beamPackages.mixRelease rec {
   pname = "livebook";
-  version = "0.14.4";
+  version = "0.14.5";
 
   inherit elixir;
 
@@ -21,14 +22,14 @@ beamPackages.mixRelease rec {
   src = fetchFromGitHub {
     owner = "livebook-dev";
     repo = "livebook";
-    rev = "v${version}";
-    hash = "sha256-XpBJlPLr7E3OqTnLxnSmKCgDyiU1hT8WfOhWeRGYROA=";
+    tag = "v${version}";
+    hash = "sha256-VSxW+X5zt6npV4tVVgTEvQhjA+jTramSX5h92BWWaQM=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version;
-    hash = "sha256-jB6IOBX3LwdrEtaWY3gglo1HO2OhdiK8j3BgzfZ1nAU=";
+    hash = "sha256-FrkM82LO7GIFpKQfhlEUrAuKu33BzPBs6OrWW4C6pI0=";
   };
 
   postInstall = ''
@@ -42,18 +43,21 @@ beamPackages.mixRelease rec {
       --set MIX_REBAR3 ${rebar3}/bin/rebar3
   '';
 
-  passthru.tests = {
-    livebook-service = nixosTests.livebook-service;
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      livebook-service = nixosTests.livebook-service;
+    };
   };
 
-  meta = with lib; {
-    license = licenses.asl20;
+  meta = {
+    license = lib.licenses.asl20;
     homepage = "https://livebook.dev/";
     description = "Automate code & data workflows with interactive Elixir notebooks";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       munksgaard
       scvalex
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

From df9822a7b119c51227a6dab5a091f6a14947ff9c Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 15:49:40 -0500
Subject: [PATCH 224/229] maintainers: add tebriel

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8e176d01b9089..463589fd1dcf7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22306,6 +22306,12 @@
     github = "teatwig";
     githubId = 18734648;
   };
+  tebriel = {
+    email = "tebriel@frodux.in";
+    name = "tebriel";
+    github = "tebriel";
+    githubId = 821688;
+  };
   techknowlogick = {
     email = "techknowlogick@gitea.com";
     github = "techknowlogick";

From cee5e731ccd21bbcc54604260860241ffdce315d Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 15:42:55 -0500
Subject: [PATCH 225/229] komga: 1.15.0 -> 1.15.1

---
 pkgs/by-name/ko/komga/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index 467af02ffc6e8..8afc916c7a66b 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -3,17 +3,17 @@
   stdenvNoCC,
   fetchurl,
   makeWrapper,
-  jdk17_headless,
+  jdk23_headless,
   nixosTests,
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "komga";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchurl {
     url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
-    sha256 = "sha256-mgPGhBdZ7FyxkVNPJkfFjQ6mJDbQ049PKzacTN6cajk=";
+    sha256 = "sha256-Gv0AaW3aTjLjNAzC5FJMVfvZyIN23ezPpRk15OYyKKs=";
   };
 
   nativeBuildInputs = [
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   buildCommand = ''
-    makeWrapper ${jdk17_headless}/bin/java $out/bin/komga --add-flags "-jar $src"
+    makeWrapper ${jdk23_headless}/bin/java $out/bin/komga --add-flags "-jar $src"
   '';
 
   passthru.tests = {
@@ -32,9 +32,9 @@ stdenvNoCC.mkDerivation rec {
     description = "Free and open source comics/mangas server";
     homepage = "https://komga.org/";
     license = lib.licenses.mit;
-    platforms = jdk17_headless.meta.platforms;
+    platforms = jdk23_headless.meta.platforms;
     maintainers = with lib.maintainers; [ govanify ];
     mainProgram = "komga";
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
   };
-
 }

From 98891a2ea0407d3f9abdef13092f2c1a59e0f647 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 15:43:59 -0500
Subject: [PATCH 226/229] komga: add tebriel to maintainers

---
 pkgs/by-name/ko/komga/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index 8afc916c7a66b..38764f7e8612c 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -33,7 +33,10 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://komga.org/";
     license = lib.licenses.mit;
     platforms = jdk23_headless.meta.platforms;
-    maintainers = with lib.maintainers; [ govanify ];
+    maintainers = with lib.maintainers; [
+      tebriel
+      govanify
+    ];
     mainProgram = "komga";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
   };

From f4992924b349403fb365338aa101cebe5322bf2a Mon Sep 17 00:00:00 2001
From: Johan Larsson <jolars@posteo.com>
Date: Thu, 2 Jan 2025 22:07:20 +0100
Subject: [PATCH 227/229] vimPlugins.nvim-trevJ-lua: init at 2024-12-23

vimPlugins.nvim-trevJ-lua: init at 2024-12-23

chore: put dependency on single line
---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix  |  5 +++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 3 files changed, 18 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 5a9bd0328c259..5ffbeb90305a5 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -9785,6 +9785,18 @@ final: prev:
     meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/";
   };
 
+  nvim-trevJ-lua = buildVimPlugin {
+    pname = "nvim-trevJ.lua";
+    version = "2024-12-23";
+    src = fetchFromGitHub {
+      owner = "AckslD";
+      repo = "nvim-trevJ.lua";
+      rev = "86445d0143d47aede944b6daa5c0a463e9d3e730";
+      sha256 = "0wrmzk7wyr4mk8y0c7hq0qqk19ngdwvvd80690vqs3vby89a5zkj";
+    };
+    meta.homepage = "https://github.com/AckslD/nvim-trevJ.lua/";
+  };
+
   nvim-ts-autotag = buildVimPlugin {
     pname = "nvim-ts-autotag";
     version = "2024-12-02";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index f9f3f0dff68a5..0fd5010f7d517 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2308,6 +2308,11 @@ in
     dependencies = [ self.nvim-treesitter ];
   };
 
+  nvim-trevJ-lua = super.nvim-trevJ-lua.overrideAttrs {
+    dependencies = [ self.nvim-treesitter ];
+    nvimRequireCheck = "trevj";
+  };
+
   nvim-ufo = super.nvim-ufo.overrideAttrs {
     dependencies = [ self.promise-async ];
     nvimRequireCheck = "ufo";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 46f11e2e3b4cc..26579292c0517 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -812,6 +812,7 @@ https://github.com/nvim-treesitter/nvim-treesitter-refactor/,,
 https://github.com/PaterJason/nvim-treesitter-sexp/,HEAD,
 https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,,
 https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD,
+https://github.com/AckslD/nvim-trevJ.lua/,HEAD,
 https://github.com/windwp/nvim-ts-autotag/,,
 https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
 https://github.com/kevinhwang91/nvim-ufo/,HEAD,

From 87b42d403e5856b99476e869f27c78df3e14fa97 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Wed, 1 Jan 2025 13:29:37 -0800
Subject: [PATCH 228/229] nixos/ncps: init service

---
 .../manual/release-notes/rl-2505.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/networking/ncps.nix    | 326 ++++++++++++++++++
 3 files changed, 329 insertions(+)
 create mode 100644 nixos/modules/services/networking/ncps.nix

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 9b39fb1869ea7..47606fab3d742 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -51,6 +51,8 @@
 
 - [networking.modemmanager](options.html#opt-networking.modemmanager) has been split out of [networking.networkmanager](options.html#opt-networking.networkmanager). NetworkManager still enables ModemManager by default, but options exist now to run NetworkManager without ModemManager.
 
+- [ncps](https://github.com/kalbasit/ncps), a Nix binary cache proxy service implemented in Go using [go-nix](https://github.com/nix-community/go-nix). Available as [services.ncps](options.html#opt-services.ncps.enable).
+
 - [Conduwuit](https://conduwuit.puppyirl.gay/), a federated chat server implementing the Matrix protocol, forked from Conduit. Available as [services.conduwuit](#opt-services.conduwuit.enable).
 
 - [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 06979a4df508f..7dc6e6f0489ad 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1160,6 +1160,7 @@
   ./services/networking/nats.nix
   ./services/networking/nbd.nix
   ./services/networking/ncdns.nix
+  ./services/networking/ncps.nix
   ./services/networking/ndppd.nix
   ./services/networking/nebula.nix
   ./services/networking/netbird.nix
diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix
new file mode 100644
index 0000000000000..12b51bf05217d
--- /dev/null
+++ b/nixos/modules/services/networking/ncps.nix
@@ -0,0 +1,326 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.services.ncps;
+
+  logLevels = [
+    "trace"
+    "debug"
+    "info"
+    "warn"
+    "error"
+    "fatal"
+    "panic"
+  ];
+
+  globalFlags = lib.concatStringsSep " " (
+    [ "--log-level='${cfg.logLevel}'" ]
+    ++ (lib.optionals cfg.openTelemetry.enable (
+      [
+        "--otel-enabled"
+      ]
+      ++ (lib.optional (
+        cfg.openTelemetry.grpcURL != null
+      ) "--otel-grpc-url='${cfg.openTelemetry.grpcURL}'")
+    ))
+  );
+
+  serveFlags = lib.concatStringsSep " " (
+    [
+      "--cache-hostname='${cfg.cache.hostName}'"
+      "--cache-data-path='${cfg.cache.dataPath}'"
+      "--cache-database-url='${cfg.cache.databaseURL}'"
+      "--server-addr='${cfg.server.addr}'"
+    ]
+    ++ (lib.optional cfg.cache.allowDeleteVerb "--cache-allow-delete-verb")
+    ++ (lib.optional cfg.cache.allowPutVerb "--cache-allow-put-verb")
+    ++ (lib.optional (cfg.cache.maxSize != null) "--cache-max-size='${cfg.cache.maxSize}'")
+    ++ (lib.optionals (cfg.cache.lru.schedule != null) [
+      "--cache-lru-schedule='${cfg.cache.lru.schedule}'"
+      "--cache-lru-schedule-timezone='${cfg.cache.lru.scheduleTimeZone}'"
+    ])
+    ++ (lib.optional (cfg.cache.secretKeyPath != null) "--cache-secret-key-path='%d/secretKey'")
+    ++ (lib.forEach cfg.upstream.caches (url: "--upstream-cache='${url}'"))
+    ++ (lib.forEach cfg.upstream.publicKeys (pk: "--upstream-public-key='${pk}'"))
+  );
+
+  isSqlite = lib.strings.hasPrefix "sqlite:" cfg.cache.databaseURL;
+
+  dbPath = lib.removePrefix "sqlite:" cfg.cache.databaseURL;
+  dbDir = dirOf dbPath;
+in
+{
+  options = {
+    services.ncps = {
+      enable = lib.mkEnableOption "ncps: Nix binary cache proxy service implemented in Go";
+
+      package = lib.mkPackageOption pkgs "ncps" { };
+
+      dbmatePackage = lib.mkPackageOption pkgs "dbmate" { };
+
+      openTelemetry = {
+        enable = lib.mkEnableOption "Enable OpenTelemetry logs, metrics, and tracing";
+
+        grpcURL = lib.mkOption {
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+          description = ''
+            Configure OpenTelemetry gRPC URL. Missing or "https" scheme enables
+            secure gRPC, "insecure" otherwise. Omit to emit telemetry to
+            stdout.
+          '';
+        };
+      };
+
+      logLevel = lib.mkOption {
+        type = lib.types.enum logLevels;
+        default = "info";
+        description = ''
+          Set the level for logging. Refer to
+          <https://pkg.go.dev/github.com/rs/zerolog#readme-leveled-logging> for
+          more information.
+        '';
+      };
+
+      cache = {
+        allowDeleteVerb = lib.mkEnableOption ''
+          Whether to allow the DELETE verb to delete narinfo and nar files from
+          the cache.
+        '';
+
+        allowPutVerb = lib.mkEnableOption ''
+          Whether to allow the PUT verb to push narinfo and nar files directly
+          to the cache.
+        '';
+
+        hostName = lib.mkOption {
+          type = lib.types.str;
+          description = ''
+            The hostname of the cache server. **This is used to generate the
+            private key used for signing store paths (.narinfo)**
+          '';
+        };
+
+        dataPath = lib.mkOption {
+          type = lib.types.str;
+          default = "/var/lib/ncps";
+          description = ''
+            The local directory for storing configuration and cached store paths
+          '';
+        };
+
+        databaseURL = lib.mkOption {
+          type = lib.types.str;
+          default = "sqlite:${cfg.cache.dataPath}/db/db.sqlite";
+          defaultText = "sqlite:/var/lib/ncps/db/db.sqlite";
+          description = ''
+            The URL of the database (currently only SQLite is supported)
+          '';
+        };
+
+        lru = {
+          schedule = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            example = "0 2 * * *";
+            description = ''
+              The cron spec for cleaning the store to keep it under
+              config.ncps.cache.maxSize. Refer to
+              https://pkg.go.dev/github.com/robfig/cron/v3#hdr-Usage for
+              documentation.
+            '';
+          };
+
+          scheduleTimeZone = lib.mkOption {
+            type = lib.types.str;
+            default = "Local";
+            example = "America/Los_Angeles";
+            description = ''
+              The name of the timezone to use for the cron schedule. See
+              <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>
+              for a comprehensive list of possible values for this setting.
+            '';
+          };
+        };
+
+        maxSize = lib.mkOption {
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+          example = "100G";
+          description = ''
+            The maximum size of the store. It can be given with units such as
+            5K, 10G etc. Supported units: B, K, M, G, T.
+          '';
+        };
+
+        secretKeyPath = lib.mkOption {
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+          description = ''
+            The path to load the secretKey for signing narinfos. Leave this
+            empty to automatically generate a private/public key.
+          '';
+        };
+      };
+
+      server = {
+        addr = lib.mkOption {
+          type = lib.types.str;
+          default = ":8501";
+          description = ''
+            The address and port the server listens on.
+          '';
+        };
+      };
+
+      upstream = {
+        caches = lib.mkOption {
+          type = lib.types.listOf lib.types.str;
+          example = [ "https://cache.nixos.org" ];
+          description = ''
+            A list of URLs of upstream binary caches.
+          '';
+        };
+
+        publicKeys = lib.mkOption {
+          type = lib.types.listOf lib.types.str;
+          default = [ ];
+          example = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+          description = ''
+            A list of public keys of upstream caches in the format
+            `host[-[0-9]*]:public-key`. This flag is used to verify the
+            signatures of store paths downloaded from upstream caches.
+          '';
+        };
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.cache.lru.schedule == null || cfg.cache.maxSize != null;
+        message = "You must specify config.ncps.cache.lru.schedule when config.ncps.cache.maxSize is set";
+      }
+
+      {
+        assertion = cfg.cache.secretKeyPath == null || (builtins.pathExists cfg.cache.secretKeyPath);
+        message = "config.ncps.cache.secresecretKeyPath=${cfg.cache.secretKeyPath} must exist but does not";
+      }
+    ];
+
+    users.users.ncps = {
+      isSystemUser = true;
+      group = "ncps";
+    };
+    users.groups.ncps = { };
+
+    systemd.services.ncps-create-datadirs = {
+      description = "Created required directories by ncps";
+      serviceConfig = {
+        Type = "oneshot";
+        UMask = "0066";
+      };
+      script =
+        (lib.optionalString (cfg.cache.dataPath != "/var/lib/ncps") ''
+          if ! test -d ${cfg.cache.dataPath}; then
+            mkdir -p ${cfg.cache.dataPath}
+            chown ncps:ncps ${cfg.cache.dataPath}
+          fi
+        '')
+        + (lib.optionalString isSqlite ''
+          if ! test -d ${dbDir}; then
+            mkdir -p ${dbDir}
+            chown ncps:ncps ${dbDir}
+          fi
+        '');
+      wantedBy = [ "ncps.service" ];
+      before = [ "ncps.service" ];
+    };
+
+    systemd.services.ncps = {
+      description = "ncps binary cache proxy service";
+
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      preStart = ''
+        ${lib.getExe cfg.dbmatePackage} --migrations-dir=${cfg.package}/share/ncps/db/migrations --url=${cfg.cache.databaseURL} up
+      '';
+
+      serviceConfig = lib.mkMerge [
+        {
+          ExecStart = "${lib.getExe cfg.package} ${globalFlags} serve ${serveFlags}";
+          User = "ncps";
+          Group = "ncps";
+          Restart = "on-failure";
+          RuntimeDirectory = "ncps";
+        }
+
+        # credentials
+        (lib.mkIf (cfg.cache.secretKeyPath != null) {
+          LoadCredential = "secretKey:${cfg.cache.secretKeyPath}";
+        })
+
+        # ensure permissions on required directories
+        (lib.mkIf (cfg.cache.dataPath != "/var/lib/ncps") {
+          ReadWritePaths = [ cfg.cache.dataPath ];
+        })
+        (lib.mkIf (cfg.cache.dataPath == "/var/lib/ncps") {
+          StateDirectory = "ncps";
+          StateDirectoryMode = "0700";
+        })
+        (lib.mkIf (isSqlite && !lib.strings.hasPrefix "/var/lib/ncps" dbDir) {
+          ReadWritePaths = [ dbDir ];
+        })
+
+        # Hardening
+        {
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged"
+            "~@resources"
+          ];
+          CapabilityBoundingSet = "";
+          PrivateUsers = true;
+          DevicePolicy = "closed";
+          DeviceAllow = [ "" ];
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectControlGroups = true;
+          ProtectKernelLogs = true;
+          ProtectHostname = true;
+          ProtectClock = true;
+          ProtectProc = "invisible";
+          ProtectSystem = "strict";
+          ProtectHome = true;
+          RestrictSUIDSGID = true;
+          RestrictRealtime = true;
+          MemoryDenyWriteExecute = true;
+          ProcSubset = "pid";
+          RestrictNamespaces = true;
+          SystemCallArchitectures = "native";
+          PrivateNetwork = false;
+          PrivateTmp = true;
+          PrivateDevices = true;
+          PrivateMounts = true;
+          NoNewPrivileges = true;
+          LockPersonality = true;
+          RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
+          LimitNOFILE = 65536;
+          UMask = "0066";
+        }
+      ];
+
+      unitConfig.RequiresMountsFor = lib.concatStringsSep " " (
+        [ "${cfg.cache.dataPath}" ] ++ lib.optional (isSqlite) dbDir
+      );
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ kalbasit ];
+}

From 07144733765a9fdfc4fb0e81c5242a0fa095f17e Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Wed, 1 Jan 2025 17:15:26 -0800
Subject: [PATCH 229/229] nixos/tests/ncps: init service test

---
 nixos/tests/all-tests.nix |  5 +++
 nixos/tests/ncps.nix      | 89 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 nixos/tests/ncps.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 147e9c11612e3..5aed7937ebf43 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -659,6 +659,11 @@ in {
   navidrome = handleTest ./navidrome.nix {};
   nbd = handleTest ./nbd.nix {};
   ncdns = handleTest ./ncdns.nix {};
+  ncps = runTest ./ncps.nix;
+  ncps-custom-cache-datapath = runTest {
+    imports = [ ./ncps.nix ];
+    defaults.services.ncps.cache.dataPath =  "/path/to/ncps";
+  };
   ndppd = handleTest ./ndppd.nix {};
   nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { };
   nebula = handleTest ./nebula.nix {};
diff --git a/nixos/tests/ncps.nix b/nixos/tests/ncps.nix
new file mode 100644
index 0000000000000..ce637246ff448
--- /dev/null
+++ b/nixos/tests/ncps.nix
@@ -0,0 +1,89 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  name = "ncps";
+
+  nodes = {
+    harmonia = {
+      services.harmonia = {
+        enable = true;
+        signKeyPaths = [
+          (pkgs.writeText "cache-key" "cache.example.com-1:9FhO0w+7HjZrhvmzT1VlAZw4OSAlFGTgC24Seg3tmPl4gZBdwZClzTTHr9cVzJpwsRSYLTu7hEAQe3ljy92CWg==")
+        ];
+        settings.priority = 35;
+      };
+
+      networking.firewall.allowedTCPPorts = [ 5000 ];
+      system.extraDependencies = [ pkgs.emptyFile ];
+    };
+
+    ncps = {
+      services.ncps = {
+        enable = true;
+
+        cache = {
+          hostName = "ncps";
+          secretKeyPath = builtins.toString (
+            pkgs.writeText "ncps-cache-key" "ncps:dcrGsrku0KvltFhrR5lVIMqyloAdo0y8vYZOeIFUSLJS2IToL7dPHSSCk/fi+PJf8EorpBn8PU7MNhfvZoI8mA=="
+          );
+        };
+
+        upstream = {
+          caches = [ "http://harmonia:5000" ];
+          publicKeys = [
+            "cache.example.com-1:eIGQXcGQpc00x6/XFcyacLEUmC07u4RAEHt5Y8vdglo="
+          ];
+        };
+      };
+
+      networking.firewall.allowedTCPPorts = [ 8501 ];
+    };
+
+    client01 = {
+      nix.settings = {
+        substituters = lib.mkForce [ "http://ncps:8501" ];
+        trusted-public-keys = lib.mkForce [
+          "ncps:UtiE6C+3Tx0kgpP34vjyX/BKK6QZ/D1OzDYX72aCPJg="
+        ];
+      };
+    };
+  };
+
+  testScript =
+    { nodes, ... }:
+    let
+      narinfoName =
+        (lib.strings.removePrefix "/nix/store/" (
+          lib.strings.removeSuffix "-empty-file" pkgs.emptyFile.outPath
+        ))
+        + ".narinfo";
+
+      narinfoNameChars = lib.strings.stringToCharacters narinfoName;
+
+      narinfoPath = lib.concatStringsSep "/" [
+        nodes.ncps.services.ncps.cache.dataPath
+        "store/narinfo"
+        (lib.lists.elemAt narinfoNameChars 0)
+        ((lib.lists.elemAt narinfoNameChars 0) + (lib.lists.elemAt narinfoNameChars 1))
+        narinfoName
+      ];
+    in
+    ''
+      start_all()
+
+      harmonia.wait_for_unit("harmonia.service")
+
+      ncps.wait_for_unit("ncps.service")
+
+      client01.wait_until_succeeds("curl -f http://ncps:8501/ | grep '\"hostname\":\"${toString nodes.ncps.services.ncps.cache.hostName}\"' >&2")
+
+      client01.succeed("cat /etc/nix/nix.conf >&2")
+      client01.succeed("nix-store --realise ${pkgs.emptyFile}")
+
+      ncps.succeed("cat ${narinfoPath} >&2")
+    '';
+}