From 8de6f7a8a9fad2d4ca40db678e8ca784c698c62b Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 22 Jan 2025 13:59:19 +0100
Subject: [PATCH 01/88] nixVersions.nix_2_24: 2.24.11 -> 2.24.12

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 5abbfb440ca2..2eca906c41f9 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -173,8 +173,8 @@ in lib.makeExtensible (self: ({
   };
 
   nix_2_24 = common {
-    version = "2.24.11";
-    hash = "sha256-ZizmbJM+DbhkaizxbjKg9fNfMrxh3PfAZ6jApQrazks=";
+    version = "2.24.12";
+    hash = "sha256-lPiheE0D146tstoUInOUf1451stezrd8j6H6w7+RCv8=";
     self_attribute_name = "nix_2_24";
   };
 

From 94efb4613c87f42337d96cad1771637d8edfb21a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 22 Jan 2025 13:59:41 +0100
Subject: [PATCH 02/88] nixos/nix-fallback-paths: 2.24.11 -> 2.24.12

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 6248f80d9f0a..dcf6689ec8ce 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,8 +1,8 @@
 {
-  x86_64-linux = "/nix/store/wsa13yx6kl6zzjlhjb8vmcqb6msbxym3-nix-2.24.11";
-  i686-linux = "/nix/store/rn1449hjxh77f723m5rc1skgv4paknic-nix-2.24.11";
-  aarch64-linux = "/nix/store/psrkach0v2s66rw30nxzpz7hgsqrvg28-nix-2.24.11";
-  riscv64-linux = "/nix/store/zc8clmxxi9zr7vx7y8v8kg1rsmhwsp42-nix-riscv64-unknown-linux-gnu-2.24.11";
-  x86_64-darwin = "/nix/store/nc81g85wlkzqck5mxdfbnxscavg2xh09-nix-2.24.11";
-  aarch64-darwin = "/nix/store/nqzxb4h7sbkk6876zx8yc88ahlgl5kkl-nix-2.24.11";
+  x86_64-linux = "/nix/store/kwck2vdfdp2v4jr9c4daryyk9mlbx406-nix-2.24.12";
+  i686-linux = "/nix/store/s9qqyxzcgjl7xrfhnnjiiy9v876pcphi-nix-2.24.12";
+  aarch64-linux = "/nix/store/pmj4g05d4nlr3gcr8nyadgwir3svbkmx-nix-2.24.12";
+  riscv64-linux = "/nix/store/nzr3m4x3mcnfpnmyap31f9pviwv29vyc-nix-riscv64-unknown-linux-gnu-2.24.12";
+  x86_64-darwin = "/nix/store/pf6msb0yzccznd75yil32mzk284h90z4-nix-2.24.12";
+  aarch64-darwin = "/nix/store/vaaakw66qnbw4g007rf2nggy0rmhf8fh-nix-2.24.12";
 }

From 87b736585afc6011683b31d6d5cd927761e3bf74 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 23 Jan 2025 18:32:41 +0100
Subject: [PATCH 03/88] harper: 0.16.0 -> 0.17.0

Diff: https://github.com/Automattic/harper/compare/v0.16.0...v0.17.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.17.0
---
 pkgs/by-name/ha/harper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index fb1a1f105cb7..b36e969e71fb 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-lpaE1yb9Yt1AVpZWBnvDOjTpVeKdTlXDnqNDrF0fCZ8=";
+    hash = "sha256-cUN7e82CncDzA9m+pcvtrAn10E6AYaMcAuu6hpt85tA=";
   };
 
-  cargoHash = "sha256-2SFgtEA9dUM1KDgNpZXNVRLHzDCd/AZ4GqzkI8ULRf4=";
+  cargoHash = "sha256-lo3Ye7u26xLqlu/R4klYd2X9G73119XtWaJzVkl85+g=";
 
   meta = {
     description = "Grammar Checker for Developers";

From 7386ced30152caf6982562acf6d125c5984a0340 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Thu, 23 Jan 2025 15:34:34 -0500
Subject: [PATCH 04/88] winePackages.{stable,unstable,staging,wayland}: * ->
 10.0

---
 pkgs/applications/emulators/wine/sources.nix | 42 ++++----------------
 pkgs/top-level/all-packages.nix              |  2 +-
 pkgs/top-level/wine-packages.nix             |  6 +--
 3 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index 959fdf6e5c4c..e460d7765f3b 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "9.0";
-    url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz";
-    hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4=";
+    version = "10.0";
+    url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz";
+    hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE=";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
@@ -69,9 +69,9 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "10.0-rc5";
+    version = "10.0";
     url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz";
-    hash = "sha256-7IlPe1wH0tTCHVNNf0OUZnuO8ngH4w4hKJhpp02XbtI=";
+    hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE=";
     inherit (stable) patches;
 
     ## see http://wiki.winehq.org/Gecko
@@ -117,7 +117,7 @@ in rec {
   staging = fetchFromGitLab rec {
     # https://gitlab.winehq.org/wine/wine-staging
     inherit (unstable) version;
-    hash = "sha256-no+yYF/xhy0kRfBqPer0UbpJNEh9LtKCmyVvhQB58K4=";
+    hash = "sha256-0mzKoaNaJ6ZDYQtJFU383W5nNe/FKtpBjeWDpiqkmp4=";
     domain = "gitlab.winehq.org";
     owner = "wine";
     repo = "wine-staging";
@@ -126,35 +126,7 @@ in rec {
     disabledPatchsets = [ ];
   };
 
-  wayland = fetchFromGitLab {
-    # https://gitlab.collabora.com/alf/wine/-/tree/wayland
-    version = "8.2";
-    hash = "sha256-Eb2SFBIeQQ3cVZkUQcwNT5mcYe0ShFxBdMc3BlqkwTo=";
-    domain = "gitlab.collabora.com";
-    owner = "alf";
-    repo = "wine";
-    rev = "b2547ddf9e08cafce98cf7734d5c4ec926ef3536";
-
-    inherit (unstable) gecko32 gecko64;
-
-    inherit (unstable) mono;
-
-    updateScript = writeShellScript "update-wine-wayland" ''
-      ${updateScriptPreamble}
-      wayland_rev=$(get_source_attr wayland.rev)
-
-      latest_wayland_rev=$(curl -s 'https://gitlab.collabora.com/api/v4/projects/2847/repository/branches/wayland' | jq -r .commit.id)
-
-      if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then
-          latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ')
-          wayland_url=$(get_source_attr wayland.url)
-          set_version_and_hash wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")"
-          set_source_attr wayland rev "\"$latest_wayland_rev\""
-      fi
-
-      do_update
-    '';
-  };
+  wayland = pkgs.lib.warnOnInstantiate "building wine with `wineRelease = \"wayland\"` is deprecated. Wine now builds with the wayland driver by default." stable; # added 2025-01-23
 
   winetricks = fetchFromGitHub rec {
     # https://github.com/Winetricks/winetricks/releases
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b37b0cce9a93..d613f3f12886 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18107,7 +18107,7 @@ with pkgs;
   });
 
   wine-wayland = lowPrio (winePackages.full.override {
-    wineRelease = "wayland";
+    x11Support = false;
   });
 
   inherit (callPackage ../servers/web-apps/wordpress {})
diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix
index 8d5191f26a25..064c190af214 100644
--- a/pkgs/top-level/wine-packages.nix
+++ b/pkgs/top-level/wine-packages.nix
@@ -58,11 +58,9 @@ rec {
   stagingFull = full.override { wineRelease = "staging"; };
 
   wayland = base.override {
-    wineRelease = "wayland";
-    waylandSupport = true;
+    x11Support = false;
   };
   waylandFull = full.override {
-    wineRelease = "wayland";
-    waylandSupport = true;
+    x11Support = false;
   };
 }

From cfd91265a6ee9c94a90e03fc30de4c8a091453e9 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Fri, 24 Jan 2025 08:33:56 +0100
Subject: [PATCH 05/88] tre: fix cross build

---
 pkgs/by-name/tr/tre/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/tr/tre/package.nix b/pkgs/by-name/tr/tre/package.nix
index 969b17817d71..ccfb9d4937c9 100644
--- a/pkgs/by-name/tr/tre/package.nix
+++ b/pkgs/by-name/tr/tre/package.nix
@@ -29,16 +29,13 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     autoconf
     automake
+    gettext # autopoint
     libtool
   ];
 
-  buildInputs =
-    [
-      gettext
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
 
   preConfigure = ''
     ./utils/autogen.sh

From aed9c00b67e81cdb19222639454bf81af0ca54fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Jan 2025 17:14:46 +0000
Subject: [PATCH 06/88] python312Packages.cyclopts: 3.3.0 -> 3.3.1

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

diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index 7a859d9bab5a..094193c51319 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "3.3.0";
+  version = "3.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "BrianPugh";
     repo = "cyclopts";
     tag = "v${version}";
-    hash = "sha256-sXTKBDfQSqMWBX+wrhP6fCugGSuXM8mOkEroFWPalVs=";
+    hash = "sha256-PrhaUUzFQJ7tqUdu7nwi9k+NxQUPQWYDUc9vsvnmfeY=";
   };
 
   build-system = [

From 3adc86b87d1cde8e1d7e0a927019456283769aa0 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 22 Jan 2025 20:32:00 +0100
Subject: [PATCH 07/88] lomiri.morph-browser: 1.1.1 -> 1.1.2

---
 ...ace-wait-and-compare-with-tryCompare.patch | 196 ------------------
 .../applications/morph-browser/default.nix    |  19 +-
 2 files changed, 3 insertions(+), 212 deletions(-)
 delete mode 100644 pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch

diff --git a/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch b/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch
deleted file mode 100644
index 72c27c3e0e29..000000000000
--- a/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 9c4cd4fa938244cc2e319555d372e4e32029964a Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Tue, 14 Jan 2025 23:06:20 +0100
-Subject: [PATCH] tests/unittests/qml/tst_AddressBar.qml: Replace wait +
- compare with tryCompare
-
----
- tests/unittests/qml/tst_AddressBar.qml | 75 +++++++++++---------------
- 1 file changed, 30 insertions(+), 45 deletions(-)
-
-diff --git a/tests/unittests/qml/tst_AddressBar.qml b/tests/unittests/qml/tst_AddressBar.qml
-index 5c27acff..dc0ec4c6 100644
---- a/tests/unittests/qml/tst_AddressBar.qml
-+++ b/tests/unittests/qml/tst_AddressBar.qml
-@@ -73,6 +73,15 @@ Item {
-         name: "AddressBar"
-         when: windowShown
- 
-+        function verifyAddressBarText(text) {
-+            tryCompare(addressBar, "text", text)
-+        }
-+
-+        function typeStringAndVerify(text) {
-+            typeString(text)
-+            verifyAddressBarText(text)
-+        }
-+
-         function init() {
-             addressBar.actualUrl = ""
-             validatedSpy.clear()
-@@ -101,9 +110,7 @@ Item {
-         }
- 
-         function test_validUrlShouldNotBeRewritten(data) {
--            typeString(data.url)
--            wait(500)
--            compare(addressBar.text, data.url)
-+            typeStringAndVerify(data.url)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl, data.url)
-@@ -120,9 +127,7 @@ Item {
-         }
- 
-         function test_urlWithoutSchemeShouldBeRewritten(data) {
--            typeString(data.text)
--            wait(500)
--            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl, data.requestedUrl)
-@@ -137,9 +142,7 @@ Item {
-         }
- 
-         function test_leadingAndTrailingWhitespacesShouldBeTrimmed(data) {
--            typeString(data.text)
--            wait(500)
--            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl, data.requestedUrl)
-@@ -153,9 +156,7 @@ Item {
-         }
- 
-         function test_searchQueryShouldBeRewritten(data) {
--            typeString(data.text)
--            wait(500)
--            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl.toString().indexOf(data.start), 0)
-@@ -174,9 +175,7 @@ Item {
-         }
- 
-         function test_htmlEntitiesShouldBeEscapedInSearchQueries(data) {
--            typeString(data.text)
--            wait(500)
--            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             verify(addressBar.requestedUrl.toString().indexOf("q=" + data.escaped) > 0)
-@@ -191,9 +190,7 @@ Item {
-         }
- 
-         function test_uppercaseDomainsShouldBeRewritten(data) {
--            typeString(data.text)
--            wait(500)
--            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl, data.requestedUrl)
-@@ -213,9 +210,7 @@ Item {
-         }
- 
-         function test_uppercaseSchemeShouldBeRewritten(data) {
--            typeString(data.text)
--            wait(500)
--            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl, data.requestedUrl)
-@@ -266,9 +261,7 @@ Item {
-         }
- 
-         function test_urlShouldBeSimplifiedWhenUnfocused(data) {
--            typeString(data.input)
--            wait(500)
--            compare(addressBar.text, data.input)
-+            typeStringAndVerify(data.input)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             addressBar.actualUrl = addressBar.requestedUrl
-@@ -289,9 +282,7 @@ Item {
- 
-         function test_clickingWhenUnfocusedShouldSelectAll() {
-             var url = "http://example.org/"
--            typeString(url)
--            wait(500)
--            compare(addressBar.text, url)
-+            typeStringAndVerify(url)
-             addressBar.actualUrl = url
-             clickItem(textInput)
-             verify(!addressBar.activeFocus)
-@@ -301,9 +292,7 @@ Item {
- 
-         function test_clickingWhenFocusedShouldDeselectText() {
-             var url = "http://example.org/"
--            typeString(url)
--            wait(500)
--            compare(addressBar.text, url)
-+            typeStringAndVerify(url)
-             addressBar.actualUrl = url
-             clickItem(textInput)
-             verify(!addressBar.activeFocus)
-@@ -316,9 +305,7 @@ Item {
- 
-         function test_clickingActionButtonWhenUnfocusedShouldNotSelectAll() {
-             var url = "http://example.org/"
--            typeString(url)
--            wait(500)
--            compare(addressBar.text, url)
-+            typeStringAndVerify(url)
-             clickItem(textInput)
-             verify(!addressBar.activeFocus)
-             clickItem(addressBar.__actionButton)
-@@ -355,31 +342,29 @@ Item {
-         }
- 
-         function test_unfocusingWhileEditingShouldResetUrl() {
--            var url = "http://example.org/"
--            typeString(url)
--            wait(500)
--            compare(addressBar.text, url)
-+            var host = "example.org"
-+            var url = "http://" + host + "/"
-+            typeStringAndVerify(url)
-             addressBar.actualUrl = url
-             var clearButton = findChild(addressBar, "clear_button")
-             verify(clearButton != null)
-             clickItem(clearButton)
--            compare(addressBar.text, "")
-+            verifyAddressBarText("")
-             clickItem(textInput)
--            compare(addressBar.text, "example.org")
-+            verifyAddressBarText(host)
-             clickItem(addressBar)
--            compare(addressBar.text, url)
-+            verifyAddressBarText(url)
-         }
- 
-         function test_exitingFindInPageRestoresUrl() {
--            addressBar.actualUrl = "http://example.org/"
-+            var host = "example.org"
-+            addressBar.actualUrl = "http://" + host + "/"
-             addressBar.findInPageMode = true
-             verify(addressBar.activeFocus)
-             compare(addressBar.text, "")
--            typeString("hello")
--            wait(500)
-+            typeStringAndVerify("hello")
-             addressBar.findInPageMode = false
--            wait(500)
--            compare(addressBar.text, "example.org")
-+            verifyAddressBarText(host)
-         }
-     }
- }
--- 
-2.47.0
-
diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
index b1502dff2f84..9e273d032ce1 100644
--- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix
+++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   cmake,
@@ -30,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "morph-browser";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/morph-browser";
-    rev = finalAttrs.version;
-    hash = "sha256-VxSADFTlaxQUDc81TzGkx54mjAUgY2L+suQC9zYGKo0=";
+    tag = finalAttrs.version;
+    hash = "sha256-CW+8HEGxeDDfqbBtNHDKTvsZkbu0tCmD6OEDW07KG2k=";
   };
 
   outputs = [
@@ -44,18 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  patches = [
-    # Remove when version > 1.1.1
-    (fetchpatch {
-      name = "0002-morph-browser-Call-i18n-bindtextdomain-with-buildtime-determined-locale-path.patch";
-      url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/3d9777fdc7d5b302a9f17679e4ea125e94468772.patch";
-      hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/589 merged & in release
-    ./1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch
-  ];
-
   postPatch =
     ''
       substituteInPlace src/{Morph,Ubuntu}/CMakeLists.txt \

From cbf92309a90dc0b7cdff8810277853f66bb46a69 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 25 Jan 2025 12:03:21 +0100
Subject: [PATCH 08/88] pax-rs: remove

Author's GitHub profile is now private.  According to the Wayback
Machine upstream repo has been gone since at least September 2020.
---
 pkgs/by-name/pa/pax-rs/package.nix | 46 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 pkgs/by-name/pa/pax-rs/package.nix

diff --git a/pkgs/by-name/pa/pax-rs/package.nix b/pkgs/by-name/pa/pax-rs/package.nix
deleted file mode 100644
index 8278405f3f39..000000000000
--- a/pkgs/by-name/pa/pax-rs/package.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  fetchurl,
-  rustPlatform,
-  runCommand,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "pax-rs";
-  version = "0.4.0";
-
-  meta = with lib; {
-    description = "Fastest JavaScript bundler in the galaxy";
-    longDescription = ''
-      The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(<string>).
-    '';
-    homepage = "https://github.com/nathan/pax";
-    license = licenses.mit;
-    maintainers = [ maintainers.klntsky ];
-    platforms = platforms.linux;
-    mainProgram = "px";
-  };
-
-  src =
-    let
-      source = fetchFromGitHub {
-        owner = "nathan";
-        repo = "pax";
-        rev = "pax-v${version}";
-        sha256 = "1l2xpgsms0bfc0i3l0hyw4dbp6d4qdxa9vxyp704p27vvn4ndhv2";
-      };
-
-      cargo-lock = fetchurl {
-        url = "https://gist.github.com/klntsky/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock";
-        sha256 = "0ff1b64b99cbca1cc2ceabcd2e4f7bc3411e3a2a9fbb9db2204d9240fe38ddeb";
-      };
-    in
-    runCommand "pax-rs-src" { } ''
-      cp -R ${source} $out
-      chmod +w $out
-      cp ${cargo-lock} $out/Cargo.lock
-    '';
-
-  cargoHash = "sha256-2gXd1rwj82Ywin4QW3g9cB9R0PkXhE73F9xSJ6EozzQ=";
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index af905e1b5a9c..a8295e79672d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1044,6 +1044,7 @@ mapAliases {
 
   ### P ###
 
+  pax-rs = throw "'pax-rs' has been removed because upstream has disappeared"; # Added 2025-01-25
   PageEdit = pageedit; # Added 2024-01-21
   p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20
   packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17

From c6b2a26f28fa61b429a6e498eba9aa92765eec02 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Jan 2025 11:32:02 +0100
Subject: [PATCH 09/88] fwts: reformat with nixfmt

---
 pkgs/os-specific/linux/fwts/default.nix | 40 ++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index c4a4d3ece8c1..c52dd1844fec 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -1,5 +1,21 @@
-{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, gnumake42, glib, pcre
-, json_c, flex, bison, dtc, pciutils, dmidecode, acpica-tools, libbsd }:
+{
+  lib,
+  stdenv,
+  fetchzip,
+  autoreconfHook,
+  pkg-config,
+  gnumake42,
+  glib,
+  pcre,
+  json_c,
+  flex,
+  bison,
+  dtc,
+  pciutils,
+  dmidecode,
+  acpica-tools,
+  libbsd,
+}:
 
 stdenv.mkDerivation rec {
   pname = "fwts";
@@ -12,8 +28,24 @@ stdenv.mkDerivation rec {
   };
 
   # fails with make 4.4
-  nativeBuildInputs = [ autoreconfHook pkg-config gnumake42 ];
-  buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode acpica-tools libbsd ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    gnumake42
+  ];
+
+  buildInputs = [
+    glib
+    pcre
+    json_c
+    flex
+    bison
+    dtc
+    pciutils
+    dmidecode
+    acpica-tools
+    libbsd
+  ];
 
   postPatch = ''
     substituteInPlace src/lib/include/fwts_binpaths.h \

From f3785b42e8ee7dc6e9a9bcced86d13188c4fbfc4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Jan 2025 11:33:14 +0100
Subject: [PATCH 10/88] fwts: refactor

---
 pkgs/os-specific/linux/fwts/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index c52dd1844fec..515669921d70 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   version = "24.09.00";
 
   src = fetchzip {
-    url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
-    sha256 = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
+    url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
+    hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
     stripRoot = false;
   };
 
@@ -49,22 +49,22 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/lib/include/fwts_binpaths.h \
-      --replace "/usr/bin/lspci"      "${pciutils}/bin/lspci" \
-      --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \
-      --replace "/usr/bin/iasl"       "${acpica-tools}/bin/iasl"
+      --replace-fail "/usr/bin/lspci"      "${pciutils}/bin/lspci" \
+      --replace-fail "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \
+      --replace-fail "/usr/bin/iasl"       "${acpica-tools}/bin/iasl"
 
     substituteInPlace src/lib/src/fwts_devicetree.c \
                       src/devicetree/dt_base/dt_base.c \
-      --replace "dtc -I" "${dtc}/bin/dtc -I"
+      --replace-fail "dtc -I" "${dtc}/bin/dtc -I"
   '';
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://wiki.ubuntu.com/FirmwareTestSuite";
     description = "Firmware Test Suite";
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ tadfisher ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ tadfisher ];
   };
 }

From 6835eb27d5ba1c36a01179ee11ae36969656c88b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Jan 2025 13:35:10 +0000
Subject: [PATCH 11/88] naabu: 2.3.3 -> 2.3.4

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

diff --git a/pkgs/by-name/na/naabu/package.nix b/pkgs/by-name/na/naabu/package.nix
index 5120f7e1eebf..c632a5dfc5c1 100644
--- a/pkgs/by-name/na/naabu/package.nix
+++ b/pkgs/by-name/na/naabu/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "naabu";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "naabu";
     tag = "v${version}";
-    hash = "sha256-ffE/PlLUH2qO4QJpSGHmEh7/ghputTCnTYplzP+Umw0=";
+    hash = "sha256-Xri3kdpK1oPb2doL/x7PkZQBtFugesbNX3GGc/w3GY8=";
   };
 
-  vendorHash = "sha256-YSE6WQkq47A+D9ff3UHbc0Kdik9b4KjRpwYWkXDD5zA=";
+  vendorHash = "sha256-HpkFUHD3B09nxGK75zELTsjr4wXivY2o/DCjYSDepRI=";
 
   buildInputs = [ libpcap ];
 

From e99b9eb8b31bd6b8ade67609c2eb7ec8ea71eb29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Jan 2025 13:35:31 +0000
Subject: [PATCH 12/88] grafana-kiosk: 1.0.8 -> 1.0.9

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

diff --git a/pkgs/by-name/gr/grafana-kiosk/package.nix b/pkgs/by-name/gr/grafana-kiosk/package.nix
index 57913244e940..7ae16243d7f9 100644
--- a/pkgs/by-name/gr/grafana-kiosk/package.nix
+++ b/pkgs/by-name/gr/grafana-kiosk/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "grafana-kiosk";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana-kiosk";
     rev = "v${version}";
-    hash = "sha256-M0Gz0+MQNTIOYBxVRaxk5kYZwoJy1nPckGcYF29EzHA=";
+    hash = "sha256-kh62qGMVHNTssQMEBwLaEW0tRtP3iWMrxXeQU+fe+44=";
   };
 
-  vendorHash = "sha256-dnA5Z6VX7+RLpV7+PPuckH+v407dK8nbe0OVJtfG1YE=";
+  vendorHash = "sha256-LZLmXGPYvNR4meqen0h0UHj62392hfPs9BLNK+X6sKA=";
 
   nativeBuildInputs = [ makeWrapper ];
   postFixup = ''

From 3045853cb07f039c9ad9bfa0c7461f18426fd3c1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Jan 2025 11:33:29 +0100
Subject: [PATCH 13/88] fwts: unpin gnumake42

---
 pkgs/os-specific/linux/fwts/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 515669921d70..6fd7dc8e99d1 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -4,7 +4,6 @@
   fetchzip,
   autoreconfHook,
   pkg-config,
-  gnumake42,
   glib,
   pcre,
   json_c,
@@ -27,11 +26,9 @@ stdenv.mkDerivation rec {
     stripRoot = false;
   };
 
-  # fails with make 4.4
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    gnumake42
   ];
 
   buildInputs = [

From ed91d70e7bd5de901a3fd487179222675f786ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 25 Jan 2025 20:01:50 +0100
Subject: [PATCH 14/88] plasma5Packages.kdev-python: use current python3

---
 pkgs/applications/kde/kdevelop/kdev-python.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/kde/kdevelop/kdev-python.nix b/pkgs/applications/kde/kdevelop/kdev-python.nix
index 9c033837b0a8..284732de3037 100644
--- a/pkgs/applications/kde/kdevelop/kdev-python.nix
+++ b/pkgs/applications/kde/kdevelop/kdev-python.nix
@@ -6,18 +6,14 @@
   threadweaver,
   ktexteditor,
   kdevelop-unwrapped,
-  python39,
+  python3,
 }:
-let
-  # FIXME: stick with python 3.9 until MR supporting 3.10 is ready:
-  # https://invent.kde.org/kdevelop/kdev-python/-/merge_requests/16
-  python = python39;
-in
-mkDerivation rec {
+
+mkDerivation {
   pname = "kdev-python";
 
   cmakeFlags = [
-    "-DPYTHON_EXECUTABLE=${python}/bin/python"
+    "-DPYTHON_EXECUTABLE=${lib.getExe python3}"
   ];
 
   nativeBuildInputs = [

From 9f8f053137668e607a15930d0db1a3d827ec93d5 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 2 Dec 2024 14:18:18 -0500
Subject: [PATCH 15/88] julia_110-bin: 1.10.4 -> 1.10.7

---
 pkgs/development/compilers/julia/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 68bd8497aad6..920aef243997 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -29,12 +29,12 @@ in
     { });
   julia_110-bin = wrapJulia (callPackage
     (import ./generic-bin.nix {
-      version = "1.10.4";
+      version = "1.10.7";
       sha256 = {
-        x86_64-linux = "079f61757c3b5b40d2ade052b3cc4816f50f7ef6df668825772562b3746adff1";
-        aarch64-linux = "ae4ae6ade84a103cdf30ce91c8d4035a0ef51c3e2e66f90a0c13abeb4e100fc4";
-        x86_64-darwin = "259c18a5294dd41cc60117ecb9fc5a8b2f659807284903a65439fb9d3818c763";
-        aarch64-darwin = "97b88d7f9b5724118769f3a3bd259f8f7ada48cdecf3d584cf68162dd873dd10";
+        x86_64-linux = "21b2c69806aacf191d7c81806c7d9918bddab30c7b5b8d4251389c3abe274334";
+        aarch64-linux = "93bf1b113f297c817310f77d1edce4ab9dcbf49432489cb8df09afbf93d1e5a0";
+        x86_64-darwin = "4643d1052ed478b646be06f545b50698fbc572b216dcca3bca69f429ce0e1321";
+        aarch64-darwin = "8beb61a29a6c32e26f55070dba8ded37f8572ad07aebd461a06ff5b10d48dc36";
       };
     })
     { });

From d9fa300f8be0455d4fa4d5afaf0577593561a062 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 2 Dec 2024 14:20:21 -0500
Subject: [PATCH 16/88] julia_110: 1.10.4 -> 1.10.7

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

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 920aef243997..61c95d3e36b8 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -60,8 +60,8 @@ in
     { });
   julia_110 = wrapJulia (callPackage
     (import ./generic.nix {
-      version = "1.10.4";
-      hash = "sha256-8y5Sd/XYKmOCSILN6/rBWBmbuEgUw8AZo/7MNgFYYZE=";
+      version = "1.10.7";
+      hash = "sha256-BLo4KQstKnowOcMlHXClRRxP5ZXmTpl4rl7D+q+Fajw=";
       patches = [
         ./patches/1.10/0002-skip-failing-and-flaky-tests.patch
       ];

From 79f1080f280cfd4ace4ff698652173fcb54916a5 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 22 Jan 2025 17:07:04 -0500
Subject: [PATCH 17/88] julia_110-bin: 1.10.7 -> 1.10.8

---
 pkgs/development/compilers/julia/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 61c95d3e36b8..ad859626c4c9 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -29,12 +29,12 @@ in
     { });
   julia_110-bin = wrapJulia (callPackage
     (import ./generic-bin.nix {
-      version = "1.10.7";
+      version = "1.10.8";
       sha256 = {
-        x86_64-linux = "21b2c69806aacf191d7c81806c7d9918bddab30c7b5b8d4251389c3abe274334";
-        aarch64-linux = "93bf1b113f297c817310f77d1edce4ab9dcbf49432489cb8df09afbf93d1e5a0";
-        x86_64-darwin = "4643d1052ed478b646be06f545b50698fbc572b216dcca3bca69f429ce0e1321";
-        aarch64-darwin = "8beb61a29a6c32e26f55070dba8ded37f8572ad07aebd461a06ff5b10d48dc36";
+        x86_64-linux = "0410175aeec3df63173c15187f2083f179d40596d36fd3a57819cc5f522ae735";
+        aarch64-linux = "8d63dd12595a08edc736be8d6c4fea1840f137b81c62079d970dbd1be448b8cd";
+        x86_64-darwin = "8dae60def14db9e9b0f70891f15483d05785ae27a2c14f8f4b1ce27010e4015f";
+        aarch64-darwin = "cdd5891a7b143bde835a79155471b82c5482d4dc5576f719351810548242e64b";
       };
     })
     { });

From c806233552497c41cd4010f4820a31eccfc1ac40 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 22 Jan 2025 17:08:36 -0500
Subject: [PATCH 18/88] julia_110: 1.10.7 -> 1.10.8

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

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index ad859626c4c9..50fbaacc0a1e 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -60,8 +60,8 @@ in
     { });
   julia_110 = wrapJulia (callPackage
     (import ./generic.nix {
-      version = "1.10.7";
-      hash = "sha256-BLo4KQstKnowOcMlHXClRRxP5ZXmTpl4rl7D+q+Fajw=";
+      version = "1.10.8";
+      hash = "sha256-NPojubjOgy32CWlD/TDzI764Ca7cMsFj9r7vUdUW9Oc=";
       patches = [
         ./patches/1.10/0002-skip-failing-and-flaky-tests.patch
       ];

From 237c868837e6a57e378b9f07630385194fb93c79 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 25 Jan 2025 14:04:47 -0500
Subject: [PATCH 19/88] julia_110: revert upstream commit breaking build

---
 pkgs/development/compilers/julia/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 50fbaacc0a1e..390745fe5290 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -1,4 +1,4 @@
-{ callPackage }:
+{ callPackage, fetchpatch2 }:
 
 let
   juliaWithPackages = callPackage ../../julia-modules { };
@@ -64,6 +64,14 @@ in
       hash = "sha256-NPojubjOgy32CWlD/TDzI764Ca7cMsFj9r7vUdUW9Oc=";
       patches = [
         ./patches/1.10/0002-skip-failing-and-flaky-tests.patch
+        # Revert https://github.com/JuliaLang/julia/pull/55354
+        # [build] Some improvements to the LLVM build system
+        # Related: https://github.com/JuliaLang/julia/issues/55617
+        (fetchpatch2 {
+          url = "https://github.com/JuliaLang/julia/commit/0be37db8c5b5a440bd9a11960ae9c998027b7337.patch";
+          revert = true;
+          hash = "sha256-gXC3LE3AuHMlSdA4dW+rbAhJpSB6ZMaz9X1qrHDPX7Y=";
+        })
       ];
     })
     { });

From 5ddb146554ec5f0f2abec9efe6ec9a787bdb26bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 19:59:19 +0000
Subject: [PATCH 20/88] apt: 2.9.18 -> 2.9.21

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

diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index e28dde96197e..57a678a751f3 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "apt";
-  version = "2.9.18";
+  version = "2.9.21";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz";
-    hash = "sha256-mQO7u8ibtqRoeggKG/kLuLo2gC7BlrNUmkwf0FAtGjo=";
+    hash = "sha256-ysdOSPZuAPjF9bxnxDnD1VGgeSGibc1II0rTmLrNbhE=";
   };
 
   # cycle detection; lib can't be split

From a4c008fc9ec46324a36a6897dbfb2aad26606e2e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Jan 2025 23:36:04 +0100
Subject: [PATCH 21/88] apt: 2.9.21 -> 2.9.25

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

diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index 57a678a751f3..6a932fd86f45 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
   bzip2,
   cmake,
   curl,
@@ -34,11 +34,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "apt";
-  version = "2.9.21";
+  version = "2.9.25";
 
-  src = fetchurl {
-    url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz";
-    hash = "sha256-ysdOSPZuAPjF9bxnxDnD1VGgeSGibc1II0rTmLrNbhE=";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "apt-team";
+    repo = "apt";
+    rev = finalAttrs.version;
+    hash = "sha256-YVMqqWF4heSF11b0uKD/EUUBPPzkTtGP3QxnLVY6/l8=";
   };
 
   # cycle detection; lib can't be split

From 41198d5f4a53bd18f574805710ec053fb3c5e70b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2025 04:45:42 +0000
Subject: [PATCH 22/88] tootik: 0.15.0 -> 0.15.1

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

diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix
index 5fd9b50eaff0..2defbff04443 100644
--- a/pkgs/by-name/to/tootik/package.nix
+++ b/pkgs/by-name/to/tootik/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "tootik";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "dimkr";
     repo = "tootik";
     tag = version;
-    hash = "sha256-Onl64ps8rfLVnZYQ2KPzS+mslgeNz2wpJuabwsqhXlM=";
+    hash = "sha256-uq0mDlJ5NPXw1fsNcoyTbqqpZsYDkX8OSdZ5ToO0rYQ=";
   };
 
-  vendorHash = "sha256-GSi+sQz7kgp1YHEzH/Y7rOOEEhhvzd75cVhSow3URaU=";
+  vendorHash = "sha256-p/pgoGzrukd4mzzoyLI9g6vL4k+lTnMZOha1KrYjHJ0=";
 
   nativeBuildInputs = [ openssl ];
 

From f13bfcaeef13bd3f277e89a2c5a9e2ece8ef70e2 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 26 Jan 2025 09:26:11 -0500
Subject: [PATCH 23/88] ansible-later: 3.3.1 -> 4.0.8

Diff: https://github.com/thegeeklab/ansible-later/compare/refs/tags/v3.3.1...v4.0.8

Changelog: https://github.com/thegeeklab/ansible-later/releases/tag/v4.0.8
---
 pkgs/tools/admin/ansible/later.nix | 62 +++++++++---------------------
 1 file changed, 19 insertions(+), 43 deletions(-)

diff --git a/pkgs/tools/admin/ansible/later.nix b/pkgs/tools/admin/ansible/later.nix
index aec0c0b80204..14fa7e514ab2 100644
--- a/pkgs/tools/admin/ansible/later.nix
+++ b/pkgs/tools/admin/ansible/later.nix
@@ -1,86 +1,62 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch,
-  python3,
+  python3Packages,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "ansible-later";
-  version = "3.3.1";
-  format = "pyproject";
+  version = "4.0.8";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-7k81eEcM+BXNrln6+Lu0+1LjsZdYkUidrRQCdlBbQB8=";
+    tag = "v${version}";
+    hash = "sha256-4ZHCnLeG5gr0UtKQLU+6xnTxUbxnLcmDd51Psnaa42I=";
   };
 
-  patches = [
-    # https://github.com/thegeeklab/ansible-later/pull/658
-    (fetchpatch {
-      name = "poetry-dynamic-versioning-pep517.patch";
-      url = "https://github.com/thegeeklab/ansible-later/commit/a2c278fb45769648df1439df5bb25883dddfc58a.patch";
-      hash = "sha256-++CiwwHZoaPC8XHaYbNQeU3zqEi2a4eIYbuSQkO0jTI=";
-    })
-  ];
-
-  pythonRelaxDeps = [
-    "anyconfig"
-    "flake8"
-    "jsonschema"
-    "pathspec"
-    "python-json-logger"
-    "PyYAML"
-    "toolz"
-    "unidiff"
-    "yamllint"
-  ];
-
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3Packages; [
     poetry-core
     poetry-dynamic-versioning
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
-    ansible
+  dependencies = with python3Packages; [
+    pyyaml
     ansible-core
+    ansible
     anyconfig
     appdirs
     colorama
-    flake8
     jsonschema
     nested-lookup
     pathspec
     python-json-logger
-    pyyaml
     toolz
     unidiff
     yamllint
-    distutils
   ];
 
-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = with python3Packages; [
     pytest-cov-stub
     pytest-mock
     pytestCheckHook
   ];
 
-  postInstall = ''
-    rm $out/lib/python*/site-packages/LICENSE
-  '';
-
   pythonImportsCheck = [
     "ansiblelater"
   ];
 
-  meta = with lib; {
+  preCheck = ''
+    export HOME="$TMPDIR"
+  '';
+
+  meta = {
     description = "Best practice scanner for Ansible roles and playbooks";
     mainProgram = "ansible-later";
     homepage = "https://github.com/thegeeklab/ansible-later";
-    changelog = "https://github.com/thegeeklab/ansible-later/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ tboerger ];
+    changelog = "https://github.com/thegeeklab/ansible-later/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tboerger ];
   };
 }

From 9bb655a235e9d374f442c7a1a3551054df37ca39 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 15:44:37 +0100
Subject: [PATCH 24/88] python3Packages.datafusion: fetchCargoTarball ->
 fetchCargoVendor

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
---
 pkgs/development/python-modules/datafusion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix
index c80baeef6e53..46d27a50e93e 100644
--- a/pkgs/development/python-modules/datafusion/default.nix
+++ b/pkgs/development/python-modules/datafusion/default.nix
@@ -47,10 +47,10 @@ buildPythonPackage rec {
     hash = "sha256-5WOSlx4XW9zO6oTY16lWQElShLv0ubflVPfSSEGrFgg=";
   };
 
-  cargoDeps = rustPlatform.fetchCargoTarball {
+  cargoDeps = rustPlatform.fetchCargoVendor {
     name = "datafusion-cargo-deps";
     inherit src;
-    hash = "sha256-hN03tbnH77VsMDxSMddMHIH00t7lUs5h8rTHbiMIExw=";
+    hash = "sha256-xUpchV4UFEX1HkCpClOwxnEfGLVlOIX4UmzYKiUth9U=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From aa3c1afabf9dd445d3f1884e3525c55040b5e476 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 15:48:05 +0100
Subject: [PATCH 25/88] python3Packages.typst: fetchCargoTarball ->
 fetchCargoVendor

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
---
 pkgs/development/python-modules/typst/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix
index 3c0d3422883b..39cf7728077c 100644
--- a/pkgs/development/python-modules/typst/default.nix
+++ b/pkgs/development/python-modules/typst/default.nix
@@ -25,10 +25,10 @@ buildPythonPackage rec {
     hash = "sha256-VgQbMeyvXjzE8jSaGLygIy8EhR23MpqjlU68FsBZq6E=";
   };
 
-  cargoDeps = rustPlatform.fetchCargoTarball {
+  cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-H7lKoSDSx0cGH+VsIX90KaiWJw1h/BokNdKzxmvm6XQ=";
+    hash = "sha256-OHJQlGwgaQ2ELWvjaA8qsuXOQGSdgirK/yTff7POOmE=";
   };
 
   build-system = [

From f3e2270660940b07aa378d1a6c56adf70957b288 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 16:33:19 +0100
Subject: [PATCH 26/88] clickhouse: fetchCargoTarball -> fetchCargoVendor

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
---
 pkgs/servers/clickhouse/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index a7837947852e..b65285ef7133 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -120,21 +120,21 @@ mkDerivation rec {
       null;
   corrosionDeps =
     if rustSupport then
-      rustPlatform.fetchCargoTarball {
+      rustPlatform.fetchCargoVendor {
         src = corrosionSrc;
         name = "corrosion-deps";
         preBuild = "cd generator";
-        hash = "sha256-dhUgpwSjE9NZ2mCkhGiydI51LIOClA5wwk1O3mnnbM8=";
+        hash = "sha256-ok1QLobiGBccmbEEWQxHz3ivvuT6FrOgG6wLK4gIbgU=";
       }
     else
       null;
   rustDeps =
     if rustSupport then
-      rustPlatform.fetchCargoTarball {
+      rustPlatform.fetchCargoVendor {
         inherit src;
         name = "rust-deps";
         preBuild = "cd rust";
-        hash = "sha256-rbEfCRB2QAZ2WBgSLYYUqeYtI4Y5d9oQ2G8/mPirIp4=";
+        hash = "sha256-nX5wBM8rVMbaf/IrPsqkdT2KQklQbBIGomeWSTjclR4=";
       }
     else
       null;

From 8965df8599001dcbbb737443a793d1a859706dee Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 16:33:48 +0100
Subject: [PATCH 27/88] librespot: useFetchCargoVendor

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
---
 pkgs/applications/audio/librespot/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index 8493793969f0..6a29a96e470b 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dGQDRb7fgIkXelZKa+PdodIs9DxbgEMlVGJjK/hU3Mo=";
   };
 
-  cargoHash = "sha256-GScAUqALoocqvsHz4XgPytI8cl0hiuWjqaO/ItNo4v4=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-SqvJSHkyd1IicT6c4pE96dBJNNodULhpyG14HRGVWCk=";
 
   nativeBuildInputs =
     [

From c93dd741e1f6ad9a216d4e780dedb09a8fcb21db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2025 15:34:31 +0000
Subject: [PATCH 28/88] mieru: 3.11.0 -> 3.11.1

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index 794d7e727c18..d1f001068a3a 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mieru";
-  version = "3.11.0";
+  version = "3.11.1";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${version}";
-    hash = "sha256-xwi9T7M4FEl79kyGj+F1HX8000PFLrBfTmnEaLwnEFg=";
+    hash = "sha256-FFV1zF/sKgIVSSTcDcuB3QWfcFKbI3RJFG9RveSVe+w=";
   };
 
   vendorHash = "sha256-AOtq6bGijQqpNMNZA3XeMjzKAo7tWTpdrKB6KxQsdMM=";

From fe24b14a04bb2872408de3a1ca572e962c6a891b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2025 16:26:56 +0000
Subject: [PATCH 29/88] tuifimanager: 5.0.9 -> 5.1.5

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

diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix
index 3f48912d6056..b87133ca8d83 100644
--- a/pkgs/by-name/tu/tuifimanager/package.nix
+++ b/pkgs/by-name/tu/tuifimanager/package.nix
@@ -21,7 +21,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
   python3.pkgs.buildPythonApplication
   rec {
     pname = "tuifimanager";
-    version = "5.0.9";
+    version = "5.1.5";
 
     pyproject = true;
 
@@ -29,7 +29,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
       owner = "GiorgosXou";
       repo = "TUIFIManager";
       tag = "v.${version}";
-      hash = "sha256-15PXua3kLf3Mpgft2msFBn+fS2bzfTAIC9bmOkNKqlU=";
+      hash = "sha256-5ShrmjEFKGdmaGBFjMnIfcM6p8AZd13uIEFwDVAkU/8=";
     };
 
     build-system = with python3.pkgs; [

From 3c4a42f4e76899fb35b8e0af7e4e02c741d8f11f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2025 17:01:10 +0000
Subject: [PATCH 30/88] rbspy: 0.28.0 -> 0.29.0

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

diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix
index 4a61021a00ca..b27c65b2fd17 100644
--- a/pkgs/development/tools/rbspy/default.nix
+++ b/pkgs/development/tools/rbspy/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rbspy";
-  version = "0.28.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "rbspy";
     repo = "rbspy";
     tag = "v${version}";
-    hash = "sha256-6tCTrplzoiimKvXEIXd2gUOXzcZ/eQ22npBqbVv0Nv0=";
+    hash = "sha256-KEF98h51F4sZ/eX08hggabnBji/8e/yJTP1VNzuLOlw=";
   };
 
-  cargoHash = "sha256-J+3v7O38+MhCoq1UKf0Sqaomw/SSu+JK3sWWv9rB6FI=";
+  cargoHash = "sha256-qC/D3Nt+dEH6gDEHaOCc5Gt8Qe2nWG5fGq81y188bYY=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''

From 919ece9608bbeea5aedf552eaed3264750a8038c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 17:40:30 +0100
Subject: [PATCH 31/88] rustfilt: remove

2 years since the last upstream commit.  Current lockfile is too old
for fetchCargoVendor, although the latest upstream commit would be.
---
 pkgs/by-name/ru/rustfilt/package.nix | 27 ---------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/by-name/ru/rustfilt/package.nix

diff --git a/pkgs/by-name/ru/rustfilt/package.nix b/pkgs/by-name/ru/rustfilt/package.nix
deleted file mode 100644
index 351cfa9af57d..000000000000
--- a/pkgs/by-name/ru/rustfilt/package.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "rustfilt";
-  version = "0.2.1";
-
-  src = fetchFromGitHub {
-    owner = "luser";
-    repo = pname;
-    rev = version;
-    hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ=";
-  };
-
-  cargoHash = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE=";
-
-  meta = with lib; {
-    description = "Demangle Rust symbol names using rustc-demangle";
-    homepage = "https://github.com/luser/rustfilt";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ wykurz ];
-    mainProgram = "rustfilt";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2cedda3561d1..ff1f8a46b059 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1214,6 +1214,7 @@ mapAliases {
   runCommandNoCC = runCommand;
   runCommandNoCCLocal = runCommandLocal;
   rustc-wasm32 = rustc; # Added 2023-12-01
+  rustfilt = throw "'rustfilt' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   rustic-rs = rustic; # Added 2024-08-02
   rxvt_unicode = throw "'rxvt_unicode' has been renamed to/replaced by 'rxvt-unicode-unwrapped'"; # Converted to throw 2024-10-17
   rxvt_unicode-with-plugins = throw "'rxvt_unicode-with-plugins' has been renamed to/replaced by 'rxvt-unicode'"; # Converted to throw 2024-10-17

From 27b777df7515d8cb77cdc3551de489ee37402261 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sat, 25 Jan 2025 15:28:43 -0500
Subject: [PATCH 32/88] python312Packages.pycm: 4.0 -> 4.2

---
 .../python-modules/pycm/default.nix           | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix
index b560b9705cca..7d6a114c3451 100644
--- a/pkgs/development/python-modules/pycm/default.nix
+++ b/pkgs/development/python-modules/pycm/default.nix
@@ -5,54 +5,55 @@
   matplotlib,
   numpy,
   pytestCheckHook,
-  pythonOlder,
+  pytest-cov-stub,
   seaborn,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pycm";
-  version = "4.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.5";
+  version = "4.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sepandhaghighi";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-GyH06G7bArFBTzV/Sx/KmoJvcoed0sswW7qGqsSULHo=";
+    hash = "sha256-oceLARBP9D6NlMQiDvzIpJNNcod5D1O4xo3YzrUstso=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     matplotlib
     numpy
     seaborn
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    matplotlib
+  ];
 
   disabledTests = [
-    # Minor tolerance issues with Python 3.12; should be fixed in next release
-    # (see https://github.com/sepandhaghighi/pycm/pull/528)
-    "verified_test"
-    "function_test"
+    "plot_error_test" # broken doctest (expects matplotlib import exception)
   ];
 
   postPatch = ''
     # Remove a trivial dependency on the author's `art` Python ASCII art library
     rm pycm/__main__.py
-    # Also depends on python3Packages.notebook
-    rm Otherfiles/notebook_check.py
     substituteInPlace setup.py \
       --replace-fail '=get_requires()' '=[]'
   '';
 
   pythonImportsCheck = [ "pycm" ];
 
-  meta = with lib; {
+  meta = {
     description = "Multiclass confusion matrix library";
     homepage = "https://pycm.io";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bcdarwin ];
+    changelog = "https://github.com/sepandhaghighi/pycm/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bcdarwin ];
   };
 }

From 78aa415507469aa388e0c008c7a00e6ba5eb2a7a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 20:40:23 +0100
Subject: [PATCH 33/88] influxdb: useFetchCargoVendor

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
---
 pkgs/servers/nosql/influxdb/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index efd6a31d3baa..d60d167e4d9f 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -43,7 +43,8 @@ let
         --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"
     '';
     sourceRoot = "${src.name}/libflux";
-    cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-wJVvpjaBUae3FK3lQaQov4t0UEsH86tB8B8bsSFGGBU=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
     buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
     pkgcfg = ''

From 2b4cec3db053c532422a2bb398808908bb33bcb2 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 20:40:55 +0100
Subject: [PATCH 34/88] influxdb2: useFetchCargoVendor

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
---
 pkgs/servers/nosql/influxdb2/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
index 61d4b8ec260b..7fcb072926f6 100644
--- a/pkgs/servers/nosql/influxdb2/default.nix
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -59,7 +59,8 @@ let
         --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"
     '';
     sourceRoot = "${src.name}/libflux";
-    cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-wJVvpjaBUae3FK3lQaQov4t0UEsH86tB8B8bsSFGGBU=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
     buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
     pkgcfg = ''

From 145fe791fed482c508fe95adc9fdc9a2dc7ebdec Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 20:54:25 +0100
Subject: [PATCH 35/88] nix-index: useFetchCargoVendor

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
---
 pkgs/tools/package-management/nix-index/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index f9ab5c71204b..de1cf8319039 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-r3Vg9ox953HdUp5Csxd2DYUyBe9u61fmA94PpcAZRqo=";
   };
 
-  cargoHash = "sha256-c1Ivsj9of/cjEKU0lo4I9BfIUQZ3pPf2QF9fAlZTQn0=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-BKVxtd+gbCHzpnr5LZmKMUMEEZvsZMT0AdlfrLpMYpc=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From d33a8e9ccc7f16a3b054bb33856693e35baaef5e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 20:59:34 +0100
Subject: [PATCH 36/88] wireguard-vanity-address: remove

5 years since the last upstream commit.  Lockfile is too old for
fetchCargoVendor.
---
 .../wireguard-vanity-address/default.nix      | 31 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 ---
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/tools/networking/wireguard-vanity-address/default.nix

diff --git a/pkgs/tools/networking/wireguard-vanity-address/default.nix b/pkgs/tools/networking/wireguard-vanity-address/default.nix
deleted file mode 100644
index e64a8a59f5c7..000000000000
--- a/pkgs/tools/networking/wireguard-vanity-address/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  rustPlatform,
-  Security,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "wireguard-vanity-address";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "warner";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-SjzcVIQ9HwhP6Y/uCwXGSdZgrYcUQ9kE/Bow8pyOKNo=";
-  };
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
-
-  cargoHash = "sha256-0bkyopkssqH0vfaWkFC3dV2o7Q3EuDEOM8JvRB9ekLU=";
-
-  meta = with lib; {
-    description = "Find Wireguard VPN keypairs with a specific readable string";
-    homepage = "https://github.com/warner/wireguard-vanity-address";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bcc32 ];
-    mainProgram = "wireguard-vanity-address";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a0db6ec6d3fb..c765ec9c42fd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1483,6 +1483,7 @@ mapAliases {
   wg-bond = throw "'wg-bond' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   wineWayland = wine-wayland;
   win-virtio = virtio-win; # Added 2023-10-17
+  wireguard-vanity-address = throw "'wireguard-vanity-address' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17
   wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14
   wlroots = wlroots_0_18; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4c00c5bcb56..0da909304ef9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5374,10 +5374,6 @@ with pkgs;
 
   wireguard-tools = callPackage ../tools/networking/wireguard-tools { };
 
-  wireguard-vanity-address = callPackage ../tools/networking/wireguard-vanity-address {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   wg-netmanager = callPackage ../tools/networking/wg-netmanager {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From e233cae76072a772008b9062f12f0d1f2d98a940 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 21:03:56 +0100
Subject: [PATCH 37/88] anevicon: remove

According to the Wayback Machine upstream has been gone since at least
November 2023.
---
 pkgs/tools/networking/anevicon/default.nix | 48 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  4 --
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 pkgs/tools/networking/anevicon/default.nix

diff --git a/pkgs/tools/networking/anevicon/default.nix b/pkgs/tools/networking/anevicon/default.nix
deleted file mode 100644
index 5aaec8d47fd6..000000000000
--- a/pkgs/tools/networking/anevicon/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  rustPlatform,
-  libiconv,
-  Security,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "anevicon";
-  version = "0.1.0";
-
-  src = fetchFromGitHub {
-    owner = "rozgo";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1m3ci7g7nn28p6x5m85av3ljgszwlg55f1hmgjnarc6bas5bapl7";
-  };
-
-  cargoHash = "sha256-Id/vjne73w+bDVA8wT7fV1DMXeGtYbSAdwl07UfYJbw=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-    Security
-  ];
-
-  cargoPatches = [
-    # Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1
-    (fetchpatch {
-      name = "cargo-lock-file.patch";
-      url = "https://github.com/rozgo/anevicon/commit/205440a0863aaea34394f30f4255fa0bb1704aed.patch";
-      sha256 = "02syzm7irn4slr3s5dwwhvg1qx8fdplwlhza8gfkc6ajl7vdc7ri";
-    })
-  ];
-
-  # Tries to send large UDP packets that Darwin rejects.
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
-  meta = with lib; {
-    description = "UDP-based load generator";
-    homepage = "https://github.com/rozgo/anevicon";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
-    mainProgram = "anevicon";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a0db6ec6d3fb..708d79b808c0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -111,6 +111,7 @@ mapAliases {
   ao = libfive; # Added 2024-10-11
   apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13
   anbox = throw "'anbox' has been removed as the upstream project is unmaintained, see https://github.com/anbox/.github/blob/main/profile/README.md"; # Added 2025-01-04
+  anevicon = throw "'anevicon' has been removed because the upstream repository no longer exists"; # Added 2025-01-26
   antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17
   apacheAnt = ant; # Added 2024-11-28
   apple-sdk_10_12 = throw "apple-sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4c00c5bcb56..c7b891052ce7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1908,10 +1908,6 @@ with pkgs;
     novacomd = callPackage ../development/mobile/webos/novacomd.nix { };
   };
 
-  anevicon = callPackage ../tools/networking/anevicon {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   aoc-cli = callPackage ../tools/misc/aoc-cli {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From 6ecc829cf2afecd6776fbf91a0d4ceff971b7952 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 21:14:35 +0100
Subject: [PATCH 38/88] sheesy-cli: remove

4 years since the last upstream commit.  Lockfile is too old for
fetchCargoVendor.
---
 pkgs/tools/security/sheesy-cli/default.nix | 65 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  4 --
 3 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 pkgs/tools/security/sheesy-cli/default.nix

diff --git a/pkgs/tools/security/sheesy-cli/default.nix b/pkgs/tools/security/sheesy-cli/default.nix
deleted file mode 100644
index 87701523ec51..000000000000
--- a/pkgs/tools/security/sheesy-cli/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  lib,
-  stdenv,
-  rustPlatform,
-  fetchCrate,
-  installShellFiles,
-  libgpg-error,
-  gpgme,
-  gettext,
-  openssl,
-  Security,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "sheesy-cli";
-  version = "4.0.11";
-
-  src = fetchCrate {
-    inherit version pname;
-    hash = "sha256-rJ/V9pJgmqERgjD0FQ/oqhZQlIeN4/3ECx15/FOUQdA=";
-  };
-
-  cargoHash = "sha256-o2XRvzw54x6xv81l97s1hwc2MC0Ioeyheoz3F+AtKpU=";
-  cargoDepsName = pname;
-
-  nativeBuildInputs = [
-    libgpg-error
-    gpgme
-    gettext
-    installShellFiles
-  ];
-
-  buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
-
-  buildFeatures = [
-    "vault"
-    "extract"
-    "completions"
-    "substitute"
-    "process"
-  ];
-
-  checkFeatures = [ ];
-
-  cargoBuildFlags = [
-    "--bin"
-    "sy"
-  ];
-
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd sy \
-      --bash <($out/bin/sy completions bash) \
-      --fish <($out/bin/sy completions fish) \
-      --zsh <($out/bin/sy completions zsh)
-  '';
-
-  meta = with lib; {
-    description = "'share-secrets-safely' CLI to interact with GPG/pass-like vaults";
-    homepage = "https://share-secrets-safely.github.io/cli/";
-    changelog = "https://github.com/share-secrets-safely/cli/releases/tag/${version}";
-    license = with licenses; [ lgpl21Only ];
-    maintainers = with maintainers; [ devhell ];
-    mainProgram = "sy";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a0db6ec6d3fb..fb36c1f7f84a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1253,6 +1253,7 @@ mapAliases {
   shipyard = jumppad; # Added 2023-06-06
   siduck76-st = st-snazzy; # Added 2024-12-24
   signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain";
+  sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   shout = nodePackages.shout; # Added unknown; moved 2024-10-19
   sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
   SkypeExport = skypeexport; # Added 2024-06-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4c00c5bcb56..169455de9103 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2578,10 +2578,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  sheesy-cli = callPackage ../tools/security/sheesy-cli {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   steampipePackages = recurseIntoAttrs (
     callPackage ../tools/misc/steampipe-packages { }
   );

From 78c5938ece7ddaae24bbf8691003bd2ed032e89b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 21:15:06 +0100
Subject: [PATCH 39/88] genpass: useFetchCargoVendor

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
---
 pkgs/tools/security/genpass/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix
index 5fd2fd3b0b72..02ddd76f75f6 100644
--- a/pkgs/tools/security/genpass/default.nix
+++ b/pkgs/tools/security/genpass/default.nix
@@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "UyEgOlKtDyneRteN3jHA2BJlu5U1HFL8HA2MTQz5rns=";
   };
 
-  cargoHash = "sha256-ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-tcE2TugvTJyUsgkxff31U/PIiO1IMr4rO6FKYP/oEiw=";
 
   buildInputs = [
     zlib

From e4fd5b5b9c5e6772649cc6dd9057c8636a79d1ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2025 20:28:08 +0000
Subject: [PATCH 40/88] v2ray: 5.24.0 -> 5.25.1

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

diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix
index ffcc687ddbcf..880c390e012b 100644
--- a/pkgs/by-name/v2/v2ray/package.nix
+++ b/pkgs/by-name/v2/v2ray/package.nix
@@ -16,18 +16,18 @@
 
 buildGoModule rec {
   pname = "v2ray-core";
-  version = "5.24.0";
+  version = "5.25.1";
 
   src = fetchFromGitHub {
     owner = "v2fly";
     repo = "v2ray-core";
     rev = "v${version}";
-    hash = "sha256-3xbXqfac1Kv77uBxykoX1nDB5NqTJDYmmzRloZUL/dA=";
+    hash = "sha256-XJVWja2LGBIXGdzYL8oHMcZn15Bg01t/ro/SRI6Xi/A=";
   };
 
   # `nix-update` doesn't support `vendorHash` yet.
   # https://github.com/Mic92/nix-update/pull/95
-  vendorHash = "sha256-z0ScEkXQu6YSXESdaTAs3vkPPlHEDmJ5xAwJQERwhWo=";
+  vendorHash = "sha256-8SFQUe52zZLii1XnFg2GBMseBlDxKAE0V56VVXGDlck=";
 
   ldflags = [
     "-s"

From cf6d220869850b4df31a4ac5d87e6b9e9f56c09c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2025 20:55:10 +0000
Subject: [PATCH 41/88] jx: 3.11.4 -> 3.11.27

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

diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix
index befb1831504d..e2a61f5850f2 100644
--- a/pkgs/by-name/jx/jx/package.nix
+++ b/pkgs/by-name/jx/jx/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "jx";
-  version = "3.11.4";
+  version = "3.11.27";
 
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
     rev = "v${version}";
-    sha256 = "sha256-6M5mY3VoKyoKRd3K6TstGdJ6sfYcIHkCESDUWhl3VCc=";
+    sha256 = "sha256-Qh7Mjo4fwB3FF83GARLgYbQfwLmzJcOvqTAWe9XN/0I=";
   };
 
-  vendorHash = "sha256-GzkAIGy9CCBIbIWUkPOPM3GlKvlEVm6YXnQUUGjItXE=";
+  vendorHash = "sha256-MJ8gYB8MQADQbhfyWHdGoGzyKPTk7LrltI3Hd2xBN0k=";
 
   subPackages = [ "cmd" ];
 

From 88234d3a4f58e7248af755a08049638860fea7a0 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 26 Jan 2025 20:00:50 +0100
Subject: [PATCH 42/88] nixos/freshrss: add caddy support

---
 nixos/modules/services/web-apps/freshrss.nix  | 40 +++++++++++++++----
 nixos/tests/freshrss/caddy-sqlite.nix         | 30 ++++++++++++++
 nixos/tests/freshrss/default.nix              |  3 +-
 nixos/tests/freshrss/extensions.nix           |  2 +-
 nixos/tests/freshrss/http-auth.nix            |  2 +-
 .../freshrss/{sqlite.nix => nginx-sqlite.nix} |  4 +-
 nixos/tests/freshrss/none-auth.nix            |  2 +-
 nixos/tests/freshrss/pgsql.nix                |  2 +-
 8 files changed, 71 insertions(+), 14 deletions(-)
 create mode 100644 nixos/tests/freshrss/caddy-sqlite.nix
 rename nixos/tests/freshrss/{sqlite.nix => nginx-sqlite.nix} (91%)

diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix
index 9bd690d21167..a1aae7e31844 100644
--- a/nixos/modules/services/web-apps/freshrss.nix
+++ b/nixos/modules/services/web-apps/freshrss.nix
@@ -3,6 +3,7 @@
 with lib;
 let
   cfg = config.services.freshrss;
+  webserver = config.services.${cfg.webserver};
 
   extension-env = pkgs.buildEnv {
     name = "freshrss-extensions";
@@ -129,13 +130,25 @@ in
       example = "/mnt/freshrss";
     };
 
+    webserver = mkOption {
+      type = types.enum [ "nginx" "caddy" "none"];
+      default = "nginx";
+      description = ''
+        Whether to use nginx or caddy for virtual host management.
+
+        Further nginx configuration can be done by adapting `services.nginx.virtualHosts.<name>`.
+        See [](#opt-services.nginx.virtualHosts) for further information.
+
+        Further caddy configuration can be done by adapting `services.caddy.virtualHosts.<name>`.
+        See [](#opt-services.caddy.virtualHosts) for further information.
+      '';
+    };
+
     virtualHost = mkOption {
-      type = types.nullOr types.str;
+      type = types.str;
       default = "freshrss";
       description = ''
-        Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost.
-        You may need to configure the virtualhost further through services.nginx.virtualHosts.<virtualhost>,
-        for example to enable SSL.
+        Name of the caddy/nginx virtualhost to use and setup.
       '';
     };
 
@@ -204,8 +217,21 @@ in
           '';
         }
       ];
+
+      # Set up a Caddy virtual host.
+      services.caddy = mkIf (cfg.webserver == "caddy") {
+        enable = true;
+        virtualHosts.${cfg.virtualHost}.extraConfig = ''
+          root * ${config.services.freshrss.package}/p
+          php_fastcgi unix/${config.services.phpfpm.pools.freshrss.socket} {
+            env FRESHRSS_DATA_PATH ${config.services.freshrss.dataDir}
+          }
+          file_server
+        '';
+      };
+
       # Set up a Nginx virtual host.
-      services.nginx = mkIf (cfg.virtualHost != null) {
+      services.nginx = mkIf (cfg.webserver == "nginx") {
         enable = true;
         virtualHosts.${cfg.virtualHost} = {
           root = "${cfg.package}/p";
@@ -237,8 +263,8 @@ in
         ${cfg.pool} = {
           user = "freshrss";
           settings = {
-            "listen.owner" = "nginx";
-            "listen.group" = "nginx";
+            "listen.owner" = webserver.user;
+            "listen.group" = webserver.group;
             "listen.mode" = "0600";
             "pm" = "dynamic";
             "pm.max_children" = 32;
diff --git a/nixos/tests/freshrss/caddy-sqlite.nix b/nixos/tests/freshrss/caddy-sqlite.nix
new file mode 100644
index 000000000000..69b62ab3b899
--- /dev/null
+++ b/nixos/tests/freshrss/caddy-sqlite.nix
@@ -0,0 +1,30 @@
+import ../make-test-python.nix (
+  { lib, pkgs, ... }:
+  {
+    name = "freshrss-caddy-sqlite";
+    meta.maintainers = with lib.maintainers; [
+      etu
+      stunkymonkey
+    ];
+
+    nodes.machine =
+      { pkgs, ... }:
+      {
+        services.freshrss = {
+          enable = true;
+          baseUrl = "http://localhost";
+          passwordFile = pkgs.writeText "password" "secret";
+          dataDir = "/srv/freshrss";
+          webserver = "caddy";
+          virtualHost = "freshrss:80";
+        };
+      };
+
+    testScript = ''
+      machine.wait_for_unit("multi-user.target")
+      machine.wait_for_open_port(80)
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
+      assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
+    '';
+  }
+)
diff --git a/nixos/tests/freshrss/default.nix b/nixos/tests/freshrss/default.nix
index 67892596ba23..9253ee7f7e4a 100644
--- a/nixos/tests/freshrss/default.nix
+++ b/nixos/tests/freshrss/default.nix
@@ -5,5 +5,6 @@
   http-auth = import ./http-auth.nix { inherit system pkgs; };
   none-auth = import ./none-auth.nix { inherit system pkgs; };
   pgsql = import ./pgsql.nix { inherit system pkgs; };
-  sqlite = import ./sqlite.nix { inherit system pkgs; };
+  nginx-sqlite = import ./nginx-sqlite.nix { inherit system pkgs; };
+  caddy-sqlite = import ./caddy-sqlite.nix { inherit system pkgs; };
 }
diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix
index 7aba55a3f5e1..d2758fd387b4 100644
--- a/nixos/tests/freshrss/extensions.nix
+++ b/nixos/tests/freshrss/extensions.nix
@@ -17,7 +17,7 @@ import ../make-test-python.nix (
     testScript = ''
       machine.wait_for_unit("multi-user.target")
       machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/?c=extension")
+      response = machine.succeed("curl -vvv -s http://localhost:80/i/?c=extension")
       assert '<span class="ext_name disabled">YouTube Video Feed</span>' in response, "Extension not present in extensions page."
     '';
   }
diff --git a/nixos/tests/freshrss/http-auth.nix b/nixos/tests/freshrss/http-auth.nix
index 84c308a7e48d..f0fb28ee188f 100644
--- a/nixos/tests/freshrss/http-auth.nix
+++ b/nixos/tests/freshrss/http-auth.nix
@@ -18,7 +18,7 @@ import ../make-test-python.nix (
     testScript = ''
       machine.wait_for_unit("multi-user.target")
       machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://localhost:80/i/")
       assert 'Account: testuser' in response, "http_auth method didn't work."
     '';
   }
diff --git a/nixos/tests/freshrss/sqlite.nix b/nixos/tests/freshrss/nginx-sqlite.nix
similarity index 91%
rename from nixos/tests/freshrss/sqlite.nix
rename to nixos/tests/freshrss/nginx-sqlite.nix
index 5edc081e5d7c..2425dc086549 100644
--- a/nixos/tests/freshrss/sqlite.nix
+++ b/nixos/tests/freshrss/nginx-sqlite.nix
@@ -1,7 +1,7 @@
 import ../make-test-python.nix (
   { lib, pkgs, ... }:
   {
-    name = "freshrss-sqlite";
+    name = "freshrss-nginx-sqlite";
     meta.maintainers = with lib.maintainers; [
       etu
       stunkymonkey
@@ -21,7 +21,7 @@ import ../make-test-python.nix (
     testScript = ''
       machine.wait_for_unit("multi-user.target")
       machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
       assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
     '';
   }
diff --git a/nixos/tests/freshrss/none-auth.nix b/nixos/tests/freshrss/none-auth.nix
index 1a945ebb9b38..1e504a869534 100644
--- a/nixos/tests/freshrss/none-auth.nix
+++ b/nixos/tests/freshrss/none-auth.nix
@@ -17,7 +17,7 @@ import ../make-test-python.nix (
     testScript = ''
       machine.wait_for_unit("multi-user.target")
       machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s http://localhost:80/i/")
       assert '<title>Main stream · FreshRSS</title>' in response, "FreshRSS stream page didn't load successfully"
     '';
   }
diff --git a/nixos/tests/freshrss/pgsql.nix b/nixos/tests/freshrss/pgsql.nix
index feb3b3bf1314..a3f3f938db98 100644
--- a/nixos/tests/freshrss/pgsql.nix
+++ b/nixos/tests/freshrss/pgsql.nix
@@ -47,7 +47,7 @@ import ../make-test-python.nix (
       machine.wait_for_unit("multi-user.target")
       machine.wait_for_open_port(5432)
       machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
       assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
     '';
   }

From 016979574e373891d0bfe8954213b0d08ed93c8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2025 21:46:41 +0000
Subject: [PATCH 43/88] renode-dts2repl: 0-unstable-2025-01-13 ->
 0-unstable-2025-01-14

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

diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index 3caff4d41017..01ebb6c336c7 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2025-01-13";
+  version = "0-unstable-2025-01-14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "d9b880c36988c0500f67d2206c4b2fdf42fd6e65";
-    hash = "sha256-Apu5WEwlUhO8/j84jH/CzWae17H5U1cwV7h9J8Nx5J0=";
+    rev = "cba1604ee130e7fa831392b315b55a142c5adc46";
+    hash = "sha256-8xFixNOPFL5af+6Lbp84Z6C/ZFWsCcKPf6G4KpBbj/A=";
   };
 
   nativeBuildInputs = [

From 6d57cfc4d70b991c7d94c5d0ef0f9c54a6aede23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2025 22:21:06 +0000
Subject: [PATCH 44/88] python312Packages.flask-limiter: 3.10.0 -> 3.10.1

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

diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix
index 4365cd89bd39..f59ee0cf9263 100644
--- a/pkgs/development/python-modules/flask-limiter/default.nix
+++ b/pkgs/development/python-modules/flask-limiter/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "flask-limiter";
-  version = "3.10.0";
+  version = "3.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "alisaifee";
     repo = "flask-limiter";
     tag = version;
-    hash = "sha256-spE0gVrPlbz0JDXGznJ6RN2uNAsQn7tbHxWGU98221M=";
+    hash = "sha256-AfreBLyJDogXnxB5cIoT766VFiHIIoVKAoBIra6Q+xs=";
   };
 
   postPatch = ''

From 14fb968a10fd436c8ae3fd818f3dc844c42f1145 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2025 22:23:58 +0000
Subject: [PATCH 45/88] python312Packages.conda-libmamba-solver: 24.11.1 ->
 25.1.1

---
 .../python-modules/conda-libmamba-solver/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
index fceb265592e5..dcbe419854bc 100644
--- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix
+++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
   pname = "conda-libmamba-solver";
-  version = "24.11.1";
+  version = "25.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "conda";
     repo = "conda-libmamba-solver";
     tag = version;
-    hash = "sha256-lIpMzm3wjkugMDwqmVFXDKVJyX/SdzFG5jelZRys8PQ=";
+    hash = "sha256-d6KLUhc7+KZ5H9vkI84S9TyximSwatu6lg7XIdMqtk0=";
   };
 
 

From 10b633fe824bbefeaa05f2ef60fefdd6765cf018 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2025 22:37:04 +0000
Subject: [PATCH 46/88] jetbrains-runner: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/by-name/je/jetbrains-runner/package.nix b/pkgs/by-name/je/jetbrains-runner/package.nix
index 364223be2926..fcb91662e252 100644
--- a/pkgs/by-name/je/jetbrains-runner/package.nix
+++ b/pkgs/by-name/je/jetbrains-runner/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "jetbrains-runner";
-  version = "3.0.4";
+  version = "3.0.5";
 
   src = fetchFromGitHub {
     owner = "alex1701c";
     repo = "JetBrainsRunner";
     rev = version;
-    hash = "sha256-uLUtxKGXa8MjpdrT7X0EpRCWQTBYm8mt0NcyOLoGd5Y=";
+    hash = "sha256-fzGwwvBgvUVU6Ra66KrIAqRjWWR6pWYbWVkOk2tDwkc=";
     fetchSubmodules = true;
   };
 

From 628d3c423cf3b5a3828f11aabddf80290809d899 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2025 22:42:21 +0000
Subject: [PATCH 47/88] heptabase: 1.50.1 -> 1.51.1

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

diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix
index f01cd563b9c1..d75879d80d9f 100644
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@@ -5,10 +5,10 @@
 }:
 let
   pname = "heptabase";
-  version = "1.50.1";
+  version = "1.51.1";
   src = fetchurl {
     url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
-    hash = "sha256-rxCpgetkm8Ma3d5PvTCM2SBcPffImw380UPuR+q0LaQ=";
+    hash = "sha256-ANVgH20I6pCy2WI3Umni8YCCWxgGrnyP154iHttlQTs=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From 1d81f9d0067f2b16bf87bf51f964f498cb286efe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 00:14:43 +0000
Subject: [PATCH 48/88] treesheets: 0-unstable-2025-01-13 ->
 0-unstable-2025-01-16

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

diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index 65996b7b2e4a..99c0ccfccabf 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "treesheets";
-  version = "0-unstable-2025-01-13";
+  version = "0-unstable-2025-01-16";
 
   src = fetchFromGitHub {
     owner = "aardappel";
     repo = "treesheets";
-    rev = "89b40de858f598975098a0436637bca8357a4a86";
-    hash = "sha256-kduZ+1EYxwuKAIVNBg9u32UD463gpBIjcxSj1FgvIIg=";
+    rev = "f8edf8abe4d7f18528cec6460831d34ee30881e3";
+    hash = "sha256-6EwlpdbLEBu5oUQx6IawaFMkBbmfoRb+lZMZiVLAk8k=";
   };
 
   nativeBuildInputs = [

From 8d732213c20e051943366aabef6b3ce3638bad95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 00:28:28 +0000
Subject: [PATCH 49/88] asn: 0.78.0 -> 0.78.3

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

diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix
index 88f05bb5d41a..e370f5f599f4 100644
--- a/pkgs/by-name/as/asn/package.nix
+++ b/pkgs/by-name/as/asn/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "asn";
-  version = "0.78.0";
+  version = "0.78.3";
 
   src = fetchFromGitHub {
     owner = "nitefood";
     repo = "asn";
     tag = "v${version}";
-    hash = "sha256-pXPc6cAPqvbECvP3v3Z1Og8jhIhh5zvXomZrxNX6KVI=";
+    hash = "sha256-ydCpCmW6NK3LM05YLw6KtJWo7UtMcsxQt2RH/Xl+bFw=";
   };
 
   nativeBuildInputs = [

From 82c3e3cdee326f41d4d925bba1c16671029fde5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 00:32:31 +0000
Subject: [PATCH 50/88] nsxiv: 32 -> 33

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

diff --git a/pkgs/by-name/ns/nsxiv/package.nix b/pkgs/by-name/ns/nsxiv/package.nix
index 692f9f625ef2..f19b9e12a9fc 100644
--- a/pkgs/by-name/ns/nsxiv/package.nix
+++ b/pkgs/by-name/ns/nsxiv/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nsxiv";
-  version = "32";
+  version = "33";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "nsxiv";
     repo = "nsxiv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-UWaet7hVtgfuWTiNY4VcsMWTfS6L9r5w1fb/0dWz8SI=";
+    hash = "sha256-H1s+pLpHTmoDssdudtAq6Ru0jwZZ55/qamEVgtHTGfk=";
   };
 
   outputs = [

From db13a24e446d66448e56c88588037412bc959e1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 00:51:23 +0000
Subject: [PATCH 51/88] commandergenius: 3.5.1 -> 3.5.2

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

diff --git a/pkgs/by-name/co/commandergenius/package.nix b/pkgs/by-name/co/commandergenius/package.nix
index 6008490dac17..a9b0afe5d19d 100644
--- a/pkgs/by-name/co/commandergenius/package.nix
+++ b/pkgs/by-name/co/commandergenius/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "commandergenius";
-  version = "3.5.1";
+  version = "3.5.2";
 
   src = fetchFromGitLab {
     owner = "Dringgstein";
     repo = "Commander-Genius";
     rev = "v${version}";
-    hash = "sha256-sWnx2UdnuuLcTxhuXhfG2ssnFvuGi9kOBrpc4jiKgTs=";
+    hash = "sha256-4WfHdgn8frcDVa3Va6vo/jZihf09vIs+bNdAxScgovE=";
   };
 
   buildInputs = [

From 13f650083cf28dae5de21ae6633dceb0f6dc23ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 01:22:13 +0000
Subject: [PATCH 52/88] stgit: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/by-name/st/stgit/package.nix b/pkgs/by-name/st/stgit/package.nix
index 6ef1afe79ce0..793bf45613f6 100644
--- a/pkgs/by-name/st/stgit/package.nix
+++ b/pkgs/by-name/st/stgit/package.nix
@@ -19,15 +19,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stgit";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "stacked-git";
     repo = "stgit";
     rev = "v${version}";
-    hash = "sha256-XyBVboNrvhOSZBPd5ZqdMuF261TpFzduC6XQtKJGntE=";
+    hash = "sha256-p6qEzkiRAuzvaPrUXtE+Ixdcu7W0aQFY2NQUyO+kESo=";
   };
-  cargoHash = "sha256-xh8TW8TgwaCqqKVyP9ImHkKAIwW5c6AC1pZD5tu0XBs=";
+  cargoHash = "sha256-whFBUqKervY/mfogA1VffA8vhM01wySkqRdIpwMXV8M=";
 
   nativeBuildInputs = [
     pkg-config

From 4aa399dff0dc98b651f307de22b85d06dbc7d2ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 01:31:42 +0000
Subject: [PATCH 53/88] marmite: 0.2.3 -> 0.2.4

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

diff --git a/pkgs/by-name/ma/marmite/package.nix b/pkgs/by-name/ma/marmite/package.nix
index 64d16f9e5224..563c98fe9102 100644
--- a/pkgs/by-name/ma/marmite/package.nix
+++ b/pkgs/by-name/ma/marmite/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "marmite";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "rochacbruno";
     repo = "marmite";
     tag = version;
-    hash = "sha256-AblitYe7YDUc2Tg2P7j+wnOjMAhDtieDsbq6B6x+uMs=";
+    hash = "sha256-IfmwPN2PbBXJJXHgwseC5L3sDOjaVlRE//H8uHazSNA=";
   };
 
-  cargoHash = "sha256-u8sJS9hvIao+af7IA4vE0eUSx0xmI1Kb5NXyZBrOCIw=";
+  cargoHash = "sha256-FpCoSX/V7AoRED3bFoGLqyNsS1mNK8i2z+YjWMvtUZo=";
 
   nativeBuildInputs = [
     pkg-config

From a619c149929a8cf4d6a46aa57482a4c381ec0f1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 02:57:54 +0000
Subject: [PATCH 54/88] python312Packages.python-gvm: 24.12.0 -> 25.1.1

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

diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix
index e091431b61f8..78dc4ea0b84a 100644
--- a/pkgs/development/python-modules/python-gvm/default.nix
+++ b/pkgs/development/python-modules/python-gvm/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "python-gvm";
-  version = "24.12.0";
+  version = "25.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = "python-gvm";
     tag = "v${version}";
-    hash = "sha256-6K9Gv2ycQuCeH5GxtRfpwRqTQxpuqRZC82EvQCFSX4k=";
+    hash = "sha256-z78JnyAyWqNqFGuauIXitPO0D0WtHicBlD6Jno4G74Y=";
   };
 
   build-system = [ poetry-core ];

From 2e4911a42cba4f15e57b2bd0de6fe3f87d70e662 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 03:35:14 +0000
Subject: [PATCH 55/88] vacuum-go: 0.15.3 -> 0.16.1

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

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 0a1a5b6a283f..4c4cfc91562e 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "vacuum-go";
-  version = "0.15.3";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     tag = "v${version}";
-    hash = "sha256-SI32ODbd3X4zMhS3LI4vwVn9/gwgabWZ/8Nx+L3KPYE=";
+    hash = "sha256-TljvCGquQJl+uJXRBJCximR5OgsdAgK/+eobQW9+fZo=";
   };
 
-  vendorHash = "sha256-xTqrKkCRO6lUbzXI4/UrBoZsKU9mQW8cMrnZ2X3wzog=";
+  vendorHash = "sha256-Yuibhb0N8QHHjdB4v3jFVxz1T6SkhgFfcouPAjjA0lU=";
 
   env.CGO_ENABLED = 0;
   ldflags = [

From 4b31ae1f151c49dcb6f310d4c7728391763ef3a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 05:51:27 +0000
Subject: [PATCH 56/88] python312Packages.unstructured: 0.16.13 -> 0.16.15

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

diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix
index e9eed5709877..eac7e5e04224 100644
--- a/pkgs/development/python-modules/unstructured/default.nix
+++ b/pkgs/development/python-modules/unstructured/default.nix
@@ -113,7 +113,7 @@
   grpcio,
 }:
 let
-  version = "0.16.13";
+  version = "0.16.15";
 in
 buildPythonPackage {
   pname = "unstructured";
@@ -124,7 +124,7 @@ buildPythonPackage {
     owner = "Unstructured-IO";
     repo = "unstructured";
     tag = version;
-    hash = "sha256-VVgSrXqfWEOjZAU54rGBW3m4FxZKJDmbFsWdgjiqMSs=";
+    hash = "sha256-Wp51LOgM/zE81324Qzu83XGupUMAzz2wn+COmNq95H8=";
   };
 
   propagatedBuildInputs = [

From 2c1eeaf29e3bf0cbc783774cba2871af8ea0b8f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 05:52:19 +0000
Subject: [PATCH 57/88] baddns: 1.6.68 -> 1.7.86

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

diff --git a/pkgs/by-name/ba/baddns/package.nix b/pkgs/by-name/ba/baddns/package.nix
index aea9b5bf287e..c36e0b7eb0ec 100644
--- a/pkgs/by-name/ba/baddns/package.nix
+++ b/pkgs/by-name/ba/baddns/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "baddns";
-  version = "1.6.68";
+  version = "1.7.86";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "blacklanternsecurity";
     repo = "baddns";
     tag = version;
-    hash = "sha256-TQPjSmLXgcHYxBQFO1QPozs1XRaJDTakGN24LLuFdfY=";
+    hash = "sha256-Jj36aNNYCwqK/Yux92YmCxywftoizXZE39qLhLpjAaw=";
   };
 
   pythonRelaxDeps = true;

From 5ecccb2ecde32c837615e3c62242468881cf538a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 07:16:35 +0000
Subject: [PATCH 58/88] spring-boot-cli: 3.4.1 -> 3.4.2

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

diff --git a/pkgs/by-name/sp/spring-boot-cli/package.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix
index b741dab8889a..60ba89ab6373 100644
--- a/pkgs/by-name/sp/spring-boot-cli/package.nix
+++ b/pkgs/by-name/sp/spring-boot-cli/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spring-boot-cli";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchzip {
     url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip";
-    hash = "sha256-XJGopVQclKVfVXNlHj9LXu8Kt3hcfsajH5p63k6nQ94=";
+    hash = "sha256-pxGibIyg4C902pmth1rsgMb95yNVyYQenFmbQLDZSEo=";
   };
 
   nativeBuildInputs = [

From 20c13980309051d6ec858340307985c9174796ec Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Mon, 27 Jan 2025 09:01:29 +0100
Subject: [PATCH 59/88] gfn-electron: 2.1.2 -> 2.1.3

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

diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix
index d00abe7861b3..37eb0397f94f 100644
--- a/pkgs/by-name/gf/gfn-electron/package.nix
+++ b/pkgs/by-name/gf/gfn-electron/package.nix
@@ -7,7 +7,7 @@
   makeBinaryWrapper,
 }:
 let
-  version = "2.1.2";
+  version = "2.1.3";
 in
 buildNpmPackage {
   pname = "gfn-electron";
@@ -17,10 +17,10 @@ buildNpmPackage {
     owner = "hmlendea";
     repo = "gfn-electron";
     tag = "v${version}";
-    hash = "sha256-kTnM4wSDqP2V8hb4mDhbQYpVYouSnUkjuuCfITb/xgY=";
+    hash = "sha256-o5p7INuyrs4Fw0uoP9f3UpqpmJzHIFSBCBTTU2NfUMQ=";
   };
 
-  npmDepsHash = "sha256-27N0hWOfkLQGaGspm4aCoVF6PWiUOAKs+JzbdQV94lo=";
+  npmDepsHash = "sha256-xp9uZAMrsPut91tQD3XfeENr7fXFg2bE89xShG1AcZk=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From f5e15c0360aa825cd55f44f644d11f3150afddcd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 08:03:12 +0000
Subject: [PATCH 60/88] gitxray: 1.0.16.4 -> 1.0.17

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

diff --git a/pkgs/by-name/gi/gitxray/package.nix b/pkgs/by-name/gi/gitxray/package.nix
index 19976da2d5f1..565edc247fed 100644
--- a/pkgs/by-name/gi/gitxray/package.nix
+++ b/pkgs/by-name/gi/gitxray/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gitxray";
-  version = "1.0.16.4";
+  version = "1.0.17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kulkansecurity";
     repo = "gitxray";
     tag = version;
-    hash = "sha256-rxG/FXIvPPCmV8//Bq3Upu4kNjwVhPVTK4ADp9X3OL0=";
+    hash = "sha256-wPqjCIHYvU1QuQIXCrbzr8+JtwQmFNHzAjxr8AXkxrc=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 4ccbe97736155d21546cc566d949e75f06e8b39b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 09:51:03 +0000
Subject: [PATCH 61/88] gum: 0.15.0 -> 0.15.1

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

diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix
index 6fc7d68be6d5..31e1d6462a6d 100644
--- a/pkgs/by-name/gu/gum/package.nix
+++ b/pkgs/by-name/gu/gum/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gum";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-DHIFU+dfZpeQo9kN9Krc1dhTf2HlnC7PEwTfN6RYmSU=";
+    hash = "sha256-5/ifKAKKl4adhTsrfIzViLuYpHyf1W6L0KQXk9EObow=";
   };
 
-  vendorHash = "sha256-BcHwFj4nGmKcbVnLEVd9rK54DAyVNc2Dlt085N+HtFA=";
+  vendorHash = "sha256-H29cyhgC+ZI7CjFTfYb4ekvHfkMfUUzgCDtWXYW6iYM=";
 
   nativeBuildInputs = [
     installShellFiles

From e855c9164802bc2e28f022959cf89c7a4bdd1821 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 10:24:52 +0000
Subject: [PATCH 62/88] cargo-leptos: 0.2.25 -> 0.2.26

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

diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix
index 5979fbfc84e5..8cb3688c0ad7 100644
--- a/pkgs/by-name/ca/cargo-leptos/package.nix
+++ b/pkgs/by-name/ca/cargo-leptos/package.nix
@@ -16,16 +16,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "cargo-leptos";
-  version = "0.2.25";
+  version = "0.2.26";
 
   src = fetchFromGitHub {
     owner = "leptos-rs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-vgYr6mMS2O4/102R+6iCW9IBziM1tIav569d36iIbl8=";
+    hash = "sha256-v1gNH3pq5db/swsk79nEzgtR4jy3f/xHs4QaLnVcVYU=";
   };
 
-  cargoHash = "sha256-Q3+tOpvzDqIn2M6Zrm1xK6TeTV4zrxK0PYgcIsEBIhE=";
+  cargoHash = "sha256-D9/ZXmXWrKhLLx2aJZgctidpxef53Z7H+X37m8Yz0Hs=";
 
   buildInputs = optionals isDarwin [
     SystemConfiguration

From 6814f53cc04273c167d44e7b5a6d7a3527c75c12 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 27 Jan 2025 11:40:31 +0100
Subject: [PATCH 63/88] kubedb-cli: fix hash after tag was moved

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/ku/kubedb-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix
index b9a17df7cf66..5ee91afb4066 100644
--- a/pkgs/by-name/ku/kubedb-cli/package.nix
+++ b/pkgs/by-name/ku/kubedb-cli/package.nix
@@ -11,8 +11,8 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubedb";
     repo = "cli";
-    rev = "v${version}";
-    sha256 = "sha256-6AhL3IBAQ9Mngquh7XbnXEb4jDX1k2d3bwKBFRhEzHA=";
+    tag = "v${version}";
+    hash = "sha256-e3kP1N6uhLKrOWfvl29vVB9D/bpj1W+1dGlaAuc8es0=";
   };
 
   vendorHash = null;

From 1ce79c9d5867fce621e3bf5c3f1910f1cfa290ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 10:47:04 +0000
Subject: [PATCH 64/88] nomino: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix
index 6ef8f5bb7869..9b6d523b84d0 100644
--- a/pkgs/by-name/no/nomino/package.nix
+++ b/pkgs/by-name/no/nomino/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nomino";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "yaa110";
     repo = pname;
     rev = version;
-    hash = "sha256-/5rKlPRo3+BsqPgHJ0M/JDGwA0c4rAiOd7gGClPfxMg=";
+    hash = "sha256-BWfgXg3DYdhSzO3qtkwDZ+BZGcIqm82G3ZryaetLYgM=";
   };
 
-  cargoHash = "sha256-LaLMa66paTW9Wubus3phc7IgDW54sJFSf4VHnJHGq3o=";
+  cargoHash = "sha256-xmm9vOcHsRXw5zAptuiSF7xnA81HsHiG8v+nN/T77Yk=";
 
   meta = with lib; {
     description = "Batch rename utility for developers";

From 6f7b06b66c951f699c06f865c8b7f1dcd51df843 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 11:28:40 +0000
Subject: [PATCH 65/88] glooctl: 1.18.5 -> 1.18.6

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

diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index 8f4722c1b576..4f6b10e09f54 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "glooctl";
-  version = "1.18.5";
+  version = "1.18.6";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${version}";
-    hash = "sha256-0ITszVZnxbXSCie9lFotMwZYSVTAhqDgKiz19apPkog=";
+    hash = "sha256-kxNlTVU4VFqEhismth5qb0Ar335TYhO/2oE8tt9km3c=";
   };
 
   vendorHash = "sha256-AEfDeUD7A4ZFgctNa8b1XeJMFnmcQCLvlQqNFM/gSCc=";

From 871c57e5f8bf527e0b81c448aaae908c383f5df1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 12:21:00 +0000
Subject: [PATCH 66/88] sqldef: 0.17.27 -> 0.17.28

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

diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix
index f2fb511a71b7..c84ebe37adcc 100644
--- a/pkgs/by-name/sq/sqldef/package.nix
+++ b/pkgs/by-name/sq/sqldef/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "sqldef";
-  version = "0.17.27";
+  version = "0.17.28";
 
   src = fetchFromGitHub {
     owner = "sqldef";
     repo = "sqldef";
     rev = "v${version}";
-    hash = "sha256-h0WOd3w6G9jmdhKzfD0AtdTzeLZgEPQ9LPlbIsASm34=";
+    hash = "sha256-DfH+5QArv3aI3ECQ5XK/mjNsKbZ4yEEY3LFZPuPvxDo=";
   };
 
   proxyVendor = true;

From 28af2a6ec46cb3343592edaff3cb396ab68b936b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 12:22:08 +0000
Subject: [PATCH 67/88] lazysql: 0.3.3 -> 0.3.4

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

diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix
index 171585a0b42a..50d88562e007 100644
--- a/pkgs/by-name/la/lazysql/package.nix
+++ b/pkgs/by-name/la/lazysql/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "lazysql";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "jorgerojas26";
     repo = "lazysql";
     rev = "v${version}";
-    hash = "sha256-+7KchZbd/XJ+c5ndA4arbKabeMxX1ZTOVs7Nw+TSxGI=";
+    hash = "sha256-APbfaAHufpEaBdXO13afmdnpSA98LhXUhYZ6TK/gazk=";
   };
 
   vendorHash = "sha256-ef3GngaaoNEJAOF5IlTQhTrO5P22w5p7G91TYJasfGk=";

From 80223d5e0c5bef1b22bfce1721b9a54839b965d2 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 24 Jan 2025 13:43:48 +0100
Subject: [PATCH 68/88] stretchly: 1.16.0 -> 1.17.2

---
 pkgs/by-name/st/stretchly/package.nix | 32 +++++++++------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/st/stretchly/package.nix b/pkgs/by-name/st/stretchly/package.nix
index b921992f6817..684cf57eadc2 100644
--- a/pkgs/by-name/st/stretchly/package.nix
+++ b/pkgs/by-name/st/stretchly/package.nix
@@ -4,18 +4,17 @@
   fetchurl,
   makeWrapper,
   electron,
-  common-updater-scripts,
-  writeShellScript,
   makeDesktopItem,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "stretchly";
-  version = "1.16.0";
+  version = "1.17.2";
 
   src = fetchurl {
     url = "https://github.com/hovancik/stretchly/releases/download/v${finalAttrs.version}/stretchly-${finalAttrs.version}.tar.xz";
-    hash = "sha256-gOMUXGldtZUfqLABJHfbToYe0pcAn8dRWEFxCi/gY9Y=";
+    hash = "sha256-IsVmdsmLfNkZ7B9i8TjTHMymsmYLJY5AJleAoEwnUKk=";
   };
 
   icon = fetchurl {
@@ -40,19 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru = {
-    updateScript = writeShellScript "update-stretchly" ''
-      set -eu -o pipefail
-
-      # get the latest release version
-      latest_version=$(curl -s https://api.github.com/repos/hovancik/stretchly/releases/latest | jq --raw-output .tag_name | sed -e 's/^v//')
-
-      echo "updating to $latest_version..."
-
-      ${common-updater-scripts}/bin/update-source-version stretchly "$latest_version"
-    '';
-  };
-
   desktopItem = makeDesktopItem {
     name = finalAttrs.pname;
     exec = finalAttrs.pname;
@@ -62,7 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
     categories = [ "Utility" ];
   };
 
-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Break time reminder app";
     longDescription = ''
       stretchly is a cross-platform electron app that reminds you to take
@@ -73,9 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://hovancik.net/stretchly";
     downloadPage = "https://hovancik.net/stretchly/downloads/";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ _1000101 ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ _1000101 ];
+    platforms = lib.platforms.linux;
     mainProgram = "stretchly";
   };
 })

From 62fff9635ca22fd9aa9bc33ab7ac0e1b5ebe7332 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 15:30:40 +0000
Subject: [PATCH 69/88] amazon-ssm-agent: 3.3.1345.0 -> 3.3.1611.0

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

diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix
index 0f9544044be8..17c70f916af5 100644
--- a/pkgs/by-name/am/amazon-ssm-agent/package.nix
+++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix
@@ -42,13 +42,13 @@ let
 in
 buildGoModule rec {
   pname = "amazon-ssm-agent";
-  version = "3.3.1345.0";
+  version = "3.3.1611.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-ssm-agent";
     tag = version;
-    hash = "sha256-6MGb6P3PYfnoztLdLhOm/smCjyWuV7ZGJtK40l4yFB0=";
+    hash = "sha256-mwru2BAnVSYLXoA+g7eizadSYLr9c3ikEJipo7N1n4Y=";
   };
 
   vendorHash = null;

From 2c537622d5d9ee83679e4d5c5b8b4d66b0bfe658 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 15:52:20 +0000
Subject: [PATCH 70/88] capslock: 0.2.6 -> 0.2.7

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

diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix
index 4460368a1123..5deac4688fef 100644
--- a/pkgs/by-name/ca/capslock/package.nix
+++ b/pkgs/by-name/ca/capslock/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "capslock";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "capslock";
     rev = "v${version}";
-    hash = "sha256-8B9L/lLRxDI6/qUCbL8VM37glDFBTaqb0fGI9BYfICU=";
+    hash = "sha256-kRuEcrx9LBzCpXFWlc9bSsgZt84T8R8VFdbAWAseSPQ=";
   };
 
-  vendorHash = "sha256-gmvnpJurjhCGS3/FH6HBZ0Zwx57ArSaw5dLHtJXCFc8=";
+  vendorHash = "sha256-CUw4ukSAs12dprgcQRfdoKzY7gbzUCHk0t2SrUMtrxo=";
 
   subPackages = [ "cmd/capslock" ];
 

From 255a75ad74c543748a4ec1ca4cf3f07d2c66e737 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 16:25:32 +0000
Subject: [PATCH 71/88] roslyn-ls: 4.13.0-3.25051.1 -> 4.14.0-1.25060.2

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

diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index 6e01757f5149..689b7002afe0 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -32,18 +32,18 @@ in
 buildDotnetModule rec {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.61.27";
+  vsVersion = "2.62.18";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-mqlCfgymhH/pR/GW3qZd0rmLdNezgVGZS6Q6zaNor8E=";
+    hash = "sha256-oy1xYM6Kd/8uAQQdvsxLNkycs9OOs7SEe+dzYc4RMeM=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "4.13.0-3.25051.1";
+  version = "4.14.0-1.25060.2";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;

From b5f82750ab072b0c89f1424b96abf36ff380c965 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 27 Jan 2025 17:27:57 +0100
Subject: [PATCH 72/88] python312Packages.blackjax: disable failing tests

---
 .../python-modules/blackjax/default.nix       | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix
index 69865be6e5bd..5b02bf3450d6 100644
--- a/pkgs/development/python-modules/blackjax/default.nix
+++ b/pkgs/development/python-modules/blackjax/default.nix
@@ -49,17 +49,28 @@ buildPythonPackage rec {
     pytest-xdist
   ];
 
-  disabledTestPaths =
-    [ "tests/test_benchmarks.py" ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # Assertion errors on numerical values
-      "tests/mcmc/test_integrators.py"
-    ];
+  disabledTestPaths = [
+    "tests/test_benchmarks.py"
+
+    # Assertion errors on numerical values
+    "tests/mcmc/test_integrators.py"
+  ];
 
   disabledTests =
     [
       # too slow
       "test_adaptive_tempered_smc"
+
+      # AssertionError on numerical values
+      "test_barker"
+      "test_mclmc"
+      "test_mcse4"
+      "test_normal_univariate"
+      "test_nuts__with_device"
+      "test_nuts__with_jit"
+      "test_nuts__without_device"
+      "test_nuts__without_jit"
+      "test_smc_waste_free__with_jit"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
       # Numerical test (AssertionError)

From 6fa05399767b9e420e80839516a275bcd8ad9943 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Mon, 27 Jan 2025 19:09:58 +0100
Subject: [PATCH 73/88] 
 home-assistant-custom-lovelace-modules.clock-weather-card: init at 2.8.7

---
 .../clock-weather-card/package.nix            | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix
new file mode 100644
index 000000000000..e224e4ce98ee
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenvNoCC,
+  fetchYarnDeps,
+  nodejs,
+  yarnConfigHook,
+  yarnBuildHook,
+}:
+stdenvNoCC.mkDerivation rec {
+  pname = "clock-weather-card";
+  version = "2.8.7";
+
+  src = fetchFromGitHub {
+    owner = "pkissling";
+    repo = "clock-weather-card";
+    tag = "v${version}";
+    hash = "sha256-ylJNI0DE+3j8EZFpUmuuBnII8nBMrJ5bhlGVh3M25eo=";
+  };
+
+  offlineCache = fetchYarnDeps {
+    yarnLock = src + "/yarn.lock";
+    hash = "sha256-EUuPF2kS6CaJ2MUYoBocLOQyOgkhRHd34ul+efJua7Q=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    yarnConfigHook
+    yarnBuildHook
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir $out
+    cp ./dist/clock-weather-card.js $out/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "A Home Assistant Card indicating today's date/time, along with an iOS inspired weather forecast for the next days with animated icons";
+    homepage = "https://github.com/pkissling/clock-weather-card";
+    changelog = "https://github.com/pkissling/clock-weather-card/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ oddlama ];
+    platforms = lib.platforms.all;
+  };
+}

From 8945c06304624c5981796adf622e5e83beeb8689 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 18:15:36 +0000
Subject: [PATCH 74/88] oauth2-proxy: 7.8.0 -> 7.8.1

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

diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix
index 11422054cf03..5b0aaaff4a18 100644
--- a/pkgs/by-name/oa/oauth2-proxy/package.nix
+++ b/pkgs/by-name/oa/oauth2-proxy/package.nix
@@ -6,12 +6,12 @@
 
 buildGoModule rec {
   pname = "oauth2-proxy";
-  version = "7.8.0";
+  version = "7.8.1";
 
   src = fetchFromGitHub {
     repo = pname;
     owner = "oauth2-proxy";
-    sha256 = "sha256-fNnneMsqwxO0CMJAr1pUSCMDt0/fS7tS6KLs8ExKMTE=";
+    sha256 = "sha256-NU9/BLyTEWGqt9SJNbvF4kSG/op8TEpYV2A24/V29PM=";
     rev = "v${version}";
   };
 

From 2ede59bdbd4e28b63d2a79441c17b667bfaf1ddd Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Mon, 27 Jan 2025 19:34:06 +0100
Subject: [PATCH 75/88] php.packages.phive: switch to buildComposerProject2 and
 tag (#377352)

* php.packages.phive: switch to buildComposerProject2

* php.packages.phive: switch to tag
---
 pkgs/development/php-packages/phive/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/phive/default.nix b/pkgs/development/php-packages/phive/default.nix
index 51a9df9087e3..e3d8801049f8 100644
--- a/pkgs/development/php-packages/phive/default.nix
+++ b/pkgs/development/php-packages/phive/default.nix
@@ -4,18 +4,18 @@
   php,
 }:
 
-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
   pname = "phive";
   version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "phar-io";
     repo = "phive";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-6vNhmIDE3kwZGMrDnGNGVV6/lb32Yb3ooWDYOC7SUcs=";
   };
 
-  vendorHash = "sha256-iBNH4n4AVE47CYmwO6s6WBAuRe7JzzvoNruYfVbxPck=";
+  vendorHash = "sha256-wNqQfVRm4kEWpYfdo8HBESh0L4cXPrTlHnBI79b1Al0=";
 
   meta = {
     changelog = "https://github.com/phar-io/phive/releases/tag/${finalAttrs.version}";

From e09d88a50988bb516aa24f5e468f5ac85ef19e56 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 27 Jan 2025 19:41:55 +0100
Subject: [PATCH 76/88] python312Packages.ldfparser: 0.25.0 -> 0.26.0

Diff: https://github.com/c4deszes/ldfparser/compare/refs/tags/v0.25.0...v0.26.0

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

diff --git a/pkgs/development/python-modules/ldfparser/default.nix b/pkgs/development/python-modules/ldfparser/default.nix
index 42abf5cfd9a9..a73651db76fc 100644
--- a/pkgs/development/python-modules/ldfparser/default.nix
+++ b/pkgs/development/python-modules/ldfparser/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "ldfparser";
-  version = "0.25.0";
+  version = "0.26.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "c4deszes";
     repo = "ldfparser";
     tag = "v${version}";
-    hash = "sha256-SZ9mWV5PjkQ2OiScPSMrunkKQWmuYW2lB2JvpTGNbY4=";
+    hash = "sha256-SVl/O0/2k1Y4lta+3BFkddyBZfYO2vqh4Xx1ZXNwXN4=";
   };
 
   build-system = [ setuptools ];

From 026ee7faf4892c0f65b275480393b617530a09d9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 27 Jan 2025 19:44:55 +0100
Subject: [PATCH 77/88] python312Packages.aiohomeconnect: 0.11.2 -> 0.11.4

Diff: https://github.com/MartinHjelmare/aiohomeconnect/compare/refs/tags/v0.11.2...v0.11.4

Changelog: https://github.com/MartinHjelmare/aiohomeconnect/blob/refs/tags/v0.11.4/CHANGELOG.md
---
 pkgs/development/python-modules/aiohomeconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix
index ffa755c21533..e2ed0f5b81de 100644
--- a/pkgs/development/python-modules/aiohomeconnect/default.nix
+++ b/pkgs/development/python-modules/aiohomeconnect/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomeconnect";
-  version = "0.11.2";
+  version = "0.11.4";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiohomeconnect";
     tag = "v${version}";
-    hash = "sha256-YnQypKeVYoHD445fv9n643qIqjTCInCfbTHPUrMePJI=";
+    hash = "sha256-feAjp1DjZeNTOf0lWN23pap7oDiqSx0v6tf6uIVf1fU=";
   };
 
   pythonRelaxDeps = [ "httpx" ];

From 795a518ce93849dadbf5246cbb2e2f003cec4252 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Mon, 27 Jan 2025 11:22:14 -0800
Subject: [PATCH 78/88] signalbackup-tools: 20250122 -> 20250127-1

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250122...20250127-1
---
 pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 69d13e8bfe2c..004de05929a6 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20250122";
+  version = "20250127-1";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-rsA0i87zC6hyQa8xIyveID/nNwAD2YMG3BHYtWKxg1I=";
+    hash = "sha256-6JHHiT1OwLPKxA0rbGiwhwF4PiuS5yguoNtB7dpTJPI=";
   };
 
   nativeBuildInputs = [

From c2504d232a73f86b1b43342329f2743371b2660d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 27 Jan 2025 20:32:27 +0100
Subject: [PATCH 79/88] vimPlugins.lua-async-await: fix deprecation

---
 pkgs/applications/editors/vim/plugins/generated.nix | 12 ------------
 pkgs/applications/editors/vim/plugins/overrides.nix |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 39b00d195e16..71554b6c7554 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6529,18 +6529,6 @@ final: prev:
     meta.homepage = "https://github.com/nvim-java/lua-async/";
   };
 
-  lua-async-await = buildVimPlugin {
-    pname = "lua-async-await";
-    version = "2024-03-31";
-    src = fetchFromGitHub {
-      owner = "nvim-java";
-      repo = "lua-async";
-      rev = "652d94df34e97abe2d4a689edbc4270e7ead1a98";
-      sha256 = "0jpw9008xghqmzjnikwq417p497lj7v9hkjbrach5p652yca07s8";
-    };
-    meta.homepage = "https://github.com/nvim-java/lua-async/";
-  };
-
   lualine-lsp-progress = buildVimPlugin {
     pname = "lualine-lsp-progress";
     version = "2021-10-23";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 1b682954f6c1..766bb21dce49 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2255,7 +2255,7 @@ in
 
   nvim-java = super.nvim-java.overrideAttrs {
     dependencies = with self; [
-      lua-async-await
+      lua-async
       mason-nvim
       nui-nvim
       nvim-dap

From b1d65ad64d1bb852960dc36a4cc41bb053143a4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 19:52:23 +0000
Subject: [PATCH 80/88] labwc-tweaks-gtk: 0-unstable-2025-01-11 ->
 0-unstable-2025-01-26

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

diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
index 9a794c513ab9..545ffcd43ca2 100644
--- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
+++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "labwc-tweaks-gtk";
-  version = "0-unstable-2025-01-11";
+  version = "0-unstable-2025-01-26";
 
   src = fetchFromGitHub {
     owner = "labwc";
     repo = "labwc-tweaks-gtk";
-    rev = "d954bc6bce2e86893c0470de36beae0542eceaad";
-    hash = "sha256-c+6AolglEF/+voa5mDwm3JLIA4btFOBI8e2/ZxCApGg=";
+    rev = "5b811cc25dac6a024a50175ef56c4831883965d9";
+    hash = "sha256-wBiHcSYczOjSm9X46oOUt1rRm0QioHOovbPMZMnLYmM=";
   };
 
   nativeBuildInputs = [

From 172cbe7e03e411ff9cf71e34ce1881b78e2adf55 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Mon, 27 Jan 2025 15:25:15 -0500
Subject: [PATCH 81/88] zed-editor: 0.170.2 -> 0.170.4 (#377358)

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

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index d768673af00d..2aeecc1e9d03 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -95,7 +95,7 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "zed-editor";
-  version = "0.170.2";
+  version = "0.170.4";
 
   outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";
 
@@ -103,7 +103,7 @@ rustPlatform.buildRustPackage rec {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${version}";
-    hash = "sha256-E9p/JHHIQ2nQ6LeFob1tDf6UopeEWL/Z7INstehvfEI=";
+    hash = "sha256-sfvTvz5RUBQiO9XxPVZNxc1xyx/BN6oU16uYfxgruuY=";
   };
 
   patches = [
@@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-A9sTR5MCLXskhvJHVGRQ/rSLwOKqhfgJi5zaGsgglL0=";
+  cargoHash = "sha256-W1olZKtbt7TCVh8KRJf5+NL/eILdO2j1Jx1OBXGL+CY=";
 
   nativeBuildInputs =
     [

From 04e51a6c3d51eee62e7e78e53cde56d884996a3c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 28 Jan 2025 06:27:21 +1000
Subject: [PATCH 82/88] iosevka-bin: 32.3.1 -> 32.4.0 (#377380)

---
 pkgs/by-name/io/iosevka-bin/package.nix  |   2 +-
 pkgs/by-name/io/iosevka-bin/variants.nix | 180 +++++++++++------------
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index 753b347b895a..cadfedce6ebe 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "32.3.1";
+  version = "32.4.0";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix
index dcc9a09f2568..470c00cd856e 100644
--- a/pkgs/by-name/io/iosevka-bin/variants.nix
+++ b/pkgs/by-name/io/iosevka-bin/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "1lpjvk31is2wm7705ilb826cpsgwfsx5182ic6lavpjigjnwi4qr";
-  IosevkaAile = "0bagp60c44ksl1irh02hdjn4dw963l1z0k77nkmipqrgxl8g00vc";
-  IosevkaCurly = "1sp72p2vxmjqjlxfkiyzg5gibymss8vxrvp7c32fybi5dfyixy28";
-  IosevkaCurlySlab = "0wbrca2qjwd5g1jic10lfzgg3rpd70plx0q73fjlj7gpx4af7j25";
-  IosevkaEtoile = "0jnbn5w04brx87ir708vi9nh0zx41znvk8anbxhi8smn7p8krd52";
-  IosevkaSlab = "1l70z14xrh4aiib3yx32ypnxaj96gimiq72ar1w06mi445s3bka1";
-  IosevkaSS01 = "0wfcjlkl2l6nyxy8gpsrmmvp5dsjz5qbz94ixviian2067lmy9n6";
-  IosevkaSS02 = "0lj1vjvk3977kszc21p2pjmmfj68gj43dj69qn01wzfh6sy8qjwm";
-  IosevkaSS03 = "0qd8nrd1j62khj865w52p9sanliyw19i8i3c49haw5pcwpylsgw5";
-  IosevkaSS04 = "0dpm6jkszr75w6v023wd4yk1zrvfw1p3q7a9n4svr8vxmimn0b7m";
-  IosevkaSS05 = "1naqv4nfl1bkl1gkmccls7104ixah9bkjyw6hn1434dgfgb7fhh3";
-  IosevkaSS06 = "1cknkhcj8pqaz65s62rvpw1c6mr59hkn623lr8jzfz5wy018xy73";
-  IosevkaSS07 = "0skn5i6wd40kzrlh6b483j0861imwa0zfalv6d022lxadznzld9f";
-  IosevkaSS08 = "0lj48zk5il5jd7p3wyhcgqszkcyjzdmskbldjp31avjhjpmv0l78";
-  IosevkaSS09 = "0w7w7jvs3jk6iimkb2g3c6w1a6rmmwnvh7gzh7zs5dirzyx2wcsd";
-  IosevkaSS10 = "0f61cpjlw05r21i8pjx005yjy3wiw1rkrxmp12fd5v5hmj88m7wh";
-  IosevkaSS11 = "138svbwr42hhhxbi330adhbyjqp1zfxvbv1nnc74pj94zijj6vzp";
-  IosevkaSS12 = "1dil93hrghpg38wz3988zfd25hm7bx69zm6qw369x5216hcknz2v";
-  IosevkaSS13 = "1ah6s1akc1m4hl21j64xnvd2jy2pmdafkkkvi1jhdvcq36k6nsm9";
-  IosevkaSS14 = "1v2780dzyaazp0r2z1nclms2f26v4g2s7k1wqxw34fjzlzpkfcfa";
-  IosevkaSS15 = "0m2fkvrnbz4h6ncsim9ixvp15g6rl1lsb62cvhfpq9bnydpzzxby";
-  IosevkaSS16 = "0b3d6zkd5rn5dg6zq9airj96cjmbc30ds8qi3c610jvca865gh1m";
-  IosevkaSS17 = "16x4n7cvhp017dg3a94chg5pg2svimlblmhbxnyic5nzy27hq26f";
-  IosevkaSS18 = "18iab2dafsj1y18rvhvr53dyfawk6gxxsss4h4r9vajvp08y3qra";
-  SGr-Iosevka = "0523fpvvypb0a1zj881n352vkbgybwz8859i8rqayxn1l766w8kx";
-  SGr-IosevkaCurly = "0gfpw0ilk5j4r7kz53w99jsc309j8c4a9cxcahpssb6cnygpm6cp";
-  SGr-IosevkaCurlySlab = "1gig9h22x9nw3zds3z9bqry9kvvgl197lkjf5x9pbbc8ah9m25iz";
-  SGr-IosevkaFixed = "1bqn0v3z2vqi7lgxhwmbm7s62llyammpbs524na59m99g8rxa8dr";
-  SGr-IosevkaFixedCurly = "1pwv91cpf672wdrvmv6adjkbnnrrdqqla2iyd9baxni44qmk9dji";
-  SGr-IosevkaFixedCurlySlab = "0wsgx32d45a1iwz67hl40kwbz6j7g6c83f3nhq156pqa5v0afk2d";
-  SGr-IosevkaFixedSlab = "04ms0gnz55fp6y01f6qskwmxfj8hy3kwxigpmqlghlzygbyfx7mf";
-  SGr-IosevkaFixedSS01 = "0ffrhysjr5qggx5ccglsa44j5l25jz7a7kypcanpglpfzja011q2";
-  SGr-IosevkaFixedSS02 = "1a0khkqs6fw9vzrd23a1nnjzz5vimgx1d5m1bzk761fsbrgv9jn0";
-  SGr-IosevkaFixedSS03 = "0h25vb2d3qs778pv01l6slx3d4q5mz9vmqr5lb6ch1zczilz5i9q";
-  SGr-IosevkaFixedSS04 = "0za23nay4909cyy3vjh2k28975cbabrqqxifw5wlyqwsi8ajr8hs";
-  SGr-IosevkaFixedSS05 = "1kgfryzqddywdv8wyc38fwhx6nbh9fij2g4xfs25xiwfsprl36lm";
-  SGr-IosevkaFixedSS06 = "0z9y16sipzqdgi36315zsa3hr4cy394g0f6j99lz8p027r14mbd1";
-  SGr-IosevkaFixedSS07 = "1rfpri0fl7iihi6850zr96jlvcsarvv1jfsyhkmj8rclpd1zqgwk";
-  SGr-IosevkaFixedSS08 = "046pwn81w7ijda9v7hwwgxja76n15l70c2zaa3wx5cqpkkadm4f3";
-  SGr-IosevkaFixedSS09 = "1dqb4d8dr1mj34625pzvp8sngky98900vv9m1n8fid9lg1kix0jp";
-  SGr-IosevkaFixedSS10 = "0d29vzvw1mhb6i1i8fmwgiycx30lpjgv38jmx8gnb837q5295r62";
-  SGr-IosevkaFixedSS11 = "0khvm0bxm207va69a932v45dsafqlgzyx4fi146msx67h9nz9i57";
-  SGr-IosevkaFixedSS12 = "1l1imghykch93n11y0a6hs1512xlcsxq3c4mk040zzy8dflbl9w4";
-  SGr-IosevkaFixedSS13 = "1xb6janlz1cpns2pacsj2pbchghgzbz6mqgnq14z2x646ag90290";
-  SGr-IosevkaFixedSS14 = "085q55s1rn52swlizcxw6wrdy73ilv6h0ypysh6zjqcrlgpda3x6";
-  SGr-IosevkaFixedSS15 = "1m2adjy4rh7w2hjfb86kdagwasvai5fk83lincbh84avxlwz28sf";
-  SGr-IosevkaFixedSS16 = "1w2f2glipy3h9sdw8l3ng7abl0421v176fi7phxjci90mxdj1i2l";
-  SGr-IosevkaFixedSS17 = "1dvnxfyp89x7qrmjrkgzc14c0xxdfq1qb71bbks69zcnsmcm4zr1";
-  SGr-IosevkaFixedSS18 = "1hms6c5g0p0j2dxyp1jdkc0kar1jwqzmjafafm6vjpnm8gaz5pz1";
-  SGr-IosevkaSlab = "04539yj4yq854af0lm9p68njjigarigpk16h3qv8x8n1l2rkrq0z";
-  SGr-IosevkaSS01 = "1gfcnj0wbm1x6zb1w9acp0q7775wdahdwd397fmpg662l0ss25mq";
-  SGr-IosevkaSS02 = "0pm76nkpgjsnz44ngk93slsy5jv32821l4vrzn5d785bbdzzzf8d";
-  SGr-IosevkaSS03 = "0cvmam87jzk83zfzjb2pcqvzh2zvr4ljjbg55ij1q7xhd64rqpaj";
-  SGr-IosevkaSS04 = "1jq16mz0p8xy4ikyn7bjbvnrhlpvkz6y0ih84xbfkgig66hq43g1";
-  SGr-IosevkaSS05 = "1phvc0ssssh7l5rdn1xby0bp4q3asr333xrf3dfiavx7ldysyipq";
-  SGr-IosevkaSS06 = "0ybb7slxwsg87avhyyyvyrx469lf00bb8aw4371ypp34bbs10zr8";
-  SGr-IosevkaSS07 = "0c2ym41kzxq3jnj131qc4q451blmaks5rd5ai1fb8xkzzwzfjin3";
-  SGr-IosevkaSS08 = "0305v7pzxwp34kvwp6ysiirw0vl0z81hh629nsg3dm8a4da86b7h";
-  SGr-IosevkaSS09 = "14zl7lab38xwp2k1fmqgnmm3bxf6ribk23bk531l6bgwdzxd84ds";
-  SGr-IosevkaSS10 = "19a24pfcwiidpvfncf955q856kz2imqwmcvf93afwmpd7aya5gi2";
-  SGr-IosevkaSS11 = "1b9ayk0ykxdcxlafqh49g5gyck1s9kpyd66nfg6jd1d3ql3ryajh";
-  SGr-IosevkaSS12 = "01rby2jx0gc6n5ch79qjdfq8sp2bm4ji28dcixycv03sjq96agdz";
-  SGr-IosevkaSS13 = "0rmkx6bzwvbcqaa950lng8aizkm9m3zrrwxzrfydgf6xx1s37ac5";
-  SGr-IosevkaSS14 = "0xf41gjq55xk1fkys1j324zrh1ds545s8bdlliq1kzik0i6gbjli";
-  SGr-IosevkaSS15 = "0izk1snd2rsh1gaa6rikr1grn3lwfkg3hnsikfqj16fixpxm752j";
-  SGr-IosevkaSS16 = "1zr5706wq1jbfhngwnd6i9dy4izhv43p8pz0l0ly6f4zgcx3533a";
-  SGr-IosevkaSS17 = "1lwj5mdhmnq9qkjkql2vawihbjf0dp50s8s8i2gq5cciy861i0qx";
-  SGr-IosevkaSS18 = "155kwdny6fcaavd8mg8j1j6s9sfj35ig2cx75h7dkqsblbmcz2z2";
-  SGr-IosevkaTerm = "0snj7i9ipa1ilancqcdwcw12s427nj9z3vgmmf71hbba9f82az1c";
-  SGr-IosevkaTermCurly = "119ay1rxci8bg59687ckd2n61a6g09h4a6lk7319caw3s1w3mj6d";
-  SGr-IosevkaTermCurlySlab = "0j1pis6aj1sblm4png0y1mihz3b1f4l8g768grnrfzl338nfg90v";
-  SGr-IosevkaTermSlab = "05vqfdhrxrbsb81j2yrsfjqzmrhin9qf9jncx220dp7qvkjpjsza";
-  SGr-IosevkaTermSS01 = "1j2sgpgnavll25ah6dr408bbq1i0mp0jvd5cgdfa4lq9nk9aa6c2";
-  SGr-IosevkaTermSS02 = "0rx3kdin2rf8nr1jf7kw1ch6zgilgirflgkq9lyx83qq79dhakma";
-  SGr-IosevkaTermSS03 = "1984r56grgrcm6lmm8mkik6n79pvwhzpfygd204rcqm267mw3hml";
-  SGr-IosevkaTermSS04 = "168dxikfxqc66j3k8amf9bqcdzw053g4rl1cbxw3mxa72ay822j9";
-  SGr-IosevkaTermSS05 = "0fy5mxw3yb82mr7jqm5fr2990xav794x3w419n7zs5bx8gj3l28c";
-  SGr-IosevkaTermSS06 = "1fiw3qmkfhfzhns0b9gkb6bzfn17qkwyx3a8i3y2q2567hr6j1v4";
-  SGr-IosevkaTermSS07 = "14fmhhrv1f39b6shp4y8aqmmvf245l12ga00af75mdan13mqsj1s";
-  SGr-IosevkaTermSS08 = "1mcjlhvg1sci7y3whj4zc3lf8k880pvl8w2lf2fkyyz01x4x3ixw";
-  SGr-IosevkaTermSS09 = "17wlci26hzjxawgars1dfdj0nn4a64r24fh1m8xvay8c6n0id50d";
-  SGr-IosevkaTermSS10 = "113mjv8hxzjcimzwg1fy1z3ii44ncaxd1kcq1n2f5czdcsawx1lj";
-  SGr-IosevkaTermSS11 = "0hp6b8c4ggzl6j4bjbw6dwphh4klwg6qrfmksqng0p8hvsf5lkp6";
-  SGr-IosevkaTermSS12 = "1v7l7x8c7dmaim5rjdlvn66parfpzslc8y5c77r0c1rxafxgkycd";
-  SGr-IosevkaTermSS13 = "1z855ikw3d8gnsz8xsdnfzl4pzxyp6p6yx6mjkw8rigjgk95kq8s";
-  SGr-IosevkaTermSS14 = "1m7csblfpc0i6ly6jlizma5h6j73y9c2dhgqgqqw0r3cgrg249wi";
-  SGr-IosevkaTermSS15 = "10l5b9p0b5m1884wmq0jk5i31hbizy6rn19i3qj6ifnf0mni3zxs";
-  SGr-IosevkaTermSS16 = "07rb6vpa9rq7czdc68jw68n9k742hbd1hcwa9zgd0njnwf78fjjr";
-  SGr-IosevkaTermSS17 = "0sm63f8r27lfvk7is9ldaa9shcfwbkydd16zd78g0n13nniiw0h7";
-  SGr-IosevkaTermSS18 = "1rx38sqclkxiql402fc33d9v4y65y3cz9wyx1p97c5wa3j686ngh";
+  Iosevka = "1wmp1xsvq6d7ybxdiscb04ry5fl3p7pbnqrm551pklgp30afcb0k";
+  IosevkaAile = "19hrycbav3r134i1f3135j68lzk4r6iq996qv45nfy5vdiwka56n";
+  IosevkaCurly = "1ibybiad4nx7n3q89ffw5d3q72c221v2vmb47hs4xiax8kjajijx";
+  IosevkaCurlySlab = "09856251vpgch7d989kamyw7f46vwjlyhy22r82vvfvlfni9qvip";
+  IosevkaEtoile = "11c3ky7f5k2qi5jq5jdai2s9nav5z5kqy8p8klhc9nqr7qbsgknc";
+  IosevkaSlab = "0pd70bzgxwi0mgb9j5b3bz4zd8q5s85x6ipq0b3adxa3n0lni2xj";
+  IosevkaSS01 = "01j36nxdh91rjkx3ccqdqj7czl5w35s4ml3y0fhjk13rfi3ikqk5";
+  IosevkaSS02 = "193lwrz5bza0rrfab1mginq90ar0icxrysbiv8nm9d9cq6k67spk";
+  IosevkaSS03 = "0x2g4q0ina97pv1rpm9mhw5as6il3nqpixpjy5nskb47vklnww0z";
+  IosevkaSS04 = "1nr2nzp51swvxmkbsipppixjqdqqp28q7njh0zhwrw9ln2mv5ykf";
+  IosevkaSS05 = "1sgbszbzgznkkjw3xiffbvfh9wx4rmw4a2332dwl3hqjsky2yb0c";
+  IosevkaSS06 = "0bdxgm5v9xngwyygqxaihsaryj9nk7jr86a35sh83p8x92696dr3";
+  IosevkaSS07 = "00cjyy477pllfcl84pms3hs7v59iz4xx24rh6mrp6gwm1dixk0lj";
+  IosevkaSS08 = "0k4aifq8d6ry0q23yjfhmsz0hq55xg0ja8skjsnba67mmw3lmhls";
+  IosevkaSS09 = "12z6bircf48p4i1pfglrdmm7dnrbg48d34d6x0andcshckh2z32m";
+  IosevkaSS10 = "1jm8jdrlydwdi2ahgyw691j0akq7xv7xki6v4qdwdccjblzq38x4";
+  IosevkaSS11 = "1p27lbp48rbr501al4hh1n10v2mi2l8jncyr2b16x6lx699dragh";
+  IosevkaSS12 = "0mpjh3v072xvxl258b9700x4x0z17fwhq526z7v6pfvr1bpa7qd6";
+  IosevkaSS13 = "029jhjymzq0x48mwds1yawp6v57zrsb1y9riy1rw3d5cq307p8np";
+  IosevkaSS14 = "0bvi0nyn0rbrg0i8xq2zhr9sc8sl1xjbjslrd7x6h9xh8vpk67yn";
+  IosevkaSS15 = "00dw3gy3ib151zlizbfac3zsxs0ap8qmfx4apghv5n9y815lsdfz";
+  IosevkaSS16 = "16jrjv6rjh1xwj4yf91c17n1qpqv3vnnnbz7dj4g7rmpb9s5hqkz";
+  IosevkaSS17 = "05nkynn2ri2lkm2ghd4vcb67qm00rl8f1fp17x4l84id36qbzy14";
+  IosevkaSS18 = "1zb96ll1q514av1qqmlaf38py66jqyfy7f0ka8r8ln7jnnfbmsr1";
+  SGr-Iosevka = "1knzbqr8yzbdwrbq9v00p87xp3gbnspcn9lwg5kx7y4s9k4xx4d3";
+  SGr-IosevkaCurly = "1ggnp299h8n54v7l7526phwczcr30ssy58lp4as64jh3kdrpkm5s";
+  SGr-IosevkaCurlySlab = "1wr15jsjnkyqf4vaxv0ckbsjnqcdzhp28xhma7h46invmicamz0b";
+  SGr-IosevkaFixed = "0b89p0f6f2igyg930w7izs2y6027s0p6i9v7hd6y60h1c1g4h3zr";
+  SGr-IosevkaFixedCurly = "09j0jpm2ym7m1gryphvdjy07bdadjfq2k33rkxdi3mm5c9ryr497";
+  SGr-IosevkaFixedCurlySlab = "15ycyyi9y2671gdswvdg56wbiixfa3xdgh0rfbp5gxamaji52jba";
+  SGr-IosevkaFixedSlab = "0rgkdji5figxa8fvl5f0xnw5sx1300g77h92bvn19p1479cpkqnd";
+  SGr-IosevkaFixedSS01 = "074l13i6vfyvj4dr4373vhck6wx451xbinsy2nkmh1l0f4ybk722";
+  SGr-IosevkaFixedSS02 = "0dmsncllnb09h9s4874v0ayadyx6ysacyd4px8gpzdgd5vwyddp5";
+  SGr-IosevkaFixedSS03 = "001zgvyrls4ajklsinz003rvqx9aqhc4b65xksinm0n88p8c6l5v";
+  SGr-IosevkaFixedSS04 = "146f0cmq28g1lkfapj78grqpsrl22208h6vj7k838rbkxx2vqazy";
+  SGr-IosevkaFixedSS05 = "1ax08sgfnwki6qkfnzk3wc5i4i6r8nfzwdn4srz8mfwfm1mlcyps";
+  SGr-IosevkaFixedSS06 = "0ypcnsqifmrh005hql6f6lql5ykgsfvanc2p24x521nrn1dy73va";
+  SGr-IosevkaFixedSS07 = "15xijwfirrwph6n8pky350k5gfx5mhfhgbhhaahvd3wgl1wc3z1d";
+  SGr-IosevkaFixedSS08 = "02l00b0zp8nxw7ma6rr8gvvkw2hxk8d3d3p0vrcf1fq1rarsrdhh";
+  SGr-IosevkaFixedSS09 = "1hf9zdzgxgjdqd1msb2n8vmfqmz66vh7ksf436yddyzcmlflkg54";
+  SGr-IosevkaFixedSS10 = "1k7z4bkf63a621p36ldgilj7d3x8cnkfjqma74l0a5m2cf8nhlhk";
+  SGr-IosevkaFixedSS11 = "091cz89i7igh61ni7cnd8w7yx29x90v96ckjdaw2mvhg0bdkydxi";
+  SGr-IosevkaFixedSS12 = "0mydmf6g8cybl00bzxr5l9ak8marp94wi73926xhks2saap9lzmj";
+  SGr-IosevkaFixedSS13 = "1q3aa628k0wvyi20xgvwh6j2b9c6sfln1dvqwk89fa6cpqjd15qx";
+  SGr-IosevkaFixedSS14 = "1hazszzhv7c3y242bk9v913v11l4f8difl7g3rk9w16x8bhcqykj";
+  SGr-IosevkaFixedSS15 = "05i6sdspi33l5l4lc68xcnpq9jsfjd21xz2cblgg8mpxi5pcxwnx";
+  SGr-IosevkaFixedSS16 = "0zcpgs611hicd9snhvwlbk2n94dnr76y8vg8ai41gy3d5ss5wgvc";
+  SGr-IosevkaFixedSS17 = "1kgmiznjwlspq3sb4mz5p94cc9jakq00sg934sjj24kh4pxpc17p";
+  SGr-IosevkaFixedSS18 = "1c6sbvbwlpyiq4vh1ydg2a963k001kcvgvw50r6ajv2dkq3b5hxf";
+  SGr-IosevkaSlab = "1lprgw2ckvp1v9b0q6ygrij9mk6mnr7bjzhdp3v5r1mpyzhxznf8";
+  SGr-IosevkaSS01 = "07ksz7bva2b47h6320rzg8wdpq2240rlym0988w8chslyi2g9cya";
+  SGr-IosevkaSS02 = "0dj5f7v1m78rp0ahzp99dir8b87cdbmf2lzrp3m8g37hwjpjzi6h";
+  SGr-IosevkaSS03 = "1v35nwwzkmbvrwil8kydw19v44gniyx7d77ri6kzxliwb86nd2rz";
+  SGr-IosevkaSS04 = "1cmvm37jm7mzmv1llpi6091xvpvh6mvimgbiqwxr6vysaal7iwz2";
+  SGr-IosevkaSS05 = "1v19ry9bpa5gdg8n1ni9kb4qrjw7jj8haqgaazkxqd5kqd0i0xbf";
+  SGr-IosevkaSS06 = "0bn4c99ipf6ij52cia788wplhgpppb82pfwpd9h94775cy1qnwmp";
+  SGr-IosevkaSS07 = "0cxw5in1v5pb0955c8pql7lla5cc70c7jvphx95kg17xdn0vf7zy";
+  SGr-IosevkaSS08 = "1qy4ah3qrdcd8vm98njhycinp282b68picc1xzyrb1cs73wcmymx";
+  SGr-IosevkaSS09 = "1hnzbjnfrg068gscia60cx5r1wvkylnnvnwxbbr49kx19j4nb9mw";
+  SGr-IosevkaSS10 = "0x1h6j4731ain7s91sjkifm0zz2l18dv7qk4d4vg99am0mykr0kr";
+  SGr-IosevkaSS11 = "0m8wd4shac32w4lhx3a1zcgg515bdgj29121342aasj8in65hzsw";
+  SGr-IosevkaSS12 = "1h79lqih6xdvzzgb4xi3v3c1v9x08vby7l1rkiypkl66s7n2qmvz";
+  SGr-IosevkaSS13 = "1kgksvsl35v4vjypw3qi5kcnnwcalwbh878p9q4wqrnx7x9q6f21";
+  SGr-IosevkaSS14 = "1kv5zk7habxi85v7ihkgm857r81v52h6qwqcva55y8cycicbxc6f";
+  SGr-IosevkaSS15 = "1a1wsi4vbfmnhvwh17k4z4zdcgsprqx15hkkpbv1ndshdmd0cnac";
+  SGr-IosevkaSS16 = "1gy1a38x79yay6396qdn3a56hhyrslskriar58lxyjdzd8v052m4";
+  SGr-IosevkaSS17 = "1flhbavmzdbi1pcnjdk0zfxh4lg284w7czw472y28xsawdpa6ylx";
+  SGr-IosevkaSS18 = "1yva22hc60v22r1gsa06wxg6zdq7xg7kznq3zdicaa1z9jaj5is3";
+  SGr-IosevkaTerm = "0nf100ymnmkcnj3pvrnsnsb8nanw4asvmmahbvbjwbscq9y5v1pp";
+  SGr-IosevkaTermCurly = "1c6csjl5mhw7rvpkx36v57h5nd2mwy8xlpcisbv2x6mr6cmiypq0";
+  SGr-IosevkaTermCurlySlab = "1mpfzk4pdpiwk7i93alw8whv6j6qq3by7mar33hqdfnwc8ry971s";
+  SGr-IosevkaTermSlab = "19fjijgcfr368c946lkr7xac1gs74bxrax1rn1c0nr8b9qw8y241";
+  SGr-IosevkaTermSS01 = "1q9j91mg19mgpx7a5bbkg5dfwza60zc5yakqb7ifcaybxphwzgzc";
+  SGr-IosevkaTermSS02 = "1v4m60y7z4v6kjrsi16ibslf5bfxmh70qp4q6id5w83307acx4af";
+  SGr-IosevkaTermSS03 = "062p5n78ny74ndhfywdv0ggm3hzscqq6z41yhz0x6pc6390ab3vn";
+  SGr-IosevkaTermSS04 = "08s8140vf1bib5rg5slzp3w2zckf7czdij11jznj61qj5z6069qd";
+  SGr-IosevkaTermSS05 = "01fa9hwznvls1shwglzvh6lvhwn2c2ys7pzvw131qd5fbj11nfxs";
+  SGr-IosevkaTermSS06 = "0k22nm9y7zsbw9wyvkcnh8r7a9p78fdnqhr4k72winhnj0az4nhi";
+  SGr-IosevkaTermSS07 = "0n4cds8bar6w420g6plvs8iwizskgs04m216bsnxa7mfmr368d8v";
+  SGr-IosevkaTermSS08 = "1agzv2vsiry7x6681ic33cxyryv34fr66qpxcihx5xf2ky565vwv";
+  SGr-IosevkaTermSS09 = "1x82wii0hpcnffvbkql6r8yj0s3m4vl6iyrd15dnhs38qrvahkj2";
+  SGr-IosevkaTermSS10 = "0jpar4ggsr0gg2b6y3bjl5k6ffnwdi2l2vz4i24n10ldcdb6kygd";
+  SGr-IosevkaTermSS11 = "0kpq91wdzkfkfldkcbxjddjvznaanz5nycvqh66zbvsfsy89i69c";
+  SGr-IosevkaTermSS12 = "0q8vkmkzxszhi9mqmb0jyjqaiss2z588iqvy3xp0qzzqs6w4vvcp";
+  SGr-IosevkaTermSS13 = "1n0isq8vfn5lfwxn2cjfaymkaiw131ykllzbv5b7kqlj32cj3q42";
+  SGr-IosevkaTermSS14 = "1hjdbpc264b1glwvfzbfrrkjxpr238byk9pw55swklzrj6q0v7sw";
+  SGr-IosevkaTermSS15 = "1sfxic3268bz7b6psnkkwbjmr4ipaf5alscr3kfwz5g03avhiz9x";
+  SGr-IosevkaTermSS16 = "0l74n9mafv0zh1qcy4gxmfkf2mjhjcplfxkcxmm4ymgybgxcqrc8";
+  SGr-IosevkaTermSS17 = "00q78cwj368rgk5lhlncs39h99w1dqbpg9nkqxqjqkgdqyd2ivwb";
+  SGr-IosevkaTermSS18 = "128c6d1bblhfn9npgp56l5zyk4gyyq9p854mi3950r1zg89963x3";
 }

From 40cf14fdbdce3833475e2535409244eddd67bbe0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 28 Jan 2025 06:28:55 +1000
Subject: [PATCH 83/88] home-manager: 0-unstable-2025-01-13 ->
 0-unstable-2025-01-27 (#377348)

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

diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index 4e6e920d98e7..94160846668f 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2025-01-13";
+  version = "0-unstable-2025-01-27";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "fc52a210b60f2f52c74eac41a8647c1573d2071d";
-    hash = "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=";
+    rev = "e1ae908bcc30af792b0bb0a52e53b03d2577255e";
+    hash = "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=";
   };
 
   nativeBuildInputs = [

From 215b417971827591b88f0e74e7d8e25a1134303d Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 27 Jan 2025 21:29:48 +0100
Subject: [PATCH 84/88] linuxPackages.nvidia_x11.open: don't include date for
 reproducibility (#377335)

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/os-specific/linux/nvidia-x11/open.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix
index 6d27b4dd0b98..108466d4e8ec 100644
--- a/pkgs/os-specific/linux/nvidia-x11/open.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/open.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation (
       "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
       "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
       "MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
+      "DATE="
       {
         aarch64-linux = "TARGET_ARCH=aarch64";
         x86_64-linux = "TARGET_ARCH=x86_64";

From 327028baa0e7a7efebebaa266651fe7221baa00a Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Mon, 27 Jan 2025 21:33:43 +0100
Subject: [PATCH 85/88] nixos/pixelfed: fix typo in nginx submodule description

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 nixos/modules/services/web-apps/pixelfed.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix
index 4c64a10951ab..41416e5e529e 100644
--- a/nixos/modules/services/web-apps/pixelfed.nix
+++ b/nixos/modules/services/web-apps/pixelfed.nix
@@ -109,7 +109,7 @@ in {
           }
         '';
         description = ''
-          With this option, you can customize an nginx virtual host which already has sensible defaults for Dolibarr.
+          With this option, you can customize an nginx virtual host which already has sensible defaults for Pixelfed.
           Set to {} if you do not need any customization to the virtual host.
           If enabled, then by default, the {option}`serverName` is
           `''${domain}`,

From 6de7de04a886d2857df3ce130558f194283609b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 20:34:57 +0000
Subject: [PATCH 86/88] gtuber: 0-unstable-2024-10-11 -> 0-unstable-2025-01-19

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

diff --git a/pkgs/by-name/gt/gtuber/package.nix b/pkgs/by-name/gt/gtuber/package.nix
index 71e504cb8e5f..750c7acdd7ff 100644
--- a/pkgs/by-name/gt/gtuber/package.nix
+++ b/pkgs/by-name/gt/gtuber/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation {
   pname = "gtuber";
-  version = "0-unstable-2024-10-11";
+  version = "0-unstable-2025-01-19";
 
   src = fetchFromGitHub {
     owner = "Rafostar";
     repo = "gtuber";
-    rev = "468bf02a8adcf69b1bd6dd7b5dbcdcc0bfdb6922";
-    hash = "sha256-pEiHqcxkrxZRD9xW/R9DNDdp5foxaHK2SAuzmPNegaY=";
+    rev = "446e26668a4e01fc2ca9c261a7f1c281577e566d";
+    hash = "sha256-5Z6sID7Alm4FWl1qCQV1w5DmGsmor2vbnZUJi3Is650=";
   };
 
   nativeBuildInputs = [

From 876605aadb7599f222e6b2492e9718ec4a80078c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2025 20:35:03 +0000
Subject: [PATCH 87/88] fswatch: 1.18.0 -> 1.18.2

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

diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 814838532766..bf6fcf41cef1 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fswatch";
-  version = "1.18.0";
+  version = "1.18.2";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "sha256-n9EDEF5swC7UyvC0cd+U/u4Wd050Jf9h2AVtEVbUICA=";
+    sha256 = "sha256-u9+sayp0U6TudffGP2Bb2PbbSMjUHCb6gGBq3jKQ3EQ=";
   };
 
   nativeBuildInputs = [

From d177ad4a037cc2e5daa47c9bc1262144923196f7 Mon Sep 17 00:00:00 2001
From: Felix Kimmel <91203390+TheRobot2105@users.noreply.github.com>
Date: Mon, 27 Jan 2025 21:39:22 +0100
Subject: [PATCH 88/88] vscode-extensions.hirse.vscode-ungit: init at 2.5.2
 (#377322)

* maintainers: add therobot2105

* vscode-extensions.hirse.vscode-ungit: init at 2.5.2
---
 maintainers/maintainer-list.nix                  |  6 ++++++
 .../editors/vscode/extensions/default.nix        | 16 ++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 02865fd4ff37..18032c354f0c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22994,6 +22994,12 @@
     githubId = 5409166;
     name = "Rishi Desai";
   };
+  therobot2105 = {
+    email = "felix.kimmel@web.de";
+    github = "TheRobot2105";
+    githubId = 91203390;
+    name = "Felix Kimmel";
+  };
   thesola10 = {
     email = "me@thesola.io";
     github = "Thesola10";
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 3a4a86852d42..17681f58ce00 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2384,6 +2384,22 @@ let
         };
       };
 
+      hirse.vscode-ungit = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-ungit";
+          publisher = "hirse";
+          version = "2.5.2";
+          hash = "sha256-0CFYL6rBecB8rNnk4IAtg03ZPdSJ9qxwnVdhdQedxsQ=";
+        };
+        meta = {
+          description = "Ungit in Visual Studio Code.";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=Hirse.vscode-ungit";
+          homepage = "https://github.com/hirse/vscode-ungit";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.therobot2105 ];
+        };
+      };
+
       hiukky.flate = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "flate";