From 1259856bac889331cf3bce2014651bb573d797db Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Wed, 18 Dec 2024 18:00:15 -0800
Subject: [PATCH 01/92] llvmPackages.lldbPlugins: drop llvm/clang rebuild

Eliminate rebuilding the following packages on darwin just for this
attrset:

< DarwinTools-1.drv
< DarwinTools-1.tar.gz.drv
< IOKit-11.0.drv
< builder.pl.drv
< clang-16.0.6.drv
< clang-at-least-16-LLVMgold-path.patch.drv
< clang-darwin-An-OS-version-preprocessor-define.patch.drv
< clang-src-16.0.6.drv
< llvm-16.0.6.drv
< llvm-src-16.0.6.drv
< psutil-6.0.0.tar.gz.drv
< python3-3.12.7-env.drv
< python3.12-psutil-6.0.0.drv
< sysctl-system_cmds-1012.drv

found by diffing the output of the command below before and after this
change:
```
nix-store --query -R $(nix-instantiate -A llvmPackages.lldbPlugins) | \
  cut -d- -f 2- | sort
```
---
 .../compilers/llvm/common/default.nix         | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index b53f76e96c11..0dabfee39359 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -329,20 +329,6 @@ let
       };
   };
 
-  lldbPlugins = lib.makeExtensible (
-    lldbPlugins:
-    let
-      callPackage = newScope (
-        lldbPlugins
-        // {
-          inherit stdenv;
-          inherit (tools) lldb;
-        }
-      );
-    in
-    lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
-  );
-
   tools = lib.makeExtensible (
     tools:
     let
@@ -668,6 +654,14 @@ let
           );
       };
 
+      lldbPlugins = lib.makeExtensible (
+        lldbPlugins:
+        let
+          callPackage = newScope ( lldbPlugins // tools // args // metadata );
+        in
+        lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
+      );
+
       lldb = callPackage ./lldb.nix (
         {
           patches =
@@ -1224,7 +1218,7 @@ let
   noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];
 in
 {
-  inherit tools libraries lldbPlugins;
+  inherit tools libraries;
   inherit (metadata) release_version;
 }
 // (noExtend libraries)

From 5ede4649bacac6690a566928036b964830c03ee6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jan 2025 09:53:13 +0000
Subject: [PATCH 02/92] cobang: 0.14.1 -> 0.15.0

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

diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix
index 6d1c76f17c49..dac40f8c7851 100644
--- a/pkgs/by-name/co/cobang/package.nix
+++ b/pkgs/by-name/co/cobang/package.nix
@@ -13,14 +13,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "cobang";
-  version = "0.14.1";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hongquan";
     repo = "CoBang";
     tag = "v${version}";
-    hash = "sha256-/8JtDoXFQGlM7tlwKd+WRIKpnKCD6OnMmbvElg7LbzU=";
+    hash = "sha256-ozHmGpRx+Ts6yrDXwm4OHXTArunQbJOlA/7zJvRNQio=";
   };
 
   postPatch = ''

From 92371eb1be5e392cfeaa9054db7de1f9058a9033 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Fri, 13 Dec 2024 19:29:49 +0100
Subject: [PATCH 03/92] awsume: install correct Zsh autocompletion

---
 pkgs/tools/admin/awsume/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/tools/admin/awsume/default.nix
index 267de059adb3..83ca755166d3 100644
--- a/pkgs/tools/admin/awsume/default.nix
+++ b/pkgs/tools/admin/awsume/default.nix
@@ -44,7 +44,7 @@ buildPythonApplication rec {
   postInstall = ''
     installShellCompletion --cmd awsume \
       --bash <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \
-      --zsh <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['zsh'])") \
+      --zsh <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \
       --fish <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \
 
     rm -f $out/bin/awsume.bat

From 795cbd1a76100c637500289fd64c079feec70f9b Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Fri, 13 Dec 2024 19:42:47 +0100
Subject: [PATCH 04/92] awsume: substitute path to awsume-autocomplete bin

---
 pkgs/tools/admin/awsume/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/tools/admin/awsume/default.nix
index 83ca755166d3..1916ebaf1f45 100644
--- a/pkgs/tools/admin/awsume/default.nix
+++ b/pkgs/tools/admin/awsume/default.nix
@@ -39,6 +39,7 @@ buildPythonApplication rec {
   postPatch = ''
     patchShebangs shell_scripts
     substituteInPlace shell_scripts/{awsume,awsume.fish} --replace-fail "awsumepy" "$out/bin/awsumepy"
+    substituteInPlace awsume/configure/autocomplete.py --replace-fail "awsume-autocomplete" "$out/bin/awsume-autocomplete"
   '';
 
   postInstall = ''

From 44ea839ccc22fb40f62275ff68613d30cf08400c Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sun, 12 Jan 2025 21:06:02 +0200
Subject: [PATCH 05/92] betterdisplay: 3.2.1 -> 3.3.0

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

diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix
index cd8b19725270..f49b68a5a60d 100644
--- a/pkgs/by-name/be/betterdisplay/package.nix
+++ b/pkgs/by-name/be/betterdisplay/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "betterdisplay";
-  version = "3.2.1";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "https://github.com/waydabber/BetterDisplay/releases/download/v${finalAttrs.version}/BetterDisplay-v${finalAttrs.version}.dmg";
-    hash = "sha256-UQLVRCeUznTqT6qDR6sZRZ5xMVgs0Th2iRRpnF0pqVI=";
+    hash = "sha256-A0kh3XNdl5kJ32Kxwb0PAgxfGJR+EZEoaP+gspRJEcU=";
   };
 
   dontPatch = true;

From d88e68758a9edcb889541e731b0a0ed8402d7610 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sun, 12 Jan 2025 21:09:09 +0200
Subject: [PATCH 06/92] betterdisplay: version check

---
 pkgs/by-name/be/betterdisplay/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix
index f49b68a5a60d..937988cd135f 100644
--- a/pkgs/by-name/be/betterdisplay/package.nix
+++ b/pkgs/by-name/be/betterdisplay/package.nix
@@ -4,6 +4,9 @@
   fetchurl,
   undmg,
   nix-update-script,
+  versionCheckHook,
+  writeShellScript,
+  xcbuild,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -32,6 +35,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = writeShellScript "version-check" ''
+    ${xcbuild}/bin/PlistBuddy -c "Print :CFBundleShortVersionString" "$1"
+  '';
+  versionCheckProgramArg = [
+    "${placeholder "out"}/Applications/BetterDisplay.app/Contents/Info.plist"
+  ];
+  doInstallCheck = true;
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 0129b83a02516278fdcf123343034f6744767ad6 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Tue, 14 Jan 2025 16:56:17 +0100
Subject: [PATCH 07/92] varnish76: init at 7.6.1

---
 nixos/tests/all-tests.nix         | 1 +
 pkgs/servers/varnish/default.nix  | 5 +++++
 pkgs/servers/varnish/modules.nix  | 4 ++++
 pkgs/servers/varnish/packages.nix | 5 +++++
 pkgs/top-level/all-packages.nix   | 4 ++--
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 837bdc7e9fdd..9c40a78094fa 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1139,6 +1139,7 @@ in {
   v2ray = handleTest ./v2ray.nix {};
   varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
   varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; };
+  varnish76 = handleTest ./varnish.nix { package = pkgs.varnish76; };
   vault = handleTest ./vault.nix {};
   vault-agent = handleTest ./vault-agent.nix {};
   vault-dev = handleTest ./vault-dev.nix {};
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index d1d67d74b153..fd969f35f3be 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -99,4 +99,9 @@ in
     version = "7.5.0";
     hash = "sha256-/KYbmDE54arGHEVG0SoaOrmAfbsdgxRXHjFIyT/3K10=";
   };
+  # EOL 2025-09-15
+  varnish76 = common {
+    version = "7.6.1";
+    hash = "sha256-Wpu1oUn/J4Z7VKZs4W0qS5Pt/6VHPLh8nHH3aZz4Rbo=";
+  };
 }
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 225d5c5e9f42..d51a2dae3f7c 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -59,4 +59,8 @@ in
     version = "0.24.0";
     hash = "sha256-2MfcrhhkBz9GyQxEWzjipdn1CBEqnCvC3t1G2YSauak=";
   };
+  modules25 = common {
+    version = "0.25.0";
+    hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk=";
+  };
 }
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index f5d72f8226da..114e3db4b131 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -3,6 +3,7 @@
   callPackage,
   varnish60,
   varnish75,
+  varnish76,
 }:
 {
   varnish60Packages = rec {
@@ -23,4 +24,8 @@
     varnish = varnish75;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules24;
   };
+  varnish76Packages = rec {
+    varnish = varnish76;
+    modules = (callPackages ./modules.nix { inherit varnish; }).modules25;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68b022b96e8f..f9a464997b2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5493,9 +5493,9 @@ with pkgs;
   unzipNLS = lowPrio (unzip.override { enableNLS = true; });
 
   inherit (callPackages ../servers/varnish { })
-    varnish60 varnish75;
+    varnish60 varnish75 varnish76;
   inherit (callPackages ../servers/varnish/packages.nix { })
-    varnish60Packages varnish75Packages;
+    varnish60Packages varnish75Packages varnish76Packages;
 
   varnishPackages = varnish75Packages;
   varnish = varnishPackages.varnish;

From 75ad720f775dad2cef4697d3baef1acf4630ccd8 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Tue, 14 Jan 2025 15:01:28 +0100
Subject: [PATCH 08/92] varnish: add flying circus as maintainer

---
 pkgs/servers/varnish/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index fd969f35f3be..b9e4b0de6c3e 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -83,7 +83,7 @@ let
         description = "Web application accelerator also known as a caching HTTP reverse proxy";
         homepage = "https://www.varnish-cache.org";
         license = licenses.bsd2;
-        maintainers = [ ];
+        maintainers = lib.teams.flyingcircus.members;
         platforms = platforms.unix;
       };
     };

From f5816b055d85986e40e5f82e45b1cfb6193c371c Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 15 Jan 2025 15:37:40 +0100
Subject: [PATCH 09/92] perlPackages.Socket6: fix cross build

---
 pkgs/top-level/perl-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7162c0d4a942..fa1aa5f200f5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -22766,8 +22766,12 @@ with self; {
       hash = "sha256-RokV+joE3PZXT8lX7/SVkV4kVpQ0lwyR7o5OFFn8kRQ=";
     };
     setOutputFlags = false;
-    buildInputs = [ pkgs.which ];
+    nativeBuildInputs = [ pkgs.which ];
     patches = [ ../development/perl-modules/Socket6-sv_undef.patch ];
+    preConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      substituteInPlace configure \
+        --replace-fail 'cross_compiling=no' 'cross_compiling=yes;ipv6_cv_can_inet_ntop=yes'
+    '';
     meta = {
       description = "IPv6 related part of the C socket.h defines and structure manipulators";
       license = with lib.licenses; [ bsd3 ];

From 273d98d9936f6e3073af4166a1cb35b67de23627 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 15 Jan 2025 15:37:40 +0100
Subject: [PATCH 10/92] perlPackages.Tk: fix cross build

---
 pkgs/top-level/perl-packages.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7162c0d4a942..f3da127c0f4d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -27685,7 +27685,21 @@ with self; {
       # in an error with clang 16.
       ../development/perl-modules/tk-configure-implicit-int-fix.patch
     ];
-    makeMakerFlags = [ "X11INC=${pkgs.xorg.libX11.dev}/include" "X11LIB=${pkgs.xorg.libX11.out}/lib" ];
+    postPatch = ''
+      substituteInPlace pTk/mTk/additions/imgWindow.c \
+        --replace-fail '"X11/Xproto.h"' "<X11/Xproto.h>"
+      substituteInPlace PNG/zlib/Makefile.in \
+        --replace-fail '$(AR) $@' '$(AR) rc $@'
+      substituteInPlace PNG/libpng/scripts/makefile.gcc \
+        --replace-fail 'AR_RC = ar rcs' 'AR_RC = ${pkgs.stdenv.cc.targetPrefix}ar rcs'
+      substituteInPlace JPEG/jpeg/makefile.cfg \
+        --replace-fail 'AR= ar rc' 'AR= ${pkgs.stdenv.cc.targetPrefix}ar rc'
+    '';
+    makeMakerFlags = [
+      "AR=${pkgs.stdenv.cc.targetPrefix}ar"
+      "X11INC=${pkgs.xorg.libX11.dev}/include"
+      "X11LIB=${pkgs.xorg.libX11.out}/lib"
+    ];
     buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ];
     env = lib.optionalAttrs stdenv.cc.isGNU {
       NIX_CFLAGS_COMPILE = toString [

From d7ac52bd816b0f28a1070c4c90c2e24061ab34a0 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 15 Jan 2025 11:40:14 +0100
Subject: [PATCH 11/92] matomo-beta: remove

---
 nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++
 nixos/tests/matomo.nix                            | 9 ---------
 pkgs/servers/web-apps/matomo/default.nix          | 7 -------
 pkgs/top-level/aliases.nix                        | 1 +
 pkgs/top-level/all-packages.nix                   | 3 +--
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index fd625646c11e..d21764cbb4ce 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -263,6 +263,8 @@
 
 - `matomo` now defaults to version 5 (previously available as `matomo_5`). Version 4 has been removed as it reached EOL on December 19, 2024.
 
+- `matomo-beta` has been removed as the version of the `matomo` package can now be easily overriden through `overrideAttrs` (see [PR #374022](https://github.com/NixOS/nixpkgs/pull/374022))
+
 - `docker_24` has been removed, as it was EOL with vulnerabilites since June 08, 2024.
 
 - `containerd` has been updated to v2, which contains breaking changes. See the [containerd
diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix
index 1a40fa93a557..ef1aeeee75c2 100644
--- a/nixos/tests/matomo.nix
+++ b/nixos/tests/matomo.nix
@@ -72,13 +72,4 @@ in
       ]
       ++ lib.teams.flyingcircus.members;
   };
-  matomo-beta = matomoTest pkgs.matomo-beta // {
-    name = "matomo-beta";
-    meta.maintainers = with maintainers; [
-      florianjacob
-      mmilata
-      twey
-      boozedog
-    ];
-  };
 }
diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index eab263044cec..58869c75bb90 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -13,13 +13,6 @@ let
       version = "5.2.1";
       hash = "sha256-5glMwwIG0Uo8bu904u40FUa+yaUlrQe1nUCkv9/ATks=";
     };
-    matomo-beta = {
-      version = "5.2.1";
-      # `beta` examples: "b1", "rc1", null
-      # when updating: use null if stable version is >= latest beta or release candidate
-      beta = null;
-      hash = "sha256-5glMwwIG0Uo8bu904u40FUa+yaUlrQe1nUCkv9/ATks=";
-    };
   };
   common =
     pname:
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fa8a07f695dd..36f89f55d86d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -837,6 +837,7 @@ mapAliases {
   mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
   mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
   matomo_5 = matomo; # Added 2024-12-12
+  matomo-beta = throw "matomo-beta has been removed as it mostly just pointed to the latest matomo release, use `matomo.overrideAttrs` to access a specific beta version instead"; # Added 2025-01-15
   matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17
   matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20
   maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d749d9178c49..2fb9e4464d06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11883,8 +11883,7 @@ with pkgs;
 
   tt-rss = callPackage ../servers/tt-rss { };
   inherit (callPackages ../servers/web-apps/matomo {})
-    matomo
-    matomo-beta;
+    matomo;
 
   unpackerr = callPackage ../servers/unpackerr {
     inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;

From 83eb8d8020d148cd151bbd5f93cd776ffef7dc7b Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 15 Jan 2025 11:47:35 +0100
Subject: [PATCH 12/92] matomo: refactor into single package file

---
 nixos/tests/matomo.nix                   | 116 ++++++------
 pkgs/servers/web-apps/matomo/default.nix | 218 +++++++++++------------
 pkgs/top-level/all-packages.nix          |   3 +-
 3 files changed, 156 insertions(+), 181 deletions(-)

diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix
index ef1aeeee75c2..a3351b573265 100644
--- a/nixos/tests/matomo.nix
+++ b/nixos/tests/matomo.nix
@@ -5,71 +5,61 @@
 }:
 
 with import ../lib/testing-python.nix { inherit system pkgs; };
-with pkgs.lib;
 
-let
-  matomoTest =
-    package:
-    makeTest {
-      name = "matomo";
+makeTest {
+  name = "matomo";
 
-      nodes.machine =
-        { config, pkgs, ... }:
-        {
-          services.matomo = {
-            package = package;
-            enable = true;
-            nginx = {
-              forceSSL = false;
-              enableACME = false;
-            };
-          };
-          services.mysql = {
-            enable = true;
-            package = pkgs.mariadb;
-          };
-          services.nginx.enable = true;
+  nodes.machine =
+    { config, pkgs, ... }:
+    {
+      services.matomo = {
+        enable = true;
+        nginx = {
+          forceSSL = false;
+          enableACME = false;
         };
-
-      testScript = ''
-        start_all()
-        machine.wait_for_unit("mysql.service")
-        machine.wait_for_unit("phpfpm-matomo.service")
-        machine.wait_for_unit("nginx.service")
-
-        with subtest("matomo.js reachable via HTTP"):
-          machine.succeed("curl -sSfk http://machine/matomo.js")
-
-        with subtest("js/piwik.js reachable via HTTP"):
-          machine.succeed("curl -sSfk http://machine/js/piwik.js")
-
-        with subtest("matomo.php (API) reachable via HTTP"):
-          machine.succeed("curl -sSfk http://machine/matomo.php")
-
-        # without the grep the command does not produce valid utf-8 for some reason
-        with subtest("welcome screen loads"):
-            machine.succeed(
-                "curl -sSfL http://localhost/ | grep '<title>Matomo[^<]*Installation'"
-            )
-
-        with subtest("killing the phpfpm process should trigger an automatic restart"):
-          machine.succeed("systemctl kill -s KILL phpfpm-matomo")
-          machine.sleep(1)
-          machine.wait_for_unit("phpfpm-matomo.service")
-      '';
+      };
+      services.mysql = {
+        enable = true;
+        package = pkgs.mariadb;
+      };
+      services.nginx.enable = true;
     };
-in
-{
-  matomo = matomoTest pkgs.matomo // {
-    name = "matomo";
-    meta.maintainers =
-      with maintainers;
-      [
-        florianjacob
-        mmilata
-        twey
-        boozedog
-      ]
-      ++ lib.teams.flyingcircus.members;
-  };
+
+  testScript = ''
+    start_all()
+    machine.wait_for_unit("mysql.service")
+    machine.wait_for_unit("phpfpm-matomo.service")
+    machine.wait_for_unit("nginx.service")
+
+    with subtest("matomo.js reachable via HTTP"):
+      machine.succeed("curl -sSfk http://machine/matomo.js")
+
+    with subtest("js/piwik.js reachable via HTTP"):
+      machine.succeed("curl -sSfk http://machine/js/piwik.js")
+
+    with subtest("matomo.php (API) reachable via HTTP"):
+      machine.succeed("curl -sSfk http://machine/matomo.php")
+
+    # without the grep the command does not produce valid utf-8 for some reason
+    with subtest("welcome screen loads"):
+      machine.succeed(
+        "curl -sSfL http://localhost/ | grep '<title>Matomo[^<]*Installation'"
+      )
+
+    with subtest("killing the phpfpm process should trigger an automatic restart"):
+      machine.succeed("systemctl kill -s KILL phpfpm-matomo")
+      machine.sleep(1)
+      machine.wait_for_unit("phpfpm-matomo.service")
+  '';
+
+  meta.maintainers =
+    with pkgs.lib.maintainers;
+    [
+      florianjacob
+      mmilata
+      twey
+      boozedog
+    ]
+    ++ pkgs.lib.teams.flyingcircus.members;
 }
diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index 58869c75bb90..b63ed013ad5d 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -7,122 +7,108 @@
   nixosTests,
 }:
 
-let
-  versions = {
-    matomo = {
-      version = "5.2.1";
-      hash = "sha256-5glMwwIG0Uo8bu904u40FUa+yaUlrQe1nUCkv9/ATks=";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "matomo";
+  version = "5.2.1";
+
+  src = fetchurl {
+    url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz";
+    hash = "sha256-5glMwwIG0Uo8bu904u40FUa+yaUlrQe1nUCkv9/ATks=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  patches = [
+    # This changes the default value of the database server field
+    # from 127.0.0.1 to localhost.
+    # unix socket authentication only works with localhost,
+    # but password-based SQL authentication works with both.
+    # TODO: is upstream interested in this?
+    # -> discussion at https://github.com/matomo-org/matomo/issues/12646
+    ./make-localhost-default-database-host.patch
+    # This changes the default config for path.geoip2 so that it doesn't point
+    # to the nix store.
+    ./change-path-geoip2-5.x.patch
+  ];
+
+  # this bootstrap.php adds support for getting PIWIK_USER_PATH
+  # from an environment variable. Point it to a mutable location
+  # to be able to use matomo read-only from the nix store
+  postPatch = ''
+    cp ${./bootstrap.php} bootstrap.php
+  '';
+
+  # TODO: future versions might rename the PIWIK_… variables to MATOMO_…
+  # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH.
+  #       See https://forum.matomo.org/t/bootstrap-php/5926/10 and
+  #       https://github.com/matomo-org/matomo/issues/11654#issuecomment-297730843
+  installPhase = ''
+    runHook preInstall
+
+    # copy everything to share/, used as webroot folder, and then remove what's known to be not needed
+    mkdir -p $out/share
+    cp -ra * $out/share/
+    # tmp/ is created by matomo in PIWIK_USER_PATH
+    rmdir $out/share/tmp
+    # config/ needs to be accessed by PIWIK_USER_PATH anyway
+    ln -s $out/share/config $out/
+
+    makeWrapper ${php}/bin/php $out/bin/matomo-console \
+      --add-flags "$out/share/console"
+
+    runHook postInstall
+  '';
+
+  filesToFix = [
+    "misc/composer/build-xhprof.sh"
+    "misc/composer/clean-xhprof.sh"
+    "misc/cron/archive.sh"
+    "plugins/GeoIp2/config/config.php"
+    "plugins/Installation/FormDatabaseSetup.php"
+    "vendor/pear/archive_tar/sync-php4"
+    "vendor/szymach/c-pchart/coverage.sh"
+    "vendor/matomo/matomo-php-tracker/run_tests.sh"
+    "vendor/twig/twig/drupal_test.sh"
+  ];
+
+  # This fixes the consistency check in the admin interface
+  #
+  # The filesToFix list may contain files that are exclusive to only one of the versions we build
+  # make sure to test for existence to avoid erroring on an incompatible version and failing
+  postFixup = ''
+    pushd $out/share > /dev/null
+    for f in $filesToFix; do
+      if [ -f "$f" ]; then
+        length="$(wc -c "$f" | cut -d' ' -f1)"
+        hash="$(md5sum "$f" | cut -d' ' -f1)"
+        sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php
+      else
+        echo "INFO(files-to-fix): $f does not exist in this version"
+      fi
+    done
+    popd > /dev/null
+  '';
+
+  passthru = {
+    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      inherit (nixosTests) matomo;
     };
   };
-  common =
-    pname:
-    {
-      version,
-      hash,
-      beta ? null,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      name = "${pname}-${finalAttrs.version}";
-      version = version + lib.optionalString (beta != null) "-${toString beta}";
 
-      src = fetchurl {
-        url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz";
-        inherit hash;
-      };
-
-      nativeBuildInputs = [ makeWrapper ];
-
-      patches = [
-        # This changes the default value of the database server field
-        # from 127.0.0.1 to localhost.
-        # unix socket authentication only works with localhost,
-        # but password-based SQL authentication works with both.
-        # TODO: is upstream interested in this?
-        # -> discussion at https://github.com/matomo-org/matomo/issues/12646
-        ./make-localhost-default-database-host.patch
-        # This changes the default config for path.geoip2 so that it doesn't point
-        # to the nix store.
-        ./change-path-geoip2-5.x.patch
-      ];
-
-      # this bootstrap.php adds support for getting PIWIK_USER_PATH
-      # from an environment variable. Point it to a mutable location
-      # to be able to use matomo read-only from the nix store
-      postPatch = ''
-        cp ${./bootstrap.php} bootstrap.php
-      '';
-
-      # TODO: future versions might rename the PIWIK_… variables to MATOMO_…
-      # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH.
-      #       See https://forum.matomo.org/t/bootstrap-php/5926/10 and
-      #       https://github.com/matomo-org/matomo/issues/11654#issuecomment-297730843
-      installPhase = ''
-        runHook preInstall
-
-        # copy everything to share/, used as webroot folder, and then remove what's known to be not needed
-        mkdir -p $out/share
-        cp -ra * $out/share/
-        # tmp/ is created by matomo in PIWIK_USER_PATH
-        rmdir $out/share/tmp
-        # config/ needs to be accessed by PIWIK_USER_PATH anyway
-        ln -s $out/share/config $out/
-
-        makeWrapper ${php}/bin/php $out/bin/matomo-console \
-          --add-flags "$out/share/console"
-
-        runHook postInstall
-      '';
-
-      filesToFix = [
-        "misc/composer/build-xhprof.sh"
-        "misc/composer/clean-xhprof.sh"
-        "misc/cron/archive.sh"
-        "plugins/GeoIp2/config/config.php"
-        "plugins/Installation/FormDatabaseSetup.php"
-        "vendor/pear/archive_tar/sync-php4"
-        "vendor/szymach/c-pchart/coverage.sh"
-        "vendor/matomo/matomo-php-tracker/run_tests.sh"
-        "vendor/twig/twig/drupal_test.sh"
-      ];
-
-      # This fixes the consistency check in the admin interface
-      #
-      # The filesToFix list may contain files that are exclusive to only one of the versions we build
-      # make sure to test for existence to avoid erroring on an incompatible version and failing
-      postFixup = ''
-        pushd $out/share > /dev/null
-        for f in $filesToFix; do
-          if [ -f "$f" ]; then
-            length="$(wc -c "$f" | cut -d' ' -f1)"
-            hash="$(md5sum "$f" | cut -d' ' -f1)"
-            sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php
-          else
-            echo "INFO(files-to-fix): $f does not exist in this version"
-          fi
-        done
-        popd > /dev/null
-      '';
-
-      passthru = {
-        tests = nixosTests.matomo."${pname}";
-      };
-
-      meta = with lib; {
-        description = "Real-time web analytics application";
-        mainProgram = "matomo-console";
-        license = licenses.gpl3Plus;
-        homepage = "https://matomo.org/";
-        platforms = platforms.all;
-        maintainers =
-          with maintainers;
-          [
-            florianjacob
-            sebbel
-            twey
-            boozedog
-          ]
-          ++ teams.flyingcircus.members;
-      };
-    });
-in
-lib.mapAttrs common versions
+  meta = with lib; {
+    description = "Real-time web analytics application";
+    mainProgram = "matomo-console";
+    license = licenses.gpl3Plus;
+    homepage = "https://matomo.org/";
+    platforms = platforms.all;
+    maintainers =
+      with maintainers;
+      [
+        florianjacob
+        sebbel
+        twey
+        boozedog
+      ]
+      ++ teams.flyingcircus.members;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fb9e4464d06..b36768390ec6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11882,8 +11882,7 @@ with pkgs;
   };
 
   tt-rss = callPackage ../servers/tt-rss { };
-  inherit (callPackages ../servers/web-apps/matomo {})
-    matomo;
+  matomo = callPackage ../servers/web-apps/matomo { };
 
   unpackerr = callPackage ../servers/unpackerr {
     inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;

From 252c0538e5dfcb84e687719293e7c1b9a17b5d9d Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 15 Jan 2025 11:56:10 +0100
Subject: [PATCH 13/92] matomo: move to pkgs/by-name

---
 pkgs/{servers/web-apps => by-name/ma}/matomo/bootstrap.php       | 0
 .../web-apps => by-name/ma}/matomo/change-path-geoip2-5.x.patch  | 0
 .../ma}/matomo/make-localhost-default-database-host.patch        | 0
 .../matomo/default.nix => by-name/ma/matomo/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 5 files changed, 1 deletion(-)
 rename pkgs/{servers/web-apps => by-name/ma}/matomo/bootstrap.php (100%)
 rename pkgs/{servers/web-apps => by-name/ma}/matomo/change-path-geoip2-5.x.patch (100%)
 rename pkgs/{servers/web-apps => by-name/ma}/matomo/make-localhost-default-database-host.patch (100%)
 rename pkgs/{servers/web-apps/matomo/default.nix => by-name/ma/matomo/package.nix} (100%)

diff --git a/pkgs/servers/web-apps/matomo/bootstrap.php b/pkgs/by-name/ma/matomo/bootstrap.php
similarity index 100%
rename from pkgs/servers/web-apps/matomo/bootstrap.php
rename to pkgs/by-name/ma/matomo/bootstrap.php
diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2-5.x.patch b/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch
similarity index 100%
rename from pkgs/servers/web-apps/matomo/change-path-geoip2-5.x.patch
rename to pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch
diff --git a/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch b/pkgs/by-name/ma/matomo/make-localhost-default-database-host.patch
similarity index 100%
rename from pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch
rename to pkgs/by-name/ma/matomo/make-localhost-default-database-host.patch
diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/by-name/ma/matomo/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/matomo/default.nix
rename to pkgs/by-name/ma/matomo/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b36768390ec6..5b8c12475582 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11882,7 +11882,6 @@ with pkgs;
   };
 
   tt-rss = callPackage ../servers/tt-rss { };
-  matomo = callPackage ../servers/web-apps/matomo { };
 
   unpackerr = callPackage ../servers/unpackerr {
     inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;

From 1cc9c542bc08bf7e1f0eb057e81067125a150f56 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 15 Jan 2025 11:57:24 +0100
Subject: [PATCH 14/92] matomo: add updateScript

---
 pkgs/by-name/ma/matomo/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix
index b63ed013ad5d..395a4272da59 100644
--- a/pkgs/by-name/ma/matomo/package.nix
+++ b/pkgs/by-name/ma/matomo/package.nix
@@ -5,6 +5,7 @@
   makeWrapper,
   php,
   nixosTests,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -90,6 +91,12 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--url"
+        "https://github.com/matomo-org/matomo"
+      ];
+    };
     tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
       inherit (nixosTests) matomo;
     };
@@ -100,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "matomo-console";
     license = licenses.gpl3Plus;
     homepage = "https://matomo.org/";
+    changelog = "https://github.com/matomo-org/matomo/releases/tag/${finalAttrs.version}";
     platforms = platforms.all;
     maintainers =
       with maintainers;

From e9750c60f30419dae1bc9af0d2b6a2ad2e45e1c7 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 15 Jan 2025 12:05:22 +0100
Subject: [PATCH 15/92] matomo: add maintainer niklaskorz

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

diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix
index 395a4272da59..7954fe5009f2 100644
--- a/pkgs/by-name/ma/matomo/package.nix
+++ b/pkgs/by-name/ma/matomo/package.nix
@@ -102,21 +102,22 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Real-time web analytics application";
     mainProgram = "matomo-console";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     homepage = "https://matomo.org/";
     changelog = "https://github.com/matomo-org/matomo/releases/tag/${finalAttrs.version}";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     maintainers =
-      with maintainers;
+      with lib.maintainers;
       [
         florianjacob
         sebbel
         twey
         boozedog
+        niklaskorz
       ]
-      ++ teams.flyingcircus.members;
+      ++ lib.teams.flyingcircus.members;
   };
 })

From 7c2e8f1b55016a0a7145e46127db986737693ad5 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 15 Jan 2025 12:42:39 +0100
Subject: [PATCH 16/92] nixos/matomo: migrate tests from handleTest to runTest

---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/matomo.nix    | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 837bdc7e9fdd..acef9bb13f66 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -585,7 +585,7 @@ in {
   mate = handleTest ./mate.nix {};
   mate-wayland = handleTest ./mate-wayland.nix {};
   matter-server = handleTest ./matter-server.nix {};
-  matomo = handleTest ./matomo.nix {};
+  matomo = runTest ./matomo.nix;
   matrix-appservice-irc = runTest ./matrix/appservice-irc.nix;
   matrix-conduit = handleTest ./matrix/conduit.nix {};
   matrix-synapse = handleTest ./matrix/synapse.nix {};
diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix
index a3351b573265..9562cb7e4e2b 100644
--- a/nixos/tests/matomo.nix
+++ b/nixos/tests/matomo.nix
@@ -1,12 +1,5 @@
+{ lib, ... }:
 {
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
-}:
-
-with import ../lib/testing-python.nix { inherit system pkgs; };
-
-makeTest {
   name = "matomo";
 
   nodes.machine =
@@ -54,12 +47,12 @@ makeTest {
   '';
 
   meta.maintainers =
-    with pkgs.lib.maintainers;
+    with lib.maintainers;
     [
       florianjacob
       mmilata
       twey
       boozedog
     ]
-    ++ pkgs.lib.teams.flyingcircus.members;
+    ++ lib.teams.flyingcircus.members;
 }

From 2b954b5f7d42232e5bf0e78162de4d13db0c6a55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jan 2025 12:39:34 +0000
Subject: [PATCH 17/92] freeipmi: 1.6.14 -> 1.6.15

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

diff --git a/pkgs/by-name/fr/freeipmi/package.nix b/pkgs/by-name/fr/freeipmi/package.nix
index 7c4c0e008650..ddae0b150e52 100644
--- a/pkgs/by-name/fr/freeipmi/package.nix
+++ b/pkgs/by-name/fr/freeipmi/package.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.14";
+  version = "1.6.15";
   pname = "freeipmi";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz";
-    sha256 = "sha256-Gj2sXHa3zMTU+GqhK475shK673SJvwXombiau34U7bU=";
+    sha256 = "sha256-1pKcNUY59c51tbGJfos2brY2JcI+XEWQp66gNP4rjK8=";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From ba79b6d68b191c8bb5b83dd6df1efc0834680c64 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Thu, 16 Jan 2025 18:47:14 +0100
Subject: [PATCH 18/92] nixos/varnish: reduce overusage of `lib` (#208242)

---
 .../services/web-servers/varnish/default.nix  | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index d2b035b7cc5f..033dc631289b 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -5,65 +5,62 @@
   ...
 }:
 
-with lib;
-
 let
   cfg = config.services.varnish;
 
   commandLine =
     "-f ${pkgs.writeText "default.vcl" cfg.config}"
     +
-      optionalString (cfg.extraModules != [ ])
+      lib.optionalString (cfg.extraModules != [ ])
         " -p vmod_path='${
-           makeSearchPathOutput "lib" "lib/varnish/vmods" ([ cfg.package ] ++ cfg.extraModules)
+           lib.makeSearchPathOutput "lib" "lib/varnish/vmods" ([ cfg.package ] ++ cfg.extraModules)
          }' -r vmod_path";
 in
 {
   options = {
     services.varnish = {
-      enable = mkEnableOption "Varnish Server";
+      enable = lib.mkEnableOption "Varnish Server";
 
-      enableConfigCheck = mkEnableOption "checking the config during build time" // {
+      enableConfigCheck = lib.mkEnableOption "checking the config during build time" // {
         default = true;
       };
 
-      package = mkPackageOption pkgs "varnish" { };
+      package = lib.mkPackageOption pkgs "varnish" { };
 
-      http_address = mkOption {
-        type = types.str;
+      http_address = lib.mkOption {
+        type = lib.types.str;
         default = "*:6081";
         description = ''
           HTTP listen address and port.
         '';
       };
 
-      config = mkOption {
-        type = types.lines;
+      config = lib.mkOption {
+        type = lib.types.lines;
         description = ''
           Verbatim default.vcl configuration.
         '';
       };
 
-      stateDir = mkOption {
-        type = types.path;
+      stateDir = lib.mkOption {
+        type = lib.types.path;
         default = "/run/varnish/${config.networking.hostName}";
-        defaultText = literalExpression ''"/run/varnish/''${config.networking.hostName}"'';
+        defaultText = lib.literalExpression ''"/run/varnish/''${config.networking.hostName}"'';
         description = ''
           Directory holding all state for Varnish to run. Note that this should be a tmpfs in order to avoid performance issues and crashes.
         '';
       };
-
-      extraModules = mkOption {
-        type = types.listOf types.package;
+      extraModules = lib.mkOption {
+        type = lib.types.listOf lib.types.package;
         default = [ ];
-        example = literalExpression "[ pkgs.varnishPackages.geoip ]";
+        example = lib.literalExpression "[ pkgs.varnishPackages.geoip ]";
         description = ''
           Varnish modules (except 'std').
         '';
       };
 
-      extraCommandLine = mkOption {
-        type = types.str;
+      extraCommandLine = lib.mkOption {
+        type = lib.types.str;
         default = "";
         example = "-s malloc,256M";
         description = ''
@@ -74,17 +71,16 @@ in
 
   };
 
-  config = mkIf cfg.enable {
-
+  config = lib.mkIf cfg.enable {
     systemd.services.varnish = {
       description = "Varnish";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      preStart = mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''
+      preStart = lib.mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''
         mkdir -p ${cfg.stateDir}
         chown -R varnish:varnish ${cfg.stateDir}
       '';
-      postStop = mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''
+      postStop = lib.mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''
         rm -rf ${cfg.stateDir}
       '';
       serviceConfig = {
@@ -95,7 +91,7 @@ in
         RestartSec = "5s";
         User = "varnish";
         Group = "varnish";
-        RuntimeDirectory = mkIf (lib.hasPrefix "/run/" cfg.stateDir) (
+        RuntimeDirectory = lib.mkIf (lib.hasPrefix "/run/" cfg.stateDir) (
           lib.removePrefix "/run/" cfg.stateDir
         );
         AmbientCapabilities = "cap_net_bind_service";
@@ -107,7 +103,7 @@ in
     environment.systemPackages = [ cfg.package ];
 
     # check .vcl syntax at compile time (e.g. before nixops deployment)
-    system.checks = mkIf cfg.enableConfigCheck [
+    system.checks = lib.mkIf cfg.enableConfigCheck [
       (pkgs.runCommand "check-varnish-syntax" { } ''
         ${cfg.package}/bin/varnishd -C ${commandLine} 2> $out || (cat $out; exit 1)
       '')

From 0640622eb1fb3ca4182e71aa3a48def88458ecec Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Tue, 14 Jan 2025 16:44:08 +0100
Subject: [PATCH 19/92] nixos/varnish: fix stateDir to allow direct use of
 `varnishadm`

---
 .../services/web-servers/varnish/default.nix  | 47 +++++++++++--------
 nixos/tests/varnish.nix                       |  8 +++-
 pkgs/servers/varnish/default.nix              |  2 +-
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index 033dc631289b..6b3ff33d2348 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -8,6 +8,24 @@
 let
   cfg = config.services.varnish;
 
+  # Varnish has very strong opinions and very complicated code around handling
+  # the stateDir. After a lot of back and forth, we decided that we a)
+  # do not want a configurable option here, as most of the handling depends
+  # on the version and the compile time options. Putting everything into
+  # /var/run (RAM backed) is absolutely recommended by Varnish anyways.
+  # We do need to pay attention to the version-dependend variations, though!
+  stateDir =
+    if
+      (lib.versionOlder cfg.package.version "7")
+    # Remove after Varnish 6.0 is gone. In 6.0 varnishadm always appends the
+    # hostname (by default) and can't be nudged to not use any name. This has
+    # long changed by 7.5 and can be used without the host name.
+    then
+      "/var/run/varnish/${config.networking.hostName}"
+    # Newer varnish uses this:
+    else
+      "/var/run/varnishd";
+
   commandLine =
     "-f ${pkgs.writeText "default.vcl" cfg.config}"
     +
@@ -17,6 +35,14 @@ let
          }' -r vmod_path";
 in
 {
+  imports = [
+    (lib.mkRemovedOptionModule [
+      "services"
+      "varnish"
+      "stateDir"
+    ] "The `stateDir` option never was functional or useful. varnish uses compile-time settings.")
+  ];
+
   options = {
     services.varnish = {
       enable = lib.mkEnableOption "Varnish Server";
@@ -42,14 +68,6 @@ in
         '';
       };
 
-      stateDir = lib.mkOption {
-        type = lib.types.path;
-        default = "/run/varnish/${config.networking.hostName}";
-        defaultText = lib.literalExpression ''"/run/varnish/''${config.networking.hostName}"'';
-        description = ''
-          Directory holding all state for Varnish to run. Note that this should be a tmpfs in order to avoid performance issues and crashes.
-        '';
-      };
       extraModules = lib.mkOption {
         type = lib.types.listOf lib.types.package;
         default = [ ];
@@ -76,24 +94,15 @@ in
       description = "Varnish";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      preStart = lib.mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''
-        mkdir -p ${cfg.stateDir}
-        chown -R varnish:varnish ${cfg.stateDir}
-      '';
-      postStop = lib.mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''
-        rm -rf ${cfg.stateDir}
-      '';
       serviceConfig = {
         Type = "simple";
         PermissionsStartOnly = true;
-        ExecStart = "${cfg.package}/sbin/varnishd -a ${cfg.http_address} -n ${cfg.stateDir} -F ${cfg.extraCommandLine} ${commandLine}";
+        ExecStart = "${cfg.package}/sbin/varnishd -a ${cfg.http_address} -n ${stateDir} -F ${cfg.extraCommandLine} ${commandLine}";
         Restart = "always";
         RestartSec = "5s";
         User = "varnish";
         Group = "varnish";
-        RuntimeDirectory = lib.mkIf (lib.hasPrefix "/run/" cfg.stateDir) (
-          lib.removePrefix "/run/" cfg.stateDir
-        );
+        RuntimeDirectory = lib.removePrefix "/var/run/" stateDir;
         AmbientCapabilities = "cap_net_bind_service";
         NoNewPrivileges = true;
         LimitNOFILE = 131072;
diff --git a/nixos/tests/varnish.nix b/nixos/tests/varnish.nix
index ec9f05853737..ee60a9e392fa 100644
--- a/nixos/tests/varnish.nix
+++ b/nixos/tests/varnish.nix
@@ -56,8 +56,12 @@ import ./make-test-python.nix (
 
       client.wait_until_succeeds("curl -f http://varnish/nix-cache-info");
 
-      client.wait_until_succeeds("nix-store -r ${testPath}");
-      client.succeed("${testPath}/bin/hello");
+      client.wait_until_succeeds("nix-store -r ${testPath}")
+      client.succeed("${testPath}/bin/hello")
+
+      output = varnish.succeed("varnishadm status")
+      print(output)
+      assert "Child in state running" in output, "Unexpected varnishadm response"
     '';
   }
 )
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index b9e4b0de6c3e..4c0a7afb0986 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -54,7 +54,7 @@ let
         ++ lib.optional stdenv.hostPlatform.isDarwin libunwind
         ++ lib.optional stdenv.hostPlatform.isLinux jemalloc;
 
-      buildFlags = [ "localstatedir=/var/spool" ];
+      buildFlags = [ "localstatedir=/var/run" ];
 
       postPatch = ''
         substituteInPlace bin/varnishtest/vtc_main.c --replace /bin/rm "${coreutils}/bin/rm"

From 76447ebd9e62bd1775a2f75699bf8477fa7b09a3 Mon Sep 17 00:00:00 2001
From: hlad <hladma@gmail.com>
Date: Thu, 16 Jan 2025 19:45:48 +0100
Subject: [PATCH 20/92] libretro.vice-*: init at 0-unstable-2025-01-11

---
 .../emulators/libretro/cores/vice.nix         | 29 +++++++++++++++++++
 .../emulators/libretro/default.nix            | 20 +++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/emulators/libretro/cores/vice.nix

diff --git a/pkgs/applications/emulators/libretro/cores/vice.nix b/pkgs/applications/emulators/libretro/cores/vice.nix
new file mode 100644
index 000000000000..afa606a04107
--- /dev/null
+++ b/pkgs/applications/emulators/libretro/cores/vice.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkLibretroCore,
+  type ? "x64",
+}:
+mkLibretroCore {
+  core = "vice-${type}";
+  version = "0-unstable-2025-01-11";
+
+  src = fetchFromGitHub {
+    owner = "libretro";
+    repo = "vice-libretro";
+    rev = "5afa33f347306f168ff0b4c54a7825895dd07b50";
+    hash = "sha256-D0DSKgqZV8EluRry2qSm7qnWnvwwDWz91G66W4nF2Kk=";
+  };
+
+  makefile = "Makefile";
+
+  env = {
+      EMUTYPE = "${type}";
+  };
+
+  meta = {
+    description = "Port of vice to libretro";
+    homepage = "https://github.com/libretro/vice-libretro";
+    license = lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/applications/emulators/libretro/default.nix b/pkgs/applications/emulators/libretro/default.nix
index 6db990141d88..7cac65848810 100644
--- a/pkgs/applications/emulators/libretro/default.nix
+++ b/pkgs/applications/emulators/libretro/default.nix
@@ -189,6 +189,26 @@ lib.makeScope newScope (self: {
 
   vecx = self.callPackage ./cores/vecx.nix { };
 
+  vice-x64 = self.callPackage ./cores/vice.nix { type = "x64"; };
+
+  vice-x128 = self.callPackage ./cores/vice.nix { type = "x128"; };
+
+  vice-x64dtv = self.callPackage ./cores/vice.nix { type = "x64dtv"; };
+
+  vice-x64sc = self.callPackage ./cores/vice.nix { type = "x64sc"; };
+
+  vice-xcbm2 = self.callPackage ./cores/vice.nix { type = "xcbm2"; };
+
+  vice-xcbm5x0 = self.callPackage ./cores/vice.nix { type = "xcbm5x0"; };
+
+  vice-xpet = self.callPackage ./cores/vice.nix { type = "xpet"; };
+
+  vice-xplus4 = self.callPackage ./cores/vice.nix { type = "xplus4"; };
+
+  vice-xscpu64 = self.callPackage ./cores/vice.nix { type = "xscpu64"; };
+
+  vice-xvic = self.callPackage ./cores/vice.nix { type = "xvic"; };
+
   virtualjaguar = self.callPackage ./cores/virtualjaguar.nix { };
 
   yabause = self.callPackage ./cores/yabause.nix { };

From e5007e43b0733016f975bebce222f3918cf5131f Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Sat, 18 Jan 2025 01:29:12 +0100
Subject: [PATCH 21/92] linuxKernel.kernels.linux_zen: fix update script

---
 pkgs/os-specific/linux/kernel/update-zen.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/update-zen.py b/pkgs/os-specific/linux/kernel/update-zen.py
index a8a363761b10..5fe19ef8cb84 100755
--- a/pkgs/os-specific/linux/kernel/update-zen.py
+++ b/pkgs/os-specific/linux/kernel/update-zen.py
@@ -64,24 +64,24 @@ def update_file(relpath, variant, version, suffix, sha256):
         for line in f:
             result = line
             result = re.sub(
-                fr'^      version = ".+"; #{variant}',
-                f'      version = "{version}"; #{variant}',
+                fr'^      version = ".+"; # {variant}',
+                f'      version = "{version}"; # {variant}',
                 result)
             result = re.sub(
-                fr'^      suffix = ".+"; #{variant}',
-                f'      suffix = "{suffix}"; #{variant}',
+                fr'^      suffix = ".+"; # {variant}',
+                f'      suffix = "{suffix}"; # {variant}',
                 result)
             result = re.sub(
-                fr'^      sha256 = ".+"; #{variant}',
-                f'      sha256 = "{sha256}"; #{variant}',
+                fr'^      sha256 = ".+"; # {variant}',
+                f'      sha256 = "{sha256}"; # {variant}',
                 result)
             print(result, end='')
 
 
 def read_file(relpath, variant):
     file_path = os.path.join(DIR, relpath)
-    re_version = re.compile(fr'^\s*version = "(.+)"; #{variant}')
-    re_suffix = re.compile(fr'^\s*suffix = "(.+)"; #{variant}')
+    re_version = re.compile(fr'^\s*version = "(.+)"; # {variant}')
+    re_suffix = re.compile(fr'^\s*suffix = "(.+)"; # {variant}')
     version = None
     suffix = None
     with fileinput.FileInput(file_path, mode='r') as f:

From 43a7f6052924f235eab14b78d014e15cdcf20452 Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Sat, 18 Jan 2025 01:31:54 +0100
Subject: [PATCH 22/92] linuxKernel.kernels.linux_zen: 6.12.2 -> 6.12.10

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

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 2b4a130467ea..b4c84bf3212f 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -12,9 +12,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.12.2"; # zen
+      version = "6.12.10"; # zen
       suffix = "zen1"; # zen
-      sha256 = "0a6anmfm6495j6lwlywr62ghpwdvbdn54bl5baya5jz7vfqc1ghj"; # zen
+      sha256 = "1kd3bcnhlarnrpl87mrdb5r9k2jdq7m8607ai847dkmncw7q2d1q"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 8859192db359988dcfcdfcf71f233abb7571988c Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Sat, 18 Jan 2025 01:33:10 +0100
Subject: [PATCH 23/92] linuxKernel.kernels.linux_lqx: 6.12.2 -> 6.12.10

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index b4c84bf3212f..de14f7f5d31f 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -19,9 +19,9 @@ let
     };
     # ./update-zen.py lqx
     lqx = {
-      version = "6.12.2"; # lqx
-      suffix = "lqx3"; # lqx
-      sha256 = "18ibc0dz70vxb61mzdhbhbjg0kfxgcsrl3zdki0cqlhcvfxwk19h"; # lqx
+      version = "6.12.10"; # lqx
+      suffix = "lqx1"; # lqx
+      sha256 = "0sg905xdyy9wmjqv6d8p5jr307j767wgk27gzxhq8dnb2dz2yg5v"; # lqx
       isLqx = true;
     };
   };

From 47cbb54c07cd96eea506337783fcfb1c68b3c697 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 19 Jan 2025 12:21:41 +0100
Subject: [PATCH 24/92] gawkextlib.{errno,gd,haru,lmdb,select}: fix (cross)
 build

---
 pkgs/tools/text/gawk/gawkextlib.nix | 38 +++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix
index c567b39b07d7..d89e1c7a2ac2 100644
--- a/pkgs/tools/text/gawk/gawkextlib.nix
+++ b/pkgs/tools/text/gawk/gawkextlib.nix
@@ -34,6 +34,9 @@ let
       extraBuildInputs ? [ ],
       doCheck ? true,
       patches ? [ ],
+      extraPostPatch ? "",
+      env ? { },
+      broken ? null,
     }:
     let
       is_extension = gawkextlib != null;
@@ -50,9 +53,11 @@ let
 
       inherit patches;
 
-      postPatch = ''
-        cd ${name}
-      '';
+      postPatch =
+        ''
+          cd ${name}
+        ''
+        + extraPostPatch;
 
       nativeBuildInputs = [
         autoconf
@@ -70,10 +75,12 @@ let
       setupHook = if is_extension then ./setup-hook.sh else null;
       inherit gawk;
 
+      inherit env;
+
       inherit doCheck;
       nativeCheckInputs = [ more ];
 
-      meta = with lib; {
+      meta = {
         homepage = "https://sourceforge.net/projects/gawkextlib/";
         description = "Dynamically loaded extension libraries for GNU AWK";
         mainProgram = "xmlgawk";
@@ -85,10 +92,10 @@ let
           database, use the GD graphics library, and perform unlimited
           precision MPFR calculations.
         '';
-        license = licenses.gpl3Plus;
-        platforms = platforms.unix;
-        maintainers = with maintainers; [ tomberek ];
-      };
+        license = lib.licenses.gpl3Plus;
+        platforms = lib.platforms.unix;
+        maintainers = with lib.maintainers; [ tomberek ];
+      } // lib.optionalAttrs (broken != null) { inherit broken; };
     }
   );
   gawkextlib = buildExtension {
@@ -112,11 +119,16 @@ let
     errno = buildExtension {
       inherit gawkextlib;
       name = "errno";
+      extraPostPatch = ''
+        substituteInPlace Makefile.am --replace-fail 'cpp -M' '${stdenv.cc.targetPrefix}cpp -M'
+      '';
     };
     gd = buildExtension {
       inherit gawkextlib;
       name = "gd";
       extraBuildInputs = [ gd ];
+      # GCC 14 makes this an error by default, remove when fixed upstream
+      env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
     };
     haru = buildExtension {
       inherit gawkextlib;
@@ -127,6 +139,8 @@ let
         # https://github.com/libharu/libharu/commit/88271b73c68c521a49a15e3555ef00395aa40810
         ./fix-typos-corrected-in-libharu-2.4.4.patch
       ];
+      # GCC 14 makes this an error by default, remove when fixed upstream
+      env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
     };
     json = buildExtension {
       inherit gawkextlib;
@@ -136,6 +150,9 @@ let
     lmdb = buildExtension {
       inherit gawkextlib;
       name = "lmdb";
+      extraPostPatch = ''
+        substituteInPlace Makefile.am --replace-fail 'cpp -M' '${stdenv.cc.targetPrefix}cpp -M'
+      '';
       extraBuildInputs = [ lmdb ];
       #  mdb_env_open(env, /dev/null)
       #! No such device
@@ -175,6 +192,9 @@ let
     select = buildExtension {
       inherit gawkextlib;
       name = "select";
+      extraPostPatch = ''
+        substituteInPlace Makefile.am --replace-fail 'cpp -M' '${stdenv.cc.targetPrefix}cpp -M'
+      '';
     };
     timex = buildExtension {
       inherit gawkextlib;
@@ -187,6 +207,8 @@ let
         expat
         libiconv
       ];
+      # gawk: xmlbase:14: fatal: load_ext: cannot open library `../.libs/xml.so`
+      broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
     };
   };
 in

From 8dfd6a9537667a97e9d77c1d57a7ba01bebe65e6 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Mon, 20 Jan 2025 20:00:00 +0100
Subject: [PATCH 25/92] terraform-providers.vultr: 2.21.0 -> 2.23.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index b9c61bda4aab..30eda61d6638 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1427,13 +1427,13 @@
     "vendorHash": "sha256-kjS1YYMoE5IBeKWXnxzO3nFp6NpBEwUCaTzO0VSBDLA="
   },
   "vultr": {
-    "hash": "sha256-gQwLGnYmB9bwpGrLNdbw+zY0MlPPrY/37rJPtindT1Q=",
+    "hash": "sha256-vgeTK5fGHYzHCBdxq1JN9agK6+jYGkCkFnAWrkIz/gM=",
     "homepage": "https://registry.terraform.io/providers/vultr/vultr",
     "owner": "vultr",
     "repo": "terraform-provider-vultr",
-    "rev": "v2.21.0",
+    "rev": "v2.23.1",
     "spdx": "MPL-2.0",
-    "vendorHash": null
+    "vendorHash": "sha256-UW9/XEG+yTgMEttWFRMeneni0i/ZEcsrniT5vbhtRf8="
   },
   "wavefront": {
     "hash": "sha256-yNNtOkodzwxKvHQq9GZlUicezGW6u2ih6ry/cOtJQGM=",

From 110716db4f0dcdfcf6ada09de48d3865a2e15e6f Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 20 Jan 2025 20:17:45 +0100
Subject: [PATCH 26/92] lomiri.trust-store: Fix compatibility with glog 0.7.x,
 pin Boost to 1.86

---
 ...treewide-Switch-to-glog-CMake-module.patch | 57 +++++++++++++++++++
 .../development/trust-store/default.nix       | 10 +++-
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/lomiri/development/trust-store/1001-treewide-Switch-to-glog-CMake-module.patch

diff --git a/pkgs/desktops/lomiri/development/trust-store/1001-treewide-Switch-to-glog-CMake-module.patch b/pkgs/desktops/lomiri/development/trust-store/1001-treewide-Switch-to-glog-CMake-module.patch
new file mode 100644
index 000000000000..f6116003151f
--- /dev/null
+++ b/pkgs/desktops/lomiri/development/trust-store/1001-treewide-Switch-to-glog-CMake-module.patch
@@ -0,0 +1,57 @@
+From dbd44fbdc580a83ce7fb67fe8d2c87acee087cb0 Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Mon, 20 Jan 2025 19:25:00 +0100
+Subject: [PATCH] treewide: Switch to glog CMake module
+
+---
+ CMakeLists.txt     | 5 ++---
+ src/CMakeLists.txt | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6f03c1c..b58d8ab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,8 +38,9 @@ IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+   SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
+ ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+ 
+-find_package(PkgConfig)
++find_package(PkgConfig REQUIRED)
+ find_package(Boost COMPONENTS filesystem program_options system REQUIRED)
++find_package(glog REQUIRED)
+ 
+ add_subdirectory(3rd_party/xdg)
+ 
+@@ -56,7 +57,6 @@ if (TRUST_STORE_MIR_AGENT_ENABLED)
+   )
+ endif()
+ 
+-pkg_check_modules(GLOG libglog REQUIRED)
+ pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
+ 
+ include(CTest)
+@@ -66,7 +66,6 @@ include_directories(
+   3rd_party/xdg
+ 
+   ${GFLAGS_INCLUDE_DIRS}
+-  ${GLOG_INCLUDE_DIRS}
+   ${PROCESS_CPP_INCLUDE_DIRS}
+ )
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ac87e7f..416549c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -211,7 +211,7 @@ target_link_libraries(
+   ${Boost_LIBRARIES}
+   ${DBUS_LIBRARIES}
+   ${GFLAGS_LDFLAGS}
+-  ${GLOG_LDFLAGS}
++  glog::glog
+   ${GLIB_LDFLAGS}
+   ${GOBJECT_LDFLAGS}
+   ${LIBAPPARMOR_LDFLAGS}
+-- 
+2.47.1
+
diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix
index 04b5bac0d6d2..dacb1ceedac2 100644
--- a/pkgs/desktops/lomiri/development/trust-store/default.nix
+++ b/pkgs/desktops/lomiri/development/trust-store/default.nix
@@ -5,7 +5,9 @@
   fetchpatch,
   gitUpdater,
   testers,
-  boost,
+  # dbus-cpp not compatible with Boost 1.87
+  # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8
+  boost186,
   cmake,
   cmake-extras,
   dbus,
@@ -50,6 +52,10 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.com/ubports/development/core/trust-store/-/commit/569f6b35d8bcdb2ae5ff84549cd92cfc0899675b.patch";
       hash = "sha256-3lrdVIzscXGiLKwftC5oECICVv3sBoS4UedfRHx7uOs=";
     })
+
+    # Fix compatibility with glog 0.7.x
+    # Remove when https://gitlab.com/ubports/development/core/trust-store/-/merge_requests/18 merged & in release
+    ./1001-treewide-Switch-to-glog-CMake-module.patch
   ];
 
   postPatch =
@@ -79,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    boost
+    boost186
     cmake-extras
     dbus-cpp
     glog

From 3fe8be4b01b980e8b34ae9728b08fbc6c952035f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 20 Jan 2025 22:40:45 +0100
Subject: [PATCH 27/92] ariang: 1.3.8 -> 1.3.9

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

diff --git a/pkgs/by-name/ar/ariang/package.nix b/pkgs/by-name/ar/ariang/package.nix
index 7e892ed82abc..783b7e67f18d 100644
--- a/pkgs/by-name/ar/ariang/package.nix
+++ b/pkgs/by-name/ar/ariang/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "ariang";
-  version = "1.3.8";
+  version = "1.3.9";
 
   src = fetchFromGitHub {
     owner = "mayswind";
     repo = "AriaNg";
     rev = version;
-    hash = "sha256-B7gyBVryRn1SwUIqzxc1MYDS8l/mxMfJtE1/ZrBjC1E=";
+    hash = "sha256-c3+iyw8LgdB29552jJQr4q5P2ZW80jC0aN+eaenEYFo=";
   };
 
-  npmDepsHash = "sha256-DmACToIdXfAqiXe13vevWrpWDY1YgRWVaTfdlk5uhPg=";
+  npmDepsHash = "sha256-N7ZK6wthBYAt8tU8sJE0QChAYxWfJ1HG5P+AjXZfIiw=";
 
   makeCacheWritable = true;
 

From 9f8b11f183ee3fc028743aa3f36fcb7eee90093a Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 19 Jan 2025 12:21:41 +0100
Subject: [PATCH 28/92] adriconf: fix cross build

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

diff --git a/pkgs/by-name/ad/adriconf/package.nix b/pkgs/by-name/ad/adriconf/package.nix
index c0feb726ce03..b9c8e47e1f32 100644
--- a/pkgs/by-name/ad/adriconf/package.nix
+++ b/pkgs/by-name/ad/adriconf/package.nix
@@ -3,6 +3,8 @@
   lib,
   fetchFromGitLab,
   cmake,
+  gettext,
+  glib,
   pkg-config,
   libdrm,
   libGL,
@@ -28,6 +30,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
+    gettext # msgfmt
+    glib # glib-compile-resources
     pkg-config
   ];
   buildInputs = [
@@ -41,6 +45,7 @@ stdenv.mkDerivation rec {
     pciutils
   ];
 
+  # tries to download googletest
   cmakeFlags = [ "-DENABLE_UNIT_TESTS=off" ];
 
   postInstall = ''

From 69e5750c25210543d8a1c13d12b8be89e709d15d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Jan 2025 23:38:08 +0100
Subject: [PATCH 29/92] python312Packages.transformers: 4.48.0 -> 4.48.1

Diff: https://github.com/huggingface/transformers/compare/refs/tags/v4.48.0...v4.48.1

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

diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index edfd88f95388..7c0234ae049f 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -58,14 +58,14 @@
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "4.48.0";
+  version = "4.48.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "transformers";
     tag = "v${version}";
-    hash = "sha256-jh2bMmvTC0G0kLJl7xXpsvXvBmlbZEDA88AfosoE9sA=";
+    hash = "sha256-doYvjwajwXqqaKZ363p2SE//9eupfkwrG66j0iUAnU0=";
   };
 
   build-system = [ setuptools ];

From 0ffd9c8aca6c4c00c927af475bac087c71dd5e98 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 20 Jan 2025 22:51:31 +0000
Subject: [PATCH 30/92] slimserver: 9.0.0 -> 9.0.1

---
 pkgs/by-name/sl/slimserver/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix
index 76fa07ba5106..3beb20677690 100644
--- a/pkgs/by-name/sl/slimserver/package.nix
+++ b/pkgs/by-name/sl/slimserver/package.nix
@@ -33,13 +33,13 @@ let
 in
 perlPackages.buildPerlPackage rec {
   pname = "slimserver";
-  version = "9.0.0";
+  version = "9.0.1";
 
   src = fetchFromGitHub {
     owner = "LMS-Community";
     repo = "slimserver";
     rev = version;
-    hash = "sha256-Sd39J8YOywOOtVHxO3OPABULwRI5VGovS33tAj4TFkw=";
+    hash = "sha256-BIWTsF9SVGBkFaZF/QYFsgATglaORhnFT/2/qRe4emg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -51,6 +51,7 @@ perlPackages.buildPerlPackage rec {
       ArchiveZip
       AsyncUtil
       AudioScan
+      CarpAssert
       CarpClan
       CGI
       ClassAccessor

From 16b86f65d6cd901bed398a1f4bbce2eb03590fa6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Jan 2025 23:55:52 +0100
Subject: [PATCH 31/92] python313Packages.holidays: 0.64 -> 0.65

Diff: https://github.com/vacanza/python-holidays/compare/refs/tags/v0.64...v0.65

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

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 6bca170e3825..8223f8fbfb12 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.64";
+  version = "0.65";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "vacanza";
     repo = "python-holidays";
     tag = "v${version}";
-    hash = "sha256-rPQr7nyouBepTi4tW0+wrbROYyWo92KkZUI6ff5jl7I=";
+    hash = "sha256-ykfcIWTRwYntp0cgrtNdgOH9y8P4TxayFPKRbo+5cI8=";
   };
 
   build-system = [

From b97d6cca52609e8aaa4aaec88a273ec1c3b055f9 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Tue, 21 Jan 2025 13:36:26 +0800
Subject: [PATCH 32/92] v2ray-geoip.generator: 202501160051 -> 202501190004

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

diff --git a/pkgs/by-name/v2/v2ray-geoip/package.nix b/pkgs/by-name/v2/v2ray-geoip/package.nix
index 249fe0e26581..e7546a695694 100644
--- a/pkgs/by-name/v2/v2ray-geoip/package.nix
+++ b/pkgs/by-name/v2/v2ray-geoip/package.nix
@@ -3,21 +3,19 @@
   stdenvNoCC,
   fetchFromGitHub,
   pkgsBuildBuild,
-  jq,
-  moreutils,
   dbip-country-lite,
 }:
 
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-geoip";
-    version = "202501160051";
+    version = "202501190004";
 
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "geoip";
       tag = version;
-      hash = "sha256-WSi7xsjKqQT37lzkOY1WZwvx5RXNKO3aMwnMiMBwMdA=";
+      hash = "sha256-l5gz3w/80o2UwexzcJ1ALhQMcwqor9m/0RG3WOBeVAc=";
     };
 
     vendorHash = "sha256-nvJsifXF6u3eWqd9X0kGZxASEs/LX2dQraZAwgnw060=";
@@ -29,32 +27,20 @@ let
       maintainers = with lib.maintainers; [ nickcao ];
     };
   };
-  input = {
-    type = "maxmindMMDB";
-    action = "add";
-    args = {
-      uri = dbip-country-lite.mmdb;
-    };
-  };
 in
 
 stdenvNoCC.mkDerivation {
   inherit (generator) pname src;
   inherit (dbip-country-lite) version;
 
-  nativeBuildInputs = [
-    jq
-    moreutils
-  ];
-
-  postPatch = ''
-    jq '.input[0] |= ${builtins.toJSON input}' config.json | sponge config.json
-  '';
+  nativeBuildInputs = [ generator ];
 
   buildPhase = ''
     runHook preBuild
 
-    ${generator}/bin/geoip
+    mkdir -p db-ip
+    ln -s ${dbip-country-lite.mmdb} ./db-ip/dbip-country-lite.mmdb
+    geoip
 
     runHook postBuild
   '';

From 8f7478bae6ee06383f1422627971b0684a5a4c71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 06:33:36 +0000
Subject: [PATCH 33/92] hexpatch: 1.9.4 -> 1.9.5

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

diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix
index 973d44fa9364..01e90074a928 100644
--- a/pkgs/by-name/he/hexpatch/package.nix
+++ b/pkgs/by-name/he/hexpatch/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hexpatch";
-  version = "1.9.4";
+  version = "1.9.5";
 
   src = fetchFromGitHub {
     owner = "Etto48";
     repo = "HexPatch";
     tag = "v${version}";
-    hash = "sha256-tVJp8ZFHaHM6Yhty0n5W4ZDKG/L5+8ZcbbTnw2yLEOI=";
+    hash = "sha256-DRuknqj4E+G4ChN5CH5N4Zrl3btSo1HdqiRPfLC5YTE=";
   };
 
-  cargoHash = "sha256-oKZjLS4+blGMt3K6in4i7JLqKZ8uWAv/uBFU9VT0Ha8=";
+  cargoHash = "sha256-5yZ+eJUjUUNCmJtFYRSzvdjZ7tnyjCO+lgwdDHluSGg=";
 
   nativeBuildInputs = [
     cmake

From 01c763ae9faa6e34566bbb084c1a82267cb3a9e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 06:52:35 +0000
Subject: [PATCH 34/92] opencsg: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index b4b2c5a66c98..3a73ea8c7850 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/pkgs/development/libraries/opencsg/default.nix
@@ -15,11 +15,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.0";
+  version = "1.7.0";
   pname = "opencsg";
   src = fetchurl {
     url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
-    hash = "sha256-v4+4Dj4M4R2H3XjdFaDehy27iXLYf1+Jz/xGHvrUe+g=";
+    hash = "sha256-uJLezIGp5nwsTSXFOZ1XbY93w7DAUmBgZ0MkPIZTnfg=";
   };
 
   nativeBuildInputs = [ qmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

From 447e4a8208b0f3b7e469ce5535d07d77d02d3144 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Jan 2025 08:05:24 +0100
Subject: [PATCH 35/92] python313Packages.publicsuffixlist: 1.0.2.20250117 ->
 1.0.2.20250121

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250121-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index fa097d9cc7d0..a5445bf385ec 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250117";
+  version = "1.0.2.20250121";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7jkUrZDmx9umNrUlzzXDdJWsDtfHKg/u8dfDNtVgiCU=";
+    hash = "sha256-LVbIYZ0rkGmZKbtnenZF5elK9wnr3A+b24NZXX3pxUM=";
   };
 
   build-system = [ setuptools ];

From 9b27ce5f25ab1f225a9b11a3131c3def36322f6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 07:15:36 +0000
Subject: [PATCH 36/92] k3sup: 0.13.7 -> 0.13.8

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

diff --git a/pkgs/by-name/k3/k3sup/package.nix b/pkgs/by-name/k3/k3sup/package.nix
index a8d309c1316b..10b52e5699d8 100644
--- a/pkgs/by-name/k3/k3sup/package.nix
+++ b/pkgs/by-name/k3/k3sup/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "k3sup";
-  version = "0.13.7";
+  version = "0.13.8";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "k3sup";
     rev = version;
-    sha256 = "sha256-B9Mo0+dqF15LuhCytMBax2gKjHl9mBkxLXCdb9f0Big=";
+    sha256 = "sha256-WmvCmG/wk63VnfJTFk3HhiaLzCe9O6kdUc7GpYNAwP4=";
   };
 
   nativeBuildInputs = [ makeWrapper installShellFiles ];

From 6247a81142724bcbb1da22f48ab2f3e689c51d44 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 21 Jan 2025 17:53:00 +1000
Subject: [PATCH 37/92] hexpatch: fix updateScript typo

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

diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix
index 01e90074a928..867cdce43851 100644
--- a/pkgs/by-name/he/hexpatch/package.nix
+++ b/pkgs/by-name/he/hexpatch/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
   doInstallCheck = true;
 
   passthru = {
-    upateScript = nix-update-script { };
+    updateScript = nix-update-script { };
   };
 
   meta = {

From c7ca6dccbfc108681d9bd15b641e32f27fd3ea57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 08:05:31 +0000
Subject: [PATCH 38/92] pgbackrest: 2.54.1 -> 2.54.2

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

diff --git a/pkgs/by-name/pg/pgbackrest/package.nix b/pkgs/by-name/pg/pgbackrest/package.nix
index 8ea691c0d4e3..e970fd79605c 100644
--- a/pkgs/by-name/pg/pgbackrest/package.nix
+++ b/pkgs/by-name/pg/pgbackrest/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgbackrest";
-  version = "2.54.1";
+  version = "2.54.2";
 
   src = fetchFromGitHub {
     owner = "pgbackrest";
     repo = "pgbackrest";
     rev = "release/${version}";
-    sha256 = "sha256-kzFTWKzBQ0Jfew8oV+iaNAEx4lQncySyAI2VAgNu42s=";
+    sha256 = "sha256-Q0WZLbtn+qJLs2jop5S92NFC6QBtCQnU3AEEcm6MSVI=";
   };
 
   strictDeps = true;

From 055f56037e6ed70bbbfe9a2be8c107deac0cc69f Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Tue, 21 Jan 2025 08:25:01 +0000
Subject: [PATCH 39/92] snapcast: 0.29.0 -> 0.30.0

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

diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 883ea94bf29c..f6cbf58d8954 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -20,17 +20,18 @@
   pulseaudioSupport ? false,
   libpulseaudio,
   nixosTests,
+  openssl,
 }:
 
 stdenv.mkDerivation rec {
   pname = "snapcast";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "badaix";
     repo = "snapcast";
     rev = "v${version}";
-    hash = "sha256-FWOGBXYWLHHZhvC5/BpkDd70ZupzALZ3ks3qTcrtwKQ=";
+    hash = "sha256-EJgpZz4PnXfge0rkVH1F7cah+i9AvDJVSUVqL7qChDM=";
   };
 
   nativeBuildInputs = [
@@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
       aixlog
       popl
       soxr
+      openssl
     ]
     ++ lib.optional pulseaudioSupport libpulseaudio
     ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib

From 5494017858d1b6607cc5e6aba4cfe2f8d80602bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 08:51:35 +0000
Subject: [PATCH 40/92] buildkite-agent-metrics: 5.9.12 -> 5.9.13

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

diff --git a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
index 5cb7b706f034..5cc2d5900e33 100644
--- a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
+++ b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
@@ -5,7 +5,7 @@
 }:
 buildGoModule rec {
   pname = "buildkite-agent-metrics";
-  version = "5.9.12";
+  version = "5.9.13";
 
   outputs = [
     "out"
@@ -16,10 +16,10 @@ buildGoModule rec {
     owner = "buildkite";
     repo = "buildkite-agent-metrics";
     rev = "v${version}";
-    hash = "sha256-5k7njo8J96hb/RUdIRcP4KfwEH5Z2S4AyDyazcFlN0s=";
+    hash = "sha256-AVFQ3GP4YDQ6d9NSeol3Eobxzmoa9bRyCAKTsDbyZyQ=";
   };
 
-  vendorHash = "sha256-zb+z1neus1mnJWeuI5DSc73cXMGWme0mz/PU2Z/Zam8=";
+  vendorHash = "sha256-RQmxYxTcQn5VEy8Z96EtArYBnODmde1RlV4CA6fhbZA=";
 
   postInstall = ''
     mkdir -p $lambda/bin

From 759e251c47492902ae901d269882469441f5facd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 09:35:38 +0000
Subject: [PATCH 41/92] google-cloud-sql-proxy: 2.14.2 -> 2.14.3

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

diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
index f328adc613ee..a7587da21256 100644
--- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
+++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "google-cloud-sql-proxy";
-  version = "2.14.2";
+  version = "2.14.3";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "cloud-sql-proxy";
     rev = "v${version}";
-    hash = "sha256-jnecQkfZzg7psWOamJTpUnxjkW0tJkuGw06GGBNbub0=";
+    hash = "sha256-zY4V5QNoesvwJxW9htTkmMk6KPCxKvLg1FVn+xmlw14=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-7jMDSW32MoHCN51yqLliUBfcjsE5l0mPvGXair5KLxA=";
+  vendorHash = "sha256-ZwCe8gJ1Sowvt0X+inFoiYpJjhl/sdQUqrkXte2gV2I=";
 
   checkFlags = [
     "-short"

From d65b84dce2dfcd530970392cf63afa35e8264a40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 10:15:21 +0000
Subject: [PATCH 42/92] cargo-bundle-licenses: 2.1.1 -> 2.3.0

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

diff --git a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
index 4772ed1ad744..af8b90d28827 100644
--- a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-bundle-licenses";
-  version = "2.1.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = "cargo-bundle-licenses";
     rev = "v${version}";
-    hash = "sha256-oyb5uWIKXhPSMpb1t6C/IYKK8FMSANIQXs2XdJ/bD2A=";
+    hash = "sha256-Rw5uwfUPTkIbiOQDohBRoAm0momljJRSYP+VmEOOw/k=";
   };
 
-  cargoHash = "sha256-HxFRHgb0nBF6YGaiynv95fNwej70IAwP4jhVcGvdFok=";
+  cargoHash = "sha256-SfTt49J6D7RESo6iO3b/l0+Vu1dEW+PG0M2RIko2OJ4=";
 
   meta = with lib; {
     description = "Generate a THIRDPARTY file with all licenses in a cargo project";

From abe4f2b275fd0e4857d57d237ebd6c1d133529f0 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Mon, 20 Jan 2025 12:45:14 +0100
Subject: [PATCH 43/92] eb-garamond: fetch from GitHub

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

diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix
index cbe42f1d132c..3191c17d8a7a 100644
--- a/pkgs/by-name/eb/eb-garamond/package.nix
+++ b/pkgs/by-name/eb/eb-garamond/package.nix
@@ -1,16 +1,17 @@
 {
   lib,
   stdenvNoCC,
-  fetchzip,
+  fetchFromGitHub,
 }:
-
 stdenvNoCC.mkDerivation rec {
   pname = "eb-garamond";
   version = "0.016";
 
-  src = fetchzip {
-    url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip";
-    hash = "sha256-P2VCLcqcMBBoTDJyRLP9vlHI+jE0EqPjPziN2MJbgEg=";
+  src = fetchFromGitHub {
+    owner = "georgd";
+    repo = "EB-Garamond";
+    tag = "v${version}";
+    hash = "sha256-ajieKhTeH6yv2qiE2xqnHFoMS65//4ZKiccAlC2PXGQ=";
   };
 
   installPhase = ''

From a057246e1b16344fe8839a5cd01fdb2413ec80d7 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Mon, 20 Jan 2025 12:46:41 +0100
Subject: [PATCH 44/92] eb-garamond: build from source

---
 pkgs/by-name/eb/eb-garamond/package.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix
index 3191c17d8a7a..db37e621786d 100644
--- a/pkgs/by-name/eb/eb-garamond/package.nix
+++ b/pkgs/by-name/eb/eb-garamond/package.nix
@@ -2,6 +2,8 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  python3,
+  ttfautohint,
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "eb-garamond";
@@ -14,6 +16,22 @@ stdenvNoCC.mkDerivation rec {
     hash = "sha256-ajieKhTeH6yv2qiE2xqnHFoMS65//4ZKiccAlC2PXGQ=";
   };
 
+  nativeBuildInputs = [
+    (python3.withPackages (p: [ p.fontforge ]))
+    ttfautohint
+  ];
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail "@\$(SFNTTOOL) -w \$< \$@"   "@fontforge -lang=ff -c 'Open(\$\$1); Generate(\$\$2)' \$< \$@"
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    make WEB=build EOT="" all
+    runHook postBuild
+  '';
+
   installPhase = ''
     runHook preInstall
 

From e0fc4bfe87c3e471c1823b1a6a12b1dca0081da5 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Mon, 20 Jan 2025 12:47:39 +0100
Subject: [PATCH 45/92] eb-garamond: install TTF, OTF, WOFF

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

diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix
index db37e621786d..ee7791129240 100644
--- a/pkgs/by-name/eb/eb-garamond/package.nix
+++ b/pkgs/by-name/eb/eb-garamond/package.nix
@@ -35,7 +35,10 @@ stdenvNoCC.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm644 otf/*.otf                                 -t $out/share/fonts/opentype
+    install -Dm644 build/*.ttf  -t $out/share/fonts/truetype
+    install -Dm644 build/*.otf  -t $out/share/fonts/opentype
+    install -Dm644 build/*.woff -t $out/share/fonts/woff
+
     install -Dm644 Changes README.markdown README.xelualatex -t $out/share/doc/${pname}-${version}
 
     runHook postInstall

From a4d19e7929345afed2383d3dfdfaf0e2433e0b83 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Tue, 21 Jan 2025 11:35:02 +0100
Subject: [PATCH 46/92] eb-garamond: remove metadata

---
 pkgs/by-name/eb/eb-garamond/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix
index ee7791129240..ef42a95fd906 100644
--- a/pkgs/by-name/eb/eb-garamond/package.nix
+++ b/pkgs/by-name/eb/eb-garamond/package.nix
@@ -39,8 +39,6 @@ stdenvNoCC.mkDerivation rec {
     install -Dm644 build/*.otf  -t $out/share/fonts/opentype
     install -Dm644 build/*.woff -t $out/share/fonts/woff
 
-    install -Dm644 Changes README.markdown README.xelualatex -t $out/share/doc/${pname}-${version}
-
     runHook postInstall
   '';
 

From 090216c3ceb09cee67e010e368a5f84167346449 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 10:42:47 +0000
Subject: [PATCH 47/92] cargo-shuttle: 0.50.0 -> 0.51.0

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

diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix
index 6efee85320f0..5549e4789623 100644
--- a/pkgs/by-name/ca/cargo-shuttle/package.nix
+++ b/pkgs/by-name/ca/cargo-shuttle/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-shuttle";
-  version = "0.50.0";
+  version = "0.51.0";
 
   src = fetchFromGitHub {
     owner = "shuttle-hq";
     repo = "shuttle";
     rev = "v${version}";
-    hash = "sha256-D3o4GdGD/lP4bchjpyj684G1CDWMhnZHke131GAI1es=";
+    hash = "sha256-oKFL/tnMsXz/qic65DgLmnmeyBsrklacs+XeVM6RGSs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-hlYcDQi4wv43UBYSvnWUMunAKVCFVFA7hvxjaeGA2pA=";
+  cargoHash = "sha256-ocTkpIqXTf8k+onUroaCt/jMnslctzCt7g9wNtkI82g=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 4e4024278008e34a199971116d33d7c2a2512b60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 10:57:55 +0000
Subject: [PATCH 48/92] docker-compose: 2.32.2 -> 2.32.4

---
 pkgs/applications/virtualization/docker/compose.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index 4ac22ade4ac5..d4de0ce91e40 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "docker-compose";
-  version = "2.32.2";
+  version = "2.32.4";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "compose";
     rev = "v${version}";
-    hash = "sha256-i4wpM7Rc4pFUUzPFvoPxUlifIvk4GJzBhCLpUndFnjE=";
+    hash = "sha256-t2XW75PuoZAZ0Nw2CMnP73BwJSpt5BtzGJLAM5zqbrI=";
   };
 
   postPatch = ''

From 798ac7eabefe7f50312826c5a9830ec55738a1d4 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Tue, 21 Jan 2025 12:15:44 +0100
Subject: [PATCH 49/92] maintainer-list: add bengsparks

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 87d1588e276f..0faae1cc82ab 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2792,6 +2792,12 @@
     githubId = 29384538;
     keys = [ { fingerprint = "D35E C9CE E631 638F F1D8  B401 6F0E 410D C3EE D02"; } ];
   };
+  bengsparks = {
+    email = "benjamin.sparks@protonmail.com";
+    github = "bengsparks";
+    githubId = 4313548;
+    name = "Ben Sparks";
+  };
   benhiemer = {
     name = "Benedikt Hiemer";
     email = "ben.email@posteo.de";

From e031d66483bb18e39ccd353a0c2160cec9028d02 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Tue, 21 Jan 2025 12:16:21 +0100
Subject: [PATCH 50/92] eb-garamond: add bengsparks as maintainer

---
 pkgs/by-name/eb/eb-garamond/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix
index ef42a95fd906..e2417fd380b7 100644
--- a/pkgs/by-name/eb/eb-garamond/package.nix
+++ b/pkgs/by-name/eb/eb-garamond/package.nix
@@ -46,6 +46,7 @@ stdenvNoCC.mkDerivation rec {
     homepage = "http://www.georgduffner.at/ebgaramond/";
     description = "Digitization of the Garamond shown on the Egenolff-Berner specimen";
     maintainers = with maintainers; [
+      bengsparks
       relrod
       rycee
     ];

From 48c4fe84da4c5a1667034d49c1572a7de739969e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 12:18:32 +0000
Subject: [PATCH 51/92] tandoor-recipes: 1.5.27 -> 1.5.29

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

diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix
index 4c9f11357220..c5bf8b55ae05 100644
--- a/pkgs/applications/misc/tandoor-recipes/common.nix
+++ b/pkgs/applications/misc/tandoor-recipes/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "1.5.27";
+  version = "1.5.29";
 
   src = fetchFromGitHub {
     owner = "TandoorRecipes";
     repo = "recipes";
     rev = version;
-    hash = "sha256-HP4gVk127hvvL337Cb4Wbvvf55RWY7u5RF/FKDCottw=";
+    hash = "sha256-NfU071BLZ/NtpbZe475oNl8LGiVzVix9iekEoCGtcdk=";
   };
 
   yarnHash = "sha256-lU8QrTkI32XOHefIkj/0fa2UKhuZpQIT1wyweQnzXmQ=";

From fa9f4a460b10dc0403c95404da12dc3d7ddb9dab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 12:32:45 +0000
Subject: [PATCH 52/92] stevenblack-blocklist: 3.15.8 -> 3.15.10

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

diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 4935527ae2fb..b4e5a6a34a06 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.15.8";
+  version = "3.15.10";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-WdqYgQB4MN1H3SH/Wn8yJIDXJToAcy49D3Rqd8/zj64=";
+    hash = "sha256-f5SH4qQzRWYKwIjpzOuhI9mPwlyNcBWjr2mrCKLgml4=";
   };
 
   outputs = [

From e75833afea406762670b7c516355118887cb5f6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 12:32:56 +0000
Subject: [PATCH 53/92] auth0-cli: 1.7.2 -> 1.8.0

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

diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix
index 63901fb56f16..d6de78598232 100644
--- a/pkgs/by-name/au/auth0-cli/package.nix
+++ b/pkgs/by-name/au/auth0-cli/package.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "auth0-cli";
-  version = "1.7.2";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "auth0";
     repo = "auth0-cli";
     tag = "v${version}";
-    hash = "sha256-9/Jjsg6E8+gkN5eGZsxmTBwVoD/eO7euidY6ds7skpA=";
+    hash = "sha256-D982lmu44JFrxGcn0G1BssGkE3juUoB6qbCHWCTg9kw=";
   };
 
-  vendorHash = "sha256-XXCmIASYQD21h1h8HOcAl8HK5QUvgfqRpauq93tUNZ8=";
+  vendorHash = "sha256-OEHJTMcoaB4BZ06GjXIFPbCyoMGeumjTzWWFmgqLML8=";
 
   ldflags = [
     "-s"

From 97c984caabcb445d8d68aa8074c63138c793fbde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 12:55:50 +0000
Subject: [PATCH 54/92] buildkite-cli: 3.4.2 -> 3.5.0

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

diff --git a/pkgs/by-name/bu/buildkite-cli/package.nix b/pkgs/by-name/bu/buildkite-cli/package.nix
index 623c7b8ca3a3..2da51b839515 100644
--- a/pkgs/by-name/bu/buildkite-cli/package.nix
+++ b/pkgs/by-name/bu/buildkite-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "buildkite-cli";
-  version = "3.4.2";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-Tb9Hyhyf+ib/tLUHc+gUccZ7TuXltxxjaIpCfvnoVkA=";
+    sha256 = "sha256-UKpvqjHnkDv6HDpDmXe3ZoFSMGmPE/KLc7TuJKjNJXw=";
   };
 
-  vendorHash = "sha256-1QXcRykXoNGYCR8+6ut1eU8TVNtx8b2O2MIjmL8rfQk=";
+  vendorHash = "sha256-FV35NCwntmIWakcNH9nu1MTwZArERCc8hN57PmunkX4=";
 
   doCheck = false;
 

From 2b34dfda6f537689feaf6b754913e2d28ce85c32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 13:05:41 +0000
Subject: [PATCH 55/92] ejsonkms: 0.2.3 -> 0.2.4

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

diff --git a/pkgs/by-name/ej/ejsonkms/package.nix b/pkgs/by-name/ej/ejsonkms/package.nix
index 742280b397d3..5a2f549fc85d 100644
--- a/pkgs/by-name/ej/ejsonkms/package.nix
+++ b/pkgs/by-name/ej/ejsonkms/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "ejsonkms";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "envato";
     repo = "ejsonkms";
     rev = "v${version}";
-    hash = "sha256-GrereV1IFRTaQEK+wjRHnXSydaKQgQeuxYgSAxEuok0=";
+    hash = "sha256-kk/+EOZ1g6SiIajcKXf6lVnll/NRWgwbFO2j07HERBI=";
   };
 
-  vendorHash = "sha256-bfR2jz4M5C60Nket9UW2C9GTK8jkbm6FZUar+wwDnbc=";
+  vendorHash = "sha256-ZSoxG532eicpR1pS2oLYnJxtJrsHZZRbjncxU4uyT3c=";
 
   ldflags = [
     "-X main.version=v${version}"

From d97a284605101d60f6d6fed6c5e6a0340401c0cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 13:14:04 +0000
Subject: [PATCH 56/92] comrak: 0.33.0 -> 0.34.0

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

diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index 1da4f0558eb7..ab9607d63f49 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "comrak";
-  version = "0.33.0";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "kivikakk";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-VN8f5r25kfUqekt9q28oMmkzQUE+Ko8DYhRZjpbbDfM=";
+    sha256 = "sha256-8LBMyCmt4HTYgprChfPSFZm6uQ7yFmJ0+srAUz785MA=";
   };
 
-  cargoHash = "sha256-Hdjit5dpZXT7ENamUX0ygTy+XAyCkcqq94wAJUPd8DY=";
+  cargoHash = "sha256-Z2LNFlHWS3IdjXlwdIizkjNFaPqTbMf0i6Y6jigKCzg=";
 
   meta = with lib; {
     description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";

From 576348a910ab4ded8b8bd2c4ad04b3426908b8f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 13:17:15 +0000
Subject: [PATCH 57/92] grpc-gateway: 2.25.1 -> 2.26.0

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

diff --git a/pkgs/by-name/gr/grpc-gateway/package.nix b/pkgs/by-name/gr/grpc-gateway/package.nix
index 76fc41ba4dfb..8ab944c898fd 100644
--- a/pkgs/by-name/gr/grpc-gateway/package.nix
+++ b/pkgs/by-name/gr/grpc-gateway/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "grpc-gateway";
-  version = "2.25.1";
+  version = "2.26.0";
 
   src = fetchFromGitHub {
     owner = "grpc-ecosystem";
     repo = "grpc-gateway";
     tag = "v${version}";
-    sha256 = "sha256-1bNYTzfBSwEEi5tjDjUI9i+0Xh+T0SQNE+8GgDwexx0=";
+    sha256 = "sha256-Vg47U57gHau7t5a1TEQuTKRUtn90gbrTETO+ngd8Bzc=";
   };
 
-  vendorHash = "sha256-zWWJxvwOZTAk5f6AMrhCBo3n5/Np6hucx6AM+Ucq6ec=";
+  vendorHash = "sha256-8YxAPvTP9o7ns4Gjs1WdqFColyZg7LoYolGQmNdCvTs=";
 
   ldflags = [
     "-X=main.version=${version}"

From 73b1346ee412b4a9060052b488bf0725fa804a64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 13:20:43 +0000
Subject: [PATCH 58/92] httm: 0.44.1 -> 0.45.0

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

diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix
index 9408ce23a64c..5125b66b1b69 100644
--- a/pkgs/by-name/ht/httm/package.nix
+++ b/pkgs/by-name/ht/httm/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.44.1";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = pname;
     rev = version;
-    hash = "sha256-vf5wIXYMBB7I6enmCYByoAE+2MWA/iUoq3UY86yRsEU=";
+    hash = "sha256-g+UUiFgOTuSNymg3OcIsoTqWA/OOZzwFCUQ7YxW1AzE=";
   };
 
-  cargoHash = "sha256-o9Ctt5a96vBhh0eB0z9N9qR3txVWdeq2qH9dYaxqtoA=";
+  cargoHash = "sha256-+ygXGSnhs9N7oHGqVA7Bo3JIgR8TZpY9y4tkBd4vZy8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 7117ad61a29c9e3ef8b83bfdf3d4d74d55c880e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 13:38:55 +0000
Subject: [PATCH 59/92] python312Packages.sagemaker: 2.237.2 -> 2.237.3

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

diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 774e4e5b4a40..0be0d88a2b27 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -40,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.237.2";
+  version = "2.237.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-python-sdk";
     tag = "v${version}";
-    hash = "sha256-cNBPuXoViHy03ZMBrF3+xeMSUpovi1lloXizBvgNJmw=";
+    hash = "sha256-eQ+5WFEobJUHdIK317A94/ro2H1xU738j3b7Z6iddlk=";
   };
 
   build-system = [

From 05693aeb4436856a6dd6ed581cbd1d1441b13e2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 14:12:20 +0000
Subject: [PATCH 60/92] sketchybar-app-font: 2.0.29 -> 2.0.30

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

diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix
index 299e84863efa..7d4e6df724cc 100644
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sketchybar-app-font";
-  version = "2.0.29";
+  version = "2.0.30";
 
   src = fetchFromGitHub {
     owner = "kvndrsslr";
     repo = "sketchybar-app-font";
-    rev = "v2.0.29";
-    hash = "sha256-8SWN22pjHnXWM+RUEYNux0ZWhRUVMib3M7r2SlI33tQ=";
+    rev = "v2.0.30";
+    hash = "sha256-Kx7Uazrmyn7yQedqnY1YJXSY2QFe0nCEIFLFUZwS9Tk=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {

From ea4b9186ed6e766d37e15d93c525436f46c74bbd Mon Sep 17 00:00:00 2001
From: Marcus Ramberg <marcus@means.no>
Date: Tue, 21 Jan 2025 13:26:50 +0100
Subject: [PATCH 61/92] tart: 2.20.2 -> 2.24.0

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

diff --git a/pkgs/by-name/ta/tart/package.nix b/pkgs/by-name/ta/tart/package.nix
index 297aece524ad..2d0fc60ad3ab 100644
--- a/pkgs/by-name/ta/tart/package.nix
+++ b/pkgs/by-name/ta/tart/package.nix
@@ -12,11 +12,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tart";
-  version = "2.20.2";
+  version = "2.24.0";
 
   src = fetchurl {
-    url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz";
-    hash = "sha256-caHuBTRpbmFbmTlDRnxZyGM6F95iKjMhKbPTez5Hecc=";
+    url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz";
+    hash = "sha256-5GBn5jWT3d/PidVvmWgfxGTuk72an6WbtRtR/5XHOzk=";
   };
   sourceRoot = ".";
 
@@ -46,7 +46,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       aduh95
     ];
     mainProgram = finalAttrs.pname;
-    platforms = [ "aarch64-darwin" ];
+    platforms = [
+      "aarch64-darwin"
+      "x86_64-darwin"
+    ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
   };
 })

From 55666c2904decb0ef5d3d9659b234e00226625c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 14:35:52 +0000
Subject: [PATCH 62/92] moar: 1.31.0 -> 1.31.2

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

diff --git a/pkgs/by-name/mo/moar/package.nix b/pkgs/by-name/mo/moar/package.nix
index 150e81956eee..23a186e320cd 100644
--- a/pkgs/by-name/mo/moar/package.nix
+++ b/pkgs/by-name/mo/moar/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "moar";
-  version = "1.31.0";
+  version = "1.31.2";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-0HDFK2wPQtwIAVup/pVSjrdt1zpbfLV08HxeVPWC8dE=";
+    hash = "sha256-0B3XouAxQ6b9cWoov+Ofhlt+zgGh6AP1gy46LoiumoE=";
   };
 
   vendorHash = "sha256-J9u7LxzXk4npRyymmMKyN2ZTmhT4WwKjy0X5ITcHtoE=";

From 7e8ac6bf0ea227db1afa8a168f85e5f622501d04 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 19 Jan 2025 12:21:41 +0100
Subject: [PATCH 63/92] shadps4: 0.5.0-unstable-2025-01-02 ->
 0.5.0-unstable-2025-01-20

Required for Boost 1.87.
---
 pkgs/by-name/sh/shadps4/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index 6c5fc826bcfc..bfbd2c60744b 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shadps4";
-  version = "0.5.0-unstable-2025-01-02";
+  version = "0.5.0-unstable-2025-01-20";
 
   src = fetchFromGitHub {
     owner = "shadps4-emu";
     repo = "shadPS4";
-    rev = "596f4cdf0e66a97c9d2d4272091d8c0167a5b8e1";
-    hash = "sha256-apwAl8TCzSKchqYGHV0UsMSGErF4GgiwhlwmOPWpeLs=";
+    rev = "95a30b2b3e1aa4e20c3db632955cc67bbded0fb1";
+    hash = "sha256-52BhGKSUv+9asACNkppxiNm3Gja7r3LcXOIwhQR5ALs=";
     fetchSubmodules = true;
   };
 

From 2b78ec3bd144901a2f5058ebd69755e6635ec13e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 15:28:25 +0000
Subject: [PATCH 64/92] whoogle-search: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/by-name/wh/whoogle-search/package.nix b/pkgs/by-name/wh/whoogle-search/package.nix
index 7f1ceb8bd801..d298a63a33e8 100644
--- a/pkgs/by-name/wh/whoogle-search/package.nix
+++ b/pkgs/by-name/wh/whoogle-search/package.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "whoogle-search";
-  version = "0.9.1";
+  version = "0.9.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "whoogle_search";
     inherit version;
-    hash = "sha256-4i/p18tu5q4yRBKQHRAyXaxYcPORbU9KyIzF2yW9VCk=";
+    hash = "sha256-Vp59n8o6hq4q15nuQguLGvQhYWrXpR6ZjDnaBCV4I4M=";
   };
 
   build-system = with python3Packages; [ setuptools ];

From 7c445692c1457aa1cfaec41bd1744abf66c4e5b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 15:30:50 +0000
Subject: [PATCH 65/92] ktor-cli: 0.3.1 -> 0.4.0

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

diff --git a/pkgs/by-name/kt/ktor-cli/package.nix b/pkgs/by-name/kt/ktor-cli/package.nix
index ace71efab245..c96adf551c97 100644
--- a/pkgs/by-name/kt/ktor-cli/package.nix
+++ b/pkgs/by-name/kt/ktor-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "ktor-cli";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "ktorio";
     repo = "ktor-cli";
     tag = version;
-    hash = "sha256-UOO6hoUZazlrP+OJ6WCdY358wnRnAiQHEXrOpN7ZIvU=";
+    hash = "sha256-TGwkGm1Rsg82f6FJeTnhyvfS2MRMe5+DTdxTsOwwb1Q=";
   };
 
   subPackages = "cmd/ktor";

From 840e3bca13590ac654309724fced392f0bc17536 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 15:55:24 +0000
Subject: [PATCH 66/92] litmusctl: 1.13.0 -> 1.14.0

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

diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix
index 7991cc130c41..4cbb41fec40d 100644
--- a/pkgs/by-name/li/litmusctl/package.nix
+++ b/pkgs/by-name/li/litmusctl/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule rec {
   pname = "litmusctl";
-  version = "1.13.0";
+  version = "1.14.0";
 
   nativeBuildInputs = [
     installShellFiles
@@ -22,7 +22,7 @@ buildGoModule rec {
     owner = "litmuschaos";
     repo = "litmusctl";
     rev = "${version}";
-    hash = "sha256-lPdejdnBefhYgv52I7BOm1VTgqHSp8u1lgJJxK5GWSA=";
+    hash = "sha256-Saj5sx5YkcKsnMrnIzPcLok+mgEZSh9p8rnfQbJhAeU=";
   };
 
   vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0=";

From e85f73a7a9a237e69774b4939a9b1393c6b95a73 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Tue, 21 Jan 2025 17:56:22 +0200
Subject: [PATCH 67/92] swiftformat: 0.55.4 -> 0.55.5

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

diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix
index fa4c303ae66a..da95f8af7998 100644
--- a/pkgs/by-name/sw/swiftformat/package.nix
+++ b/pkgs/by-name/sw/swiftformat/package.nix
@@ -12,13 +12,13 @@
 
 swift.stdenv.mkDerivation rec {
   pname = "swiftformat";
-  version = "0.55.4";
+  version = "0.55.5";
 
   src = fetchFromGitHub {
     owner = "nicklockwood";
     repo = "SwiftFormat";
     rev = version;
-    sha256 = "sha256-0Dk2SgfPozgbdhyQa74NZkd/kA6JleSfpHDn4NuQdEo=";
+    sha256 = "sha256-AZAQSwmGNHN6ykh9ufeQLC1dEXvTt32X24MPTDh6bI8=";
   };
 
   nativeBuildInputs = [

From c08bacb620bd828b1736ff872bd3bf2a4fcc2bf9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 16:08:23 +0000
Subject: [PATCH 68/92] prometheus-artifactory-exporter: 1.14.0 -> 1.15.0

---
 pkgs/servers/monitoring/prometheus/artifactory-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
index a36851d7b28c..869298901b4f 100644
--- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
@@ -7,14 +7,14 @@
 
 buildGoModule rec {
   pname = "artifactory_exporter";
-  version = "1.14.0";
+  version = "1.15.0";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     owner = "peimanja";
     repo = pname;
     rev = rev;
-    hash = "sha256-+CCUSI7Rh9fENzsg7rpI01Cm++kafd1nGgpyFRt20Ug=";
+    hash = "sha256-5aE+ga8tK7EpkcH1exmIdROCnZ49Fz/GGkk993uYcGY=";
   };
 
   vendorHash = "sha256-CQ7JvXcutj63UzaYk/jbmd9G2whN48Xv1PCllaI9Nuo=";

From 5b70b7bb2599f39717bbe812e7743c0186cead89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 16:13:10 +0000
Subject: [PATCH 69/92] prometheus-sql-exporter: 0.5.8 -> 0.5.9

---
 pkgs/servers/monitoring/prometheus/sql-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
index 6826e16145c4..83423fef422c 100644
--- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "sql_exporter";
-  version = "0.5.8";
+  version = "0.5.9";
 
   src = fetchFromGitHub {
     owner = "justwatchcom";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Uf5Itclc43E8tsgS8rR8F2Dq9gNVIagoB5KfEqqd7MI=";
+    sha256 = "sha256-KygxnNbElzRtVwjKmlbgdCxO3oEYssfFl5UAk5+F50c=";
   };
 
   vendorHash = null;

From f0915ee880d4acf6541dc1d364825d21205659f2 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 21 Jan 2025 16:35:39 +0100
Subject: [PATCH 70/92] libfakekey: fix cross build

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

diff --git a/pkgs/by-name/li/libfakekey/package.nix b/pkgs/by-name/li/libfakekey/package.nix
index 9a90ea45bd87..2d01260e8f66 100644
--- a/pkgs/by-name/li/libfakekey/package.nix
+++ b/pkgs/by-name/li/libfakekey/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-QNJlxZ9uNwNgFWm9qRJdPfusx7dXHZajjFH7wDhpgcs=";
   };
 
-  preConfigure = "./autogen.sh";
+  configureScript = "./autogen.sh";
 
   nativeBuildInputs = [
     automake

From c638f36f8f7ce34f2d6a216266eba556fe50aa90 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Tue, 21 Jan 2025 17:18:33 +0100
Subject: [PATCH 71/92] gcl: mark broken

---
 pkgs/development/compilers/gcl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 600056072631..ba8c3023894d 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -61,5 +61,6 @@ stdenv.mkDerivation rec {
     maintainers = lib.teams.lisp.members;
     license = licenses.gpl2;
     platforms = platforms.linux;
+    broken = true; # 2025-01-21; to check after 2.7.0 is tagged
   };
 }

From 36e0294a00307044ea28a99a21e730f4baf279a1 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Tue, 21 Jan 2025 18:20:39 +0200
Subject: [PATCH 72/92] maintainers: update DimitarNestorov

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index be08ed0097e9..e926076bf285 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5821,6 +5821,8 @@
   };
   DimitarNestorov = {
     name = "Dimitar Nestorov";
+    email = "nix@dimitarnestorov.com";
+    matrix = "@dimitarnestorov:matrix.org";
     github = "DimitarNestorov";
     githubId = 8790386;
   };

From 22d1c18041429015691ee6e04b78db9fccab610e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 16:23:11 +0000
Subject: [PATCH 73/92] pulumictl: 0.0.47 -> 0.0.48

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

diff --git a/pkgs/by-name/pu/pulumictl/package.nix b/pkgs/by-name/pu/pulumictl/package.nix
index 3cee71a768d5..110b623787bf 100644
--- a/pkgs/by-name/pu/pulumictl/package.nix
+++ b/pkgs/by-name/pu/pulumictl/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "pulumictl";
-  version = "0.0.47";
+  version = "0.0.48";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "pulumictl";
     rev = "v${version}";
-    sha256 = "sha256-bZ7Di1DcvGECfOzW72QnfWRn76U+agsNsdsprBjx5Rw=";
+    sha256 = "sha256-rFVxfWeESWmqH0BhKY6BO5AxSPXVW8tOPGyUXB5Kc/E=";
   };
 
-  vendorHash = "sha256-QYQk36e7NLZnl00fRW4i4UMy7jFVaGHlXcxXt/wqw3M=";
+  vendorHash = "sha256-x5CBSzwOfX0BwwbAOuW1ibrLnnkVSNjqG0Sj2EcmRbM=";
 
   ldflags = [
     "-s"

From 6bdf6d1a629de7fbb63908f5676ff315cd265d5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 17:20:21 +0000
Subject: [PATCH 74/92] spacectl: 1.8.0 -> 1.9.0

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

diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix
index 7b4e64178286..6737ba52fd0c 100644
--- a/pkgs/by-name/sp/spacectl/package.nix
+++ b/pkgs/by-name/sp/spacectl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "spacectl";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "spacelift-io";
     repo = "spacectl";
     rev = "v${version}";
-    hash = "sha256-IkGkySGvRFvIxx9c2jkFJ0vJ6iqdp+pQYgOuZgHZjIw=";
+    hash = "sha256-24aw5ooN6ru9p+/21M64VlZdzcep0S76XA27wtZ0xyA=";
   };
 
-  vendorHash = "sha256-SYfXG6YM0Q2rCnoTM2tYvE17uBCD8yQiW/5DTCxMPWo=";
+  vendorHash = "sha256-VfhbwbKQOmXzLjS/O8BDdYHtZT2kBuxRcAPpHMlenUc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 945248f18f8a7836e2fff7011f5b1d069384b27f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 17:21:45 +0000
Subject: [PATCH 75/92] tana: 1.0.20 -> 1.0.21

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

diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix
index fe1b46e66a03..a06dc1675215 100644
--- a/pkgs/by-name/ta/tana/package.nix
+++ b/pkgs/by-name/ta/tana/package.nix
@@ -55,7 +55,7 @@ let
   ];
   buildInputs = glLibs ++ libs;
   runpathPackages = glLibs ++ [ stdenv.cc.cc stdenv.cc.libc ];
-  version = "1.0.20";
+  version = "1.0.21";
 in
 stdenv.mkDerivation {
   pname = "tana";
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb";
-    hash = "sha256-fJiAqPppPoIN4gT54YMgbf/Fe9eVgRYHU6q6Yopl46I=";
+    hash = "sha256-NjBJz1zHLnWLWTxgSZwnmuZr2FbHuYLxynRG8jGMP+0=";
   };
 
   nativeBuildInputs = [

From 9f4da4cfa67832f0999a4885362d7f3c734cf490 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 17:34:39 +0000
Subject: [PATCH 76/92] whoami: 1.10.3 -> 1.10.4

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

diff --git a/pkgs/by-name/wh/whoami/package.nix b/pkgs/by-name/wh/whoami/package.nix
index 7046436f8d53..e468e087be30 100644
--- a/pkgs/by-name/wh/whoami/package.nix
+++ b/pkgs/by-name/wh/whoami/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "whoami";
-  version = "1.10.3";
+  version = "1.10.4";
 
   src = fetchFromGitHub {
     owner = "traefik";
     repo = "whoami";
     rev = "v${version}";
-    hash = "sha256-wzxgmysqn4aWAZEaMjMwHdHLe4UZ4nwdNFJw5X7fuKQ=";
+    hash = "sha256-T5oUIJ6ELfPNd8JW5hUXV6bRUGVRD0IgHJ34ioR4sMs=";
   };
 
-  vendorHash = "sha256-qDfkYIAymkFUtbKka9OLoYjT+S9KhOra2UtOvhoz5Mw=";
+  vendorHash = "sha256-0Qxw+MUYVgzgWB8vi3HBYtVXSq/btfh4ZfV/m1chNrA=";
 
   ldflags = [ "-s" ];
 

From d9e0922923517278ab684f992b72dc97d317ca58 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 21 Jan 2025 18:53:04 +0100
Subject: [PATCH 77/92] woodpecker-{agent,cli,server}: 2.8.3 -> 3.0.0

https://github.com/woodpecker-ci/woodpecker/releases/tag/v3.0.0

diff: https://github.com/woodpecker-ci/woodpecker/compare/v2.8.3...v3.0.0
---
 .../tools/continuous-integration/woodpecker/common.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index 22d8adaf2454..24b3384e792a 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 let
-  version = "2.8.3";
-  srcHash = "sha256-/Ozzibz2BhVSxQeH9tg3cC5uVl0gEA/Hw2AMOELW/I8=";
+  version = "3.0.0";
+  srcHash = "sha256-AM+qMTbvlLOLtuADJGWKRmeqwK+ssV7YxydOsx+L8Nc=";
   # The tarball contains vendored dependencies
   vendorHash = null;
 in
@@ -37,7 +37,7 @@ in
   ldflags = [
     "-s"
     "-w"
-    "-X go.woodpecker-ci.org/woodpecker/v2/version.Version=${version}"
+    "-X go.woodpecker-ci.org/woodpecker/v3/version.Version=${version}"
   ];
 
   meta = with lib; {

From 3d47efdc1b4100de43a86af5bffeb9d3bf99c0d3 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 21 Jan 2025 18:53:06 +0100
Subject: [PATCH 78/92] woodpecker-cli: calling woodpecker instead of
 woodpecker-cli is now deprecated

according to upstream starting with v3.0.0.

Previously the opposite was true, so we simply invert the deprecation
wrapper added in ee4670a8210d326e2de4f38f5cb7e87b24bd2264.

Ref: 3d7e60beb0224d40e86f4120e15302cdb0af94e9
---
 .../continuous-integration/woodpecker/cli.nix      |  2 +-
 .../continuous-integration/woodpecker/common.nix   | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix
index a67b628aa084..68b4218a60e0 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix
@@ -18,6 +18,6 @@ buildGoModule {
 
   meta = common.meta // {
     description = "Command line client for the Woodpecker Continuous Integration server";
-    mainProgram = "woodpecker";
+    mainProgram = "woodpecker-cli";
   };
 }
diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index 24b3384e792a..ad60a06cc551 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -18,18 +18,16 @@ in
     cd $out/bin
     for f in *; do
       if [ "$f" = cli ]; then
-        mv -- "$f" "woodpecker"
         # Issue a warning to the user if they call the deprecated executable
-        cat >woodpecker-cli << EOF
+        cat >woodpecker << EOF
     #!/bin/sh
-    echo 'WARNING: calling \`woodpecker-cli\` is deprecated, use \`woodpecker\` instead.' >&2
-    $out/bin/woodpecker "\$@"
+    echo 'WARNING: calling \`woodpecker\` is deprecated, use \`woodpecker-cli\` instead.' >&2
+    $out/bin/woodpecker-cli "\$@"
     EOF
-        chmod +x woodpecker-cli
-        patchShebangs woodpecker-cli
-      else
-        mv -- "$f" "woodpecker-$f"
+        chmod +x woodpecker
+        patchShebangs woodpecker
       fi
+        mv -- "$f" "woodpecker-$f"
     done
     cd -
   '';

From 32be348f2857dfac6cacca6d02987b56c3e84b4b Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 21 Jan 2025 18:53:08 +0100
Subject: [PATCH 79/92] woodpecker-{agent,cli,server}: 3.0.0 -> 3.0.1

https://github.com/woodpecker-ci/woodpecker/releases/tag/v3.0.1

diff: https://github.com/woodpecker-ci/woodpecker/compare/v3.0.0...v3.0.1
---
 .../tools/continuous-integration/woodpecker/common.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index ad60a06cc551..f240ead19bd5 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 let
-  version = "3.0.0";
-  srcHash = "sha256-AM+qMTbvlLOLtuADJGWKRmeqwK+ssV7YxydOsx+L8Nc=";
+  version = "3.0.1";
+  srcHash = "sha256-BJHvZhi/jjVH/NZKqGwL2ZiYGxM72EtJ0KTO21IigAY=";
   # The tarball contains vendored dependencies
   vendorHash = null;
 in

From 12c287be6c4374bf8bfb4e40c8974a0151486e0a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Jan 2025 15:01:36 +0100
Subject: [PATCH 80/92] python312Packages.manim: 0.18.1 -> 0.19.0

Diff:
https://github.com/ManimCommunity/manim/compare/refs/tags/v0.18.1...v0.19.0

Changelog:
https://docs.manim.community/en/latest/changelog/0.19.0-changelog.html
---
 .../python-modules/manim/default.nix          | 60 +++++++++----------
 .../manim/pytest-report-header.patch          | 40 +++++++++----
 2 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix
index 14bc1ad76be9..0fb223a910ca 100644
--- a/pkgs/development/python-modules/manim/default.nix
+++ b/pkgs/development/python-modules/manim/default.nix
@@ -2,26 +2,26 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
-  pytest-xdist,
-  pytestCheckHook,
-  pythonOlder,
-
-  cairo,
-  ffmpeg,
   texliveInfraOnly,
 
+  # build-system
+  poetry-core,
+
+  # buildInputs
+  cairo,
+
+  # dependencies
+  av,
+  beautifulsoup4,
   click,
   cloup,
   decorator,
   isosurfaces,
-  jupyterlab,
   manimpango,
   mapbox-earcut,
   moderngl,
   moderngl-window,
   networkx,
-  notebook,
   numpy,
   pillow,
   pycairo,
@@ -36,6 +36,17 @@
   tqdm,
   typing-extensions,
   watchdog,
+
+  # optional-dependencies
+  jupyterlab,
+  notebook,
+
+  # tests
+  ffmpeg,
+  pytest-cov-stub,
+  pytest-xdist,
+  pytestCheckHook,
+  versionCheckHook,
 }:
 
 let
@@ -175,41 +186,26 @@ in
 buildPythonPackage rec {
   pname = "manim";
   pyproject = true;
-  version = "0.18.1";
-  disabled = pythonOlder "3.9";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "ManimCommunity";
     repo = "manim";
     tag = "v${version}";
-    hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ=";
+    hash = "sha256-eQgp/GwKsfQA1ZgqfB3HF2ThEgH3Fbn9uAtcko9pkjs=";
   };
 
   build-system = [
     poetry-core
   ];
 
-  pythonRelaxDeps = [
-    "cloup"
-    "isosurfaces"
-    "pillow"
-    "skia-pathops"
-    "watchdog"
-  ];
-
   patches = [ ./pytest-report-header.patch ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" ""
-
-    substituteInPlace manim/_config/default.cfg \
-      --replace "ffmpeg_executable = ffmpeg" "ffmpeg_executable = ${lib.getExe ffmpeg}"
-  '';
-
   buildInputs = [ cairo ];
 
   dependencies = [
+    av
+    beautifulsoup4
     click
     cloup
     decorator
@@ -257,16 +253,19 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     ffmpeg
     manim-tinytex
+    pytest-cov-stub
     pytest-xdist
     pytestCheckHook
+    versionCheckHook
   ];
+  versionCheckProgramArg = [ "--version" ];
 
   # about 55 of ~600 tests failing mostly due to demand for display
   disabledTests = import ./failing_tests.nix;
 
   pythonImportsCheck = [ "manim" ];
 
-  meta = with lib; {
+  meta = {
     description = "Animation engine for explanatory math videos - Community version";
     longDescription = ''
       Manim is an animation engine for explanatory math videos. It's used to
@@ -274,8 +273,9 @@ buildPythonPackage rec {
       3Blue1Brown on YouTube. This is the community maintained version of
       manim.
     '';
+    changelog = "https://docs.manim.community/en/latest/changelog/${version}-changelog.html";
     homepage = "https://github.com/ManimCommunity/manim";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/manim/pytest-report-header.patch b/pkgs/development/python-modules/manim/pytest-report-header.patch
index 7aa87d373e50..76894b080c4b 100644
--- a/pkgs/development/python-modules/manim/pytest-report-header.patch
+++ b/pkgs/development/python-modules/manim/pytest-report-header.patch
@@ -1,17 +1,26 @@
-diff --git a/conftest.py b/conftest.py
-index dacb730a..149c6702 100644
---- a/conftest.py
-+++ b/conftest.py
-@@ -33,17 +33,3 @@ def temp_media_dir(tmpdir, monkeypatch, request):
-         with tempconfig({"media_dir": str(tmpdir)}):
-             assert config.media_dir == str(tmpdir)
-             yield tmpdir
--
--
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 4de34bbb..07b4bea6 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -4,31 +4,11 @@ import logging
+ import sys
+ from pathlib import Path
+ 
+-import cairo
+-import moderngl
+ import pytest
+ 
+ import manim
+ 
+ 
 -def pytest_report_header(config):
--    ctx = moderngl.create_standalone_context()
--    info = ctx.info
--    ctx.release()
+-    try:
+-        ctx = moderngl.create_standalone_context()
+-        info = ctx.info
+-        ctx.release()
+-    except Exception as e:
+-        raise Exception("Error while creating moderngl context") from e
+-
 -    return (
 -        f"\nCairo Version: {cairo.cairo_version()}",
 -        "\nOpenGL information",
@@ -20,3 +29,8 @@ index dacb730a..149c6702 100644
 -        f"renderer: {info['GL_RENDERER'].strip()}",
 -        f"version: {info['GL_VERSION'].strip()}\n",
 -    )
+-
+-
+ def pytest_addoption(parser):
+     parser.addoption(
+         "--skip_slow",

From c72fadce72dd61c9d538e171d9f3c64267bd0b9a Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Tue, 21 Jan 2025 13:53:57 -0500
Subject: [PATCH 81/92] zed-editor: 0.169.2 -> 0.169.3

---
 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 48a383965144..2078052108f6 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.169.2";
+  version = "0.169.3";
 
   outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";
 
@@ -103,7 +103,7 @@ rustPlatform.buildRustPackage rec {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${version}";
-    hash = "sha256-IdJVWsHWMzE0AZxFy6jOmquc2jFeozNDdAhbB3fFMwk=";
+    hash = "sha256-F7R3GDjz5I82CqupVcTvhR+wvANAcxjIDDJ8azVTtfY=";
   };
 
   patches = [
@@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-0zH5J3nvBpqD22nFzX98MBoTtNDpWS4NSSMcT1DB2SM=";
+  cargoHash = "sha256-yuf2NNnclaMKXJnbg+SC7xqcgkf4JT36GqWXNBNZUCI=";
 
   nativeBuildInputs =
     [

From d07168dccb208dc9471c106589ef76c0175869f7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 21 Jan 2025 20:12:26 +0100
Subject: [PATCH 82/92] tests.replaceVars.replaceVarsWith: fix

This never worked properly, but it does now.
---
 pkgs/test/replace-vars/default.nix | 56 ++++++++++++++++++------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/pkgs/test/replace-vars/default.nix b/pkgs/test/replace-vars/default.nix
index 45d0ce52b7b0..7d9200a2cf08 100644
--- a/pkgs/test/replace-vars/default.nix
+++ b/pkgs/test/replace-vars/default.nix
@@ -11,7 +11,7 @@ let
   inherit (testers) testEqualContents testBuildFailure;
 
   mkTests =
-    callReplaceVars:
+    callReplaceVars: mkExpectation:
     lib.recurseIntoAttrs {
       succeeds = testEqualContents {
         assertion = "replaceVars-succeeds";
@@ -21,13 +21,15 @@ let
           brotherhood = "shared humanity";
         };
 
-        expected = builtins.toFile "expected" ''
-          All human beings are born free and are the same in dignity and rights.
-          They are endowed with reason and conscience and should act towards
-          one another in a spirit of shared humanity.
+        expected = mkExpectation (
+          builtins.toFile "source.txt" ''
+            All human beings are born free and are the same in dignity and rights.
+            They are endowed with reason and conscience and should act towards
+            one another in a spirit of shared humanity.
 
-            -- eroosevelt@humanrights.un.org
-        '';
+              -- eroosevelt@humanrights.un.org
+          ''
+        );
       };
 
       # There might eventually be a usecase for this, but it's not supported at the moment.
@@ -83,13 +85,15 @@ let
           brotherhood = null;
         };
 
-        expected = builtins.toFile "expected" ''
-          All human beings are born free and are the same in dignity and rights.
-          They are endowed with reason and conscience and should act towards
-          one another in a spirit of @brotherhood@.
+        expected = mkExpectation (
+          builtins.toFile "source.txt" ''
+            All human beings are born free and are the same in dignity and rights.
+            They are endowed with reason and conscience and should act towards
+            one another in a spirit of @brotherhood@.
 
-            -- eroosevelt@humanrights.un.org
-        '';
+              -- eroosevelt@humanrights.un.org
+          ''
+        );
       };
 
       fails-in-check-phase-with-exemption =
@@ -120,13 +124,21 @@ let
     };
 in
 {
-  replaceVars = mkTests replaceVars;
-  replaceVarsWith = mkTests (
-    src: replacements:
-    replaceVarsWith {
-      inherit src replacements;
-      dir = "bin";
-      isExecutable = true;
-    }
-  );
+  replaceVars = mkTests replaceVars lib.id;
+  replaceVarsWith =
+    mkTests
+      (
+        src: replacements:
+        replaceVarsWith {
+          inherit src replacements;
+          dir = "bin";
+          isExecutable = true;
+        }
+      )
+      (
+        file:
+        runCommand "expected" { inherit file; } ''
+          install -Dm755 "$file" "$out/bin/$(stripHash "$file")"
+        ''
+      );
 }

From 0becaa2a8873510329f71d47d203f7d001f47f3d Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 21 Jan 2025 14:29:00 -0500
Subject: [PATCH 83/92] lm_sensors: fix tag name

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

diff --git a/pkgs/by-name/lm/lm_sensors/package.nix b/pkgs/by-name/lm/lm_sensors/package.nix
index 6748d60926ac..9fcabb816a74 100644
--- a/pkgs/by-name/lm/lm_sensors/package.nix
+++ b/pkgs/by-name/lm/lm_sensors/package.nix
@@ -14,7 +14,7 @@
 
 let
   version = "3.6.0";
-  tag = lib.replaceStrings [ "." ] [ "-" ] version;
+  tag = "V" + lib.replaceStrings [ "." ] [ "-" ] version;
 in
 
 stdenv.mkDerivation {

From b0cfc9769a0845c7506351fa7147a82495cfc95f Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@tweag.io>
Date: Tue, 10 Dec 2024 00:45:55 +0100
Subject: [PATCH 84/92] maintainers/scripts/auto-rebase: init

---
 .git-blame-ignore-revs                        |   6 +
 maintainers/scripts/auto-rebase/README.md     |  16 +++
 maintainers/scripts/auto-rebase/run.sh        |  61 ++++++++++
 .../scripts/auto-rebase/test/default.nix      |  46 +++++++
 .../scripts/auto-rebase/test/first.diff       |  11 ++
 maintainers/scripts/auto-rebase/test/run.sh   | 112 ++++++++++++++++++
 .../scripts/auto-rebase/test/second.diff      |  11 ++
 7 files changed, 263 insertions(+)
 create mode 100644 maintainers/scripts/auto-rebase/README.md
 create mode 100755 maintainers/scripts/auto-rebase/run.sh
 create mode 100644 maintainers/scripts/auto-rebase/test/default.nix
 create mode 100644 maintainers/scripts/auto-rebase/test/first.diff
 create mode 100755 maintainers/scripts/auto-rebase/test/run.sh
 create mode 100644 maintainers/scripts/auto-rebase/test/second.diff

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index c3ca7bf19112..2892d07f97d9 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,5 +1,11 @@
 # This file contains a list of commits that are not likely what you
 # are looking for in a blame, such as mass reformatting or renaming.
+#
+# If a commit's line ends with `# !autorebase <command>`,
+# where <command> is an idempotent bash command that reapplies the changes from the commit,
+# the `maintainers/scripts/auto-rebase/run.sh` script can be used to rebase
+# across that commit while automatically resolving merge conflicts caused by the commit.
+#
 # You can set this file as a default ignore file for blame by running
 # the following command.
 #
diff --git a/maintainers/scripts/auto-rebase/README.md b/maintainers/scripts/auto-rebase/README.md
new file mode 100644
index 000000000000..926aa6c99d9f
--- /dev/null
+++ b/maintainers/scripts/auto-rebase/README.md
@@ -0,0 +1,16 @@
+# Auto rebase script
+
+The [`./run.sh` script](./run.sh) in this directory rebases the current branch onto a target branch,
+while automatically resolving merge conflicts caused by marked commits in [`.git-blame-ignore-revs`](../../../.git-blame-ignore-revs).
+See the header comment of that file to understand how to mark commits.
+
+This is convenient for resolving merge conflicts for pull requests after e.g. treewide reformats.
+
+## Testing
+
+To run the tests in the [test directory](./test):
+```
+$ cd test
+$ nix-shell
+nix-shell> ./run.sh
+```
diff --git a/maintainers/scripts/auto-rebase/run.sh b/maintainers/scripts/auto-rebase/run.sh
new file mode 100755
index 000000000000..1a8ad98c3723
--- /dev/null
+++ b/maintainers/scripts/auto-rebase/run.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+if (( $# < 1 )); then
+    echo "Usage: $0 TARGET_BRANCH"
+    echo ""
+    echo "TARGET_BRANCH: Branch to rebase the current branch onto, e.g. master or release-24.11"
+    exit 1
+fi
+
+targetBranch=$1
+
+# Loop through all autorebase-able commits in .git-blame-ignore-revs on the base branch
+readarray -t autoLines < <(
+  git show "$targetBranch":.git-blame-ignore-revs \
+      | sed -n 's/^\([0-9a-f]\+\).*!autorebase \(.*\)$/\1 \2/p'
+)
+for line in "${autoLines[@]}"; do
+    read -r autoCommit autoCmd <<< "$line"
+
+    if ! git cat-file -e "$autoCommit"; then
+        echo "Not a valid commit: $autoCommit"
+        exit 1
+    elif git merge-base --is-ancestor "$autoCommit" HEAD; then
+        # Skip commits that we have already
+        continue
+    fi
+
+    echo -e "\e[32mAuto-rebasing commit $autoCommit with command '$autoCmd'\e[0m"
+
+    # The commit before the commit
+    parent=$(git rev-parse "$autoCommit"~)
+
+    echo "Rebasing on top of the previous commit, might need to manually resolve conflicts"
+    if ! git rebase --onto "$parent" "$(git merge-base "$targetBranch" HEAD)"; then
+      echo -e "\e[33m\e[1mRestart this script after resolving the merge conflict as described above\e[0m"
+      exit 1
+    fi
+
+    echo "Reapplying the commit on each commit of our branch"
+    # This does two things:
+    # - The parent filter inserts the auto commit between its parent and
+    #   and our first commit. By itself, this causes our first commit to
+    #   effectively "undo" the auto commit, since the tree of our first
+    #   commit is unchanged. This is why the following is also necessary:
+    # - The tree filter runs the command on each of our own commits,
+    #   effectively reapplying it.
+    FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch \
+        --parent-filter "sed 's/$parent/$autoCommit/'" \
+        --tree-filter "$autoCmd" \
+        "$autoCommit"..HEAD
+
+    # A tempting alternative is something along the lines of
+    #   git rebase --strategy-option=theirs --onto "$rev" "$parent" \
+    #     --exec '$autoCmd && git commit --all --amend --no-edit' \
+    # but this causes problems because merges are not guaranteed to maintain the formatting.
+    # The ./test.sh exercises such a case.
+done
+
+echo "Rebasing on top of the latest target branch commit"
+git rebase --onto "$targetBranch" "$(git merge-base "$targetBranch" HEAD)"
diff --git a/maintainers/scripts/auto-rebase/test/default.nix b/maintainers/scripts/auto-rebase/test/default.nix
new file mode 100644
index 000000000000..fd6ce30d24ac
--- /dev/null
+++ b/maintainers/scripts/auto-rebase/test/default.nix
@@ -0,0 +1,46 @@
+let
+  pkgs = import ../../../.. {
+    config = { };
+    overlays = [ ];
+  };
+
+  inherit (pkgs)
+    lib
+    stdenvNoCC
+    gitMinimal
+    treefmt
+    nixfmt-rfc-style
+    ;
+in
+
+stdenvNoCC.mkDerivation {
+  name = "test";
+  src = lib.fileset.toSource {
+    root = ./..;
+    fileset = lib.fileset.unions [
+      ../run.sh
+      ./run.sh
+      ./first.diff
+      ./second.diff
+    ];
+  };
+  nativeBuildInputs = [
+    gitMinimal
+    treefmt
+    nixfmt-rfc-style
+  ];
+  patchPhase = ''
+    patchShebangs .
+  '';
+
+  buildPhase = ''
+    export HOME=$(mktemp -d)
+    export PAGER=true
+    git config --global user.email "Your Name"
+    git config --global user.name "your.name@example.com"
+    ./test/run.sh
+  '';
+  installPhase = ''
+    touch $out
+  '';
+}
diff --git a/maintainers/scripts/auto-rebase/test/first.diff b/maintainers/scripts/auto-rebase/test/first.diff
new file mode 100644
index 000000000000..0485d72102a7
--- /dev/null
+++ b/maintainers/scripts/auto-rebase/test/first.diff
@@ -0,0 +1,11 @@
+diff --git a/b.nix b/b.nix
+index 9d18f25..67b0466 100644
+--- a/b.nix
++++ b/b.nix
+@@ -1,5 +1,5 @@
+ {
+   this = "is";
+ 
+-  some = "set";
++  some = "value";
+ }
diff --git a/maintainers/scripts/auto-rebase/test/run.sh b/maintainers/scripts/auto-rebase/test/run.sh
new file mode 100755
index 000000000000..04989ba9a30c
--- /dev/null
+++ b/maintainers/scripts/auto-rebase/test/run.sh
@@ -0,0 +1,112 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# https://stackoverflow.com/a/246128/6605742
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+# Allows using a local directory for temporary files,
+# which can then be inspected after the run
+if (( $# > 0 )); then
+    tmp=$(realpath "$1/tmp")
+    if [[ -e "$tmp" ]]; then
+        rm -rf "$tmp"
+    fi
+    mkdir -p "$tmp"
+else
+    tmp=$(mktemp -d)
+    trap 'rm -rf "$tmp"' exit
+fi
+
+# Tests a scenario where two poorly formatted files were modified on both the
+# main branch and the feature branch, while the main branch also did a treewide
+# format.
+
+git init "$tmp/repo"
+cd "$tmp/repo" || exit
+git branch -m main
+
+# Some initial poorly-formatted files
+cat > a.nix <<EOF
+{ x
+, y
+
+, z
+}:
+null
+EOF
+
+cat > b.nix <<EOF
+{
+  this = "is";
+
+
+  some="set" ;
+ }
+EOF
+
+git add -A
+git commit -m "init"
+
+git switch -c feature
+
+# Some changes
+sed 's/set/value/' -i b.nix
+git commit -a -m "change b"
+sed '/, y/d' -i a.nix
+git commit -a -m "change a"
+
+git switch main
+
+# A change to cause a merge conflict
+sed 's/y/why/' -i a.nix
+git commit -a -m "change a"
+
+cat > treefmt.toml <<EOF
+[formatter.nix]
+command = "nixfmt"
+includes = [ "*.nix" ]
+EOF
+git add -A
+git commit -a -m "introduce treefmt"
+
+# Treewide reformat
+treefmt
+git commit -a -m "format"
+
+echo "$(git rev-parse HEAD) # !autorebase treefmt" > .git-blame-ignore-revs
+git add -A
+git commit -a -m "update ignored revs"
+
+git switch feature
+
+# Setup complete
+
+git log --graph --oneline feature main
+
+# This expectedly fails with a merge conflict that has to be manually resolved
+"$SCRIPT_DIR"/../run.sh main && exit 1
+sed '/<<</,/>>>/d' -i a.nix
+git add a.nix
+GIT_EDITOR=true git rebase --continue
+
+"$SCRIPT_DIR"/../run.sh main
+
+git log --graph --oneline feature main
+
+checkDiff() {
+    local ref=$1
+    local file=$2
+    expectedDiff=$(cat "$file")
+    actualDiff=$(git diff "$ref"~ "$ref")
+    if [[ "$expectedDiff" != "$actualDiff" ]]; then
+        echo -e "Expected this diff:\n$expectedDiff"
+        echo -e "But got this diff:\n$actualDiff"
+        exit 1
+    fi
+}
+
+checkDiff HEAD~ "$SCRIPT_DIR"/first.diff
+checkDiff HEAD "$SCRIPT_DIR"/second.diff
+
+echo "Success!"
diff --git a/maintainers/scripts/auto-rebase/test/second.diff b/maintainers/scripts/auto-rebase/test/second.diff
new file mode 100644
index 000000000000..3b714658aa23
--- /dev/null
+++ b/maintainers/scripts/auto-rebase/test/second.diff
@@ -0,0 +1,11 @@
+diff --git a/a.nix b/a.nix
+index 18ba7ce..bcf38bc 100644
+--- a/a.nix
++++ b/a.nix
+@@ -1,6 +1,5 @@
+ {
+   x,
+-  why,
+ 
+   z,
+ }:

From d7964f40d766d7c10f628561504604b84f530ec3 Mon Sep 17 00:00:00 2001
From: h0nIg <h0nIg@users.noreply.github.com>
Date: Tue, 21 Jan 2025 20:46:57 +0100
Subject: [PATCH 85/92] shadow: fix meta.homepage (#375611)

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

diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index bc683d7bb9c7..654a4ca8fd10 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
   disallowedReferences = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.shellPackage;
 
   meta = with lib; {
-    homepage = "https://github.com/shadow-maint";
+    homepage = "https://github.com/shadow-maint/shadow";
     description = "Suite containing authentication-related tools such as passwd and su";
     license = licenses.bsd3;
     platforms = platforms.linux;

From 06eb65540a786eac0ad1f2920a9a3816a3b467b9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Jan 2025 21:21:19 +0100
Subject: [PATCH 86/92] exo: 0.0.9-alpha -> 0.0.10-alpha

Diff: https://github.com/exo-explore/exo/compare/refs/tags/v0.0.9-alpha...0.0.10-alpha

Changelog: https://github.com/exo-explore/exo/releases/tag/v0.0.10-alpha
---
 pkgs/by-name/ex/exo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix
index ea5877437013..9931d0fa15ee 100644
--- a/pkgs/by-name/ex/exo/package.nix
+++ b/pkgs/by-name/ex/exo/package.nix
@@ -7,14 +7,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "exo";
-  version = "0.0.9-alpha";
+  version = "0.0.10-alpha";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "exo-explore";
     repo = "exo";
     tag = "v${version}";
-    hash = "sha256-H3Jxq0GS3Ha9cDsIHCsTupD0/Mp80Mxf2NvAyZytTb0=";
+    hash = "sha256-JJGjr9RLiJ23mPpSsx6exs8hXx/ZkL5rl8i6Xg1vFhY=";
   };
 
   build-system = with python3Packages; [ setuptools ];

From 9b3f7971376c0e09702578724a1989df0a07c5c5 Mon Sep 17 00:00:00 2001
From: Raphael Neubert <raphi.neubert@gmail.com>
Date: Tue, 21 Jan 2025 20:55:59 +0100
Subject: [PATCH 87/92] ola: fix error: template-id not allowed for constructor
 in C++20

---
 pkgs/applications/misc/ola/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index e8642f86ded2..1ac44a057d09 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -15,6 +15,7 @@
   libmicrohttpd,
   perl,
   python3,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +28,13 @@ stdenv.mkDerivation rec {
     tag = version;
     hash = "sha256-8w8ZT3D/+8Pxl9z2KTXeydVxE5xiPjxZevgmMFgrblU=";
   };
-
+  patches = [
+    # Fix build error with GCC 14 due to stricter C++20 compliance (template-id in constructors)
+    (fetchpatch {
+      url = "https://github.com/OpenLightingProject/ola/commit/d9b9c78645c578adb7c07b692842e841c48310be.patch";
+      hash = "sha256-BplSqQv8ztWMpiX/M3/3wvf6LsPTBglh48gHlUoM6rw=";
+    })
+  ];
   nativeBuildInputs = [
     autoreconfHook
     bison

From 525409c1013c789e7f2f7206cd369b098818fbd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 20:56:56 +0000
Subject: [PATCH 88/92] python312Packages.aioesphomeapi: 28.0.0 -> 28.0.1

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

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index f4b8f6b7f5ad..fd82bc553883 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "28.0.0";
+  version = "28.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-vMqDxg2BV9/g5FquejnT/Rsvwjhdh01K2LxiT355p1U=";
+    hash = "sha256-MAlgr+DaJWQnO4Y8KesP/d9aCRbSjUb9ciuvR5DHz+w=";
   };
 
   build-system = [

From 32540cf7633e215ee256b458b9b8a52b60cbca44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 21:08:48 +0000
Subject: [PATCH 89/92] python312Packages.recurring-ical-events: 3.4.0 -> 3.4.1

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

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

From 23ad04a4e460b22495c288582906e1149556a059 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 21 Jan 2025 22:05:26 +0100
Subject: [PATCH 90/92] php83Packages.composer: 2.8.4 -> 2.8.5

---
 .../php-packages/composer/default.nix         | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index 28e97de3c56b..4997be05f740 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "composer";
-  version = "2.8.4";
+  version = "2.8.5";
 
   # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to
   # use together with the version from this package to keep the
   # bootstrap phar file up-to-date together with the end user composer
   # package.
-  passthru.pharHash = "sha256-xMTi4b6rDqBOC9BCpdu6n+2h+/XtoNNiA5WO3TQ8Coo=";
+  passthru.pharHash = "sha256-nO8YIS4iI1GutHa4HeeypTg/d1M2R0Rnv1x8z+hKsMw=";
 
   composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix {
     inherit (finalAttrs) version;
@@ -33,19 +33,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "composer";
     repo = "composer";
     tag = finalAttrs.version;
-    hash = "sha256-m4CfWWbrmMN0j27XaMx/KRbFjpW5iMMNUlAtzlrorJc=";
+    hash = "sha256-/E/fXh+jefPwzsADpmGyrJ+xqW5CSPNok0DVLD1KZDY=";
   };
 
-  patches = [
-    # Fix an issue preventing reproducible builds
-    # This patch should be removed at the next release (2.8.5)
-    # More information at https://github.com/composer/composer/pull/12090
-    (fetchpatch {
-      url = "https://github.com/composer/composer/commit/7b1e983ce9a0b30a6369cda11a7d61cca9c1ce46.patch";
-      hash = "sha256-veBdfZxzgL/R3P87GpvxQc+es3AdpaKSzCX0DCzH63U=";
-    })
-  ];
-
   nativeBuildInputs = [ makeBinaryWrapper ];
 
   buildInputs = [ php ];
@@ -53,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   vendor = stdenvNoCC.mkDerivation {
     pname = "${finalAttrs.pname}-vendor";
 
-    inherit (finalAttrs) src version patches;
+    inherit (finalAttrs) src version;
 
     nativeBuildInputs = [
       cacert
@@ -97,7 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-0VbIaOuXeBNRd41q4Ogde8/B4hApueb5FeZ8cGHwB7s=";
+    outputHash = "sha256-UcMB0leKqD8cXeExXpjDgPvF8pfhGXnCR0EN4FVWouw=";
   };
 
   installPhase = ''

From 8fad15a0ca6665f43e7cea11b7f33ba357c4dc0e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Jan 2025 23:11:25 +0100
Subject: [PATCH 91/92] python312Packages.testcontainers: 4.9.0 -> 4.9.1

Diff: https://github.com/testcontainers/testcontainers-python/compare/refs/tags/testcontainers-v4.9.0...testcontainers-v4.9.1

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

diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix
index 2998822d5d7f..77f9639c4bac 100644
--- a/pkgs/development/python-modules/testcontainers/default.nix
+++ b/pkgs/development/python-modules/testcontainers/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "testcontainers";
-  version = "4.9.0";
+  version = "4.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "testcontainers";
     repo = "testcontainers-python";
     tag = "testcontainers-v${version}";
-    hash = "sha256-E0g0A3RJY2l/0N6t+/OSXB+Xm2O/9y7FkscXfGm/nKw=";
+    hash = "sha256-qbOtsENvPl+l2ODGyuxmiAoJwU4EIACu1GW5GPP207c=";
   };
 
   postPatch = ''

From 381484d4652d91195ea0e5d5c509fb48564600ec Mon Sep 17 00:00:00 2001
From: Nicolas Goudry <goudry.nicolas@gmail.com>
Date: Wed, 22 Jan 2025 00:37:32 +0100
Subject: [PATCH 92/92] gitkraken: 10.6.1 -> 10.6.2

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

diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 8c56ff729866..e81078a768a5 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -57,24 +57,24 @@
 
 let
   pname = "gitkraken";
-  version = "10.6.1";
+  version = "10.6.2";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-      hash = "sha256-OzVBimAi9vAi6YhSRV0a51MWSmdHmHvvXbimeaNFpBU=";
+      hash = "sha256-E/9BR4PE5QF075+NgJZTtgDoShHEqeRcoICnMLt3RuY=";
     };
 
     x86_64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
-      hash = "sha256-MF6H3tNUw4P4BAzScMsolyB9Qage/7aZwe84gCBjyV4=";
+      hash = "sha256-gCiZN+ivXEF5KLas7eZn9iWfXcDGwf1gXK1ejY2C4xs=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
-      hash = "sha256-Akn8LSSYEj/dUU8iNWm5wO239wKGBmQp9RfzbCjI5Wo=";
+      hash = "sha256-1zd57Kqi5iKHw/dNqLQ7jVAkNFvkFeqQbZPN32kF9IU=";
     };
   };