From af834d939d2b64f9f9994557c4bf8b69dcbeb0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sat, 16 Nov 2024 13:27:30 +0100
Subject: [PATCH 01/46] local-ai: 2.22.1 -> 2.23.0

---
 pkgs/by-name/lo/local-ai/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix
index ee73e0381de0..4e41e7af53e9 100644
--- a/pkgs/by-name/lo/local-ai/package.nix
+++ b/pkgs/by-name/lo/local-ai/package.nix
@@ -147,8 +147,8 @@ let
         src = fetchFromGitHub {
           owner = "ggerganov";
           repo = "llama.cpp";
-          rev = "45f097645efb11b6d09a5b4adbbfd7c312ac0126";
-          hash = "sha256-kZlH+Xpt38Ymc9TW7qRVyN7ISwed4ycA0M0808+UcXM=";
+          rev = "6423c65aa8be1b98f990cf207422505ac5a441a1";
+          hash = "sha256-DI3VhXEeok/wIFuM/l1hJJZlpxvyKY6Kmi97o3g0Ppk=";
           fetchSubmodules = true;
         };
         postPatch =
@@ -246,7 +246,7 @@ let
     src = fetchFromGitHub {
       owner = "mudler";
       repo = "go-piper";
-      rev = "9d0100873a7dbb0824dfea40e8cec70a1b110759";
+      rev = "e10ca041a885d4a8f3871d52924b47792d5e5aa0";
       hash = "sha256-Yv9LQkWwGpYdOS0FvtP0vZ0tRyBAx27sdmziBR4U4n8=";
       fetchSubmodules = true;
     };
@@ -299,8 +299,8 @@ let
     src = fetchFromGitHub {
       owner = "ggerganov";
       repo = "whisper.cpp";
-      rev = "a5abfe6a90495f7bf19fe70d016ecc255e97359c";
-      hash = "sha256-XSPO1Wtqlq1krwAH98jMIGWa1Npmnjd5oCJ0lc3D3H4=";
+      rev = "31aea563a83803c710691fed3e8d700e06ae6788";
+      hash = "sha256-YCYRx+DHhxazJ3ZAdmuqeYHOX5v6JEZhU9eo487yEtk=";
     };
 
     nativeBuildInputs = [
@@ -431,12 +431,12 @@ let
       stdenv;
 
   pname = "local-ai";
-  version = "2.22.1";
+  version = "2.23.0";
   src = fetchFromGitHub {
     owner = "go-skynet";
     repo = "LocalAI";
     rev = "v${version}";
-    hash = "sha256-vIjjGs3IIxnWlLsybQNWJHbWNnoInVh+otJ7vNODcik=";
+    hash = "sha256-7i2qW9yh++YQrEnjjxkHB7GJZSIIJQFJ9GyU2Rp9+kk=";
   };
 
   prepare-sources =
@@ -460,7 +460,7 @@ let
   self = buildGo123Module.override { stdenv = effectiveStdenv; } {
     inherit pname version src;
 
-    vendorHash = "sha256-tb2nVUCUdaOWHpJz4zMqgfJ4PYUqGwV/0lj76n36sUg=";
+    vendorHash = "sha256-bLeKh0aKSQrD5jTydG0ZLW5RCNb3oKvjCSeA9juI3B8=";
 
     env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4";
 

From 95eee45da2f51bba91107a3f86aeefdffb4b8837 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Nov 2024 16:44:55 +0000
Subject: [PATCH 02/46] libcpuid: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix
index 077c441f5c80..7511b49438bc 100644
--- a/pkgs/by-name/li/libcpuid/package.nix
+++ b/pkgs/by-name/li/libcpuid/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libcpuid";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "anrieff";
     repo = "libcpuid";
     rev = "v${version}";
-    hash = "sha256-OZfsEk6sTTvwgAetjilSWbkfC1nMQnPH3oL0IeuqObA=";
+    hash = "sha256-/28yo1V4/xYMirt2bNTB/l9Xl8NgRmxTitOW21TY8gE=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From f1b1f80d76cc6e2cb43ef710526ae77431b6da3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Dec 2024 00:18:01 +0000
Subject: [PATCH 03/46] coccinelle: 1.2 -> 1.3.0

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

diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 5e97e8486a63..056ef7744e1a 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "coccinelle";
-  version = "1.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     repo = "coccinelle";
     rev = finalAttrs.version;
     owner = "coccinelle";
-    hash = "sha256-v51KQLMJENLrlstCsP3DAuJJFMyjFyOZPJ7cRW5ovws=";
+    hash = "sha256-be95cuFP6bAdpCT0Z9zBAx9cc3gYuuXAmHYaI/bmyTE=";
   };
 
   nativeBuildInputs = with ocamlPackages; [

From 323491f4795dacefd58fed2a2f604ba6e220bed7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Dec 2024 20:47:48 +0000
Subject: [PATCH 04/46] openxr-loader: 1.1.42 -> 1.1.43

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

diff --git a/pkgs/by-name/op/openxr-loader/package.nix b/pkgs/by-name/op/openxr-loader/package.nix
index e82525479ba4..86e4e7d5d8bf 100644
--- a/pkgs/by-name/op/openxr-loader/package.nix
+++ b/pkgs/by-name/op/openxr-loader/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openxr-loader";
-  version = "1.1.42";
+  version = "1.1.43";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenXR-SDK-Source";
     rev = "release-${version}";
-    sha256 = "sha256-jHpCseldH02vcuoARHKGitaKi95atLfCPZxY6CVaM+4=";
+    sha256 = "sha256-Ze7r3qcYomcAIAoAO6FZDraKfFr/Wwrnv0HxmY6uE6w=";
   };
 
   nativeBuildInputs = [ cmake python3 pkg-config ];

From aaf03d7f0022f77ba1c2656ff0aec88ae7b36597 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Tue, 10 Dec 2024 19:40:40 -0600
Subject: [PATCH 05/46] sunshine: move to by-name

---
 .../0001-fix-upnp-support-newer-miniupnpc-library-2782.patch    | 0
 pkgs/{servers => by-name/su}/sunshine/package-lock.json         | 0
 .../sunshine/default.nix => by-name/su/sunshine/package.nix}    | 0
 pkgs/{servers => by-name/su}/sunshine/updater.sh                | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{servers => by-name/su}/sunshine/0001-fix-upnp-support-newer-miniupnpc-library-2782.patch (100%)
 rename pkgs/{servers => by-name/su}/sunshine/package-lock.json (100%)
 rename pkgs/{servers/sunshine/default.nix => by-name/su/sunshine/package.nix} (100%)
 rename pkgs/{servers => by-name/su}/sunshine/updater.sh (100%)

diff --git a/pkgs/servers/sunshine/0001-fix-upnp-support-newer-miniupnpc-library-2782.patch b/pkgs/by-name/su/sunshine/0001-fix-upnp-support-newer-miniupnpc-library-2782.patch
similarity index 100%
rename from pkgs/servers/sunshine/0001-fix-upnp-support-newer-miniupnpc-library-2782.patch
rename to pkgs/by-name/su/sunshine/0001-fix-upnp-support-newer-miniupnpc-library-2782.patch
diff --git a/pkgs/servers/sunshine/package-lock.json b/pkgs/by-name/su/sunshine/package-lock.json
similarity index 100%
rename from pkgs/servers/sunshine/package-lock.json
rename to pkgs/by-name/su/sunshine/package-lock.json
diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/by-name/su/sunshine/package.nix
similarity index 100%
rename from pkgs/servers/sunshine/default.nix
rename to pkgs/by-name/su/sunshine/package.nix
diff --git a/pkgs/servers/sunshine/updater.sh b/pkgs/by-name/su/sunshine/updater.sh
similarity index 100%
rename from pkgs/servers/sunshine/updater.sh
rename to pkgs/by-name/su/sunshine/updater.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd4aedf998d0..0f55b5c000cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18792,7 +18792,7 @@ with pkgs;
 
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
-  sunshine = callPackage ../servers/sunshine { };
+  sunshine = callPackage ../by-name/su/sunshine/package.nix { };
 
   jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {
     # TODO: remove once `udev` is `systemdMinimal` everywhere.

From a6048a8058bd4e1254bc671f83a034616c0d0a24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Dec 2024 03:37:22 +0000
Subject: [PATCH 06/46] sundials: 7.1.1 -> 7.2.0

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

diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index 4086db31f014..787e36465eed 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   pname = "sundials";
-  version = "7.1.1";
+  version = "7.2.0";
 
   outputs = [
     "out"
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
-    hash = "sha256-6n1u37UkSN39wexI+JpyH+bAolnBD471b2D83th6lLs=";
+    hash = "sha256-XGwKZqfifEW/tXsn91eUY4Vahfw5dv7R1cndiNwa46s=";
   };
 
   nativeBuildInputs = [

From 921233985c512efec8119b7de55b9958ad0110f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Dec 2024 00:58:02 +0000
Subject: [PATCH 07/46] pcaudiolib: 1.2 -> 1.3

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

diff --git a/pkgs/by-name/pc/pcaudiolib/package.nix b/pkgs/by-name/pc/pcaudiolib/package.nix
index c426e57d09cc..32f31d8fbfc0 100644
--- a/pkgs/by-name/pc/pcaudiolib/package.nix
+++ b/pkgs/by-name/pc/pcaudiolib/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pcaudiolib";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "espeak-ng";
     repo = "pcaudiolib";
     rev = finalAttrs.version;
-    hash = "sha256-ZG/HBk5DHaZP/H3M01vDr3M2nP9awwsPuKpwtalz3EE=";
+    hash = "sha256-bBiGvAySEwAv6Qj2iSawb9oZfMCGBDCDIP8AYdbtQQc=";
   };
 
   nativeBuildInputs = [

From 6d26f98353ec9c5e8cfc79488ff1ca50d515c0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sun, 15 Dec 2024 14:12:20 +0100
Subject: [PATCH 08/46] tbs: 20241026 -> 20241213

---
 pkgs/os-specific/linux/tbs/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix
index 841e8501c4b0..902cc24c93ad 100644
--- a/pkgs/os-specific/linux/tbs/default.nix
+++ b/pkgs/os-specific/linux/tbs/default.nix
@@ -13,22 +13,22 @@ let
     name = repo;
     owner = "tbsdtv";
     repo = "linux_media";
-    rev = "36ce48448be5dd42669a5199f61e85da1a68cf60";
-    hash = "sha256-fbb1ITcWymLoybA7VkfdpJmuRHKCP1s0CqLn0Rl2E2I=";
+    rev = "cf8cf4c06090fe3c2dc2f665764abc580b8a1921";
+    hash = "sha256-YTITVsSktxAoWBsIN6jXZD11pxXaMrMl5N6VZYxfTi0=";
   };
 
   build = fetchFromGitHub rec {
     name = repo;
     owner = "tbsdtv";
     repo = "media_build";
-    rev = "0f49c76b80838ded04bd64c56af9e1f9b8ac1965";
-    hash = "sha256-S5g7OTBJjzClLfy6C0PJwUtukrqoCiIjyU26Yy26hDo=";
+    rev = "f362ab16cb88cc1d3599408c22e3abc52aebe1fc";
+    hash = "sha256-xsZdrOgf+dA5B/GVWSnWUw0FInswPd1Kzg/qWE2JmqM=";
   };
 
 in
 stdenv.mkDerivation {
   pname = "tbs";
-  version = "20241026-${kernel.version}";
+  version = "20241213-${kernel.version}";
 
   srcs = [
     media
@@ -80,6 +80,6 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ ck3d ];
     priority = -1;
-    broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.12";
+    broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.13";
   };
 }

From 2eece2f7e06b98443c63d57164d40bac626129be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 16:21:07 +0000
Subject: [PATCH 09/46] rubberband: 3.3.0 -> 4.0.0

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

diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix
index d5acb98c22a4..65d1da508121 100644
--- a/pkgs/by-name/ru/rubberband/package.nix
+++ b/pkgs/by-name/ru/rubberband/package.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rubberband";
-  version = "3.3.0";
+  version = "4.0.0";
 
   src = fetchurl {
-    url = "https://breakfastquay.com/files/releases/${pname}-${version}.tar.bz2";
-    hash = "sha256-2e+J4rjvn4WxOsPC+uww4grPLJ86nIxFzmN/K8leV2w=";
+    url = "https://breakfastquay.com/files/releases/rubberband-${version}.tar.bz2";
+    hash = "sha256-rwUDE+5jvBizWy4GTl3OBbJ2qvbRqiuKgs7R/i+AKOk=";
   };
 
   nativeBuildInputs = [ pkg-config meson ninja jdk_headless ];

From 6086df8d4d348f50eb6e47fa8a91fc8a57f6f6b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Dec 2024 00:34:25 +0000
Subject: [PATCH 10/46] bio-gappa: 0.8.4 -> 0.8.5

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

diff --git a/pkgs/by-name/bi/bio-gappa/package.nix b/pkgs/by-name/bi/bio-gappa/package.nix
index da1c70583844..fdb38563321e 100644
--- a/pkgs/by-name/bi/bio-gappa/package.nix
+++ b/pkgs/by-name/bi/bio-gappa/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bio-gappa";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "lczech";
     repo = "gappa";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-VAp9e5Cu3tTeWSOTZ8kPG1eOyocYZiJsy/s+MWbCMLI=";
+    hash = "sha256-YuvJyLMfGUKXvJyMe/HadrCc6HRnn4bipepX2FOuGfM=";
     fetchSubmodules = true;
   };
 

From f6262762b2bda19e1ea187d53af0e223d50619c3 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Tue, 10 Dec 2024 19:56:58 -0600
Subject: [PATCH 11/46] sunshine: fix tray icon and menu links

---
 nixos/modules/services/networking/sunshine.nix | 2 ++
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/sunshine.nix b/nixos/modules/services/networking/sunshine.nix
index eaa769246add..2b723b74ce7b 100644
--- a/nixos/modules/services/networking/sunshine.nix
+++ b/nixos/modules/services/networking/sunshine.nix
@@ -177,6 +177,8 @@ in
       startLimitIntervalSec = 500;
       startLimitBurst = 5;
 
+      environment.PATH = lib.mkForce null; # don't use default PATH, needed for tray icon menu links to work
+
       serviceConfig = {
         # only add configFile if an application or a setting other than the default port is set to allow configuration from web UI
         ExecStart = escapeSystemdExecArgs (
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f55b5c000cb..54d0b3ce5eb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18792,7 +18792,9 @@ with pkgs;
 
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
-  sunshine = callPackage ../by-name/su/sunshine/package.nix { };
+  sunshine = callPackage ../by-name/su/sunshine/package.nix {
+    boost = boost185;
+  };
 
   jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {
     # TODO: remove once `udev` is `systemdMinimal` everywhere.

From 46abca2b83640403d8e449080fbc16bb928f6815 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Wed, 18 Sep 2024 16:43:48 +0300
Subject: [PATCH 12/46] nixos/tests/sunshine: fix test

- change text in `wait_for_console_text` to prevent sending curl with
pairing response before moonlight can accept it
- remove "close moonlight" step as next window stays on top in
fullscreen, previous window with pairing result does not interfere
with test. Otherwise it needs OCR or some other way to only do
`send_key("kp_enter")` after "Pairing complete" window is visible.
- add different ways to increase chances of successfull OCR: hide icewm
panel, gxmessage window takes full screen without titlebar or buttons,
black background, white foreground, consolas font,"ABC" text
- add `wait_for_console_text` to only run OCR after window is visible
---
 nixos/tests/sunshine.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/sunshine.nix b/nixos/tests/sunshine.nix
index 96ba81d62068..14e213353871 100644
--- a/nixos/tests/sunshine.nix
+++ b/nixos/tests/sunshine.nix
@@ -6,6 +6,7 @@ import ./make-test-python.nix (
       # test is flaky on aarch64
       broken = pkgs.stdenv.hostPlatform.isAarch64;
       maintainers = [ lib.maintainers.devusb ];
+      timeout = 600;
     };
 
     nodes.sunshine =
@@ -58,20 +59,23 @@ import ./make-test-python.nix (
 
       # initiate pairing from moonlight
       moonlight.execute("moonlight pair sunshine --pin 1234 >&2 & disown")
-      moonlight.wait_for_console_text("Executing request")
+      moonlight.wait_for_console_text("Executing request.*pair")
 
       # respond to pairing request from sunshine
-      sunshine.succeed("curl --insecure -u sunshine:sunshine -d '{\"pin\": \"1234\"}' https://localhost:47990/api/pin")
+      sunshine.succeed("curl --fail --insecure -u sunshine:sunshine -d '{\"pin\": \"1234\"}' https://localhost:47990/api/pin")
 
-      # close moonlight once pairing complete
-      moonlight.send_key("kp_enter")
+      # wait until pairing is complete
+      moonlight.wait_for_console_text("Executing request.*phrase=pairchallenge")
 
+      # hide icewm panel
+      sunshine.send_key("ctrl-alt-h")
       # put words on the sunshine screen for moonlight to see
-      sunshine.execute("gxmessage 'hello world' -center -font 'sans 75' >&2 & disown")
+      sunshine.execute("gxmessage ' ABC' -center -font 'consolas 100' -fg '#FFFFFF' -bg '#000000' -borderless -geometry '2000x2000' -buttons \"\" >&2 & disown")
 
       # connect to sunshine from moonlight and look for the words
       moonlight.execute("moonlight --video-decoder software stream sunshine 'Desktop' >&2 & disown")
-      moonlight.wait_for_text("hello world")
+      moonlight.wait_for_console_text("Dropping window event during flush")
+      moonlight.wait_for_text("ABC")
     '';
   }
 )

From 2ea22a2039af8fdc87d859729edd18f2e90de4a5 Mon Sep 17 00:00:00 2001
From: aktaboot <akhtaboot@protonmail.com>
Date: Tue, 17 Dec 2024 22:37:55 +0100
Subject: [PATCH 13/46] bolt: 0.9.7 -> 0.9.8

---
 pkgs/by-name/bo/bolt/0001-skip-mkdir.patch | 12 ------------
 pkgs/by-name/bo/bolt/package.nix           | 14 ++++----------
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/by-name/bo/bolt/0001-skip-mkdir.patch

diff --git a/pkgs/by-name/bo/bolt/0001-skip-mkdir.patch b/pkgs/by-name/bo/bolt/0001-skip-mkdir.patch
deleted file mode 100644
index 0853bcea9167..000000000000
--- a/pkgs/by-name/bo/bolt/0001-skip-mkdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/scripts/meson-install.sh b/scripts/meson-install.sh
-index 859ae81..05a1c58 100644
---- a/scripts/meson-install.sh
-+++ b/scripts/meson-install.sh
-@@ -7,5 +7,5 @@ fi
- 
- BOLT_DBDIR=$1
- 
--echo "Creating database dir: ${BOLT_DBDIR}"
--mkdir -p "${DESTDIR}/${BOLT_DBDIR}"
-+# echo "Creating database dir: ${BOLT_DBDIR}"
-+# mkdir -p "${DESTDIR}/${BOLT_DBDIR}"
diff --git a/pkgs/by-name/bo/bolt/package.nix b/pkgs/by-name/bo/bolt/package.nix
index c63df50bf2f9..a88bcfb60702 100644
--- a/pkgs/by-name/bo/bolt/package.nix
+++ b/pkgs/by-name/bo/bolt/package.nix
@@ -22,26 +22,23 @@
 
 stdenv.mkDerivation rec {
   pname = "bolt";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "bolt";
     repo = "bolt";
     rev = version;
-    sha256 = "sha256-6m4Yrev9W5WV4/pptc8tJ4hc6QSC+eJ7BSt2mx33s9U=";
+    hash = "sha256-sDPipSIT2MJMdsOjOQSB+uOe6KXzVnyAqcQxPPr2NsU=";
   };
 
   patches = [
-    # meson install tries to create /var/lib/boltd
-    ./0001-skip-mkdir.patch
-
     # Test does not work on ZFS with atime disabled.
     # Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167
     (fetchpatch {
       url = "https://gitlab.freedesktop.org/bolt/bolt/-/commit/c2f1d5c40ad71b20507e02faa11037b395fac2f8.diff";
       revert = true;
-      sha256 = "6w7ll65W/CydrWAVi/qgzhrQeDv1PWWShulLxoglF+I=";
+      hash = "sha256-6w7ll65W/CydrWAVi/qgzhrQeDv1PWWShulLxoglF+I=";
     })
   ];
 
@@ -59,16 +56,13 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     glib
-  ] ++ lib.optional (!doCheck) python3;
+  ];
 
   buildInputs = [
     polkit
     systemd
   ];
 
-  # https://gitlab.freedesktop.org/bolt/bolt/-/issues/181
-  doCheck = false;
-
   preCheck = ''
     export LD_LIBRARY_PATH=${umockdev.out}/lib/
   '';

From aed5169ad4c42542047eee9d3c74a06b26989b04 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Wed, 18 Dec 2024 19:57:34 +0800
Subject: [PATCH 14/46] clockify: fomat

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

diff --git a/pkgs/by-name/cl/clockify/package.nix b/pkgs/by-name/cl/clockify/package.nix
index 54824d13ef60..94791ff6ee4e 100644
--- a/pkgs/by-name/cl/clockify/package.nix
+++ b/pkgs/by-name/cl/clockify/package.nix
@@ -22,13 +22,13 @@ appimageTools.wrapType2 rec {
       install -Dm 444 ${appimageContents}/clockify.png -t $out/share/pixmaps
 
       substituteInPlace $out/share/applications/clockify.desktop \
-        --replace 'Exec=AppRun' 'Exec=${pname}'
+        --replace-fail 'Exec=AppRun' 'Exec=${pname}'
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Free time tracker and timesheet app that lets you track work hours across projects";
     homepage = "https://clockify.me";
-    license = licenses.unfree;
+    license = lib.licenses.unfree;
     maintainers = [ ];
     mainProgram = "clockify";
     platforms = [ "x86_64-linux" ];

From 0cb24b8232fa69b2672979a6bf1f65d858d70ca2 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Wed, 18 Dec 2024 20:03:19 +0800
Subject: [PATCH 15/46] clockify: 2.1.17.1354 -> 2.2.9.2224

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

diff --git a/pkgs/by-name/cl/clockify/package.nix b/pkgs/by-name/cl/clockify/package.nix
index 94791ff6ee4e..6441c4bbc202 100644
--- a/pkgs/by-name/cl/clockify/package.nix
+++ b/pkgs/by-name/cl/clockify/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "clockify";
-  version = "2.1.17.1354";
+  version = "2.2.9.2224";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20240406052908/https://clockify.me/downloads/Clockify_Setup.AppImage";
-    hash = "sha256-G5VOAf6PrjHUsnk7IlXdqJ2D941cnggjuHkkgrOaVaA=";
+    url = "https://web.archive.org/web/20241218115559/https://clockify.me/downloads/Clockify_Setup.AppImage";
+    hash = "sha256-/L70C+sTFJPzXkt1NSak2wVTRtFy2zInIlmLPG5LqeY=";
   };
 
   extraInstallCommands =

From 95f0b0a468a13887bd00dcf08df1a9980b61c0c8 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Thu, 19 Dec 2024 01:10:33 +0800
Subject: [PATCH 16/46] qtractor: remove with lib

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

diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix
index c305a89fc8d7..a03c4205bc12 100644
--- a/pkgs/by-name/qt/qtractor/package.nix
+++ b/pkgs/by-name/qt/qtractor/package.nix
@@ -71,13 +71,13 @@ stdenv.mkDerivation rec {
     suil
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Audio/MIDI multi-track sequencer";
     homepage = "https://qtractor.sourceforge.io";
     changelog = "https://github.com/rncbc/qtractor/blob/v${version}/ChangeLog";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     mainProgram = "qtractor";
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

From 46ca5fbf76fe9292ad9f001a0c6aa176b160f57b Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Thu, 19 Dec 2024 02:24:51 +0800
Subject: [PATCH 17/46] qtractor: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix
index a03c4205bc12..c3c0c0d5875d 100644
--- a/pkgs/by-name/qt/qtractor/package.nix
+++ b/pkgs/by-name/qt/qtractor/package.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation rec {
   pname = "qtractor";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz";
-    hash = "sha256-1BuytrG2y/cAa2v4nex2TM0v7SEsUuu1QzBs1DczhkA=";
+    hash = "sha256-p2Fuads2uTiEIXRS7sqe8Fa3XEKwW1ND/pPnUhFlLdY=";
   };
 
   nativeBuildInputs = [

From 47f5decc4caa8e1a8fd8a2bf9c43e08ce9bb2dfc Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Thu, 19 Dec 2024 00:06:12 +0800
Subject: [PATCH 18/46] calculix: rename to calculix-ccx

---
 .../calculix.patch => calculix-ccx/calculix-ccx.patch}        | 0
 pkgs/by-name/ca/{calculix => calculix-ccx}/package.nix        | 4 ++--
 pkgs/top-level/aliases.nix                                    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename pkgs/by-name/ca/{calculix/calculix.patch => calculix-ccx/calculix-ccx.patch} (100%)
 rename pkgs/by-name/ca/{calculix => calculix-ccx}/package.nix (95%)

diff --git a/pkgs/by-name/ca/calculix/calculix.patch b/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch
similarity index 100%
rename from pkgs/by-name/ca/calculix/calculix.patch
rename to pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch
diff --git a/pkgs/by-name/ca/calculix/package.nix b/pkgs/by-name/ca/calculix-ccx/package.nix
similarity index 95%
rename from pkgs/by-name/ca/calculix/package.nix
rename to pkgs/by-name/ca/calculix-ccx/package.nix
index aae214513391..49c58b86407a 100644
--- a/pkgs/by-name/ca/calculix/package.nix
+++ b/pkgs/by-name/ca/calculix-ccx/package.nix
@@ -12,7 +12,7 @@
 assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64);
 
 stdenv.mkDerivation rec {
-  pname = "calculix";
+  pname = "calculix-ccx";
   version = "2.19";
 
   src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    ./calculix.patch
+    ./calculix-ccx.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 74e47c2d0be7..c8173d5f5c65 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -186,6 +186,7 @@ mapAliases {
   ### C ###
 
   caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20
+  calculix = calculix-ccx; # Added 2024-12-18
   calligra = kdePackages.calligra; # Added 2024-09-27
   callPackage_i686 = pkgsi686Linux.callPackage;
   cask = emacs.pkgs.cask; # Added 2022-11-12

From f5987ef17042028368ded99935faef632ce73fe2 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Thu, 19 Dec 2024 00:36:08 +0800
Subject: [PATCH 19/46] calculix-ccx: 2.19 -> 2.22

---
 .../by-name/ca/calculix-ccx/calculix-ccx.patch | 18 ++++++++----------
 pkgs/by-name/ca/calculix-ccx/package.nix       | 18 +++++++++++-------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch b/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch
index 36048546948c..add650e1798b 100644
--- a/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch
+++ b/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch
@@ -1,8 +1,6 @@
-diff --git a/ccx_2.19/src/Makefile b/ccx_2.19/src/Makefile
-index c503513..8a69a0c 100755
---- a/ccx_2.19/src/Makefile
-+++ b/ccx_2.19/src/Makefile
-@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o)
+--- old/ccx_2.22/src/Makefile	2024-08-06 01:13:21.031704000 +0800
++++ new/ccx_2.22/src/Makefile	2024-12-19 00:27:06.848862592 +0800
+@@ -18,15 +18,10 @@
  OCCXC = $(SCCXC:.c=.o)
  OCCXMAIN = $(SCCXMAIN:.c=.o)
  
@@ -14,10 +12,10 @@ index c503513..8a69a0c 100755
 -	../../../ARPACK/libarpack_INTEL.a \
 -       -lpthread -lm -lc
 -
--ccx_2.19: $(OCCXMAIN) ccx_2.19.a  $(LIBS)
--	./date.pl; $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp
-+ccx_2.19: $(OCCXMAIN) ccx_2.19.a
-+	$(CC) $(CFLAGS) -c ccx_2.19.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp
+-ccx_2.22: $(OCCXMAIN) ccx_2.22.a  $(LIBS)
+-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.22.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.22.a $(LIBS) -fopenmp
++ccx_2.22: $(OCCXMAIN) ccx_2.22.a
++	$(CC) $(CFLAGS) -c ccx_2.22.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.22.a $(LIBS) -fopenmp
  
- ccx_2.19.a: $(OCCXF) $(OCCXC)
+ ccx_2.22.a: $(OCCXF) $(OCCXC)
  	ar vr $@ $?
diff --git a/pkgs/by-name/ca/calculix-ccx/package.nix b/pkgs/by-name/ca/calculix-ccx/package.nix
index 49c58b86407a..9afb29e17e42 100644
--- a/pkgs/by-name/ca/calculix-ccx/package.nix
+++ b/pkgs/by-name/ca/calculix-ccx/package.nix
@@ -13,11 +13,11 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !bla
 
 stdenv.mkDerivation rec {
   pname = "calculix-ccx";
-  version = "2.19";
+  version = "2.22";
 
   src = fetchurl {
     url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2";
-    sha256 = "01vdy9sns58hkm39z6d0r5y7gzqf5z493d18jin9krqib1l6jnn7";
+    hash = "sha256-OpTcx3WjH1cCKXNLNB1rBjAevcdZhj35Aci5vxhUwLw=";
   };
 
   nativeBuildInputs = [ gfortran ];
@@ -43,15 +43,19 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
+    runHook preInstall
+
     install -Dm0755 ccx_${version} $out/bin/ccx
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
-    homepage = "http://www.calculix.de/";
+  meta = {
+    homepage = "http://www.calculix.de";
     description = "Three-dimensional structural finite element program";
     mainProgram = "ccx";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ gebner ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ gebner ];
+    platforms = lib.platforms.unix;
   };
 }

From a36ae47a1b6b41dac9971a011ce25d96fb89ff9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 19:44:10 +0000
Subject: [PATCH 20/46] openvas-scanner: 23.13.1 -> 23.14.0

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

diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix
index 3df339ec6105..d00a3575ef00 100644
--- a/pkgs/by-name/op/openvas-scanner/package.nix
+++ b/pkgs/by-name/op/openvas-scanner/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openvas-scanner";
-  version = "23.13.1";
+  version = "23.14.0";
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "openvas-scanner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MT5AtuJQeSUjN+jbqJ957+oy24wVAZ89bkZ4bMxIFNc=";
+    hash = "sha256-1IesoAK5Aq/JlM83WT0dodwmUvWv6RDqTyUg6LURle4=";
   };
 
   nativeBuildInputs = [

From 0ff62ae974a23a843fa6c8f5e6db887caa796ec8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 22:07:52 +0000
Subject: [PATCH 21/46] docker-buildx: 0.18.0 -> 0.19.3

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

diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 562a6b87922e..84e98cad92c3 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "docker-buildx";
-  version = "0.18.0";
+  version = "0.19.3";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
     rev = "v${version}";
-    hash = "sha256-mw66AF+JwavuB8r2qzo50rguqZaUfzCVmyYI6yk7ig8=";
+    hash = "sha256-0LK79CdZF3JGuxUgM3V4HhZ4rpVoXEQ9YG8vdAn+cyA=";
   };
 
   doCheck = false;

From 50eaaa1caa387f951478b5f219b0a3a83ea2ce3d Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@slow.janky.email>
Date: Thu, 19 Dec 2024 10:14:58 +0530
Subject: [PATCH 22/46] yggdrasil: 0.5.11 -> 0.5.12

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

diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix
index 6c817e349834..c7e2b7c5ee8b 100644
--- a/pkgs/by-name/yg/yggdrasil/package.nix
+++ b/pkgs/by-name/yg/yggdrasil/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "yggdrasil";
-  version = "0.5.11";
+  version = "0.5.12";
 
   src = fetchFromGitHub {
     owner = "yggdrasil-network";
     repo = "yggdrasil-go";
     rev = "v${version}";
-    hash = "sha256-029bG3zHEJKjP8fvq+TxiAR/JiGqXzrK5gnxvyve9FA=";
+    hash = "sha256-NlNQnYmK//p35pj2MInD6RVsajM/bGDhOuzOZZYoWRw=";
   };
 
-  vendorHash = "sha256-D65Sbc9W5qYO/GmSIvFRwPpGJlX7bzsp8yN6yb3prWY=";
+  vendorHash = "sha256-xZpUWIR3xTjhhNSwPoHx7GLUgcZJrWfF0FMExlluBmg=";
 
   subPackages = [
     "cmd/genkeys"

From 4410ed3e80d45666d7028e3293959b8a17a0e7cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 08:43:00 +0000
Subject: [PATCH 23/46] python312Packages.msgraph-sdk: 1.14.0 -> 1.15.0

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

diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix
index 8b44541cd221..2ae38b89ea60 100644
--- a/pkgs/development/python-modules/msgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/msgraph-sdk/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "msgraph-sdk";
-  version = "1.14.0";
+  version = "1.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-qCrBd1RIIjVJQyWf7srdFHNQc8TYh3zDtq/nepbk6tE=";
+    tag = "v${version}";
+    hash = "sha256-jGGBWakuGXY7zH7Gb5C/e7hJB//B+Ko/l0TyxGHz0N4=";
   };
 
   build-system = [ flit-core ];

From 667e57cfcf2a2947ebf124a01e529c4bea345ff0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 08:49:34 +0000
Subject: [PATCH 24/46] storj-uplink: 1.118.8 -> 1.119.3

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

diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix
index b31199c4f7b1..b5db91926747 100644
--- a/pkgs/by-name/st/storj-uplink/package.nix
+++ b/pkgs/by-name/st/storj-uplink/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "storj-uplink";
-  version = "1.118.8";
+  version = "1.119.3";
 
   src = fetchFromGitHub {
     owner = "storj";
     repo = "storj";
     rev = "v${version}";
-    hash = "sha256-kVV5d3ULRg/yGWZJSR2gP0X3gaGPM3Uy0ZkLed1Kb+U=";
+    hash = "sha256-O+DCMgrhlunqetL2GYbNSuSbfcyYNNP3kf9bL6P3uHQ=";
   };
 
   subPackages = [ "cmd/uplink" ];
 
-  vendorHash = "sha256-5pNYC1ubjxaU7KPd4lsEOyAe/OU95UID4JtFJ6Q+E3w=";
+  vendorHash = "sha256-DgW1RCyTDfbc7BiMeMVMWY1gHNdxiLxojAn0NGNeWqA=";
 
   ldflags = [
     "-s"

From c0125794c47fa7a76f52f11a7edf51bd8dbb4d49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 10:50:39 +0000
Subject: [PATCH 25/46] prowler: 5.0.1 -> 5.0.2

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

diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix
index 1f993ce543a2..443901d6c0a7 100644
--- a/pkgs/by-name/pr/prowler/package.nix
+++ b/pkgs/by-name/pr/prowler/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "prowler";
-  version = "5.0.1";
+  version = "5.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "prowler-cloud";
     repo = "prowler";
-    rev = "refs/tags/${version}";
-    hash = "sha256-yT6hyOmKkndJvtbxGQdzmW/miC8kz1yIo3DxvMPJ30Y=";
+    tag = version;
+    hash = "sha256-8sQodEh12aEcIgBMC9kvI/aBTqttCC0lcQUl+D+k+XA=";
   };
 
   pythonRelaxDeps = true;

From 3505d1484aaba6ae01e86c814e54b5167e5a4830 Mon Sep 17 00:00:00 2001
From: Jean-Luc Jox <jeanluc.jox@gmail.com>
Date: Mon, 18 Nov 2024 14:06:12 +1000
Subject: [PATCH 26/46] upbound: 0.34.0 -> 0.36.1, upbound-main: init at
 0.37.0-0.rc.0.38.g797e121

---
 pkgs/by-name/up/upbound-main/package.nix   |  6 ++
 pkgs/by-name/up/upbound/package.nix        | 97 ++++++++++++++++------
 pkgs/by-name/up/upbound/sources-main.nix   | 54 ++++++++++++
 pkgs/by-name/up/upbound/sources-stable.nix | 54 ++++++++++++
 pkgs/by-name/up/upbound/update.sh          | 83 ++++++++++++++++++
 5 files changed, 270 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/by-name/up/upbound-main/package.nix
 create mode 100644 pkgs/by-name/up/upbound/sources-main.nix
 create mode 100644 pkgs/by-name/up/upbound/sources-stable.nix
 create mode 100755 pkgs/by-name/up/upbound/update.sh

diff --git a/pkgs/by-name/up/upbound-main/package.nix b/pkgs/by-name/up/upbound-main/package.nix
new file mode 100644
index 000000000000..af8f2c95876f
--- /dev/null
+++ b/pkgs/by-name/up/upbound-main/package.nix
@@ -0,0 +1,6 @@
+{
+  upbound,
+}:
+upbound.override {
+  version-channel = "main";
+}
diff --git a/pkgs/by-name/up/upbound/package.nix b/pkgs/by-name/up/upbound/package.nix
index 9bf2b100c910..0315f9600493 100644
--- a/pkgs/by-name/up/upbound/package.nix
+++ b/pkgs/by-name/up/upbound/package.nix
@@ -1,32 +1,81 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  fetchurl,
+  installShellFiles,
+  versionCheckHook,
+  stdenvNoCC,
+  version-channel ? "stable",
+}:
+let
+  inherit (stdenvNoCC.hostPlatform) system;
+  sources =
+    if "${version-channel}" == "main" then import ./sources-main.nix else import ./sources-stable.nix;
+  arch = sources.archMap.${system};
 
-buildGoModule rec {
-  pname = "upbound";
-  version = "0.34.0";
+in
+stdenvNoCC.mkDerivation {
+  pname = if "${version-channel}" == "main" then "upbound-main" else "upbound";
+  version = sources.version;
+  srcs = [
+    (fetchurl {
+      url = sources.fetchurlAttrSet.${system}.docker-credential-up.url;
+      sha256 = sources.fetchurlAttrSet.${system}.docker-credential-up.hash;
+    })
 
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = "up";
-    rev = "v${version}";
-    hash = "sha256-npWCGR0/iXAF7efreWhpwqboXJ24lqk5TPaB7glwEFI=";
-  };
-
-  vendorHash = "sha256-f/RPyjrC5FsOjC5wnBtqEbLeVX7VeiVYFpRXcQ2lTc4=";
-
-  subPackages = [ "cmd/docker-credential-up" "cmd/up" ];
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X github.com/upbound/up/internal/version.version=v${version}"
+    (fetchurl {
+      url = sources.fetchurlAttrSet.${system}.up.url;
+      sha256 = sources.fetchurlAttrSet.${system}.up.hash;
+    })
   ];
 
-  meta = with lib; {
-    description =
-      "CLI for interacting with Upbound Cloud, Upbound Enterprise, and Universal Crossplane (UXP)";
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+
+    cp ./${arch}/up $out/bin/up
+    chmod +x $out/bin/up
+
+    cp ./${arch}/docker-credential-up $out/bin/docker-credential-up
+    chmod +x $out/bin/docker-credential-up
+
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    installShellCompletion --bash --name up <(echo complete -C up up)
+  '';
+
+  versionCheckProgramArg = "version";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  doCheck = false;
+
+  passthru.updateScript = [
+    ./update.sh
+    "${version-channel}"
+  ];
+
+  passthru.tests = {
+    versionCheck = versionCheckHook;
+  };
+
+  meta = {
+    description = "CLI for interacting with Upbound Cloud, Upbound Enterprise, and Universal Crossplane (UXP)";
     homepage = "https://upbound.io";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ lucperkins ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
+      lucperkins
+      jljox
+    ];
     mainProgram = "up";
+    platforms = sources.platformList;
   };
 }
diff --git a/pkgs/by-name/up/upbound/sources-main.nix b/pkgs/by-name/up/upbound/sources-main.nix
new file mode 100644
index 000000000000..acf3aee01529
--- /dev/null
+++ b/pkgs/by-name/up/upbound/sources-main.nix
@@ -0,0 +1,54 @@
+# Generated by "update.sh main" - do not update manually!
+{
+  version = "0.37.0-0.rc.0.38.g797e121";
+
+  platformList = [
+    "aarch64-linux"
+    "x86_64-linux"
+    "x86_64-darwin"
+    "aarch64-darwin"
+  ];
+
+  archMap = {
+    aarch64-linux = "linux_arm64";
+    x86_64-linux = "linux_amd64";
+    x86_64-darwin = "darwin_amd64";
+    aarch64-darwin = "darwin_arm64";
+  };
+
+  fetchurlAttrSet = {
+
+    aarch64-linux.docker-credential-up = {
+      hash = "sha256-nZXniTuLzmV7tK/Pd4BjUzqYYH2OmQKC4yoCHOhZ3C8=";
+      url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/docker-credential-up/linux_arm64.tar.gz";
+    };
+    x86_64-linux.docker-credential-up = {
+      hash = "sha256-LILaT+vn2CdKzNWxYOeda+Zid9V11I94+vwDGkGwxuQ=";
+      url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/docker-credential-up/linux_amd64.tar.gz";
+    };
+    x86_64-darwin.docker-credential-up = {
+      hash = "sha256-7eUWveGIbimxbwOGtA6qrU7F8p8EpOCTHXN4vj74qqA=";
+      url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/docker-credential-up/darwin_amd64.tar.gz";
+    };
+    aarch64-darwin.docker-credential-up = {
+      hash = "sha256-XTgSZjbHXyt1BXNeaHXqdi4gs8eeD/7rE657oAeQKv4=";
+      url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/docker-credential-up/darwin_arm64.tar.gz";
+    };
+    aarch64-linux.up = {
+      hash = "sha256-cNk4uaXcdH3EucwGnGXGsPbmKGGO+ig3xfJ+fAcwEbo=";
+      url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/up/linux_arm64.tar.gz";
+    };
+    x86_64-linux.up = {
+      hash = "sha256-3h+Jtl84UdWvs2cbrDsbtqlCCpvvYjzXZLmzDY/9aXE=";
+      url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/up/linux_amd64.tar.gz";
+    };
+    x86_64-darwin.up = {
+      hash = "sha256-WzngxshyHnR1H7Rhkbw/wkN1i3TWyV8CcBTwLNVggdU=";
+      url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/up/darwin_amd64.tar.gz";
+    };
+    aarch64-darwin.up = {
+      hash = "sha256-KLcxE4847DE6e0AznjlNZnS6GNhT1JJaCnYDecTZ6EQ=";
+      url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/up/darwin_arm64.tar.gz";
+    };
+  };
+}
diff --git a/pkgs/by-name/up/upbound/sources-stable.nix b/pkgs/by-name/up/upbound/sources-stable.nix
new file mode 100644
index 000000000000..1dfc1b574cd2
--- /dev/null
+++ b/pkgs/by-name/up/upbound/sources-stable.nix
@@ -0,0 +1,54 @@
+# Generated by "update.sh stable" - do not update manually!
+{
+  version = "0.36.1";
+
+  platformList = [
+    "aarch64-linux"
+    "x86_64-linux"
+    "x86_64-darwin"
+    "aarch64-darwin"
+  ];
+
+  archMap = {
+    aarch64-linux = "linux_arm64";
+    x86_64-linux = "linux_amd64";
+    x86_64-darwin = "darwin_amd64";
+    aarch64-darwin = "darwin_arm64";
+  };
+
+  fetchurlAttrSet = {
+
+    aarch64-linux.docker-credential-up = {
+      hash = "sha256-BnEQWK1Y4rCDEk5BgkUIeF0oK6C77AQZh6KWhS+MfqM=";
+      url = "https://cli.upbound.io/stable/v0.36.1/bundle/docker-credential-up/linux_arm64.tar.gz";
+    };
+    x86_64-linux.docker-credential-up = {
+      hash = "sha256-4A0Di92G/vi9NR/pH20E8aaSn/jYhduQbYH6aLL2R3E=";
+      url = "https://cli.upbound.io/stable/v0.36.1/bundle/docker-credential-up/linux_amd64.tar.gz";
+    };
+    x86_64-darwin.docker-credential-up = {
+      hash = "sha256-/i4VsDUk0B+htRv0UCjCLT1ByewO8UNHOMbbxqIfvvE=";
+      url = "https://cli.upbound.io/stable/v0.36.1/bundle/docker-credential-up/darwin_amd64.tar.gz";
+    };
+    aarch64-darwin.docker-credential-up = {
+      hash = "sha256-gaaaOfn8oOxjlYruGePFZ+e65cUgRJSlsr4iweVYdSE=";
+      url = "https://cli.upbound.io/stable/v0.36.1/bundle/docker-credential-up/darwin_arm64.tar.gz";
+    };
+    aarch64-linux.up = {
+      hash = "sha256-mxuDhdO0nZkozMsKiKcDPBscgrY0pSChJP5TUJz729E=";
+      url = "https://cli.upbound.io/stable/v0.36.1/bundle/up/linux_arm64.tar.gz";
+    };
+    x86_64-linux.up = {
+      hash = "sha256-oZ1RpPZAKzChRWKUhUcKPRXhqmf3FBXvpFCICMsWh+w=";
+      url = "https://cli.upbound.io/stable/v0.36.1/bundle/up/linux_amd64.tar.gz";
+    };
+    x86_64-darwin.up = {
+      hash = "sha256-a4QsXlfmmFhRYxC0yZ7yVIHmP8VUgggfOZSenMXGlKA=";
+      url = "https://cli.upbound.io/stable/v0.36.1/bundle/up/darwin_amd64.tar.gz";
+    };
+    aarch64-darwin.up = {
+      hash = "sha256-PPHlADbIiQ/CAF746lulvuHjwwo1V563K9Haf/7IjEI=";
+      url = "https://cli.upbound.io/stable/v0.36.1/bundle/up/darwin_arm64.tar.gz";
+    };
+  };
+}
diff --git a/pkgs/by-name/up/upbound/update.sh b/pkgs/by-name/up/upbound/update.sh
new file mode 100755
index 000000000000..ad0460aaade0
--- /dev/null
+++ b/pkgs/by-name/up/upbound/update.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl
+
+#set -euo pipefail
+
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
+
+# value can be main | stable
+# Ensure at least one argument is passed
+if [[ $# -lt 1 ]]; then
+  echo "Error: No argument provided. Please specify 'main' or 'stable'."
+  exit 1
+fi
+
+# Check if the first argument is 'main' or 'stable'
+if [[ "$1" == "main" || "$1" == "stable" ]]; then
+  echo "Valid input: $1"
+else
+  echo "Error: Invalid input. Please specify 'main' or 'stable'."
+  exit 1
+fi
+channel=$1
+
+baseUrl="https://cli.upbound.io/${channel}"
+currentVersion=$(curl ${baseUrl}/current/version)
+
+version="${currentVersion:1}"
+
+declare -A archMapping
+archMapping["aarch64-darwin"]="darwin_arm64"
+archMapping["x86_64-darwin"]="darwin_amd64"
+archMapping["aarch64-linux"]="linux_arm64"
+archMapping["x86_64-linux"]="linux_amd64"
+
+archMapBlock=
+for key in "${!archMapping[@]}"; do
+    line=$(printf "$key = \"${archMapping[$key]}\"; ")
+    archMapBlock="$archMapBlock$line"
+done
+
+platformListBlock=
+for key in "${!archMapping[@]}"; do
+    platformListBlock="$platformListBlock\"$key\" "
+done
+
+cmds=("docker-credential-up" "up")
+fetchurlAttrSetBlock=
+for cmd in "${cmds[@]}"; do
+    for key in "${!archMapping[@]}"; do
+        arch=${archMapping[$key]}
+        url="${baseUrl}/v${version}/bundle/$cmd/${arch}.tar.gz";
+        hash=$(nix-prefetch-url $url)
+        hash=$(nix hash convert "${hash}" --hash-algo sha256)
+        fetchurlAttrSetBlock="
+        ${fetchurlAttrSetBlock}
+        $key.$cmd = {
+          hash = \"${hash}\";
+          url = ${url};
+        };"
+    done
+done
+
+OUT_FILE="$SCRIPT_DIR/sources-${channel}.nix"
+cat >$OUT_FILE <<EOF
+# Generated by "update.sh ${channel}" - do not update manually!
+{
+  version = "${version}";
+
+  platformList = [
+    ${platformListBlock}
+    ];
+
+  archMap = {
+    ${archMapBlock}
+    };
+
+  fetchurlAttrSet = {
+    ${fetchurlAttrSetBlock}
+    };
+}
+EOF
+
+nixfmt $OUT_FILE

From 10ddebe5cee5121b5be0dd92ca629a698ce5912a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 12:31:33 +0000
Subject: [PATCH 27/46] msbuild-structured-log-viewer: 2.2.383 -> 2.2.392

---
 .../ms/msbuild-structured-log-viewer/deps.nix | 393 +++++++++++++++---
 .../msbuild-structured-log-viewer/package.nix |   4 +-
 2 files changed, 330 insertions(+), 67 deletions(-)

diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix
index 65452a6f93de..34286768531c 100644
--- a/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix
+++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix
@@ -1,69 +1,332 @@
 # This file was automatically generated by passthru.fetch-deps.
 # Please dont edit it manually, your changes might get overwritten!
+# TODO: This format file is obsolete, consider migrating to JSON.
 
-{ fetchNuGet }: [
-  (fetchNuGet { pname = "AutomaticGraphLayout"; version = "1.1.12"; hash = "sha256-Fe4pGr+Ln1FfgHD3Odq2WOTrhi2nD/jjnh2cKLC2pwo="; })
-  (fetchNuGet { pname = "AutomaticGraphLayout.Drawing"; version = "1.1.12"; hash = "sha256-KPyc4JxcQkGTeb5tceB3zRN8FqTj7jzimb97NOhZPl0="; })
-  (fetchNuGet { pname = "Avalonia"; version = "11.0.0"; hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="; })
-  (fetchNuGet { pname = "Avalonia"; version = "11.1.3"; hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; })
-  (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; })
-  (fetchNuGet { pname = "Avalonia.AvaloniaEdit"; version = "11.1.0"; hash = "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="; })
-  (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="; })
-  (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; })
-  (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.3"; hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="; })
-  (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.3"; hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="; })
-  (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.3"; hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="; })
-  (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.3"; hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="; })
-  (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.3"; hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="; })
-  (fetchNuGet { pname = "Avalonia.Native"; version = "11.1.3"; hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="; })
-  (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="; })
-  (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.3"; hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="; })
-  (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.3"; hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="; })
-  (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.3"; hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="; })
-  (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.3"; hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="; })
-  (fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.3"; hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="; })
-  (fetchNuGet { pname = "Avalonia.X11"; version = "11.1.3"; hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="; })
-  (fetchNuGet { pname = "DotUtils.StreamUtils.Sources"; version = "0.0.8"; hash = "sha256-KL5PkSsuZ9uPgtzK7rB0W6XGTcJQGqHoZqMLhpFR7tw="; })
-  (fetchNuGet { pname = "GuiLabs.Language.Xml"; version = "1.2.93"; hash = "sha256-4fvD+8QBxEpVqcQtZ+gE8GhY7Iaay4aFr5HWQ9LGeqk="; })
-  (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; })
-  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; })
-  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; })
-  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0.2"; hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; })
-  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; })
-  (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; })
-  (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.5.0"; hash = "sha256-FVomTQ8rZ5Ga09piFxSDFQ+b3gpC2ddZd+pQBSn5Csw="; })
-  (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="; })
-  (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.5.0"; hash = "sha256-W4bN0E9/DgEw0fxopXUhMK9tuGGwm0NYK3APytAzNRI="; })
-  (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.5.0"; hash = "sha256-9eoXaPQvt6YAeb+cK5/ekh3YFfjymZCzJAxsDsIPlMQ="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
-  (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="; })
-  (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="; })
-  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; })
-  (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; })
-  (fetchNuGet { pname = "Nerdbank.GitVersioning"; version = "3.6.141"; hash = "sha256-i1pBJ12vlPmde6qSQK4PG2QLSpjaUCoY+odTi24R5XI="; })
-  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; })
-  (fetchNuGet { pname = "Nullable"; version = "1.3.1"; hash = "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM="; })
-  (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; })
-  (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; })
-  (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; })
-  (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.8"; hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; })
-  (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; })
-  (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; })
-  (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; })
-  (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; })
-  (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; })
-  (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; })
-  (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; })
-  (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; })
-  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; })
-  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; })
-  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; })
-  (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; })
-  (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; })
-  (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; })
-  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; })
-  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; })
-  (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; })
-  (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.16.0"; hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; })
+{ fetchNuGet }:
+[
+  (fetchNuGet {
+    pname = "AutomaticGraphLayout";
+    version = "1.1.12";
+    hash = "sha256-Fe4pGr+Ln1FfgHD3Odq2WOTrhi2nD/jjnh2cKLC2pwo=";
+  })
+  (fetchNuGet {
+    pname = "AutomaticGraphLayout.Drawing";
+    version = "1.1.12";
+    hash = "sha256-KPyc4JxcQkGTeb5tceB3zRN8FqTj7jzimb97NOhZPl0=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia";
+    version = "11.0.0";
+    hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia";
+    version = "11.1.3";
+    hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Angle.Windows.Natives";
+    version = "2.1.22045.20230930";
+    hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.AvaloniaEdit";
+    version = "11.1.0";
+    hash = "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.BuildServices";
+    version = "0.0.28";
+    hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.BuildServices";
+    version = "0.0.29";
+    hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Controls.ColorPicker";
+    version = "11.1.3";
+    hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Controls.DataGrid";
+    version = "11.1.3";
+    hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Desktop";
+    version = "11.1.3";
+    hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Diagnostics";
+    version = "11.1.3";
+    hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.FreeDesktop";
+    version = "11.1.3";
+    hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Native";
+    version = "11.1.3";
+    hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Remote.Protocol";
+    version = "11.0.0";
+    hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Remote.Protocol";
+    version = "11.1.3";
+    hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Skia";
+    version = "11.1.3";
+    hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Themes.Fluent";
+    version = "11.1.3";
+    hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Themes.Simple";
+    version = "11.1.3";
+    hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.Win32";
+    version = "11.1.3";
+    hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc=";
+  })
+  (fetchNuGet {
+    pname = "Avalonia.X11";
+    version = "11.1.3";
+    hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw=";
+  })
+  (fetchNuGet {
+    pname = "DotUtils.StreamUtils.Sources";
+    version = "0.0.8";
+    hash = "sha256-KL5PkSsuZ9uPgtzK7rB0W6XGTcJQGqHoZqMLhpFR7tw=";
+  })
+  (fetchNuGet {
+    pname = "GuiLabs.Language.Xml";
+    version = "1.2.93";
+    hash = "sha256-4fvD+8QBxEpVqcQtZ+gE8GhY7Iaay4aFr5HWQ9LGeqk=";
+  })
+  (fetchNuGet {
+    pname = "HarfBuzzSharp";
+    version = "7.3.0.2";
+    hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=";
+  })
+  (fetchNuGet {
+    pname = "HarfBuzzSharp.NativeAssets.Linux";
+    version = "7.3.0.2";
+    hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=";
+  })
+  (fetchNuGet {
+    pname = "HarfBuzzSharp.NativeAssets.macOS";
+    version = "7.3.0.2";
+    hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=";
+  })
+  (fetchNuGet {
+    pname = "HarfBuzzSharp.NativeAssets.WebAssembly";
+    version = "7.3.0.2";
+    hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c=";
+  })
+  (fetchNuGet {
+    pname = "HarfBuzzSharp.NativeAssets.Win32";
+    version = "7.3.0.2";
+    hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=";
+  })
+  (fetchNuGet {
+    pname = "MicroCom.Runtime";
+    version = "0.11.0";
+    hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.Build.Framework";
+    version = "17.5.0";
+    hash = "sha256-FVomTQ8rZ5Ga09piFxSDFQ+b3gpC2ddZd+pQBSn5Csw=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.Build.Tasks.Git";
+    version = "8.0.0";
+    hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.Build.Utilities.Core";
+    version = "17.5.0";
+    hash = "sha256-W4bN0E9/DgEw0fxopXUhMK9tuGGwm0NYK3APytAzNRI=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NET.StringTools";
+    version = "17.5.0";
+    hash = "sha256-9eoXaPQvt6YAeb+cK5/ekh3YFfjymZCzJAxsDsIPlMQ=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.Platforms";
+    version = "1.1.0";
+    hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.SourceLink.Common";
+    version = "8.0.0";
+    hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.SourceLink.GitHub";
+    version = "8.0.0";
+    hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.Win32.Registry";
+    version = "5.0.0";
+    hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.Win32.SystemEvents";
+    version = "6.0.0";
+    hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=";
+  })
+  (fetchNuGet {
+    pname = "Nerdbank.GitVersioning";
+    version = "3.6.141";
+    hash = "sha256-i1pBJ12vlPmde6qSQK4PG2QLSpjaUCoY+odTi24R5XI=";
+  })
+  (fetchNuGet {
+    pname = "NETStandard.Library";
+    version = "2.0.3";
+    hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=";
+  })
+  (fetchNuGet {
+    pname = "Nullable";
+    version = "1.3.1";
+    hash = "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM=";
+  })
+  (fetchNuGet {
+    pname = "SkiaSharp";
+    version = "2.88.8";
+    hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=";
+  })
+  (fetchNuGet {
+    pname = "SkiaSharp.NativeAssets.Linux";
+    version = "2.88.8";
+    hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=";
+  })
+  (fetchNuGet {
+    pname = "SkiaSharp.NativeAssets.macOS";
+    version = "2.88.8";
+    hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=";
+  })
+  (fetchNuGet {
+    pname = "SkiaSharp.NativeAssets.WebAssembly";
+    version = "2.88.8";
+    hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=";
+  })
+  (fetchNuGet {
+    pname = "SkiaSharp.NativeAssets.Win32";
+    version = "2.88.8";
+    hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=";
+  })
+  (fetchNuGet {
+    pname = "System.Buffers";
+    version = "4.5.1";
+    hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=";
+  })
+  (fetchNuGet {
+    pname = "System.Buffers";
+    version = "4.6.0";
+    hash = "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=";
+  })
+  (fetchNuGet {
+    pname = "System.Collections.Immutable";
+    version = "8.0.0";
+    hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=";
+  })
+  (fetchNuGet {
+    pname = "System.ComponentModel.Annotations";
+    version = "4.5.0";
+    hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=";
+  })
+  (fetchNuGet {
+    pname = "System.Configuration.ConfigurationManager";
+    version = "6.0.0";
+    hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=";
+  })
+  (fetchNuGet {
+    pname = "System.Drawing.Common";
+    version = "6.0.0";
+    hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=";
+  })
+  (fetchNuGet {
+    pname = "System.IO.Pipelines";
+    version = "6.0.0";
+    hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA=";
+  })
+  (fetchNuGet {
+    pname = "System.Memory";
+    version = "4.6.0";
+    hash = "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=";
+  })
+  (fetchNuGet {
+    pname = "System.Numerics.Vectors";
+    version = "4.5.0";
+    hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=";
+  })
+  (fetchNuGet {
+    pname = "System.Numerics.Vectors";
+    version = "4.6.0";
+    hash = "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU=";
+  })
+  (fetchNuGet {
+    pname = "System.Runtime.CompilerServices.Unsafe";
+    version = "6.1.0";
+    hash = "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.AccessControl";
+    version = "5.0.0";
+    hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.AccessControl";
+    version = "6.0.0";
+    hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Cryptography.ProtectedData";
+    version = "6.0.0";
+    hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Permissions";
+    version = "6.0.0";
+    hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Principal.Windows";
+    version = "5.0.0";
+    hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=";
+  })
+  (fetchNuGet {
+    pname = "System.Text.Encoding.CodePages";
+    version = "6.0.0";
+    hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=";
+  })
+  (fetchNuGet {
+    pname = "System.Windows.Extensions";
+    version = "6.0.0";
+    hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=";
+  })
+  (fetchNuGet {
+    pname = "Tmds.DBus.Protocol";
+    version = "0.16.0";
+    hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98=";
+  })
 ]
diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
index e3611f7bdec2..d8b8c2d20c43 100644
--- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
+++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
@@ -15,13 +15,13 @@
 }:
 buildDotnetModule (finalAttrs: rec {
   pname = "msbuild-structured-log-viewer";
-  version = "2.2.383";
+  version = "2.2.392";
 
   src = fetchFromGitHub {
     owner = "KirillOsenkov";
     repo = "MSBuildStructuredLog";
     rev = "v${version}";
-    hash = "sha256-re1owocdiPKwoORCPD+A0eiRi4Nk4i9a1l0XTQJcxqE=";
+    hash = "sha256-oMWFgELF/bIDQWOdrBAOLTluwH3rFO2vU0xCuRnrT1Y=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;

From 313f7061052d1f21f3b5e45ce958a062bb5ce687 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Thu, 19 Dec 2024 12:07:36 -0300
Subject: [PATCH 28/46] nuget-to-json: fix tools not being added to the
 lockfile

---
 pkgs/by-name/nu/nuget-to-json/nuget-to-json.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/nu/nuget-to-json/nuget-to-json.sh b/pkgs/by-name/nu/nuget-to-json/nuget-to-json.sh
index ff29f414d5b9..b2b051398b25 100755
--- a/pkgs/by-name/nu/nuget-to-json/nuget-to-json.sh
+++ b/pkgs/by-name/nu/nuget-to-json/nuget-to-json.sh
@@ -62,7 +62,7 @@ done
             fi
 
             # packages in the nix store should have an empty metadata file
-            used_source="$(jq -r '.source // ""' "$version"/.nupkg.metadata)"
+            used_source="$(jq -r 'if has("source") then .source else "" end' "$version"/.nupkg.metadata)"
             found=false
 
             if [[ -z "$used_source" || -d "$used_source" ]]; then

From 2f56118be07cffef1b25f17ef13a26af5eef989e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 15:21:03 +0000
Subject: [PATCH 29/46] tidb: 8.4.0 -> 8.5.0

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

diff --git a/pkgs/by-name/ti/tidb/package.nix b/pkgs/by-name/ti/tidb/package.nix
index 467b03b96360..6a1bf3cde948 100644
--- a/pkgs/by-name/ti/tidb/package.nix
+++ b/pkgs/by-name/ti/tidb/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "tidb";
-  version = "8.4.0";
+  version = "8.5.0";
 
   src = fetchFromGitHub {
     owner = "pingcap";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-AVREHQnEBCU5Z9aiYWVi2jzZ5amb/Bc0jJogwGunU84=";
+    sha256 = "sha256-mrR4Rk+p1JaimvBVyEHc+syQwkvRDjQfGCuL5H0GqG8=";
   };
 
-  vendorHash = "sha256-zRTFmXNTc2M24q8ClqsjNsok4RMi1Yyfe2ItE8I2Ww4=";
+  vendorHash = "sha256-yV97PyVkHWQSj+nFuxCvKkAbdwfszM1gslOvi8iihaE=";
 
   ldflags = [
     "-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${version}"

From 6a711c3e8f0c69a3abb7100ba8a52760ea7751cb Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Thu, 19 Dec 2024 17:22:25 +0100
Subject: [PATCH 30/46] chromium: fix cross-"building" of recompressed FODs

---
 pkgs/applications/networking/browsers/chromium/common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 2d219cc12e9e..e231afbe7859 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -222,9 +222,10 @@ let
         name = "source.tar.zstd";
         downloadToTemp = false;
         passthru.unpack = true;
+        nativeBuildInputs = [ zstd ];
         postFetch = ''
           tar \
-            --use-compress-program="${lib.getExe zstd} -T$NIX_BUILD_CORES" \
+            --use-compress-program="zstd -T$NIX_BUILD_CORES" \
             --sort=name \
             --mtime="1970-01-01" \
             --owner=root --group=root \

From 7a25e3878f8ea6bffdea1ebd35eb0efff77ba94c Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Thu, 19 Dec 2024 17:25:44 +0100
Subject: [PATCH 31/46] chromium,chromedriver: 131.0.6778.139 -> 131.0.6778.204

https://chromereleases.googleblog.com/2024/12/stable-channel-update-for-desktop_18.html

This update includes 5 security fixes.

CVEs:
CVE-2024-12692 CVE-2024-12693 CVE-2024-12694 CVE-2024-12695
---
 .../networking/browsers/chromium/info.json         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index fc99e8d8129f..bca8407c04c2 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,9 +1,9 @@
 {
   "chromium": {
-    "version": "131.0.6778.139",
+    "version": "131.0.6778.204",
     "chromedriver": {
-      "hash_darwin": "sha256-QLYUD5SDHoPdiPHX46ps/oBhzDjwxBuQEh0hzbEY73Q=",
-      "hash_darwin_aarch64": "sha256-VZ4nS9H1J1R6OXqqOaFLHM2rD8dyUTTWur5X1CNm4sU="
+      "hash_darwin": "sha256-xxTu1aPNTfGpaPFC55NihzJbcjDL3fBXimQIGBPaU18=",
+      "hash_darwin_aarch64": "sha256-WyNiLNIPPUesDCYYs6Uc0aZDou0N60kZvL31DlqHMtw="
     },
     "deps": {
       "depot_tools": {
@@ -19,8 +19,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "c35bbcbd7c2775a12a3f320e05ac0022939b1a8a",
-        "hash": "sha256-oJ4y9W51RMiUk40Uz8b3LJH0kMD5GMDG2V//Tng4/4A=",
+        "rev": "52183f9e99a61056f9b78535f53d256f1516f2a0",
+        "hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -760,8 +760,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "b97fcc24b3523da5e389d2a6d76857f134be09c5",
-        "hash": "sha256-5Es9Zot/DH+UKq3+aCgeQC+Llgj7/lmPXUYvar/hX7I="
+        "rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0",
+        "hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc="
       }
     }
   },

From 170a250e10d47c77eb32ba3f5f8afb79977a272a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 19 Dec 2024 17:15:08 +0100
Subject: [PATCH 32/46] nixpkgs-review: 2.12.0 -> 3.0.0

Diff: https://github.com/Mic92/nixpkgs-review/compare/refs/tags/2.12.0...3.0.0

Changelog: https://github.com/Mic92/nixpkgs-review/releases/tag/3.0.0
---
 pkgs/by-name/ni/nixpkgs-review/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index 4d7743f0aece..88e11eccb51e 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nixpkgs-review";
-  version = "2.12.0";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixpkgs-review";
-    rev = "refs/tags/${version}";
-    hash = "sha256-yNdBqL3tceuoUHx8/j2y5ZTq1zeVDAm37RZtlCbC6rg=";
+    tag = version;
+    hash = "sha256-C2JAlCgH5OCMAZr/Rvi0H7xAwesnkVCJ3kZyyVYaLg4=";
   };
 
   build-system = [
@@ -76,7 +76,7 @@ python3Packages.buildPythonApplication rec {
   versionCheckProgramArg = [ "--version" ];
 
   meta = {
-    changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${version}";
+    changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${src.tag}";
     description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
     homepage = "https://github.com/Mic92/nixpkgs-review";
     license = lib.licenses.mit;

From af008b3fa5d95eb0065672a9225c42451de36f61 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 19 Dec 2024 19:03:53 +0200
Subject: [PATCH 33/46] taskwarrior3: 3.2.0-unstable-2024-12-18 -> 3.3.0

Diff: https://github.com/GothenburgBitFactory/taskwarrior/compare/dcbe916286792e6f5d2d3af3baab79918ebc5f71...v3.3.0

Changelog: https://github.com/GothenburgBitFactory/taskwarrior/blob/dcbe916286792e6f5d2d3af3baab79918ebc5f71/ChangeLog
---
 pkgs/by-name/ta/taskwarrior3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix
index be73d71ba212..e9b1c4959185 100644
--- a/pkgs/by-name/ta/taskwarrior3/package.nix
+++ b/pkgs/by-name/ta/taskwarrior3/package.nix
@@ -22,7 +22,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "taskwarrior";
-  version = "3.2.0-unstable-2024-12-18";
+  version = "3.3.0";
   src = fetchFromGitHub {
     owner = "GothenburgBitFactory";
     repo = "taskwarrior";
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoTarball {
     name = "${finalAttrs.pname}-${finalAttrs.version}-cargo-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-yaIjtwZuYqyiXHxq4NDuZC9aE+mYpovXygxWENf6v1o=";
+    hash = "sha256-mzmrbsUuIjUVuNEa33EgtOTl9r+0xYj2WkKqFjxX1oU=";
   };
 
   postPatch = ''

From 956c40423c170c73a1181644e7eb74c193eb76ae Mon Sep 17 00:00:00 2001
From: Elliot Cameron <nixpkgs-commits@deshaw.com>
Date: Thu, 19 Dec 2024 12:08:04 -0500
Subject: [PATCH 34/46] barman: add distutils to dependencies

And add a test to catch this kind of error.
---
 pkgs/by-name/ba/barman/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix
index 7e1eea61d0a9..da9cda162fd1 100644
--- a/pkgs/by-name/ba/barman/package.nix
+++ b/pkgs/by-name/ba/barman/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   python3Packages,
+  versionCheckHook,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -30,6 +31,7 @@ python3Packages.buildPythonApplication rec {
     azure-mgmt-compute
     azure-storage-blob
     boto3
+    distutils
     google-cloud-compute
     google-cloud-storage
     grpcio
@@ -41,6 +43,7 @@ python3Packages.buildPythonApplication rec {
   nativeCheckInputs = with python3Packages; [
     mock
     pytestCheckHook
+    versionCheckHook
   ];
 
   disabledTests =
@@ -57,6 +60,7 @@ python3Packages.buildPythonApplication rec {
     description = "Backup and Recovery Manager for PostgreSQL";
     homepage = "https://www.pgbarman.org/";
     changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS";
+    mainProgram = "barman";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ freezeboy ];
     platforms = platforms.unix;

From ffcf6b781e9bb18ceb86e0f836a8adb53c2d7c30 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Thu, 19 Dec 2024 11:18:24 -0300
Subject: [PATCH 35/46] addNugetDeps.fetch-deps: remove `set -u`

It was causing issues with other hooks and things used in the build for packages so I opted to remove it as it wasn't there to start with.
---
 pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh b/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh
index 809f5c4b26d8..9bef944b4bd7 100644
--- a/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh
+++ b/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh
@@ -1,5 +1,5 @@
 # shellcheck shell=bash
-set -euo pipefail
+set -e
 
 export PATH="@binPath@:$PATH"
 

From d133ab9d3262a6038b783c2f9e8db9bf9aee26cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 19 Dec 2024 18:43:04 +0100
Subject: [PATCH 36/46] osu-lazer: 2024.1208.0 -> 2024.1219.2

---
 pkgs/by-name/os/osu-lazer/deps.json   | 4 ++--
 pkgs/by-name/os/osu-lazer/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index e6f537882615..0e7be190c28d 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -651,8 +651,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2024.1202.0",
-    "hash": "sha256-OwsEEF4WSH7HQ5HOl3EB36RJ19stn966DtmfnOtpBJk="
+    "version": "2024.1219.1",
+    "hash": "sha256-KyZeNkTissfZAusvWYUdZ3+YujrcTfkZDyzt99i4fkg="
   },
   {
     "pname": "ppy.osuTK.NS20",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 37ae24c45b5a..417b890b8b9a 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -21,13 +21,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2024.1208.0";
+  version = "2024.1219.2";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = version;
-    hash = "sha256-cMPVtzoTxIUVZNNAqF+H0873ZsXGluFEXwNDp7zOq8c=";
+    hash = "sha256-uRaMVd3FH6094MxplLNG0JJnO+7s805TI0aeDN/rRVY=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From 45c4bca8e43c10975b816660321cea533da74f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 19 Dec 2024 13:59:01 +0100
Subject: [PATCH 37/46] osu-lazer-bin: 2024.1208.0 -> 2024.1219.2

---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 64f2c3e43615..272a0b225708 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2024.1208.0";
+  version = "2024.1219.2";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-        hash = "sha256-OgXKJ09OMqeD2ZdNBbEluEyR0bbBllprSAHaIXCtLSA=";
+        hash = "sha256-kzGerNcaop39zqv3+w5hkgLZzhH6PfCPhZfGk9f9/Z8=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-        hash = "sha256-3W6F2ThYTOVKa9/zTA/6X0uMoPy1SYulIYfYw+D7FR8=";
+        hash = "sha256-kWcdynu3m8MehpNjkk10VN9/z8ixu/cZI9HuTY/79dk=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        hash = "sha256-gRUr7jf0+Xbfz8FurPk/o7F67TYisdNySNzVWEMb1es=";
+        hash = "sha256-qNkuiDA4LiWqwpYFrBDvV5VoOwO6Ei8jHGIgVKSErdo=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

From cc46eef84e17b5bc6b189a9c61a7d3e45993f025 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 19 Dec 2024 13:55:28 -0500
Subject: [PATCH 38/46] blender: 4.3.1 -> 4.3.2 (#366295)

Assets are unchanged.

Changelog: https://developer.blender.org/docs/release_notes/4.3/corrective_releases/#blender-432
---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 2f7490627ee5..f486a8e6dcff 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -112,13 +112,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "blender";
-  version = "4.3.1";
+  version = "4.3.2";
 
   srcs = [
     (fetchzip {
       name = "source";
       url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-      hash = "sha256-+pRZ9ZSe656pdzR60oZ5ayGJ6gvzPOMKyATKA381RKg=";
+      hash = "sha256-LCU2JpQbvQ+W/jC+H8J2suh+X5sTLOG9TcE2EeHqVh4=";
     })
     (fetchgit {
       name = "assets";

From 159385c1aec83734ea490c762925647846f749b6 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 19 Dec 2024 13:58:01 -0500
Subject: [PATCH 39/46] opencascade-occt: fix compilation on darwin (#365409)

```
FAILED: src/TKV3d/CMakeFiles/TKV3d.dir/__/StdPrs/StdPrs_BRepFont.cxx.o
/nix/store/raqax5qp65an4jcwj1bzd5lq589ywpg0-clang-wrapper-16.0.6/bin/clang++ -DHAVE_FREETYPE -DHAVE_OPENGL -DHAVE_OPENGL_EXT -DHAVE_TK -DOCC_CO>
/tmp/nix-build-opencascade-occt-7.8.1.drv-0/occt-V7_8_1-bd2a789/src/StdPrs/StdPrs_BRepFont.cxx:460:17: error: cannot initialize a variable of t>
    const char* aTags      = &anOutline->tags[aStartIndex];
                ^            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
```
---
 pkgs/by-name/op/opencascade-occt/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/op/opencascade-occt/package.nix b/pkgs/by-name/op/opencascade-occt/package.nix
index 5b84417830f3..3d9c247b75ea 100644
--- a/pkgs/by-name/op/opencascade-occt/package.nix
+++ b/pkgs/by-name/op/opencascade-occt/package.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, fetchpatch
 , cmake
 , ninja
 , tcl
@@ -24,6 +25,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-AGMZqTLLjXbzJFW/RSTsohAGV8sMxlUmdU/Y2oOzkk8=";
   };
 
+  patches = [
+    # fix compilation on darwin against latest version of freetype
+    # https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/330
+    (fetchpatch {
+      url = "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.diff";
+      hash = "sha256-NoC2mE3DG78Y0c9UWonx1vmXoU4g5XxFUT3eVXqLU60=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja

From 2cfb049f6800ba8f715c65073c52bab9ba9173d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 19:35:11 +0000
Subject: [PATCH 40/46] tana: 1.0.18 -> 1.0.20

---
 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 9f597ca052d1..0d4ba69c1f35 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.18";
+  version = "1.0.20";
 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-74jQkOTTRfyM7uy74xqx0sYZWy/vndBfLbwjcW8L1D0=";
+    hash = "sha256-fJiAqPppPoIN4gT54YMgbf/Fe9eVgRYHU6q6Yopl46I=";
   };
 
   nativeBuildInputs = [

From a07222588d06932e5a6d6f276c00b4fe59366c3c Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 19 Dec 2024 11:37:58 -0800
Subject: [PATCH 41/46] myEnvFun: fix build

This broke in ebd18cf.

replaceVars is not needed on setup.sh since 15103e5e5.
---
 pkgs/misc/my-env/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 1e48a93b16b2..1f0e1decad87 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -66,7 +66,6 @@
   name,
   buildInputs ? [ ],
   propagatedBuildInputs ? [ ],
-  gcc ? stdenv.cc,
   extraCmds ? "",
   cleanupCmds ? "",
   shell ? "${pkgs.bashInteractive}/bin/bash --norc",
@@ -80,9 +79,7 @@ mkDerivation {
     "buildPhase"
     "fixupPhase"
   ];
-  setupNew = replaceVars ../../stdenv/generic/setup.sh {
-    inherit gcc;
-  };
+  setupNew = ../../stdenv/generic/setup.sh;
 
   buildPhase =
     let

From 7dae87b2384dced7212f349bd475b90c9552c094 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Dec 2024 13:58:05 +0000
Subject: [PATCH 42/46] plexRaw: 1.41.2.9200-c6bbc1b53 -> 1.41.3.9292-bc7397402

---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 029fd07e987f..2c9de7d77c3b 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -14,7 +14,7 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.41.2.9200-c6bbc1b53";
+  version = "1.41.3.9292-bc7397402";
   pname = "plexmediaserver";
 
   # Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-        sha256 = "sha256-VTWyeve+Uz3TdWQ06CmZ9w+Gk9jBHP7EuYi0N9DTB4Q=";
+        sha256 = "0xbkd8iplvzgm0jqgz6ncxwx0bhdkm0208z22cpjh1ynjqx5lvkq";
       }
     else
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-        sha256 = "sha256-HmgtnUsDzRIUThYdlZIzhiU02n9jSU7wtwnEA0+r1iQ=";
+        sha256 = "1a18xfc69yk99hw3q3nv4ibmgq6whk3ywwfq5r91v8fsb7l9cf58";
       };
 
   outputs = [

From a4e52be6d970d4f31a25140f9fa51c21fb3c6aa6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 21:04:13 +0000
Subject: [PATCH 43/46] tippecanoe: 2.72.0 -> 2.73.0

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

diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix
index 5d7683e5f934..458dc34e40be 100644
--- a/pkgs/by-name/ti/tippecanoe/package.nix
+++ b/pkgs/by-name/ti/tippecanoe/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tippecanoe";
-  version = "2.72.0";
+  version = "2.73.0";
 
   src = fetchFromGitHub {
     owner = "felt";
     repo = "tippecanoe";
     rev = finalAttrs.version;
-    hash = "sha256-5Ox/2K9cls8lZ+C/Fh5VQmgNEtbdMW0mh4fhBl6ecP8=";
+    hash = "sha256-IQEtfLRWe0/R6FSGzyar+qcpng0nm3LcyBb352TLZrs=";
   };
 
   buildInputs = [

From 814c8e613688c7f99cd6b29d26749e11915e15be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 21:29:57 +0000
Subject: [PATCH 44/46] llama-cpp: 4293 -> 4367

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 4b775e8a0f2a..74369e968aa8 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -81,13 +81,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "4293";
+  version = "4367";
 
   src = fetchFromGitHub {
     owner = "ggerganov";
     repo = "llama.cpp";
     rev = "refs/tags/b${finalAttrs.version}";
-    hash = "sha256-ab45VNNJvzp6t8Bk2GSuTBsP4bWcyOT4d+TvaIHs5qo=";
+    hash = "sha256-N7uNIb6bkTsTx/kgbnc7mahYUIeV1ks4piwwgoXauRM=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 78bfef8ddaa9befda2253153d18219a5e1b1fad5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 14 Dec 2024 09:02:52 +1000
Subject: [PATCH 45/46] go_1_24: init at 1.24rc1

---
 pkgs/development/compilers/go/1.24.nix        | 203 ++++++++++++++++++
 .../development/compilers/go/bootstrap122.nix |  27 +++
 pkgs/top-level/all-packages.nix               |   5 +
 3 files changed, 235 insertions(+)
 create mode 100644 pkgs/development/compilers/go/1.24.nix
 create mode 100644 pkgs/development/compilers/go/bootstrap122.nix

diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
new file mode 100644
index 000000000000..92653cfeebde
--- /dev/null
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -0,0 +1,203 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  tzdata,
+  substituteAll,
+  iana-etc,
+  apple-sdk_11,
+  xcbuild,
+  mailcap,
+  buildPackages,
+  pkgsBuildTarget,
+  threadsCross,
+  testers,
+  skopeo,
+  buildGo124Module,
+}:
+
+let
+  goBootstrap = buildPackages.callPackage ./bootstrap122.nix { };
+
+  skopeoTest = skopeo.override { buildGoModule = buildGo124Module; };
+
+  goarch =
+    platform:
+    {
+      "aarch64" = "arm64";
+      "arm" = "arm";
+      "armv5tel" = "arm";
+      "armv6l" = "arm";
+      "armv7l" = "arm";
+      "i686" = "386";
+      "mips" = "mips";
+      "mips64el" = "mips64le";
+      "mipsel" = "mipsle";
+      "powerpc64" = "ppc64";
+      "powerpc64le" = "ppc64le";
+      "riscv64" = "riscv64";
+      "s390x" = "s390x";
+      "x86_64" = "amd64";
+      "wasm32" = "wasm";
+    }
+    .${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}");
+
+  # We need a target compiler which is still runnable at build time,
+  # to handle the cross-building case where build != host == target
+  targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
+
+  isCross = stdenv.buildPlatform != stdenv.targetPlatform;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "go";
+  version = "1.24rc1";
+
+  src = fetchurl {
+    url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
+    hash = "sha256-r9iiP9Jg8qJG0XQEmgdrigW7C62T8SIHaNIZuL33U50=";
+  };
+
+  strictDeps = true;
+  buildInputs =
+    [ ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ]
+    ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
+
+  depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
+    apple-sdk_11
+    xcbuild
+  ];
+
+  depsBuildTarget = lib.optional isCross targetCC;
+
+  depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  patches = [
+    (substituteAll {
+      src = ./iana-etc-1.17.patch;
+      iana = iana-etc;
+    })
+    # Patch the mimetype database location which is missing on NixOS.
+    # but also allow static binaries built with NixOS to run outside nix
+    (substituteAll {
+      src = ./mailcap-1.17.patch;
+      inherit mailcap;
+    })
+    # prepend the nix path to the zoneinfo files but also leave the original value for static binaries
+    # that run outside a nix server
+    (substituteAll {
+      src = ./tzdata-1.19.patch;
+      inherit tzdata;
+    })
+    ./remove-tools-1.11.patch
+    ./go_no_vendor_checks-1.22.patch
+  ];
+
+  GOOS = if stdenv.targetPlatform.isWasi then "wasip1" else stdenv.targetPlatform.parsed.kernel.name;
+  GOARCH = goarch stdenv.targetPlatform;
+  # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
+  # Go will nevertheless build a for host system that we will copy over in
+  # the install phase.
+  GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
+  GOHOSTARCH = goarch stdenv.buildPlatform;
+
+  # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
+  # to be different from CC/CXX
+  CC_FOR_TARGET = if isCross then "${targetCC}/bin/${targetCC.targetPrefix}cc" else null;
+  CXX_FOR_TARGET = if isCross then "${targetCC}/bin/${targetCC.targetPrefix}c++" else null;
+
+  GOARM = toString (
+    lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]
+  );
+  GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
+  # Wasi does not support CGO
+  CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1;
+
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
+
+  buildPhase = ''
+    runHook preBuild
+    export GOCACHE=$TMPDIR/go-cache
+
+    export PATH=$(pwd)/bin:$PATH
+
+    ${lib.optionalString isCross ''
+      # Independent from host/target, CC should produce code for the building system.
+      # We only set it when cross-compiling.
+      export CC=${buildPackages.stdenv.cc}/bin/cc
+    ''}
+    ulimit -a
+
+    pushd src
+    ./make.bash
+    popd
+    runHook postBuild
+  '';
+
+  preInstall =
+    ''
+      # Contains the wrong perl shebang when cross compiling,
+      # since it is not used for anything we can deleted as well.
+      rm src/regexp/syntax/make_perl_groups.pl
+    ''
+    + (
+      if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then
+        ''
+          mv bin/*_*/* bin
+          rmdir bin/*_*
+          ${lib.optionalString
+            (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
+            ''
+              rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH}
+            ''
+          }
+        ''
+      else
+        lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
+          rm -rf bin/*_*
+          ${lib.optionalString
+            (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
+            ''
+              rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH}
+            ''
+          }
+        ''
+    );
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/go
+    cp -a bin pkg src lib misc api doc go.env $out/share/go
+    mkdir -p $out/bin
+    ln -s $out/share/go/bin/* $out/bin
+    runHook postInstall
+  '';
+
+  disallowedReferences = [ goBootstrap ];
+
+  passthru = {
+    inherit goBootstrap skopeoTest;
+    tests = {
+      skopeo = testers.testVersion { package = skopeoTest; };
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+        command = "go version";
+        version = "go${finalAttrs.version}";
+      };
+    };
+  };
+
+  meta = with lib; {
+    changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}";
+    description = "Go Programming language";
+    homepage = "https://go.dev/";
+    license = licenses.bsd3;
+    maintainers = teams.golang.members;
+    platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd;
+    mainProgram = "go";
+  };
+})
diff --git a/pkgs/development/compilers/go/bootstrap122.nix b/pkgs/development/compilers/go/bootstrap122.nix
new file mode 100644
index 000000000000..44ebbb29f266
--- /dev/null
+++ b/pkgs/development/compilers/go/bootstrap122.nix
@@ -0,0 +1,27 @@
+{ callPackage }:
+callPackage ./binary.nix {
+  version = "1.22.10";
+  hashes = {
+    # Use `print-hashes.sh ${version}` to generate the list below
+    darwin-amd64 = "dd2c4ac3702658c2c20e3a8b394da1917d86156b2cb4312c9d2f657f80067874";
+    darwin-arm64 = "21cf49415ffe0755b45f2b63e75d136528a32f7bb7bdd0166f51d22a03eb0a3f";
+    freebsd-386 = "f82f5d194114963693e0f51fd56d55d8417ca556438062f2b0df608473b62837";
+    freebsd-amd64 = "cce9da240870a4430c5cf1227bcf29d37575043ff16f7982a69f1139c6f564b5";
+    freebsd-arm64 = "abae388d0d42563a242db0d405172cb73e09236f68000ff90c2a327ec8c5764c";
+    freebsd-armv6l = "7c9c8fe30cbabbb4fb597f0f0ad1279fd2b320bc70831eba4c207b55ad46931d";
+    freebsd-riscv64 = "d6f25fd79e17b84d1b61bec3e2fdffc47377b28b51a04b6bdbeac0199313e059";
+    linux-386 = "2ae9f00e9621489b75494fa2b8abfc5d09e0cae6effdd4c13867957ad2e4deba";
+    linux-amd64 = "736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092";
+    linux-arm64 = "5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec";
+    linux-armv6l = "a7bbbc80fe736269820bbdf3555e91ada5d18a5cde2276aac3b559bc1d52fc70";
+    linux-loong64 = "0be34dbc69726b52414e0283736f997fee477379ebff66cebd7d8c35f4f64f9d";
+    linux-mips = "bb7d7e99db7ee70063cb57bb7395c392b8b5ed87f37d733a1c91de935c70bb91";
+    linux-mips64 = "c7f0571410297cb29e52d10fed7a2a21aeaeabb9539d0c04a6d778adf0fe7f1b";
+    linux-mips64le = "e66c440c03dd19bf8423034cbde7f6813321beb18d3fcf2ef234c13a25467952";
+    linux-mipsle = "b4e0061f62a9c1f874893aa4951a4883c19762a9dd64c5710554ec5a7aaf311a";
+    linux-ppc64 = "4192158cdedc6a124aa32a099cc6bebebabf1f4d380c46c5e36ea52c30a3888b";
+    linux-ppc64le = "db05b9838f69d741fb9a5301220b1a62014aee025b0baf341aba3d280087b981";
+    linux-riscv64 = "aef9b186c1b9b58c0472dbf54978f97682852a91b2e8d6bf354e59ba9c24438a";
+    linux-s390x = "4ab2286adb096576771801b5099760b1d625fd7b44080449151a4d9b21303672";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47dc590a3c6b..7b267d0432be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11225,6 +11225,11 @@ with pkgs;
     go = buildPackages.go_1_23;
   };
 
+  go_1_24 = callPackage ../development/compilers/go/1.24.nix { };
+  buildGo124Module = callPackage ../build-support/go/module.nix {
+    go = buildPackages.go_1_24;
+  };
+
   ### DEVELOPMENT / HARE
 
   hareHook = callPackage ../by-name/ha/hare/hook.nix { };

From d70bd19e0a38ad4790d3913bf08fcbfc9eeca507 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@users.noreply.github.com>
Date: Fri, 20 Dec 2024 00:01:11 +0100
Subject: [PATCH 46/46] Revert "netpbm: 11.8.1 -> 11.8.2" (#366656)

Rebuild of al nixos tests. Let's bundle that with staging changes instead.
---
 pkgs/tools/graphics/netpbm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 4468157a8b73..107b36e5515e 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -20,14 +20,14 @@ stdenv.mkDerivation {
   # Determine version and revision from:
   # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
   pname = "netpbm";
-  version = "11.8.2";
+  version = "11.8.1";
 
   outputs = [ "bin" "out" "dev" ];
 
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/netpbm/code/advanced";
-    rev = "4971";
-    sha256 = "sha256-liJIx2/TlIl9jcbyCzqhzuHAalmjJM3EtAceDIFa0rw=";
+    rev = "4966";
+    sha256 = "sha256-Vy7aKyMn3C2P3N9jdRayDu35+8jzvQv4rYIEsKdyWDU=";
   };
 
   nativeBuildInputs = [