From 4f86994b739c33588d8c1c1649dd0d4139c5266b Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Tue, 17 Dec 2024 11:36:53 +0100
Subject: [PATCH 01/74] matrix-commander: 7.6.2 -> 8.0.4

---
 .../instant-messengers/matrix-commander/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
index 23df7627e6fa..2ed07af8eeb3 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonApplication rec {
   pname = "matrix-commander";
-  version = "7.6.2";
+  version = "8.0.4";
 
   src = fetchFromGitHub {
     owner = "8go";
     repo = "matrix-commander";
     rev = "v${version}";
-    hash = "sha256-BiQShJHCTvEdkhp21uxxCTxBZ1eezuWE6btMc/wkPlc=";
+    hash = "sha256-JZcdAo6d7huwDQ9hJE8oT5FH0ZQjg0DhoglOkhOyk1o=";
   };
 
   format = "pyproject";

From 72b219d8eacaefcf956844bcfec67674b0b4a1cb Mon Sep 17 00:00:00 2001
From: BlaiZephyr <arbeit.t.lechner@gmail.com>
Date: Sat, 21 Dec 2024 09:40:02 +0100
Subject: [PATCH 02/74] update to 18.8.2

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

diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix
index 7ab1ef89e2e7..87c300c29646 100644
--- a/pkgs/games/ddnet/default.nix
+++ b/pkgs/games/ddnet/default.nix
@@ -33,19 +33,19 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "18.7";
+  version = "18.8.2";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = pname;
     rev = version;
-    hash = "sha256-mOXD7lEggFus+TBZ5042QALu4PhHRBntnChQFnHu6Dw=";
+    hash = "sha256-+X56o8s9kbNxufDeQVLAaVG8jxcSTFVssn1HnxIHhZQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     name = "${pname}-${version}";
     inherit src;
-    hash = "sha256-zug7MzxqGhlmm6ZeRo+3ldwmFEn5cVCb+nvRzomFrnc=";
+    hash = "sha256-b1JOj8p5+Q2SvmbBvLxGFPCLALcOc4mAdegPCsMnNqc=";
   };
 
   nativeBuildInputs = [

From 6ac2b4a240387ea435022c11ad30d0010962fd3f Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 25 Dec 2024 15:58:03 +0900
Subject: [PATCH 03/74] pinact: prefer versionCheckHook rather than
 testers.testVersion

https://github.com/NixOS/nixpkgs/blob/bd352cd67834c983d69adf4080d225dbe28f99ba/doc/stdenv/passthru.chapter.md?plain=1#L84
---
 pkgs/by-name/pi/pinact/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index 8e72aa925dc5..9ec8b7888ebc 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -2,9 +2,8 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
-  testers,
+  versionCheckHook,
   nix-update-script,
-  pinact,
 }:
 
 let
@@ -16,6 +15,7 @@ let
     rev = "v${version}";
     hash = "sha256-fOmQDfqG1aWzpL80Nc8JA6HWQR+z9mhqtwU4rC2g2Gg=";
   };
+  mainProgram = "pinact";
 in
 buildGoModule {
   inherit pname version src;
@@ -24,11 +24,14 @@ buildGoModule {
 
   doCheck = true;
 
-  passthru = {
-    tests.version = testers.testVersion {
-      package = pinact;
-    };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${mainProgram}";
+  versionCheckProgramArg = [ "version" ];
 
+  passthru = {
     updateScript = nix-update-script { };
   };
 
@@ -39,11 +42,11 @@ buildGoModule {
   ];
 
   meta = with lib; {
+    inherit mainProgram;
     description = "Pin GitHub Actions versions";
     homepage = "https://github.com/suzuki-shunsuke/pinact";
     changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = [ maintainers.kachick ];
-    mainProgram = "pinact";
   };
 }

From c6a2750e4117341344cda6a82d228d77e82c9f91 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 25 Dec 2024 16:02:43 +0900
Subject: [PATCH 04/74] pinact: set CGO_ENABLED=0

Upstream sets 0 in the release

https://github.com/suzuki-shunsuke/pinact/blob/v1.0.0/.goreleaser.yml#L13

nixpkgs sets 1 by default

https://github.com/NixOS/nixpkgs/blob/471addceb995f4f9e84618c471d07c97597da2c5/doc/languages-frameworks/go.section.md?plain=1#L252
---
 pkgs/by-name/pi/pinact/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index 9ec8b7888ebc..55d97614e117 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -22,6 +22,8 @@ buildGoModule {
 
   vendorHash = "sha256-AFlkzs5mL/x9CwfF2apLcQbiu60GD33oFH6lQDHAL1M=";
 
+  env.CGO_ENABLED = 0;
+
   doCheck = true;
 
   nativeInstallCheckInputs = [

From 1750892a928fe72f01c1cff33e051a8f1f39b0a8 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 25 Dec 2024 15:58:30 +0900
Subject: [PATCH 05/74] pinact: prefer tag rather than rev for fetchFromGitHub

introduced in 7822cb34f86bcdd0b9f31f2955062216857a6757
---
 pkgs/by-name/pi/pinact/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index 55d97614e117..0c9e868185de 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "suzuki-shunsuke";
     repo = "pinact";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fOmQDfqG1aWzpL80Nc8JA6HWQR+z9mhqtwU4rC2g2Gg=";
   };
   mainProgram = "pinact";
@@ -40,14 +40,14 @@ buildGoModule {
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version} -X main.commit=${src.rev}"
+    "-X main.version=${version} -X main.commit=v${version}"
   ];
 
   meta = with lib; {
     inherit mainProgram;
     description = "Pin GitHub Actions versions";
     homepage = "https://github.com/suzuki-shunsuke/pinact";
-    changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/${src.rev}";
+    changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = [ maintainers.kachick ];
   };

From 5d50bc8e162d5a8172f9c10aa3cf27715d516e97 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 25 Dec 2024 16:37:56 +0900
Subject: [PATCH 06/74] pinact: reduce scope of with in meta

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

diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index 0c9e868185de..3f1a2f8f19b3 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -43,12 +43,12 @@ buildGoModule {
     "-X main.version=${version} -X main.commit=v${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     inherit mainProgram;
     description = "Pin GitHub Actions versions";
     homepage = "https://github.com/suzuki-shunsuke/pinact";
     changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.kachick ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kachick ];
   };
 }

From 3b8fc626560eb0cc2187436d1bdc932df170a62d Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sat, 28 Dec 2024 12:20:13 +0900
Subject: [PATCH 07/74] pinact: 1.0.0 -> 1.1.0

Diff: https://github.com/suzuki-shunsuke/pinact/compare/v1.0.0...v1.1.0
---
 pkgs/by-name/pi/pinact/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index 3f1a2f8f19b3..95718e5d4d25 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -8,19 +8,19 @@
 
 let
   pname = "pinact";
-  version = "1.0.0";
+  version = "1.1.0";
   src = fetchFromGitHub {
     owner = "suzuki-shunsuke";
     repo = "pinact";
     tag = "v${version}";
-    hash = "sha256-fOmQDfqG1aWzpL80Nc8JA6HWQR+z9mhqtwU4rC2g2Gg=";
+    hash = "sha256-FOWlCKhMZhxWRb6079aSbTO3RR1Da7ZfjHb5N/ULl8o=";
   };
   mainProgram = "pinact";
 in
 buildGoModule {
   inherit pname version src;
 
-  vendorHash = "sha256-AFlkzs5mL/x9CwfF2apLcQbiu60GD33oFH6lQDHAL1M=";
+  vendorHash = "sha256-Cdo24F1ewrGhXHC+gOh/HNlCQhJfTYBMqLWoL8HedYE=";
 
   env.CGO_ENABLED = 0;
 

From 2316da9798ef5eba2b2a494f95c507710489d661 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sat, 28 Dec 2024 18:20:08 +0900
Subject: [PATCH 08/74] pinact: 1.1.0 -> 1.1.1

Diff: https://github.com/suzuki-shunsuke/pinact/compare/v1.1.0...v1.1.1
---
 pkgs/by-name/pi/pinact/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index 95718e5d4d25..b2a7bbde40b1 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -8,12 +8,12 @@
 
 let
   pname = "pinact";
-  version = "1.1.0";
+  version = "1.1.1";
   src = fetchFromGitHub {
     owner = "suzuki-shunsuke";
     repo = "pinact";
     tag = "v${version}";
-    hash = "sha256-FOWlCKhMZhxWRb6079aSbTO3RR1Da7ZfjHb5N/ULl8o=";
+    hash = "sha256-nreKo4tH5fidevuWH4LYg4c0uoeiEFPF0qSYouC5N5w=";
   };
   mainProgram = "pinact";
 in

From d49a887c164a5754caf3d33773849eb62c5ac676 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 30 Dec 2024 10:30:44 +0900
Subject: [PATCH 09/74] pinact: 1.1.1 -> 1.1.2

Diff: https://github.com/suzuki-shunsuke/pinact/compare/v1.1.1...v1.1.2
---
 pkgs/by-name/pi/pinact/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index b2a7bbde40b1..c310b752a0ee 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -8,19 +8,19 @@
 
 let
   pname = "pinact";
-  version = "1.1.1";
+  version = "1.1.2";
   src = fetchFromGitHub {
     owner = "suzuki-shunsuke";
     repo = "pinact";
     tag = "v${version}";
-    hash = "sha256-nreKo4tH5fidevuWH4LYg4c0uoeiEFPF0qSYouC5N5w=";
+    hash = "sha256-QBWxs0YRTWItJ1aTG33Z6vK8/vaZBTuZAVPYqD6dIvE=";
   };
   mainProgram = "pinact";
 in
 buildGoModule {
   inherit pname version src;
 
-  vendorHash = "sha256-Cdo24F1ewrGhXHC+gOh/HNlCQhJfTYBMqLWoL8HedYE=";
+  vendorHash = "sha256-Y44nJv0eWM0xO+lB56OBcEe/CCipPj8Ptg7WuJ2Vszo=";
 
   env.CGO_ENABLED = 0;
 

From d6891b326ed2c30ca3704aee27bc6968bf620617 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Dec 2024 19:20:28 +0000
Subject: [PATCH 10/74] =?UTF-8?q?gnome-robots:=2040.0=20=E2=86=92=2041.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-robots/-/compare/40.0...41.1
---
 pkgs/by-name/gn/gnome-robots/package.nix | 105 ++++++++++++++++-------
 1 file changed, 74 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-robots/package.nix b/pkgs/by-name/gn/gnome-robots/package.nix
index dfe37b8dff4c..72b8725d3da6 100644
--- a/pkgs/by-name/gn/gnome-robots/package.nix
+++ b/pkgs/by-name/gn/gnome-robots/package.nix
@@ -1,73 +1,116 @@
 {
   lib,
   stdenv,
+  cargo,
+  desktop-file-utils,
   fetchurl,
-  pkg-config,
+  glib,
   gnome,
-  gtk3,
-  wrapGAppsHook3,
-  librsvg,
-  gsound,
-  gettext,
+  gtk4,
   itstool,
+  libadwaita,
+  librsvg,
   libxml2,
-  libgnome-games-support,
-  libgee,
+  gst_all_1,
   meson,
   ninja,
-  vala,
-  python3,
-  desktop-file-utils,
-  adwaita-icon-theme,
+  pkg-config,
+  rustc,
+  rustPlatform,
+  wrapGAppsHook4,
+  _experimental-update-script-combinators,
+  common-updater-scripts,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-robots";
-  version = "40.0";
+  version = "41.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/gnome-robots-${version}.tar.xz";
-    hash = "sha256-b78viFdQ8aURCnJPjzWt3ZvGEYTuMc8MDLiZU+T0yxE=";
+    url = "mirror://gnome/sources/gnome-robots/${lib.versions.major finalAttrs.version}/gnome-robots-${finalAttrs.version}.tar.xz";
+    hash = "sha256-K4BQcFrIPpOL56iREyYB62XHk/IJzX6RDGzWQphzBHg=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit (finalAttrs) src;
+    name = "gnome-robots-${finalAttrs.version}";
+    hash = "sha256-rn/rs0D2qKDYf8oxpegQalPQIVuT8rSrHTzeZqWGn44=";
   };
 
   nativeBuildInputs = [
     pkg-config
     meson
     ninja
-    vala
-    python3
-    libxml2
-    wrapGAppsHook3
-    gettext
+    cargo
+    rustc
+    rustPlatform.cargoSetupHook
+    gtk4 # for gtk4-update-icon-cache
+    wrapGAppsHook4
     itstool
     desktop-file-utils
   ];
 
   buildInputs = [
-    gtk3
+    glib
+    gtk4
+    libadwaita
     librsvg
-    gsound
-    libgnome-games-support
-    libgee
-    adwaita-icon-theme
+    libxml2
+    # Sound playback, not checked at build time.
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
   ];
 
   postPatch = ''
-    chmod +x build-aux/meson_post_install.py
-    patchShebangs build-aux/meson_post_install.py
+    # https://gitlab.gnome.org/GNOME/gnome-robots/-/merge_requests/38
+    substituteInPlace data/icons/meson.build \
+      --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
+  '';
+
+  preFixup = ''
+    # Seal GStreamer plug-ins so that we can notice when they are missing.
+    gappsWrapperArgs+=(--set "GST_PLUGIN_SYSTEM_PATH_1_0" "$GST_PLUGIN_SYSTEM_PATH_1_0")
+    unset GST_PLUGIN_SYSTEM_PATH_1_0
   '';
 
   passthru = {
-    updateScript = gnome.updateScript { packageName = "gnome-robots"; };
+    updateScript =
+      let
+        updateSource = gnome.updateScript {
+          packageName = "gnome-robots";
+        };
+
+        updateLockfile = {
+          command = [
+            "sh"
+            "-c"
+            ''
+              PATH=${
+                lib.makeBinPath [
+                  common-updater-scripts
+                ]
+              }
+              update-source-version gnome-robots --ignore-same-version --source-key=cargoDeps > /dev/null
+            ''
+          ];
+          # Experimental feature: do not copy!
+          supportedFeatures = [ "silent" ];
+        };
+      in
+      _experimental-update-script-combinators.sequence [
+        updateSource
+        updateLockfile
+      ];
   };
 
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/GNOME/gnome-robots";
-    changelog = "https://gitlab.gnome.org/GNOME/gnome-robots/-/blob/${version}/NEWS?ref_type=tags";
+    changelog = "https://gitlab.gnome.org/GNOME/gnome-robots/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
     description = "Avoid the robots and make them crash into each other";
     mainProgram = "gnome-robots";
     maintainers = teams.gnome.members;
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
   };
-}
+})

From 4875bab70521b8bba347b3ee2500080d07033c8a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Dec 2024 21:16:44 +0000
Subject: [PATCH 11/74] =?UTF-8?q?gxml:=200.20.3=20=E2=86=92=200.20.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gxml/-/compare/0.20.3...0.20.4
---
 pkgs/by-name/gx/gxml/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gx/gxml/package.nix b/pkgs/by-name/gx/gxml/package.nix
index dc9a8b2f53b9..771c4f6039ea 100644
--- a/pkgs/by-name/gx/gxml/package.nix
+++ b/pkgs/by-name/gx/gxml/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gxml";
-  version = "0.20.3";
+  version = "0.20.4";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "gxml";
     rev = finalAttrs.version;
-    hash = "sha256-GlctGxsLyQ2kPV3oBmusRiouG4PPncBTh3vgxhVaQOo=";
+    hash = "sha256-/gaWuUytBsvAsC95ee6MtTW6g3ltGbkD+JWqrAjJLDc=";
   };
 
   nativeBuildInputs = [
@@ -47,8 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     # https://gitlab.gnome.org/GNOME/gxml/-/merge_requests/24
+    # https://gitlab.gnome.org/GNOME/gxml/-/merge_requests/28
     substituteInPlace gxml/gxml.pc.in \
-      --replace-fail "includedir=@prefix@/include" "includedir=${placeholder "dev"}/include"
+      --replace-fail "includedir=@prefix@/include" "includedir=${placeholder "dev"}/include" \
+      --replace-fail ">=2" ">= 2" \
+      --replace-fail ">=0" ">= 0"
   '';
 
   doCheck = true;

From eb77e057322f01494c4c77e5da565b679faf25ec Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 1 Jan 2025 00:36:51 +0100
Subject: [PATCH 12/74] =?UTF-8?q?gom:=200.4=20=E2=86=92=200.5.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gom/-/compare/0.4...0.5.3
---
 pkgs/by-name/go/gom/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix
index 7d902ec5ee24..11b7745baf60 100644
--- a/pkgs/by-name/go/gom/package.nix
+++ b/pkgs/by-name/go/gom/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gom";
-  version = "0.4";
+  version = "0.5.3";
 
   outputs = [
     "out"
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "17ca07hpg7dqxjn0jpqim3xqcmplk2a87wbwrrlq3dd3m8381l38";
+    url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz";
+    sha256 = "Bp0JCfvca00n7feoeTZhlOOrUIsDVIv1uJ/2NUbSAXc=";
   };
 
   patches = [
@@ -54,8 +54,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
-      versionPolicy = "odd-unstable";
+      packageName = "gom";
     };
   };
 

From f2fcce79636e8749a261c778aabe843d903759e3 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 8 Oct 2024 01:14:38 -0400
Subject: [PATCH 13/74] phosh: 0.41.1 -> 0.44.0

- https://phosh.mobi/releases/rel-0.42.0/
- https://phosh.mobi/releases/rel-0.43.0/
- https://phosh.mobi/releases/rel-0.44.0/
---
 pkgs/applications/window-managers/phosh/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index bba1f204da6a..5f3820737308 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -16,6 +16,7 @@
 , pulseaudio
 , evince
 , glib
+, modemmanager
 , gtk4
 , gnome-bluetooth
 , gnome-control-center
@@ -41,12 +42,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phosh";
-  version = "0.41.1";
+  version = "0.44.0";
 
   src = fetchurl {
     # Release tarball which includes subprojects gvc and libcall-ui
     url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-Oc6Dltjj+2D3LWZz1eYArqEKEJYYqJPSrScEkxyNhX0=";
+    hash = "sha256-b4yrSC0TzTuh5kl93DeJNh06ZKjvNhTSjhDzmsEuK2g=";
   };
 
   nativeBuildInputs = [
@@ -70,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     evolution-data-server
     pulseaudio
     glib
+    modemmanager
     gcr
     networkmanager
     polkit

From 0bec5b455c2571c380dc45c2a3215adf97f08544 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 8 Oct 2024 01:18:21 -0400
Subject: [PATCH 14/74] phoc: 0.41.0 -> 0.44.0

Diff: https://gitlab.gnome.org/World/Phosh/phoc/-/compare/v0.41.0...v0.44.0
---
 pkgs/applications/misc/phoc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix
index 494d287364c2..19dc0653c753 100644
--- a/pkgs/applications/misc/phoc/default.nix
+++ b/pkgs/applications/misc/phoc/default.nix
@@ -28,7 +28,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phoc";
-  version = "0.41.0";
+  version = "0.44.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Phosh";
     repo = "phoc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-T2gKvP3WyrGNOiCwiX93UjMuSTnnZ+nykEAFhq0BF4U=";
+    hash = "sha256-KaCQtORMJUM7/BLD+Jnbunhd/9/3NYWYx/XMYMo27hI=";
   };
 
   nativeBuildInputs = [

From ec998e4b391acabca133b174573190d79a89c23e Mon Sep 17 00:00:00 2001
From: Atin Bainada <atin4@proton.me>
Date: Sun, 5 Jan 2025 16:03:48 +0530
Subject: [PATCH 15/74] reaper: 7.28 -> 7.29

---
 pkgs/applications/audio/reaper/default.nix | 196 +++++++++++++--------
 pkgs/applications/audio/reaper/updater.sh  |   4 +-
 2 files changed, 123 insertions(+), 77 deletions(-)

diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 4a1bae404d36..e40c3e231dcc 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -1,100 +1,135 @@
-{ config, lib, stdenv
-, fetchurl
-, autoPatchelfHook
-, makeWrapper
-, undmg
+{
+  config,
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  makeWrapper,
+  undmg,
 
-, alsa-lib
-, curl
-, gtk3
-, lame
-, libxml2
-, ffmpeg
-, vlc
-, xdg-utils
-, xdotool
-, which
+  alsa-lib,
+  curl,
+  gtk3,
+  lame,
+  libxml2,
+  ffmpeg,
+  vlc,
+  xdg-utils,
+  xdotool,
+  which,
 
-, jackSupport ? stdenv.hostPlatform.isLinux
-, jackLibrary
-, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux
-, libpulseaudio
+  jackSupport ? stdenv.hostPlatform.isLinux,
+  jackLibrary,
+  pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  libpulseaudio,
 }:
 
 let
-  url_for_platform = version: arch: if stdenv.hostPlatform.isDarwin
-    then "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_universal.dmg"
-    else "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz";
+  url_for_platform =
+    version: arch:
+    if stdenv.hostPlatform.isDarwin then
+      "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${
+        builtins.replaceStrings [ "." ] [ "" ] version
+      }_universal.dmg"
+    else
+      "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${
+        builtins.replaceStrings [ "." ] [ "" ] version
+      }_linux_${arch}.tar.xz";
 in
 stdenv.mkDerivation rec {
   pname = "reaper";
-  version = "7.28";
+  version = "7.29";
 
   src = fetchurl {
     url = url_for_platform version stdenv.hostPlatform.qemuArch;
-    hash = if stdenv.hostPlatform.isDarwin then "sha256-bhrBIXrE3gaAjpqrOtFK9Awb3rKMIckYhpQKVioBbqY=" else {
-      x86_64-linux = "sha256-HTxuu1IfjDYnCRksW5tjbOLIFz150wBwyJKCkMATlAk=";
-      aarch64-linux = "sha256-3jH6UwQefhLyymGltw7+//tUaO0V/3VySWuDsS3cqSo=";
-    }.${stdenv.hostPlatform.system};
+    hash =
+      if stdenv.hostPlatform.isDarwin then
+        "sha256-b1Gb5guaFyWrt9KEwptuXGvfrJAvgnFEl8QuwSufktE="
+      else
+        {
+          x86_64-linux = "sha256-uFK8Y36pYTDK3foCKH9kiq3u1MTir2nNM5KrDwIHEm0=";
+          aarch64-linux = "sha256-KZTUeEtyAVwIFTmclYv4GcGJ2WXukEF0/mfYmmBPfz0=";
+        }
+        .${stdenv.hostPlatform.system};
   };
 
-  nativeBuildInputs = [
-    makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    which
-    autoPatchelfHook
-    xdg-utils # Required for desktop integration
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    undmg
-  ];
+  nativeBuildInputs =
+    [
+      makeWrapper
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      which
+      autoPatchelfHook
+      xdg-utils # Required for desktop integration
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      undmg
+    ];
 
   sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app";
 
-  buildInputs = [
-    (lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    gtk3
-    alsa-lib
-  ];
+  buildInputs =
+    [
+      (lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      gtk3
+      alsa-lib
+    ];
 
-  runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [
-    gtk3 # libSwell needs libgdk-3.so.0
-  ]
-  ++ lib.optional jackSupport jackLibrary
-  ++ lib.optional pulseaudioSupport libpulseaudio;
+  runtimeDependencies =
+    lib.optionals stdenv.hostPlatform.isLinux [
+      gtk3 # libSwell needs libgdk-3.so.0
+    ]
+    ++ lib.optional jackSupport jackLibrary
+    ++ lib.optional pulseaudioSupport libpulseaudio;
 
   dontBuild = true;
 
-  installPhase = if stdenv.hostPlatform.isDarwin then ''
-    runHook preInstall
-    mkdir -p "$out/Applications/Reaper.app"
-    cp -r * "$out/Applications/Reaper.app/"
-    makeWrapper "$out/Applications/Reaper.app/Contents/MacOS/REAPER" "$out/bin/reaper"
-    runHook postInstall
-  '' else ''
-    runHook preInstall
+  installPhase =
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        runHook preInstall
+        mkdir -p "$out/Applications/Reaper.app"
+        cp -r * "$out/Applications/Reaper.app/"
+        makeWrapper "$out/Applications/Reaper.app/Contents/MacOS/REAPER" "$out/bin/reaper"
+        runHook postInstall
+      ''
+    else
+      ''
+        runHook preInstall
 
-    HOME="$out/share" XDG_DATA_HOME="$out/share" ./install-reaper.sh \
-      --install $out/opt \
-      --integrate-user-desktop
-    rm $out/opt/REAPER/uninstall-reaper.sh
+        HOME="$out/share" XDG_DATA_HOME="$out/share" ./install-reaper.sh \
+          --install $out/opt \
+          --integrate-user-desktop
+        rm $out/opt/REAPER/uninstall-reaper.sh
 
-    # Dynamic loading of plugin dependencies does not adhere to rpath of
-    # reaper executable that gets modified with runtimeDependencies.
-    # Patching each plugin with DT_NEEDED is cumbersome and requires
-    # hardcoding of API versions of each dependency.
-    # Setting the rpath of the plugin shared object files does not
-    # seem to have an effect for some plugins.
-    # We opt for wrapping the executable with LD_LIBRARY_PATH prefix.
-    # Note that libcurl and libxml2 are needed for ReaPack to run.
-    wrapProgram $out/opt/REAPER/reaper \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc ]}"
+        # Dynamic loading of plugin dependencies does not adhere to rpath of
+        # reaper executable that gets modified with runtimeDependencies.
+        # Patching each plugin with DT_NEEDED is cumbersome and requires
+        # hardcoding of API versions of each dependency.
+        # Setting the rpath of the plugin shared object files does not
+        # seem to have an effect for some plugins.
+        # We opt for wrapping the executable with LD_LIBRARY_PATH prefix.
+        # Note that libcurl and libxml2 are needed for ReaPack to run.
+        wrapProgram $out/opt/REAPER/reaper \
+          --prefix LD_LIBRARY_PATH : "${
+            lib.makeLibraryPath [
+              curl
+              lame
+              libxml2
+              ffmpeg
+              vlc
+              xdotool
+              stdenv.cc.cc
+            ]
+          }"
 
-    mkdir $out/bin
-    ln -s $out/opt/REAPER/reaper $out/bin/
+        mkdir $out/bin
+        ln -s $out/opt/REAPER/reaper $out/bin/
 
-    runHook postInstall
-  '';
+        runHook postInstall
+      '';
 
   passthru.updateScript = ./updater.sh;
 
@@ -103,7 +138,18 @@ stdenv.mkDerivation rec {
     homepage = "https://www.reaper.fm/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
-    maintainers = with maintainers; [ ilian orivej uniquepointer viraptor ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    maintainers = with maintainers; [
+      atinba
+      ilian
+      orivej
+      uniquepointer
+      viraptor
+    ];
   };
 }
diff --git a/pkgs/applications/audio/reaper/updater.sh b/pkgs/applications/audio/reaper/updater.sh
index ef070c38aa22..a47df805345f 100755
--- a/pkgs/applications/audio/reaper/updater.sh
+++ b/pkgs/applications/audio/reaper/updater.sh
@@ -8,14 +8,14 @@ reaper_ver=$(curl -Ls https://www.reaper.fm/download.php | grep -o 'Version [0-9
 function set_hash_for_linux() {
   local arch=$1
   pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_linux_$arch.tar.xz)
-  pkg_hash=$(nix hash to-sri "sha256:$pkg_hash")
+  pkg_hash=$(nix hash convert "sha256:$pkg_hash")
   update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux --ignore-same-version
 }
 
 function set_hash_for_darwin() {
   local arch=$1
   pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_universal.dmg)
-  pkg_hash=$(nix hash to-sri "sha256:$pkg_hash")
+  pkg_hash=$(nix hash convert "sha256:$pkg_hash")
   update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-darwin --ignore-same-version
 }
 

From ebbe9f39848cf93a1ca5e36eb50292fa36f6711c Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 5 Jan 2025 16:08:59 +0100
Subject: [PATCH 16/74] python312Packages.anthropic: 0.39.0 -> 0.42.0

---
 .../python-modules/anthropic/default.nix      | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix
index b7e834205fcd..df45b9cee2b2 100644
--- a/pkgs/development/python-modules/anthropic/default.nix
+++ b/pkgs/development/python-modules/anthropic/default.nix
@@ -10,9 +10,11 @@
   hatchling,
   httpx,
   jiter,
+  nest-asyncio,
   pydantic,
   pytest-asyncio,
   pytestCheckHook,
+  pythonAtLeast,
   pythonOlder,
   respx,
   sniffio,
@@ -22,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "anthropic";
-  version = "0.39.0";
+  version = "0.42.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +33,7 @@ buildPythonPackage rec {
     owner = "anthropics";
     repo = "anthropic-sdk-python";
     tag = "v${version}";
-    hash = "sha256-lpW+waHvwgbhK7EnPZy/XI8gK3a8JjFflPqUFbDN1z8=";
+    hash = "sha256-7cRXKXiyq3ty21klkitjjnm9rzBRmAXGYvvVxTNWeZ4=";
   };
 
   build-system = [
@@ -57,16 +59,22 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     dirty-equals
     pytest-asyncio
+    nest-asyncio
     pytestCheckHook
     respx
   ];
 
   pythonImportsCheck = [ "anthropic" ];
 
-  disabledTests = [
-    # Test require network access
-    "test_copy_build_request"
-  ];
+  disabledTests =
+    [
+      # Test require network access
+      "test_copy_build_request"
+    ]
+    ++ lib.optionals (pythonAtLeast "3.13") [
+      # Fails on RuntimeWarning: coroutine method 'aclose' of 'AsyncStream._iter_events' was never awaited
+      "test_multi_byte_character_multiple_chunks[async]"
+    ];
 
   disabledTestPaths = [
     # Test require network access

From 801ca9c559615117fcaa8c9116bd9f391f406bc7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jan 2025 00:34:20 +0100
Subject: [PATCH 17/74] authoscope: refactor

- add changelog to meta
- remove with lib;
- migrate to tag
- add nix-update-script
---
 pkgs/tools/security/authoscope/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/authoscope/default.nix b/pkgs/tools/security/authoscope/default.nix
index 728db72a8b8c..d1f1ebdbdf84 100644
--- a/pkgs/tools/security/authoscope/default.nix
+++ b/pkgs/tools/security/authoscope/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   installShellFiles,
   libcap,
+  nix-update-script,
   openssl,
   pkg-config,
   rustPlatform,
@@ -17,9 +18,9 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "kpcyrd";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk=";
+    repo = "authoscope";
+    tag = "v${version}";
+    hash = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk=";
   };
 
   cargoHash = "sha256-rSHuKy86iJNLAKSVcb7fn7A/cc75EOc97jGI14EaC6k=";
@@ -42,10 +43,13 @@ rustPlatform.buildRustPackage rec {
   # Tests requires access to httpin.org
   doCheck = false;
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Scriptable network authentication cracker";
     homepage = "https://github.com/kpcyrd/authoscope";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ fab ];
+    changelog = "https://github.com/kpcyrd/authoscope/releases/tag/v${version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 5fd77b8b06198cfd2ee37491dd913a03a4e4dde2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jan 2025 00:42:48 +0100
Subject: [PATCH 18/74] authoscope: move to pkgs/by-name

---
 .../au/authoscope/package.nix}                   | 16 ++++++++++------
 pkgs/top-level/all-packages.nix                  |  4 ----
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename pkgs/{tools/security/authoscope/default.nix => by-name/au/authoscope/package.nix} (85%)

diff --git a/pkgs/tools/security/authoscope/default.nix b/pkgs/by-name/au/authoscope/package.nix
similarity index 85%
rename from pkgs/tools/security/authoscope/default.nix
rename to pkgs/by-name/au/authoscope/package.nix
index d1f1ebdbdf84..3cd61f98fb21 100644
--- a/pkgs/tools/security/authoscope/default.nix
+++ b/pkgs/by-name/au/authoscope/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  darwin,
   fetchFromGitHub,
   installShellFiles,
   libcap,
@@ -8,7 +9,6 @@
   openssl,
   pkg-config,
   rustPlatform,
-  Security,
   zlib,
 }:
 
@@ -30,11 +30,15 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs = [
-    libcap
-    zlib
-    openssl
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
+  buildInputs =
+    [
+      libcap
+      zlib
+      openssl
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin [
+      darwin.apple_sdk.frameworks.Security
+    ];
 
   postInstall = ''
     installManPage docs/${pname}.1
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3327d4a79f0b..ee1d200cb4ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1948,10 +1948,6 @@ with pkgs;
     buildGoModule = buildGo123Module;
   };
 
-  authoscope = callPackage ../tools/security/authoscope {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   avahi = callPackage ../development/libraries/avahi { };
 
   avahi-compat = callPackage ../development/libraries/avahi {

From 516b1e74c358a9c4b06e5591f8c1a2897aad0c33 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Mon, 6 Jan 2025 21:16:09 -0500
Subject: [PATCH 19/74] tmuxPlugins: change sha256 to hash where applicable

Run the sha-to-sri.py script on tmux-plugins.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/misc/tmux-plugins/default.nix | 72 +++++++++++++++---------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 74b201bc133c..39aabfb30332 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -58,7 +58,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-battery";
       rev = "f8b8e8451990365e0c98c38c184962e4f83b793b";
-      sha256 = "1bhdzsx3kdjqjmm1q4j8937lrpkzf71irr3fqhdbddsghwrrmwim";
+      hash = "sha256-NfKaM4dPt7YaxG7kHMNxf95Mz0hIEhxqlVi2Obr+Da4=";
     };
   };
 
@@ -69,7 +69,7 @@ in rec {
       owner = "NHDaly";
       repo = "tmux-better-mouse-mode";
       rev = "aa59077c635ab21b251bd8cb4dc24c415e64a58e";
-      sha256 = "06346ih3hzwszhkj25g4xv5av7292s6sdbrdpx39p0n3kgf5mwww";
+      hash = "sha256-nPNa3JvDgptGvy2vpo0WSZytyu7kFSEn/Jp/OGA0ZBg=";
     };
     rtpFilePath = "scroll_copy_mode.tmux";
     meta = {
@@ -117,7 +117,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-continuum";
       rev = "fc2f31d79537a5b349f55b74c8ca69abaac1ddbb";
-      sha256 = "06i1jp83iybw76raaxciqz9a7ypgpkvbyjn6jjap8jpqfmj2wmjb";
+      hash = "sha256-S1YuZHX4SnSVlMZKv/a87/qj0seRdaWyOXz5ONCVIRo=";
     };
     meta = {
       homepage = "https://github.com/tmux-plugins/tmux-continuum";
@@ -169,7 +169,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-copycat";
       rev = "77ca3aab2aed8ede3e2b941079b1c92dd221cf5f";
-      sha256 = "1bchwzhai8k5rk32n4lrmh56rw944jqxr8imjk74hyaa7bbn81ds";
+      hash = "sha256-ugVk1zpKeUjOlDWi3LEkJPFsCqyZEivGzGWiqODnkK0=";
     };
   };
 
@@ -180,7 +180,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-cpu";
       rev = "98d787191bc3e8f19c3de54b96ba1caf61385861";
-      sha256 = "sha256-ymmCI6VYvf94Ot7h2GAboTRBXPIREP+EB33+px5aaJk=";
+      hash = "sha256-ymmCI6VYvf94Ot7h2GAboTRBXPIREP+EB33+px5aaJk=";
     };
   };
 
@@ -191,7 +191,7 @@ in rec {
       owner = "eraserhd";
       repo = "tmux-ctrlw";
       rev = "v${version}";
-      sha256 = "1kv5pqfjczd6z7i9jf6j5xmcai50l9bn5p2p1w1l5fi6cj8cz1k1";
+      hash = "sha256-YYbPkGQmukIDD1fcYleioETFai/SOJni+aZ9Jh2+Zc8=";
     };
   };
 
@@ -220,7 +220,7 @@ in rec {
       owner = "laktak";
       repo = "extrakto";
       rev = "bf9e666f2a6a8172ebe99fff61b574ba740cffc2";
-      sha256 = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk=";
+      hash = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk=";
     };
     nativeBuildInputs = [ pkgs.makeWrapper ];
     buildInputs = [ pkgs.python3 ];
@@ -252,7 +252,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-fpp";
       rev = "ca125d5a9c80bb156ac114ac3f3d5951a795c80e";
-      sha256 = "1b89s6mfzifi7s5iwf22w7niddpq28w48nmqqy00dv38z4yga5ws";
+      hash = "sha256-mhf1PPlo7AaAx7haRDgS+LYW7eFCOB6LPtHF76rRCa0=";
     };
     postInstall = ''
       sed -i -e 's|fpp |${pkgs.fpp}/bin/fpp |g' $target/fpp.tmux
@@ -266,7 +266,7 @@ in rec {
       owner = "roosta";
       repo = "tmux-fuzzback";
       rev = "bfd9cf0ef1c35488f0080f0c5ca4fddfdd7e18ec";
-      sha256 = "w788xDBkfiLdUVv1oJi0YikFPqVk6LiN6PDfHu8on5E=";
+      hash = "sha256-w788xDBkfiLdUVv1oJi0YikFPqVk6LiN6PDfHu8on5E=";
     };
     nativeBuildInputs = [ pkgs.makeWrapper ];
     postInstall = ''
@@ -311,7 +311,7 @@ in rec {
       owner = "egel";
       repo = "tmux-gruvbox";
       rev = "3f9e38d7243179730b419b5bfafb4e22b0a969ad";
-      sha256 = "1l0kq77rk3cbv0rvh7bmfn90vvqqmywn9jk6gbl9mg3qbynq5wcf";
+      hash = "sha256-jvGCrV94vJroembKZLmvGO8NknV1Hbgz2IuNmc/BE9A=";
     };
   };
 
@@ -323,7 +323,7 @@ in rec {
       owner = "schasse";
       repo = "tmux-jump";
       rev = "416f613d3eaadbe1f6f9eda77c49430527ebaffb";
-      sha256 = "1xbzdyhsgaq2in0f8f491gwjmx6cxpkf2c35d2dk0kg4jfs505sz";
+      hash = "sha256-XxdQtJPkTTCbaGUw4ebtzPQq+QuJOOSAjQKrp6Fvf/U=";
     };
     postInstall = ''
       sed -i -e 's|ruby|${pkgs.ruby}/bin/ruby|g' $target/scripts/tmux-jump.sh
@@ -344,7 +344,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-logging";
       rev = "b085ad423b5d59a2c8b8d71772352e7028b8e1d0";
-      sha256 = "0p0sawysalhi8k2a5hdxniqx6kb24kd8rnvfzkjqigzid5ik37js";
+      hash = "sha256-Wp4xY2nxv4jl/G7bjNokYk3TcbS9waLERBFSpT1XGlw=";
     };
   };
 
@@ -355,7 +355,7 @@ in rec {
       owner = "MunifTanjim";
       repo = "tmux-mode-indicator";
       rev = "11520829210a34dc9c7e5be9dead152eaf3a4423";
-      sha256 = "sha256-hlhBKC6UzkpUrCanJehs2FxK5SoYBoiGiioXdx6trC4=";
+      hash = "sha256-hlhBKC6UzkpUrCanJehs2FxK5SoYBoiGiioXdx6trC4=";
     };
     meta = with lib; {
       homepage = "https://github.com/MunifTanjim/tmux-mode-indicator";
@@ -373,7 +373,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-net-speed";
       rev = "58abb615971cb617821e2e7e41c660334f55a92d";
-      sha256 = "1aj06gdhzcxsydjzf21n9kyxigwf38kh2rg8hh7gnjk260ydqlrc";
+      hash = "sha256-LFPcPDBiSvsOhOhlAScajr/Y/Uw2CPdl87qzD9szQKo=";
     };
   };
 
@@ -409,7 +409,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-maildir-counter";
       rev = "9415f0207e71e37cbd870c9443426dbea6da78b9";
-      sha256 = "0dwvqhiv9bjwr01hsi5c57n55jyv5ha5m5q1aqgglf4wyhbnfms4";
+      hash = "sha256-RFdnF/ScOPoeVgGXWhQs28tS7CmsRA0DyFyutCPEmzc=";
     };
   };
 
@@ -420,7 +420,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-online-status";
       rev = "ea86704ced8a20f4a431116aa43f57edcf5a6312";
-      sha256 = "1hy3vg8v2sir865ylpm2r4ip1zgd4wlrf24jbwh16m23qdcvc19r";
+      hash = "sha256-OQW2WcNDVBMgX5IIlykn7f1wI8miXuqLQTlqsdHbw8M=";
     };
   };
 
@@ -431,7 +431,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-open";
       rev = "cedb4584908bd8458fadc8d3e64101d3cbb48d46";
-      sha256 = "10s0xdhmg0dhpj13ybcq72pw3xgb2dq5v5h2mwidzqyh9g17wndh";
+      hash = "sha256-sFl+wkvQ498irwKWXXAT6/XBrziYLT+CvLCBV2HrQIM=";
     };
   };
 
@@ -443,7 +443,7 @@ in rec {
       owner = "odedlaz";
       repo = "tmux-onedark-theme";
       rev = "3607ef889a47dd3b4b31f66cda7f36da6f81b85c";
-      sha256 = "19jljshwp2p83b634cd1mw69091x42jj0dg40ipw61qy6642h2m5";
+      hash = "sha256-pQooiDEeB8NvBOQ1IKUgPSSQDK+hMTLMGuiKy6GWVKY=";
     };
   };
 
@@ -454,7 +454,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-pain-control";
       rev = "2db63de3b08fc64831d833240749133cecb67d92";
-      sha256 = "0w7a6n4n86ysiqcqj12j2hg9r5fznvbp3dz8pzas9q1k3avlk0zk";
+      hash = "sha256-84NJtxoz4KTVv+i3cde235WcHhRSBIkZjtobZIk16nA=";
     };
   };
 
@@ -466,7 +466,7 @@ in rec {
       owner = "rafi";
       repo = "tmux-pass";
       rev = "76b1c98911d56928063a41bc93a2d9e81818ef4c";
-      sha256 = "sha256-bamz4IZrozo5R7jt+z7YKyrogawPqsZ9cTJi9osjVoA=";
+      hash = "sha256-bamz4IZrozo5R7jt+z7YKyrogawPqsZ9cTJi9osjVoA=";
     };
 
     nativeBuildInputs = [ pkgs.makeWrapper ];
@@ -494,7 +494,7 @@ in rec {
       owner = "eraserhd";
       repo = "tmux-plumb";
       rev = "v${version}";
-      sha256 = "1c6k4fdl0az9811r6k164mgd4w5la75xr6x7nabmy046xc0z5i2r";
+      hash = "sha256-WcTyAeuGAF+Xsqeb3MtRtHDSXiUmTJNDQOkrQJsj07A=";
     };
     postInstall = ''
       sed -i -e 's,9 plumb,${pkgs.plan9port}/bin/9 plumb,' $target/scripts/plumb
@@ -526,7 +526,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-prefix-highlight";
       rev = "15acc6172300bc2eb13c81718dc53da6ae69de4f";
-      sha256 = "08rkflfnynxgv2s26b33l199h6xcqdfmlqbyqa1wkw7h85br3dgl";
+      hash = "sha256-9LWRV0Hw8MmDwn5hWl3DrBuYUqBjLCO02K9bbx11MyM=";
     };
   };
 
@@ -537,7 +537,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-resurrect";
       rev = "ca6468e2deef11efadfe3a62832ae67742505432";
-      sha256 = "0d7jg5dy4jq64679rf2zqmqbvgiqvpcj5jxfljk7d7y86dnqhj3n";
+      hash = "sha256-dkiIbTPIn3ampK7LItndOL69cMVfuJyOIQZL4lt58jQ=";
     };
     meta = {
       homepage = "https://github.com/tmux-plugins/tmux-resurrect";
@@ -575,7 +575,7 @@ in rec {
       owner = "rose-pine";
       repo = "tmux";
       rev = "dd6d01338ac4afeb96542dcf24e4a7fe179b69e6";
-      sha256 = "sha256-Tccb4VjdotOSw7flJV4N0H4557NxRhXiCecZBPU9ICQ=";
+      hash = "sha256-Tccb4VjdotOSw7flJV4N0H4557NxRhXiCecZBPU9ICQ=";
     };
     meta = {
       homepage = "https://github.com/rose-pine/tmux";
@@ -591,7 +591,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-sensible";
       rev = "25cb91f42d020f675bb0a2ce3fbd3a5d96119efa";
-      sha256 = "sha256-sw9g1Yzmv2fdZFLJSGhx1tatQ+TtjDYNZI5uny0+5Hg=";
+      hash = "sha256-sw9g1Yzmv2fdZFLJSGhx1tatQ+TtjDYNZI5uny0+5Hg=";
     };
     postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
       sed -e 's:reattach-to-user-namespace:${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux
@@ -606,7 +606,7 @@ in rec {
       owner = "27medkamal";
       repo = "tmux-session-wizard";
       rev = "V${version}";
-      sha256 = "sha256-mLpZQSo8nildawsPxGwkcETNwlRq6O1pfy/VusMNMaw=";
+      hash = "sha256-mLpZQSo8nildawsPxGwkcETNwlRq6O1pfy/VusMNMaw=";
     };
     meta = with lib; {
       homepage = "https://github.com/27medkamal/tmux-session-wizard";
@@ -640,7 +640,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-sessionist";
       rev = "09ec86be38eae98ffc27bd0dde605ed10ae0dc89";
-      sha256 = "030q2mmj8akbc26jnqn8n7fckg1025p0ildx4wr401b6p1snnlw4";
+      hash = "sha256-hFNrdbhmBUAyJ73RCG4RILzJ3LHIYiuNYGsqJGsVGAw=";
     };
   };
 
@@ -651,7 +651,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-sidebar";
       rev = "aacbdb45bc5ab69db448a72de4155d0b8dbac677";
-      sha256 = "1bp90zbv19kbbiik0bgb893ybss1jqsnk3353a631993xjwsih7c";
+      hash = "sha256-7MCouewjpTCMGmWMaTWWQevlR0LrLTBjXGumsNcH6a4=";
     };
   };
 
@@ -662,7 +662,7 @@ in rec {
       owner = "samoshkin";
       repo = "tmux-plugin-sysstat";
       rev = "29e150f403151f2341f3abcb2b2487a5f011dd23";
-      sha256 = "013mv9p6r2r0ls3p60l8hdad4hm8niv3wr27vgm925gxmibi4hyq";
+      hash = "sha256-2EMSV6z9FZHq20dkPna0qELSVIOIAnOHpiCLbG7adQQ=";
     };
   };
 
@@ -673,7 +673,7 @@ in rec {
       owner = "jabirali";
       repo = "tmux-tilish";
       rev = "22f7920837d827dc6cb31143ea916afa677c24c1";
-      sha256 = "wP3c+p/DM6ve7GUhi0QEzggct7NS4XUa78sVQFSKrfo=";
+      hash = "sha256-wP3c+p/DM6ve7GUhi0QEzggct7NS4XUa78sVQFSKrfo=";
     };
 
     meta = with lib; {
@@ -711,7 +711,7 @@ in rec {
       owner = "seebi";
       repo = "tmux-colors-solarized";
       rev = "e5e7b4f1af37f8f3fc81ca17eadee5ae5d82cd09";
-      sha256 = "1l3i82abzi4b395cgdsjg7lcfaq15kyyhijwvrgchzxi95z3hl4x";
+      hash = "sha256-nVA4fkmxf8he3lxG6P0sASvH6HlSt8dKGovEv5RAcdA=";
     };
   };
 
@@ -803,7 +803,7 @@ in rec {
       owner = "joshmedeski";
       repo = "t-smart-tmux-session-manager";
       rev = "v${version}";
-      sha256 = "sha256-EMDEEIWJ+XFOk0WsQPAwj9BFBVDNwFUCyd1ScceqKpc=";
+      hash = "sha256-EMDEEIWJ+XFOk0WsQPAwj9BFBVDNwFUCyd1ScceqKpc=";
     };
     nativeBuildInputs = [ pkgs.makeWrapper ];
     postInstall = ''
@@ -824,7 +824,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-urlview";
       rev = "b84c876cffdd22990b4ab51247e795cbd7813d53";
-      sha256 = "1jp4jq57cn116b3i34v6yy69izd8s6mp2ijr260cw86g0470k0fn";
+      hash = "sha256-1oEJDgHPIM6AEVlGcavRqP2YjPdmkxHHMiFYdgqW5Mo=";
     };
     postInstall = ''
       sed -i -e '14,20{s|extract_url|${pkgs.extract_url}/bin/extract_url|g}' $target/urlview.tmux
@@ -838,7 +838,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "vim-tmux-focus-events";
       rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941";
-      sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1";
+      hash = "sha256-ITZMu2q80deOf0zqgYJDDgWQHWhJEzZlK6lVFPY4FIw=";
     };
 
     meta = with lib; {
@@ -889,7 +889,7 @@ in rec {
       owner = "tmux-plugins";
       repo = "tmux-yank";
       rev = "acfd36e4fcba99f8310a7dfb432111c242fe7392";
-      sha256 = "sha256-/5HPaoOx2U2d8lZZJo5dKmemu6hKgHJYq23hxkddXpA=";
+      hash = "sha256-/5HPaoOx2U2d8lZZJo5dKmemu6hKgHJYq23hxkddXpA=";
     };
   };
 
@@ -901,7 +901,7 @@ in rec {
       owner = "o0th";
       repo = "tmux-nova";
       rev = "v${version}";
-      sha256 = "16llz3nlyw88lyd8mmj27i0ncyhpfjj5c1yikngf7nxcqsbjmcnh";
+      hash = "sha256-0LIql8as2+OendEHVqR0F3pmQTxC1oqapwhxT+34lJo=";
     };
     meta = with lib; {
       homepage = "https://github.com/o0th/tmux-nova";

From 3ead276824c117da2df4abcd4445868fd9133cd2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 23 Oct 2024 09:04:02 +0200
Subject: [PATCH 20/74] python312Packages.py3to2: remove

py3to2 is unmaintained and source is no longer available
Also, Python 2 is Eol for a while now.
---
 .../python-modules/3to2/default.nix           | 35 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 pkgs/development/python-modules/3to2/default.nix

diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix
deleted file mode 100644
index 7832a765a05f..000000000000
--- a/pkgs/development/python-modules/3to2/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  pytest,
-}:
-
-buildPythonPackage rec {
-  pname = "py3to2";
-  version = "1.1.1";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "3to2";
-    extension = "zip";
-    sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c";
-  };
-
-  nativeCheckInputs = [ pytest ];
-
-  checkPhase = ''
-    py.test lib3to2/tests
-  '';
-
-  # Test failing due to upstream issue (https://bitbucket.org/amentajo/lib3to2/issues/50/testsuite-fails-with-new-python-35)
-  doCheck = false;
-
-  meta = {
-    homepage = "https://bitbucket.org/amentajo/lib3to2";
-    description = "Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical conversion is possible";
-    mainProgram = "3to2";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ mt-caret ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 20c66d01c0bb..3e32d5aea390 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -452,6 +452,7 @@ mapAliases ({
   pushbullet = pushbullet-py;  # Added 2022-10-15
   Pweave = pweave; # added 2023-02-19
   pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13
+  py3to2 = throw "py3to2 is unmaintained and source is no longer available"; # added 2024-10-23
   py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07
   py_stringmatching = py-stringmatching; # added 2023-11-12
   py17track = throw "py17track was removed because Home Assistant switched to pyseventeentrack"; # added 2024-08-08
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c73c7c7651c6..0188a50e36a0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11275,8 +11275,6 @@ self: super: with self; {
 
   py3status = callPackage ../development/python-modules/py3status { };
 
-  py3to2 = callPackage ../development/python-modules/3to2 { };
-
   py4j = callPackage ../development/python-modules/py4j { };
 
   pyacaia-async = callPackage ../development/python-modules/pyacaia-async { };

From 97896bbe0b03bafb2e07082c15afec5eb5467447 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 5 Jan 2025 16:08:59 +0100
Subject: [PATCH 21/74] python312Packages.niapy: 2.5.1 -> 2.5.2

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

diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix
index 67a1937bd016..2550bcc78ac9 100644
--- a/pkgs/development/python-modules/niapy/default.nix
+++ b/pkgs/development/python-modules/niapy/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "niapy";
-  version = "2.5.1";
+  version = "2.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "NiaOrg";
     repo = "NiaPy";
     tag = "v${version}";
-    hash = "sha256-+5tXwubKdhkcv5NjO/DglK+WJfsJ3AzVx/Y/byDBmGo=";
+    hash = "sha256-8hKT0WxnJijm22w4DkzicvtikaTL/mL3VhQX/WVHL58=";
   };
 
   build-system = [ poetry-core ];
@@ -35,6 +35,10 @@ buildPythonPackage rec {
     pandas
   ];
 
+  pythonRelaxDeps = [
+    "numpy"
+  ];
+
   nativeCheckInputs = [
     pytest7CheckHook
     pytest-xdist

From b6e9cdb1d74e2c4c749e9bb9a367fe97ca07c2a6 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 5 Jan 2025 16:08:59 +0100
Subject: [PATCH 22/74] python312Packages.niaarm: fix Numpy 2 upgrade

---
 pkgs/development/python-modules/niaarm/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix
index 2baf8ed356cc..0f96ca82471d 100644
--- a/pkgs/development/python-modules/niaarm/default.nix
+++ b/pkgs/development/python-modules/niaarm/default.nix
@@ -28,7 +28,10 @@ buildPythonPackage rec {
     hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y=";
   };
 
-  pythonRelaxDeps = [ "scikit-learn" ];
+  pythonRelaxDeps = [
+    "numpy"
+    "scikit-learn"
+  ];
 
   nativeBuildInputs = [ poetry-core ];
 

From 2bf736f3c3d46f76e493e89d7ed149928cafda4b Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 5 Jan 2025 16:08:59 +0100
Subject: [PATCH 23/74] python312Packages.niaaml: allow Numpy 2

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

diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix
index a74b1ccef1ff..f0f1d6db0d77 100644
--- a/pkgs/development/python-modules/niaaml/default.nix
+++ b/pkgs/development/python-modules/niaaml/default.nix
@@ -28,7 +28,10 @@ buildPythonPackage rec {
     hash = "sha256-VMZLEirE01Q9eyQIhV18PepGWmBcxLIwNeuVf7EuSWE=";
   };
 
-  pythonRelaxDeps = [ "pandas" ];
+  pythonRelaxDeps = [
+    "numpy"
+    "pandas"
+  ];
 
   nativeBuildInputs = [
     poetry-core

From 7c2b4aa9446648b3d83f981defaac92bcd851f26 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 5 Jan 2025 16:08:59 +0100
Subject: [PATCH 24/74] python312Packages.niaclass: allow Numpy 2

---
 pkgs/development/python-modules/niaclass/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/niaclass/default.nix b/pkgs/development/python-modules/niaclass/default.nix
index f526c2d5f58b..aeb0b7099110 100644
--- a/pkgs/development/python-modules/niaclass/default.nix
+++ b/pkgs/development/python-modules/niaclass/default.nix
@@ -26,7 +26,10 @@ buildPythonPackage rec {
     hash = "sha256-2VNLXVciWInkZwk9O+U+6oU+FOVQx3InV4UVgny/B6I=";
   };
 
-  pythonRelaxDeps = [ "pandas" ];
+  pythonRelaxDeps = [
+    "numpy"
+    "pandas"
+  ];
 
   nativeBuildInputs = [
     poetry-core

From 1d72ee6de97b3b892ea16283eac86802cb3915d3 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 5 Jan 2025 16:08:59 +0100
Subject: [PATCH 25/74] python312Packages.nianet: allow Numpy 2

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

diff --git a/pkgs/development/python-modules/nianet/default.nix b/pkgs/development/python-modules/nianet/default.nix
index 5a9ca788238e..bcdcb08bb9df 100644
--- a/pkgs/development/python-modules/nianet/default.nix
+++ b/pkgs/development/python-modules/nianet/default.nix
@@ -27,18 +27,22 @@ buildPythonPackage rec {
     sha256 = "sha256-FZipl6Z9AfiL6WH0kvUn8bVxt8JLdDVlmTSqnyxe0nY=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     poetry-core
     toml-adapt
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     niapy
     numpy
     scikit-learn
     torch
   ];
 
+  pythonRelaxDeps = [
+    "numpy"
+  ];
+
   # create niapy and torch dep version consistent
   preBuild = ''
     toml-adapt -path pyproject.toml -a change -dep niapy -ver X

From 0e942585fd512bcbdd9fe787accb7dd49a6c29d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jan 2025 10:43:25 +0000
Subject: [PATCH 26/74] gpxsee: 13.33 -> 13.34

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 18fb74a8343d..0246a6ba928b 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
-  version = "13.33";
+  version = "13.34";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = finalAttrs.version;
-    hash = "sha256-5x21KEalRpNhtSNlStziXDyDnvNmqvy6Lq0jgAZ2WE8=";
+    hash = "sha256-adZTcZGRE0PkG9rntvD3vLIqXOsVxP28LCZrfyVqy9M=";
   };
 
   buildInputs =

From ec405dc47448ce6f723433f785382129afe64ca2 Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Mon, 6 Jan 2025 11:52:09 +0100
Subject: [PATCH 27/74] rpm: add a disableUnshare option

Add an option to disable the unshare RPM plugin. Enabling it hinders execution within the Nix sandbox. While plain RPM invocations can use `--noplugins` and friends, many consumers like `tdnf` do not expose such a knob for enabling / disabling RPM options. Thus, add an easy interface to disable the plugin via Nix.
---
 pkgs/tools/package-management/rpm/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 3f266c11bdfb..ff427b7e4fc9 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -29,6 +29,10 @@
   bubblewrap,
   autoconf,
   gnupg,
+
+  # Disable the unshare RPM plugin, which can be useful if
+  # RPM is ran within the Nix sandbox.
+  disableUnshare ? true,
 }:
 
 stdenv.mkDerivation rec {
@@ -112,6 +116,9 @@ stdenv.mkDerivation rec {
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       "-DWITH_LIBELF=OFF"
       "-DWITH_LIBDW=OFF"
+    ]
+    ++ lib.optionals disableUnshare [
+      "-DHAVE_UNSHARE=OFF"
     ];
 
   # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements

From f1ab3477cd709c6c558a58966acffdc06b062471 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 11 Nov 2024 08:39:43 +0100
Subject: [PATCH 28/74] python312Packages.cvxpy: 1.5.3 -> 1.6.0

Diff: https://github.com/cvxpy/cvxpy/compare/refs/tags/v1.5.3...v1.6.0

Changelog: https://github.com/cvxpy/cvxpy/releases/tag/v1.6.0
---
 .../python-modules/cvxpy/default.nix            | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index a837e141bdc5..de88b31cce3e 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -13,12 +12,12 @@
   # dependencies
   clarabel,
   cvxopt,
-  ecos,
   osqp,
   scipy,
   scs,
 
   # checks
+  hypothesis,
   pytestCheckHook,
 
   useOpenmp ? (!stdenv.hostPlatform.isDarwin),
@@ -26,16 +25,14 @@
 
 buildPythonPackage rec {
   pname = "cvxpy";
-  version = "1.5.3";
+  version = "1.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "cvxpy";
     repo = "cvxpy";
     tag = "v${version}";
-    hash = "sha256-6RaEyFckvF3WhbfeffysMB/zt+aU1NU6B7Nm06znt9k=";
+    hash = "sha256-t2+j0ZrvGvTv6FoNVpD2MVFZKfGgqTaN32OKwBXM3Zw=";
   };
 
   # we need to patch out numpy version caps from upstream
@@ -53,14 +50,16 @@ buildPythonPackage rec {
   dependencies = [
     clarabel
     cvxopt
-    ecos
     numpy
     osqp
     scipy
     scs
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    hypothesis
+    pytestCheckHook
+  ];
 
   # Required flags from https://github.com/cvxpy/cvxpy/releases/tag/v1.1.11
   preBuild = lib.optionalString useOpenmp ''
@@ -84,7 +83,7 @@ buildPythonPackage rec {
     description = "Domain-specific language for modeling convex optimization problems in Python";
     homepage = "https://www.cvxpy.org/";
     downloadPage = "https://github.com/cvxpy/cvxpy//releases";
-    changelog = "https://github.com/cvxpy/cvxpy/releases/tag/v${version}";
+    changelog = "https://github.com/cvxpy/cvxpy/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ drewrisinger ];
   };

From 69cafaa0853ae8d3f116f8f9a799e1b56307abf9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 23 Nov 2024 00:14:34 +0100
Subject: [PATCH 29/74] python312Packages.qutip: mark as broken on darwin

---
 .../python-modules/qutip/default.nix          | 60 +++++++++++--------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index 14fbd3a853d8..8bf11e644f24 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -1,21 +1,28 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython_0,
+  oldest-supported-numpy,
+  setuptools,
+
+  # dependencies
+  numpy,
+  packaging,
+  scipy,
+
+  # tests
+  pytestCheckHook,
+  pytest-rerunfailures,
+  python,
+
+  # optional-dependencies
+  matplotlib,
+  ipython,
   cvxopt,
   cvxpy,
-  cython_0,
-  fetchFromGitHub,
-  ipython,
-  matplotlib,
-  numpy,
-  oldest-supported-numpy,
-  packaging,
-  pytest-rerunfailures,
-  pytestCheckHook,
-  python,
-  pythonOlder,
-  scipy,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -23,11 +30,9 @@ buildPythonPackage rec {
   version = "5.0.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "qutip";
+    repo = "qutip";
     tag = "v${version}";
     hash = "sha256-KT5Mk0w6EKTUZzGRnQ6XQPZfH5ZXVuiD+EwSflNqHNo=";
   };
@@ -38,13 +43,13 @@ buildPythonPackage rec {
       --replace-fail "numpy>=2.0.0" "numpy"
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     cython_0
-    setuptools
     oldest-supported-numpy
+    setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
     packaging
     scipy
@@ -78,16 +83,21 @@ buildPythonPackage rec {
     graphics = [ matplotlib ];
     ipython = [ ipython ];
     semidefinite = [
-      cvxpy
       cvxopt
+      cvxpy
     ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source software for simulating the dynamics of closed and open quantum systems";
     homepage = "https://qutip.org/";
-    changelog = "https://github.com/qutip/qutip/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fabiangd ];
+    changelog = "https://github.com/qutip/qutip/releases/tag/${src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fabiangd ];
+    badPlatforms = [
+      # Tests fail at ~80%
+      # ../tests/test_animation.py::test_result_state Fatal Python error: Aborted
+      lib.systems.inspect.patterns.isDarwin
+    ];
   };
 }

From 76ea0b0464231d289b7cd600a06cdb94df934dc3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 6 Jan 2025 11:36:49 +0100
Subject: [PATCH 30/74] python312Packages.qutip: 5.0.4 -> 5.1.0

Diff: https://github.com/qutip/qutip/compare/refs/tags/v5.0.4...v5.1.0

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

diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index 8bf11e644f24..0a09eeac1c91 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "qutip";
-  version = "5.0.4";
+  version = "5.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "qutip";
     repo = "qutip";
     tag = "v${version}";
-    hash = "sha256-KT5Mk0w6EKTUZzGRnQ6XQPZfH5ZXVuiD+EwSflNqHNo=";
+    hash = "sha256-8P95uAalMeGXWNG8J8Rf/eg0x1K62o9rKjmDrB8KGRo=";
   };
 
   postPatch = ''

From beb04c41e11ab666fcbbb74aa831375449cc4f22 Mon Sep 17 00:00:00 2001
From: Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com>
Date: Wed, 18 Dec 2024 17:54:19 +0530
Subject: [PATCH 31/74] python3Packages.stop-words: init at 2018.7.23

---
 .../python-modules/stop-words/default.nix     | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/stop-words/default.nix

diff --git a/pkgs/development/python-modules/stop-words/default.nix b/pkgs/development/python-modules/stop-words/default.nix
new file mode 100644
index 000000000000..ead093cd5622
--- /dev/null
+++ b/pkgs/development/python-modules/stop-words/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  unittestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "stop-words";
+  version = "2018.7.23";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-bfOtX13ml9qkN+REXIbHNgTmvBON0NwPrFVmSqTmsD4=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ unittestCheckHook ];
+
+  pythonImportsCheck = [ "stop_words" ];
+
+  meta = {
+    description = "Get list of common stop words in various languages in Python";
+    homepage = "https://github.com/Alir3z4/python-stop-words";
+    license = [ lib.licenses.bsd3 ];
+    maintainers = with lib.maintainers; [ lavafroth ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39b8b28be828..cfce4848d054 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14779,6 +14779,8 @@ self: super: with self; {
 
   stopit = callPackage ../development/python-modules/stopit { };
 
+  stop-words = callPackage ../development/python-modules/stop-words { };
+
   stransi = callPackage ../development/python-modules/stransi { };
 
   strategies = callPackage ../development/python-modules/strategies { };

From 04760af90d6f33b538b25c6b5ac7bae0fc053c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 7 Jan 2025 13:41:04 +0100
Subject: [PATCH 32/74] golangci-lint: 1.63.1 -> 1.63.4

Changelog: https://golangci-lint.run/product/changelog/
---
 pkgs/by-name/go/golangci-lint/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index 66738bfc88b2..94e31f5b3ca3 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "golangci-lint";
-  version = "1.63.1";
+  version = "1.63.4";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    hash = "sha256-Q7SwLm+rnwyjlXf8iArUQWYC0DyjFZI9HIWJsgNplyw=";
+    hash = "sha256-7nIo6Nuz8KLuQlT7btjnTRFpOl+KVd30v973HRKzh08=";
   };
 
-  vendorHash = "sha256-Rsg/bVbMsA2dUz0GjAdzifBTpDDVrFYY+ptyB5m3AgM=";
+  vendorHash = "sha256-atr4HMxoPEfGeaNlHqwTEAcvgbSyzgCe262VUg3J86c=";
 
   subPackages = [ "cmd/golangci-lint" ];
 

From 16140d5b27165f2a8434cd969f7d4a25ac210d52 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jan 2025 14:14:17 +0100
Subject: [PATCH 33/74] python312Packages.qutip: skip failing test on
 aarch64-linux

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

diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index 0a09eeac1c91..d23d459b12f4 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -79,6 +80,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "qutip" ];
 
+  pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # Fatal Python error: Aborted
+    "--deselect=../tests/core/test_metrics.py::Test_hellinger_dist::test_monotonicity[25]"
+  ];
+
   optional-dependencies = {
     graphics = [ matplotlib ];
     ipython = [ ipython ];

From c7ade74095791cb632683e81640044460f24eb0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jan 2025 17:22:32 +0000
Subject: [PATCH 34/74] ente-auth: 4.2.2 -> 4.2.3

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

diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index ba8ad3271e3c..1870c8143547 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -17,14 +17,14 @@ let
 in
 flutter324.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.2.2";
+  version = "4.2.3";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "auth" ];
     tag = "auth-v${version}";
-    hash = "sha256-pg2ivtTsMtDRNmxp2SQwI2n94qg60q8JfIWoO/rEUJE=";
+    hash = "sha256-G+uSEEJUD8mq8d7FJRKSHjpcFsILZJmtpgBmtpQYP58=";
   };
 
   sourceRoot = "${src.name}/auth";

From 26d37cd508b012cf6a7f45bdf2efb5f4f31e9314 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 7 Jan 2025 21:18:38 +0100
Subject: [PATCH 35/74] debootstrap: move to gnupg

Debian is also using gnupg2 so we have no good reason to stay on
gnupg1.
https://packages.debian.org/fr/sid/gpgv
---
 pkgs/by-name/de/debootstrap/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/debootstrap/package.nix b/pkgs/by-name/de/debootstrap/package.nix
index 09c5c65c6f19..520fd3f97b46 100644
--- a/pkgs/by-name/de/debootstrap/package.nix
+++ b/pkgs/by-name/de/debootstrap/package.nix
@@ -11,7 +11,7 @@
   coreutils,
   util-linux,
   gnugrep,
-  gnupg1,
+  gnupg,
   gnutar,
   gnused,
   gzip,
@@ -32,7 +32,7 @@ let
     dpkg
     gawk
     gnugrep
-    gnupg1
+    gnupg
     gnused
     gnutar
     gzip

From 59725b22ae5b0f7289cbea91a010f6ca12fe15d3 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 7 Jan 2025 18:38:28 +0100
Subject: [PATCH 36/74] doc: fix pypy39 removal

---
 doc/doc-support/python-interpreter-table.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/doc-support/python-interpreter-table.nix b/doc/doc-support/python-interpreter-table.nix
index f06609e363f2..0ea478812872 100644
--- a/doc/doc-support/python-interpreter-table.nix
+++ b/doc/doc-support/python-interpreter-table.nix
@@ -37,7 +37,10 @@ let
     lib.attrNames (
       lib.filterAttrs (
         name: value:
-        isPythonInterpreter name && name != pname && interpreterName name == interpreterName pname
+        # use tryEval to handle entries in aliases.nix
+        (builtins.tryEval (
+          isPythonInterpreter name && name != pname && interpreterName name == interpreterName pname
+        )).value
       ) pkgs
     );
 

From cd2a21a070ed19c8e47310d11b198fd61493ce85 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 7 Jan 2025 18:38:28 +0100
Subject: [PATCH 37/74] doc/python: update versions

---
 doc/languages-frameworks/python.section.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 24347a8e252e..8cb52ba29861 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -57,7 +57,6 @@ sets are
 * `pkgs.python313Packages`
 * `pkgs.python314Packages`
 * `pkgs.pypy27Packages`
-* `pkgs.pypy39Packages`
 * `pkgs.pypy310Packages`
 
 and the aliases
@@ -66,7 +65,7 @@ and the aliases
 * `pkgs.python3Packages` pointing to `pkgs.python312Packages`
 * `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
 * `pkgs.pypy2Packages` pointing to `pkgs.pypy27Packages`
-* `pkgs.pypy3Packages` pointing to `pkgs.pypy39Packages`
+* `pkgs.pypy3Packages` pointing to `pkgs.pypy310Packages`
 * `pkgs.pypyPackages` pointing to `pkgs.pypy2Packages`
 
 

From 306ae38084c30b0423331bd1d6e2ea4d76f9e128 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jan 2025 23:47:43 +0100
Subject: [PATCH 38/74] python312Packages.aioautomower: 2024.12.0 -> 2025.1.0

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

diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix
index 068a7c72ec05..afc678991bd8 100644
--- a/pkgs/development/python-modules/aioautomower/default.nix
+++ b/pkgs/development/python-modules/aioautomower/default.nix
@@ -14,12 +14,13 @@
   pytestCheckHook,
   pythonOlder,
   syrupy,
+  time-machine,
   tzlocal,
 }:
 
 buildPythonPackage rec {
   pname = "aioautomower";
-  version = "2024.12.0";
+  version = "2025.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +29,7 @@ buildPythonPackage rec {
     owner = "Thomas55555";
     repo = "aioautomower";
     tag = version;
-    hash = "sha256-JLlmvd6Hgf1a3YU9xfbw8plEbRDNgCzxF3PpveGsrPg=";
+    hash = "sha256-MEZdYOpBAHmWidzq+7SpEFsHNYlSaIQ4utnGK9Y3/NE=";
   };
 
   postPatch = ''
@@ -53,6 +54,7 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-cov-stub
     pytestCheckHook
+    time-machine
     syrupy
   ];
 

From a863b8f1968ad49f71ae51cb34c8fa3a6d0203cd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 00:26:57 +0100
Subject: [PATCH 39/74] nuclei: 3.3.7 -> 3.3.8

Diff: https://github.com/projectdiscovery/nuclei/compare/refs/tags/v3.3.7...v3.3.8

Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v3.3.8
---
 pkgs/by-name/nu/nuclei/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix
index 48fdc0e61649..d85ed923a2c7 100644
--- a/pkgs/by-name/nu/nuclei/package.nix
+++ b/pkgs/by-name/nu/nuclei/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "nuclei";
-  version = "3.3.7";
+  version = "3.3.8";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei";
     tag = "v${version}";
-    hash = "sha256-cvbxLEXPvJgAWHAMmHXPyHtBkYOOXj9xz1zfrm8oLG4=";
+    hash = "sha256-RL6/H1X6+rt9n1rpeRpKv+u3SloOnRX6YzMKDDQw+78=";
   };
 
-  vendorHash = "sha256-+eAZ/YJc8nqeTu8oRu2H6EFUyI5HDQZNO+hCUARPtcA=";
+  vendorHash = "sha256-k4seYTUO7BmU2HhTWweDRfNnXp+HshWM1riSc9BbYYg=";
 
   proxyVendor = true; # hash mismatch between Linux and Darwin
 

From c89b9515ec3f512ba73c718e7196130144520769 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 00:48:21 +0100
Subject: [PATCH 40/74] python313Packages.boto3-stubs: 1.35.93 -> 1.35.94

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index b0e691404108..f17c97a74250 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.35.93";
+  version = "1.35.94";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-mCAsipukijtuQ0qc+d5JktfMk+5QXx/EgcV82cgBYj0=";
+    hash = "sha256-KgYVjr8QsDAD/SnzqXPY24at0Uf+1knwE97gFOumhVA=";
   };
 
   build-system = [ setuptools ];

From 8b655a16680372885154eec33a24bc1ef3a36f07 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 00:48:29 +0100
Subject: [PATCH 41/74] python313Packages.botocore-stubs: 1.35.93 -> 1.35.94

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index fdb12bd74e9c..01be59db277c 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.35.93";
+  version = "1.35.94";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-aHLv6iTWsd0fAbdmL/HgvX+bcRDabWRHt4wbhdlDFR8=";
+    hash = "sha256-ceRBSq77afed9XtZW60JwMsIqqmAxy3PGufUJt4q1aI=";
   };
 
   nativeBuildInputs = [ setuptools ];

From cb657c1649c07938c5919c4e49d4fa5a8bc1284d Mon Sep 17 00:00:00 2001
From: Matt Moriarity <matt@mattmoriarity.com>
Date: Tue, 7 Jan 2025 17:45:09 -0700
Subject: [PATCH 42/74] icloudpd: fix build tool versions

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

diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix
index f1eca052c99a..5638815b133f 100644
--- a/pkgs/by-name/ic/icloudpd/package.nix
+++ b/pkgs/by-name/ic/icloudpd/package.nix
@@ -72,8 +72,8 @@ python3Packages.buildPythonApplication rec {
 
   preBuild = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==69.0.2" "setuptools" \
-      --replace-fail "wheel==0.42.0" "wheel"
+      --replace-fail "setuptools==75.6.0" "setuptools" \
+      --replace-fail "wheel==0.45.1" "wheel"
 
     substituteInPlace src/foundation/__init__.py \
       --replace-fail "0.0.1" "${version}"

From f133fabacac875164baa585911fb796c11b14470 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 00:47:53 +0000
Subject: [PATCH 43/74] poetryPlugins.poetry-plugin-shell: 1.0.0 -> 1.0.1

---
 pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix
index ff3abe44fc67..68526526ce86 100644
--- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix
+++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "poetry-plugin-shell";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = "poetry-plugin-shell";
     tag = version;
-    hash = "sha256-ynbZCzic6bAIwtG0rGk4oMPc8pm59UFboNAGUb0qJnE=";
+    hash = "sha256-BntObwrW7xt1gYWpckLJF7GklkmUJMh8D1IUwCcOOl4=";
   };
 
   build-system = [ poetry-core ];

From a28263ed7b68f46bcb42fded78842c28df9bea95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 01:05:49 +0000
Subject: [PATCH 44/74] diffnav: 0.2.8 -> 0.3.0

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

diff --git a/pkgs/by-name/di/diffnav/package.nix b/pkgs/by-name/di/diffnav/package.nix
index 807dffc8486b..a104299e95d2 100644
--- a/pkgs/by-name/di/diffnav/package.nix
+++ b/pkgs/by-name/di/diffnav/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "diffnav";
-  version = "0.2.8";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "dlvhdr";
     repo = "diffnav";
     rev = "refs/tags/v${version}";
-    hash = "sha256-xZAi/Ky1RjOxjhQKHvozaPTqDPcrGfhMemGWzi7WyW4=";
+    hash = "sha256-JXxeRq8OuTvzkbxDr1xVXeW0RFtCRyEbhCGvXeWHb0g=";
   };
 
   vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI=";

From 301266db991e291c1bc37b5587cfa14b17f4b0d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 01:23:53 +0000
Subject: [PATCH 45/74] xeol: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix
index 884bcfcecea1..c091b51820c0 100644
--- a/pkgs/by-name/xe/xeol/package.nix
+++ b/pkgs/by-name/xe/xeol/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "xeol";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "xeol-io";
     repo = "xeol";
     tag = "v${version}";
-    hash = "sha256-4fMH07XKMnpX54mS9pAuTBiHcP6nXj8vpuk3f/3ik+k=";
+    hash = "sha256-4+3/k46HvNZ+hl6oYAWaRewzz4sPEfO5Tb/vCZyXGkI=";
   };
 
-  vendorHash = "sha256-MLNUmJOpgKkIe5NUWYMA5avVvt6QLit0i4hpoaadcrs=";
+  vendorHash = "sha256-OsUsWd5AvNjAJzrC68Ed4+ZAnMY0JLB0d43eUI0Eivg=";
 
   proxyVendor = true;
 

From 3356026546cafaa6f220e6afca51ec38162f483e Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Tue, 7 Jan 2025 20:32:17 -0500
Subject: [PATCH 46/74] .git-blame-ignore-revs: add tmuxPlugins commit

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 8cc0c8caba0e..9957db3b8f60 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -221,3 +221,5 @@ adb9714bd909df283c66bbd641bd631ff50a4260
 667d42c00d566e091e6b9a19b365099315d0e611
 84d4f874c2bac9f3118cb6907d7113b3318dcb5e
 
+# tmuxPlugins sha-to-sri.py script
+516b1e74c358a9c4b06e5591f8c1a2897aad0c33

From 370293c52b56832d71ffd6a107eda62fc715ba93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 01:57:42 +0000
Subject: [PATCH 47/74] protoc-gen-connect-go: 1.17.0 -> 1.18.0

---
 pkgs/by-name/pr/protoc-gen-connect-go/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
index 99645faf4e4e..9533883d2252 100644
--- a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "protoc-gen-connect-go";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "connectrpc";
     repo = "connect-go";
     tag = "v${version}";
-    hash = "sha256-GF7J21Y27LmKuDjuk2omQo2xV5pDo2GQXyu9SLwG0fs=";
+    hash = "sha256-/RfGduRfXEZO66qhKOOMpESNxBghjqf/vbg1gkCPyHM=";
   };
 
   vendorHash = "sha256-j5T1Ho3K0kPZOo5LA6Md06W/gF6DmEElGt9BvceBtTo=";

From f092910034bcf933eb36a55c6eaf46fd53a4dbf2 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 8 Oct 2024 01:19:01 -0400
Subject: [PATCH 48/74] squeekboard: 1.41.0 -> 1.43.1

Diff: https://gitlab.gnome.org/World/Phosh/squeekboard/-/compare/v1.41.0...v1.43.1
---
 pkgs/by-name/sq/squeekboard/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sq/squeekboard/package.nix b/pkgs/by-name/sq/squeekboard/package.nix
index edcc1938c854..811a1eb65f23 100644
--- a/pkgs/by-name/sq/squeekboard/package.nix
+++ b/pkgs/by-name/sq/squeekboard/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "squeekboard";
-  version = "1.41.0";
+  version = "1.43.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -31,13 +31,13 @@ stdenv.mkDerivation rec {
     owner = "Phosh";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-WHGdA0cEB1nu7vJ+pwjdl8aZzccJ232vsbSGmZohFVo=";
+    hash = "sha256-UsUr4UnYNo2ybEdNyOD/IiafEZ1YJFwRQ3CVy76X2H0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-CRKaH8cA/EhXQna3zCU0Z06zkB9qu6QxPJ4No3NFcs0=";
+    hash = "sha256-1yBGn8cZxwpEOeF2BcUIIcI4Uxn80vRau/MvlufX9GU=";
   };
 
   nativeBuildInputs = [

From 47eeefaba3b8e2cf0973d2460bbe06a5742a9653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francis=20Gagn=C3=A9?= <fragag1@gmail.com>
Date: Tue, 7 Jan 2025 20:48:11 -0500
Subject: [PATCH 49/74] vorbisgain: Remove patchPhase

- configure is already executable in 0.37
- The man page is installed just fine even without --mandir
---
 pkgs/by-name/vo/vorbisgain/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/vo/vorbisgain/package.nix b/pkgs/by-name/vo/vorbisgain/package.nix
index ca7b62c7715b..6f2e143ca661 100644
--- a/pkgs/by-name/vo/vorbisgain/package.nix
+++ b/pkgs/by-name/vo/vorbisgain/package.nix
@@ -22,11 +22,6 @@ stdenv.mkDerivation rec {
     libvorbis
   ];
 
-  patchPhase = ''
-    chmod -v +x configure
-    configureFlags="--mandir=$out/share/man"
-  '';
-
   meta = with lib; {
     homepage = "https://sjeng.org/vorbisgain.html";
     description = "Utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness";

From 646113a9ddef513933385a64f6124ddaf7338c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francis=20Gagn=C3=A9?= <fragag1@gmail.com>
Date: Tue, 7 Jan 2025 20:49:43 -0500
Subject: [PATCH 50/74] vorbisgain: Add patch to fix implicit declaration of
 isatty()

Fixes #370032
---
 pkgs/by-name/vo/vorbisgain/isatty.patch | 10 ++++++++++
 pkgs/by-name/vo/vorbisgain/package.nix  |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/by-name/vo/vorbisgain/isatty.patch

diff --git a/pkgs/by-name/vo/vorbisgain/isatty.patch b/pkgs/by-name/vo/vorbisgain/isatty.patch
new file mode 100644
index 000000000000..cb09845f980f
--- /dev/null
+++ b/pkgs/by-name/vo/vorbisgain/isatty.patch
@@ -0,0 +1,10 @@
+--- vorbisgain-0.37/misc.c	2004-01-03 16:17:28.000000000 -0500
++++ vorbisgain-0.37-patched/misc.c	2025-01-07 20:35:13.056221211 -0500
+@@ -23,6 +23,7 @@
+ #else /* WIN32 */
+ #include <errno.h>
+ #include <ctype.h>
++#include <unistd.h>
+ 
+ #ifndef DISABLE_WINSIZE
+ 
diff --git a/pkgs/by-name/vo/vorbisgain/package.nix b/pkgs/by-name/vo/vorbisgain/package.nix
index 6f2e143ca661..a50823cab635 100644
--- a/pkgs/by-name/vo/vorbisgain/package.nix
+++ b/pkgs/by-name/vo/vorbisgain/package.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
     sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx";
   };
 
+  patches = [
+    ./isatty.patch
+  ];
+
   hardeningDisable = [ "format" ];
 
   buildInputs = [

From 31c64cd7668b1f4345ef4f08c74fb283c720067d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francis=20Gagn=C3=A9?= <fragag1@gmail.com>
Date: Tue, 7 Jan 2025 20:55:29 -0500
Subject: [PATCH 51/74] vorbisgain: Add patch for incorrect usage of fprintf()

---
 pkgs/by-name/vo/vorbisgain/fprintf.patch | 12 ++++++++++++
 pkgs/by-name/vo/vorbisgain/package.nix   |  3 +--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/vo/vorbisgain/fprintf.patch

diff --git a/pkgs/by-name/vo/vorbisgain/fprintf.patch b/pkgs/by-name/vo/vorbisgain/fprintf.patch
new file mode 100644
index 000000000000..45a6833a446c
--- /dev/null
+++ b/pkgs/by-name/vo/vorbisgain/fprintf.patch
@@ -0,0 +1,12 @@
+--- vorbisgain-0.37/misc.c	2004-01-03 16:17:28.000000000 -0500
++++ vorbisgain-0.37-patched/misc.c	2025-01-07 20:51:12.989521816 -0500
+@@ -56,8 +56,7 @@
+     vfprintf(stderr, message, args);
+     va_end(args);
+ 
+-    fprintf(stderr, strerror(err_num));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", strerror(err_num));
+ }
+ 
+ 
diff --git a/pkgs/by-name/vo/vorbisgain/package.nix b/pkgs/by-name/vo/vorbisgain/package.nix
index a50823cab635..6775b8d500fd 100644
--- a/pkgs/by-name/vo/vorbisgain/package.nix
+++ b/pkgs/by-name/vo/vorbisgain/package.nix
@@ -17,10 +17,9 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./isatty.patch
+    ./fprintf.patch
   ];
 
-  hardeningDisable = [ "format" ];
-
   buildInputs = [
     libogg
     libvorbis

From c11b5dd2b89bc632389b2d8d2fd183780668a888 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 7 Jan 2025 21:29:43 -0600
Subject: [PATCH 52/74] vimPlugins.blink-cmp: 0.9.3 -> 0.10.0

---
 .../editors/vim/plugins/non-generated/blink-cmp/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
index 9b1efb8dbcf2..4c4526e013dc 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
@@ -9,12 +9,12 @@
   replaceVars,
 }:
 let
-  version = "0.9.3";
+  version = "0.10.0";
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.cmp";
     tag = "v${version}";
-    hash = "sha256-j6hBURbIZbvNE69l4AyCtCwfeOi3oNxVtooFK7/WUuA=";
+    hash = "sha256-MfHI4efAdaoCU8si6YFdznZmSTprthDq3YKuF91z7ss=";
   };
   libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
   blink-fuzzy-lib = rustPlatform.buildRustPackage {

From 8a071f043dfe27b2e2a443552fce5da0b438894d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 05:55:19 +0000
Subject: [PATCH 53/74] python312Packages.stringzilla: 3.11.1 -> 3.11.3

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

diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix
index 9b215d73db33..21d9e79dcaf5 100644
--- a/pkgs/development/python-modules/stringzilla/default.nix
+++ b/pkgs/development/python-modules/stringzilla/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "stringzilla";
-  version = "3.11.1";
+  version = "3.11.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "stringzilla";
     tag = "v${version}";
-    hash = "sha256-8HcX0P/PCaJAV333oSYZJ6xVKwYet/CF8vnEe9/dMo4=";
+    hash = "sha256-2qmcjRNjCyErzwto2DqdDU9NX4+hqeibhDM85c81TgU=";
   };
 
   build-system = [

From 8c977905cbe4b700830955c1ec86c38f0a808c6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 06:12:58 +0000
Subject: [PATCH 54/74] tandoor-recipes: 1.5.25 -> 1.5.27

---
 pkgs/applications/misc/tandoor-recipes/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix
index b0a3dbf1e7e9..e1a96acb3dd3 100644
--- a/pkgs/applications/misc/tandoor-recipes/common.nix
+++ b/pkgs/applications/misc/tandoor-recipes/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "1.5.25";
+  version = "1.5.27";
 
   src = fetchFromGitHub {
     owner = "TandoorRecipes";
     repo = "recipes";
     rev = version;
-    hash = "sha256-Yw68wxLqoyPRQmP/krSaxByv24CKh7Y7O07NU+dL5mo=";
+    hash = "sha256-HP4gVk127hvvL337Cb4Wbvvf55RWY7u5RF/FKDCottw=";
   };
 
   yarnHash = "sha256-lU8QrTkI32XOHefIkj/0fa2UKhuZpQIT1wyweQnzXmQ=";

From 9ce4afe6086683ef314e288882745b2f8009d6d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 07:18:55 +0000
Subject: [PATCH 55/74] oterm: 0.6.9 -> 0.7.3

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

diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index 2e6aaf029b75..c9cae817ef92 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "oterm";
-  version = "0.6.9";
+  version = "0.7.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ggozad";
     repo = "oterm";
     tag = version;
-    hash = "sha256-ltzwb6r7zg41jlTJdU+/zTJ0H6jOL/4NKCZRBN6HQR4=";
+    hash = "sha256-COIvnn6qDG9srv4ByWTBoRHfIva3a2dLS+yIZDguo+M=";
   };
 
   pythonRelaxDeps = [

From e06c6d8a5a4c76785ae4088b10ed3c359e24ef5e Mon Sep 17 00:00:00 2001
From: atagen <atagen@boss.co>
Date: Wed, 8 Jan 2025 14:24:18 +1100
Subject: [PATCH 56/74] maintainers: add atagen

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 743922f74cba..2a3b5a1f2b08 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2138,6 +2138,11 @@
     name = "aszlig";
     keys = [ { fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; } ];
   };
+  atagen = {
+    name = "atagen";
+    github = "atagen";
+    githubId = 11548989;
+  };
   atalii = {
     email = "taliauster@gmail.com";
     github = "atalii";

From 9febecc7611d378e326ce34610cb03607de58b6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 08:12:54 +0000
Subject: [PATCH 57/74] flirt: 0.2.1 -> 0.3

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

diff --git a/pkgs/by-name/fl/flirt/package.nix b/pkgs/by-name/fl/flirt/package.nix
index b4a2b7245b5e..2169efd63c7d 100644
--- a/pkgs/by-name/fl/flirt/package.nix
+++ b/pkgs/by-name/fl/flirt/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flirt";
-  version = "0.2.1";
+  version = "0.3";
 
   src = fetchFromSourcehut {
     owner = "~hadronized";
     repo = "flirt";
     rev = "v${version}";
-    hash = "sha256-LCwSETvXHAUbe4QIeGpT7vVbuZl1SDfIehVG8svkmHM=";
+    hash = "sha256-xhNo85xwcVI4qliHU4/uNEvS7rW5avKOv8fMfRrvqD0=";
   };
 
-  cargoHash = "sha256-EquriyhfbYyi87TP3zuLiCXDV7baDRaTRuZd7Yht/UA=";
+  cargoHash = "sha256-9DmTSx1sKINnvJv3px8UKaa5j8AUnJiYB1lwnBR+xn8=";
 
   passthru.updateScript = nix-update-script { };
 

From 49fd995d973e48be07df913575e846efc8a1d81b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 09:19:13 +0100
Subject: [PATCH 58/74] tandoor-recipes: add changelog to meta

---
 pkgs/applications/misc/tandoor-recipes/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix
index e1a96acb3dd3..4c9f11357220 100644
--- a/pkgs/applications/misc/tandoor-recipes/common.nix
+++ b/pkgs/applications/misc/tandoor-recipes/common.nix
@@ -13,6 +13,7 @@ rec {
 
   meta = with lib; {
     homepage = "https://tandoor.dev/";
+    changelog = "https://github.com/TandoorRecipes/recipes/releases/tag/${version}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ jvanbruegge ];
   };

From 48a999d832c903e16273aae6db4d616af27ae5df Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 09:21:30 +0100
Subject: [PATCH 59/74] python313Packages.tencentcloud-sdk-python: 3.0.1297 ->
 3.0.1298

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1297...3.0.1298

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1298/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 88c1736b2796..363c2e622eba 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.1297";
+  version = "3.0.1298";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-8EVqWhS814OwmG8nebKgGsAmn4aoKMCYBBU26tOyuj4=";
+    hash = "sha256-0JDCfoQqw7u1Sxmwvol7CHF55U4hfkS69/c63ZSRltE=";
   };
 
   build-system = [ setuptools ];

From 8eeed40ea2117741147d83062fd204e0f96eb0ba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 09:25:09 +0100
Subject: [PATCH 60/74] python313Packages.tesla-fleet-api: 0.9.4 -> 0.9.5

Diff: https://github.com/Teslemetry/python-tesla-fleet-api/compare/refs/tags/v0.9.4...v0.9.5

Changelog: https://github.com/Teslemetry/python-tesla-fleet-api/releases/tag/v0.9.5
---
 pkgs/development/python-modules/tesla-fleet-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix
index 3bc1154267dc..564bab70ca3a 100644
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "tesla-fleet-api";
-  version = "0.9.4";
+  version = "0.9.5";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Teslemetry";
     repo = "python-tesla-fleet-api";
     tag = "v${version}";
-    hash = "sha256-BfVpFTWF6s3tyW0tnfvqkS3+w72vv1YHYpYNj3cC0LA=";
+    hash = "sha256-45EfV6lqhOn8sorhyzUBKOj6xtd9OzYxB7SLK07IQ08=";
   };
 
   build-system = [ setuptools ];

From 8e1596fa39c9d4d98c5cf28ff84508e95ea4ac08 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 09:29:22 +0100
Subject: [PATCH 61/74] python313Packages.environs: 11.2.1 -> 14.0.0

Diff: https://github.com/sloria/environs/compare/refs/tags/11.2.1...14.0.0

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

diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix
index 5124264df587..e6697813e4f0 100644
--- a/pkgs/development/python-modules/environs/default.nix
+++ b/pkgs/development/python-modules/environs/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "environs";
-  version = "11.2.1";
+  version = "14.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "sloria";
     repo = "environs";
     tag = version;
-    hash = "sha256-BU2D9NGNoUu3F1kx9t4j1VW0HarLVqiXTZEW67pMPV8=";
+    hash = "sha256-sqEe0DoJHUtHFin04+lNQKuXjvSmDmfwjQIvU6a4sDo=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 3b88af6546cb08db69c1136453f244ae8a34fb89 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 09:32:35 +0100
Subject: [PATCH 62/74] python313Packages.model-bakery: 1.20.0 -> 1.20.1

Diff: https://github.com/model-bakers/model_bakery/compare/refs/tags/1.20.0...1.20.1

Changelog: https://github.com/model-bakers/model_bakery/blob/1.20.1/CHANGELOG.md
---
 pkgs/development/python-modules/model-bakery/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix
index 7f0ae4281eb8..91f7cf1e896f 100644
--- a/pkgs/development/python-modules/model-bakery/default.nix
+++ b/pkgs/development/python-modules/model-bakery/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "model-bakery";
-  version = "1.20.0";
+  version = "1.20.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "model-bakers";
     repo = "model_bakery";
     tag = version;
-    hash = "sha256-71c5p6FypqbwUUoYu4dTamYnBlks1fiXTp7dUfc0ZQs=";
+    hash = "sha256-VA3rRzu1FhgCRCSRBQ+cZkwHVZr5/e++twk3hOWuc2c=";
   };
 
   build-system = [ hatchling ];

From d536a9d842e42f84297600ae7b7e6c429719f9e3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 09:33:06 +0100
Subject: [PATCH 63/74] python313Packages.model-checker: 0.6.10 -> 0.7.1

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

diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix
index 18cf442ecd60..8b771d5a3c8a 100644
--- a/pkgs/development/python-modules/model-checker/default.nix
+++ b/pkgs/development/python-modules/model-checker/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "model-checker";
-  version = "0.6.10";
+  version = "0.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "model_checker";
     inherit version;
-    hash = "sha256-L0dtNsuU6JQl0PRHB7UayLCdPwxk70FZYNomMUy/wW4=";
+    hash = "sha256-xwF0KCFso1Yno8mUFnVgMbVbhanvANsDtvS/WaUgSwI=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From f9aaf88e7a76bcff7e1b34d468dc5ce3e8572d4d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 09:33:53 +0100
Subject: [PATCH 64/74] python313Packages.pontos: 24.12.4 -> 25.1.0

Diff: https://github.com/greenbone/pontos/compare/refs/tags/v24.12.4...v25.1.0

Changelog: https://github.com/greenbone/pontos/releases/tag/v25.1.0
---
 pkgs/development/python-modules/pontos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index e8b431d34abe..b3b3a4e2af43 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "pontos";
-  version = "24.12.4";
+  version = "25.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = "pontos";
     tag = "v${version}";
-    hash = "sha256-Ri5MtUfIHE0s3Csaf08RZjGvl5HYxZJSn/JwNkkXvRA=";
+    hash = "sha256-Aw5PU3YfWH/YxOWkJcrUwhio71ASasZzyAsnjztOm5o=";
   };
 
   build-system = [ poetry-core ];

From bc500a9a460cf08b50111274cd523f3e61dcdbf4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 09:42:14 +0100
Subject: [PATCH 65/74] python313Packages.pygitguardian: 1.18.0 -> 1.19.0

Diff: https://github.com/GitGuardian/py-gitguardian/compare/refs/tags/v1.18.0...v1.19.0

Changelog: https://github.com/GitGuardian/py-gitguardian/blob/v1.19.0/CHANGELOG.md
---
 .../python-modules/pygitguardian/default.nix  | 36 +++----------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix
index 554b42ce3d9b..3cb25d8e04f6 100644
--- a/pkgs/development/python-modules/pygitguardian/default.nix
+++ b/pkgs/development/python-modules/pygitguardian/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pygitguardian";
-  version = "1.18.0";
+  version = "1.19.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "GitGuardian";
     repo = "py-gitguardian";
     tag = "v${version}";
-    hash = "sha256-4qMcBtelLiqLXKV8YIw9M6e97Nbo/K8UpsKoR0W7uKM=";
+    hash = "sha256-g3OH6pPk6Whd0JW6voILEK40/z6gWrdT6ibSa5kW47Q=";
   };
 
   pythonRelaxDeps = [
@@ -33,9 +33,7 @@ buildPythonPackage rec {
     "setuptools"
   ];
 
-  build-system = [
-    pdm-backend
-  ];
+  build-system = [ pdm-backend ];
 
   dependencies = [
     marshmallow
@@ -53,33 +51,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pygitguardian" ];
 
-  disabledTests = [
-    # Tests require an API key
-    "test_api_tokens"
-    "test_bogus_rate_limit"
-    "test_compute_sca_files"
-    "test_content_scan_exceptions"
-    "test_content_scan"
-    "test_create_honeytoken"
-    "test_create_jwt"
-    "test_extra_headers"
-    "test_health_check"
-    "test_multi_content_exceptions"
-    "test_multi_content_scan"
-    "test_multiscan_parameters"
-    "test_quota_overview"
-    "test_rate_limit"
-    "test_read_metadata_bad_response"
-    "test_read_metadata_no_remediation_message"
-    "test_read_metadata_remediation_message"
-    "test_retrieve_secret_incident"
-    "test_sca_client_scan_diff"
-    "test_sca_scan_all_with_params"
-    "test_sca_scan_directory_invalid_tar"
-    "test_sca_scan_directory"
-    "test_scan"
-    "test_versions_from_headers"
-  ];
+  env.GITGUARDIAN_API_KEY = "Test key for tests";
 
   meta = with lib; {
     description = "Library to access the GitGuardian API";

From b8ff537154befc43327e6a2fbd0ebe218b89d617 Mon Sep 17 00:00:00 2001
From: ners <ners@gmx.ch>
Date: Fri, 25 Oct 2024 18:28:58 +0200
Subject: [PATCH 66/74] pianoteq: refactor, bump versions

---
 pkgs/applications/audio/pianoteq/default.nix | 151 +++++++++----------
 1 file changed, 72 insertions(+), 79 deletions(-)

diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix
index 91885898b7d6..56198ba6dc23 100644
--- a/pkgs/applications/audio/pianoteq/default.nix
+++ b/pkgs/applications/audio/pianoteq/default.nix
@@ -1,31 +1,33 @@
 { lib
 , stdenv
-, curl
-, jq
-, htmlq
-, xorg
 , alsa-lib
-, freetype
-, p7zip
 , autoPatchelfHook
-, writeShellScript
-, zlib
-, libjack2
-, makeWrapper
 , copyDesktopItems
-, makeDesktopItem
+, curl
+, freetype
+, htmlq
+, jq
+, libglvnd
 , librsvg
+, makeDesktopItem
+, makeWrapper
+, p7zip
+, writeShellScript
 }:
 let
   versionForFile = v: builtins.replaceStrings [ "." ] [ "" ] v;
 
+  archdirs =
+    if stdenv.hostPlatform.isx86_64 then ["x86-64bit" "amd64"]
+    else if stdenv.hostPlatform.isAarch64 then ["arm-64bit" "arm"]
+    else throw "unsupported platform";
+
   mkPianoteq =
     { name
     , mainProgram
     , startupWMClass
     , src
     , version
-    , archdir ? if (stdenv.hostPlatform.system == "aarch64-linux") then "arm-64bit" else "x86-64bit"
     , ...
     }:
     stdenv.mkDerivation rec {
@@ -45,11 +47,10 @@ let
       ];
 
       buildInputs = [
-        (lib.getLib stdenv.cc.cc)
-        xorg.libX11 # libX11.so.6
-        xorg.libXext # libXext.so.6
+        (lib.getLib stdenv.cc.cc) # libgcc_s.so.1, libstdc++.so.6
         alsa-lib # libasound.so.2
         freetype # libfreetype.so.6
+        libglvnd # libGL.so.1
       ];
 
       desktopItems = [
@@ -68,20 +69,7 @@ let
       installPhase = ''
         runHook preInstall
         mkdir -p $out/bin
-        mv -t $out/bin Pianoteq*/${archdir}/*
-        for f in $out/bin/Pianoteq*; do
-          if [ -x "$f" ] && [ -f "$f" ]; then
-            wrapProgram "$f" --prefix LD_LIBRARY_PATH : ${
-              lib.makeLibraryPath (buildInputs ++ [
-                xorg.libXcursor
-                xorg.libXinerama
-                xorg.libXrandr
-                libjack2
-                zlib
-              ])
-            }
-          fi
-        done
+        mv -t $out/bin ${builtins.concatStringsSep " " (builtins.map (dir: "Pianoteq*/${dir}/*") archdirs)}
         install -Dm644 ${./pianoteq.svg} $out/share/icons/hicolor/scalable/apps/pianoteq.svg
         for size in 16 22 32 48 64 128 256; do
           dir=$out/share/icons/hicolor/"$size"x"$size"/apps
@@ -219,59 +207,64 @@ let
       '';
     };
 
-in
-{
-  # TODO currently can't install more than one because `lame` clashes
-  stage-trial = mkPianoteq rec {
-    name = "stage-trial";
-    mainProgram = "Pianoteq 8 STAGE";
-    startupWMClass = "Pianoteq STAGE Trial";
-    version = "8.2.0";
-    src = fetchPianoteqTrial {
-      name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
-      hash = "sha256-66xbcqNrnVJ+C9FQ8Bg8A7nj/bFrjt6jKheusrXVWvI=";
-    };
-  };
-  standard-trial = mkPianoteq rec {
-    name = "standard-trial";
-    mainProgram = "Pianoteq 8";
-    startupWMClass = "Pianoteq Trial";
-    version = "8.2.0";
-    src = fetchPianoteqTrial {
-      name = "pianoteq_linux_trial_v${versionForFile version}.7z";
-      hash = "sha256-IFFQMn8EFo5X8sUZV2/vtQOA83NHEFrUsU++CvYbN1c=";
-    };
-  };
-  stage-6 = mkPianoteq rec {
-    name = "stage-6";
-    mainProgram = "Pianoteq 6 STAGE";
-    startupWMClass = "Pianoteq STAGE";
-    version = "6.7.3";
-    archdir = if (stdenv.hostPlatform.system == "aarch64-linux") then throw "Pianoteq stage-6 is not supported on aarch64-linux" else "amd64";
-    src = fetchPianoteqWithLogin {
-      name = "pianoteq_stage_linux_v${versionForFile version}.7z";
-      hash = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy";
-    };
-  };
-  stage-7 = mkPianoteq rec {
-    name = "stage-7";
-    mainProgram = "Pianoteq 7 STAGE";
-    startupWMClass = "Pianoteq STAGE";
-    version = "7.3.0";
-    src = fetchPianoteqWithLogin {
-      name = "pianoteq_stage_linux_v${versionForFile version}.7z";
-      hash = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx";
-    };
-  };
-  standard-8 = mkPianoteq rec {
-    name = "standard-8";
-    mainProgram = "Pianoteq 8";
+  version6 = "6.7.3";
+  version7 = "7.5.4";
+  version8 = "8.3.2";
+
+  mkStandard = version: hash: mkPianoteq {
+    name = "standard";
+    mainProgram = "Pianoteq ${lib.versions.major version}";
     startupWMClass = "Pianoteq";
-    version = "8.2.0";
+    inherit version;
     src = fetchPianoteqWithLogin {
       name = "pianoteq_linux_v${versionForFile version}.7z";
-      hash = "sha256-ME0urUc1jwUKpg+5BdawYo9WhvMsrztYTVOrJTVxtkY=";
+      inherit hash;
     };
   };
-  # TODO other paid binaries, I don't own that so I don't know their hash.
+  mkStage = version: hash: mkPianoteq {
+    name = "stage";
+    mainProgram = "Pianoteq ${lib.versions.major version} STAGE";
+    startupWMClass = "Pianoteq STAGE";
+    inherit version;
+    src = fetchPianoteqWithLogin {
+      name = "pianoteq_stage_linux_v${versionForFile version}.7z";
+      inherit hash;
+    };
+  };
+  mkStandardTrial = version: hash: mkPianoteq {
+    name = "standard-trial";
+    mainProgram = "Pianoteq ${lib.versions.major version}";
+    startupWMClass = "Pianoteq Trial";
+    inherit version;
+    src = fetchPianoteqTrial {
+      name = "pianoteq_linux_trial_v${versionForFile version}.7z";
+      inherit hash;
+    };
+  };
+  mkStageTrial = version: hash: mkPianoteq {
+    name = "stage-trial";
+    mainProgram = "Pianoteq ${lib.versions.major version} STAGE";
+    startupWMClass = "Pianoteq STAGE Trial";
+    inherit version;
+    src = fetchPianoteqTrial {
+      name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
+      inherit hash;
+    };
+  };
+in
+{
+  standard_8 = mkStandard version8 "sha256-U9i9XgZKed8KxDL1fwGbRs30wj0IQwMjP+GH2JpdrJ0=";
+  stage_8 = mkStage version8 "";
+  standard-trial_8 = mkStandardTrial version8 "sha256-nYhTtPtkmYwVV5N1XIGBNU9YBbeIxLOjw2bA29ObXps=";
+  stage-trial_8 = mkStageTrial version8 "sha256-dkSG1PZgVds4fTir/77TSKhd3pBMJaOcWnLtZHsPqWo=";
+
+  standard_7 = mkStandard version7 "sha256-TA9CiuT21fQedlMUGz7bNNxYun5ArmRjvIxjOGqXDCs=";
+  stage_7 = mkStage version7 "";
+  standard-trial_7 = mkStandardTrial version7 "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ=";
+  stage-trial_7 = mkStageTrial version7 "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc=";
+
+  standard_6 = mkStandard version6 "sha256-u6ZNpmHFVOk+r+6Q8OURSfAi41cxMoDvaEXrTtHEAVY=";
+  stage_6 = mkStage version6 "";
+  standard-trial_6 = mkStandardTrial version6 "sha256-nHTAqosOJqC0VnRw2/xVpZ6y02vvau6CgfNmgiN/AHs=";
+  stage-trial_6 = mkStageTrial version6 "sha256-zrv0c/Mxt1EysR7ZvmxtksXAF5MyXTFMNj4KAdO3QnE=";
 }

From c37011b656b45f030f7c9bbedb38fda1f264e1f4 Mon Sep 17 00:00:00 2001
From: ners <ners@gmx.ch>
Date: Sat, 28 Dec 2024 18:12:42 +0100
Subject: [PATCH 67/74] pianoteq: 8.3.2 -> 8.4.0

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

diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix
index 56198ba6dc23..25fa6358bbd6 100644
--- a/pkgs/applications/audio/pianoteq/default.nix
+++ b/pkgs/applications/audio/pianoteq/default.nix
@@ -209,7 +209,7 @@ let
 
   version6 = "6.7.3";
   version7 = "7.5.4";
-  version8 = "8.3.2";
+  version8 = "8.4.0";
 
   mkStandard = version: hash: mkPianoteq {
     name = "standard";
@@ -253,10 +253,10 @@ let
   };
 in
 {
-  standard_8 = mkStandard version8 "sha256-U9i9XgZKed8KxDL1fwGbRs30wj0IQwMjP+GH2JpdrJ0=";
+  standard_8 = mkStandard version8 "sha256-ZDGB/SOOz+sWz7P+sNzyaipEH452n8zq5LleO3ztSXc=";
   stage_8 = mkStage version8 "";
-  standard-trial_8 = mkStandardTrial version8 "sha256-nYhTtPtkmYwVV5N1XIGBNU9YBbeIxLOjw2bA29ObXps=";
-  stage-trial_8 = mkStageTrial version8 "sha256-dkSG1PZgVds4fTir/77TSKhd3pBMJaOcWnLtZHsPqWo=";
+  standard-trial_8 = mkStandardTrial version8 "sha256-K3LbAWxciXt9hVAyRayxSoE/IYJ38Fd03+j0s7ZsMuw=";
+  stage-trial_8 = mkStageTrial version8 "sha256-k0p7SnkEq90bqIlT7PTYAQuhKEDVi+srHwYrpMUtIbM=";
 
   standard_7 = mkStandard version7 "sha256-TA9CiuT21fQedlMUGz7bNNxYun5ArmRjvIxjOGqXDCs=";
   stage_7 = mkStage version7 "";

From ac61a8b80ae3d1b112fa73b05ee84205825b5890 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 09:16:41 +0000
Subject: [PATCH 68/74] hugo: 0.140.1 -> 0.140.2

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

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 4c4be18f2f4b..0bdbc37ba1d5 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.140.1";
+  version = "0.140.2";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     tag = "v${version}";
-    hash = "sha256-9H7hXBz/rKJZr/XvqFRmOQylf6sfJtkwik3jh/k+Vec=";
+    hash = "sha256-4W/iUJHVsmCrIR5z0qSQ/Fsa4qtiuSie6/cot6oYQNM=";
   };
 
-  vendorHash = "sha256-swcj1JxYoRqKscu/IC0uiAATp4AXN0aANWkSq/mJsyc=";
+  vendorHash = "sha256-gyXvxg1pKf0MYbwf2FTUnDLSBf0Bcb4uNZ5rDq/2QGY=";
 
   checkFlags =
     let

From b405106c05feef222571f531243f2ca1c9c06b38 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 10:25:59 +0100
Subject: [PATCH 69/74] troubadix: relax pontos

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

diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix
index c46c3b4c1892..699f0cbe3142 100644
--- a/pkgs/by-name/tr/troubadix/package.nix
+++ b/pkgs/by-name/tr/troubadix/package.nix
@@ -7,17 +7,20 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "troubadix";
-  version = "24.11.0";
+  version = "25.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "troubadix";
     tag = "v${version}";
-    hash = "sha256-N+XZXXGIoZ9wN4GU0iHEEY8D/buFQ/5om86FTgAyvyw=";
+    hash = "sha256-cb9U1xxN5pUVRiB8JKCWd4XtnkH72XH7QnvFATXaPgY=";
   };
 
-  pythonRelaxDeps = [ "validators" ];
+  pythonRelaxDeps = [
+    "pontos"
+    "validators"
+  ];
 
   build-system = with python3.pkgs; [ poetry-core ];
 

From 6f9d611c5e5812a41bde71aac76b16a1fe648a4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 10:01:41 +0000
Subject: [PATCH 70/74] python312Packages.recurring-ical-events: 3.3.4 -> 3.4.0

---
 .../python-modules/recurring-ical-events/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix
index 6646a6fff78f..3ffc9dec48ef 100644
--- a/pkgs/development/python-modules/recurring-ical-events/default.nix
+++ b/pkgs/development/python-modules/recurring-ical-events/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "recurring-ical-events";
-  version = "3.3.4";
+  version = "3.4.0";
 
   disabled = pythonOlder "3.8";
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "niccokunzmann";
     repo = "python-recurring-ical-events";
     tag = "v${version}";
-    hash = "sha256-3KlmJJmak3X9adUlcmclnCv9D1Ddr+woFokrinZBYoE=";
+    hash = "sha256-+spbfeJ1hMMQqLj9IIu2xj4J6y1r2f94b4NK8vcDF5M=";
   };
 
   build-system = [ setuptools ];

From b3ecbffa39c803992f68d0fd80106ba053390c01 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 8 Jan 2025 19:22:59 +0900
Subject: [PATCH 71/74] pinact: exclude bin/gen-jsonschema

Which was introduced in version 1.1.2
However it looks like a project internal tool

For example, homebrew did not include it
https://github.com/Homebrew/homebrew-core/blob/2e88df3e7a7a39f4d0cd462a0f46d73861d7af8d/Formula/p/pinact.rb#L20-L28
---
 pkgs/by-name/pi/pinact/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index c310b752a0ee..f09487dcc088 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -43,6 +43,10 @@ buildGoModule {
     "-X main.version=${version} -X main.commit=v${version}"
   ];
 
+  subPackages = [
+    "cmd/pinact"
+  ];
+
   meta = {
     inherit mainProgram;
     description = "Pin GitHub Actions versions";

From a5a738b092e790afce747d3135c85f6188506185 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Thu, 26 Dec 2024 16:39:47 +0100
Subject: [PATCH 72/74] coqPackages.mathcomp: 2.2.0 -> 2.3.0

---
 pkgs/development/coq-modules/coqeal/default.nix           | 8 ++++++++
 pkgs/development/coq-modules/deriving/default.nix         | 8 ++++++++
 pkgs/development/coq-modules/extructures/default.nix      | 8 ++++++++
 pkgs/development/coq-modules/gaia/default.nix             | 2 +-
 pkgs/development/coq-modules/graph-theory/default.nix     | 2 +-
 .../coq-modules/mathcomp-real-closed/default.nix          | 8 ++++++++
 pkgs/development/coq-modules/mathcomp/default.nix         | 2 ++
 pkgs/development/coq-modules/multinomials/default.nix     | 8 ++++++++
 pkgs/development/coq-modules/odd-order/default.nix        | 5 +++++
 pkgs/development/coq-modules/ssprove/default.nix          | 8 ++++++++
 10 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix
index 8876f02dcd7d..eca10e366238 100644
--- a/pkgs/development/coq-modules/coqeal/default.nix
+++ b/pkgs/development/coq-modules/coqeal/default.nix
@@ -20,6 +20,13 @@
     lib.switch
       [ coq.version mathcomp.version ]
       [
+        {
+          cases = [
+            (range "8.16" "8.20")
+            (isGe "2.1.0")
+          ];
+          out = "2.0.3";
+        }
         {
           cases = [
             (range "8.16" "8.20")
@@ -79,6 +86,7 @@
       ]
       null;
 
+  release."2.0.3".sha256 = "sha256-5lDq7IWlEW0EkNzYPu+dA6KOvRgy53W/alikpDr/Kd0=";
   release."2.0.1".sha256 = "sha256-d/IQ4IdS2tpyPewcGobj2S6m2HU+iXQmlvR+ITNIcjI=";
   release."2.0.0".sha256 = "sha256-SG/KVnRJz2P+ZxkWVp1dDOnc/JVgigoexKfRUh1Y0GM";
   release."1.1.3".sha256 = "sha256-xhqWpg86xbU1GbDtXXInNCTArjjPnWZctWiiasq1ScU=";
diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix
index e4f03c4e7253..909cb7f42154 100644
--- a/pkgs/development/coq-modules/deriving/default.nix
+++ b/pkgs/development/coq-modules/deriving/default.nix
@@ -16,6 +16,13 @@ mkCoqDerivation {
     lib.switch
       [ coq.coq-version ssreflect.version ]
       [
+        {
+          cases = [
+            (range "8.17" "8.20")
+            (isGe "2.0.0")
+          ];
+          out = "0.2.1";
+        }
         {
           cases = [
             (range "8.17" "8.20")
@@ -35,6 +42,7 @@ mkCoqDerivation {
 
   releaseRev = v: "v${v}";
 
+  release."0.2.1".sha256 = "sha256-053bNa3rcy0fCs9CQoKPxDLXnKRHzteyClLDURpaZJo=";
   release."0.2.0".sha256 = "sha256-xPsuEayHstjF0PGFJZJ+5cm0oMUrpoGLXN23op97vjM=";
   release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI=";
   release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh";
diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix
index e7825105762b..2f5b3f330089 100644
--- a/pkgs/development/coq-modules/extructures/default.nix
+++ b/pkgs/development/coq-modules/extructures/default.nix
@@ -17,6 +17,13 @@
     lib.switch
       [ coq.coq-version ssreflect.version ]
       [
+        {
+          cases = [
+            (range "8.17" "8.20")
+            (isGe "2.0.0")
+          ];
+          out = "0.5.0";
+        }
         {
           cases = [
             (range "8.17" "8.20")
@@ -50,6 +57,7 @@
 
   releaseRev = v: "v${v}";
 
+  release."0.5.0".sha256 = "sha256-Guu2+tmHym52DA6SB5Rq/rYWIQEl47Q7YvMaUkfOH2k=";
   release."0.4.0".sha256 = "sha256-hItFO2XY2LTPSofPTKt3AfOEfiLliaYdzUXgDv4ea9Y=";
   release."0.3.1".sha256 = "sha256-KcuG/11Yq5ACem4FyVnQqHKvy3tNK7hd0ir2SJzzMN0=";
   release."0.3.0".sha256 = "sha256:14rm0726f1732ldds495qavg26gsn30w6dfdn36xb12g5kzavp38";
diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix
index 63891055f22c..2e17861ea3bf 100644
--- a/pkgs/development/coq-modules/gaia/default.nix
+++ b/pkgs/development/coq-modules/gaia/default.nix
@@ -27,7 +27,7 @@ mkCoqDerivation {
         {
           cases = [
             (range "8.16" "8.20")
-            (range "2.0" "2.2")
+            (range "2.0" "2.3")
           ];
           out = "2.2";
         }
diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix
index 380ee69f1f8c..6ef59a006de5 100644
--- a/pkgs/development/coq-modules/graph-theory/default.nix
+++ b/pkgs/development/coq-modules/graph-theory/default.nix
@@ -29,7 +29,7 @@ mkCoqDerivation {
         {
           cases = [
             (range "8.16" "8.19")
-            (range "2.0.0" "2.2.0")
+            (range "2.0.0" "2.3.0")
           ];
           out = "0.9.4";
         }
diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix
index 07d0f15f3e70..91a303219b19 100644
--- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix
@@ -17,6 +17,7 @@ mkCoqDerivation {
   owner = "math-comp";
   inherit version;
   release = {
+    "2.0.2".sha256 = "sha256-hBo9JMtmXDYBmf5ihKGksQLHv3c0+zDBnd8/aI2V/ao=";
     "2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic=";
     "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8=";
     "1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4=";
@@ -34,6 +35,13 @@ mkCoqDerivation {
     lib.switch
       [ coq.version mathcomp.version ]
       [
+        {
+          cases = [
+            (isGe "8.17")
+            (isGe "2.1.0")
+          ];
+          out = "2.0.2";
+        }
         {
           cases = [
             (isGe "8.17")
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 2cb068ba11cc..2cafe8ca8ac7 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -20,6 +20,7 @@ let
   withDoc = single && (args.withDoc or false);
   defaultVersion = let inherit (lib.versions) range; in
     lib.switch coq.coq-version [
+      { case = range "8.19" "8.20"; out = "2.3.0"; }
       { case = range "8.17" "8.20"; out = "2.2.0"; }
       { case = range "8.17" "8.18"; out = "2.1.0"; }
       { case = range "8.17" "8.18"; out = "2.0.0"; }
@@ -39,6 +40,7 @@ let
       { case = range "8.5" "8.7";   out = "1.6.4";  }
     ] null;
   release = {
+    "2.3.0".sha256  = "sha256-wa6OBig8rhAT4iwupSylyCAMhO69rADa0MQIX5zzL+Q=";
     "2.2.0".sha256  = "sha256-SPyWSI5kIP5w7VpgnQ4vnK56yEuWnJylNQOT7M77yoQ=";
     "2.1.0".sha256  = "sha256-XDLx0BIkVRkSJ4sGCIE51j3rtkSGemNTs/cdVmTvxqo=";
     "2.0.0".sha256  = "sha256-dpOmrHYUXBBS9kmmz7puzufxlbNpIZofpcTvJFLG5DI=";
diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix
index 78e8150aa010..b79561b17ada 100644
--- a/pkgs/development/coq-modules/multinomials/default.nix
+++ b/pkgs/development/coq-modules/multinomials/default.nix
@@ -24,6 +24,13 @@ mkCoqDerivation {
     lib.switch
       [ coq.version mathcomp.version ]
       [
+        {
+          cases = [
+            (range "8.17" "8.20")
+            (isGe "2.1.0")
+          ];
+          out = "2.3.0";
+        }
         {
           cases = [
             (range "8.17" "8.20")
@@ -104,6 +111,7 @@ mkCoqDerivation {
       ]
       null;
   release = {
+    "2.3.0".sha256 = "sha256-usIcxHOAuN+f/j3WjVbPrjz8Hl9ac8R6kYeAKi3CEts=";
     "2.2.0".sha256 = "sha256-Cie6paweITwPZy6ej9+qIvHFWknVR382uJPW927t/fo=";
     "2.1.0".sha256 = "sha256-QT91SBJ6DXhyg4j/okTvPP6yj2DnnPbnSlJ/p8pvZbY=";
     "2.0.0".sha256 = "sha256-2zWHzMBsO2j8EjN7CgCmKQcku9Be8aVlme0LD5p4ab8=";
diff --git a/pkgs/development/coq-modules/odd-order/default.nix b/pkgs/development/coq-modules/odd-order/default.nix
index 30082aa3de12..1e4e044ae558 100644
--- a/pkgs/development/coq-modules/odd-order/default.nix
+++ b/pkgs/development/coq-modules/odd-order/default.nix
@@ -9,6 +9,7 @@ mkCoqDerivation {
   pname = "odd-order";
   owner = "math-comp";
 
+  release."2.1.0".sha256 = "sha256-TPlaQbO0yXEpUgy3rlCx/w1MSLECJk5tdU26fAGe48Q=";
   release."1.14.0".sha256 = "0iln70npkvixqyz469l6nry545a15jlaix532i1l7pzfkqqn6v68";
   release."1.13.0".sha256 = "sha256-EzNKR/JzM8T17sMhPhgZNs14e50X4dY3OwFi133IsT0=";
   release."1.12.0".sha256 = "sha256-omsfdc294CxKAHNMMeqJCcVimvyRCHgxcQ4NJOWSfNM=";
@@ -18,6 +19,10 @@ mkCoqDerivation {
   defaultVersion =
     with lib.versions;
     lib.switch mathcomp.character.version [
+      {
+        case = (range "2.1.0" "2.3.0");
+        out = "2.1.0";
+      }
       {
         case = (range "1.13.0" "1.15.0");
         out = "1.14.0";
diff --git a/pkgs/development/coq-modules/ssprove/default.nix b/pkgs/development/coq-modules/ssprove/default.nix
index c0e5b0bf8c57..ca181478fedb 100644
--- a/pkgs/development/coq-modules/ssprove/default.nix
+++ b/pkgs/development/coq-modules/ssprove/default.nix
@@ -21,6 +21,13 @@
     lib.switch
       [ coq.coq-version mathcomp-ssreflect.version ]
       [
+        {
+          cases = [
+            (range "8.18" "8.20")
+            "2.3.0"
+          ];
+          out = "0.2.3";
+        }
         {
           cases = [
             (range "8.18" "8.20")
@@ -47,6 +54,7 @@
 
   releaseRev = v: "v${v}";
 
+  release."0.2.3".sha256 = "sha256-Y3dmNIF36IuIgrVILteofOv8e5awKfq93S4YN7enswI=";
   release."0.2.2".sha256 = "sha256-tBF8equJd6hKZojpe+v9h6Tg9xEnMTVFgOYK7ZnMfxk=";
   release."0.2.1".sha256 = "sha256-X00q5QFxdcGWeNqOV/PLTOqQyyfqFEinbGUTO7q8bC4=";
   release."0.2.0".sha256 = "sha256-GDkWH0LUsW165vAUoYC5of9ndr0MbfBtmrPhsJVXi3o=";

From 8210f907cbd83961217008e0e998f5015ca6a7f3 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Thu, 26 Dec 2024 17:03:12 +0100
Subject: [PATCH 73/74] coqPackages.mathcomp-analysis: 1.7.0 -> 1.8.0

---
 .../development/coq-modules/mathcomp-analysis/default.nix | 5 +++--
 .../development/coq-modules/mathcomp-infotheo/default.nix | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
index 64bd6fecab88..f148ad2a04e9 100644
--- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@@ -15,6 +15,7 @@ let
   repo = "analysis";
   owner = "math-comp";
 
+  release."1.8.0".sha256 = "sha256-2ZafDmZAwGB7sxdUwNIE3xvwBRw1kFDk0m5Vz+onWZc=";
   release."1.7.0".sha256 = "sha256-GgsMIHqLkWsPm2VyOPeZdOulkN00IoBz++qA6yE9raQ=";
   release."1.5.0".sha256 = "sha256-EWogrkr5TC5F9HjQJwO3bl4P8mij8U7thUGJNNI+k88=";
   release."1.4.0".sha256 = "sha256-eDggeuEU0fMK7D5FbxvLkbAgpLw5lwL/Rl0eLXAnJeg=";
@@ -49,9 +50,9 @@ let
         {
           cases = [
             (range "8.19" "8.20")
-            (range "2.1.0" "2.2.0")
+            (range "2.1.0" "2.3.0")
           ];
-          out = "1.7.0";
+          out = "1.8.0";
         }
         {
           cases = [
diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix
index 3c5bc6df6b4e..6390270fa736 100644
--- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix
@@ -23,6 +23,13 @@
     lib.switch
       [ coq.version mathcomp-analysis.version ]
       [
+        {
+          cases = [
+            (range "8.19" "8.20")
+            (isGe "1.7")
+          ];
+          out = "0.7.7";
+        }
         {
           cases = [
             (range "8.19" "8.20")
@@ -74,6 +81,7 @@
         }
       ]
       null;
+  release."0.7.7".sha256 = "sha256-kEbpMl7U+I2kvqi1VrjhIVFkZFO6h0tTHEUZRbHYG7E=";
   release."0.7.5".sha256 = "sha256-pzPo+Acjx3vlyqOkSZQ8uT2BDLSTfbAnRm39e+/CqE0=";
   release."0.7.3".sha256 = "sha256-7+qPtE1KfDmo9ZsQtWMzoR2MYnFpTjFHK/yZYVm+GxA=";
   release."0.7.2".sha256 = "sha256-dekrdVmuTcqXXmKhIb831EKtMhbPrXHJZhzmGb9rdRo=";

From ac8941d77fc7945fd5addc021fe9a93f1a27d09c Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Fri, 27 Dec 2024 13:30:57 +0100
Subject: [PATCH 74/74] coqPackages.hierarchy-builder: 1.7.1 -> 1.8.0

---
 pkgs/development/coq-modules/hierarchy-builder/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix
index 1b7e6284afdc..bff7825637c7 100644
--- a/pkgs/development/coq-modules/hierarchy-builder/default.nix
+++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix
@@ -5,6 +5,7 @@ let hb = mkCoqDerivation {
   owner = "math-comp";
   inherit version;
   defaultVersion = with lib.versions; lib.switch coq.coq-version [
+    { case = range "8.19" "8.20"; out = "1.8.0"; }
     { case = range "8.18" "8.20"; out = "1.7.1"; }
     { case = range "8.16" "8.18"; out = "1.6.0"; }
     { case = range "8.15" "8.18"; out = "1.5.0"; }
@@ -13,6 +14,7 @@ let hb = mkCoqDerivation {
     { case = range "8.12" "8.13"; out = "1.1.0"; }
     { case = isEq "8.11";         out = "0.10.0"; }
   ] null;
+  release."1.8.0".sha256  = "sha256-4s/4ZZKj5tiTtSHGIM8Op/Pak4Vp52WVOpd4l9m19fY=";
   release."1.7.1".sha256  = "sha256-MCmOzMh/SBTFAoPbbIQ7aqd3hMcSMpAKpiZI7dbRaGs=";
   release."1.7.0".sha256  = "sha256-WqSeuJhmqicJgXw/xGjGvbRzfyOK7rmkVRb6tPDTAZg=";
   release."1.6.0".sha256  = "sha256-E8s20veOuK96knVQ7rEDSt8VmbtYfPgItD0dTY/mckg=";