From fc4e95e2e0966d641e985117674af67d10237a6f Mon Sep 17 00:00:00 2001
From: c4710n <c4710n@users.noreply.github.com>
Date: Sat, 12 Mar 2022 18:08:32 +0800
Subject: [PATCH 001/145] nixos/v2ray: change the type of `config` field

Currently, the type of `config` is `types.attrsOf types.unspecified`. It results
that the merging of list doesn't perform as expected.

For example, I declare two part of config in two files:

`a.nix`:
```
config = {
  routing = {
    rules = [
      {
        type = "field";
        outboundTag = "direct";
        domain = [ "geosite:cn" ];
      }
    ];
  };
};
```

`b.nix`:
```
config = {
  routing = {
    rules = [
      {
        type = "field";
        outboundTag = "direct";
        ip = [
          "geoip:cn"
          "geoip:private"
        ];
      }
    ];
  };
};
```

After merging, only the content of `b.nix` left, the content of `a.nix` is
removed.

This commit give the right type of config, which makes the merging of config
acts as expected.
---
 nixos/modules/services/networking/v2ray.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/v2ray.nix b/nixos/modules/services/networking/v2ray.nix
index 95e8761ba5cc..6e7b480f55d5 100644
--- a/nixos/modules/services/networking/v2ray.nix
+++ b/nixos/modules/services/networking/v2ray.nix
@@ -2,7 +2,9 @@
 
 with lib;
 
-{
+let
+  json = pkgs.formats.json { };
+in {
   options = {
 
     services.v2ray = {
@@ -39,7 +41,7 @@ with lib;
       };
 
       config = mkOption {
-        type = types.nullOr (types.attrsOf types.unspecified);
+        type = types.nullOr json.type;
         default = null;
         example = {
           inbounds = [{

From f43fb79c08b8627da6b10abbf73c64c9a910dc04 Mon Sep 17 00:00:00 2001
From: Marin <supermarin@users.noreply.github.com>
Date: Fri, 5 May 2023 14:31:09 -0400
Subject: [PATCH 002/145] [nbstripout] Don't propagate ipython

If you have a devShell with `python311` and `nbstripout` in `buildInputs`, running `python --version` will output 3.10 as of today, because `nbstripout` is propagating python through ipython.
---
 pkgs/applications/version-management/nbstripout/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index e88f21a85cb1..234176fbedc6 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = with python3.pkgs; [
-    ipython
     nbformat
   ];
 

From 77f4097425aedb26e3b55cc2bde13fc9e19e2e0c Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Fri, 9 Aug 2024 04:03:49 +0700
Subject: [PATCH 003/145] unbound: support dynlib module

---
 pkgs/by-name/un/unbound/package.nix | 4 ++++
 pkgs/top-level/all-packages.nix     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 1a9025a4a907..b90a440d2e76 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -40,6 +40,8 @@
 # enable support for python plugins in unbound: note this is distinct from pyunbound
 # see https://unbound.docs.nlnetlabs.nl/en/latest/developer/python-modules.html
 , withPythonModule ? false
+# enable support for .so plugins
+, withDynlibModule ? false
 , withLto ? !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isMinGW
 , withMakeWrapper ? !stdenv.hostPlatform.isMinGW
 , libnghttp2
@@ -88,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-systemd"
   ] ++ lib.optionals withPythonModule [
     "--with-pythonmodule"
+  ] ++ lib.optionals withDynlibModule [
+    "--with-dynlibmodule"
   ] ++ lib.optionals withDoH [
     "--with-libnghttp2=${libnghttp2.dev}"
   ] ++ lib.optionals withECS [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 905378f73d23..e5d9db9cefb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14103,6 +14103,7 @@ with pkgs;
   unbound-full = unbound.override {
     python = python3;
     withSystemd = true;
+    withDynlibModule = true;
     withPythonModule = true;
     withDoH = true;
     withECS = true;

From 1a7827817004f9e9daee8ede5561fb895e6a2c76 Mon Sep 17 00:00:00 2001
From: Andrew Bruce <me@andrewbruce.net>
Date: Wed, 4 Dec 2024 19:03:47 +0000
Subject: [PATCH 004/145] bitwig-studio: fix MIDI input

Binding the entire /dev directory inside the Bubblewrap environment
appears to fix MIDI, which broke after the Bubblewrap change
in PR #360198.
---
 pkgs/applications/audio/bitwig-studio/bitwig-wrapper.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-wrapper.nix b/pkgs/applications/audio/bitwig-studio/bitwig-wrapper.nix
index b07cf40a2908..0bda040b093c 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-wrapper.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-wrapper.nix
@@ -30,7 +30,12 @@ stdenv.mkDerivation {
         chmod -R u+w $TMPDIR/VampTransforms
 
         echo "Starting Bitwig Studio in Bubblewrap Environment"
-        ${bubblewrap}/bin/bwrap --bind / / --bind $TMPDIR/VampTransforms ${bitwig-studio-unwrapped}/libexec/resources/VampTransforms ${bitwig-studio-unwrapped}/bin/bitwig-studio || true
+        ${bubblewrap}/bin/bwrap \
+          --bind / / \
+          --bind $TMPDIR/VampTransforms ${bitwig-studio-unwrapped}/libexec/resources/VampTransforms \
+          --dev-bind /dev /dev \
+          ${bitwig-studio-unwrapped}/bin/bitwig-studio \
+          || true
 
         echo "Bitwig exited, removing temporary directory"
         rm -rf $TMPDIR

From e5bd86b7518c0cd40f82ae3cca4b131c4db053f7 Mon Sep 17 00:00:00 2001
From: jiriks74 <jiri@stefka.eu>
Date: Thu, 14 Nov 2024 23:22:59 +0100
Subject: [PATCH 005/145] maintainers: Add jiriks74

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 666937455272..af83af87c36f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10456,6 +10456,18 @@
     githubId = 1476865;
     name = "jigglycrumb";
   };
+  jiriks74 = {
+    name = "Jiří Štefka";
+    email = "jiri@stefka.eu";
+    github = "jiriks74";
+    githubId = 54378412;
+    matrix = "@jiriks74:matrix.org";
+    keys = [
+      {
+        fingerprint = "563AC7887FD6414714A6ACAC1D5E30D3DB2264DE";
+      }
+    ];
+  };
   jirkamarsik = {
     email = "jiri.marsik89@gmail.com";
     github = "jirkamarsik";

From 376975bdf66459d5d6b9fb5a7fd97764a3de6a33 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Mon, 28 Oct 2024 08:57:01 -0700
Subject: [PATCH 006/145] arrpc: format

---
 pkgs/by-name/ar/arrpc/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ar/arrpc/package.nix b/pkgs/by-name/ar/arrpc/package.nix
index 137cd7cde283..38038f79b80f 100644
--- a/pkgs/by-name/ar/arrpc/package.nix
+++ b/pkgs/by-name/ar/arrpc/package.nix
@@ -1,7 +1,9 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-}: buildNpmPackage rec {
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+buildNpmPackage rec {
   pname = "arrpc";
   version = "3.4.0";
 
@@ -25,7 +27,10 @@
     description = "Open Discord RPC server for atypical setups";
     homepage = "https://arrpc.openasar.dev/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ anomalocaris NotAShelf ];
+    maintainers = with lib.maintainers; [
+      anomalocaris
+      NotAShelf
+    ];
     mainProgram = "arrpc";
   };
 }

From a611045f3df0b851b4b02507605b0dde002434f6 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Mon, 28 Oct 2024 08:57:56 -0700
Subject: [PATCH 007/145] arrpc: 3.4.0 -> 3.5.0; add systemd user service

---
 pkgs/by-name/ar/arrpc/arrpc.service | 13 +++++++++++++
 pkgs/by-name/ar/arrpc/package.nix   | 21 ++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/by-name/ar/arrpc/arrpc.service

diff --git a/pkgs/by-name/ar/arrpc/arrpc.service b/pkgs/by-name/ar/arrpc/arrpc.service
new file mode 100644
index 000000000000..ea8a1ca92f42
--- /dev/null
+++ b/pkgs/by-name/ar/arrpc/arrpc.service
@@ -0,0 +1,13 @@
+# https://aur.archlinux.org/cgit/aur.git/tree/arrpc.service?h=arrpc
+
+[Unit]
+Description=arRPC Discord RPC daemon
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=@arrpc@
+Restart=on-failure
+
+[Install]
+WantedBy=default.target
diff --git a/pkgs/by-name/ar/arrpc/package.nix b/pkgs/by-name/ar/arrpc/package.nix
index 38038f79b80f..f2e8fd195dfb 100644
--- a/pkgs/by-name/ar/arrpc/package.nix
+++ b/pkgs/by-name/ar/arrpc/package.nix
@@ -5,31 +5,34 @@
 }:
 buildNpmPackage rec {
   pname = "arrpc";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "OpenAsar";
     repo = "arrpc";
-    # Release commits are not tagged
-    # release: 3.4.0
-    rev = "cca93db585dedf8acc1423f5e2db215de95c4c3b";
-    hash = "sha256-SeegrCgbjfVxG/9xfOcdfbVdDssZOhjBRnDipu6L7Wg=";
+    tag = version;
+    hash = "sha256-3xkqWcLhmSIH6Al2SvM9qBpdcLzEqUmUCgwYBPAgVpo=";
   };
 
-  npmDepsHash = "sha256-S9cIyTXqCp8++Yj3VjBbcStOjzjgd0Cq7KL7NNzZFpY=";
+  npmDepsHash = "sha256-lw6pngFC2Pnk+I8818TOTwN4r+8IsjvdMYIyTsTi49g=";
 
   dontNpmBuild = true;
 
+  postInstall = ''
+    mkdir -p $out/lib/systemd/user
+    substitute ${./arrpc.service} $out/lib/systemd/user/arrpc.service \
+      --subst-var-by arrpc $out/bin/arrpc
+  '';
+
   meta = {
-    # ideally we would do blob/${version}/changelog.md here
-    # upstream does not tag releases
-    changelog = "https://github.com/OpenAsar/arrpc/blob/${src.rev}/changelog.md";
+    changelog = "https://github.com/OpenAsar/arrpc/blob/${version}/changelog.md";
     description = "Open Discord RPC server for atypical setups";
     homepage = "https://arrpc.openasar.dev/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       anomalocaris
       NotAShelf
+      ulysseszhan
     ];
     mainProgram = "arrpc";
   };

From 2843169b006a16a0237f933369c9752d887b04be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 22:53:12 +0000
Subject: [PATCH 008/145] cargo-modules: 0.19.1 -> 0.20.2

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

diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix
index 13625dae781d..b89478820144 100644
--- a/pkgs/by-name/ca/cargo-modules/package.nix
+++ b/pkgs/by-name/ca/cargo-modules/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-modules";
-  version = "0.19.1";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "regexident";
     repo = "cargo-modules";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2wA34rQHHAvx+5NhmtugnGTMZ2Sj8MNpdkkIJhDK1HM=";
+    hash = "sha256-GrkAEblelLWIGYdOlbRWNBibNnb+/eA3e8aM5+L7Z7g=";
   };
 
-  cargoHash = "sha256-3R7rFkA2tObJZk5ypWPpMojEZvrDgKZsc1dN1wBJ63A=";
+  cargoHash = "sha256-/CQWVrXwkg0xVFAC2nYHtGlWYxU2TIkCLb6+NgmarDw=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices

From 3a1877ce56cf620303db1d219ba37b4c7ea2d343 Mon Sep 17 00:00:00 2001
From: Axel Karjalainen <axel@axka.fi>
Date: Mon, 22 Jul 2024 13:50:17 +0300
Subject: [PATCH 009/145] maintainers: add axka

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9a4e26d944d6..9fd21fcb655c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2304,6 +2304,12 @@
     githubId = 99703210;
     name = "Katherine Jamison";
   };
+  axka = {
+    name = "Axel Karjalainen";
+    email = "axel@axka.fi";
+    github = "axelkar";
+    githubId = 120189068;
+  };
   ayazhafiz = {
     email = "ayaz.hafiz.1@gmail.com";
     github = "hafiz";

From 970a263fabcd3c920b94e352d2bb1af3904cbd0b Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sun, 8 Dec 2024 02:20:43 +0100
Subject: [PATCH 010/145] netdata: 1.47.4 -> 1.47.5

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

diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index c8a729a5afe4..ab35ddad0ac6 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -53,7 +53,7 @@ let
   stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
 in
 stdenv'.mkDerivation (finalAttrs: {
-  version = "1.47.4";
+  version = "1.47.5";
   pname = "netdata";
 
   src = fetchFromGitHub {
@@ -62,10 +62,10 @@ stdenv'.mkDerivation (finalAttrs: {
     rev = "v${finalAttrs.version}";
     hash =
       if withCloudUi then
-        "sha256-PCaY6J3X4zUUJ8kRCGmLLbk2Pkp5CnH3rxOaoAdsKG4="
+        "sha256-+cPYwjxg/+A5bNa517zg9xKEjUa8uPM9WD67tToPH5o="
       # we delete the v2 GUI after fetching
       else
-        "sha256-W4g/ns+XfBSf6iACIW+6lfzZJLMktTfe5/n3egL27XE=";
+        "sha256-0aiBUkDymmdIT/u1y2PG30QYAvb8Zc4i8ZgjOtlzt+A=";
     fetchSubmodules = true;
 
     # Remove v2 dashboard distributed under NCUL1. Make sure an empty

From add9b9454827d1a342781d20454db920e0ed08fb Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <ulysseszhan@gmail.com>
Date: Fri, 15 Mar 2024 18:41:50 -0700
Subject: [PATCH 011/145] legends-of-equestria: init at 2024.05.01

---
 .../le/legends-of-equestria/package.nix       | 141 ++++++++++++++++++
 .../by-name/le/legends-of-equestria/update.sh |  17 +++
 2 files changed, 158 insertions(+)
 create mode 100644 pkgs/by-name/le/legends-of-equestria/package.nix
 create mode 100755 pkgs/by-name/le/legends-of-equestria/update.sh

diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix
new file mode 100644
index 000000000000..32c87dd3cef9
--- /dev/null
+++ b/pkgs/by-name/le/legends-of-equestria/package.nix
@@ -0,0 +1,141 @@
+{
+  lib,
+  stdenv,
+  runCommand,
+  megacmd,
+  unzip,
+  makeWrapper,
+  autoPatchelfHook,
+  makeDesktopItem,
+  copyDesktopItems,
+  libgcc,
+  dbus,
+  xorg_sys_opengl,
+  systemd,
+  libcap,
+  libdrm,
+  pulseaudio,
+  libsndfile,
+  flac,
+  libvorbis,
+  libopus,
+  mpg123,
+  lame,
+  libGL,
+  vulkan-loader,
+  libasyncns,
+  xorg,
+}:
+
+let
+  pname = "legends-of-equestria";
+  version = "2024.05.01";
+  description = "Free-to-play MMORPG";
+  runtimeDeps =
+    [
+      dbus.lib
+      xorg_sys_opengl
+      systemd
+      libcap.lib
+      libdrm
+      pulseaudio
+      libsndfile
+      flac
+      libvorbis
+      mpg123
+      lame.lib
+      libGL
+      vulkan-loader
+      libasyncns
+    ]
+    ++ (with xorg; [
+      libX11
+      libxcb
+      libXau
+      libXdmcp
+      libXext
+      libXcursor
+      libXrender
+      libXfixes
+      libXinerama
+      libXi
+      libXrandr
+      libXScrnSaver
+    ]);
+in
+stdenv.mkDerivation {
+  inherit pname version;
+  src =
+    runCommand "mega-loe"
+      {
+        inherit pname version;
+        nativeBuildInputs = [
+          megacmd
+          unzip
+        ];
+        url = "https://mega.nz/file/NjIwwJoK#MVi3C3FAcSQPd7FRpQc0CoStBG8jSFuPn0jD-pG3zY0";
+        outputHashAlgo = "sha256";
+        outputHash = "VXBtEB3G5MTrWn9OOvmCG3sDoasjbKkLJruhdQZa4SQ=";
+        outputHashMode = "recursive";
+      }
+      ''
+        export HOME=$(mktemp -d)
+        dest=$HOME/mega-loe
+        mkdir -p $dest
+        mega-get "$url" $dest
+        mkdir -p $out
+        unzip -d $out $dest/*.zip
+      '';
+
+  dontBuild = true;
+  buildInputs = [
+    libgcc
+  ];
+  nativeBuildInputs = [
+    makeWrapper
+    copyDesktopItems
+    autoPatchelfHook
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    loeHome=$out/lib/${pname}
+    mkdir -p $loeHome
+    cp -r LoE/* $loeHome
+
+    makeWrapper $loeHome/LoE.x86_64 $out/bin/LoE \
+      --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}"
+
+    icon=$out/share/icons/hicolor/128x128/apps/legends-of-equestria.png
+    mkdir -p $(dirname $icon)
+    ln -s $loeHome/LoE_Data/Resources/UnityPlayer.png $icon
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "legends-of-equestria";
+      comment = description;
+      desktopName = "Legends of Equestria";
+      genericName = "Legends of Equestria";
+      exec = "LoE";
+      icon = "legends-of-equestria";
+      categories = [ "Game" ];
+    })
+  ];
+
+  meta = {
+    inherit description;
+    license = lib.licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    mainProgram = "LoE";
+    homepage = "https://www.legendsofequestria.com";
+    downloadPage = "https://www.legendsofequestria.com/downloads";
+  };
+
+}
diff --git a/pkgs/by-name/le/legends-of-equestria/update.sh b/pkgs/by-name/le/legends-of-equestria/update.sh
new file mode 100755
index 000000000000..7aef3fd0f488
--- /dev/null
+++ b/pkgs/by-name/le/legends-of-equestria/update.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts
+
+set -eu -o pipefail
+
+DOWNLOADS_PAGE_URL=https://www.legendsofequestria.com/downloads
+REGEX='href="(https.+)".+Linux.+v(([0-9]+\.)+[0-9]+)'
+
+if [[ $(curl -s $DOWNLOADS_PAGE_URL | grep -Fi Linux) =~ $REGEX ]]; then
+    url="${BASH_REMATCH[1]}"
+    version="${BASH_REMATCH[2]}"
+else
+    echo "cannot find the latest version"
+    exit 1
+fi
+
+update-source-version legends-of-equestria "$version" "" "$url"

From a1cccc5e39dc52bed046b8ab59af8a2c3f958ee1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Dec 2024 00:55:56 +0000
Subject: [PATCH 012/145] nsd: 4.10.1 -> 4.10.2

---
 pkgs/servers/dns/nsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 3ee78ad57032..f89859a8c6ab 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nsd";
-  version = "4.10.1";
+  version = "4.10.2";
 
   src = fetchurl {
     url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-wBkPkj8AlZlfLmMx2s2SxuH01Xi4gNYWkGArQ6Ws/YQ=";
+    sha256 = "sha256-yR7vLnPkMPooa9SPB1qNAj+25gVg4iGJyzWDxdoAtps=";
   };
 
   prePatch = ''

From f3a4513ef4457c6cdd8a3af34cf4f1f413ae639c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Dec 2024 12:44:39 +0000
Subject: [PATCH 013/145] =?UTF-8?q?libgedit-tepl:=206.11.0=20=E2=86=92=206?=
 =?UTF-8?q?.12.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/World/gedit/libgedit-tepl/-/compare/6.11.0...6.12.0
---
 pkgs/by-name/li/libgedit-tepl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix
index c3cebb631f17..4508b25869f3 100644
--- a/pkgs/by-name/li/libgedit-tepl/package.nix
+++ b/pkgs/by-name/li/libgedit-tepl/package.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libgedit-tepl";
-  version = "6.11.0";
+  version = "6.12.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     owner = "gedit";
     repo = "libgedit-tepl";
     rev = version;
-    hash = "sha256-8y3EQZKYRcx2ocG7aR7tGBCE/68yPdrBcPNm6O2lM4c=";
+    hash = "sha256-s3b7wj6b2SM0+i0vXUDDhnspgPcsRAsA5kLblh0orJE=";
   };
 
   strictDeps = true;

From 597f6fff71a10a720d0af0943b2995dcc44010c1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 9 Dec 2024 20:58:33 +0800
Subject: [PATCH 014/145] =?UTF-8?q?libgedit-gtksourceview:=20299.3.0=20?=
 =?UTF-8?q?=E2=86=92=20299.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/World/gedit/libgedit-gtksourceview/-/compare/299.3.0...299.4.0
---
 pkgs/by-name/li/libgedit-gtksourceview/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix
index 3e6a7fc5891e..722c0d19d0a4 100644
--- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix
+++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libgedit-gtksourceview";
-  version = "299.3.0";
+  version = "299.4.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "gedit";
     repo = "libgedit-gtksourceview";
     rev = finalAttrs.version;
-    hash = "sha256-C2Bq01PlALJMr7kHsSr9VaSNcktc250yGevRYQ7Ipck=";
+    hash = "sha256-befm5UIXh2aCpKN2NH0aJhCYLf9j/ug0kVDAD5xNt4k=";
   };
 
   patches = [

From 8153ad4458f0d71420f710705598c13da39a07f7 Mon Sep 17 00:00:00 2001
From: Marcel <34819524+MarcelCoding@users.noreply.github.com>
Date: Mon, 9 Dec 2024 21:15:19 +0100
Subject: [PATCH 015/145] nixos/librenms: order librenms-setup after
 network.target

librenms-setup requires database access; when deploying databases externally, networking is required.
---
 nixos/modules/services/monitoring/librenms.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix
index eb3504f8c990..918c01ebaf22 100644
--- a/nixos/modules/services/monitoring/librenms.nix
+++ b/nixos/modules/services/monitoring/librenms.nix
@@ -514,7 +514,7 @@ in
     systemd.services.librenms-setup = {
       description = "Preparation tasks for LibreNMS";
       before = [ "phpfpm-librenms.service" ];
-      after = [ "systemd-tmpfiles-setup.service" ]
+      after = [ "systemd-tmpfiles-setup.service" "network.target" ]
         ++ (lib.optional (cfg.database.host == "localhost") "mysql.service");
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [ package configFile ];

From 4da7e8106a841a3d98bca80ad7190f5135b210fa Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 9 Dec 2024 21:15:35 +0100
Subject: [PATCH 016/145] mobilizon: 4.1.0 -> 5.1.0

---
 pkgs/servers/mobilizon/common.nix   | 4 ++--
 pkgs/servers/mobilizon/frontend.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix
index 0b3e3faa7306..d77b7758a2cc 100644
--- a/pkgs/servers/mobilizon/common.nix
+++ b/pkgs/servers/mobilizon/common.nix
@@ -1,13 +1,13 @@
 { fetchFromGitLab }: rec {
 
   pname = "mobilizon";
-  version = "4.1.0";
+  version = "5.1.0";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "framasoft";
     repo = pname;
     rev = version;
-    sha256 = "sha256-aS57126Nhz/QvouSyZ9wUu78/eoCYbRwyncUUmO1Dv8=";
+    sha256 = "sha256-2L1k8oaO9EDWlYO+OIlkbEcqPYN1fac0MpnpNHkoeis=";
   };
 }
diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix
index 397fb138bd44..a18a164196b4 100644
--- a/pkgs/servers/mobilizon/frontend.nix
+++ b/pkgs/servers/mobilizon/frontend.nix
@@ -6,7 +6,7 @@ in
 buildNpmPackage {
   inherit (common) pname version src;
 
-  npmDepsHash = "sha256-pF07ul71zg9iLM/ja4Fz/6IXpqdMKb7KwOH02Q9lyCg=";
+  npmDepsHash = "sha256-oOV4clyUzKTdAMCKghWS10X9Nug9j8mil/vXcFhZ6Z0=";
 
   nativeBuildInputs = [ imagemagick ];
 

From 10e95f3d0ae85c072bc9ca6ef2325eee0c97e3c9 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Mon, 9 Dec 2024 16:54:23 -0500
Subject: [PATCH 017/145] nodePackages.vls: drop

---
 .../manual/release-notes/rl-2505.section.md   |   2 +
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 223 ------------------
 4 files changed, 3 insertions(+), 224 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index f3a58367e055..37f724226a95 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -52,6 +52,8 @@
 
 - `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL.
 
+- `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead.
+
 - `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead.
 
 - `nodePackages.insect` has been removed, as it's deprecated by upstream. The suggested replacement is `numbat`.
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index f64a2a5383e7..c898526c6d63 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -208,6 +208,7 @@ mapAliases {
   inherit (pkgs) undollar; # added 2024-06-29
   inherit (pkgs) ungit; # added 2023-08-20
   inherit (pkgs) vim-language-server; # added 2024-06-25
+  vls = throw "vls has been deprecated by upstream as vetur is also deprecated. Upstream suggests migrating to Volar for Vue LSP tooling instead."; # added 2024-12-09
   inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30
   vscode-css-languageserver-bin = throw "vscode-css-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26
   vscode-html-languageserver-bin = throw "vscode-html-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index cce143419c90..fc2fc2cb8a6b 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -217,7 +217,6 @@
 , "vega-cli"
 , "vega-lite"
 , "vercel"
-, "vls"
 , "vscode-json-languageserver"
 , "wavedrom-cli"
 , "webpack"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index fa95c792deda..bb775a7e8763 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -22578,15 +22578,6 @@ let
         sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==";
       };
     };
-    "eslint-plugin-vue-9.28.0" = {
-      name = "eslint-plugin-vue";
-      packageName = "eslint-plugin-vue";
-      version = "9.28.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.28.0.tgz";
-        sha512 = "ShrihdjIhOTxs+MfWun6oJWuk+g/LAhN+CiuOl/jjkG3l0F2AuK5NMTaWqyvBgkFtpYmyks6P4603mLmhNJW8g==";
-      };
-    };
     "eslint-rule-docs-1.1.235" = {
       name = "eslint-rule-docs";
       packageName = "eslint-rule-docs";
@@ -51381,15 +51372,6 @@ let
         sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==";
       };
     };
-    "vue-eslint-parser-9.4.3" = {
-      name = "vue-eslint-parser";
-      packageName = "vue-eslint-parser";
-      version = "9.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz";
-        sha512 = "2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==";
-      };
-    };
     "w3c-hr-time-1.0.2" = {
       name = "w3c-hr-time";
       packageName = "w3c-hr-time";
@@ -52497,15 +52479,6 @@ let
         sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==";
       };
     };
-    "xml-name-validator-4.0.0" = {
-      name = "xml-name-validator";
-      packageName = "xml-name-validator";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz";
-        sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==";
-      };
-    };
     "xml-name-validator-5.0.0" = {
       name = "xml-name-validator";
       packageName = "xml-name-validator";
@@ -78716,202 +78689,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  vls = nodeEnv.buildNodePackage {
-    name = "vls";
-    packageName = "vls";
-    version = "0.8.5";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/vls/-/vls-0.8.5.tgz";
-      sha512 = "61kbdO2COZWBMC4wq59QfDdev9ruXd0226f57DFJTFpFXv85S+qnHakQlAmbSYFFLGKcx95HB2UjnuQh4YRwFA==";
-    };
-    dependencies = [
-      sources."@babel/code-frame-7.24.7"
-      sources."@babel/helper-validator-identifier-7.24.7"
-      (sources."@babel/highlight-7.24.7" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."escape-string-regexp-1.0.5"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."@eslint-community/eslint-utils-4.4.0"
-      sources."@eslint-community/regexpp-4.11.1"
-      sources."@eslint/eslintrc-2.1.4"
-      sources."@eslint/js-8.57.1"
-      sources."@humanwhocodes/config-array-0.13.0"
-      sources."@humanwhocodes/module-importer-1.0.1"
-      sources."@humanwhocodes/object-schema-2.0.3"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."@ungap/structured-clone-1.2.0"
-      sources."acorn-8.12.1"
-      sources."acorn-jsx-5.3.2"
-      sources."ajv-6.12.6"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."argparse-2.0.1"
-      sources."balanced-match-1.0.2"
-      sources."boolbase-1.0.0"
-      sources."brace-expansion-1.1.11"
-      sources."builtin-modules-1.1.1"
-      sources."call-bind-1.0.7"
-      sources."callsites-3.1.0"
-      sources."chalk-4.1.2"
-      sources."character-parser-2.2.0"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."commander-2.20.3"
-      sources."concat-map-0.0.1"
-      sources."cross-spawn-7.0.3"
-      sources."cssesc-3.0.0"
-      sources."debug-4.3.7"
-      sources."deep-is-0.1.4"
-      sources."define-data-property-1.1.4"
-      sources."diff-4.0.2"
-      sources."doctrine-3.0.0"
-      sources."es-define-property-1.0.0"
-      sources."es-errors-1.3.0"
-      sources."escape-string-regexp-4.0.0"
-      sources."eslint-8.57.1"
-      sources."eslint-plugin-vue-9.28.0"
-      sources."eslint-scope-7.2.2"
-      sources."eslint-visitor-keys-3.4.3"
-      sources."espree-9.6.1"
-      sources."esprima-4.0.1"
-      sources."esquery-1.6.0"
-      sources."esrecurse-4.3.0"
-      sources."estraverse-5.3.0"
-      sources."esutils-2.0.3"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-levenshtein-2.0.6"
-      sources."fastq-1.17.1"
-      sources."file-entry-cache-6.0.1"
-      sources."find-up-5.0.0"
-      sources."flat-cache-3.2.0"
-      sources."flatted-3.3.1"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.2.4"
-      sources."glob-7.2.3"
-      sources."glob-parent-6.0.2"
-      sources."globals-13.24.0"
-      sources."gopd-1.0.1"
-      sources."graphemer-1.4.0"
-      sources."has-flag-4.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-proto-1.0.3"
-      sources."has-symbols-1.0.3"
-      sources."has-tostringtag-1.0.2"
-      sources."hasown-2.0.2"
-      sources."ignore-5.3.2"
-      sources."import-fresh-3.3.0"
-      sources."imurmurhash-0.1.4"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."is-core-module-2.15.1"
-      (sources."is-expression-4.0.0" // {
-        dependencies = [
-          sources."acorn-7.4.1"
-        ];
-      })
-      sources."is-extglob-2.1.1"
-      sources."is-glob-4.0.3"
-      sources."is-path-inside-3.0.3"
-      sources."is-regex-1.1.4"
-      sources."isexe-2.0.0"
-      sources."js-tokens-4.0.0"
-      sources."js-yaml-4.1.0"
-      sources."json-buffer-3.0.1"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stable-stringify-without-jsonify-1.0.1"
-      sources."keyv-4.5.4"
-      sources."levn-0.4.1"
-      sources."locate-path-6.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.merge-4.6.2"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."mkdirp-0.5.6"
-      sources."ms-2.1.3"
-      sources."natural-compare-1.4.0"
-      sources."nth-check-2.1.1"
-      sources."object-assign-4.1.1"
-      sources."once-1.4.0"
-      sources."optionator-0.9.4"
-      sources."p-limit-3.1.0"
-      sources."p-locate-5.0.0"
-      sources."parent-module-1.0.1"
-      sources."path-exists-4.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
-      sources."path-parse-1.0.7"
-      sources."picocolors-1.1.0"
-      sources."postcss-selector-parser-6.1.2"
-      sources."prelude-ls-1.2.1"
-      sources."prettier-2.8.8"
-      sources."pug-error-2.1.0"
-      sources."pug-lexer-5.0.1"
-      sources."punycode-2.3.1"
-      sources."queue-microtask-1.2.3"
-      sources."resolve-1.22.8"
-      sources."resolve-from-4.0.0"
-      sources."reusify-1.0.4"
-      sources."rimraf-3.0.2"
-      sources."run-parallel-1.2.0"
-      sources."semver-7.6.3"
-      sources."set-function-length-1.2.2"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."sprintf-js-1.0.3"
-      sources."strip-ansi-6.0.1"
-      sources."strip-json-comments-3.1.1"
-      sources."supports-color-7.2.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."text-table-0.2.0"
-      sources."tslib-1.14.1"
-      (sources."tslint-6.1.3" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."argparse-1.0.10"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."escape-string-regexp-1.0.5"
-          sources."has-flag-3.0.0"
-          sources."js-yaml-3.14.1"
-          sources."semver-5.7.2"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."tsutils-2.29.0"
-      sources."type-check-0.4.0"
-      sources."type-fest-0.20.2"
-      sources."typescript-4.9.5"
-      sources."uri-js-4.4.1"
-      sources."util-deprecate-1.0.2"
-      sources."vue-eslint-parser-9.4.3"
-      sources."which-2.0.2"
-      sources."word-wrap-1.2.5"
-      sources."wrappy-1.0.2"
-      sources."xml-name-validator-4.0.0"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Vue Language Server";
-      homepage = "https://github.com/vuejs/vetur/tree/master/server";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   vscode-json-languageserver = nodeEnv.buildNodePackage {
     name = "vscode-json-languageserver";
     packageName = "vscode-json-languageserver";

From 17121bf6202f76fa52b2a41165fc38a0f132f8a6 Mon Sep 17 00:00:00 2001
From: jiriks74 <jiri@stefka.eu>
Date: Thu, 14 Nov 2024 23:23:10 +0100
Subject: [PATCH 018/145] git-worktree-switcher: init at 0.2.4

[`git worktree` documentation](https://git-scm.com/docs/git-worktree)
[`git-worktree-switcher` repository](https://github.com/mateusauler/git-worktree-switcher)

From the project's description:

> Switch between git worktrees with speed.

It's a wrapper script around `git worktree` making some tasks,
like switching between worktrees, easier.

> [!Note]
> `git worktree` is a little known feature and adding QoL things can help
it's adoption as it's a considerable upgrade against the `git stash`
workflow.
---
 .../disable-update.patch                      | 30 ++++++++++
 .../gi/git-worktree-switcher/package.nix      | 60 +++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 pkgs/by-name/gi/git-worktree-switcher/disable-update.patch
 create mode 100644 pkgs/by-name/gi/git-worktree-switcher/package.nix

diff --git a/pkgs/by-name/gi/git-worktree-switcher/disable-update.patch b/pkgs/by-name/gi/git-worktree-switcher/disable-update.patch
new file mode 100644
index 000000000000..2763ab3a3fe1
--- /dev/null
+++ b/pkgs/by-name/gi/git-worktree-switcher/disable-update.patch
@@ -0,0 +1,30 @@
+diff --git a/wt b/wt
+index 60999f2..5687822 100755
+--- a/wt
++++ b/wt
+@@ -27,7 +27,6 @@ help_message() {
+ 	echo -e "\twt: go to the main worktree"
+ 	echo -e "\twt <worktree-name>: search for worktree names and change to that directory."
+ 	echo -e "\twt names: list out only the git worktree names."
+-	echo -e "\twt update: update to the latest release of worktree switcher."
+ 	echo -e "\twt version: show the CLI version."
+ 	echo -e "\twt init <shell>: print the init script for <shell>."
+ 	echo -e "\twt help: shows this help message."
+@@ -163,9 +162,6 @@ case "${args[0]}" in
+ names)
+ 	worktree_list_names
+ 	;;
+-update)
+-	update
+-	;;
+ help)
+ 	help_message
+ 	;;
+@@ -176,7 +172,6 @@ init)
+ 	init
+ 	;;
+ *)
+-	auto_check_update
+ 	directory=$(git worktree list --porcelain 2> /dev/null | sed -n '/'"${arg:-.}"'/{s/^worktree\s*//p;q}')
+ 	;;
+ esac
diff --git a/pkgs/by-name/gi/git-worktree-switcher/package.nix b/pkgs/by-name/gi/git-worktree-switcher/package.nix
new file mode 100644
index 000000000000..9c9f64e58c96
--- /dev/null
+++ b/pkgs/by-name/gi/git-worktree-switcher/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeWrapper,
+  installShellFiles,
+  git,
+  jq,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "git-worktree-switcher";
+  version = "0.2.4";
+
+  src = fetchFromGitHub {
+    owner = "mateusauler";
+    repo = "git-worktree-switcher";
+    rev = "refs/tags/${finalAttrs.version}-fork";
+    hash = "sha256-N+bDsLEUM6FWhyliUav2n5hwMa5EEuVPoIK+Cja0DxA=";
+  };
+
+  buildInputs = [
+    jq
+    git
+  ];
+
+  nativeBuildInputs = [
+    makeWrapper
+    installShellFiles
+  ];
+
+  patches = [
+    ./disable-update.patch # Disable update and auto update functionality
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    cp wt $out/bin
+    wrapProgram $out/bin/wt --prefix PATH : ${
+      lib.makeBinPath [
+        git
+        jq
+      ]
+    }
+
+    installShellCompletion --zsh completions/_wt_completion
+    installShellCompletion --bash completions/wt_completion
+    installShellCompletion --fish completions/wt.fish
+  '';
+
+  meta = {
+    homepage = "https://github.com/mateusauler/git-worktree-switcher";
+    description = "Switch between git worktrees with speed.";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    mainProgram = "wt";
+    maintainers = with lib.maintainers; [ jiriks74 ];
+  };
+})

From 3318aa52de01fed525e04ba6d73a7cc2e2aafff4 Mon Sep 17 00:00:00 2001
From: jiriks74 <jiri@stefka.eu>
Date: Thu, 14 Nov 2024 12:53:07 +0100
Subject: [PATCH 019/145] nixos/git-worktree-switcher: init
 git-worktree-switcher

This module sets up shells so that they work with
[git-worktree-switcher](https://github.com/mateusauler/git-worktree-switcher)
---
 .../manual/release-notes/rl-2505.section.md   |  2 +
 nixos/modules/module-list.nix                 |  1 +
 .../programs/git-worktree-switcher.nix        | 40 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 nixos/modules/programs/git-worktree-switcher.nix

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 39849d5d64c2..bb690cb8a467 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -20,6 +20,8 @@
 
 - [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](#opt-services.agorakit.enable).
 
+- [git-worktree-switcher](https://github.com/mateusauler/git-worktree-switcher), switch between git worktrees with speed. Available as [programs.git-worktree-switcher](#opt-programs.git-worktree-switcher.enable)
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3b31c12df77a..4081aa28b140 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -205,6 +205,7 @@
   ./programs/gdk-pixbuf.nix
   ./programs/geary.nix
   ./programs/git.nix
+  ./programs/git-worktree-switcher.nix
   ./programs/gnome-disks.nix
   ./programs/gnome-terminal.nix
   ./programs/gnupg.nix
diff --git a/nixos/modules/programs/git-worktree-switcher.nix b/nixos/modules/programs/git-worktree-switcher.nix
new file mode 100644
index 000000000000..c85ebfbd49cd
--- /dev/null
+++ b/nixos/modules/programs/git-worktree-switcher.nix
@@ -0,0 +1,40 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.programs.git-worktree-switcher;
+
+  initScript =
+    shell:
+    if (shell == "fish") then
+      ''
+        ${lib.getExe pkgs.git-worktree-switcher} init ${shell} | source
+      ''
+    else
+      ''
+        eval "$(${lib.getExe pkgs.git-worktree-switcher} init ${shell})"
+      '';
+in
+{
+  options = {
+    programs.git-worktree-switcher = {
+      enable = lib.mkEnableOption "git-worktree-switcher, switch between git worktrees with speed.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [ git-worktree-switcher ];
+
+    programs.bash.interactiveShellInit = initScript "bash";
+    programs.zsh.interactiveShellInit = lib.optionalString config.programs.zsh.enable (
+      initScript "zsh"
+    );
+    programs.fish.interactiveShellInit = lib.optionalString config.programs.fish.enable (
+      initScript "fish"
+    );
+  };
+}

From 917ed0b6d7d2256e1da1b1010ee36531cb1c2e2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 03:16:29 +0000
Subject: [PATCH 020/145] versitygw: 1.0.8 -> 1.0.9

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

diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix
index 40c8297ed57f..d94b5d5efd40 100644
--- a/pkgs/by-name/ve/versitygw/package.nix
+++ b/pkgs/by-name/ve/versitygw/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "versitygw";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "versity";
     repo = "versitygw";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hrGPHl8vfLsL1JMcaU+RAQj6CaBJKsW+Q2AGCbgYUSA=";
+    hash = "sha256-giPk0037zMqrqG6L1b9M7Us9d9YpGNjlJXWaNCIx3vc=";
   };
 
-  vendorHash = "sha256-zZufxxZZ5Lfr0vWcygXdiRK+bhUr/+MFk4ajJGz5TMI=";
+  vendorHash = "sha256-vW1LQDr2u/owt919HyRkd6frCQquCq5rrYFAp0n3x2o=";
 
   doCheck = false; # Require access to online S3 services
 

From 78ba8eabb4b528da71689bcd3e0d9f551b89ab03 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 10 Dec 2024 04:16:32 +0100
Subject: [PATCH 021/145] python312Packages.example-robot-data: 4.1.0 -> 4.2.0

---
 pkgs/by-name/ex/example-robot-data/package.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix
index 63331bbf5a84..4b649a847156 100644
--- a/pkgs/by-name/ex/example-robot-data/package.nix
+++ b/pkgs/by-name/ex/example-robot-data/package.nix
@@ -2,7 +2,6 @@
   cmake,
   doxygen,
   fetchFromGitHub,
-  fetchpatch,
   lib,
   pkg-config,
   pythonSupport ? false,
@@ -12,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "example-robot-data";
-  version = "4.1.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "Gepetto";
     repo = "example-robot-data";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-Heq+c8SSYNO8ksTv5FphRBRStlTakm9T66jlPXon5tI=";
+    hash = "sha256-IRmqeaN0EaIjYaibTEAR8KhixoNQsl6YydbGQRinP6w=";
   };
 
   outputs = [
@@ -29,16 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  patches = [
-    # Temporary patch for pinocchio v3.0.0 compatibility.
-    # Should be removed on next example-robot-data release
-    (fetchpatch {
-      name = "pin3.patch";
-      url = "https://github.com/Gepetto/example-robot-data/pull/217/commits/a605ceec857005cde153ec5895e227205eb7a5c3.patch";
-      hash = "sha256-cvAWFytrU2XVggo/nCg8cuLcaZBTACXg6LxjL/6YMPs=";
-    })
-  ];
-
   nativeBuildInputs =
     [
       cmake

From 43785144de5a62c1da5feb3730dd1ba202b06bc6 Mon Sep 17 00:00:00 2001
From: Yongun Seong <nevivurn@nevi.dev>
Date: Sun, 1 Dec 2024 18:34:25 +0900
Subject: [PATCH 022/145] perlPackages.FinanceQuote: 1.63 -> 1.64

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4adf1b10a3ed..8e757ae40faa 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10479,10 +10479,10 @@ with self; {
 
   FinanceQuote = buildPerlPackage rec {
     pname = "Finance-Quote";
-    version = "1.63";
+    version = "1.64";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz";
-      hash = "sha256-Y0dqDIJ60aHf7KjePopkKiToeMH0p6neb1FNaoV3so0=";
+      hash = "sha256-BYB8lEFakSzlbiJ4FRcTjv/OdoOaj4LtOLsxxAaOXBs=";
     };
     buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ];
     propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies HTTPCookieJar JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ];

From 0e59e7b7d81cc5c8e878eed4c520b68728cd7368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Dec 2024 06:33:10 +0100
Subject: [PATCH 023/145] nix: simplify version checks

---
 pkgs/tools/package-management/nix/common.nix | 59 ++++++++------------
 1 file changed, 24 insertions(+), 35 deletions(-)

diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index a4d233b2b128..2e2b4ba94e2f 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -10,16 +10,6 @@
 }@args:
 assert (hash == null) -> (src != null);
 let
-  atLeast24 = lib.versionAtLeast version "2.4pre";
-  atLeast25 = lib.versionAtLeast version "2.5pre";
-  atLeast27 = lib.versionAtLeast version "2.7pre";
-  atLeast210 = lib.versionAtLeast version "2.10pre";
-  atLeast213 = lib.versionAtLeast version "2.13pre";
-  atLeast214 = lib.versionAtLeast version "2.14pre";
-  atLeast218 = lib.versionAtLeast version "2.18pre";
-  atLeast219 = lib.versionAtLeast version "2.19pre";
-  atLeast220 = lib.versionAtLeast version "2.20pre";
-  atLeast221 = lib.versionAtLeast version "2.21pre";
   atLeast224 = lib.versionAtLeast version "2.24pre";
   atLeast225 = lib.versionAtLeast version "2.25pre";
   # Major.minor versions unaffected by CVE-2024-27297
@@ -112,7 +102,7 @@ self = stdenv.mkDerivation {
     "shadowstack"
   ] ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
 
-  nativeInstallCheckInputs = lib.optional atLeast221 git ++ lib.optional atLeast219 man;
+  nativeInstallCheckInputs = lib.optional atLeast224 [ git man ];
 
   nativeBuildInputs = [
     pkg-config
@@ -121,17 +111,18 @@ self = stdenv.mkDerivation {
     bison
     flex
     jq
-  ] ++ lib.optionals (enableDocumentation && !atLeast24) [
-    libxslt
-    libxml2
-    docbook_xsl_ns
-    docbook5
-  ] ++ lib.optionals (enableDocumentation && atLeast24) [
-    (lib.getBin lowdown-unsandboxed)
-    mdbook
-  ] ++ lib.optionals (atLeast213 && enableDocumentation) [
-    mdbook-linkcheck
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+  ] ++ lib.optionals enableDocumentation
+    (if atLeast224 then [
+      (lib.getBin lowdown-unsandboxed)
+      mdbook
+      mdbook-linkcheck
+    ] else [
+      libxslt
+      libxml2
+      docbook_xsl_ns
+      docbook5
+    ])
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
     util-linuxMinimal
   ];
 
@@ -148,23 +139,21 @@ self = stdenv.mkDerivation {
     gtest
     libarchive
     lowdown
-  ] ++ lib.optionals atLeast220 [
+  ] ++ lib.optionals atLeast224 [
     libgit2
-  ] ++ lib.optionals (atLeast224 || lib.versionAtLeast version "pre20240626") [
     toml11
+    rapidcheck
   ] ++ lib.optionals (atLeast225 && enableDocumentation) [
     python3
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     Security
   ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [
     libcpuid
-  ] ++ lib.optionals atLeast214 [
-    rapidcheck
   ] ++ lib.optionals withLibseccomp [
     libseccomp
   ] ++ lib.optionals withAWS [
     aws-sdk-cpp
-  ] ++ lib.optional (atLeast218 && stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optional (atLeast224 && stdenv.hostPlatform.isDarwin) [
     darwin.apple_sdk.libs.sandbox
   ] ++ lib.optional (atLeast224 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
     # Fix the following error with the default x86_64-darwin SDK:
@@ -179,7 +168,7 @@ self = stdenv.mkDerivation {
 
   propagatedBuildInputs = [
     boehmgc
-  ] ++ lib.optionals atLeast27 [
+  ] ++ lib.optionals atLeast224 [
     nlohmann_json
   ];
 
@@ -203,7 +192,7 @@ self = stdenv.mkDerivation {
     # removes config.nix entirely and is not present in 2.3.x, we need to
     # patch around an issue where the Nix configure step pulls in the build
     # system's bash and other utilities when cross-compiling.
-    lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && !atLeast24) ''
+    lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && !atLeast224) ''
       mkdir tmp/
       substitute corepkgs/config.nix.in tmp/config.nix.in \
         --subst-var-by bash ${bash}/bin/bash \
@@ -225,14 +214,14 @@ self = stdenv.mkDerivation {
     "--disable-doc-gen"
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox"
-  ] ++ lib.optionals (atLeast210 && stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [
+  ] ++ lib.optionals (atLeast224 && stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [
     "--enable-embedded-sandbox-shell"
   ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system) [
     "--with-system=${stdenv.hostPlatform.nix.system}"
   ] ++ lib.optionals (!withLibseccomp) [
     # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
     "--disable-seccomp-sandboxing"
-  ] ++ lib.optionals (atLeast210 && stdenv.cc.isGNU && !enableStatic) [
+  ] ++ lib.optionals (atLeast224 && stdenv.cc.isGNU && !enableStatic) [
     "--enable-lto"
   ];
 
@@ -248,7 +237,7 @@ self = stdenv.mkDerivation {
   installFlags = [ "sysconfdir=$(out)/etc" ];
 
   doInstallCheck = true;
-  installCheckTarget = if atLeast210 then "installcheck" else null;
+  installCheckTarget = if atLeast224 then "installcheck" else null;
 
   # socket path becomes too long otherwise
   preInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -260,17 +249,17 @@ self = stdenv.mkDerivation {
     export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
   ''
   # See https://github.com/NixOS/nix/issues/5687
-  + lib.optionalString (atLeast25 && stdenv.hostPlatform.isDarwin) ''
+  + lib.optionalString (atLeast224 && stdenv.hostPlatform.isDarwin) ''
     echo "exit 99" > tests/gc-non-blocking.sh
   '' # TODO: investigate why this broken
-  + lib.optionalString (atLeast25 && stdenv.hostPlatform.system == "aarch64-linux") ''
+  + lib.optionalString (atLeast224 && stdenv.hostPlatform.system == "aarch64-linux") ''
     echo "exit 0" > tests/functional/flakes/show.sh
   '' + ''
     # nixStatic otherwise does not find its man pages in tests.
     export MANPATH=$man/share/man:$MANPATH
   '';
 
-  separateDebugInfo = stdenv.hostPlatform.isLinux && (atLeast24 -> !enableStatic);
+  separateDebugInfo = stdenv.hostPlatform.isLinux && (atLeast224 -> !enableStatic);
 
   enableParallelBuilding = true;
 

From 90f44b313c7a9b616bd6afc6ce38b11adf522e72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Dec 2024 06:33:46 +0100
Subject: [PATCH 024/145] nix: remove fixed CVE-2024-27297 check

---
 pkgs/tools/package-management/nix/common.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index 2e2b4ba94e2f..91622b64ebd1 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -12,14 +12,6 @@ assert (hash == null) -> (src != null);
 let
   atLeast224 = lib.versionAtLeast version "2.24pre";
   atLeast225 = lib.versionAtLeast version "2.25pre";
-  # Major.minor versions unaffected by CVE-2024-27297
-  unaffectedByFodSandboxEscape = [
-    "2.3"
-    "2.16"
-    "2.18"
-    "2.19"
-    "2.20"
-  ];
 in
 { stdenv
 , autoconf-archive
@@ -320,7 +312,6 @@ self = stdenv.mkDerivation {
     platforms = platforms.unix;
     outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";
     mainProgram = "nix";
-    knownVulnerabilities = lib.optional (!builtins.elem (lib.versions.majorMinor version) unaffectedByFodSandboxEscape && !atLeast221) "CVE-2024-27297";
   };
 };
 in self

From 7861ca184d5c79e2700f7e859bbf19f7bd3d7818 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 10:21:32 +0000
Subject: [PATCH 025/145] scdl: 2.12.1 -> 2.12.3

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

diff --git a/pkgs/by-name/sc/scdl/package.nix b/pkgs/by-name/sc/scdl/package.nix
index 94e1d5c53740..486c4947cc77 100644
--- a/pkgs/by-name/sc/scdl/package.nix
+++ b/pkgs/by-name/sc/scdl/package.nix
@@ -2,12 +2,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "scdl";
-  version = "2.12.1";
+  version = "2.12.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8BMO5/XJdAkz/E1ZDXavJudNSOiZdYLcZVMk1S8g9nU=";
+    hash = "sha256-24X+UAabxjyUYF/0qgXEpHgBNXDNn/q8/Nxw2jXKQdM=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 0901bc2b615f4f3f14b07306fc980140d4cdfc47 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 10 Dec 2024 11:25:45 +0100
Subject: [PATCH 026/145] jaq: format

---
 pkgs/by-name/ja/jaq/package.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix
index 4bd2f8cb1a3f..94dd551c3d0a 100644
--- a/pkgs/by-name/ja/jaq/package.nix
+++ b/pkgs/by-name/ja/jaq/package.nix
@@ -1,8 +1,9 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, stdenv
-, darwin
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  stdenv,
+  darwin,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -27,7 +28,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/01mf02/jaq";
     changelog = "https://github.com/01mf02/jaq/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda siraben ];
+    maintainers = with maintainers; [
+      figsoda
+      siraben
+    ];
     mainProgram = "jaq";
   };
 }

From 56e36e8d5763d367e920d2760bca5b2201675b62 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 12:17:54 +0100
Subject: [PATCH 027/145] python312Packages.msticpy: 2.14.0 -> 2.15.0

Diff: https://github.com/microsoft/msticpy/compare/refs/tags/v2.14.0...v2.15.0

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

diff --git a/pkgs/development/python-modules/msticpy/default.nix b/pkgs/development/python-modules/msticpy/default.nix
index 737a54b83f26..16edae320a26 100644
--- a/pkgs/development/python-modules/msticpy/default.nix
+++ b/pkgs/development/python-modules/msticpy/default.nix
@@ -49,7 +49,7 @@
 
 buildPythonPackage rec {
   pname = "msticpy";
-  version = "2.14.0";
+  version = "2.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -58,7 +58,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "msticpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9qTcXcgUxjSLbsWT7O9ilYuRRPPyN0v9NzUkbd4cIn0=";
+    hash = "sha256-jYLAF+6yhZo74LYDaoA/+JTd05s6VCheYpHk6ilufBM=";
   };
 
   pythonRelaxDeps = [ "bokeh" ];

From dd4e8f555eee7a656f9eee609b603dcb3d317d8b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 13:18:51 +0100
Subject: [PATCH 028/145] python312Packages.tencentcloud-sdk-python: 3.0.1277
 -> 3.0.1278

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1277...3.0.1278

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

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index de6e4d45ff62..0018bc4b5783 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1277";
+  version = "3.0.1278";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-4HgrzI3vHPZIFa8H/EqWF9GgGEJetd/+BVMgbYTvmA8=";
+    hash = "sha256-K+s0Bd75ZY1WtkW7wtJhq0EUcualuCLU9ms0gedKDQk=";
   };
 
   build-system = [ setuptools ];

From a89ad69cd90cf6ba863670bc1b73f36796fdf3f2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 13:21:22 +0100
Subject: [PATCH 029/145] python312Packages.yte: 1.5.4 -> 1.5.5

Diff: https://github.com/koesterlab/yte/compare/refs/tags/v1.5.4...v1.5.5

Changelog: https://github.com/yte-template-engine/yte/blob/v1.5.5/CHANGELOG.md
---
 .../development/python-modules/yte/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/yte/default.nix b/pkgs/development/python-modules/yte/default.nix
index a269cdd69176..3afdf2d243c5 100644
--- a/pkgs/development/python-modules/yte/default.nix
+++ b/pkgs/development/python-modules/yte/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   dpath,
   fetchFromGitHub,
+  numpy,
   plac,
   poetry-core,
   pytestCheckHook,
@@ -12,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "yte";
-  version = "1.5.4";
+  version = "1.5.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,18 +22,21 @@ buildPythonPackage rec {
     owner = "koesterlab";
     repo = "yte";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Rm3EKxRZCdYErkyWK9+fF2W7C+v5/MXD/LkehmB6UNQ=";
+    hash = "sha256-vHrYWdyWBqonCBWg1X+lTVlOHS30/yYqZ9sVK3/2n5o=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dpath
     plac
     pyyaml
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    numpy
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "yte" ];
 
@@ -45,10 +49,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "YAML template engine with Python expressions";
-    mainProgram = "yte";
     homepage = "https://github.com/koesterlab/yte";
     changelog = "https://github.com/yte-template-engine/yte/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "yte";
   };
 }

From 4b45fe7c20bd448d9719969ac1cae21240feddf2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 10 Dec 2024 11:27:36 +0100
Subject: [PATCH 030/145] jaq: 1.6.0 -> 2.0.1

Diff: https://github.com/01mf02/jaq/compare/None...v2.0.1

Changelog: https://github.com/01mf02/jaq/releases/tag/v2.0.1
---
 pkgs/by-name/ja/jaq/package.nix | 36 ++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix
index 94dd551c3d0a..f64e9855bd9f 100644
--- a/pkgs/by-name/ja/jaq/package.nix
+++ b/pkgs/by-name/ja/jaq/package.nix
@@ -1,34 +1,46 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
-  stdenv,
-  darwin,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "jaq";
-  version = "1.6.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "01mf02";
     repo = "jaq";
-    rev = "v${version}";
-    hash = "sha256-VD10BO7bxTmD1A1AZsiEiYBsVhAKlXxdHNMmXqpvpKM=";
+    tag = "v${version}";
+    hash = "sha256-S8ELxUKU8g8+6HpM+DxINEqMDha7SgesDymhCb7T9bg=";
   };
 
-  cargoHash = "sha256-7MK0iLBpjvWE7UH5Tb3qIm2XnEVsAvBy34Ed4wHagZQ=";
+  cargoHash = "sha256-i3AxIlRY6r0zrMmZVh1l9fPiR652xjhTcwCyHCHCrL8=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Security
+  # This very line fails on `x86_64-darwin`: assertion failed: out.eq(ys)
+  # https://github.com/01mf02/jaq/blob/v2.0.1/jaq-json/tests/funs.rs#L118
+  postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
+    substituteInPlace jaq-json/tests/funs.rs \
+      --replace-fail 'give(json!(null), "2.1 % 0 | isnan", json!(true));' ""
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
   ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Jq clone focused on correctness, speed and simplicity";
     homepage = "https://github.com/01mf02/jaq";
-    changelog = "https://github.com/01mf02/jaq/releases/tag/${src.rev}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/01mf02/jaq/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       siraben
     ];

From 38c02e8952338b1066ff61784152bc3952e39f6e Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Tue, 10 Dec 2024 15:50:01 +0100
Subject: [PATCH 031/145] batman-adv: 2024.3 -> 2024.4

Changelog: https://www.open-mesh.org/news/119
---
 pkgs/os-specific/linux/batman-adv/version.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix
index ca2da5f22100..15b32737a6ea 100644
--- a/pkgs/os-specific/linux/batman-adv/version.nix
+++ b/pkgs/os-specific/linux/batman-adv/version.nix
@@ -1,16 +1,16 @@
 {
-  version = "2024.3";
+  version = "2024.4";
 
   # To get these, run:
   #
   # ```
   # for tool in alfred batctl batman-adv; do
-  #   nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.3/$tool-2024.3.tar.gz --type sha256 | xargs nix hash to-sri --type sha256
+  #   nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.4/$tool-2024.4.tar.gz --type sha256 | xargs nix hash to-sri --type sha256
   # done
   # ```
   sha256 = {
-    alfred = "sha256-1xFDOMGgZGla9x1Y3gNnenIZsHxVQpuA+G3APAJJ/+o=";
-    batctl = "sha256-Zl5lXto4FBUhik1fX9d/8zxPqbXtu36I6DkJaWHjYAs=";
-    batman-adv = "sha256-uWgX7R9PSJF8MlUKhPqtjIfs9Tqm9vRswmVUuZm1f/M=";
+    alfred = "sha256-06WtkGtygDbkc1+dZKcrlzHxb4Hz2N9Ay0eFkaO9IpQ=";
+    batctl = "sha256-5CvfGk7LSxiLzTrKF+EgSWpCtlR1k7kX4//PlD4/KRM=";
+    batman-adv = "sha256-pVTfb8erzMayQ/Vup7GESGyV6phtsRM/h6r+I32pLyE=";
   };
 }

From 5ed339ff576954488d0e7ca087a3817c6f84ace4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:03:26 +0100
Subject: [PATCH 032/145] python312Packages.groq: init at 0.13.0

Library for the Groq API

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

diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix
new file mode 100644
index 000000000000..8828f79a8c04
--- /dev/null
+++ b/pkgs/development/python-modules/groq/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  anyio,
+  buildPythonPackage,
+  dirty-equals,
+  distro,
+  fetchFromGitHub,
+  hatch-fancy-pypi-readme,
+  hatchling,
+  httpx,
+  nest-asyncio,
+  pydantic,
+  pytest-asyncio,
+  pytestCheckHook,
+  respx,
+  sniffio,
+  typing-extensions,
+}:
+
+buildPythonPackage rec {
+  pname = "groq";
+  version = "0.13.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "groq";
+    repo = "groq-python";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-EkEXXHca4DJtY1joM1E4IXzaQzJL+QC+aYaTe46EWlE=";
+  };
+
+  build-system = [
+    hatch-fancy-pypi-readme
+    hatchling
+  ];
+
+  dependencies = [
+    anyio
+    distro
+    httpx
+    pydantic
+    sniffio
+    typing-extensions
+  ];
+
+  nativeCheckInputs = [
+    dirty-equals
+    nest-asyncio
+    pytest-asyncio
+    pytestCheckHook
+    respx
+  ];
+
+  pythonImportsCheck = [ "groq" ];
+
+  disabledTests = [
+    # Tests require network access
+    "test_method"
+    "test_streaming"
+    "test_raw_response"
+    "test_copy_build_request"
+  ];
+
+  meta = {
+    description = "Library for the Groq API";
+    homepage = "https://github.com/groq/groq-python";
+    changelog = "https://github.com/groq/groq-python/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c1682fcddad1..93718e43dc2c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5576,6 +5576,8 @@ self: super: with self; {
 
   greynoise = callPackage ../development/python-modules/greynoise { };
 
+  groq = callPackage ../development/python-modules/groq { };
+
   growattserver = callPackage ../development/python-modules/growattserver { };
 
   gridnet = callPackage ../development/python-modules/gridnet { };

From 95776b69658279f3c50c4c1fbe7a46331ae36de2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:04:28 +0100
Subject: [PATCH 033/145] python312Packages.speechrecognition: 3.11.0 -> 3.12.0

Changelog: https://github.com/Uberi/speech_recognition/releases/tag/3.12.0
---
 .../speechrecognition/default.nix             | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix
index d53493b0a992..bc8375c80807 100644
--- a/pkgs/development/python-modules/speechrecognition/default.nix
+++ b/pkgs/development/python-modules/speechrecognition/default.nix
@@ -3,13 +3,16 @@
   buildPythonPackage,
   fetchFromGitHub,
   flac,
-  openai,
+  groq,
+  httpx,
   openai-whisper,
+  openai,
   pocketsphinx,
   pyaudio,
   pytestCheckHook,
   pythonOlder,
   requests,
+  respx,
   setuptools,
   soundfile,
   typing-extensions,
@@ -17,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "speechrecognition";
-  version = "3.11.0";
+  version = "3.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +29,7 @@ buildPythonPackage rec {
     owner = "Uberi";
     repo = "speech_recognition";
     rev = "refs/tags/${version}";
-    hash = "sha256-5DZ5QhaYpVtd+AX5OSYD3cM+37Ez0+EL5a+zJ+X/uNg=";
+    hash = "sha256-2yc5hztPBOysHxUQcS76ioCXmqNqjid6QUF4qPlIt24=";
   };
 
   postPatch = ''
@@ -40,15 +43,20 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [
-    pyaudio
-    requests
-    typing-extensions
-  ];
+  dependencies = [ typing-extensions ];
 
   optional-dependencies = {
+    assemblyai = [ requests ];
     audio = [ pyaudio ];
-    whisper-api = [ openai ];
+    groq = [
+      groq
+      httpx
+    ];
+    openai = [
+      httpx
+      openai
+    ];
+    pocketsphinx = [ pocketsphinx ];
     whisper-local = [
       openai-whisper
       soundfile
@@ -56,8 +64,10 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    groq
     pytestCheckHook
     pocketsphinx
+    respx
   ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "speech_recognition" ];

From f74bd181b828c379ae6b1243218ce92705b62b61 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 9 Dec 2024 21:01:01 +0800
Subject: [PATCH 034/145] =?UTF-8?q?gedit:=2048.0=20=E2=86=92=2048.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/World/gedit/gedit/-/compare/48.0...48.1
---
 pkgs/by-name/ge/gedit/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ge/gedit/package.nix b/pkgs/by-name/ge/gedit/package.nix
index 7a1edc7294b1..6a7f4e4c7509 100644
--- a/pkgs/by-name/ge/gedit/package.nix
+++ b/pkgs/by-name/ge/gedit/package.nix
@@ -21,7 +21,6 @@
 , ninja
 , gnome
 , gspell
-, perl
 , itstool
 , desktop-file-utils
 , vala
@@ -29,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gedit";
-  version = "48.0";
+  version = "48.1";
 
   outputs = [ "out" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz";
-    sha256 = "/g/vm3sHmRINuGrok6BgA2oTRFNS3tkWm6so04rPDoA=";
+    hash = "sha256-lx56wmvAo6Pe0np1Y3ckFWh9sOWgkrRUflsQpVhYswo=";
   };
 
   patches = [
@@ -50,7 +49,6 @@ stdenv.mkDerivation rec {
     libxml2
     meson
     ninja
-    perl
     pkg-config
     python3
     vala
@@ -77,9 +75,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     chmod +x build-aux/meson/post_install.py
-    chmod +x plugins/externaltools/scripts/gedit-tool-merge.pl
     patchShebangs build-aux/meson/post_install.py
-    patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl
   '';
 
   # Reliably fails to generate gedit-file-browser-enum-types.h in time

From f958d5c5f9b889c7936092be8139b59b55d35fed Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:35:44 +0100
Subject: [PATCH 035/145] python312Packages.polyswarm-api: 3.10.0 -> 3.11.0

Diff: https://github.com/polyswarm/polyswarm-api/compare/refs/tags/3.10.0...3.11.0

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

diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix
index 3bce5e796233..f2acda4a0af7 100644
--- a/pkgs/development/python-modules/polyswarm-api/default.nix
+++ b/pkgs/development/python-modules/polyswarm-api/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "polyswarm-api";
-  version = "3.10.0";
+  version = "3.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "polyswarm";
     repo = "polyswarm-api";
     rev = "refs/tags/${version}";
-    hash = "sha256-3K0FdqsEjt5cTymgxmt0Ohud/+bsILe9bDclZXJqPV8=";
+    hash = "sha256-7hmuJr+1ghVsp8EfykhVLCHwJYrO2m6cBREUFRov5Mo=";
   };
 
   pythonRelaxDeps = [ "future" ];

From ffe0849a4ac734d56a53487732d77d9fff003e3d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:36:27 +0100
Subject: [PATCH 036/145] python312Packages.pvo: 2.1.1 -> 2.2.0

Diff: https://github.com/frenck/python-pvoutput/compare/refs/tags/v2.1.1...v2.2.0

Changelog: https://github.com/frenck/python-pvoutput/releases/tag/v2.2.0
---
 pkgs/development/python-modules/pvo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix
index 213475f27e88..cb2870780ce8 100644
--- a/pkgs/development/python-modules/pvo/default.nix
+++ b/pkgs/development/python-modules/pvo/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pvo";
-  version = "2.1.1";
+  version = "2.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.11";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "frenck";
     repo = "python-pvoutput";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Js8oPEMxJyWK1E6GDm1xwm2BilnV3WBM6Hibf6oFOKE=";
+    hash = "sha256-EQdOPAYh7D9jHtuOuDtokxXnFKKtC0HybSwX77jj6+c=";
   };
 
   postPatch = ''

From c4329f867fd953183be0e4c5d23ea3bb5ec8d24f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:38:23 +0100
Subject: [PATCH 037/145] python312Packages.pvo: refactor

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

diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix
index cb2870780ce8..259b46962637 100644
--- a/pkgs/development/python-modules/pvo/default.nix
+++ b/pkgs/development/python-modules/pvo/default.nix
@@ -16,7 +16,7 @@
 buildPythonPackage rec {
   pname = "pvo";
   version = "2.2.0";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.11";
 
@@ -34,9 +34,9 @@ buildPythonPackage rec {
       --replace "--cov" ""
   '';
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     mashumaro
     yarl

From 00383674bd2b84598436b91c9a35a469f51c77a4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:39:30 +0100
Subject: [PATCH 038/145] python312Packages.pytest-codspeed: 3.0.0 -> 3.1.0

Diff: https://github.com/CodSpeedHQ/pytest-codspeed/compare/refs/tags/v3.0.0...v3.1.0

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

diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix
index edf811929e82..f28ddddbf831 100644
--- a/pkgs/development/python-modules/pytest-codspeed/default.nix
+++ b/pkgs/development/python-modules/pytest-codspeed/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-codspeed";
-  version = "3.0.0";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CodSpeedHQ";
     repo = "pytest-codspeed";
     rev = "refs/tags/v${version}";
-    hash = "sha256-06U7S0hRb0J4hO48DaKMQk8Uzl2rUi1thQ4lGorfqpU=";
+    hash = "sha256-A8H8gx+g2Fcf+aapahnAiVBt5vUzPc1SW4scOmSjI0g=";
   };
 
   build-system = [ hatchling ];

From 9c6fb1cf3a140f88166757251747369024a84cec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:39:48 +0100
Subject: [PATCH 039/145] python312Packages.mypy-boto3-appsync: 1.35.67 ->
 1.35.77

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 16d1e163da33..23d1e04bd47b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -134,8 +134,8 @@ rec {
       "sha256-HK2Eh7uNihu+st+A51z+3uYlPacOkpp7Ic3+xIWHhJ0=";
 
   mypy-boto3-appsync =
-    buildMypyBoto3Package "appsync" "1.35.67"
-      "sha256-kOChUtLeRR8uNb27GRv1FA2rfNasJttpmTowJsvW1yA=";
+    buildMypyBoto3Package "appsync" "1.35.77"
+      "sha256-DmwHwbpBnxzyJnxAVqptfH9ZBD1HweVZJaDhNefTaGg=";
 
   mypy-boto3-arc-zonal-shift =
     buildMypyBoto3Package "arc-zonal-shift" "1.35.0"

From 72448bb723181b1a1bc077c05800969f9cf11a2a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:39:58 +0100
Subject: [PATCH 040/145] python312Packages.mypy-boto3-cognito-idp: 1.35.68 ->
 1.35.77

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 23d1e04bd47b..3b4ba94916d6 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -314,8 +314,8 @@ rec {
       "sha256-UVEJn/VNbYEIRPHV9CuDI0Hos5POiMQThiN4OlncQIE=";
 
   mypy-boto3-cognito-idp =
-    buildMypyBoto3Package "cognito-idp" "1.35.68"
-      "sha256-/wKxHF/k+K1TB1VjvuxRpv7QY8HTPaomtVxUGMnAV4s=";
+    buildMypyBoto3Package "cognito-idp" "1.35.77"
+      "sha256-H2CQ/CeVjmnteZPmTN6LUq1Uldks1k7tbnwYAHv1gGo=";
 
   mypy-boto3-cognito-sync =
     buildMypyBoto3Package "cognito-sync" "1.35.0"

From e333ea0d3f485ada9b119472954ab712ec06e2eb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:40:10 +0100
Subject: [PATCH 041/145] python312Packages.mypy-boto3-ec2: 1.35.72 -> 1.35.77

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3b4ba94916d6..0c926d911138 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -446,8 +446,8 @@ rec {
       "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.35.72"
-      "sha256-0v9DrRxCZVy8uwbRHf90s4J1A9gKmaeAmKtSug+7cjU=";
+    buildMypyBoto3Package "ec2" "1.35.77"
+      "sha256-s2wgtoeKrQRd9f3x3oVYUNvf/3h4r4OBu0r2B9KGQo8=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.35.0"

From a6f1472f3eb0526db2fef1fe4f5e514af8efcceb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:40:11 +0100
Subject: [PATCH 042/145] python312Packages.mypy-boto3-ecs: 1.35.72 -> 1.35.77

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0c926d911138..41ff2d0e97d3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -462,8 +462,8 @@ rec {
       "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.35.72"
-      "sha256-jplX7a1Rql7+97/chlK4bd1PECDUD5OqELNt5ErhDFg=";
+    buildMypyBoto3Package "ecs" "1.35.77"
+      "sha256-g2EhM/9/oqHDJUTXosXsOLQhowPEIl0XmNGktljUCL8=";
 
   mypy-boto3-efs =
     buildMypyBoto3Package "efs" "1.35.65"

From 3099086d96332d48f1ab8354bd73c0f9de01358e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:40:27 +0100
Subject: [PATCH 043/145] python312Packages.mypy-boto3-keyspaces: 1.35.65 ->
 1.35.77

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 41ff2d0e97d3..58879bceb794 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -726,8 +726,8 @@ rec {
       "sha256-lBZ9MJQsuM0vRyrDcelDXTIhP9sex6CjnRjYY3qjIdE=";
 
   mypy-boto3-keyspaces =
-    buildMypyBoto3Package "keyspaces" "1.35.65"
-      "sha256-hn0qygyjRs7+PR4526zoyh4ZO8bLVsG0MD/v1iKhqwU=";
+    buildMypyBoto3Package "keyspaces" "1.35.77"
+      "sha256-0FKWOd+CV683H3uGX5naMwrm8ImJgcwcI5gk6Vz5pzs=";
 
   mypy-boto3-kinesis =
     buildMypyBoto3Package "kinesis" "1.35.26"

From 10e041b63ae2e5791fabd43e7a8bee4f7e8b9281 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:40:36 +0100
Subject: [PATCH 044/145] python312Packages.mypy-boto3-medialive: 1.35.23 ->
 1.35.77

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 58879bceb794..7b7543800bbc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -866,8 +866,8 @@ rec {
       "sha256-NJRSgwKHlb0ORdkg2ovACyfegmm5Tpzmxm/izLqpt/k=";
 
   mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.35.23"
-      "sha256-emjiDJ1sZylGgclL3E90nYBwqJgJq20fQx2Ug4e9UbQ=";
+    buildMypyBoto3Package "medialive" "1.35.77"
+      "sha256-MJzQKna5vl99uxJEm9dBCgGsXB2VkHQit9LuhRNSJuM=";
 
   mypy-boto3-mediapackage =
     buildMypyBoto3Package "mediapackage" "1.35.0"

From f4e95c30fee742e3bddfefdbea239edef420d6bc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:41:08 +0100
Subject: [PATCH 045/145] python312Packages.mypy-boto3-workspaces: 1.35.68 ->
 1.35.77

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7b7543800bbc..529eb0d9aec9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1426,8 +1426,8 @@ rec {
       "sha256-Om/TFPBZh3xr0inpGzCpvTNij9DTPq8dV1ikX8g4YtE=";
 
   mypy-boto3-workspaces =
-    buildMypyBoto3Package "workspaces" "1.35.68"
-      "sha256-tWM2zB4mYY7HkCxgWnwI4ggUVStNxz+3nJUw5hHwTkg=";
+    buildMypyBoto3Package "workspaces" "1.35.77"
+      "sha256-mR7oxRVxDy1IbXEt7cEEn0POlVyyH5Vxzlzobl4wvlQ=";
 
   mypy-boto3-workspaces-web =
     buildMypyBoto3Package "workspaces-web" "1.35.66"

From bbfaa21171ff259f9f96e2cfdd4ddb354117cfb4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:43:01 +0100
Subject: [PATCH 046/145] checkov: 3.2.332 -> 3.2.334

Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.332...3.2.334

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.334
---
 pkgs/development/tools/analysis/checkov/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 5d455705a1bb..61480a75db03 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.332";
+  version = "3.2.334";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     rev = "refs/tags/${version}";
-    hash = "sha256-O4stCuRm847mULyCSs+HXSBLsHIcXxtxXuUVysgd5/o=";
+    hash = "sha256-UY3EXGOo9xXU/Iqzwk2+pcbtMYQwuEU9G3uETWL3o2o=";
   };
 
   patches = [ ./flake8-compat-5.x.patch ];

From f6f3c4e74c61b040e6297f76e86cb58d65f13790 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 16:53:35 +0100
Subject: [PATCH 047/145] python312Packages.plugwise: 1.6.2 -> 1.6.3

Diff: https://github.com/plugwise/python-plugwise/compare/refs/tags/v1.6.2...v1.6.3

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

diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 991f52e3d688..191f26a59db7 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "1.6.2";
+  version = "1.6.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "plugwise";
     repo = "python-plugwise";
     rev = "refs/tags/v${version}";
-    hash = "sha256-rVal/w7ZPKjdCXTeCy6NHDlrCaKDdmJkeusUdW0BRXI=";
+    hash = "sha256-REWU3ngf93HUVDnyiErML41E+nPoqphfhBKmAYvV2+U=";
   };
 
   postPatch = ''

From e4206aafdd899d14359b6e35d4060cd08bc76747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Dec 2024 17:02:18 +0100
Subject: [PATCH 048/145] nixos-option: link to nixos test

---
 pkgs/tools/nix/nixos-option/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/nix/nixos-option/default.nix b/pkgs/tools/nix/nixos-option/default.nix
index db6c974288c8..282329ac5285 100644
--- a/pkgs/tools/nix/nixos-option/default.nix
+++ b/pkgs/tools/nix/nixos-option/default.nix
@@ -7,6 +7,7 @@
   pkg-config,
   installShellFiles,
   nix,
+  nixosTests,
 }:
 
 stdenv.mkDerivation {
@@ -31,6 +32,8 @@ stdenv.mkDerivation {
     nix
   ];
 
+  passthru.tests.installer-simpleUefiSystemdBoot = nixosTests.installer.simpleUefiSystemdBoot;
+
   meta = with lib; {
     license = licenses.lgpl2Plus;
     mainProgram = "nixos-option";

From 38eff9f4677eafce6351566ee7acd6fd4af4275c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 18:00:51 +0100
Subject: [PATCH 049/145] python312Packages.reolink-aio: 0.11.4 -> 0.11.5

Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.11.4...0.11.5

Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.11.5
---
 pkgs/development/python-modules/reolink-aio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index dc7e453ee6e5..70daa1f7829c 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.11.4";
+  version = "0.11.5";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     rev = "refs/tags/${version}";
-    hash = "sha256-h4mHRNmzrFAUQ0qQkzAMevO9hqV4Uueivr8wwor636Q=";
+    hash = "sha256-9CKpkwqlRTcA/a5bBCT/3y3odWyRzLElLPtemhg1hcM=";
   };
 
   build-system = [ setuptools ];

From 7e4fef772d1a5667d9552a27e64cdfaac490fd0d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 18:03:02 +0100
Subject: [PATCH 050/145] python312Packages.sigstore-rekor-types: 0.0.17 ->
 0.0.18

Diff: https://github.com/trailofbits/sigstore-rekor-types/compare/refs/tags/v0.0.17...v0.0.18

Changelog: https://github.com/trailofbits/sigstore-rekor-types/releases/tag/v0.0.18
---
 .../python-modules/sigstore-rekor-types/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
index f29379975ae9..e8eaa852017e 100644
--- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix
+++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "sigstore-rekor-types";
-  version = "0.0.17";
+  version = "0.0.18";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "trailofbits";
     repo = "sigstore-rekor-types";
     rev = "refs/tags/v${version}";
-    hash = "sha256-mMjFmUjaYvfFCTAvhr4x8QJZSypGTkOmzP+OiVyyz5Y=";
+    hash = "sha256-vOGKDWhOg8dsgxyxOtM+czR+NOM26v0T0ctkFPUAYEo=";
   };
 
   build-system = [ setuptools ];

From 02db5ff29455c5440cf1fc60b22aa47119692bef Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Dec 2024 18:03:52 +0100
Subject: [PATCH 051/145] python312Packages.aioacaia: 0.1.10 -> 0.1.11

Diff: https://github.com/zweckj/aioacaia/compare/refs/tags/v0.1.10...v0.1.11

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

diff --git a/pkgs/development/python-modules/aioacaia/default.nix b/pkgs/development/python-modules/aioacaia/default.nix
index 955fcfec24ea..a92d44a6bb30 100644
--- a/pkgs/development/python-modules/aioacaia/default.nix
+++ b/pkgs/development/python-modules/aioacaia/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "aioacaia";
-  version = "0.1.10";
+  version = "0.1.11";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "aioacaia";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Lp7sYnVzk1w7zgKDtoBMrzArTNAQ3jgt4Ch3uJ8ZDyY=";
+    hash = "sha256-9lRF3NrJ/Zl7ZOihiUiflxCjUi9WHjovgbpFebJJl9M=";
   };
 
   build-system = [ setuptools ];

From 3e3caa5f733ca395dc58b5c032ec61262c5fd86f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 10 Dec 2024 18:20:27 +0100
Subject: [PATCH 052/145] python312Packages.mizani: 0.13.0 -> 0.13.1

Diff: https://github.com/has2k1/mizani/compare/refs/tags/v0.13.0...v0.13.1

Changelog: https://github.com/has2k1/mizani/releases/tag/v0.13.1
---
 pkgs/development/python-modules/mizani/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix
index 4e985885890a..1bee4a9f29fb 100644
--- a/pkgs/development/python-modules/mizani/default.nix
+++ b/pkgs/development/python-modules/mizani/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "mizani";
-  version = "0.13.0";
+  version = "0.13.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "mizani";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-UzedAhYGgGLOMUyZe3ew4a2gh1UgYHaLsIe9k85rOkg=";
+    tag = "v${version}";
+    hash = "sha256-3eEOkrF3Sn5ZETnxgc5spwHlbJAiDhkJkd5LwMl0QEY=";
   };
 
   build-system = [ setuptools-scm ];

From 9bdb97c052d5d51a05b05081e9eb249131fab809 Mon Sep 17 00:00:00 2001
From: Axel Karjalainen <axel@axka.fi>
Date: Mon, 22 Jul 2024 13:51:44 +0300
Subject: [PATCH 053/145] otadump: init at 0.1.2

---
 pkgs/by-name/ot/otadump/no-static.patch | 13 ++++++++
 pkgs/by-name/ot/otadump/package.nix     | 41 +++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/ot/otadump/no-static.patch
 create mode 100644 pkgs/by-name/ot/otadump/package.nix

diff --git a/pkgs/by-name/ot/otadump/no-static.patch b/pkgs/by-name/ot/otadump/no-static.patch
new file mode 100644
index 000000000000..f9ba98be1c33
--- /dev/null
+++ b/pkgs/by-name/ot/otadump/no-static.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 65be773..3499dee 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -30,7 +30,7 @@ nom = "7.1.3"
+ nom-derive = "0.10.1"
+ prost = "0.11.8"
+ rayon = "1.7.0"
+-rust-lzma = { version = "0.6.0", features = ["static"] }
++rust-lzma = "0.6.0"
+ sha2 = "0.10.6"
+ sync-unsafe-cell = "0.1.0"
+ tempfile = "3.6.0"
diff --git a/pkgs/by-name/ot/otadump/package.nix b/pkgs/by-name/ot/otadump/package.nix
new file mode 100644
index 000000000000..2567cf28ee8a
--- /dev/null
+++ b/pkgs/by-name/ot/otadump/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  protobuf,
+  xz,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "otadump";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "crazystylus";
+    repo = "otadump";
+    rev = version;
+    hash = "sha256-4zPVcTU+0otV4EPQi80uSRkpRo9XzI0V3Kr17ugXX2U=";
+  };
+
+  patches = [ ./no-static.patch ];
+
+  nativeBuildInputs = [
+    pkg-config
+    protobuf
+  ];
+
+  buildInputs = [ xz ];
+
+  doCheck = false; # There are no tests
+
+  cargoHash = "sha256-lTzEgy9mevkmefvTZT9hEBHN5I+kXVqTev5+sy/JoaE=";
+
+  meta = {
+    description = "Command-line tool to extract partitions from Android OTA files";
+    homepage = "https://github.com/crazystylus/otadump";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.axka ];
+    mainProgram = "otadump";
+  };
+}

From 3887116c00ea34881bc21b9b348e3355fd4d8a56 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 10 Dec 2024 21:59:50 +0300
Subject: [PATCH 054/145] linux-firmware: 20241110 -> 20241210

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

diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
index 25ac7067982d..4d525004b50e 100644
--- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
@@ -20,11 +20,11 @@ let
   '';
 in stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20241110";
+  version = "20241210";
 
   src = fetchzip {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz";
-    hash = "sha256-AsEJfAkr+E2Tnev/UkYLRXsf+PWCp7brvO99bMgLQ1A=";
+    hash = "sha256-z/YrFyL7Ee0bfwkLj5l1Ei3neMRS5ZAu76MA7T+48+g=";
   };
 
   postUnpack = ''

From 11c34f6d2cf9c23e38bbab7974915e8f1db03954 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 19:51:00 +0000
Subject: [PATCH 055/145] libretro.nestopia: 0-unstable-2024-10-17 ->
 0-unstable-2024-12-10

---
 pkgs/applications/emulators/libretro/cores/nestopia.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix
index 0275db2c133e..39cad263b695 100644
--- a/pkgs/applications/emulators/libretro/cores/nestopia.nix
+++ b/pkgs/applications/emulators/libretro/cores/nestopia.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "nestopia";
-  version = "0-unstable-2024-10-17";
+  version = "0-unstable-2024-12-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "nestopia";
-    rev = "b932740e8abbe2cda80d06b083fdd8115af1c5d5";
-    hash = "sha256-lIWk3V93vTKZM/jvfLkA06c7DDSEQtLmqRzJUi0TK/4=";
+    rev = "8b622a6e2a7403fff47830e0437f324ed9f24464";
+    hash = "sha256-I9YKOV+mPZrcA5bB1KfWk+NaWIxSpBpZT8ntNxSt/m0=";
   };
 
   makefile = "Makefile";

From 07a190e7a44fb98349272e274a818f9e9fddd1f2 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Tue, 10 Dec 2024 20:51:16 +0100
Subject: [PATCH 056/145] datalad: fix changed hash from upstream

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/development/python-modules/datalad/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix
index 1df8ee11bf65..f97007d13e52 100644
--- a/pkgs/development/python-modules/datalad/default.nix
+++ b/pkgs/development/python-modules/datalad/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage rec {
     owner = "datalad";
     repo = "datalad";
     rev = "refs/tags/${version}";
-    hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA=";
+    hash = "sha256-sIWHBaqTJuKQHvh+L10PUehsmjRFl/holXzp0SMqr+k=";
   };
 
   postPatch = ''

From a59f464331a29aa082f7f95a45981b86ea62c615 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 20:21:52 +0000
Subject: [PATCH 057/145] libretro.bluemsx: 0-unstable-2024-10-22 ->
 0-unstable-2024-12-04

---
 pkgs/applications/emulators/libretro/cores/bluemsx.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
index 1f352cf6356b..b2e52fd6202f 100644
--- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix
+++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bluemsx";
-  version = "0-unstable-2024-10-22";
+  version = "0-unstable-2024-12-04";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bluemsx-libretro";
-    rev = "01ce142ccb85c302420cb962d1b6e6a68a6ce076";
-    hash = "sha256-h3Zpv+h6CbM1pdSOXsjN0pFUjXLn5T/R5W55VZXpMVM=";
+    rev = "572c91856a5288b7433c619af651e31f00f3ce7e";
+    hash = "sha256-fN5zjQGIyx3yIEgIhC50gD3O2F6WPJ/ssiauQ5Z/t9s=";
   };
 
   meta = {

From f0a2b7b6e271d67e2e68d2b5f6e0f410d8b1b2ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 20:28:02 +0000
Subject: [PATCH 058/145] libretro.freeintv: 0-unstable-2024-06-28 ->
 0-unstable-2024-10-21

---
 pkgs/applications/emulators/libretro/cores/freeintv.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/freeintv.nix b/pkgs/applications/emulators/libretro/cores/freeintv.nix
index e5486b6a1d03..048d09cf1240 100644
--- a/pkgs/applications/emulators/libretro/cores/freeintv.nix
+++ b/pkgs/applications/emulators/libretro/cores/freeintv.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "freeintv";
-  version = "0-unstable-2024-06-28";
+  version = "0-unstable-2024-10-21";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "freeintv";
-    rev = "6bd91d0d83d896e66b9fd7e5e239f93f00e4ad87";
-    hash = "sha256-P3devj/aAa0e/QpV68kQkLAvhrVGO8O8ijkUAobgUb0=";
+    rev = "beab9af119fc117833d2d866d8d4ea0857ec0236";
+    hash = "sha256-+3hF7OZ2OD8K3OsvzJ3+Nn3DwC7PfD+Mr3Ku2/W/fDQ=";
   };
 
   makefile = "Makefile";

From 94f605619bf508c7b03a08752e5c9d4462dd4228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 10 Dec 2024 12:31:10 -0800
Subject: [PATCH 059/145] python312Packages.python-linkplay: 0.1.0 -> 0.1.1

Diff: https://github.com/Velleman/python-linkplay/compare/v0.1.0...v0.1.1

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

diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix
index d8bb004c3383..775b6b2926fe 100644
--- a/pkgs/development/python-modules/python-linkplay/default.nix
+++ b/pkgs/development/python-modules/python-linkplay/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "python-linkplay";
-  version = "0.1.0";
+  version = "0.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Velleman";
     repo = "python-linkplay";
     tag = "v${version}";
-    hash = "sha256-upgiGAAopRoCYtWaGpYIpmb8nbSHr1iW7wGfBrC1yW4=";
+    hash = "sha256-voAhqqisBgBOTS9aPcAAFt6OeZ5Eb8RDH0xWjCbEryE=";
   };
 
   build-system = [ setuptools ];

From be0d8d7de047df52fa3555a606c92b124797a685 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 20:36:50 +0000
Subject: [PATCH 060/145] libretro.fceumm: 0-unstable-2024-09-23 ->
 0-unstable-2024-11-23

---
 pkgs/applications/emulators/libretro/cores/fceumm.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix
index 93c6956d18b1..d038cc54a0a2 100644
--- a/pkgs/applications/emulators/libretro/cores/fceumm.nix
+++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fceumm";
-  version = "0-unstable-2024-09-23";
+  version = "0-unstable-2024-11-23";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-fceumm";
-    rev = "e226068f979cd8fbfc3be9780d16cfb1405095b0";
-    hash = "sha256-2G5EzcDJkEhaN+nXi/wu3+Ejim04ZzOr+LW69cLAEuM=";
+    rev = "449db5de6b56e9d44fc685e1b38399f0b233bd28";
+    hash = "sha256-yD75ohq7dJwXt6t3RLMwTtmdLGLS3/eb98uBlnazWDk=";
   };
 
   meta = {

From f30fc8c81292b0567b0b74fa62bfbc0a92e2c94f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 20:42:08 +0000
Subject: [PATCH 061/145] libretro.beetle-wswan: 0-unstable-2024-06-28 ->
 0-unstable-2024-10-21

---
 pkgs/applications/emulators/libretro/cores/beetle-wswan.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix b/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
index 39b2afda52e9..ba88ac5735c9 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-wswan";
-  version = "0-unstable-2024-06-28";
+  version = "0-unstable-2024-10-21";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-wswan-libretro";
-    rev = "440e9228592a3f603d7d09e8bee707b0163f545f";
-    hash = "sha256-+98gCDBYeqUlFGzX83lwTGqSezLnzWRwapZCn4T37uE=";
+    rev = "2aeb47d3a58bf0360c686f842d9bb5bd201306fe";
+    hash = "sha256-LrF9p5tPtUamVLC41bJxcYDKvHmhVfwMieyIAdHaGmU=";
   };
 
   makefile = "Makefile";

From 10a40579bfaa4f961c1c9bfdc6e96156bb64eee9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 20:47:15 +0000
Subject: [PATCH 062/145] libretro.genesis-plus-gx: 0-unstable-2024-09-18 ->
 0-unstable-2024-11-22

---
 .../emulators/libretro/cores/genesis-plus-gx.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index caf2d667ba95..ada643de0d0a 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2024-09-18";
+  version = "0-unstable-2024-11-22";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "7de0f0b6cde9bda1235b448aa607044b3f80ab3c";
-    hash = "sha256-W06vSrGKbXMcXIouW9/fD93sBfwREqIL8HvB3kan0tM=";
+    rev = "03ebe2b96ed3f5747588de55ab3fec9add0a49c2";
+    hash = "sha256-0SAxxJqgxwQfpv4KE0J1Zr0XcGDQzCAbRku9obMamv4=";
   };
 
   meta = {

From 8783dd8fcf651d4521636c602aadb395949c93ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 20:47:42 +0000
Subject: [PATCH 063/145] libretro.o2em: 0-unstable-2024-06-28 ->
 0-unstable-2024-10-21

---
 pkgs/applications/emulators/libretro/cores/o2em.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/o2em.nix b/pkgs/applications/emulators/libretro/cores/o2em.nix
index e5deb54ea7dd..0af8242cee2f 100644
--- a/pkgs/applications/emulators/libretro/cores/o2em.nix
+++ b/pkgs/applications/emulators/libretro/cores/o2em.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "o2em";
-  version = "0-unstable-2024-06-28";
+  version = "0-unstable-2024-10-21";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-o2em";
-    rev = "c8f458d035392963823fbb50db0cec0033d9315f";
-    hash = "sha256-riqMXm+3BG4Gz0wrmVFxtVhuMRtZHZqCViAupp/Q42U=";
+    rev = "3ba4231c1dc8dcdf487428712856b790d2e4b8f3";
+    hash = "sha256-HhTkFm9Jte4wDPxTcXRgCg2tCfdQvo0M3nHRhlPmz/w=";
   };
 
   makefile = "Makefile";

From de523607dbbbbecaed9f4cd6060fe66c437a10dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 20:53:41 +0000
Subject: [PATCH 064/145] libretro.vba-next: 0-unstable-2024-06-28 ->
 0-unstable-2024-10-21

---
 pkgs/applications/emulators/libretro/cores/vba-next.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/vba-next.nix b/pkgs/applications/emulators/libretro/cores/vba-next.nix
index a0c9ee947e2d..55e70b174349 100644
--- a/pkgs/applications/emulators/libretro/cores/vba-next.nix
+++ b/pkgs/applications/emulators/libretro/cores/vba-next.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "vba-next";
-  version = "0-unstable-2024-06-28";
+  version = "0-unstable-2024-10-21";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "vba-next";
-    rev = "2c726f25da75a5600ef5791ce904befe06c4dddd";
-    hash = "sha256-Elb6cOm2oO+3fNUaTXLN4kyhftoJ/oWXD571mXApybs=";
+    rev = "d0ec7f3e209a91b903bb9d2c2397fef2bb3cca32";
+    hash = "sha256-g3Eb1bMGjt+H7awUlMCtKVu223+UvyQ2VBh8aQG1yo8=";
   };
 
   meta = {

From e7a62c7e0973b77b7c6f46ba9e10434c20cac1d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 20:56:23 +0000
Subject: [PATCH 065/145] libretro.gambatte: 0-unstable-2024-10-04 ->
 0-unstable-2024-11-29

---
 pkgs/applications/emulators/libretro/cores/gambatte.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix
index 90840af74960..aef239ed264e 100644
--- a/pkgs/applications/emulators/libretro/cores/gambatte.nix
+++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2024-10-04";
+  version = "0-unstable-2024-11-29";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "3eeb65e9bcf4b2a7ca24c5cebdfa7e342177ef0f";
-    hash = "sha256-tNGMR6GIyXen9+Ktg3IvYTcPidc+5Z8TpBQu1YgmqlY=";
+    rev = "9d92381643a6aad186054fa6019a47b710f73d2c";
+    hash = "sha256-gbjUIETbGb8i9bQuKRlpPOLnZorA/ho5DqT9AXkojUY=";
   };
 
   meta = {

From 45e926207eafbd888ed3eb70c44ad14d838210d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 21:05:25 +0000
Subject: [PATCH 066/145] libretro.fmsx: 0-unstable-2024-06-28 ->
 0-unstable-2024-10-21

---
 pkgs/applications/emulators/libretro/cores/fmsx.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/fmsx.nix b/pkgs/applications/emulators/libretro/cores/fmsx.nix
index ca320c9df653..09152627e8bc 100644
--- a/pkgs/applications/emulators/libretro/cores/fmsx.nix
+++ b/pkgs/applications/emulators/libretro/cores/fmsx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fmsx";
-  version = "0-unstable-2024-06-28";
+  version = "0-unstable-2024-10-21";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fmsx-libretro";
-    rev = "cf97a3c6da07d5f8e98c90c907ad987ffea432e0";
-    hash = "sha256-mPgmt05XDnB+eIWtOpBfZ37Cz24VBei1lLLaYsJNeAA=";
+    rev = "9eb5f25df5397212a3e3088ca1a64db0740bbe5f";
+    hash = "sha256-Pac1tQvPxYETU+fYU17moBHGfjNtzZiOsOms1uFQAmE=";
   };
 
   makefile = "Makefile";

From 654ea971126155566c22d1fa086ca232bfa7a863 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 21:06:34 +0000
Subject: [PATCH 067/145] libretro.mesen: 0-unstable-2024-06-09 ->
 0.9.9-unstable-2024-10-21

---
 pkgs/applications/emulators/libretro/cores/mesen.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/mesen.nix b/pkgs/applications/emulators/libretro/cores/mesen.nix
index 3c6c9bb9399e..db70f2dcd62a 100644
--- a/pkgs/applications/emulators/libretro/cores/mesen.nix
+++ b/pkgs/applications/emulators/libretro/cores/mesen.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mesen";
-  version = "0-unstable-2024-06-09";
+  version = "0.9.9-unstable-2024-10-21";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mesen";
-    rev = "91db6be681f70b2080525c267af6132555323ea1";
-    hash = "sha256-rw/bwHaeglO/DPeOCFHAWF5Y5DXVKiteO4bWZjTB4rI=";
+    rev = "791c5e8153ee6e29691d45b5df2cf1151ff416f9";
+    hash = "sha256-PEEGJsyT+D/JwBxH2H9OY2MwaGt1i+1kmDZUT6zROic=";
   };
 
   makefile = "Makefile";

From da3fc64e1a2b4291a11905a833740f70214e8c7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 21:23:22 +0000
Subject: [PATCH 068/145] microfetch: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix
index 83823e63386c..25be372aecc3 100644
--- a/pkgs/by-name/mi/microfetch/package.nix
+++ b/pkgs/by-name/mi/microfetch/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "microfetch";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "NotAShelf";
     repo = "microfetch";
     rev = "refs/tags/v${version}";
-    hash = "sha256-mK1sBcTieMjYneMhkuxoOt5+fELcyjH9+SQpzs7542Y=";
+    hash = "sha256-EfQs9CdbWhf/elujUO/N3TU5TiQJalYMqRGbPIGiMwg=";
   };
 
-  cargoHash = "sha256-LEw7z73Jm7/mJomN6yy87iCFauXifA+vffn/drXwqpY=";
+  cargoHash = "sha256-/pRkF8xp0bOsliJPlQNQBkkeSf1cFe+yBo4CzMbcnKM=";
 
   passthru.updateScript = nix-update-script { };
 

From fee3e54a0c217516f9123bbea15520f27bb10457 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 22:55:43 +0000
Subject: [PATCH 069/145] python312Packages.json-repair: 0.30.2 -> 0.30.3

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

diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix
index 3343fb84eb79..4a4316d5fe72 100644
--- a/pkgs/development/python-modules/json-repair/default.nix
+++ b/pkgs/development/python-modules/json-repair/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "json-repair";
-  version = "0.30.2";
+  version = "0.30.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mangiucugna";
     repo = "json_repair";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-RqPeBDhrCas+DI/cd5R1uvNRtLmv14fR50uazVLDSxg=";
+    tag = "v${version}";
+    hash = "sha256-8EHrI+Z9SempjiBwCeLlskA7FPOhYbi0WHevi7ewlrY=";
   };
 
   build-system = [ setuptools ];

From 6073d7e89b86222de86e0278327a3bcda3d91e49 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 11 Dec 2024 00:38:47 +0100
Subject: [PATCH 070/145] chromium: 131.0.6778.108 -> 131.0.6778.139

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

This update includes 3 security fixes.

CVEs:
CVE-2024-12381 CVE-2024-12382
---
 .../networking/browsers/chromium/info.json     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 5906d5749b44..12d9423e5d32 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.108",
+    "version": "131.0.6778.139",
     "chromedriver": {
-      "hash_darwin": "sha256-X0kzihCQsICn5SRdU+THdthov0EPxsmMcrm6YJ6hMhs=",
-      "hash_darwin_aarch64": "sha256-3Qdj44cZD4wQTzkBx47ZCfqHE2HckkLuqYKpJxxfESk="
+      "hash_darwin": "sha256-QLYUD5SDHoPdiPHX46ps/oBhzDjwxBuQEh0hzbEY73Q=",
+      "hash_darwin_aarch64": "sha256-VZ4nS9H1J1R6OXqqOaFLHM2rD8dyUTTWur5X1CNm4sU="
     },
     "deps": {
       "depot_tools": {
@@ -19,8 +19,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "3b014839fbc4fb688b2f5af512d6ce312ad208b1",
-        "hash": "sha256-ypzu3LveMFcOFm7+JlaERjzs3SK/n9+sfm5wOKB8/zw=",
+        "rev": "c35bbcbd7c2775a12a3f320e05ac0022939b1a8a",
+        "hash": "sha256-oJ4y9W51RMiUk40Uz8b3LJH0kMD5GMDG2V//Tng4/4A=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -360,8 +360,8 @@
       },
       "src/third_party/icu": {
         "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
-        "rev": "4239b1559d11d4fa66c100543eda4161e060311e",
-        "hash": "sha256-7568UHNDOzyTCLy3TAwxZLUrKfB6A1yKA0wVZQJjKoI="
+        "rev": "ba7ed88cc5ffa428a82a0f787dd61031aa5ef4ca",
+        "hash": "sha256-WtCoxcbEkkZayB6kXdQEhZ7/ue+ka6cguhFbpeWUBJA="
       },
       "src/third_party/jsoncpp/source": {
         "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
@@ -760,8 +760,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "e38771cb283b9689683c5ac0b5831dd89f8ec690",
-        "hash": "sha256-csSDnepYxil0R3PD/LVxW7JBcasOKG4l6q6vj8zHV/I="
+        "rev": "b97fcc24b3523da5e389d2a6d76857f134be09c5",
+        "hash": "sha256-5Es9Zot/DH+UKq3+aCgeQC+Llgj7/lmPXUYvar/hX7I="
       }
     }
   },

From 6bc8dcc6308d33a0034b3d5afdfa9c9b23a1de80 Mon Sep 17 00:00:00 2001
From: Majiir Paktu <majiir@nabaal.net>
Date: Tue, 10 Dec 2024 17:36:46 -0500
Subject: [PATCH 071/145] nixos/wireguard-networkd: use systemd credentials for
 privateKeyFile and presharedKeyFile

---
 .../manual/release-notes/rl-2505.section.md   |  2 +-
 .../networking/wireguard-networkd.nix         | 28 ++++++++++++++-----
 .../modules/services/networking/wireguard.nix |  6 ----
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 51b62fac69d3..da6d99be690a 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -121,7 +121,7 @@
 
 - Cinnamon has been updated to 6.4.
 
-- `networking.wireguard` now has an optional networkd backend, enabled with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option. Before upgrading, make sure the `privateKeyFile` and `presharedKeyFile` paths are readable by the `systemd-network` user if using the networkd backend.
+- `networking.wireguard` now has an optional networkd backend, enabled with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option.
 
 - `services.avahi.ipv6` now defaults to true.
 
diff --git a/nixos/modules/services/networking/wireguard-networkd.nix b/nixos/modules/services/networking/wireguard-networkd.nix
index 6360f5ec0a5d..26d23b5d26ee 100644
--- a/nixos/modules/services/networking/wireguard-networkd.nix
+++ b/nixos/modules/services/networking/wireguard-networkd.nix
@@ -14,14 +14,26 @@ let
     mapAttrsToList
     nameValuePair
     ;
-  inherit (lib.lists) concatMap concatLists;
+  inherit (lib.lists) concatMap concatLists filter;
   inherit (lib.modules) mkIf;
   inherit (lib.options) literalExpression mkOption;
   inherit (lib.strings) hasInfix;
-  inherit (lib.trivial) flip;
+  inherit (lib.trivial) flip pipe;
 
   removeNulls = filterAttrs (_: v: v != null);
 
+  privateKeyCredential = interfaceName: "wireguard-${interfaceName}-private-key";
+  presharedKeyCredential =
+    interfaceName: peer: "wireguard-${interfaceName}-${peer.name}-preshared-key";
+
+  interfaceCredentials =
+    interfaceName: interface:
+    [ "${privateKeyCredential interfaceName}:${interface.privateKeyFile}" ]
+    ++ pipe interface.peers [
+      (filter (peer: peer.presharedKeyFile != null))
+      (map (peer: "${presharedKeyCredential interfaceName peer}:${peer.presharedKeyFile}"))
+    ];
+
   generateNetdev =
     name: interface:
     nameValuePair "40-${name}" {
@@ -31,20 +43,20 @@ let
         MTUBytes = interface.mtu;
       };
       wireguardConfig = removeNulls {
-        PrivateKeyFile = interface.privateKeyFile;
+        PrivateKey = "@${privateKeyCredential name}";
         ListenPort = interface.listenPort;
         FirewallMark = interface.fwMark;
         RouteTable = if interface.allowedIPsAsRoutes then interface.table else null;
         RouteMetric = interface.metric;
       };
-      wireguardPeers = map generateWireguardPeer interface.peers;
+      wireguardPeers = map (generateWireguardPeer name) interface.peers;
     };
 
   generateWireguardPeer =
-    peer:
+    interfaceName: peer:
     removeNulls {
       PublicKey = peer.publicKey;
-      PresharedKeyFile = peer.presharedKeyFile;
+      PresharedKey = "@${presharedKeyCredential interfaceName peer}";
       AllowedIPs = peer.allowedIPs;
       Endpoint = peer.endpoint;
       PersistentKeepalive = peer.persistentKeepalive;
@@ -201,6 +213,8 @@ in
     };
 
     systemd.timers = mapAttrs' generateRefreshTimer refreshEnabledInterfaces;
-    systemd.services = mapAttrs' generateRefreshService refreshEnabledInterfaces;
+    systemd.services = (mapAttrs' generateRefreshService refreshEnabledInterfaces) // {
+      systemd-networkd.serviceConfig.LoadCredential = mapAttrsToList interfaceCredentials cfg.interfaces;
+    };
   };
 }
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 613c1ae7d769..a3308a1cd396 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -49,9 +49,6 @@ let
         default = null;
         description = ''
           Private key file as generated by {command}`wg genkey`.
-
-          When {option}`networking.wireguard.useNetworkd` is enabled, this file
-          must be readable by the `systemd-network` user.
         '';
       };
 
@@ -259,9 +256,6 @@ let
           Optional, and may be omitted. This option adds an additional layer of
           symmetric-key cryptography to be mixed into the already existing
           public-key cryptography, for post-quantum resistance.
-
-          When {option}`networking.wireguard.useNetworkd` is enabled, this file
-          must be readable by the `systemd-network` user.
         '';
       };
 

From e5a456f26f4694449bcffae3012d1377b3f09506 Mon Sep 17 00:00:00 2001
From: Majiir Paktu <majiir@nabaal.net>
Date: Tue, 10 Dec 2024 17:01:52 -0500
Subject: [PATCH 072/145] nixos/wireguard-networkd: re-enable by default for
 networkd users

---
 nixos/doc/manual/release-notes/rl-2505.section.md        | 2 +-
 nixos/modules/services/networking/wireguard-networkd.nix | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index da6d99be690a..3c9b48b575d4 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -121,7 +121,7 @@
 
 - Cinnamon has been updated to 6.4.
 
-- `networking.wireguard` now has an optional networkd backend, enabled with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option.
+- `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option.
 
 - `services.avahi.ipv6` now defaults to true.
 
diff --git a/nixos/modules/services/networking/wireguard-networkd.nix b/nixos/modules/services/networking/wireguard-networkd.nix
index 26d23b5d26ee..931f3305594c 100644
--- a/nixos/modules/services/networking/wireguard-networkd.nix
+++ b/nixos/modules/services/networking/wireguard-networkd.nix
@@ -108,7 +108,8 @@ in
 
   options.networking.wireguard = {
     useNetworkd = mkOption {
-      default = false;
+      default = config.networking.useNetworkd;
+      defaultText = literalExpression "config.networking.useNetworkd";
       type = types.bool;
       description = ''
         Whether to use networkd as the network configuration backend for

From d9b23fc6772117dfb477ec64e2684c2fbbde8a01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 00:48:34 +0000
Subject: [PATCH 073/145] chamber: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/by-name/ch/chamber/package.nix b/pkgs/by-name/ch/chamber/package.nix
index 4936b4bfd529..b44e62fa674a 100644
--- a/pkgs/by-name/ch/chamber/package.nix
+++ b/pkgs/by-name/ch/chamber/package.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "chamber";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "segmentio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-BD4gtdlIh5IRgTtrCdEN+o5d00wZsczsH0JbdoFdg4o=";
+    sha256 = "sha256-1ySOlP0sFk3+IRt/zstZK6lEE2pzoVSiZz3wFxdesgc=";
   };
 
   CGO_ENABLED = 0;
 
-  vendorHash = "sha256-Rk6doJqLD8ucU+mGDtteCyM/QvnzbIVnFmFW9b09560=";
+  vendorHash = "sha256-KlouLjW9hVKFi9uz34XHd4CzNOiyO245QNygkB338YQ=";
 
   ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];
 

From 187adc1516900ee3199e5acd9027c99f2d4b4b22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 01:07:42 +0000
Subject: [PATCH 074/145] nats-server: 2.10.22 -> 2.10.23

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

diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix
index e99d1a34d3e5..69cad049f1ab 100644
--- a/pkgs/by-name/na/nats-server/package.nix
+++ b/pkgs/by-name/na/nats-server/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "nats-server";
-  version = "2.10.22";
+  version = "2.10.23";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-B+fSB3aTXAc/EjKSaFR2clieLNFszA2U2BdMsYJRZFE=";
+    hash = "sha256-XZPp8hRuweSUJaCXRgJJ2F8/cglWKMeDC/HZxxvL+V8=";
   };
 
-  vendorHash = "sha256-0VkY1+3tlAfGDt+fhyMbmyT4TN0bw1HVJLi2+mivkrc=";
+  vendorHash = "sha256-ZpPxx7WwknlJTk1tMuH6L4oxQAFnd41y4pGky86qKR8=";
 
   doCheck = false;
 

From 622f8658b4b527a0e11e40ff285a4ff4129106cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 01:18:43 +0000
Subject: [PATCH 075/145] flutter_rust_bridge_codegen: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
index 096368cba962..8c6146706d35 100644
--- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
+++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
@@ -6,17 +6,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "flutter_rust_bridge_codegen";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "fzyzcjy";
     repo = "flutter_rust_bridge";
     rev = "v${version}";
-    hash = "sha256-SGbl1l2jtANO9QMNz9GDXI794RY/K+ldpmDxLkqAa+Y=";
+    hash = "sha256-XHHgKwwGI0v6PD+KQBA8AvUBqUPxefxoJXcZDwjOemQ=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-b+duVR3vn1HrhUcVucHfzjTDhbru3+IYVNS3ji6LGto=";
+  cargoHash = "sha256-MDQFHQQWEStBwrwlGti5bY5HwACcrLrSR9Zs9DxTz/A=";
   cargoBuildFlags = "--package flutter_rust_bridge_codegen";
   cargoTestFlags = "--package flutter_rust_bridge_codegen";
 

From 12e421949ea7333d3ab484d4fb192c3732e5b2d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 01:36:43 +0000
Subject: [PATCH 076/145] httm: 0.43.2 -> 0.44.0

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

diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix
index 109744ae92ca..b41097f32de1 100644
--- a/pkgs/by-name/ht/httm/package.nix
+++ b/pkgs/by-name/ht/httm/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.43.2";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = pname;
     rev = version;
-    hash = "sha256-8oG40pxhWd2MRxUSzZ3lgcsC9M1W5yBUZ0t5tO3B86U=";
+    hash = "sha256-RDz/R2wfB8nEiSUD58YsF1wRgMmJkMxRTfYjSB8fEsM=";
   };
 
-  cargoHash = "sha256-KKvpI3U6/cByP5M2ZiNtVrYyh2Nqe9cee2ObKqRBEyg=";
+  cargoHash = "sha256-c4u8/bYkme3iJzuIXIJoclgukTMZ6LZEhezggs/lcro=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 579d0cfe8b483ff4375fa4bad511d8dbe9e5fceb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 01:38:41 +0000
Subject: [PATCH 077/145] lint-staged: 15.2.10 -> 15.2.11

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

diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix
index 8987008c06f5..5a324a3a868d 100644
--- a/pkgs/by-name/li/lint-staged/package.nix
+++ b/pkgs/by-name/li/lint-staged/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "lint-staged";
-  version = "15.2.10";
+  version = "15.2.11";
 
   src = fetchFromGitHub {
     owner = "okonet";
     repo = "lint-staged";
     rev = "v${version}";
-    hash = "sha256-Mtr3PXV4pSQgtP+RkPmXpDgmW5hFo7a+xb2GAi+wFg4=";
+    hash = "sha256-f2sHvbReLfX+PtFAZuxK36ZzHmaegqCG/7ADel8YVOA=";
   };
 
-  npmDepsHash = "sha256-Br/KlvRkr+jFe8y2KEiE38FYrwgSbY5WpvwVOO4LGuQ=";
+  npmDepsHash = "sha256-RhR5nexLM5Ah35u/8jhv2PzrMYWYztPf964kQXWNim8=";
 
   dontNpmBuild = true;
 

From b33f750edba5d2970e1d9fa3a33da579e2e150b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Wed, 11 Dec 2024 02:57:02 +0100
Subject: [PATCH 078/145] twinkle: unstable-2023-03-25 -> unstable-2024-20-11

---
 .../networking/instant-messengers/twinkle/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
index d86fad39c334..3a2c62e277ab 100644
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
@@ -22,13 +22,13 @@
 
 mkDerivation rec {
   pname = "twinkle";
-  version = "unstable-2023-03-25";
+  version = "unstable-2024-20-11";
 
   src = fetchFromGitHub {
     owner = "LubosD";
     repo = "twinkle";
-    rev = "355813d5640ad58c84dc063826069384470ce310";
-    hash = "sha256-u+RewFwW17Oz2+lJLlmwebaGn4ebTBquox9Av7Jh1as=";
+    rev = "e067dcba28f4e2acd7f71b875fc4168e9706aaaa";
+    hash = "sha256-3YtZwP/ugWOSfUa4uaEAEEsk9i5j93eLt5lHgAu5qqI=";
   };
 
   buildInputs = [

From 99926bf0606a7bbfb90c3ef8d9a41a1e6914960d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 10 Dec 2024 21:13:09 -0600
Subject: [PATCH 079/145] vimPlugins.blink-cmp: 0.7.3 -> 0.7.6

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

diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
index d78502333229..aa53842b2c0c 100644
--- a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
+++ b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
@@ -7,12 +7,12 @@
   nix-update-script,
 }:
 let
-  version = "0.7.3";
+  version = "0.7.6";
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.cmp";
     rev = "refs/tags/v${version}";
-    hash = "sha256-nxiODLKgGeXzN5sqkLWU0PcsuSSB1scSzTC5qyCxLCI=";
+    hash = "sha256-fzAqUqMx4zqN9dtTYRAibhWd5CKh2pvai9g7E/xxnE8=";
   };
   libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
   blink-fuzzy-lib = rustPlatform.buildRustPackage {

From cb52981ac0751f014530b55c1a5b95dbff8a7e15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 03:23:00 +0000
Subject: [PATCH 080/145] limine: 8.4.0 -> 8.6.0

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

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 13fe4282c703..4d50feaf18d0 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -18,7 +18,7 @@ let
   llvmPackages = llvmPackages_18;
   stdenv = llvmPackages.stdenv;
 
-  version = "8.4.0";
+  version = "8.6.0";
 
   hasI686 =
     (if targets == [ ] then stdenv.hostPlatform.isx86_32 else (builtins.elem "i686" targets))
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz";
-    hash = "sha256-MSKUXfwnLw/tVAfhUoKYNGUeMYb7Ka4UWAtx9R1eSR8=";
+    hash = "sha256-4bFZ6nxNcrJTQhkJ5S1KU0PJN4yu9Li+QznF5IxpGCE=";
   };
 
   hardeningDisable = [

From 24420c3050c53725fde1ab56a50dc3c79d66012b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 10 Dec 2024 19:32:37 -0800
Subject: [PATCH 081/145] hypnotix: 4.7 -> 4.8

Diff: https://github.com/linuxmint/hypnotix/compare/4.7...4.8

Changelog: https://github.com/linuxmint/hypnotix/blob/4.8/debian/changelog
---
 pkgs/by-name/hy/hypnotix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hypnotix/package.nix b/pkgs/by-name/hy/hypnotix/package.nix
index 3e6169da35cf..a9f8c306bf4a 100644
--- a/pkgs/by-name/hy/hypnotix/package.nix
+++ b/pkgs/by-name/hy/hypnotix/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hypnotix";
-  version = "4.7";
+  version = "4.8";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "hypnotix";
     rev = version;
-    hash = "sha256-e5vz5bCypzbofps+VW2UrKMsRBl7edeF8Ky00muCub4=";
+    hash = "sha256-/RW7AGEr/cAnEvjKXSqOWtAfVfqGYrGbIiQN3K5WLM4=";
   };
 
   patches = [

From 070b61b84396eab43af107c8fb92b9f2b3919533 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 03:43:43 +0000
Subject: [PATCH 082/145] yubikey-touch-detector: 1.12.0 -> 1.12.2

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

diff --git a/pkgs/by-name/yu/yubikey-touch-detector/package.nix b/pkgs/by-name/yu/yubikey-touch-detector/package.nix
index f7fd9937ccf5..9ba1da8af8d2 100644
--- a/pkgs/by-name/yu/yubikey-touch-detector/package.nix
+++ b/pkgs/by-name/yu/yubikey-touch-detector/package.nix
@@ -9,15 +9,15 @@
 
 buildGoModule rec {
   pname = "yubikey-touch-detector";
-  version = "1.12.0";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "maximbaz";
     repo = "yubikey-touch-detector";
     rev = version;
-    hash = "sha256-Uh6DzDMBnTkKP1GW71TwGOfe3apDNNDUzZ5GLkPxrkE=";
+    hash = "sha256-vhaJSgQUBYBXfQHHR7cR3zHCZstwRD/jXhqYR1vqMqA=";
   };
-  vendorHash = "sha256-mhmYTicj/ihGNzeCZd1ZijWPkvxQZjBxaC5dyAU1O7U=";
+  vendorHash = "sha256-x8Fmhsk6MtgAtLxgH/V3KusM0BXAOaSU+2HULR5boJQ=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 7a1979d03acc73bfa61bd21f2d01a699cc98a852 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 03:45:28 +0000
Subject: [PATCH 083/145] nomino: 1.3.6 -> 1.3.7

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

diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix
index 119b6557d542..0c638bc1b8d5 100644
--- a/pkgs/by-name/no/nomino/package.nix
+++ b/pkgs/by-name/no/nomino/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nomino";
-  version = "1.3.6";
+  version = "1.3.7";
 
   src = fetchFromGitHub {
     owner = "yaa110";
     repo = pname;
     rev = version;
-    hash = "sha256-HbI2XPYNSFBc/h+kEsNsOxJ8+7uq1Ia0ce98FKoUlng=";
+    hash = "sha256-rePNcO8vssCR7YfdDCV+YT1hqGKBeMCwWpGmBnKtl9w=";
   };
 
-  cargoHash = "sha256-zA5cTdW0x7k8/mAUfUBzbiBR1ypyeLr7AOyg+16Islk=";
+  cargoHash = "sha256-C+fcN3byvPFtgX/DYexNZryoirOAhSx0hhOYR2gdW3s=";
 
   meta = with lib; {
     description = "Batch rename utility for developers";

From 1035bd8668deec43643f191cc1eb445e37d287ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 10 Dec 2024 19:47:19 -0800
Subject: [PATCH 084/145] python312Packages.fints: 4.2.0 -> 4.2.3

Diff: https://github.com/raphaelm/python-fints/compare/v4.2.0...v4.2.3
---
 pkgs/development/python-modules/fints/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix
index deaaf1fd1adf..e51e05d1d3b2 100644
--- a/pkgs/development/python-modules/fints/default.nix
+++ b/pkgs/development/python-modules/fints/default.nix
@@ -13,17 +13,17 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.2.0";
+  version = "4.2.3";
   pname = "fints";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "python-fints";
-    rev = "v${version}";
-    hash = "sha256-BM57Ov36DEJVH5DBm/mJife16iaFfjlQrF0IXRziM2A=";
+    tag = "v${version}";
+    hash = "sha256-QR5/mAll6vuP+hJo/oguynLLsGawhTQNaU6TCgww9yM=";
   };
 
   pythonRemoveDeps = [ "enum-tools" ];

From b5e271018c3325877867baa0ec55a52e4ff81e47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 03:53:56 +0000
Subject: [PATCH 085/145] google-java-format: 1.25.0 -> 1.25.1

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

diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix
index a88b7c11726d..09a927065200 100644
--- a/pkgs/by-name/go/google-java-format/package.nix
+++ b/pkgs/by-name/go/google-java-format/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "google-java-format";
-  version = "1.25.0";
+  version = "1.25.1";
 
   src = fetchurl {
     url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
-    sha256 = "sha256-i9lJ6EpkNQRs8Y3fp2lmHqrJ2iGy08pGxLoS+WY3vLs=";
+    sha256 = "sha256-D1gf6WLRju+J2HUeIVqfYsUNv27aQwiT/EgtqmXLk+0=";
   };
 
   dontUnpack = true;

From 12c98df8affee9553baf410572af64862586be52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 04:13:35 +0000
Subject: [PATCH 086/145] ast-grep: 0.30.0 -> 0.31.1

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

diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index a56a0f8024e0..823c98f49d25 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ast-grep";
-  version = "0.30.0";
+  version = "0.31.1";
 
   src = fetchFromGitHub {
     owner = "ast-grep";
     repo = "ast-grep";
     rev = version;
-    hash = "sha256-Fk46F1EBWSVFAUUDAtXcwq9iCSATW1CV/ul3NEa1YqA=";
+    hash = "sha256-6xdqxo7XFzZHuzCUDM50iwJdub/XElKG0AlRL5mS7u4=";
   };
 
-  cargoHash = "sha256-5yJ248BSp9w/r1chQqIucxzfvFGy+jumSquF9gVmSUM=";
+  cargoHash = "sha256-6s+XVpGTrKCBX2E/9+VyiUTvi47Xj48lPkUXlfXnufQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 2190b2449dfc9eb5c42e91d6258c70dd506bcc7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 04:13:40 +0000
Subject: [PATCH 087/145] go-task: 3.40.0 -> 3.40.1

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

diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix
index 2de970288cc7..e4d80380bd61 100644
--- a/pkgs/by-name/go/go-task/package.nix
+++ b/pkgs/by-name/go/go-task/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "go-task";
-  version = "3.40.0";
+  version = "3.40.1";
 
   src = fetchFromGitHub {
     owner = "go-task";
     repo = "task";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SOXtzesS+luil8Q0iKlhWv4hqPyRU2V+Um6S/uzChas=";
+    hash = "sha256-jQKPTKEzTfzqPlNlKFMduaAhvDsogRv3vCGtZ4KP/O4=";
   };
 
-  vendorHash = "sha256-5AABVG+MHvw8f8tcphUqQFid/mzXeWjbsD9mHJfyxDw=";
+  vendorHash = "sha256-bw9NaJOMMKcKth0hRqNq8mqib/5zLpjComo0oj22A/U=";
 
   doCheck = false;
 

From fae5d6025cf7ba674a1f48269610064a83464dc9 Mon Sep 17 00:00:00 2001
From: Majiir Paktu <majiir@nabaal.net>
Date: Tue, 10 Dec 2024 23:30:37 -0500
Subject: [PATCH 088/145] programs/yubikey-touch-detector: add
 PartOf=graphical-session.target

---
 nixos/modules/programs/yubikey-touch-detector.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/programs/yubikey-touch-detector.nix b/nixos/modules/programs/yubikey-touch-detector.nix
index 42beabbc4e94..2986c1344327 100644
--- a/nixos/modules/programs/yubikey-touch-detector.nix
+++ b/nixos/modules/programs/yubikey-touch-detector.nix
@@ -55,6 +55,7 @@ in
       };
 
       wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
     };
     systemd.user.sockets.yubikey-touch-detector = {
       wantedBy = [ "sockets.target" ];

From 1c79dc069afabcfcd21c45832ba2a2f487fe443e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 05:05:15 +0000
Subject: [PATCH 089/145] python312Packages.reptor: 0.24 -> 0.25

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

diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix
index 033445a3790c..db45305baa2a 100644
--- a/pkgs/development/python-modules/reptor/default.nix
+++ b/pkgs/development/python-modules/reptor/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "reptor";
-  version = "0.24";
+  version = "0.25";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -38,8 +38,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Syslifters";
     repo = "reptor";
-    rev = "refs/tags/${version}";
-    hash = "sha256-OHS9fkJ9BomZNYgnmIv4AVFfLH40LSdvmZskhzdE9II=";
+    tag = version;
+    hash = "sha256-PwBaQHulbk14RRMNAj8Oze4tP46+2LWI3QZlpMmxV2A=";
   };
 
   pythonRelaxDeps = true;

From e4414e862bec332af863465c06a2ef5dd84953cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 05:50:12 +0000
Subject: [PATCH 090/145] rqlite: 8.34.1 -> 8.34.3

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

diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix
index ed805591a1f1..b58ac6428127 100644
--- a/pkgs/by-name/rq/rqlite/package.nix
+++ b/pkgs/by-name/rq/rqlite/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "rqlite";
-  version = "8.34.1";
+  version = "8.34.3";
 
   src = fetchFromGitHub {
     owner = "rqlite";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-YU2TQ+QTtrderXx2l/bqRCaNiuCOBD/jRYZ/oEKO9H4=";
+    sha256 = "sha256-iErUNuX0FecBeMkcJv75TxlXP4WrdOsS9T5ABsedZlg=";
   };
 
-  vendorHash = "sha256-yoowUrS7UDk6sCfTYmDEVWzGBtzT7DR1vuqPWlcqRzU=";
+  vendorHash = "sha256-v30TFML8RBn02LaNDQ0LBbhJduQUZDEBUCSSDwW2Ixo=";
 
   subPackages = [
     "cmd/rqlite"

From 115709cac4beeb927d3a9fcbcfcbd388022fbf4c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 16:09:00 +1000
Subject: [PATCH 091/145] resources: 1.7.0 -> 1.7.1 (#363218)

* resources: 1.7.0 -> 1.7.1

* resources: fix changelog link

---------

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
---
 pkgs/by-name/re/resources/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix
index 080abee14620..9e28c3975938 100644
--- a/pkgs/by-name/re/resources/package.nix
+++ b/pkgs/by-name/re/resources/package.nix
@@ -20,19 +20,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "resources";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "nokyan";
     repo = "resources";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-mnOpWVJTNGNdGd6fMIZl3AOF4NbtMm1XS8QFqfAF/18=";
+    hash = "sha256-SHawaH09+mDovFiznZ+ZkUgUbv5tQGcXBgUGrdetOcA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) src;
     name = "resources-${finalAttrs.version}";
-    hash = "sha256-vIqtKJxKQ/mHFcB6IxfX27Lk2ID/W+M4hQnPB/aExa4=";
+    hash = "sha256-tUD+gx9nQiGWKKRPcR7OHbPvU2j1dQjYck7FF9vYqSQ=";
   };
 
   nativeBuildInputs = [
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    changelog = "https://github.com/nokyan/resources/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/nokyan/resources/releases/tag/v${finalAttrs.version}";
     description = "Monitor your system resources and processes";
     homepage = "https://github.com/nokyan/resources";
     license = lib.licenses.gpl3Only;

From f6b00e9c88c8e66e16de748217309f516ae3f381 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 16:20:12 +1000
Subject: [PATCH 092/145] television: 0.5.3 -> 0.6.2 (#364120)

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

diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix
index 6e1ff57835f8..d40307c98deb 100644
--- a/pkgs/by-name/te/television/package.nix
+++ b/pkgs/by-name/te/television/package.nix
@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "television";
-  version = "0.5.3";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "alexpasmantier";
     repo = "television";
     rev = "refs/tags/" + version;
-    hash = "sha256-xYfaFs0a37maeLdnlEGVsocWWym41EOZ9dsuFXc1hMY=";
+    hash = "sha256-Z2FkgGpXSetmG90c4RoiBlp8fyivmcbyA5fQ2jYsLLg=";
   };
 
-  cargoHash = "sha256-z12FeXQ2IpDZQYqnt6MPkLeW4Ul3XphSI38ikM/YizY=";
+  cargoHash = "sha256-K0NfS5oXlhlEhk4qpHbI/9R0IlxP0qo3DLgB99/VdP4=";
 
   passthru = {
     tests.version = testers.testVersion {

From e866043406b157c14dc7d588fdd5fc5561e3199f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 11 Dec 2024 15:07:47 +1000
Subject: [PATCH 093/145] terraform-providers.cloudflare: 4.44.0 -> 4.48.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2e47c18a2858..be5cf100f271 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -243,13 +243,13 @@
     "vendorHash": "sha256-j3qdi19dxJL+R8Xa6MDag6KHMuBnzEZ9lUhuSAEZOAQ="
   },
   "cloudflare": {
-    "hash": "sha256-R6cJQaBnsARO3qg48ijqVdyrSivLN3Wf96yqTjuaN/c=",
+    "hash": "sha256-RC8/tw01yNxeqOlmLzzagRgxQm+o+4ztJ/7KWyBPJ+I=",
     "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
     "owner": "cloudflare",
     "repo": "terraform-provider-cloudflare",
-    "rev": "v4.44.0",
+    "rev": "v4.48.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-g575BZRdCekfUgF78DENloCeM8TTz5OhLxxgb1OkElc="
+    "vendorHash": "sha256-tznAR/SRtJJdxm17f8ej5Lt8BCVlCW3zkrBX94ErbjQ="
   },
   "cloudfoundry": {
     "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",

From 9b6c95e8e858127732c05083ee63ffd13e470cd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 06:32:55 +0000
Subject: [PATCH 094/145] gitlab-ci-local: 4.55.0 -> 4.56.0

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

diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix
index a495b9e278d8..a409d0b02609 100644
--- a/pkgs/by-name/gi/gitlab-ci-local/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage rec {
   pname = "gitlab-ci-local";
-  version = "4.55.0";
+  version = "4.56.0";
 
   src = fetchFromGitHub {
     owner = "firecow";
     repo = "gitlab-ci-local";
     rev = version;
-    hash = "sha256-rfe2vvg6F4MzV/FN52cf31Ef0XlMGM+UpbSRq2vinsM=";
+    hash = "sha256-JMT0HtCeeM9gI6k44BohNjAq/EpvBtX2Iqe4VkBqvn4=";
   };
 
-  npmDepsHash = "sha256-uv0/pasytEKEhkQXhjh51YWPMaskTEb3w4vMaMpspmI=";
+  npmDepsHash = "sha256-J+S8/JXAyt/nDkfLtSEGlR38oCb0DlJDDkc1t+IiyPA=";
 
   postPatch = ''
     # remove cleanup which runs git commands

From b2bcb86d1b1549ba43692bf9c00af5c78ce96346 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 11 Dec 2024 16:43:22 +1000
Subject: [PATCH 095/145] nix-eval-jobs: 2.24.1 -> 2.25.0

Diff: https://github.com/nix-community/nix-eval-jobs/compare/v2.24.1...v2.25.0
---
 pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
index fd4c23368fe1..3fc90e6fe356 100644
--- a/pkgs/tools/package-management/nix-eval-jobs/default.nix
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -13,12 +13,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nix-eval-jobs";
-  version = "2.24.1";
+  version = "2.25.0";
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-j/p2ftkP8MXYEK7Vx65jH/Knr2QkEcRSVoDnVOUDe6Q=";
+    hash = "sha256-63i7TgirD3FiJM1z8ZuOOcXWj4ZhgK357NHmf90WNig=";
   };
   buildInputs = [
     boost
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9223b9e42530..f60fc1d21025 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18269,7 +18269,7 @@ with pkgs;
     ({ inherit pkgs lib; } // attrs);
 
   nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
-    nix = nixVersions.nix_2_24;
+    nix = nixVersions.nix_2_25;
   };
 
   nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;

From 6a81d40331e754ae2dd3b5f56d9e422504bab42e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 06:50:53 +0000
Subject: [PATCH 096/145] cpuinfo: 0-unstable-2024-11-14 ->
 0-unstable-2024-12-09

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

diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix
index 547db0d024cd..17134da28104 100644
--- a/pkgs/by-name/cp/cpuinfo/package.nix
+++ b/pkgs/by-name/cp/cpuinfo/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpuinfo";
-  version = "0-unstable-2024-11-14";
+  version = "0-unstable-2024-12-09";
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "cpuinfo";
-    rev = "cebb0933058d7f181c979afd50601dc311e1bf8c";
-    hash = "sha256-MlJZmgwHt6+hJHdl8lKOTeaTT+PTOgRHfmCCjn0a3Zc=";
+    rev = "ca156f7bc9109c552973414a63d310f76ef0cbf8";
+    hash = "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

From cb810460f58a8774106dff029ababf9fcb49868a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 06:51:55 +0000
Subject: [PATCH 097/145] marwaita-orange: 22 -> 23

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

diff --git a/pkgs/by-name/ma/marwaita-orange/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix
index 80bc17f448c7..94473b665365 100644
--- a/pkgs/by-name/ma/marwaita-orange/package.nix
+++ b/pkgs/by-name/ma/marwaita-orange/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "marwaita-orange";
-  version = "22";
+  version = "23";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = pname;
     rev = version;
-    hash = "sha256-hp+5UIr3uXuUay3K6HsaGs+Wh9VFx1yVNb3d0Jw2M34=";
+    hash = "sha256-YLgLjTsoaPV7MErVxc48PsgR8y5lhehQfTal+/ZwYsI=";
   };
 
   buildInputs = [

From de0880c00783fd5c4c89b9152225691ec2127332 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 06:57:39 +0000
Subject: [PATCH 098/145] duplicity: 3.0.3.1 -> 3.0.3.2

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

diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix
index fcb24859fea2..f821a73aa2bf 100644
--- a/pkgs/by-name/du/duplicity/package.nix
+++ b/pkgs/by-name/du/duplicity/package.nix
@@ -22,13 +22,13 @@
 let
   self = python3.pkgs.buildPythonApplication rec {
     pname = "duplicity";
-    version = "3.0.3.1";
+    version = "3.0.3.2";
 
     src = fetchFromGitLab {
       owner = "duplicity";
       repo = "duplicity";
       rev = "rel.${version}";
-      hash = "sha256-s8yPmuGivvmqAKsdaGouP/UoK6Ea27HjvSm39eQuKF0=";
+      hash = "sha256-aP2+MIV9EgwGb9detibHzW2AJdbnP+9ur9Y/Irw26qM=";
     };
 
     patches = [

From 1634b6e49bb8ea08b16395c717f3623703bf6416 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 Dec 2024 08:21:04 +0100
Subject: [PATCH 099/145] python312Packages.gotailwind: 0.2.4 -> 0.3.0

Diff: https://github.com/frenck/python-gotailwind/compare/refs/tags/v0.2.4...v0.3.0

Changelog: https://github.com/frenck/python-gotailwind/releases/tag/v$version
---
 pkgs/development/python-modules/gotailwind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix
index bc77ffb251d1..269422d61f86 100644
--- a/pkgs/development/python-modules/gotailwind/default.nix
+++ b/pkgs/development/python-modules/gotailwind/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "gotailwind";
-  version = "0.2.4";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "frenck";
     repo = "python-gotailwind";
     rev = "refs/tags/v${version}";
-    hash = "sha256-g4wYjMJXSm7cjb5Zck1O0A+ETfqMTmiI8In26mcGhNw=";
+    hash = "sha256-kNyqSyJ1ha+BumYX4ruWaN0akEvUEsRxPs7Fj7LDHOw=";
   };
 
   postPatch = ''

From a71752a06d87d52c861e2386f529f5b5d5bcfb26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 08:09:02 +0000
Subject: [PATCH 100/145] starpls: 0.1.17 -> 0.1.20

---
 pkgs/by-name/st/starpls/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/st/starpls/manifest.json b/pkgs/by-name/st/starpls/manifest.json
index 2d11d58eea61..eaa523d8ff8d 100644
--- a/pkgs/by-name/st/starpls/manifest.json
+++ b/pkgs/by-name/st/starpls/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "0.1.17",
+  "version": "0.1.20",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-linux-amd64",
-      "hash": "sha256-LGW7KBC0/q/JMdpQSaTjqSqjjNqH49WoZJQMXKOkq5c="
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.20/starpls-linux-amd64",
+      "hash": "sha256-oImI2aWIGPKJiu/eDwT2ExP0UNz6kj8ZWjZNPUkT5Dc="
     },
     "aarch64-linux": {
-      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-linux-aarch64",
-      "hash": "sha256-qsS0J4qiaj7nuC9Gv2hZHAuZ3L+GZFaZAazkxOlZvAc="
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.20/starpls-linux-aarch64",
+      "hash": "sha256-z6KY//iMcXXtTRn+9DuXAYZRsakyNOjiGpLztC0g6a4="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-darwin-amd64",
-      "hash": "sha256-VB2Y8UMyVxkPmeA0wTlIq/0Rc4Yei9PZrMz86m111GA="
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.20/starpls-darwin-amd64",
+      "hash": "sha256-hTD+DE6Ih10+Jr2sATDAedpRQOnW9BCrEcAcuvd/u50="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-darwin-arm64",
-      "hash": "sha256-JSJ6gypX1bcPJ57f4XIB5DCL2HynhhIlG6pwbJjpVCE="
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.20/starpls-darwin-arm64",
+      "hash": "sha256-tOk/w+g8xI7uGKPUc8Ff5QQ6/brmy6TcfzH8dCjlU2w="
     }
   }
 }

From fa5fd554c6edc111db6842ffbc64f0e7622eeeed Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Dec 2024 06:37:45 +0100
Subject: [PATCH 101/145] =?UTF-8?q?malcontent:=200.12.0=20=E2=86=92=200.13?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.freedesktop.org/pwithnall/malcontent/-/compare/0.12.0...0.13.0
---
 pkgs/development/libraries/malcontent/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix
index 2f4044aaed34..76d59f6737cd 100644
--- a/pkgs/development/libraries/malcontent/default.nix
+++ b/pkgs/development/libraries/malcontent/default.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation rec {
   pname = "malcontent";
-  version = "0.12.0";
+  version = "0.13.0";
 
   outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "pwithnall";
     repo = "malcontent";
     rev = version;
-    hash = "sha256-UK/WVqDMkwIqkTFFjzh7PRCA/Ej8Iyu33FasnAEApRs=";
+    hash = "sha256-DVoTJrpXk5AoRMz+TxEP3NIAA/OOGRzZurLyGp0UBUo=";
   };
 
   patches = [
@@ -70,10 +70,10 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace libmalcontent/tests/app-filter.c \
-      --replace "/usr/bin/true" "${coreutils}/bin/true" \
-      --replace "/bin/true" "${coreutils}/bin/true" \
-      --replace "/usr/bin/false" "${coreutils}/bin/false" \
-      --replace "/bin/false" "${coreutils}/bin/false"
+      --replace-fail "/usr/bin/true" "${coreutils}/bin/true" \
+      --replace-fail "/bin/true" "${coreutils}/bin/true" \
+      --replace-fail "/usr/bin/false" "${coreutils}/bin/false" \
+      --replace-fail "/bin/false" "${coreutils}/bin/false"
   '';
 
   postInstall = ''

From 0daaba4fbd4e9ff41b06ee5ea0f7697bbf213521 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Dec 2024 06:42:58 +0100
Subject: [PATCH 102/145] malcontent: Add malcontent-ui to passthru.tests

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

diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix
index 76d59f6737cd..faa48dda2739 100644
--- a/pkgs/development/libraries/malcontent/default.nix
+++ b/pkgs/development/libraries/malcontent/default.nix
@@ -14,6 +14,7 @@
 , glib-testing
 , python3
 , nixosTests
+, malcontent-ui
 }:
 
 stdenv.mkDerivation rec {
@@ -86,6 +87,7 @@ stdenv.mkDerivation rec {
   passthru = {
     tests = {
       installedTests = nixosTests.installed-tests.malcontent;
+      inherit malcontent-ui;
     };
   };
 

From 037efbc6feb40ce68dfd62546de25273d01ace73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 08:12:22 +0000
Subject: [PATCH 103/145] goread: 1.7.0 -> 1.7.1

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

diff --git a/pkgs/by-name/go/goread/package.nix b/pkgs/by-name/go/goread/package.nix
index a6220e172f60..51849cb0cc65 100644
--- a/pkgs/by-name/go/goread/package.nix
+++ b/pkgs/by-name/go/goread/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "goread";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "TypicalAM";
     repo = "goread";
     rev = "v${version}";
-    hash = "sha256-a30i8eh7asc4nlomrEFV3EgwMs69UUyXPWiRQ5w6Xvc=";
+    hash = "sha256-tWQVqHtuTCHrsZu3CfTWUQzvUYbQrrdJoWHp43dfPEE=";
   };
 
   vendorHash = "sha256-S/0uuy/G7ZT239OgKaOT1dmY+u5/lnZKL4GtbEi2zCI=";

From 223c39872ed28e720b86c97379047b114864cfe7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 08:19:02 +0000
Subject: [PATCH 104/145] python312Packages.cymem: 2.0.8 -> 2.0.10

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

diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix
index ef7db6848cbd..b49cb89c7560 100644
--- a/pkgs/development/python-modules/cymem/default.nix
+++ b/pkgs/development/python-modules/cymem/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "cymem";
-  version = "2.0.8";
+  version = "2.0.10";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "explosion";
     repo = "cymem";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-e4lgV39lwC2Goqmd8Jjra+znuCpxsv2IsRXfFbQkGN8=";
+    tag = "release-v${version}";
+    hash = "sha256-lMbovEIYdXYQvLeVaCm8KfYaQ2TFSAi6picu7Ju9peg=";
   };
 
   build-system = [

From da2272328c6eb3abe32c83bf1977d45645741f00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 08:30:59 +0000
Subject: [PATCH 105/145] python312Packages.pdm-build-locked: 0.3.3 -> 0.3.4

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

diff --git a/pkgs/development/python-modules/pdm-build-locked/default.nix b/pkgs/development/python-modules/pdm-build-locked/default.nix
index 9c8026d32d21..db6929aa35b5 100644
--- a/pkgs/development/python-modules/pdm-build-locked/default.nix
+++ b/pkgs/development/python-modules/pdm-build-locked/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pdm-build-locked";
-  version = "0.3.3";
+  version = "0.3.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdm-project";
     repo = "pdm-build-locked";
-    rev = "refs/tags/${version}";
-    hash = "sha256-tgLC1tUgmyX7QvlLpNb/SMQRTDZ+DNFV3o0JELAZEeo=";
+    tag = version;
+    hash = "sha256-22p9QQZOiDp4IlMK7tn4eSws3lKcThcHvIQpIX/cYrU=";
   };
 
   postPatch = ''

From 8c822968ec11d3ff06855f1000020f767ff7bfbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 08:42:36 +0000
Subject: [PATCH 106/145] python312Packages.momepy: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/python-modules/momepy/default.nix b/pkgs/development/python-modules/momepy/default.nix
index 79292c79c102..00334eacf4f8 100644
--- a/pkgs/development/python-modules/momepy/default.nix
+++ b/pkgs/development/python-modules/momepy/default.nix
@@ -19,15 +19,15 @@
 
 buildPythonPackage rec {
   pname = "momepy";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
   disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "pysal";
     repo = "momepy";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-JeAQ0JMvle+63ymbd+wPRpvpxlq9YxwjVElVVyGs0EQ=";
+    tag = "v${version}";
+    hash = "sha256-9bFPxpopmrwNKdCEF+jlPRoNiVFrngW+sMeshq2EDYU=";
   };
 
   build-system = [ setuptools-scm ];

From 435017687908846624796215077cfd4553cfc415 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 06:47:38 +0000
Subject: [PATCH 107/145] terraform-providers.ibm: 1.71.2 -> 1.72.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index be5cf100f271..2d86c818fe67 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -633,13 +633,13 @@
     "vendorHash": null
   },
   "ibm": {
-    "hash": "sha256-ZjsQBqn0faSqgSrdV4G+18XD1ZpCd3zRt5I1zQ3MWoQ=",
+    "hash": "sha256-xryHugAi0cJHFx5SvJrcbVrnhjCLA7eT9wUdvk3ynGg=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v1.71.2",
+    "rev": "v1.72.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-eYmxVdMbGT7aW9tfH9shgc/eIDfe41OdLOGrDuxivTY="
+    "vendorHash": "sha256-lEuaR4OPbg1kyGY1u1eWRsGfVpW5vHjQsovuBMXiLrQ="
   },
   "icinga2": {
     "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",

From c686ea4e8149b953c1d2edcc8e52717f7c5d80f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 12:36:08 +0000
Subject: [PATCH 108/145] tarlz: 0.25 -> 0.26

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

diff --git a/pkgs/by-name/ta/tarlz/package.nix b/pkgs/by-name/ta/tarlz/package.nix
index 636c921d6c5a..c5ead9ce765a 100644
--- a/pkgs/by-name/ta/tarlz/package.nix
+++ b/pkgs/by-name/ta/tarlz/package.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "tarlz";
-  version = "0.25";
+  version = "0.26";
   outputs = [ "out" "man" "info" ];
 
   nativeBuildInputs = [ lzip texinfo ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://savannah/lzip/tarlz/tarlz-${version}.tar.lz";
-    hash = "sha256-fQu+nDoTe7k6EL5WmI/Pc2Lk28ZUkGOe3EJVtwQQX84=";
+    hash = "sha256-U/4FXvcDSFcJddIgzq1WNvkXXwwHu+yORQuv8YuZmOQ=";
   };
 
   enableParallelBuilding = true;

From cb68aacc006d4518ebba989b9dc25fc6c7b4ec15 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 11 Dec 2024 10:46:27 +0100
Subject: [PATCH 109/145] gitlab: increase node heap size limit

Without this change gitlab-ee's gitlab-assets fails to build with
JavaScript heap out of memory.

GitLab's own CI uses different limits between 5 to 10GBs, but 8GBs for
asset builds. (see https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/tasks/gitlab/assets.rake#L130)
---
 pkgs/applications/version-management/gitlab/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index f1cf80ead01e..bf9353f5d15a 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -174,6 +174,7 @@ let
     FOSS_ONLY = !gitlabEnterprise;
 
     SKIP_YARN_INSTALL = 1;
+    NODE_OPTIONS = "--max-old-space-size=8192";
 
     configurePhase = ''
       runHook preConfigure

From 00edd0346e5b9f2df68a8dfdd6af5f15450949c7 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 28 Nov 2024 13:52:45 +0800
Subject: [PATCH 110/145] pywal16: 3.6.0 -> 3.7.1

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

diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix
index 189441135aeb..37fe05ee5df1 100644
--- a/pkgs/by-name/py/pywal16/package.nix
+++ b/pkgs/by-name/py/pywal16/package.nix
@@ -7,17 +7,17 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pywal16";
-  version = "3.6.0";
+  version = "3.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eylles";
     repo = "pywal16";
     rev = "refs/tags/${version}";
-    hash = "sha256-YKHOH1bEsZHTgYm8AYpfA6C8RtWxAqNQ+GHMcdaj/JU=";
+    hash = "sha256-XDOmpeONPW6b1ZEGk272wwraTLR8PjjniIXm0M9BGU4=";
   };
 
-  nativeBuildInputs = [ python3.pkgs.setuptools ];
+  build-system = [ python3.pkgs.setuptools ];
 
   nativeCheckInputs = [
     python3.pkgs.pytestCheckHook

From 3a78dd097dd7057624dc492ce3f5064c6d988cc5 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 28 Nov 2024 14:07:04 +0800
Subject: [PATCH 111/145] pywal16: add man page

---
 pkgs/by-name/py/pywal16/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix
index 37fe05ee5df1..211a9229fb34 100644
--- a/pkgs/by-name/py/pywal16/package.nix
+++ b/pkgs/by-name/py/pywal16/package.nix
@@ -3,6 +3,7 @@
   python3,
   fetchFromGitHub,
   imagemagick,
+  installShellFiles,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -19,11 +20,17 @@ python3.pkgs.buildPythonApplication rec {
 
   build-system = [ python3.pkgs.setuptools ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
   nativeCheckInputs = [
     python3.pkgs.pytestCheckHook
     imagemagick
   ];
 
+  postInstall = ''
+    installManPage data/man/man1/wal.1
+  '';
+
   preCheck = ''
     export HOME=$(mktemp -d)
   '';

From 9f4747e9d0ec8f808c07bab6f3f3fd197b6ae1a5 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 28 Nov 2024 14:07:22 +0800
Subject: [PATCH 112/145] pywal16: add optional-dependencies

---
 pkgs/by-name/py/pywal16/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix
index 211a9229fb34..466475af7006 100644
--- a/pkgs/by-name/py/pywal16/package.nix
+++ b/pkgs/by-name/py/pywal16/package.nix
@@ -37,6 +37,19 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "pywal" ];
 
+  optional-dependencies = with python3.pkgs; {
+    colorthief = [ colorthief ];
+    colorz = [ colorz ];
+    fast-colorthief = [ fast-colorthief ];
+    haishoku = [ haishoku ];
+    all = [
+      colorthief
+      colorz
+      ast-colorthief
+      haishoku
+    ];
+  };
+
   meta = {
     description = "16 colors fork of pywal";
     homepage = "https://github.com/eylles/pywal16";

From f313eefa97ba49cf02c4fe4b9e2cdb1330d88568 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 28 Nov 2024 14:10:24 +0800
Subject: [PATCH 113/145] pywal16: add updateScript

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

diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix
index 466475af7006..ec8c8e100e77 100644
--- a/pkgs/by-name/py/pywal16/package.nix
+++ b/pkgs/by-name/py/pywal16/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   imagemagick,
   installShellFiles,
+  nix-update-script,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -50,6 +51,8 @@ python3.pkgs.buildPythonApplication rec {
     ];
   };
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "16 colors fork of pywal";
     homepage = "https://github.com/eylles/pywal16";

From 0c1feac497d4c8c9743cca5f7187515ff680a211 Mon Sep 17 00:00:00 2001
From: Moritz Vogel <moritzv7@gmail.com>
Date: Fri, 1 Nov 2024 00:16:49 +0100
Subject: [PATCH 114/145] nixos/ebusd: fix device access

---
 nixos/modules/services/home-automation/ebusd.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/home-automation/ebusd.nix b/nixos/modules/services/home-automation/ebusd.nix
index b04da56b6d14..a0bff26e2ae3 100644
--- a/nixos/modules/services/home-automation/ebusd.nix
+++ b/nixos/modules/services/home-automation/ebusd.nix
@@ -155,7 +155,11 @@ in
 
   config =
     let
-      usesDev = lib.hasPrefix "/" cfg.device;
+      usesDev = lib.any (prefix: lib.hasPrefix prefix cfg.device) [
+        "/"
+        "ens:/"
+        "enh:/"
+      ];
     in
     lib.mkIf cfg.enable {
       systemd.services.ebusd = {
@@ -200,12 +204,14 @@ in
 
           # Hardening
           CapabilityBoundingSet = "";
-          DeviceAllow = lib.optionals usesDev [ cfg.device ];
+          DeviceAllow = lib.optionals usesDev [
+            (lib.removePrefix "ens:" (lib.removePrefix "enh:" cfg.device))
+          ];
           DevicePolicy = "closed";
           LockPersonality = true;
           MemoryDenyWriteExecute = false;
           NoNewPrivileges = true;
-          PrivateDevices = usesDev;
+          PrivateDevices = !usesDev;
           PrivateUsers = true;
           PrivateTmp = true;
           ProtectClock = true;

From c1d053679641c2cbf49573dad584f9656126a8f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 10:05:34 +0000
Subject: [PATCH 115/145] libserdes: 7.7.1 -> 7.8.0

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

diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix
index 27eb6c1f43ec..5a8cc69e0016 100644
--- a/pkgs/by-name/li/libserdes/package.nix
+++ b/pkgs/by-name/li/libserdes/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libserdes";
-  version = "7.7.1";
+  version = "7.8.0";
 
   src = fetchFromGitHub {
     owner = "confluentinc";

From e9eff47002ddc00e9f4b0472f7d0972509605e59 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 5 Dec 2024 17:59:10 +0100
Subject: [PATCH 116/145] nixos/networking: don't add extra names to ::1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From hosts(5):

> For each host a single line should be present with the following
> information:
>
>               IP_address canonical_hostname [aliases...]

With lines like "::1 localhost ahost.adomin ahost", we were saying
that the canonical name for "ahost" was "localhost", the opposite of a
canonical name.  This is why a second loopback address (127.0.0.2) is
used for hostnames with IPv4 — if they were put after "localhost" on
the 127.0.0.1 line, the same thing would happen.  With IPv6 we can't
do the same thing as there's only a single loopback address, so
instead the right thing to do is to simply not list the hostnames in
/etc/hosts, and rely on the myhostname NSS plugin, which will handle
this correctly.

(Note that the examples in hosts(5) also do not include IPv6 FQDN or
hostname entries.)
---
 nixos/modules/config/networking.nix | 2 --
 nixos/tests/hostname.nix            | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 8665a611e575..cde3e99fe90f 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -163,8 +163,6 @@ in
         ++ lib.optional (cfg.hostName != "") cfg.hostName; # Then the hostname (without the domain)
     in {
       "127.0.0.2" = hostnames;
-    } // lib.optionalAttrs cfg.enableIPv6 {
-      "::1" = hostnames;
     };
 
     networking.hostFiles = let
diff --git a/nixos/tests/hostname.nix b/nixos/tests/hostname.nix
index dffec956bc0b..ddb894cfe522 100644
--- a/nixos/tests/hostname.nix
+++ b/nixos/tests/hostname.nix
@@ -62,6 +62,8 @@ let
             fqdn_and_host_name
             == machine.succeed("getent hosts 127.0.0.2 | awk '{print $2,$3}'").strip()
         )
+
+        assert "${fqdn}" == machine.succeed("getent hosts ${hostName} | awk '{print $2}'").strip()
       '';
     };
 

From 37dc568acd913fb18235ba71bad8236648effe08 Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Tue, 10 Dec 2024 22:52:53 +0100
Subject: [PATCH 117/145] ocamlPackages.tls-eio: init at 1.0.4

---
 pkgs/development/ocaml-modules/tls/eio.nix | 36 ++++++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix          |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/tls/eio.nix

diff --git a/pkgs/development/ocaml-modules/tls/eio.nix b/pkgs/development/ocaml-modules/tls/eio.nix
new file mode 100644
index 000000000000..678893d4da29
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tls/eio.nix
@@ -0,0 +1,36 @@
+{
+  buildDunePackage,
+  crowbar,
+  eio,
+  eio_main,
+  logs,
+  mdx,
+  mirage-crypto-rng-eio,
+  ptime,
+  tls,
+}:
+
+buildDunePackage rec {
+  pname = "tls-eio";
+
+  inherit (tls) src meta version;
+
+  minimalOCamlVersion = "5.0";
+
+  doCheck = true;
+  nativeCheckInputs = [
+    mdx.bin
+  ];
+  checkInputs = [
+    crowbar
+    eio_main
+    (mdx.override { inherit logs; })
+  ];
+
+  propagatedBuildInputs = [
+    ptime
+    eio
+    mirage-crypto-rng-eio
+    tls
+  ];
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3431c113c2fb..618e94b92721 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1844,6 +1844,8 @@ let
 
     tls-async = callPackage ../development/ocaml-modules/tls/async.nix { };
 
+    tls-eio = callPackage ../development/ocaml-modules/tls/eio.nix { };
+
     tls-lwt = callPackage ../development/ocaml-modules/tls/lwt.nix { };
 
     tls-mirage = callPackage ../development/ocaml-modules/tls/mirage.nix { };

From e2317b109f26f822bd92dccc251f64100b27e87f Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sun, 1 Dec 2024 00:54:38 +0800
Subject: [PATCH 118/145] pywal16: 3.7.1 -> 3.7.2

Diff: https://github.com/eylles/pywal16/compare/refs/tags/3.7.1...3.7.2

Changelog: https://github.com/eylles/pywal16/blob/refs/tags/3.7.2/CHANGELOG.md
---
 pkgs/by-name/py/pywal16/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix
index ec8c8e100e77..0c6a226e806d 100644
--- a/pkgs/by-name/py/pywal16/package.nix
+++ b/pkgs/by-name/py/pywal16/package.nix
@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pywal16";
-  version = "3.7.1";
+  version = "3.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eylles";
     repo = "pywal16";
-    rev = "refs/tags/${version}";
-    hash = "sha256-XDOmpeONPW6b1ZEGk272wwraTLR8PjjniIXm0M9BGU4=";
+    tag = version;
+    hash = "sha256-aizuON8Y321i7bF2SuC5UC1iOWHY217ccfzY9WmaevQ=";
   };
 
   build-system = [ python3.pkgs.setuptools ];
@@ -56,7 +56,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "16 colors fork of pywal";
     homepage = "https://github.com/eylles/pywal16";
-    changelog = "https://github.com/eylles/pywal16/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/eylles/pywal16/blob/refs/tags/${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ moraxyc ];
     mainProgram = "wal";

From 22501447b2e4ed7120ecfd5625a83a948320ca76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 10:57:36 +0000
Subject: [PATCH 119/145] glaze: 4.0.1 -> 4.0.2

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

diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index 2ac4ad856fab..3e494e7461fa 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (final: {
   pname = "glaze";
-  version = "4.0.1";
+  version = "4.0.2";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     rev = "v${final.version}";
-    hash = "sha256-gQfRz7b1kbn1AoKUNG62LBynmJNbDTXzPXaX6kDCjVw=";
+    hash = "sha256-fNarN2VFgfZDmY62EoLsiMdW60XPbi71wbiSe/ftaFc=";
   };
 
   nativeBuildInputs = [ cmake ];

From 3de5332bba9d99b63c5648158678f790bc987b78 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Wed, 11 Dec 2024 06:17:04 -0500
Subject: [PATCH 120/145] nixos/qt: install kio when qt.platformTheme = "kde"
 (#364032)

---
 nixos/modules/config/qt.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/config/qt.nix b/nixos/modules/config/qt.nix
index fb10ef5c3238..ee771698323e 100644
--- a/nixos/modules/config/qt.nix
+++ b/nixos/modules/config/qt.nix
@@ -18,6 +18,7 @@ let
       qt6Packages.qt6gtk2
     ];
     kde = [
+      libsForQt5.kio
       libsForQt5.plasma-integration
       libsForQt5.systemsettings
     ];

From f75807ce2a545eeeeb919d7e31fcc3f3b6c8c6ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 12:06:29 +0000
Subject: [PATCH 121/145] ocm: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/by-name/oc/ocm/package.nix b/pkgs/by-name/oc/ocm/package.nix
index d228be418b99..f24654a0c479 100644
--- a/pkgs/by-name/oc/ocm/package.nix
+++ b/pkgs/by-name/oc/ocm/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "ocm";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "openshift-online";
     repo = "ocm-cli";
     rev = "v${version}";
-    sha256 = "sha256-cKXC7+Hn+74ukHG7iN4QwIv9vuPXm8FKyaKPD62S5ck=";
+    sha256 = "sha256-RuGUIG58cyyWvHD/0T7xwtzFy9XJUmavkQg4MRAHQqQ=";
   };
 
-  vendorHash = "sha256-uj4xmNZViag+j4YavFjDvc/ClMBb99DhwlcKzvGWQ7c=";
+  vendorHash = "sha256-qkTh+tkU6MXBJkX0XwktRCMjoySe1/9uWHFGTc7ozRM=";
 
   # Strip the final binary.
   ldflags = [

From b745cbe1658dc4b99adf339ff9c7d7b87fdeebb4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 12:09:57 +0000
Subject: [PATCH 122/145] pantheon.elementary-terminal: 6.2.0 -> 6.3.0

---
 pkgs/desktops/pantheon/apps/elementary-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index eef3b4facca7..62a0861432d7 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-terminal";
-  version = "6.2.0";
+  version = "6.3.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "terminal";
     rev = version;
-    sha256 = "sha256-o5hMrsn6OBk/2ycCDdT8n6gQUWcRuoaHqnmkODnJ6B8=";
+    sha256 = "sha256-Pr2Jm37vuw1DOx63BXKT3oPK6C7i5v9ObYFNR6Hvhns=";
   };
 
   nativeBuildInputs = [

From 62cbaa39ed9a8cd3f38be3abd3edd5569fd1956c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 12:30:46 +0000
Subject: [PATCH 123/145] bark-server: 2.1.5 -> 2.1.6

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

diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix
index daf2843178ac..0a79c7fee9a1 100644
--- a/pkgs/by-name/ba/bark-server/package.nix
+++ b/pkgs/by-name/ba/bark-server/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "bark-server";
-  version = "2.1.5";
+  version = "2.1.6";
 
   src = fetchFromGitHub {
     owner = "Finb";
     repo = "bark-server";
     rev = "refs/tags/v${version}";
-    hash = "sha256-lPhRWMR+gConFOxiSONBRrwPoARaGqzaIU3hd3wSO8E=";
+    hash = "sha256-T4/ye3F0x2XvYEi6BFw6225lnYLRinwjgSz6UxqqV88=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -26,7 +26,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-GemXcU5nmMkZSNpuXoRt9EH5PrxMHWLJ56bNYHXOB9I=";
+  vendorHash = "sha256-Yti+W3GKUMEfNBHf4C435BpYsDjCzgfLr55iqU3BGbA=";
 
   ldflags = [
     "-s"

From a4458d7310b61aa301e1bb84d84814e32bdf2b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 11 Dec 2024 09:41:42 +0100
Subject: [PATCH 124/145] sbomnix: 1.7.0 -> 1.7.1

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

diff --git a/pkgs/tools/security/sbomnix/default.nix b/pkgs/tools/security/sbomnix/default.nix
index f6ab7ec81a68..5b42de44b8a8 100644
--- a/pkgs/tools/security/sbomnix/default.nix
+++ b/pkgs/tools/security/sbomnix/default.nix
@@ -28,14 +28,14 @@
 
 python.pkgs.buildPythonApplication rec {
   pname = "sbomnix";
-  version = "1.7.0";
+  version = "1.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tiiuae";
     repo = "sbomnix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-n5nK9fqgAC10jU9BcO+EEVrSD0YEr/hp6XDcTqVrvP8=";
+    hash = "sha256-LMrsJnJXmn+rneIslAaoIpwOyPVIVjOyu49O+7J/nIs=";
 
     # Remove documentation as it contains references to nix store
     postFetch = ''

From ac2c2f4cf9e7d051f9dac3729a4ccb7f2c672c22 Mon Sep 17 00:00:00 2001
From: Mateus Auler <mateus@auler.dev>
Date: Wed, 11 Dec 2024 09:43:08 -0300
Subject: [PATCH 125/145] maintainers: add mateusauler

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0bfa80425ccd..80478f7b5985 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13786,6 +13786,17 @@
     githubId = 28183516;
     name = "Mateusz Słodkowicz";
   };
+  mateusauler = {
+    email = "mateus@auler.dev";
+    github = "mateusauler";
+    githubId = 24767687;
+    name = "Mateus Auler";
+    keys = [
+      {
+        fingerprint = "A09D C093 3C37 4BFC 2B5A  269F 80A5 D62F 6EB7 D9F0";
+      }
+    ];
+  };
   math-42 = {
     email = "matheus.4200@gmail.com";
     github = "Math-42";

From 3ebe0ca44a6881d8dc2e9c91ce0b4999fdcdcb55 Mon Sep 17 00:00:00 2001
From: Mateus Auler <mateus@auler.dev>
Date: Wed, 11 Dec 2024 09:43:30 -0300
Subject: [PATCH 126/145] git-worktree-switcher: add mateusauler as
 co-maintainer

---
 pkgs/by-name/gi/git-worktree-switcher/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gi/git-worktree-switcher/package.nix b/pkgs/by-name/gi/git-worktree-switcher/package.nix
index 9c9f64e58c96..27a7274e5c93 100644
--- a/pkgs/by-name/gi/git-worktree-switcher/package.nix
+++ b/pkgs/by-name/gi/git-worktree-switcher/package.nix
@@ -55,6 +55,9 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
     mainProgram = "wt";
-    maintainers = with lib.maintainers; [ jiriks74 ];
+    maintainers = with lib.maintainers; [
+      jiriks74
+      mateusauler
+    ];
   };
 })

From 02660f220ba8fb478c0a8f4f8b533dbeb5606adb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 26 Nov 2024 13:19:47 +0100
Subject: [PATCH 127/145] python312Packages.prettytable: 3.11.0 -> 3.12.0

Diff: https://github.com/jazzband/prettytable/compare/refs/tags/3.11.0...3.12.0

Changelog: https://github.com/jazzband/prettytable/releases/tag/3.12.0
---
 .../python-modules/prettytable/default.nix    | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index b5cecedd6388..c4ba297b6ecd 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -2,26 +2,31 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   hatch-vcs,
   hatchling,
+
+  # dependencies
+  wcwidth,
+
+  # tests
+  coverage,
+  pytest-cov-stub,
   pytest-lazy-fixtures,
   pytestCheckHook,
-  pythonOlder,
-  wcwidth,
 }:
 
 buildPythonPackage rec {
   pname = "prettytable";
-  version = "3.11.0";
+  version = "3.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "prettytable";
-    rev = "refs/tags/${version}";
-    hash = "sha256-LtphoD5gCMgWgDcFghinq9zjUD69XudEeGIToqqmVPs=";
+    tag = version;
+    hash = "sha256-RoBPmnuAOtTET898Gdm1zzPIst26GdCY5nU1PyJ+Nro=";
   };
 
   build-system = [
@@ -32,17 +37,19 @@ buildPythonPackage rec {
   dependencies = [ wcwidth ];
 
   nativeCheckInputs = [
+    coverage
+    pytest-cov-stub
     pytest-lazy-fixtures
     pytestCheckHook
   ];
 
   pythonImportsCheck = [ "prettytable" ];
 
-  meta = with lib; {
+  meta = {
     description = "Display tabular data in a visually appealing ASCII table format";
     homepage = "https://github.com/jazzband/prettytable";
     changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }

From f02e016caa44097bf8905f7e448419c0c4442c21 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 26 Nov 2024 13:22:59 +0100
Subject: [PATCH 128/145] python312Packages.prettytable: add GaetanLepage as
 maintainer

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

diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index c4ba297b6ecd..32257b5ffa9a 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jazzband/prettytable";
     changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}";
     license = lib.licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }

From 9745ad0a8216601541bd0613507f7aeb68daebcc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 17 Oct 2024 13:51:46 +0200
Subject: [PATCH 129/145] python312Packages.jupysql: 0.10.13 -> 0.10.16

Diff:
https://github.com/ploomber/jupysql/compare/refs/tags/0.10.13...0.10.16

Changelog: https://github.com/ploomber/jupysql/blob/0.10.16/CHANGELOG.md
---
 .../python-modules/jupysql/default.nix        | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix
index 01fa1c0f3163..56326d52d837 100644
--- a/pkgs/development/python-modules/jupysql/default.nix
+++ b/pkgs/development/python-modules/jupysql/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -36,15 +37,15 @@
 
 buildPythonPackage rec {
   pname = "jupysql";
-  version = "0.10.13";
+  version = "0.10.16";
 
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ploomber";
     repo = "jupysql";
-    rev = "refs/tags/${version}";
-    hash = "sha256-vNuMGHFkatJS5KjxaOBwZ7JolIDAdYqGq3JNKSV2fKE=";
+    tag = version;
+    hash = "sha256-TIISiGvspRG0d/4nEyi8Tiu0y80D1Rf8puDEkGIeA08=";
   };
 
   pythonRelaxDeps = [ "sqlalchemy" ];
@@ -81,33 +82,35 @@ buildPythonPackage rec {
     psutil
   ] ++ optional-dependencies.dev;
 
-  disabledTests = [
-    # AttributeError: 'DataFrame' object has no attribute 'frame_equal'
-    "test_resultset_polars_dataframe"
-    # all of these are broken with later versions of duckdb; see
-    # https://github.com/ploomber/jupysql/issues/1030
-    "test_resultset_getitem"
-    "test_resultset_dict"
-    "test_resultset_len"
-    "test_resultset_dicts"
-    "test_resultset_dataframe"
-    "test_resultset_csv"
-    "test_resultset_str"
-    "test_resultset_repr_html_when_feedback_is_2"
-    "test_resultset_repr_html_with_reduced_feedback"
-    "test_invalid_operation_error"
-    "test_resultset_config_autolimit_dict"
-    # fails due to strict warnings
-    "test_calling_legacy_plotting_functions_displays_warning"
-  ];
+  disabledTests =
+    [
+      # AttributeError: 'DataFrame' object has no attribute 'frame_equal'
+      "test_resultset_polars_dataframe"
+      # all of these are broken with later versions of duckdb; see
+      # https://github.com/ploomber/jupysql/issues/1030
+      "test_resultset_getitem"
+      "test_resultset_dict"
+      "test_resultset_len"
+      "test_resultset_dicts"
+      "test_resultset_dataframe"
+      "test_resultset_csv"
+      "test_resultset_str"
+      "test_resultset_repr_html_when_feedback_is_2"
+      "test_resultset_repr_html_with_reduced_feedback"
+      "test_invalid_operation_error"
+      "test_resultset_config_autolimit_dict"
+      # fails due to strict warnings
+      "test_calling_legacy_plotting_functions_displays_warning"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # Fatal Python error: Aborted (in matplotlib)
+      "test_no_errors_with_stored_query"
+    ];
 
   disabledTestPaths = [
     # require docker
     "src/tests/integration"
 
-    # require network access
-    "src/tests/test_telemetry.py"
-
     # want to download test data from the network
     "src/tests/test_parse.py"
     "src/tests/test_ggplot.py"

From 47755f037380ddc8c7425f78d5de6958ae00b890 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 27 Nov 2024 00:46:30 +0100
Subject: [PATCH 130/145] python312Packages.libuuu: fix typo in description

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

diff --git a/pkgs/development/python-modules/libuuu/default.nix b/pkgs/development/python-modules/libuuu/default.nix
index 2cd77ce3b699..d824c2379877 100644
--- a/pkgs/development/python-modules/libuuu/default.nix
+++ b/pkgs/development/python-modules/libuuu/default.nix
@@ -6,8 +6,8 @@
   setuptools,
   setuptools-scm,
   autoPatchelfHook,
-  pytestCheckHook,
   udev,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -51,7 +51,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    description = "Python wraper for libuuu";
+    description = "Python wrapper for libuuu";
     homepage = "https://github.com/nxp-imx/mfgtools/tree/master/wrapper";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ GaetanLepage ];

From 0e6166eaf82f8388622bb4dd4d6630c9aa5a0ba8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Dec 2024 10:07:59 +0100
Subject: [PATCH 131/145] python312Packages.softlayer: fix on darwin

---
 .../python-modules/softlayer/default.nix      | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix
index b2238da2916f..49550048e359 100644
--- a/pkgs/development/python-modules/softlayer/default.nix
+++ b/pkgs/development/python-modules/softlayer/default.nix
@@ -1,44 +1,52 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
-  click,
   fetchFromGitHub,
-  mock,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  click,
   prettytable,
   prompt-toolkit,
   ptable,
   pygments,
-  pytestCheckHook,
-  pythonOlder,
   requests,
   rich,
+  urllib3,
+
+  # tests
+  mock,
+  pytestCheckHook,
   sphinx,
   testtools,
   tkinter,
-  urllib3,
   zeep,
 }:
 
 buildPythonPackage rec {
   pname = "softlayer";
   version = "6.2.5";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
-    owner = pname;
+    owner = "softlayer";
     repo = "softlayer-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wDLMVonPUexoaZ60kRBILmr5l46yajzACozCp6uETGY=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-        --replace "rich ==" "rich >="
-  '';
+  build-system = [
+    setuptools
+  ];
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "rich"
+  ];
+
+  dependencies = [
     click
     prettytable
     prompt-toolkit
@@ -66,6 +74,11 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
+  pytestFlagsArray = lib.optionals stdenv.hostPlatform.isDarwin [
+    # SoftLayer.exceptions.TransportError: TransportError(0): ('Connection aborted.', ConnectionResetError(54, 'Connection reset by peer'))
+    "--deselect=tests/CLI/modules/hardware/hardware_basic_tests.py::HardwareCLITests"
+  ];
+
   disabledTestPaths = [
     # Test fails with ConnectionError trying to connect to api.softlayer.com
     "tests/transports/soap_tests.py.unstable"
@@ -73,11 +86,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "SoftLayer" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python libraries that assist in calling the SoftLayer API";
     homepage = "https://github.com/softlayer/softlayer-python";
     changelog = "https://github.com/softlayer/softlayer-python/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ onny ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ onny ];
   };
 }

From a264d75d5c08f068c473c9088998b705f2bd4f6d Mon Sep 17 00:00:00 2001
From: Mach50 <64970593+mastermach50@users.noreply.github.com>
Date: Tue, 10 Dec 2024 19:24:39 +0530
Subject: [PATCH 132/145] whatsie: Add desktop entry and install icons

---
 pkgs/by-name/wh/whatsie/package.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/by-name/wh/whatsie/package.nix b/pkgs/by-name/wh/whatsie/package.nix
index e9888da4ea15..e7c45012278c 100644
--- a/pkgs/by-name/wh/whatsie/package.nix
+++ b/pkgs/by-name/wh/whatsie/package.nix
@@ -2,6 +2,8 @@
   fetchFromGitHub,
   lib,
   stdenv,
+  makeDesktopItem,
+  copyDesktopItems,
   libX11,
   libxcb,
   qt5,
@@ -20,6 +22,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = finalAttrs.pname;
+      desktopName = "Whatsie";
+      icon = finalAttrs.pname;
+      exec = finalAttrs.pname;
+      comment = finalAttrs.meta.description;
+    })
+  ];
+
   buildInputs = [
     libX11
     libxcb
@@ -27,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
+    copyDesktopItems
     qt5.wrapQtAppsHook
     qt5.qmake
   ];
@@ -43,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     install -Dm755 whatsie -t $out/bin
+    install -Dm644 $src/snap/gui/icon.svg $out/share/icons/hicolor/scalable/apps/whatsie.svg
 
     runHook postInstall
   '';

From b67a2d717f116b6bebe815534d5c97d153e20141 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 13:29:18 +0000
Subject: [PATCH 133/145] vscode-extensions.ms-toolsai.jupyter: 2024.10.0 ->
 2024.11.0

---
 .../editors/vscode/extensions/ms-toolsai.jupyter/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
index 6279d605e14f..d68262e590af 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "jupyter";
     publisher = "ms-toolsai";
-    version = "2024.10.0";
-    hash = "sha256-4b3aE1RgqxEKHMEMlhIjRk4WR3DZRWmqMfGGFQi43J0=";
+    version = "2024.11.0";
+    hash = "sha256-BwZLF52ilEaLU6swUFEa+PtrxzsFOLIYd8TVD7xRgPg=";
   };
 
   nativeBuildInputs = [

From 045065efb879b73d21458764ee8d738afe40e3e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 13:32:00 +0000
Subject: [PATCH 134/145] kubescape: 3.0.21 -> 3.0.22

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

diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix
index d892461ef469..d0ac97d23a9e 100644
--- a/pkgs/by-name/ku/kubescape/package.nix
+++ b/pkgs/by-name/ku/kubescape/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "kubescape";
-  version = "3.0.21";
+  version = "3.0.22";
 
   src = fetchFromGitHub {
     owner = "kubescape";
     repo = "kubescape";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8Reg49X+3wzE2FJVkTA8T3VN0Ph3ToSXAeMAc2b5rYk=";
+    hash = "sha256-m1tfYuRDPxm8Q1e4RIzqfkv9vOjGUPvI0FADvYXep/c=";
     fetchSubmodules = true;
   };
 

From 9dc84e1150ed9aa60f630b57abe12f0f7b155ff8 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Mon, 9 Dec 2024 07:36:49 +0800
Subject: [PATCH 135/145] dart.file_picker: init

---
 .../dart/package-source-builders/default.nix  |  1 +
 .../file_picker/default.nix                   | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/compilers/dart/package-source-builders/file_picker/default.nix

diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix
index e462e932cca6..f07195160d43 100644
--- a/pkgs/development/compilers/dart/package-source-builders/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/default.nix
@@ -1,6 +1,7 @@
 { callPackage }:
 
 {
+  file_picker = callPackage ./file_picker { };
   flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { };
   flutter_volume_controller = callPackage ./flutter_volume_controller { };
   fvp = callPackage ./fvp { };
diff --git a/pkgs/development/compilers/dart/package-source-builders/file_picker/default.nix b/pkgs/development/compilers/dart/package-source-builders/file_picker/default.nix
new file mode 100644
index 000000000000..11b541507e04
--- /dev/null
+++ b/pkgs/development/compilers/dart/package-source-builders/file_picker/default.nix
@@ -0,0 +1,25 @@
+{
+  stdenv,
+  zenity,
+}:
+
+{ version, src, ... }:
+
+stdenv.mkDerivation rec {
+  pname = "file_picker";
+  inherit version src;
+  inherit (src) passthru;
+
+  postPatch = ''
+    substituteInPlace lib/src/linux/file_picker_linux.dart \
+        --replace-fail "isExecutableOnPath('zenity')" "'${zenity}/bin/zenity'"
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r . $out
+
+    runHook postInstall
+  '';
+}

From 0d460350cafd072e8864e60f5cdd91724290ca23 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Mon, 9 Dec 2024 07:42:11 +0800
Subject: [PATCH 136/145] cwtch-ui: remove useless zenity

---
 pkgs/by-name/cw/cwtch-ui/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/cw/cwtch-ui/package.nix b/pkgs/by-name/cw/cwtch-ui/package.nix
index 7a05aa76b53e..88bcf61439d5 100644
--- a/pkgs/by-name/cw/cwtch-ui/package.nix
+++ b/pkgs/by-name/cw/cwtch-ui/package.nix
@@ -4,12 +4,10 @@
   flutter,
   lib,
   tor,
-  zenity,
 }:
 let
   runtimeBinDependencies = [
     tor
-    zenity
   ];
 in
 flutter.buildFlutterApplication rec {

From f746723f331bcab6dae51ac1b2fa7af582e233b2 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Mon, 9 Dec 2024 07:42:55 +0800
Subject: [PATCH 137/145] flclash: remove useless zenity

---
 pkgs/by-name/fl/flclash/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
index 861237e7d515..6b1bbedcbab5 100644
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -7,7 +7,6 @@
   buildGoModule,
   makeDesktopItem,
   copyDesktopItems,
-  zenity,
   wrapGAppsHook3,
   autoPatchelfHook,
 }:
@@ -97,10 +96,6 @@ flutter324.buildFlutterApplication {
     install -Dm644 ./assets/images/icon.png $out/share/pixmaps/flclash.png
   '';
 
-  extraWrapProgramArgs = ''
-    --prefix PATH : ${lib.makeBinPath [ zenity ]}
-  '';
-
   meta = {
     description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
     homepage = "https://github.com/chen08209/FlClash";

From 2a6c78be41deb29752afee7cc1b508eb61b0595f Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Mon, 9 Dec 2024 07:44:21 +0800
Subject: [PATCH 138/145] fluffychat: remove useless zenity

---
 pkgs/by-name/fl/fluffychat/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix
index f3e0e4a0cfdc..482b8ddb5b0f 100644
--- a/pkgs/by-name/fl/fluffychat/package.nix
+++ b/pkgs/by-name/fl/fluffychat/package.nix
@@ -8,7 +8,6 @@
   flutter324,
   pulseaudio,
   makeDesktopItem,
-  zenity,
   olm,
 
   targetFlutterPlatform ? "linux",
@@ -64,8 +63,6 @@ flutter324.buildFlutterApplication (
 
     runtimeDependencies = [ pulseaudio ];
 
-    extraWrapProgramArgs = "--prefix PATH : ${zenity}/bin";
-
     env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}";
 
     desktopItem = makeDesktopItem {

From eb2ed4eb3540b9a156ac6faff97701488d986ed7 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Mon, 9 Dec 2024 07:45:19 +0800
Subject: [PATCH 139/145] mangayomi: remove useless zenity

---
 pkgs/by-name/ma/mangayomi/package.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix
index 7682422e031c..fd0b8770e378 100644
--- a/pkgs/by-name/ma/mangayomi/package.nix
+++ b/pkgs/by-name/ma/mangayomi/package.nix
@@ -35,7 +35,6 @@
   libvdpau,
   rustPlatform,
   stdenv,
-  zenity,
   copyDesktopItems,
   makeDesktopItem,
   replaceVars,
@@ -157,12 +156,7 @@ flutter324.buildFlutterApplication {
   '';
 
   extraWrapProgramArgs = ''
-    --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \
-    --prefix PATH : "${
-      lib.makeBinPath [
-        zenity
-      ]
-    }"
+    --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib"
   '';
 
   meta = {

From 68936e5e6fdd44d0cf20028dd8c5b2fb8b956d68 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Mon, 9 Dec 2024 07:46:11 +0800
Subject: [PATCH 140/145] quickgui: remove useless zenity

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

diff --git a/pkgs/by-name/qu/quickgui/package.nix b/pkgs/by-name/qu/quickgui/package.nix
index 3bd968a1cb12..7a39f648cacf 100644
--- a/pkgs/by-name/qu/quickgui/package.nix
+++ b/pkgs/by-name/qu/quickgui/package.nix
@@ -5,7 +5,6 @@
   lib,
   flutter,
   quickemu,
-  zenity,
 }:
 flutter.buildFlutterApplication rec {
   pname = "quickgui";
@@ -26,7 +25,6 @@ flutter.buildFlutterApplication rec {
   extraWrapProgramArgs = "--prefix PATH : ${
     lib.makeBinPath [
       quickemu
-      zenity
     ]
   }";
 

From 1182f0c3e2d9a2fbfc50e189d8aabf19c5126a5a Mon Sep 17 00:00:00 2001
From: Vincent Haupert <vincent.haupert@yaxi.tech>
Date: Sat, 23 Nov 2024 12:27:12 +0100
Subject: [PATCH 141/145] python3Packages.test-results-parser: init at 0.5.1

---
 .../test-results-parser/default.nix           | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/test-results-parser/default.nix

diff --git a/pkgs/development/python-modules/test-results-parser/default.nix b/pkgs/development/python-modules/test-results-parser/default.nix
new file mode 100644
index 000000000000..c14c5cff4180
--- /dev/null
+++ b/pkgs/development/python-modules/test-results-parser/default.nix
@@ -0,0 +1,44 @@
+{
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+  pytestCheckHook,
+  rustPlatform,
+}:
+
+buildPythonPackage rec {
+  pname = "test-results-parser";
+  version = "0.5.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "test_results_parser";
+    hash = "sha256-DaUSTu4Hg9SbJwBd3PlMcIAm/o63Q1yM5E7dVxbOwM8=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit pname version src;
+    hash = "sha256-dhreAWm/Hses/N3XocYX7IZru9nYJqDrmTnJPkKaOwY=";
+  };
+
+  nativeBuildInputs = with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ];
+
+  pythonImpotsCheck = [
+    "test_results_parser"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Codecov test results parser";
+    homepage = "https://github.com/codecov/test-results-parser";
+    license = lib.licenses.fsl11Asl20;
+    maintainers = with lib.maintainers; [ veehaitch ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 27e56d5cfedb..fe4356581467 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15767,6 +15767,8 @@ self: super: with self; {
 
   tesserocr = callPackage ../development/python-modules/tesserocr { };
 
+  test-results-parser = callPackage ../development/python-modules/test-results-parser { };
+
   testcontainers = callPackage ../development/python-modules/testcontainers { };
 
   testfixtures = callPackage ../development/python-modules/testfixtures { };

From d377d2b0a509cf67c5005053516b668e19ebd7bb Mon Sep 17 00:00:00 2001
From: Vincent Haupert <vincent.haupert@yaxi.tech>
Date: Sat, 23 Nov 2024 12:30:33 +0100
Subject: [PATCH 142/145] codecov-cli: init at 9.1.1

---
 pkgs/by-name/co/codecov-cli/package.nix | 44 +++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/co/codecov-cli/package.nix

diff --git a/pkgs/by-name/co/codecov-cli/package.nix b/pkgs/by-name/co/codecov-cli/package.nix
new file mode 100644
index 000000000000..63f7a7ce0457
--- /dev/null
+++ b/pkgs/by-name/co/codecov-cli/package.nix
@@ -0,0 +1,44 @@
+{
+  fetchPypi,
+  lib,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "codecov-cli";
+  version = "9.1.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-jaljYA2x2nZUOn9vy/CdtxfGjQKHtrtY13WmBdsICTA=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "httpx"
+    "responses"
+    "tree-sitter"
+  ];
+
+  dependencies = with python3Packages; [
+    click
+    httpx
+    ijson
+    pyyaml
+    regex
+    responses
+    test-results-parser
+    tree-sitter
+  ];
+
+  meta = {
+    description = "Codecov Command Line Interface";
+    homepage = "https://github.com/codecov/codecov-cli";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ veehaitch ];
+  };
+}

From e626888ad91be28c530dd717eb1c683212a2979b Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 11 Dec 2024 09:43:16 -0500
Subject: [PATCH 143/145] python312Packages.cymem: update meta.changelog

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

diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix
index b49cb89c7560..c5b35087b0e3 100644
--- a/pkgs/development/python-modules/cymem/default.nix
+++ b/pkgs/development/python-modules/cymem/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Cython memory pool for RAII-style memory management";
     homepage = "https://github.com/explosion/cymem";
-    changelog = "https://github.com/explosion/cymem/releases/tag/v${version}";
+    changelog = "https://github.com/explosion/cymem/releases/tag/release-v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ nickcao ];
   };

From 7251eb7213d072ea06d61eb01b392976cda71d91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gy=C3=B6rgy=20Kurucz?= <me@kuruczgy.com>
Date: Tue, 10 Dec 2024 22:04:23 +0100
Subject: [PATCH 144/145] edk2-uefi-shell: fix cross compilation

This PYTHON_COMMAND workaround was introduced in #201095, but it does
not seem to have caused issues so far, until the version update in
bef3f40f05fbea6154967ff638d4e194f1a7d251. Not sure why this was not an
issue before this update and why it is now, but I think this fix makes
sense regardless of the exact root cause, and I don't think it's worth
the effort to dig further.
---
 pkgs/by-name/ed/edk2-uefi-shell/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ed/edk2-uefi-shell/package.nix b/pkgs/by-name/ed/edk2-uefi-shell/package.nix
index dd79e1ac4d16..b1d1beb266ef 100644
--- a/pkgs/by-name/ed/edk2-uefi-shell/package.nix
+++ b/pkgs/by-name/ed/edk2-uefi-shell/package.nix
@@ -6,6 +6,7 @@
   util-linux,
   nasm,
   python3,
+  pkgsBuildHost,
 }:
 edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: {
   pname = "edk2-uefi-shell";
@@ -32,7 +33,7 @@ edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: {
 
   # Set explicitly to use Python 3 from nixpkgs. Otherwise, the build system will detect and try to
   # use `/usr/bin/python3` on Darwin when sandboxing is disabled.
-  PYTHON_COMMAND = "${lib.getBin python3}/bin/python3";
+  PYTHON_COMMAND = "${lib.getBin pkgsBuildHost.python3}/bin/python3";
 
   # We only have a .efi file in $out which shouldn't be patched or stripped
   dontPatchELF = true;

From cef807f7be0ec1f5ce169709056086f48a1e0443 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 15:08:06 +0000
Subject: [PATCH 145/145] rustypaste: 0.15.1 -> 0.16.0

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

diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix
index eef90e5c0858..6dff4d942efe 100644
--- a/pkgs/by-name/ru/rustypaste/package.nix
+++ b/pkgs/by-name/ru/rustypaste/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rustypaste";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-C/ndU09+yQTXEUWDO3u9Bl5M3x3aaRHVuWpomUAa/B8=";
+    sha256 = "sha256-Kv6hmqqGY9SssiT/MYmYCZ71N8CHFTT7K4q7eMdQTQU=";
   };
 
-  cargoHash = "sha256-b9KZzevaTl52pduN4gkF8k6yqgDcE8x5sOwmPxzYfWA=";
+  cargoHash = "sha256-podM44J7RGpLdPo+yS7clwX6vvvQRllkqPu7UpC/LzI=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices