From b7a9e74716478f0617681fa865f3cc76dc6933ea Mon Sep 17 00:00:00 2001
From: Syed Moiz Ur Rehman <smrehman@proton.me>
Date: Sun, 5 Jan 2025 20:18:38 +0500
Subject: [PATCH 01/87] python3Packages.simple-term-menu: 1.6.4 -> 1.6.6

---
 .../python-modules/simple-term-menu/default.nix      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/simple-term-menu/default.nix b/pkgs/development/python-modules/simple-term-menu/default.nix
index ea67d21d5adc..96409771ae3d 100644
--- a/pkgs/development/python-modules/simple-term-menu/default.nix
+++ b/pkgs/development/python-modules/simple-term-menu/default.nix
@@ -1,18 +1,20 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "simple-term-menu";
-  version = "1.6.4";
+  version = "1.6.6";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-vpxdvY3xKkBLFM2Oldb8AtWMYOJVX2Xd3kF3fEh/s7k=";
+  src = fetchFromGitHub {
+    owner = "IngoMeyer441";
+    repo = "simple-term-menu";
+    tag = "v${version}";
+    hash = "sha256-nfMqtyUalt/d/wTyRUlu5x4Q349ARY8hDMi8Ui4cTI4=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 4e89837f4e475db75b1cd54cefb0fc2ce4be6f52 Mon Sep 17 00:00:00 2001
From: A Frederick Christensen <fauxmight@users.noreply.github.com>
Date: Sun, 12 Jan 2025 16:54:43 -0600
Subject: [PATCH 02/87] alacritty-theme: don't litter /

Moves the output files from $out/ to $out/share/alacritty-theme/
Without this, ~/.nix-profile/ is filled with alacritty-theme files
when using alacritty-theme from home-manager.
---
 pkgs/by-name/al/alacritty-theme/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix
index a5e7d6f44c0c..27a953458bf0 100644
--- a/pkgs/by-name/al/alacritty-theme/package.nix
+++ b/pkgs/by-name/al/alacritty-theme/package.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (self: {
   sourceRoot = "${self.src.name}/themes";
   installPhase = ''
     runHook preInstall
-    install -Dt $out *.toml
+    install -Dt $out/share/alacritty-theme *.toml
     runHook postInstall
   '';
 

From 67cde07547a12e811ad03e205678bb1f0a2119bd Mon Sep 17 00:00:00 2001
From: Stefan Fehrenbach <stefan.fehrenbach@gmail.com>
Date: Sun, 19 Jan 2025 12:19:01 +0100
Subject: [PATCH 03/87] frink: 2024-05-09 -> 2025-01-07

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

diff --git a/pkgs/by-name/fr/frink/package.nix b/pkgs/by-name/fr/frink/package.nix
index 818a70bfe2a0..43ddf36ab9bf 100644
--- a/pkgs/by-name/fr/frink/package.nix
+++ b/pkgs/by-name/fr/frink/package.nix
@@ -9,12 +9,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "frink";
-  version = "2024-05-09";
+  version = "2025-01-07";
 
   src = fetchurl {
     # Upstream does not provide versioned download links
-    url = "https://web.archive.org/web/20240605193919/https://frinklang.org/frinkjar/frink-tng.jar";
-    sha256 = "sha256-ceV1p9wsXprcNLhol79evswVZ1SpH5IzfSbl8st4cmU=";
+    url = "https://web.archive.org/web/20250119105218/https://frinklang.org/frinkjar/frink-tng.jar";
+    sha256 = "sha256-qsbYUUBBVILUG6oZVR3t5UaVdNew6xRvjqQBJVr76L8=";
   };
 
   dontUnpack = true;

From 7cad2aa70b73f67dc71b50d52b8dc977f391f8c8 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 4 Feb 2025 11:18:07 -0500
Subject: [PATCH 04/87] atproto-goat: 0-unstable-2024-10-29 ->
 0-unstable-2025-02-01

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

diff --git a/pkgs/by-name/at/atproto-goat/package.nix b/pkgs/by-name/at/atproto-goat/package.nix
index b2ba3474d212..daf579357988 100644
--- a/pkgs/by-name/at/atproto-goat/package.nix
+++ b/pkgs/by-name/at/atproto-goat/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "atproto-goat";
-  version = "0-unstable-2024-10-29";
+  version = "0-unstable-2025-02-01";
 
   src = fetchFromGitHub {
     owner = "bluesky-social";
     repo = "indigo";
-    rev = "983ce4a481a32a3eb2944c4c76e885d0f6006f83";
-    hash = "sha256-Jo3pI4uRyKh3yV03ijOcg+Uyu75Spmy/VS116MVgleU=";
+    rev = "fd270fbccf0ca858ed2eccdeff246a303c0be045";
+    hash = "sha256-1WK3tMz8WbuIGTHYwD0or+9D0KVezhnv3EDdK11KKp8=";
   };
 
   postPatch = ''
@@ -22,7 +22,7 @@ buildGoModule rec {
       --replace-fail '"github.com/carlmjohnson/versioninfo"' ""
   '';
 
-  vendorHash = "sha256-T+jtxubVKskrLGTUa4RI24o/WTSFCBk60HhyCFujPOI=";
+  vendorHash = "sha256-pGc29fgJFq8LP7n/pY1cv6ExZl88PAeFqIbFEhB3xXs=";
 
   subPackages = [ "cmd/goat" ];
 

From 4dbad1c78157a01e03a9ea8efcffcec692b216c9 Mon Sep 17 00:00:00 2001
From: LuoChen <luochen1990@gmail.com>
Date: Tue, 12 Sep 2023 12:03:50 +0800
Subject: [PATCH 05/87] zsh-histdb: init at 0-unstable-2024-04-18

Co-authored-by: FliegendeWurst <arne.keller@posteo.de>
---
 pkgs/by-name/zs/zsh-histdb/package.nix | 49 ++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/zs/zsh-histdb/package.nix

diff --git a/pkgs/by-name/zs/zsh-histdb/package.nix b/pkgs/by-name/zs/zsh-histdb/package.nix
new file mode 100644
index 000000000000..5ad1773e2323
--- /dev/null
+++ b/pkgs/by-name/zs/zsh-histdb/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  makeWrapper,
+  zsh,
+  sqlite,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "zsh-histdb";
+  version = "0-unstable-2024-04-18";
+
+  src = fetchFromGitHub {
+    owner = "larkery";
+    repo = "zsh-histdb";
+    rev = "90a6c104d0fcc0410d665e148fa7da28c49684eb";
+    hash = "sha256-vtG1poaRVbfb/wKPChk1WpPgDq+7udLqLfYfLqap4Vg=";
+  };
+
+  postPatch = ''
+    substituteInPlace sqlite-history.zsh \
+      --replace-fail 'sqlite3' '"${lib.getExe sqlite}"'
+  '';
+
+  buildInputs = [
+    zsh
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dt $out/share/zsh-histdb/ \
+      sqlite-history.zsh histdb-interactive.zsh histdb-{merge,migrate}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "History database for Zsh, based on SQLite";
+    homepage = "https://github.com/larkery/zsh-histdb";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      fliegendewurst
+      luochen1990
+    ];
+    platforms = lib.platforms.unix;
+  };
+}

From 208a3054284ceb4b19344b1e6e5fe26ee75ca9cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 15 Feb 2025 11:43:54 +0000
Subject: [PATCH 06/87] yandex-music: 5.28.4 -> 5.39.0

---
 pkgs/by-name/ya/yandex-music/package.nix  | 4 ++--
 pkgs/by-name/ya/yandex-music/ym_info.json | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix
index 518bdd0de63c..fa83fc56171a 100644
--- a/pkgs/by-name/ya/yandex-music/package.nix
+++ b/pkgs/by-name/ya/yandex-music/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "yandex-music";
-  version = "5.28.4";
+  version = "5.39.0";
 
   src = fetchFromGitHub {
     owner = "cucumber-sp";
     repo = "yandex-music-linux";
     rev = "v${version}";
-    hash = "sha256-0YUZKklwHkZ3bDI4OLmXyj0v2wzWzJbJpQ8QQa356fI=";
+    hash = "sha256-oEbbQRqvnK521N3Kerv18h1frVLbioFeHfb/FCkHC6Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ya/yandex-music/ym_info.json b/pkgs/by-name/ya/yandex-music/ym_info.json
index f7200b7767d8..b5eeac27441b 100644
--- a/pkgs/by-name/ya/yandex-music/ym_info.json
+++ b/pkgs/by-name/ya/yandex-music/ym_info.json
@@ -1,6 +1,6 @@
 {
-  "version": "5.28.4",
-  "exe_name": "Yandex_Music_x64_5.28.4.exe",
-  "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.28.4.exe",
-  "exe_hash": "sha256-fJlRtGgOJcHbAgUBxrv3AJro7uN5En9le2b+a5K2QMc="
+  "version": "5.39.0",
+  "exe_name": "Yandex_Music_x64_5.39.0.exe",
+  "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.39.0.exe",
+  "exe_hash": "sha256-jOaxKDOkabsNQTXH5+UGwfdL+Srjm5gjQgHe/YuGiaQ="
 }

From 75e7f40104a7f25fab5e16d9f744d9fd7c52bd53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Feb 2025 01:07:36 +0000
Subject: [PATCH 07/87] libmodsecurity: 3.0.13 -> 3.0.14

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

diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix
index a5d840d44df0..544363a24fca 100644
--- a/pkgs/tools/security/libmodsecurity/default.nix
+++ b/pkgs/tools/security/libmodsecurity/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libmodsecurity";
-  version = "3.0.13";
+  version = "3.0.14";
 
   src = fetchFromGitHub {
     owner = "owasp-modsecurity";
     repo = "ModSecurity";
     rev = "v${version}";
-    hash = "sha256-+z31t007NLCAFG/Lsj5j/AbBDPkI2wjbH5yM5vipH04=";
+    hash = "sha256-SaeBO3+WvPhHiJoiOmijB0G3/QYxjAdxgeCVqESS+4U=";
     fetchSubmodules = true;
   };
 

From fb1b6844a17ac5f6ccefdde7ff134a9a14ce5ff0 Mon Sep 17 00:00:00 2001
From: secufoe <135814375+secufoe@users.noreply.github.com>
Date: Wed, 26 Feb 2025 12:34:50 +0100
Subject: [PATCH 08/87] ipxe: fix dangling symlink

---
 pkgs/by-name/ip/ipxe/package.nix | 33 +++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index 046b9f34f304..c51d9684902b 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -112,22 +112,25 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildFlags = lib.attrNames targets;
 
-  installPhase = ''
-    runHook preInstall
+  installPhase =
+    ''
+      runHook preInstall
 
-    mkdir -p $out
-    ${lib.concatStringsSep "\n" (
-      lib.mapAttrsToList (
-        from: to: if to == null then "cp -v ${from} $out" else "cp -v ${from} $out/${to}"
-      ) targets
-    )}
-
-    # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending
-    # let's provide it as a symlink to be compatible in this case.
-    ln -s undionly.kpxe $out/undionly.kpxe.0
-
-    runHook postInstall
-  '';
+      mkdir -p $out
+      ${lib.concatStringsSep "\n" (
+        lib.mapAttrsToList (
+          from: to: if to == null then "cp -v ${from} $out" else "cp -v ${from} $out/${to}"
+        ) targets
+      )}
+    ''
+    + lib.optionalString stdenv.hostPlatform.isx86 ''
+      # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending
+      # let's provide it as a symlink to be compatible in this case.
+      ln -s undionly.kpxe $out/undionly.kpxe.0
+    ''
+    + ''
+      runHook postInstall
+    '';
 
   enableParallelBuilding = true;
 

From 0ee24498210e397f3beeefb4a3b87e43d1d5817b Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Sun, 2 Mar 2025 19:20:31 -0300
Subject: [PATCH 09/87] cosmic-bg: use mold linker

---
 pkgs/by-name/co/cosmic-bg/package.nix | 98 +++++++++++++++------------
 1 file changed, 53 insertions(+), 45 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 5b6098a42f5f..04e7a6de2120 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  stdenvAdapters,
   fetchFromGitHub,
   rustPlatform,
   just,
@@ -8,58 +9,65 @@
   makeBinaryWrapper,
   libxkbcommon,
   wayland,
+
+  withMoldLinker ? stdenv.targetPlatform.isLinux,
 }:
 
-rustPlatform.buildRustPackage rec {
-  pname = "cosmic-bg";
-  version = "1.0.0-alpha.6";
+rustPlatform.buildRustPackage.override
+  { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; }
+  rec {
+    pname = "cosmic-bg";
+    version = "1.0.0-alpha.6";
 
-  src = fetchFromGitHub {
-    owner = "pop-os";
-    repo = pname;
-    rev = "epoch-${version}";
-    hash = "sha256-4b4laUXTnAbdngLVh8/dD144m9QrGReSEjRZoNR6Iks=";
-  };
+    src = fetchFromGitHub {
+      owner = "pop-os";
+      repo = pname;
+      rev = "epoch-${version}";
+      hash = "sha256-4b4laUXTnAbdngLVh8/dD144m9QrGReSEjRZoNR6Iks=";
+    };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk=";
 
-  postPatch = ''
-    substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
-  '';
+    postPatch = ''
+      substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
+    '';
 
-  nativeBuildInputs = [
-    just
-    pkg-config
-    makeBinaryWrapper
-  ];
-  buildInputs = [
-    libxkbcommon
-    wayland
-  ];
+    nativeBuildInputs = [
+      just
+      pkg-config
+      makeBinaryWrapper
+    ];
+    buildInputs = [
+      libxkbcommon
+      wayland
+    ];
 
-  dontUseJustBuild = true;
+    dontUseJustBuild = true;
 
-  justFlags = [
-    "--set"
-    "prefix"
-    (placeholder "out")
-    "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg"
-  ];
+    justFlags = [
+      "--set"
+      "prefix"
+      (placeholder "out")
+      "--set"
+      "bin-src"
+      "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg"
+    ];
 
-  postInstall = ''
-    wrapProgram $out/bin/cosmic-bg \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}"
-  '';
+    env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
+      lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold";
 
-  meta = with lib; {
-    homepage = "https://github.com/pop-os/cosmic-bg";
-    description = "Applies Background for the COSMIC Desktop Environment";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ nyabinary ];
-    platforms = platforms.linux;
-    mainProgram = "cosmic-bg";
-  };
-}
+    postInstall = ''
+      wrapProgram $out/bin/cosmic-bg \
+        --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}"
+    '';
+
+    meta = with lib; {
+      homepage = "https://github.com/pop-os/cosmic-bg";
+      description = "Applies Background for the COSMIC Desktop Environment";
+      license = licenses.mpl20;
+      maintainers = with maintainers; [ nyabinary ];
+      platforms = platforms.linux;
+      mainProgram = "cosmic-bg";
+    };
+  }

From 0a49ff25e2c847f255b24cb1cdc2cbe94f8be50c Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Sun, 2 Mar 2025 19:23:45 -0300
Subject: [PATCH 10/87] cosmic-bg: refactor

---
 pkgs/by-name/co/cosmic-bg/package.nix | 36 ++++++++-------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 04e7a6de2120..183ed2ad9af7 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -4,11 +4,9 @@
   stdenvAdapters,
   fetchFromGitHub,
   rustPlatform,
+  libcosmicAppHook,
   just,
-  pkg-config,
-  makeBinaryWrapper,
-  libxkbcommon,
-  wayland,
+  nasm,
 
   withMoldLinker ? stdenv.targetPlatform.isLinux,
 }:
@@ -21,29 +19,22 @@ rustPlatform.buildRustPackage.override
 
     src = fetchFromGitHub {
       owner = "pop-os";
-      repo = pname;
-      rev = "epoch-${version}";
+      repo = "cosmic-bg";
+      tag = "epoch-${version}";
       hash = "sha256-4b4laUXTnAbdngLVh8/dD144m9QrGReSEjRZoNR6Iks=";
     };
 
     useFetchCargoVendor = true;
     cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk=";
 
-    postPatch = ''
-      substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
-    '';
-
     nativeBuildInputs = [
       just
-      pkg-config
-      makeBinaryWrapper
-    ];
-    buildInputs = [
-      libxkbcommon
-      wayland
+      libcosmicAppHook
+      nasm
     ];
 
     dontUseJustBuild = true;
+    dontUseJustCheck = true;
 
     justFlags = [
       "--set"
@@ -57,17 +48,12 @@ rustPlatform.buildRustPackage.override
     env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
       lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold";
 
-    postInstall = ''
-      wrapProgram $out/bin/cosmic-bg \
-        --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}"
-    '';
-
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/pop-os/cosmic-bg";
       description = "Applies Background for the COSMIC Desktop Environment";
-      license = licenses.mpl20;
-      maintainers = with maintainers; [ nyabinary ];
-      platforms = platforms.linux;
+      license = lib.licenses.mpl20;
+      maintainers = with lib.maintainers; [ nyabinary ];
+      platforms = lib.platforms.linux;
       mainProgram = "cosmic-bg";
     };
   }

From ad42512ff34c32e8e061c248df01ae4239773717 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Sun, 2 Mar 2025 19:24:13 -0300
Subject: [PATCH 11/87] cosmic-bg: add HeitorAugustoLN as a maintainer

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

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 183ed2ad9af7..635e727fe498 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -52,7 +52,10 @@ rustPlatform.buildRustPackage.override
       homepage = "https://github.com/pop-os/cosmic-bg";
       description = "Applies Background for the COSMIC Desktop Environment";
       license = lib.licenses.mpl20;
-      maintainers = with lib.maintainers; [ nyabinary ];
+      maintainers = with lib.maintainers; [
+        nyabinary
+        HeitorAugustoLN
+      ];
       platforms = lib.platforms.linux;
       mainProgram = "cosmic-bg";
     };

From 63a365d8ffd47ffe7bbd0e577e3fecb51130efed Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Sun, 2 Mar 2025 19:27:32 -0300
Subject: [PATCH 12/87] cosmic-launcher: use mold linker

---
 pkgs/by-name/co/cosmic-launcher/package.nix | 106 ++++++++++----------
 1 file changed, 54 insertions(+), 52 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index 3db03c2d7c51..6c9bfa4c8665 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -1,68 +1,70 @@
 {
   lib,
   stdenv,
+  stdenvAdapters,
   fetchFromGitHub,
   rustPlatform,
   just,
   libcosmicAppHook,
   nix-update-script,
+
+  withMoldLinker ? stdenv.targetPlatform.isLinux,
 }:
 
-rustPlatform.buildRustPackage rec {
-  pname = "cosmic-launcher";
-  version = "1.0.0-alpha.6";
+rustPlatform.buildRustPackage.override
+  { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; }
+  rec {
+    pname = "cosmic-launcher";
+    version = "1.0.0-alpha.6";
 
-  src = fetchFromGitHub {
-    owner = "pop-os";
-    repo = "cosmic-launcher";
-    tag = "epoch-${version}";
-    hash = "sha256-BtYnL+qkM/aw+Air5yOKH098V+TQByM5mh1DX7v+v+s=";
-  };
+    src = fetchFromGitHub {
+      owner = "pop-os";
+      repo = "cosmic-launcher";
+      tag = "epoch-${version}";
+      hash = "sha256-BtYnL+qkM/aw+Air5yOKH098V+TQByM5mh1DX7v+v+s=";
+    };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-g7Qr3C8jQg65KehXAhftdXCpEukag0w12ClvZFkxfqs=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-g7Qr3C8jQg65KehXAhftdXCpEukag0w12ClvZFkxfqs=";
 
-  nativeBuildInputs = [
-    just
-    libcosmicAppHook
-  ];
-
-  dontUseJustBuild = true;
-  dontUseJustCheck = true;
-
-  justFlags = [
-    "--set"
-    "prefix"
-    (placeholder "out")
-    "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-launcher"
-  ];
-
-  postPatch = ''
-    substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
-  '';
-
-  env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable";
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
+    nativeBuildInputs = [
+      just
+      libcosmicAppHook
     ];
-  };
 
-  meta = {
-    homepage = "https://github.com/pop-os/cosmic-launcher";
-    description = "Launcher for the COSMIC Desktop Environment";
-    mainProgram = "cosmic-launcher";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      nyabinary
-      HeitorAugustoLN
+    dontUseJustBuild = true;
+    dontUseJustCheck = true;
+
+    justFlags = [
+      "--set"
+      "prefix"
+      (placeholder "out")
+      "--set"
+      "bin-src"
+      "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-launcher"
     ];
-    platforms = lib.platforms.linux;
-  };
-}
+
+    env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
+      "--cfg tokio_unstable${lib.optionalString withMoldLinker " -C link-arg=-fuse-ld=mold"}";
+
+    passthru.updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
+
+    meta = {
+      homepage = "https://github.com/pop-os/cosmic-launcher";
+      description = "Launcher for the COSMIC Desktop Environment";
+      mainProgram = "cosmic-launcher";
+      license = lib.licenses.gpl3Only;
+      maintainers = with lib.maintainers; [
+        nyabinary
+        HeitorAugustoLN
+      ];
+      platforms = lib.platforms.linux;
+    };
+  }

From a91e87b1f024e9a69c19a410f2c80e8bea8e5385 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Sun, 2 Mar 2025 19:28:26 -0300
Subject: [PATCH 13/87] cosmic-bg: add updateScript

---
 pkgs/by-name/co/cosmic-bg/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 635e727fe498..1ca3e6b61639 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -7,6 +7,7 @@
   libcosmicAppHook,
   just,
   nasm,
+  nix-update-script,
 
   withMoldLinker ? stdenv.targetPlatform.isLinux,
 }:
@@ -48,6 +49,15 @@ rustPlatform.buildRustPackage.override
     env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
       lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold";
 
+    passthru.updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
+
     meta = {
       homepage = "https://github.com/pop-os/cosmic-bg";
       description = "Applies Background for the COSMIC Desktop Environment";

From 801b31bb362705233a52c364cef9a7328667ab24 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Sun, 2 Mar 2025 19:31:15 -0300
Subject: [PATCH 14/87] cosmic-randr: use mold linker

---
 pkgs/by-name/co/cosmic-randr/package.nix | 104 ++++++++++++-----------
 1 file changed, 56 insertions(+), 48 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 92e96e25c270..ce99615b10ec 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -1,65 +1,73 @@
 {
   lib,
   stdenv,
+  stdenvAdapters,
   fetchFromGitHub,
   rustPlatform,
   just,
   pkg-config,
   wayland,
   nix-update-script,
+
+  withMoldLinker ? stdenv.targetPlatform.isLinux,
 }:
 
-rustPlatform.buildRustPackage rec {
-  pname = "cosmic-randr";
-  version = "1.0.0-alpha.6";
+rustPlatform.buildRustPackage.override
+  { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; }
+  rec {
+    pname = "cosmic-randr";
+    version = "1.0.0-alpha.6";
 
-  src = fetchFromGitHub {
-    owner = "pop-os";
-    repo = "cosmic-randr";
-    tag = "epoch-${version}";
-    hash = "sha256-Sqxe+vKonsK9MmJGtbrZHE7frfrjkHXysm0WQt7WSU4=";
-  };
+    src = fetchFromGitHub {
+      owner = "pop-os";
+      repo = "cosmic-randr";
+      tag = "epoch-${version}";
+      hash = "sha256-Sqxe+vKonsK9MmJGtbrZHE7frfrjkHXysm0WQt7WSU4=";
+    };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-UQ/fhjUiniVeHRQYulYko4OxcWB6UhFuxH1dVAfAzIY=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-UQ/fhjUiniVeHRQYulYko4OxcWB6UhFuxH1dVAfAzIY=";
 
-  nativeBuildInputs = [
-    just
-    pkg-config
-  ];
-
-  buildInputs = [ wayland ];
-
-  dontUseJustBuild = true;
-  dontUseJustCheck = true;
-
-  justFlags = [
-    "--set"
-    "prefix"
-    (placeholder "out")
-    "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr"
-  ];
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
+    nativeBuildInputs = [
+      just
+      pkg-config
     ];
-  };
 
-  meta = {
-    homepage = "https://github.com/pop-os/cosmic-randr";
-    description = "Library and utility for displaying and configuring Wayland outputs";
-    license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [
-      nyabinary
-      HeitorAugustoLN
+    buildInputs = [ wayland ];
+
+    dontUseJustBuild = true;
+    dontUseJustCheck = true;
+
+    justFlags = [
+      "--set"
+      "prefix"
+      (placeholder "out")
+      "--set"
+      "bin-src"
+      "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr"
     ];
-    platforms = lib.platforms.linux;
-    mainProgram = "cosmic-randr";
-  };
-}
+
+    env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
+      lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold";
+
+    passthru.updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
+
+    meta = {
+      homepage = "https://github.com/pop-os/cosmic-randr";
+      description = "Library and utility for displaying and configuring Wayland outputs";
+      license = lib.licenses.mpl20;
+      maintainers = with lib.maintainers; [
+        nyabinary
+        HeitorAugustoLN
+      ];
+      platforms = lib.platforms.linux;
+      mainProgram = "cosmic-randr";
+    };
+  }

From 58156542d271b4f0e128ce4984cb1014fe242eaa Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Mon, 3 Mar 2025 10:38:55 -0300
Subject: [PATCH 15/87] cosmic-bg: replace `rec` with `finalAttrs`

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

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 1ca3e6b61639..61fe82b61528 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage.override
   { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; }
-  rec {
+  (finalAttrs: {
     pname = "cosmic-bg";
     version = "1.0.0-alpha.6";
 
     src = fetchFromGitHub {
       owner = "pop-os";
       repo = "cosmic-bg";
-      tag = "epoch-${version}";
+      tag = "epoch-${finalAttrs.version}";
       hash = "sha256-4b4laUXTnAbdngLVh8/dD144m9QrGReSEjRZoNR6Iks=";
     };
 
@@ -69,4 +69,4 @@ rustPlatform.buildRustPackage.override
       platforms = lib.platforms.linux;
       mainProgram = "cosmic-bg";
     };
-  }
+  })

From 713d43cdb4ccaa6e1df436adbbe5f597f511dcc3 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Mon, 3 Mar 2025 10:39:20 -0300
Subject: [PATCH 16/87] cosmic-randr: replace `rec` with `finalAttrs`

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

diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index ce99615b10ec..e8115fad0f15 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage.override
   { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; }
-  rec {
+  (finalAttrs: {
     pname = "cosmic-randr";
     version = "1.0.0-alpha.6";
 
     src = fetchFromGitHub {
       owner = "pop-os";
       repo = "cosmic-randr";
-      tag = "epoch-${version}";
+      tag = "epoch-${finalAttrs.version}";
       hash = "sha256-Sqxe+vKonsK9MmJGtbrZHE7frfrjkHXysm0WQt7WSU4=";
     };
 
@@ -70,4 +70,4 @@ rustPlatform.buildRustPackage.override
       platforms = lib.platforms.linux;
       mainProgram = "cosmic-randr";
     };
-  }
+  })

From 1b269226f081c09d5be0da0f8153728bc8deb4bb Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Mon, 3 Mar 2025 10:40:17 -0300
Subject: [PATCH 17/87] cosmic-launcher: replace `rec` with `finalAttrs`

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

diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index 6c9bfa4c8665..fba267328761 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage.override
   { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; }
-  rec {
+  (finalAttrs: {
     pname = "cosmic-launcher";
     version = "1.0.0-alpha.6";
 
     src = fetchFromGitHub {
       owner = "pop-os";
       repo = "cosmic-launcher";
-      tag = "epoch-${version}";
+      tag = "epoch-${finalAttrs.version}";
       hash = "sha256-BtYnL+qkM/aw+Air5yOKH098V+TQByM5mh1DX7v+v+s=";
     };
 
@@ -67,4 +67,4 @@ rustPlatform.buildRustPackage.override
       ];
       platforms = lib.platforms.linux;
     };
-  }
+  })

From 367239e256a9f77c2e97200475dd2f5586a4a4e1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 4 Mar 2025 19:45:05 +0100
Subject: [PATCH 18/87] fishMinimal: init at 4.0.0

This is a version of Fish without python. Reducing the size of the package from ~240MB to ~110MB.
---
 pkgs/by-name/fi/fishMinimal/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 pkgs/by-name/fi/fishMinimal/package.nix

diff --git a/pkgs/by-name/fi/fishMinimal/package.nix b/pkgs/by-name/fi/fishMinimal/package.nix
new file mode 100644
index 000000000000..38db86742512
--- /dev/null
+++ b/pkgs/by-name/fi/fishMinimal/package.nix
@@ -0,0 +1,7 @@
+{
+  fish,
+}:
+
+fish.override {
+  usePython = false;
+}

From 3770c96104d1e8f386b38a539adb66689443ce79 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 5 Mar 2025 22:35:51 +0100
Subject: [PATCH 19/87] nginxModules.modsecurity: v1.0.3 -> 0b4f0cf (unstable)

Update to get compatability to modsecurity 3.0.14.
---
 pkgs/servers/http/nginx/modules.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 2565cfc465e6..e2435f5864f1 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -432,10 +432,11 @@ let self = {
     name = "modsecurity";
     src = fetchFromGitHub {
       name = "modsecurity-nginx";
-      owner = "SpiderLabs";
+      owner = "owasp-modsecurity";
       repo = "ModSecurity-nginx";
-      rev = "v1.0.3";
-      sha256 = "sha256-xp0/eqi5PJlzb9NaUbNnzEqNcxDPyjyNwZOwmlv1+ag=";
+      # unstable 2025-02-17
+      rev = "0b4f0cf38502f34a30c8543039f345cfc075670d";
+      hash = "sha256-P3IwKFR4NbaMXYY+O9OHfZWzka4M/wr8sJpX94LzQTU=";
     };
 
     inputs = [ curl geoip libmodsecurity libxml2 lmdb yajl ];

From 63bd5d02357f207ce1d1a22ed79a4dee3e850b9b Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Thu, 6 Mar 2025 11:18:39 -0700
Subject: [PATCH 20/87] openal-soft: only enable alsa on Linux

This flag enables building a source file which uses linux-only errno
values.
---
 pkgs/development/libraries/openal-soft/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index a5d2f85e0dc2..9972d316a941 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -5,7 +5,7 @@
   cmake,
   pkg-config,
   removeReferencesTo,
-  alsaSupport ? !stdenv.hostPlatform.isDarwin,
+  alsaSupport ? stdenv.hostPlatform.isLinux,
   alsa-lib,
   dbusSupport ? !stdenv.hostPlatform.isDarwin,
   dbus,

From 732fe5d0fa1b62de0bbca08f9e2a9a25827f2172 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Thu, 6 Mar 2025 15:59:11 -0300
Subject: [PATCH 21/87] cosmic-term: refactor

---
 pkgs/by-name/co/cosmic-term/package.nix | 35 ++++++++++++-------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index 6c420ec15c02..6191dd292e86 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -1,30 +1,30 @@
 {
   lib,
-  cosmic-icons,
+  stdenv,
+  rustPlatform,
   fetchFromGitHub,
+  pkg-config,
+  just,
   fontconfig,
   freetype,
-  just,
   libglvnd,
   libinput,
   libxkbcommon,
   makeBinaryWrapper,
-  pkg-config,
-  rustPlatform,
-  stdenv,
   vulkan-loader,
   wayland,
+  cosmic-icons,
   xorg,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-term";
   version = "1.0.0-alpha.6";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-term";
-    rev = "epoch-${version}";
+    tag = "epoch-${finalAttrs.version}";
     hash = "sha256-sdeRkT6UcyBKIFnJZn3aGf8LZQimqVPqtXo7RtwUs5M=";
   };
 
@@ -33,12 +33,10 @@ rustPlatform.buildRustPackage rec {
 
   # COSMIC applications now uses vergen for the About page
   # Update the COMMIT_DATE to match when the commit was made
-  env.VERGEN_GIT_COMMIT_DATE = "2025-02-21";
-  env.VERGEN_GIT_SHA = src.rev;
-
-  postPatch = ''
-    substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
-  '';
+  env = {
+    VERGEN_GIT_COMMIT_DATE = "2025-02-21";
+    VERGEN_GIT_SHA = finalAttrs.src.tag;
+  };
 
   nativeBuildInputs = [
     just
@@ -58,6 +56,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   dontUseJustBuild = true;
+  dontUseJustCheck = true;
 
   justFlags = [
     "--set"
@@ -83,15 +82,15 @@ rustPlatform.buildRustPackage rec {
       --suffix XDG_DATA_DIRS : "${cosmic-icons}/share"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/pop-os/cosmic-term";
     description = "Terminal for the COSMIC Desktop Environment";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       ahoneybun
       nyabinary
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "cosmic-term";
   };
-}
+})

From ab6978130dd319b8dfa3bc36a143dd8ec8a94c92 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Thu, 6 Mar 2025 16:00:19 -0300
Subject: [PATCH 22/87] cosmic-term: use libcosmicAppHook

---
 pkgs/by-name/co/cosmic-term/package.nix | 30 ++-----------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index 6191dd292e86..18008e7a3012 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -5,16 +5,10 @@
   fetchFromGitHub,
   pkg-config,
   just,
+  libcosmicAppHook,
   fontconfig,
   freetype,
-  libglvnd,
   libinput,
-  libxkbcommon,
-  makeBinaryWrapper,
-  vulkan-loader,
-  wayland,
-  cosmic-icons,
-  xorg,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -41,18 +35,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     just
     pkg-config
-    makeBinaryWrapper
+    libcosmicAppHook
   ];
 
   buildInputs = [
     fontconfig
     freetype
-    libglvnd
     libinput
-    libxkbcommon
-    vulkan-loader
-    wayland
-    xorg.libX11
   ];
 
   dontUseJustBuild = true;
@@ -67,21 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-term"
   ];
 
-  # Force linking to libEGL, which is always dlopen()ed, and to
-  # libwayland-client, which is always dlopen()ed except by the
-  # obscure winit backend.
-  RUSTFLAGS = map (a: "-C link-arg=${a}") [
-    "-Wl,--push-state,--no-as-needed"
-    "-lEGL"
-    "-lwayland-client"
-    "-Wl,--pop-state"
-  ];
-
-  postInstall = ''
-    wrapProgram "$out/bin/cosmic-term" \
-      --suffix XDG_DATA_DIRS : "${cosmic-icons}/share"
-  '';
-
   meta = {
     homepage = "https://github.com/pop-os/cosmic-term";
     description = "Terminal for the COSMIC Desktop Environment";

From 528437b27bd425e023b451ad822463ebc05c53db Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Thu, 6 Mar 2025 16:01:58 -0300
Subject: [PATCH 23/87] cosmic-term: add updateScript

---
 pkgs/by-name/co/cosmic-term/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index 18008e7a3012..f39da322fdaa 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -9,6 +9,7 @@
   fontconfig,
   freetype,
   libinput,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -56,6 +57,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-term"
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version"
+      "unstable"
+      "--version-regex"
+      "epoch-(.*)"
+    ];
+  };
+
   meta = {
     homepage = "https://github.com/pop-os/cosmic-term";
     description = "Terminal for the COSMIC Desktop Environment";

From 554d5379aab6808086ad5c2311e735d3f4887609 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Thu, 6 Mar 2025 16:02:10 -0300
Subject: [PATCH 24/87] cosmic-term: add HeitorAugustoLN as a maintainer

---
 pkgs/by-name/co/cosmic-term/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index f39da322fdaa..f8efd682d3a4 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -73,6 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       ahoneybun
       nyabinary
+      HeitorAugustoLN
     ];
     platforms = lib.platforms.linux;
     mainProgram = "cosmic-term";

From ba8de40b213387e98eea3aee9187b4cb9f2d6ca1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Mar 2025 01:16:46 +0100
Subject: [PATCH 25/87] python312Packages.orbax-checkpoint: 0.11.6 -> 0.11.8

Diff:
https://github.com/google/orbax/compare/refs/tags/v0.11.6...v0.11.8

Changelog:
https://github.com/google/orbax/blob/v0.11.8/checkpoint/CHANGELOG.md
---
 .../python-modules/orbax-checkpoint/default.nix           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix
index c6b55e5c1b86..a89d762a8ee8 100644
--- a/pkgs/development/python-modules/orbax-checkpoint/default.nix
+++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix
@@ -34,20 +34,24 @@
 
 buildPythonPackage rec {
   pname = "orbax-checkpoint";
-  version = "0.11.6";
+  version = "0.11.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "orbax";
     tag = "v${version}";
-    hash = "sha256-2bnm9D+ywhploTmtZ+frwf8VuTjczBVN+wqcfe3x77I=";
+    hash = "sha256-h7SXuOhytM9ev0Q53z0UoT9/ShPVlqgFofn7j8gnehM=";
   };
 
   sourceRoot = "${src.name}/checkpoint";
 
   build-system = [ flit-core ];
 
+  pythonRelaxDeps = [
+    "jax"
+  ];
+
   dependencies = [
     absl-py
     etils

From 4ef6c11de597a14ce609be62b1d99f21d38a0888 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Mar 2025 05:39:42 +0000
Subject: [PATCH 26/87] opshin: 0.24.0 -> 0.24.1

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

diff --git a/pkgs/by-name/op/opshin/package.nix b/pkgs/by-name/op/opshin/package.nix
index 242c9044439c..73f663a60815 100644
--- a/pkgs/by-name/op/opshin/package.nix
+++ b/pkgs/by-name/op/opshin/package.nix
@@ -6,7 +6,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "opshin";
-  version = "0.24.0";
+  version = "0.24.1";
 
   format = "pyproject";
 
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "OpShin";
     repo = "opshin";
     tag = version;
-    hash = "sha256-5IzPxzNvH9nlOYBCbc8kC7yzf8L8LPA5Wq9agqg9kng=";
+    hash = "sha256-+uuTEszA5p/qhvthM3Uje6yX3urbIUAKKfDZ4JXEYYQ=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 7b58756c0386b786a4c3906ca6ffca68406fc18d Mon Sep 17 00:00:00 2001
From: Alex Epelde <alex@epelde.net>
Date: Sat, 8 Mar 2025 22:23:23 -0500
Subject: [PATCH 27/87] sage: higher quality notebook icon

Icon found [here](https://github.com/sagemath/sage/blob/master/src/sage/ext_data/notebook-ipython/logo-64x64.png).
---
 pkgs/by-name/sa/sage/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sa/sage/package.nix b/pkgs/by-name/sa/sage/package.nix
index b8888c50e8af..0244119055cd 100644
--- a/pkgs/by-name/sa/sage/package.nix
+++ b/pkgs/by-name/sa/sage/package.nix
@@ -47,9 +47,8 @@ let
       "{connection_file}"
     ];
     language = "sage";
-    # just one 16x16 logo is available
-    logo32 = "${sage-src}/src/doc/common/static/sageicon.png";
-    logo64 = "${sage-src}/src/doc/common/static/sageicon.png";
+    logo32 = "${sage-src}/src/sage/ext_data/notebook-ipython/logo-64x64.png";
+    logo64 = "${sage-src}/src/sage/ext_data/notebook-ipython/logo-64x64.png";
   };
 
   jupyter-kernel-specs = pkgs.jupyter-kernel.create {

From 714a275df27ed48abe0e50ed60ba578e73829f59 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 9 Mar 2025 04:19:44 +0100
Subject: [PATCH 28/87] python313Packages.configshell: fix build

---
 .../python-modules/configshell/default.nix     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix
index ff65269cb932..df0a5aa19170 100644
--- a/pkgs/development/python-modules/configshell/default.nix
+++ b/pkgs/development/python-modules/configshell/default.nix
@@ -2,15 +2,18 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
+  pythonOlder,
+  hatchling,
+  hatch-vcs,
   pyparsing,
-  six,
-  urwid,
 }:
 
 buildPythonPackage rec {
   pname = "configshell";
   version = "2.0.0";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "open-iscsi";
@@ -19,10 +22,13 @@ buildPythonPackage rec {
     hash = "sha256-lP3WT9ASEj6WiCrurSU/e9FhIaeoQW/n9hi1XZMnV4Q=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
+
+  dependencies = [
     pyparsing
-    six
-    urwid
   ];
 
   # Module has no tests

From d60aee932d45f2fb239cc75c64d371ffd6b151c5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 9 Mar 2025 04:42:00 +0100
Subject: [PATCH 29/87] pdb2pqr: fix build

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

diff --git a/pkgs/development/python-modules/pdb2pqr/default.nix b/pkgs/development/python-modules/pdb2pqr/default.nix
index bc86b70cacfe..9d3065934ab0 100644
--- a/pkgs/development/python-modules/pdb2pqr/default.nix
+++ b/pkgs/development/python-modules/pdb2pqr/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   pythonOlder,
+  hatchling,
   mmcif-pdbx,
   numpy,
   propka,
@@ -16,7 +17,7 @@
 buildPythonPackage rec {
   pname = "pdb2pqr";
   version = "3.7.1";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -27,6 +28,10 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [ "docutils" ];
 
+  build-system = [
+    hatchling
+  ];
+
   propagatedBuildInputs = [
     mmcif-pdbx
     numpy

From ba0d99eb543301c625e3950281506f3ffd9076cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Mar 2025 18:48:45 +0000
Subject: [PATCH 30/87] repomix: 0.2.29 -> 0.2.36

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

diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix
index 1db0b8b640b5..056c48868623 100644
--- a/pkgs/by-name/re/repomix/package.nix
+++ b/pkgs/by-name/re/repomix/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "repomix";
-  version = "0.2.29";
+  version = "0.2.36";
 
   src = fetchFromGitHub {
     owner = "yamadashy";
     repo = "repomix";
     tag = "v${version}";
-    hash = "sha256-AOqGmI5hnDA18/+uFGQwVKdLniOvGMEBKHTZJa5gE2w=";
+    hash = "sha256-utuCtkDp+3411FTqKxpXdE0XAMsVT0dwpcMAdJ2pAB0=";
   };
 
-  npmDepsHash = "sha256-R/NTlU5ljwmoGHB/5wPADkGx8xjfF4d2bPWWkAr+VOk=";
+  npmDepsHash = "sha256-jKAHFxxRheMw8pcYfOurL7L5TFaNIQjoxpJsPysuKYI=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From f3264426448176d6eba7b10d35033167b50a29f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Mar 2025 20:30:29 +0000
Subject: [PATCH 31/87] python312Packages.ultralytics: 8.3.85 -> 8.3.86

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

diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix
index ba94ae528ac3..6b4067fa1f2c 100644
--- a/pkgs/development/python-modules/ultralytics/default.nix
+++ b/pkgs/development/python-modules/ultralytics/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "ultralytics";
-  version = "8.3.85";
+  version = "8.3.86";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ultralytics";
     repo = "ultralytics";
     tag = "v${version}";
-    hash = "sha256-4EiTiy4SNinNwIUvqbckaA/5YRcv6io8ssTAhwDVgsM=";
+    hash = "sha256-9z6f/48jQVCR744ojNH+T22+JDg31+WEKWi48k5/GoY=";
   };
 
   postPatch = ''
@@ -100,7 +100,7 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://github.com/ultralytics/ultralytics";
-    changelog = "https://github.com/ultralytics/ultralytics/releases/tag/v${version}";
+    changelog = "https://github.com/ultralytics/ultralytics/releases/tag/${src.tag}";
     description = "Train YOLO models for computer vision tasks";
     mainProgram = "yolo";
     license = lib.licenses.agpl3Only;

From 66ae588fe26946fd838b977c9f4f0ed50b8b9385 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 9 Mar 2025 22:11:45 +0100
Subject: [PATCH 32/87] python313Packages.python-roborock: 2.12.0 -> 2.12.1

Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v2.12.0...v2.12.1

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

diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index 7955fec5dcd5..4761fc15c20f 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "python-roborock";
-  version = "2.12.0";
+  version = "2.12.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "humbertogontijo";
     repo = "python-roborock";
     tag = "v${version}";
-    hash = "sha256-hJzmAvIKb1rLwGo5uYiRWYspH4d3uTdoF7k+emlCAec=";
+    hash = "sha256-oUsnjvrPq4VcYwafZqzZkA2I9Hs75j03nOcIIO7abpk=";
   };
 
   postPatch = ''

From cb3ca5c11786d0dcb8dfba6be3984ee9a0a0f603 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 9 Mar 2025 17:37:32 -0400
Subject: [PATCH 33/87] ccache: 4.10.2 -> 4.11

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

diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix
index 1143798f411e..655f769c0c41 100644
--- a/pkgs/by-name/cc/ccache/package.nix
+++ b/pkgs/by-name/cc/ccache/package.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ccache";
-  version = "4.10.2";
+  version = "4.11";
 
   src = fetchFromGitHub {
     owner = "ccache";
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
         exit 1
       fi
     '';
-    hash = "sha256-j7Cjr5R/fN/1C6hR9400Y/hwgG++qjPvo9PYyetzrx0=";
+    hash = "sha256-hMQ+4/5kk+QRHtMEbIk4TIWaSyYXVdXrOMKCkglNe6g=";
   };
 
   outputs = [

From fffcb82221b67b975caa0b076bbae7a5e396cca4 Mon Sep 17 00:00:00 2001
From: Patrick Brogan <pbrogan12@gmail.com>
Date: Sun, 9 Mar 2025 19:04:59 -0400
Subject: [PATCH 34/87] snowsql: 1.3.0 -> 1.3.3

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

diff --git a/pkgs/by-name/sn/snowsql/package.nix b/pkgs/by-name/sn/snowsql/package.nix
index ac72739b7cd6..46a84bacf27c 100644
--- a/pkgs/by-name/sn/snowsql/package.nix
+++ b/pkgs/by-name/sn/snowsql/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "snowsql";
-  version = "1.3.0";
+  version = "1.3.3";
 
   src = fetchurl {
     url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${lib.versions.majorMinor version}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm";
-    sha256 = "sha256-KKCCj+pIwWhuzOuxljQ8Y11mAwD/GONspbXuPAMBdhE=";
+    sha256 = "sha256-BedOcd3ZllzMSZ6hjs1BG0o9TEg3aJKtLzutOE3nI1s=";
   };
 
   nativeBuildInputs = [

From 75503e8b9e112985467fea3e47fa845fe289d371 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 9 Mar 2025 19:56:12 -0400
Subject: [PATCH 35/87] chirp: 0.4.0-unstable-2025-03-05 ->
 0.4.0-unstable-2025-03-07

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ch/chirp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index 53c18f846388..ca0d27a1adaa 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2025-03-05";
+  version = "0.4.0-unstable-2025-03-07";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "3e663d36f96aef03a58cab81d32122ca14a59343";
-    hash = "sha256-ODb+Q1Q+7XF/mX1GY2qItY4OOigguTFF+53vnaO5Ap0=";
+    rev = "7ba82c4faca496cf1370554a3485c1573b6a38a0";
+    hash = "sha256-UhQF6yfykraz5DblyW8cSP/XY+j/uxJtUVDpgdWlHZU=";
   };
 
   nativeBuildInputs = [

From aeb5f219e196f7871cffb0ef68ea72f97d87a5ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 00:46:32 +0000
Subject: [PATCH 36/87] ttdl: 4.9.0 -> 4.10.0

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

diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix
index 3ee92e70b69b..4d577365b809 100644
--- a/pkgs/by-name/tt/ttdl/package.nix
+++ b/pkgs/by-name/tt/ttdl/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ttdl";
-  version = "4.9.0";
+  version = "4.10.0";
 
   src = fetchFromGitHub {
     owner = "VladimirMarkelov";
     repo = "ttdl";
     rev = "v${version}";
-    sha256 = "sha256-qFOZj214iw/d1wvWz8wwIFB2kaDSPH80blDkohQxSro=";
+    sha256 = "sha256-cCz2wxYvYAoI+Hmyll+Fn56NUCuWlIiJycmYvGyhkR4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-gdFLT04pNedU30/Qw2OiXpdLL+6cC6ryUoeZLKu/myQ=";
+  cargoHash = "sha256-207Tmfs3LrZkwsAF/9qD5PN/zHwzCf0lq+87bFIP7y8=";
 
   meta = with lib; {
     description = "CLI tool to manage todo lists in todo.txt format";

From 3f9728fc7e2ef1389ada7cb1b0d646cce14f1314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 9 Mar 2025 17:53:12 -0700
Subject: [PATCH 37/87] libdeltachat: 1.156.2 -> 1.156.3

Diff: https://github.com/chatmail/core/compare/refs/tags/v1.156.2...v1.156.3

Changelog: https://github.com/chatmail/core/blob/v1.156.3/CHANGELOG.md
---
 pkgs/by-name/li/libdeltachat/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index a5e2d1fd181f..14dafa95bdc2 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.156.2";
+  version = "1.156.3";
 
   src = fetchFromGitHub {
-    owner = "deltachat";
-    repo = "deltachat-core-rust";
+    owner = "chatmail";
+    repo = "core";
     tag = "v${version}";
-    hash = "sha256-CpFnO8stLLTH/XOZZS3j9nVrf2FRekjkQ/R1pmw5o9A=";
+    hash = "sha256-FJTHG1NUdKcYTPrBkhu4ZiodSwpNgaGUHiHBSk/lUVA=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "deltachat-core-rust";
     inherit version src;
-    hash = "sha256-jrsGMNgKglk+Rq/ZGiZgSZrT4uSA5RjbTYaDtW0Ijyg=";
+    hash = "sha256-Kh0TU6lJ7spZIOUyJabFd1icqN9jU+kG+BpADAi0nRo=";
   };
 
   nativeBuildInputs = [
@@ -86,8 +86,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Delta Chat Rust Core library";
-    homepage = "https://github.com/deltachat/deltachat-core-rust/";
-    changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.tag}/CHANGELOG.md";
+    homepage = "https://github.com/chatmail/core";
+    changelog = "https://github.com/chatmail/core/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mpl20;
     maintainers = with maintainers; [ dotlambda ];
     platforms = platforms.unix;

From 2f8e4c9d3d8e8b6f90c67cb797e7ea7994c0f9a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 01:07:59 +0000
Subject: [PATCH 38/87] cargo-deb: 2.11.2 -> 2.11.3

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

diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix
index 127b85d0d5a1..4052f0b19c2f 100644
--- a/pkgs/by-name/ca/cargo-deb/package.nix
+++ b/pkgs/by-name/ca/cargo-deb/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-deb";
-  version = "2.11.2";
+  version = "2.11.3";
 
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-I8b14fB/m5fYPLIpXnhYGsLaKXs7F9NW2mjHxng6AHU=";
+    hash = "sha256-QDx7ZP/5z1YgD3RzLmwDE3KLY+5nMncYy97aveFH03w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-o9VN1D3OoqochtpNApE5N+g7xw/QOTbzwSKVPwzzDow=";
+  cargoHash = "sha256-ZN0TAQzt7LrHxoM4qAuMUm5Goaq1BuNBmd4kDGjiK4Q=";
 
   nativeBuildInputs = [
     makeWrapper

From 2a04f2c06754eb379dc93a2f983ee0ac3c244611 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 01:36:53 +0000
Subject: [PATCH 39/87] doctl: 1.122.0 -> 1.123.0

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

diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix
index 0766a1cf5aad..35ab7c4e3f3e 100644
--- a/pkgs/by-name/do/doctl/package.nix
+++ b/pkgs/by-name/do/doctl/package.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.122.0";
+  version = "1.123.0";
 
   vendorHash = null;
 
@@ -31,7 +31,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     rev = "v${version}";
-    sha256 = "sha256-l5UfvMTexoGhX2CWBZlO1ibM+cULdhRdZ7UeH0jgC7E=";
+    sha256 = "sha256-B7xUo59qyftjZj2ywJROaWYPkfelqPSkY3YqR2y+/jw=";
   };
 
   meta = with lib; {

From 0a233ea99d76574c48b40c6ac33f9a15a3432ccf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 01:53:56 +0000
Subject: [PATCH 40/87] oxigraph: 0.4.8 -> 0.4.9

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

diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix
index de17fe6bea77..85d05d00c24b 100644
--- a/pkgs/servers/oxigraph/default.nix
+++ b/pkgs/servers/oxigraph/default.nix
@@ -9,18 +9,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oxigraph";
-  version = "0.4.8";
+  version = "0.4.9";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-yMXNt7pGiwYDXjmHxKUQpqNrAmnFpg21Vc5R1DmwsHc=";
+    hash = "sha256-sv9LpAoPQ4oFrGI6j6NgVZwEwpM1wt93lHkUwnvmhIY=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-qOGpM3SOAOMO5W3wj4ruXlymp9bV4sqOU75gMVSEyfk=";
+  cargoHash = "sha256-nVlvmYOxZDMLvxP8JaKTyKMgW6+48B8B+UzlwgthJS0=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From 8502d4078d71aae93b6a2d357c962cdc75c7d75c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 04:43:14 +0000
Subject: [PATCH 41/87] inputplumber: 0.48.0 -> 0.49.2

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

diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix
index d7412cc5d7a1..d694b04af7b1 100644
--- a/pkgs/by-name/in/inputplumber/package.nix
+++ b/pkgs/by-name/in/inputplumber/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "inputplumber";
-  version = "0.48.0";
+  version = "0.49.2";
 
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "InputPlumber";
     tag = "v${version}";
-    hash = "sha256-9/4+gNuG02uoXDflRh3q5T+hqAKu/j+1FQnXVJVTpiI=";
+    hash = "sha256-vWqmcVF/gi0ubIF/NDnz0op1ss0t7A7O8NrOzszx7Gw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-cRSY9a5qOvYrdvNSDoDjgrIo+SRlD24oAWriudbKS1E=";
+  cargoHash = "sha256-5yG8iUW5BVHI2QcOl+9dN1c1b/wmrFCO4mDs4ZflhUM=";
 
   nativeBuildInputs = [
     pkg-config

From 50837d1a2b17bc0f882e8286f03c82ae0dce9274 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 06:47:02 +0000
Subject: [PATCH 42/87] cargo-update: 16.1.0 -> 16.2.0

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

diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix
index 5b389029c897..159fc0b0ca04 100644
--- a/pkgs/by-name/ca/cargo-update/package.nix
+++ b/pkgs/by-name/ca/cargo-update/package.nix
@@ -17,15 +17,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-update";
-  version = "16.1.0";
+  version = "16.2.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-bdIFenNMW5iDQaKS2+lMYVVfc0zpbYNOHQqczpjBNC4=";
+    hash = "sha256-dO8A4XAFms31hWVpZelMnDmn0sPpCh4S4byEVRYjOTI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-KujJB9o5+yHu6mEQOvzGUcBS6/fh/jcnt7/FbUPLefg=";
+  cargoHash = "sha256-DxY03sqr/upJbNm8EkoIN96SOhZr1jm/6dgtKwyDFEU=";
 
   nativeBuildInputs =
     [

From 8b3db53479768f1ab2d59905d81a010bd41414d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 07:26:55 +0000
Subject: [PATCH 43/87] esbuild: 0.25.0 -> 0.25.1

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

diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix
index 4357668e4ec3..15fd950d5206 100644
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "esbuild";
-  version = "0.25.0";
+  version = "0.25.1";
 
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
     rev = "v${version}";
-    hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA=";
+    hash = "sha256-vrhtdrvrcC3dQoJM6hWq6wrGJLSiVww/CNPlL1N5kQ8=";
   };
 
   vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

From 080c810d275aac08ec33f22ac6072d1670c80d63 Mon Sep 17 00:00:00 2001
From: Arsenii Zorin <me@wrb.bz>
Date: Mon, 10 Mar 2025 11:14:04 +0300
Subject: [PATCH 44/87] pulumi-bin: 3.153.0 -> 3.154.0

---
 pkgs/tools/admin/pulumi-bin/data.nix | 194 +++++++++++++--------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
index eed9bfe1d836..2b15d9ae64a5 100644
--- a/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,48 +1,48 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.153.1";
+  version = "3.154.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.153.1-linux-x64.tar.gz";
-        sha256 = "01bppw8yik697x5mwh1pjd8wpi80qzkbbsdp4lyjrsi3514d6nji";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.154.0-linux-x64.tar.gz";
+        sha256 = "1vjz37qq7q2iyxz9c482rhcdljlsxl1y1mw8mqp50zlrc785n8rr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.35.0-linux-amd64.tar.gz";
         sha256 = "0m25l1iai6ja6n79jb1zzvmz1d087hy1ddhisb8r53nv8awdjz5b";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-linux-amd64.tar.gz";
-        sha256 = "0k5mg57257v9h8njlx943fgrxbvszcqi9bhk41kna8j2claqdzdb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.0.0-linux-amd64.tar.gz";
+        sha256 = "1xbwvb15zgxf0vvrpdp5p0jk09kzz3f1hn15k0b3bqjal7dp51qz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.74.0-linux-amd64.tar.gz";
-        sha256 = "0jg062yhp0nx2lhixs3r7lvjzg0q5h3v1f8pvsp04y8hixq7jip8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.75.0-linux-amd64.tar.gz";
+        sha256 = "0mfr4yj59b2l8bch0dbbmznd3b2rwvsjvp2jyzlq6jpb1sfyj3cr";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.3-linux-amd64.tar.gz";
-        sha256 = "1cn2ii8ryh46axdvnzksx5zlnd59y1bd9janid8g0pvdz9rxgvdq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.0-linux-amd64.tar.gz";
+        sha256 = "1kyljbg6lkc9mr6j493rjk5mnrh3ldgc8qjxmn8y3nzbc2xmcs65";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-linux-amd64.tar.gz";
         sha256 = "06kazf5r3r3cdr2cxk2afj1wjmjj0kda038j9vdpfirzpjyy47l3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.70.0-linux-amd64.tar.gz";
-        sha256 = "0cza17gkr0jd8y4rr17819n6g246jc7mlg675s0sz2dcqvkh5c6j";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.71.0-linux-amd64.tar.gz";
+        sha256 = "0flwsaw3ack9sq99vbpg4k7dyh541ygvjgj0f7a9nm7j728sz9s2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-linux-amd64.tar.gz";
         sha256 = "1fa45kzn755md2m98c8305hwqq7w414cvnbllvvdvqji2qmikh2d";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.6.0-linux-amd64.tar.gz";
-        sha256 = "0h3zym30gj8lyj294zj3dimdl2wdir2vmymvv6wr392f9i22m2yn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.7.0-linux-amd64.tar.gz";
+        sha256 = "0c2rzijzfkb3kw4r4yi4hwaqmnxcz0smb0lxyqs05xzgijf74jgx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.20.0-linux-amd64.tar.gz";
-        sha256 = "1dbgwhx1ba92wh9478b24lf3c0w3d2v1q6z7dniyccjimfgdwd29";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.21.0-linux-amd64.tar.gz";
+        sha256 = "18f8fap5zjrjqzmblxgpwffkqj82bhj3pl6vrmj7nlmj4q2r4i88";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.1-linux-amd64.tar.gz";
@@ -73,8 +73,8 @@
         sha256 = "191j823pngyicvgvkjfik9n0nsws2zsqqzykzsad74w59i9cr90c";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.20.0-linux-amd64.tar.gz";
-        sha256 = "0lfa7kz3vc7hamsl270xijs7szhbdm09hmll6593q6x9wgmaadal";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.21.0-linux-amd64.tar.gz";
+        sha256 = "1sql8napyydhf35vi4i36qf013g9ibmkr8qcd3c0vx1hslwi89hl";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-linux-amd64.tar.gz";
@@ -121,16 +121,16 @@
         sha256 = "16scgz83rih511isyq7ycnm4gm94zvf6hgd86kic5s1q20lf86k9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-linux-amd64.tar.gz";
-        sha256 = "147dmg9gv8b3pifmqwjz9skvidryb8wkayvghdd6pziyqncbqwzb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.3-linux-amd64.tar.gz";
+        sha256 = "1ikw64y55dzhdc49mq3qy4gq2zfbvv3551295mygrz11zrjrmfzp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.111.0-linux-amd64.tar.gz";
-        sha256 = "0g4zbmn21ii3r75qb18xz4dhafyxzvfh1qmndx49p0mlqyrly950";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.112.0-linux-amd64.tar.gz";
+        sha256 = "0l6s3pf2nqn4kh8px97c8qvycqm3bhgrnx0wzrsm7f1cfnpd0ss1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-linux-amd64.tar.gz";
-        sha256 = "0z0wggfg9s0x8wlvymsl030bby4id5rjhb3na0rmsjg3fjh71bsf";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.5-linux-amd64.tar.gz";
+        sha256 = "02k9w2f9pvxhw6jsl4g7v7ppgcx4ixd855a2h1dgkallfc7ja63b";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.18.0-linux-amd64.tar.gz";
@@ -153,8 +153,8 @@
         sha256 = "0h5pca5kgyjwdj9m8fd0wmygxhvjm6r5wss00wprad383mwp3s7v";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-linux-amd64.tar.gz";
-        sha256 = "01y7h7k99wz1zh47qhmnzcn74b37lxngimff56rj6dhrd0ngir6k";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.8-linux-amd64.tar.gz";
+        sha256 = "0bj4lc7g74vlsv4rqqj9ymbpbc3fdxn483wp1m6y838b3kd69hns";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz";
@@ -163,44 +163,44 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.153.1-darwin-x64.tar.gz";
-        sha256 = "1nzapprv3c0p3xx4fa1lssxl3fcd0hmbnmn9pnrcll1y2nsvaahb";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.154.0-darwin-x64.tar.gz";
+        sha256 = "1l1n5w2b2n1vbrri2vj5wq9g97kka35qrwpz7h9bzb44gpiprjjx";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.35.0-darwin-amd64.tar.gz";
         sha256 = "1rj4fn0m182c6laihgx3h92zyqw77qajxygv3k8md4f0b4wvnd7q";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-darwin-amd64.tar.gz";
-        sha256 = "0nczhgib7hcyh7midm0s5b8zbi76lkyfz76c3lmkqnr0kj5nzb5y";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.0.0-darwin-amd64.tar.gz";
+        sha256 = "1vrywndkhhr3k2ckpy7rxm910mq70ks1r36dnfa10pb53hhl1ngp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.74.0-darwin-amd64.tar.gz";
-        sha256 = "1mm51klxsqsgdz53m7zfbw3fh5vwwn1l1rxzwd1hjhm3giasqfv9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.75.0-darwin-amd64.tar.gz";
+        sha256 = "18y8vr13dcpwg9mdwfn2mh5bww782wx7j8wxvv8j0xnv6ikwgaxm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.3-darwin-amd64.tar.gz";
-        sha256 = "19a5sfg2j74ji73cszsqak4gdyk1x7l7p0rpss8j5xnwbyw1y0nf";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.0-darwin-amd64.tar.gz";
+        sha256 = "10zkqc02lpf9k0brykyngsasi189w167f6v24cp8sl1agbdcqb9f";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-darwin-amd64.tar.gz";
         sha256 = "1yclkdpmm8y92wbyhb87h3vdhcibhcvfppv1nvwhqd3bbx3zk1rb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.70.0-darwin-amd64.tar.gz";
-        sha256 = "07r7a28qgn1m8g7sk6x66r01m9yvpccxwkqsic3x6rz7rar8aifq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.71.0-darwin-amd64.tar.gz";
+        sha256 = "09zrx8xxmp3nfj0vaznn4k2q24r6hjv5z1ip0vxa2jx2m2j3jd9c";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-darwin-amd64.tar.gz";
         sha256 = "0znbyyh84ygbscm7db10bbzhma23kxy8aqpcnf5hd0l1fvphyw4h";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.6.0-darwin-amd64.tar.gz";
-        sha256 = "1j952sjqhp42a1s8fxn5li8mjfvl9as3ydhwdpslx8pzc8ykr2zj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.7.0-darwin-amd64.tar.gz";
+        sha256 = "05fabrw15x9rsyib1lxvwd78kcy241hfqdbqgpilf83isavf6s8y";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.20.0-darwin-amd64.tar.gz";
-        sha256 = "01ry0xj3hghqcp0jp5jfmxnkgk1cf9nz356glma21dsfv5c9h2gc";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.21.0-darwin-amd64.tar.gz";
+        sha256 = "1kzx16rv67ck7pnlyrmq7407bq41agfwxn7c70l0wsnp5y2l6zwj";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.1-darwin-amd64.tar.gz";
@@ -231,8 +231,8 @@
         sha256 = "0qqzfdibgwzgnv79as3l6k8hh4nviq2i0xsgzsvjkklzf2szyh8k";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.20.0-darwin-amd64.tar.gz";
-        sha256 = "1vnv7njpcf7x2vmjhrrpqgjn82wkbq1rr32yankzbrfyzkpsmwck";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.21.0-darwin-amd64.tar.gz";
+        sha256 = "00qmmnwc2i9n7r415bmjzb66wr9ragvkydgs8njjz7hsfz97girg";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-darwin-amd64.tar.gz";
@@ -279,16 +279,16 @@
         sha256 = "0gkazxwkmb5317amaqb3h34ras7b2vxblaybz2llp47w4qnvq834";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-darwin-amd64.tar.gz";
-        sha256 = "02mq6mnjbfkhwfm9fsgixw8imnxyrgl3zjh2v7z6la0qn888k9yi";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.3-darwin-amd64.tar.gz";
+        sha256 = "1ahmp1za19qf6gg2nmgqxqr0xg24pavx9q8gf917gmmj4gx4b2ws";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.111.0-darwin-amd64.tar.gz";
-        sha256 = "1q40y7d7mrr94afwbbyh8zi2liz37zz491ff82lxf31h2nbrcacv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.112.0-darwin-amd64.tar.gz";
+        sha256 = "1fxgshs66kqiyw50b347bzzx67mzhmmzr3qfn0nj3yfhsnb1bbky";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-darwin-amd64.tar.gz";
-        sha256 = "1rc717psnir7hpl9az29z232zgkp2dnzfjsph6v3lm44qd0yw9dq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.5-darwin-amd64.tar.gz";
+        sha256 = "1ijy38aqk6mkzh5bkdd7d10ips77rqk10dic6sdx79hfay16i4g7";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.18.0-darwin-amd64.tar.gz";
@@ -311,8 +311,8 @@
         sha256 = "1risgn050qs9yb0r7wx9z1xfw4ai50b5f6fzqchmaw4wpqj83j4h";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-darwin-amd64.tar.gz";
-        sha256 = "1vpg87kw3i9zqk0x73l6xg0i6k9vyqilwsppz1kjg2jg91hm9aww";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.8-darwin-amd64.tar.gz";
+        sha256 = "1hrkfl5nqazcf7k6aazi4n8p1d2965ffqfl9wgv6cmzpabwbmc01";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz";
@@ -321,44 +321,44 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.153.1-linux-arm64.tar.gz";
-        sha256 = "18lq4gzc4hk8yxs5s4fxqixxh4dywak3rhri0pqpc9hidiqccwgs";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.154.0-linux-arm64.tar.gz";
+        sha256 = "16324963a5laa2lvv75gvh9pb0mpvg1y0m7rr4c6cppi7iachv3f";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.35.0-linux-arm64.tar.gz";
         sha256 = "0jb91frd5y0bqbps1yqjqvdcdjs5xnyycs1iil5hrlr3c5gzmbhk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-linux-arm64.tar.gz";
-        sha256 = "054pcilsi1qfnf2him7hb0nw9r1w7q47c60ska3cmw27q1xjvjsk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.0.0-linux-arm64.tar.gz";
+        sha256 = "1166ih4sk9ya1m0sdvhvh8xhzmx8dpmzfg8l8jfn2i2af4w1iij2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.74.0-linux-arm64.tar.gz";
-        sha256 = "1ihf580aad9cz95211jxk7l4mvwnxhlvdmxlr70h4drjp377y59h";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.75.0-linux-arm64.tar.gz";
+        sha256 = "17vzdi28awlplgmyv6zsb5ccya8yqii3j6wz742wd47w666lkbq9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.3-linux-arm64.tar.gz";
-        sha256 = "0n2kiqcqpkqiapzvh1a5cz1sv0431k4c0s62wczbynyj8f838ywk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.0-linux-arm64.tar.gz";
+        sha256 = "0a07fhkjivn8r2qfc4ads89a6s9fh3dm0n49iwj8j6zfnbwl2kdz";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-linux-arm64.tar.gz";
         sha256 = "0xpfjwdhapyfc1562pxbvgmcmljvvsxdiymrwvcfhn08sdgpmas2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.70.0-linux-arm64.tar.gz";
-        sha256 = "1vcin5gkwv79xq5zrixqgipzyca7rdvq5rlfv9iwxmyh8dwa2kyl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.71.0-linux-arm64.tar.gz";
+        sha256 = "1xxa6xxhrf4wvwv27v48mm5hw1i62m6r3chif8c8ql0cv32n2m4w";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-linux-arm64.tar.gz";
         sha256 = "0n53hh16ggv1cmj21hy0hqn92lvfnqdan57l0a7lqwx5r433mlrg";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.6.0-linux-arm64.tar.gz";
-        sha256 = "1d4a5xyx55mscqq4wqgvilfagk8mg49xnhwp5vx1i274kgdq7a7z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.7.0-linux-arm64.tar.gz";
+        sha256 = "0fyhx0zvibb5msgiw0k8f8n9a957n6lbpkpg9kbp5ylhsjafi5ry";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.20.0-linux-arm64.tar.gz";
-        sha256 = "00mhcz8lyjlgxwan69br5bq1bvzglcnclwmpplcrzpwsqiwbgwss";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.21.0-linux-arm64.tar.gz";
+        sha256 = "1nipp4f4q61fwnr4wh99hc9an5qb572rfj0kbjw5pn9fhgy86nc4";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.1-linux-arm64.tar.gz";
@@ -389,8 +389,8 @@
         sha256 = "1dyg5k7giny2d26yw222kahdnbfwmhr8d1nkrn3i1ycqsb1g573j";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.20.0-linux-arm64.tar.gz";
-        sha256 = "1vkdjyywikqkw1capz6ky3ggdqmiwaz9gxr0mx5g8sbd4vzssx0l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.21.0-linux-arm64.tar.gz";
+        sha256 = "1pzzlvh8bd4pillyb0mr6ba458fjqh3ab310wvih559gzg4fz85j";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-linux-arm64.tar.gz";
@@ -437,16 +437,16 @@
         sha256 = "14y4jwzlxq0icjw7b3drfgv0kg2a9xl691r59388k9d193yh31n3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-linux-arm64.tar.gz";
-        sha256 = "1qghb1kj1flr36hcpk2r85ly833hm3z80lvwdw8rh2gz8ch6wi21";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.3-linux-arm64.tar.gz";
+        sha256 = "1p7aahp9zfk5qhiw2h6wf11is4xnz6j7f1dcm69xli8x0wjib9kc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.111.0-linux-arm64.tar.gz";
-        sha256 = "0xc8bv6qj8g7cqhpi37gm4f2hcdzpr3j4pnrh4hxxvxhcsfy6ywc";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.112.0-linux-arm64.tar.gz";
+        sha256 = "081pvgl2sshdjzn3rgal955crcf9pald3qn35bqw6xrzz7a3sv6r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-linux-arm64.tar.gz";
-        sha256 = "0f1zpcn0b0hd2kb1adigqp5zd2k7glxdav785yrg7zhq3gccmklw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.5-linux-arm64.tar.gz";
+        sha256 = "0i211g9bq48nhrglqmz8410qp5yby33b3mbkvasarywii6mic2q5";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.18.0-linux-arm64.tar.gz";
@@ -469,8 +469,8 @@
         sha256 = "1wkcrvyw9r0j4vy3nmgsypzak8ld2750rc3cd88m0q9qi22vi6hm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-linux-arm64.tar.gz";
-        sha256 = "1haa6syws9744zjwgvh5p6lq15xpb1ha7zqga8giig13wligcxvv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.8-linux-arm64.tar.gz";
+        sha256 = "0pwxqlgsxn0fpq21p4rk7lsb2rlvig2paszwpvyzpfpzksn66mvm";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz";
@@ -479,44 +479,44 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.153.1-darwin-arm64.tar.gz";
-        sha256 = "0bhwdkvqzsvl898ndhfs20affrnidkblcpibpzncsha1cycl3jnl";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.154.0-darwin-arm64.tar.gz";
+        sha256 = "07vpsiqr23sd9xiib35zwxnm3axadg2cvkdmkygvvhk0rzdb7zzl";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.35.0-darwin-arm64.tar.gz";
         sha256 = "1lbv0bd6kz0d50306b9y27xllf2lmmwnj5fz15p36p1dawz029r1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-darwin-arm64.tar.gz";
-        sha256 = "1x3jajip18dhs39bpi3yyj3mcwcyyxd4ijnsbq71a98cws55iipq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.0.0-darwin-arm64.tar.gz";
+        sha256 = "0spsr6asi7vhml7fwplidzjphkr01zifmb61aj11hxwmpkldhwz8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.74.0-darwin-arm64.tar.gz";
-        sha256 = "1m71v28yr25ikj0sfd8h9dfnpd53g4jhs6lcxjzz9mb645vvsl0h";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.75.0-darwin-arm64.tar.gz";
+        sha256 = "0c4krcnw4kh8wxrvrcfv0j2i276zmsbxiiiph19m3263ddi6i99x";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.7.3-darwin-arm64.tar.gz";
-        sha256 = "1g3badq0zhjs69lyh6d9mpj0c77jqlgapbm03scbamgjzq0zzbdl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.0-darwin-arm64.tar.gz";
+        sha256 = "01glc6mn5k6qyk65qkzhbmkrhlwzlmdkvx8d8mkgm7fprdwaxfv0";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.14.0-darwin-arm64.tar.gz";
         sha256 = "09ss5j92ra4bs5vmsqq2sgs30nalsb1bs3s0njn72fsc1cd6n0qz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.70.0-darwin-arm64.tar.gz";
-        sha256 = "1v8yid6dd6i3nnf62m37mlgwqjy68dgd0k8zkw3q8qs1r9mf8wfq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.71.0-darwin-arm64.tar.gz";
+        sha256 = "06bah84cq2bhg4zxm0m70wrz1cr9mhixqz5n9q7q5l36hw6x1jmd";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.2.0-darwin-arm64.tar.gz";
         sha256 = "0zsvaz2shh35lw5c4sqvg39wrfsqk514z2nd9jzvjrnbwmwps6zd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.6.0-darwin-arm64.tar.gz";
-        sha256 = "1x4ij8qv9jq39fbacirjvk96hc117da5ll3fzrmgpkvjc1mall01";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.7.0-darwin-arm64.tar.gz";
+        sha256 = "0mmpf4ggzhimm6mhf2p0jydc78wm7wqbm180g6066dd84izi9dsi";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.20.0-darwin-arm64.tar.gz";
-        sha256 = "114njwjir2zk6fzfxiyjch97js6p0v2cr41v199zm2ff0h90727q";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.21.0-darwin-arm64.tar.gz";
+        sha256 = "1f9vd95jw2s3yvssnv5xx5l4fzhklyb11rlhvl42cccfgndj7g6j";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.1-darwin-arm64.tar.gz";
@@ -547,8 +547,8 @@
         sha256 = "17cm719jsh6rc7lwd64kg7qdlxlclvwrky9598f85kbvnv6n0xa8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.20.0-darwin-arm64.tar.gz";
-        sha256 = "1l3jl4nwvhp58lybv4lll2qb8d400nx6kb504prh84i67my685ni";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.21.0-darwin-arm64.tar.gz";
+        sha256 = "1r3w1vw0d0qn2vnv4a0n81q3dpw4m7cs34gryvfvllp5f7m8zn31";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-darwin-arm64.tar.gz";
@@ -595,16 +595,16 @@
         sha256 = "1aqlwj0v0x2ipjvalzry8g4g5y28pm52q8mriirmimml0vavlib8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.2-darwin-arm64.tar.gz";
-        sha256 = "022x01wxl7zj65n25slijnb0is266xrg26sbb1z408bipv4svxgk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.1.3-darwin-arm64.tar.gz";
+        sha256 = "1sayvk6h8g2n5g9zb0drsqpibzlsm9k0zp4dvkcgf68iw32fpzxz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.111.0-darwin-arm64.tar.gz";
-        sha256 = "1jjqhkfciinwjp6i4qlfjs826m88wncz5v5ppg9mwa9wmnyagi3l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.112.0-darwin-arm64.tar.gz";
+        sha256 = "0cpi6q4rm2kfvycfva6h3qqj62x3469qlxv034rx4q4jahxnd4zn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.4-darwin-arm64.tar.gz";
-        sha256 = "18iw3nkmygsdb0mjdgx5h2ny834vlnd5g1f5nm9gkrs5594sqgf3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.5-darwin-arm64.tar.gz";
+        sha256 = "1j8r4ghifhxx1i3g9l0drbdgdigq59q1gkkr2j8y2626fypgddjh";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.18.0-darwin-arm64.tar.gz";
@@ -627,8 +627,8 @@
         sha256 = "0xw51rfh9vv0dbdzkjz6yrhj86f691cdg40ax085zk0g31x2g1cm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.7-darwin-arm64.tar.gz";
-        sha256 = "1c2h6yxgx395mf8z61n29xwcx85qq373fcvv5w620zj1y3l8ff57";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.8-darwin-arm64.tar.gz";
+        sha256 = "1mmnn6my6v0mj28fqgiymdwfjsmj3rcb1nf7aj92kp3m38a0gcjs";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz";

From 6eed68351bb5fc1c46748f4677c7f93635a50faf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 09:14:45 +0000
Subject: [PATCH 45/87] orchard: 0.28.2 -> 0.28.3

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

diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix
index 518205ca5512..15e16e971f97 100644
--- a/pkgs/by-name/or/orchard/package.nix
+++ b/pkgs/by-name/or/orchard/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "orchard";
-  version = "0.28.2";
+  version = "0.28.3";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = pname;
     rev = version;
-    hash = "sha256-QH/TkXBdqpgIiByLmutqk6M4GWwkm/BThTRN2DZXhc0=";
+    hash = "sha256-blXxINsM793iH7X38J+Mrqf/WKnSRoS48yP4r3Dllow=";
     # 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;
@@ -24,7 +24,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-0bdsz5Oj351dztApJ1FnSbObuCKEPC38Fupe3NyRAAQ=";
+  vendorHash = "sha256-OimkH34coQLhJlJd3BGBFE9L/TQtU4tJbTl0zwmQh3w=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 8e4608e18f363c6fe6eb5383944dad2f254a8462 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 09:35:13 +0000
Subject: [PATCH 46/87] yew-fmt: 0.5.3 -> 0.5.5

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

diff --git a/pkgs/by-name/ye/yew-fmt/package.nix b/pkgs/by-name/ye/yew-fmt/package.nix
index 6605936287e2..d6341b7cf075 100644
--- a/pkgs/by-name/ye/yew-fmt/package.nix
+++ b/pkgs/by-name/ye/yew-fmt/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "yew-fmt";
-  version = "0.5.3";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "its-the-shrimp";
     repo = "yew-fmt";
     tag = "v${version}";
-    hash = "sha256-Ck6WA6ROm8APTsgoxbVGUqoblc5awW+hmmzcy4ZFoBM=";
+    hash = "sha256-2sOw8wWfnEphYsruQyhZMW3KofcGkNHJB6Q1jhFP3oo=";
   };
 
-  cargoHash = "sha256-Fp8MT1LJ1EpqwEZ+SpOomqZ7we47w2S5ExkB966Z3r0=";
+  cargoHash = "sha256-o4oRVI3+Nz8fwdwlyVvXUuhCQr4Bbg5Kife/PJoJCJY=";
   nativeCheckInputs = [ rustfmt ];
   passthru.updateScript = nix-update-script { };
   useFetchCargoVendor = true;

From 20d178fb73ab020b6b12726502a3888143784999 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 10:10:40 +0000
Subject: [PATCH 47/87] wxsqlite3: 4.10.4 -> 4.10.5

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

diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix
index 02514f260109..94595ff510e8 100644
--- a/pkgs/by-name/wx/wxsqlite3/package.nix
+++ b/pkgs/by-name/wx/wxsqlite3/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wxsqlite3";
-  version = "4.10.4";
+  version = "4.10.5";
 
   src = fetchFromGitHub {
     owner = "utelle";
     repo = "wxsqlite3";
     rev = "v${version}";
-    hash = "sha256-IHlQxVAgCZ8Nwz2VbP8Wvf3on9XEaVBDEMInUWHw2XQ=";
+    hash = "sha256-aDEVT3R948P+N1fFC9Q7LNf8FpPuxlKs+dQurewtaFA=";
   };
 
   nativeBuildInputs = [

From 58df86d5ee0fe700cdbb70806113a24b450b884e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 10 Mar 2025 11:31:32 +0100
Subject: [PATCH 48/87] dolphin-emu: 2412 -> 2503

Diff: https://github.com/dolphin-emu/dolphin/compare/refs/tags/2412...2503
---
 pkgs/applications/emulators/dolphin-emu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix
index b7aae1d4c7c0..26d84ff1da98 100644
--- a/pkgs/applications/emulators/dolphin-emu/default.nix
+++ b/pkgs/applications/emulators/dolphin-emu/default.nix
@@ -55,13 +55,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dolphin-emu";
-  version = "2412";
+  version = "2503";
 
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
     tag = finalAttrs.version;
-    hash = "sha256-5Eir8EQPGVSg2QXzzuHH9lf7CrV76KwmRsHiDqs6tD4=";
+    hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs=";
     fetchSubmodules = true;
   };
 

From 92c0bc88a91f552573f5611bbd6f25572658da66 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 9 Mar 2025 15:07:26 +0100
Subject: [PATCH 49/87] xfig: 3.2.9 -> 3.2.9a

Changes:
https://sourceforge.net/p/mcj/xfig/ci/3.2.9a/tree/CHANGES
---
 pkgs/by-name/xf/xfig/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/xf/xfig/package.nix b/pkgs/by-name/xf/xfig/package.nix
index 990bb00b1f61..f53ccd161b1f 100644
--- a/pkgs/by-name/xf/xfig/package.nix
+++ b/pkgs/by-name/xf/xfig/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xfig";
-  version = "3.2.9";
+  version = "3.2.9a";
 
   src = fetchurl {
     url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz";
-    hash = "sha256-E+2dBNG7wt7AnafvSc7sJ4OC0pD2zZJkdMLy0Bb+wvc=";
+    hash = "sha256-vFcqGIHl4gmHrFkBWLBBq3gDhFqWkQNtO6XpgvZtnKM=";
   };
 
   nativeBuildInputs = [
@@ -39,8 +39,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace src/main.c --replace '"fig2dev"' '"${fig2dev}/bin/fig2dev"'
-    substituteInPlace xfig.desktop --replace "/usr/bin/" "$out/bin/"
+    substituteInPlace src/main.c --replace-fail '"fig2dev"' '"${fig2dev}/bin/fig2dev"'
   '';
 
   postInstall = ''
@@ -53,7 +52,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/icons/hicolor/{16x16,22x22,48x48,64x64}/apps
 
     for dimension in 16x16 22x22 48x48; do
-      convert doc/html/images/xfig-logo.png -geometry $dimension\
+      magick convert doc/html/images/xfig-logo.png -geometry $dimension\
         $out/share/icons/hicolor/16x16/apps/xfig.png
     done
     install doc/html/images/xfig-logo.png \

From 9e5825feac4b4686e835fbc0fd360436f4ce9d4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 12:38:02 +0000
Subject: [PATCH 50/87] apko: 0.25.1 -> 0.25.2

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

diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix
index 274ade384421..e251cf4e48ae 100644
--- a/pkgs/development/tools/apko/default.nix
+++ b/pkgs/development/tools/apko/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "apko";
-  version = "0.25.1";
+  version = "0.25.2";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-ElHRhEsXP3pzTkys9c8FaQODZJmFDMl4ubUIU4B1ACM=";
+    hash = "sha256-lvxdpc8rXGgebxjFEeQOlpDfLwwe8a0QAfqApCgWAHw=";
     # 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;
@@ -25,7 +25,7 @@ buildGoModule rec {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-ddvdnnDxqwqO6xtLf5NoMT2WYNNMuvyHlo2+/A6rN0E=";
+  vendorHash = "sha256-EE59/VyP/dK9qZuTSQqqxAhcJUh/hfSopR7x6k5Eunc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 42c892425798005ee784221588db2ce68ecef036 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 13:29:38 +0000
Subject: [PATCH 51/87] copilot-language-server: 1.275.0 -> 1.280.0

---
 pkgs/by-name/co/copilot-language-server/package-lock.json | 4 ++--
 pkgs/by-name/co/copilot-language-server/package.nix       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/co/copilot-language-server/package-lock.json b/pkgs/by-name/co/copilot-language-server/package-lock.json
index 9f08fecf4535..f5f68a310487 100644
--- a/pkgs/by-name/co/copilot-language-server/package-lock.json
+++ b/pkgs/by-name/co/copilot-language-server/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@github/copilot-language-server",
-    "version": "1.275.0",
+    "version": "1.280.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@github/copilot-language-server",
-            "version": "1.275.0",
+            "version": "1.280.0",
             "license": "https://docs.github.com/en/site-policy/github-terms/github-terms-for-additional-products-and-features",
             "dependencies": {
                 "vscode-languageserver-protocol": "^3.17.5"
diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index 6aa4b6aa92de..fff7ec334a6c 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "copilot-language-server";
-  version = "1.275.0";
+  version = "1.280.0";
 
   src = fetchurl {
     url = "https://registry.npmjs.org/@github/copilot-language-server/-/copilot-language-server-${version}.tgz";
-    hash = "sha256-OVqtwz9T5vSYAZc8nof0jXn7H40i1r7SAS6jK4xeSlo=";
+    hash = "sha256-6UniNoKUoATY+7amMoyWmo0DxEM82Iuu2Jf8P2raWx4=";
   };
 
-  npmDepsHash = "sha256-PLX/mN7xu8gMh2BkkyTncP3+rJ3nBmX+pHxl0ONXbe4=";
+  npmDepsHash = "sha256-BtErMpXdRC0t9DNa3hKU+tct6e9K+tMP+LcbmwSJrLI=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json

From df851aea993e5c5e22ce3540b51862709876a558 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 14:09:59 +0000
Subject: [PATCH 52/87] roxctl: 4.6.2 -> 4.6.3

---
 pkgs/applications/networking/cluster/roxctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix
index 411c5e6641b2..b0372f6f297f 100644
--- a/pkgs/applications/networking/cluster/roxctl/default.nix
+++ b/pkgs/applications/networking/cluster/roxctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "roxctl";
-  version = "4.6.2";
+  version = "4.6.3";
 
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = "stackrox";
     rev = version;
-    sha256 = "sha256-UgwWNacoPSMtZBLnGh/e7tIgXksBgBcCyZJ3XpKUapQ=";
+    sha256 = "sha256-QrQLIqP70IUDY9lOZ0cTBIRYY8mVVW4sRt8522y/q80=";
   };
 
-  vendorHash = "sha256-NqPon1S0GzdyIDMNejIXmlkppR8DnXWNdXuyuiA2Vxo=";
+  vendorHash = "sha256-Zuln5na8MrL+IVOk+NOBrrYJIQ3RincJRYgpAd1WiS8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 408e9583b1756a832544e05ec0c510253f29da8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 14:15:45 +0000
Subject: [PATCH 53/87] tygo: 0.2.17 -> 0.2.18

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

diff --git a/pkgs/by-name/ty/tygo/package.nix b/pkgs/by-name/ty/tygo/package.nix
index af5f690fcfe1..533737f67456 100644
--- a/pkgs/by-name/ty/tygo/package.nix
+++ b/pkgs/by-name/ty/tygo/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "tygo";
-  version = "0.2.17";
+  version = "0.2.18";
 
   src = fetchFromGitHub {
     owner = "gzuidhof";
     repo = "tygo";
     rev = "v${version}";
-    hash = "sha256-yaXS+DS/xeIQXhn3L6x2lp/xu4OxrBqr5wKVbADhZkU=";
+    hash = "sha256-W2PgBcbkreP61QtAuOZ+VHUUZ4Mhe++1SK1p4Tg4Ack=";
   };
 
   vendorHash = "sha256-E73yqGhPzZA/1xTYGvTBy0/b4SE9hzx+gdhjX3ClE/Y=";

From ecc53063d9d598790e4bb5159a42b65cbf052bf7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 10 Mar 2025 15:18:12 +0100
Subject: [PATCH 54/87] python312Packages.uproot: 5.5.2 -> 5.6.0

Diff: https://github.com/scikit-hep/uproot5/compare/refs/tags/v5.5.2...v5.6.0

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

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index 9c34d6798579..239de084d40a 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "5.5.2";
+  version = "5.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "uproot5";
     tag = "v${version}";
-    hash = "sha256-vMTZ3ajCEkKKerPXThSxk0vgGxK2Po9hVf8ofaGCO04=";
+    hash = "sha256-9DObKSMGx6fgU6DHafqynd7XC36zdjzp24iyaugobw8=";
   };
 
   build-system = [

From 35065f107014dde0c4ead784d7ffd7b2396f7394 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Wed, 5 Mar 2025 19:24:43 +0100
Subject: [PATCH 55/87] SDL_compat: patch sdl-config to use setup-hook

The setup hook creating SDL_PATH variable was copied from the SDL1,
however, the necessary patch to `sdl-config.in` was not adapted making
the hook useless.
---
 pkgs/by-name/sd/SDL_compat/find-headers.patch | 26 +++++++++++++++++++
 pkgs/by-name/sd/SDL_compat/package.nix        |  8 ++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/sd/SDL_compat/find-headers.patch

diff --git a/pkgs/by-name/sd/SDL_compat/find-headers.patch b/pkgs/by-name/sd/SDL_compat/find-headers.patch
new file mode 100644
index 000000000000..92b48fb1c2ab
--- /dev/null
+++ b/pkgs/by-name/sd/SDL_compat/find-headers.patch
@@ -0,0 +1,26 @@
+diff --git a/sdl-config.in b/sdl-config.in
+index ce332b3..359d574 100755
+--- a/sdl-config.in
++++ b/sdl-config.in
+@@ -50,14 +50,18 @@ while test $# -gt 0; do
+       echo @PROJECT_VERSION@
+       ;;
+     --cflags)
+-      echo -I${includedir}/SDL @SDL_CFLAGS@
++      SDL_CFLAGS=""
++      for i in @includedir@/SDL $SDL_PATH; do
++        SDL_CFLAGS="$SDL_CFLAGS -I$i"
++      done
++      echo $SDL_CFLAGS @SDL_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+-@ENABLE_SHARED_TRUE@      echo -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
++@ENABLE_SHARED_TRUE@      echo -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ $SDL_LIB_PATH
+ @ENABLE_SHARED_TRUE@      ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
+-@ENABLE_STATIC_TRUE@      echo -L${libdir} @SDL_LIBS@ @SDL_STATIC_LIBS@
++@ENABLE_STATIC_TRUE@      echo -L${libdir} @SDL_LIBS@ @SDL_STATIC_LIBS@ $SDL_LIB_PATH
+ @ENABLE_STATIC_TRUE@      ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix
index 235613fa3d8d..c1d02ce324b6 100644
--- a/pkgs/by-name/sd/SDL_compat/package.nix
+++ b/pkgs/by-name/sd/SDL_compat/package.nix
@@ -48,14 +48,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  setupHook = ./setup-hook.sh;
-
   postInstall = ''
     # allow as a drop in replacement for SDL
     # Can be removed after treewide switch from pkg-config to pkgconf
     ln -s $out/lib/pkgconfig/sdl12_compat.pc $out/lib/pkgconfig/sdl.pc
   '';
 
+  # The setup hook scans paths of buildInputs to find SDL related packages and
+  # adds their include and library paths to environment variables. The sdl-config
+  # is patched to use these variables to produce correct flags for compiler.
+  patches = [ ./find-headers.patch ];
+  setupHook = ./setup-hook.sh;
+
   postFixup = ''
     for lib in $out/lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* ; do
       if [[ -L "$lib" ]]; then

From 16ed9c78b70f4d851d58c115feca8978611fda0c Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 9 Mar 2025 21:30:47 +0100
Subject: [PATCH 56/87] rott: remove SDL_compat workaround

---
 pkgs/games/rott/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix
index a91187730151..f9d39a527daa 100644
--- a/pkgs/games/rott/default.nix
+++ b/pkgs/games/rott/default.nix
@@ -44,12 +44,6 @@ stdenv.mkDerivation rec {
     "SHAREWARE=${if buildShareware then "1" else "0"}"
   ];
 
-  # when using SDL_compat instead of SDL1, SDL_mixer isn't correctly detected,
-  # but there is no harm just specifying it
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-I${lib.getDev SDL_mixer}/include/SDL"
-  ];
-
   installPhase = ''
     runHook preInstall
 

From 2af27d54238497541ef75150d706548d591efa75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 16:28:20 +0000
Subject: [PATCH 57/87] esp-generate: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix
index b19995034101..b335ff256c18 100644
--- a/pkgs/by-name/es/esp-generate/package.nix
+++ b/pkgs/by-name/es/esp-generate/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "esp-generate";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "esp-generate";
     rev = "v${version}";
-    hash = "sha256-Z+PsGx3Y2WZLO5QK5icI89YPOmY4p/RBMiYecEOfmwc=";
+    hash = "sha256-yk7iv5nq2b/1OY77818I7mXW96YxjwwJS3iiv1KXVHs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uvHZyvIcPLB1GW7EkJshAeGRI3xJZtN9kPrLhHGoojs=";
+  cargoHash = "sha256-ncTX9cDSAf6ZGlz0utGYxkuXcx85vt3VHQzdmQhCNf0=";
 
   meta = {
     description = "Template generation tool to create no_std applications targeting Espressif's chips";

From 4694a3a2e66d0b1903f9738a58ce0cb475a2efd6 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 10 Mar 2025 09:46:49 -0700
Subject: [PATCH 58/87] varia: refactor substituteInPlace

---
 pkgs/by-name/va/varia/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/va/varia/package.nix b/pkgs/by-name/va/varia/package.nix
index dbdfca27386e..67547e5d516c 100644
--- a/pkgs/by-name/va/varia/package.nix
+++ b/pkgs/by-name/va/varia/package.nix
@@ -27,8 +27,7 @@ python3Packages.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace src/varia-py.in \
-      --replace-fail 'aria2cexec = sys.argv[1]' 'aria2cexec = "${lib.getExe aria2}"'
-    substituteInPlace src/varia-py.in \
+      --replace-fail 'aria2cexec = sys.argv[1]' 'aria2cexec = "${lib.getExe aria2}"' \
       --replace-fail 'ffmpegexec = sys.argv[2]' 'ffmpegexec = "${lib.getExe ffmpeg}"'
   '';
 

From f597c68e7ba0d6d5740ac89d5c56e69463d82b58 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 10 Mar 2025 22:27:41 +0530
Subject: [PATCH 59/87] nixos/boot/systemd: enable tracefs

tracefs is a special-purpose filesystem in Linux used for tracing filesystem and kernel operations.

This was added to the kernel back in 2015 to replace debugfs. For security reasons, some system do not mount debugfs at all. Tracefs reduces the attack surface by allowing to trace without mounting debugfs. Additionally it provides features not supported by debugfs (such as calls for mkdir and rmdir

Debian and Arch Linux both enable this by default.
RHEL 8 and later, they enable tracefs by default.

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 nixos/modules/system/boot/systemd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 8b3f2a1bc49f..3096517c0b08 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -88,6 +88,7 @@ let
       "sys-fs-fuse-connections.mount"
       ] ++ (optional (!config.boot.isContainer) "sys-kernel-config.mount") ++ [
       "sys-kernel-debug.mount"
+      "sys-kernel-tracing.mount"
 
       # Maintaining state across reboots.
       "systemd-random-seed.service"

From 15c5832faf3b8b8cab134ddce837bde9309acbb4 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 10 Mar 2025 18:06:18 +0100
Subject: [PATCH 60/87] gdmd: use replaceVars intead of substituteAll

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

diff --git a/pkgs/by-name/gd/gdmd/package.nix b/pkgs/by-name/gd/gdmd/package.nix
index 6f98c8a491c8..74bd4799809b 100644
--- a/pkgs/by-name/gd/gdmd/package.nix
+++ b/pkgs/by-name/gd/gdmd/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  substituteAll,
+  replaceVars,
   gdc,
   perl,
 }:
@@ -18,8 +18,7 @@ stdenvNoCC.mkDerivation {
   };
 
   patches = [
-    (substituteAll {
-      src = ./0001-gdc-store-path.diff;
+    (replaceVars ./0001-gdc-store-path.diff {
       gdc_dir = "${gdc}/bin";
     })
   ];

From 83201a86a1be16a84e46f9a383c61a07ef706200 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 10 Mar 2025 18:06:44 +0100
Subject: [PATCH 61/87] vimPlugins.sniprun: use replaceVars intead of
 substituteAll

---
 .../editors/vim/plugins/non-generated/sniprun/default.nix    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix
index 4594b378744a..566e22c88a93 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix
@@ -14,7 +14,7 @@
 
   # sniprun
   vimUtils,
-  substituteAll,
+  replaceVars,
   nix-update-script,
 }:
 let
@@ -58,8 +58,7 @@ vimUtils.buildVimPlugin {
   inherit version src;
 
   patches = [
-    (substituteAll {
-      src = ./fix-paths.patch;
+    (replaceVars ./fix-paths.patch {
       sniprun = lib.getExe sniprun-bin;
     })
   ];

From 8bf1e138bc2a866637681b2dac07f82eb2f5e98e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 10 Mar 2025 18:06:32 +0100
Subject: [PATCH 62/87] nixos/postgresql: fix merging of
 shared_preload_libraries option

Closes #386804

The issue with coercing to `types.str` is that it's not mergeable, so
any declarations will result in an eval error like this:

    error: The option `interactive.nodes.tmp.services.postgresql.settings.shared_preload_libraries' has conflicting definition values:
    - In `/home/ma27/Projects/nixpkgs-hack/tmp.nix@node-tmp': "foo"
    - In `/home/ma27/Projects/nixpkgs-hack/tmp.nix@node-tmp': "bar2"
    Use `lib.mkForce value` or `lib.mkDefault value` to change the priority on any of these definitions.

Using a mergeable type (`types.comma`, i.e. a string, where all declarations
get joined with a comma as delimiter) fixes the problem.
---
 nixos/modules/services/databases/postgresql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 7963b4152fe6..530c4a036fad 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -439,7 +439,7 @@ in
             ]);
             options = {
               shared_preload_libraries = mkOption {
-                type = nullOr (coercedTo (listOf str) (concatStringsSep ", ") str);
+                type = nullOr (coercedTo (listOf str) (concatStringsSep ",") commas);
                 default = null;
                 example = literalExpression ''[ "auto_explain" "anon" ]'';
                 description = ''

From 428ade6d95b408cba33ffea88e018fb08eb53f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 10 Mar 2025 10:29:52 -0700
Subject: [PATCH 63/87] imagemagick: 7.1.1-44 -> 7.1.1-45

Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-44...7.1.1-45

Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md#711-45---2025-03-09
---
 pkgs/applications/graphics/ImageMagick/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index f1c1f7f933be..c9e736a9d275 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -84,13 +84,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.1-44";
+  version = "7.1.1-45";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
-    rev = finalAttrs.version;
-    hash = "sha256-DsJRTLMyjU2mMEGq/2qEJvjdYa698TEZZqkxuWtd/A4=";
+    tag = finalAttrs.version;
+    hash = "sha256-7oE+fkozhTqTagcwpzttKLZoq4gT1nSib4JssRmz3YI=";
   };
 
   outputs = [

From 3289472d2fe6d44308cb1a0007b7c922af52e1f1 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Mon, 10 Mar 2025 18:38:39 +0100
Subject: [PATCH 64/87] vscode-extensions.sas.sas-lsp: 1.13.0 -> 1.13.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b49e0786f8e7..ed25d0b9b65e 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4329,8 +4329,8 @@ let
         mktplcRef = {
           name = "sas-lsp";
           publisher = "SAS";
-          version = "1.13.0";
-          hash = "sha256-bcj9p/hvzZ1z03D1dXxiyPmGndh3pD7seI5VYHWsvzU=";
+          version = "1.13.1";
+          hash = "sha256-Ol79+z/W4RzAQ0jjDMkxPrg8eOWanOqtIF7ZxNrskOk=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog";

From a74746c0d8472fd03ef4060d48abe5b2359ddd1b Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@protonmail.com>
Date: Thu, 27 Feb 2025 13:37:28 -0500
Subject: [PATCH 65/87] weka: enhance package

- Add .desktop entries to launch application and open documention.
- Add weka-java script to provide access to WEKA cli.
- Add weka-home script to write path to WEKA share directory to stdout.
- Add ability to set the max. memory allocation pool
---
 .../science/math/weka/default.nix             | 61 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix
index 57f3bd1a1100..bb255dc52c6c 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@@ -5,6 +5,11 @@
   jre,
   unzip,
   makeWrapper,
+  makeDesktopItem,
+  copyDesktopItems,
+  xdg-utils,
+  imagemagick,
+  maxMemoryAllocationPool ? "1000M",
 }:
 
 stdenv.mkDerivation rec {
@@ -19,18 +24,70 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     makeWrapper
     unzip
-  ];
+    imagemagick
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
 
   # The -Xmx1000M comes suggested from their download page:
   # https://www.cs.waikato.ac.nz/ml/weka/downloading.html
   installPhase = ''
+    runHook preInstall
+
     mkdir -pv $out/share/weka
+    mkdir -p $out/share/icons/hicolor
     cp -Rv * $out/share/weka
 
     makeWrapper ${jre}/bin/java $out/bin/weka \
-      --add-flags "-Xmx1000M -jar $out/share/weka/weka.jar"
+      --add-flags "-Xmx${maxMemoryAllocationPool} -jar $out/share/weka/weka.jar"
+
+    makeWrapper ${jre}/bin/java $out/bin/weka-java \
+      --add-flags "-Xmx${maxMemoryAllocationPool} -cp $out/share/weka/weka.jar"
+
+    ${lib.optionalString stdenv.hostPlatform.isLinux "
+        makeWrapper ${xdg-utils}/bin/xdg-open $out/bin/weka-doc --add-flags $out/share/weka/documentation.html
+    "}
+
+    cat << EOF > $out/bin/weka-home
+    #!${stdenv.shell}
+    echo -n $out/share/weka
+    EOF
+
+    chmod ugo+x $out/bin/weka-home
+
+    for n in 16 24 32 48 64 96 128 256; do
+      size=$n"x"$n
+      mkdir -p $out/share/icons/hicolor/$size/apps
+      magick convert $out/share/weka/weka.gif -resize $size $out/share/icons/hicolor/$size/apps/weka.png
+    done;
+
+    runHook postInstall
   '';
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = "weka";
+      exec = "weka";
+      icon = "weka";
+      desktopName = "WEKA";
+      categories = [
+        "Science"
+        "ArtificialIntelligence"
+        "ComputerScience"
+      ];
+    })
+
+    (makeDesktopItem {
+      name = "weka-doc";
+      exec = "weka-doc";
+      icon = "weka";
+      desktopName = "View the WEKA documentation with a web browser";
+      categories = [
+        "Science"
+        "ArtificialIntelligence"
+        "ComputerScience"
+      ];
+    })
+  ];
+
   meta = with lib; {
     homepage = "https://www.cs.waikato.ac.nz/ml/weka/";
     description = "Collection of machine learning algorithms for data mining tasks";

From 98b086d6d318d9c6fc5303b50e9e8c5f0c32a135 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Mon, 23 Dec 2024 01:40:14 +0800
Subject: [PATCH 66/87] xdg-desktop-portal: 1.18.4 -> 1.20.0

- remove unneeded dependencies
- switch to wrapGAppsNoGuiHook
- add patch to fix sound validation similar to icon validation
- rebase other patches
- use a single python env with all test dependencies, as pytest path is hardcoded
  into installed tests
- fix installed tests, reenable location test (it works now)
- clean up a bunch of old hacks

Co-authored-by: aucub <78630225+aucub@users.noreply.github.com>
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
---
 .../installed-tests/xdg-desktop-portal.nix    |  36 ++++--
 .../libraries/xdg-desktop-portal/default.nix  | 122 ++++++++----------
 .../fix-icon-validation.patch                 |  33 +++++
 .../fix-sound-validation.patch                |  32 +++++
 .../installed-tests-path.patch                |  23 ++--
 .../installed-tests-share.patch               |   9 --
 .../nix-pkgdatadir-env.patch                  |  10 +-
 .../xdg-desktop-portal/trash-test.patch       |  16 +--
 8 files changed, 164 insertions(+), 117 deletions(-)
 create mode 100644 pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
 create mode 100644 pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
 delete mode 100644 pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch

diff --git a/nixos/tests/installed-tests/xdg-desktop-portal.nix b/nixos/tests/installed-tests/xdg-desktop-portal.nix
index d40317faeb01..a85203fe3eda 100644
--- a/nixos/tests/installed-tests/xdg-desktop-portal.nix
+++ b/nixos/tests/installed-tests/xdg-desktop-portal.nix
@@ -1,22 +1,32 @@
-{ pkgs, makeInstalledTest, ... }:
+{
+  lib,
+  pkgs,
+  makeInstalledTest,
+  ...
+}:
 
 makeInstalledTest {
   tested = pkgs.xdg-desktop-portal;
 
-  # Red herring
-  # Failed to load RealtimeKit property: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.RealtimeKit1 was not provided by any .service files
-  # Maybe a red herring, enabling PipeWire doesn't fix the location test.
-  # Failed connect to PipeWire: Couldn't connect to PipeWire
   testConfig = {
     environment.variables = {
-      TEST_IN_CI = 1;
-      XDG_DATA_DIRS = "${pkgs.xdg-desktop-portal.installedTests}/share/installed-tests/xdg-desktop-portal/share";
+      GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" [
+        pkgs.glib.out
+        pkgs.umockdev.out
+      ];
+      # need to set this ourselves, because the tests will set LD_PRELOAD=libumockdev-preload.so,
+      # which can't be found because it's not in default rpath
+      LD_PRELOAD = "${pkgs.umockdev.out}/lib/libumockdev-preload.so";
+      XDP_TEST_IN_CI = 1;
     };
-    # Broken, see comment in the package file.
-    #services.geoclue2 = {
-    #  enable = true;
-    #  enableDemoAgent = true;
-    #};
-    #location.provider = "geoclue2";
+    environment.systemPackages = with pkgs; [
+      umockdev
+      wireless-regdb
+    ];
+    services.geoclue2 = {
+      enable = true;
+      enableDemoAgent = true;
+    };
+    location.provider = "geoclue2";
   };
 }
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 79c7633a5576..1b4ec15a1b93 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -4,17 +4,12 @@
   flatpak,
   fuse3,
   bubblewrap,
-  docbook_xml_dtd_412,
-  docbook_xml_dtd_43,
-  docbook_xsl,
   docutils,
   systemdMinimal,
   geoclue2,
   glib,
   gsettings-desktop-schemas,
   json-glib,
-  libportal,
-  libxml2,
   meson,
   ninja,
   nixosTests,
@@ -26,16 +21,20 @@
   pkg-config,
   stdenv,
   runCommand,
-  wrapGAppsHook3,
-  xmlto,
+  wrapGAppsNoGuiHook,
   bash,
+  dbus,
+  gst_all_1,
+  libgudev,
+  umockdev,
+  substituteAll,
   enableGeoLocation ? true,
   enableSystemd ? true,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal";
-  version = "1.18.4";
+  version = "1.20.0";
 
   outputs = [
     "out"
@@ -45,18 +44,23 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "flatpak";
     repo = "xdg-desktop-portal";
-    rev = finalAttrs.version;
-    hash = "sha256-o+aO7uGewDPrtgOgmp/CE2uiqiBLyo07pVCFrtlORFQ=";
+    tag = finalAttrs.version;
+    hash = "sha256-FHMa8fTr8qNEM5WptuMjMs/XOsvmFxi8pDaCrwJ3/ww=";
   };
 
   patches = [
     # The icon validator copied from Flatpak needs to access the gdk-pixbuf loaders
     # in the Nix store and cannot bind FHS paths since those are not available on NixOS.
-    (runCommand "icon-validator.patch" { } ''
-      # Flatpak uses a different path
-      substitute "${flatpak.icon-validator-patch}" "$out" \
-        --replace "/icon-validator/validate-icon.c" "/src/validate-icon.c"
-    '')
+    (substituteAll {
+      src = ./fix-icon-validation.patch;
+      inherit (builtins) storeDir;
+    })
+
+    # Same for the sound validator, except the gdk-pixbuf part.
+    (substituteAll {
+      src = ./fix-sound-validation.patch;
+      inherit (builtins) storeDir;
+    })
 
     # Allow installing installed tests to a separate output.
     ./installed-tests-path.patch
@@ -68,23 +72,14 @@ stdenv.mkDerivation (finalAttrs: {
 
     # test tries to read /proc/cmdline, which is not intended to be accessible in the sandbox
     ./trash-test.patch
-
-    # Install files required to be in XDG_DATA_DIR of the installed tests
-    # Merged PR https://github.com/flatpak/xdg-desktop-portal/pull/1444
-    ./installed-tests-share.patch
   ];
 
   nativeBuildInputs = [
-    docbook_xml_dtd_412
-    docbook_xml_dtd_43
-    docbook_xsl
     docutils # for rst2man
-    libxml2
     meson
     ninja
     pkg-config
-    wrapGAppsHook3
-    xmlto
+    wrapGAppsNoGuiHook
   ];
 
   buildInputs =
@@ -95,19 +90,14 @@ stdenv.mkDerivation (finalAttrs: {
       glib
       gsettings-desktop-schemas
       json-glib
-      libportal
       pipewire
+      gst_all_1.gst-plugins-base
+      libgudev
+      umockdev
 
       # For icon validator
       gdk-pixbuf
       librsvg
-
-      # For document-fuse installed test.
-      (python3.withPackages (
-        pp: with pp; [
-          pygobject3
-        ]
-      ))
       bash
     ]
     ++ lib.optionals enableGeoLocation [
@@ -118,11 +108,22 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
   nativeCheckInputs = [
+    dbus
+    gdk-pixbuf
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-good
     gobject-introspection
-    python3.pkgs.pytest
-    python3.pkgs.python-dbusmock
-    python3.pkgs.pygobject3
-    python3.pkgs.dbus-python
+
+    # NB: this Python is used both for build-time tests
+    # and for installed (VM) tests, so it includes dependencies
+    # for both
+    (python3.withPackages (ps: [
+      ps.pytest
+      ps.python-dbusmock
+      ps.pygobject3
+      ps.dbus-python
+    ]))
+    umockdev
   ];
 
   mesonFlags =
@@ -130,13 +131,14 @@ stdenv.mkDerivation (finalAttrs: {
       "--sysconfdir=/etc"
       "-Dinstalled-tests=true"
       "-Dinstalled_test_prefix=${placeholder "installedTests"}"
+      "-Ddocumentation=disabled" # pulls in a whole lot of extra stuff
       (lib.mesonEnable "systemd" enableSystemd)
     ]
     ++ lib.optionals (!enableGeoLocation) [
       "-Dgeoclue=disabled"
     ]
     ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
-      "-Dpytest=disabled"
+      "-Dtests=disabled"
     ];
 
   strictDeps = true;
@@ -148,13 +150,8 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace meson.build \
       --replace-fail "find_program('bwrap'"  "find_program('${lib.getExe bubblewrap}'"
 
-    # Disable test failing with libportal 0.9.0
-    ${
-      assert (lib.versionOlder finalAttrs.version "1.20.0");
-      "# TODO: Remove when updating to x-d-p 1.20.0"
-    }
-    substituteInPlace tests/test-portals.c \
-      --replace-fail 'g_test_add_func ("/portal/notification/bad-arg", test_notification_bad_arg);' ""
+    patchShebangs src/generate-method-info.py
+    patchShebangs tests/run-test.sh
   '';
 
   preCheck = ''
@@ -165,42 +162,29 @@ stdenv.mkDerivation (finalAttrs: {
     # be flaky. Let's disable those downstream as hydra exhibits similar
     # flakes:
     #   https://github.com/NixOS/nixpkgs/pull/270085#issuecomment-1840053951
-    export TEST_IN_CI=1
+    export XDP_TEST_IN_CI=1
+
+    # need to set this ourselves, because the tests will set LD_PRELOAD=libumockdev-preload.so,
+    # which can't be found because it's not in default rpath
+    export LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so
   '';
 
-  postFixup =
-    let
-      documentFuse = "${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal/test-document-fuse.py";
-      testPortals = "${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal/test-portals";
-
-    in
-    ''
-      if [ -x '${documentFuse}' ] ; then
-        wrapGApp '${documentFuse}'
-        wrapGApp '${testPortals}'
-        # (xdg-desktop-portal:995): xdg-desktop-portal-WARNING **: 21:21:55.673: Failed to get GeoClue client: Timeout was reached
-        # xdg-desktop-portal:ERROR:../tests/location.c:22:location_cb: 'res' should be TRUE
-        # https://github.com/flatpak/xdg-desktop-portal/blob/1d6dfb57067dec182b546dfb60c87aa3452c77ed/tests/location.c#L21
-        rm $installedTests/share/installed-tests/xdg-desktop-portal/test-portals-location.test
-      fi
-    '';
-
   passthru = {
     tests = {
       installedTests = nixosTests.installed-tests.xdg-desktop-portal;
 
       validate-icon = runCommand "test-icon-validation" { } ''
-        ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --sandbox 512 512 ${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out"
+        ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --ruleset=desktop --sandbox --path=${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out"
         grep format=svg "$out"
       '';
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Desktop integration portals for sandboxed apps";
-    homepage = "https://flatpak.github.io/xdg-desktop-portal/";
-    license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.linux;
+    homepage = "https://flatpak.github.io/xdg-desktop-portal";
+    license = lib.licenses.lgpl2Plus;
+    maintainers = with lib.maintainers; [ jtojnar ];
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
new file mode 100644
index 000000000000..08b7a3c0b3b0
--- /dev/null
+++ b/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
@@ -0,0 +1,33 @@
+diff --git a/src/validate-icon.c b/src/validate-icon.c
+index c42265b..320f028 100644
+--- a/src/validate-icon.c
++++ b/src/validate-icon.c
+@@ -254,7 +254,7 @@ flatpak_get_bwrap (void)
+ static int
+ rerun_in_sandbox (int input_fd)
+ {
+-  const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" };
++  const char * const usrmerged_dirs[] = { };
+   g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
+   g_autofree char* arg_input_fd = NULL;
+   char validate_icon[PATH_MAX + 1];
+@@ -276,8 +276,7 @@ rerun_in_sandbox (int input_fd)
+             "--unshare-ipc",
+             "--unshare-net",
+             "--unshare-pid",
+-            "--ro-bind", "/usr", "/usr",
+-            "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
++            "--ro-bind", "@storeDir@", "@storeDir@",
+             "--ro-bind", validate_icon, validate_icon,
+             NULL);
+ 
+@@ -320,6 +319,9 @@ rerun_in_sandbox (int input_fd)
+   if (g_getenv ("G_MESSAGES_PREFIXED"))
+     add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL);
+ 
++  if (g_getenv ("GDK_PIXBUF_MODULE_FILE"))
++    add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL);
++
+   arg_input_fd = g_strdup_printf ("%d", input_fd);
+   add_args (args,
+             validate_icon,
diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
new file mode 100644
index 000000000000..bfc6982d2dfd
--- /dev/null
+++ b/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
@@ -0,0 +1,32 @@
+diff --git a/src/validate-sound.c b/src/validate-sound.c
+index 7348d46..8b87c78 100644
+--- a/src/validate-sound.c
++++ b/src/validate-sound.c
+@@ -234,7 +234,7 @@ flatpak_get_bwrap (void)
+ static int
+ rerun_in_sandbox (int input_fd)
+ {
+-  const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" };
++  const char * const usrmerged_dirs[] = { };
+   int i;
+   g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
+   char validate_sound[PATH_MAX + 1];
+@@ -255,8 +255,7 @@ rerun_in_sandbox (int input_fd)
+             "--unshare-ipc",
+             "--unshare-net",
+             "--unshare-pid",
+-            "--ro-bind", "/usr", "/usr",
+-            "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
++            "--ro-bind", "@storeDir@", "@storeDir@",
+             "--ro-bind", validate_sound, validate_sound,
+             NULL);
+ 
+@@ -299,6 +298,8 @@ rerun_in_sandbox (int input_fd)
+   if (g_getenv ("G_MESSAGES_PREFIXED"))
+     add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL);
+ 
++  if (g_getenv ("GST_PLUGIN_SYSTEM_PATH_1_0"))
++    add_args (args, "--setenv", "GST_PLUGIN_SYSTEM_PATH_1_0", g_getenv ("GST_PLUGIN_SYSTEM_PATH_1_0"), NULL);
+ 
+   arg_input_fd = g_strdup_printf ("%d", input_fd);
+   add_args (args, validate_sound, "--fd", arg_input_fd, NULL);
diff --git a/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch b/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch
index 0a9547ba3628..9de427d86307 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch
@@ -1,8 +1,8 @@
 diff --git a/meson.build b/meson.build
-index b25f9ef..7975f85 100644
+index 4238adb..d3f89fd 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -40,8 +40,8 @@ if dataroot_dir == ''
+@@ -43,8 +43,8 @@ if dataroot_dir == ''
      dataroot_dir = datadir
  endif
  
@@ -14,17 +14,14 @@ index b25f9ef..7975f85 100644
  
  summary({
 diff --git a/meson_options.txt b/meson_options.txt
-index fccada3..ca87600 100644
+index ed8c311..0a2bf7e 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -38,6 +38,10 @@ option('installed-tests',
-         type: 'boolean',
-         value: false,
-         description: 'Enable installation of some test cases')
+@@ -54,3 +54,7 @@ option('sandboxed-sound-validation',
+        type: 'feature',
+        value: 'enabled',
+        description: 'Use Bubblewrap to sandbox sound validation. Disabling this option may lead to security vulnerabilities.')
 +option('installed_test_prefix',
-+        type: 'string',
-+        value: '',
-+        description: 'Prefix for installed tests')
- option('pytest',
-         type: 'feature',
-         value: 'auto',
++       type: 'string',
++       value: '',
++       description: 'Prefix for installed tests')
diff --git a/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch b/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch
deleted file mode 100644
index ba9a3822e59e..000000000000
--- a/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/tests/share/applications/meson.build b/tests/share/applications/meson.build
-index d56b633..3ad3371 100644
---- a/tests/share/applications/meson.build
-+++ b/tests/share/applications/meson.build
-@@ -1,2 +1,2 @@
--configure_file(input: 'furrfix.desktop', output: '@PLAINNAME@', copy: true)
--configure_file(input: 'mimeinfo.cache', output: '@PLAINNAME@', copy: true)
-+configure_file(input: 'furrfix.desktop', output: '@PLAINNAME@', copy: true, install: enable_installed_tests, install_dir: installed_tests_data_dir / 'share' / 'applications')
-+configure_file(input: 'mimeinfo.cache', output: '@PLAINNAME@', copy: true, install: enable_installed_tests, install_dir: installed_tests_data_dir / 'share' / 'applications')
diff --git a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
index b099c4ad56f5..b7ca73e5afed 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
@@ -1,8 +1,8 @@
-diff --git a/src/portal-impl.c b/src/portal-impl.c
-index 85b3a23..6d43636 100644
---- a/src/portal-impl.c
-+++ b/src/portal-impl.c
-@@ -275,6 +275,8 @@ load_installed_portals (gboolean opt_verbose)
+diff --git a/src/xdp-portal-impl.c b/src/xdp-portal-impl.c
+index 770c265..a34ca8e 100644
+--- a/src/xdp-portal-impl.c
++++ b/src/xdp-portal-impl.c
+@@ -277,6 +277,8 @@ load_installed_portals (gboolean opt_verbose)
  
    /* We need to override this in the tests */
    portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR");
diff --git a/pkgs/development/libraries/xdg-desktop-portal/trash-test.patch b/pkgs/development/libraries/xdg-desktop-portal/trash-test.patch
index 3bfa88597281..23991fd87020 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/trash-test.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/trash-test.patch
@@ -1,18 +1,18 @@
 diff --git a/tests/test_trash.py b/tests/test_trash.py
-index d745cd2..173e3e5 100644
+index 2637256..e89d45c 100644
 --- a/tests/test_trash.py
 +++ b/tests/test_trash.py
-@@ -24,13 +24,6 @@ class TestTrash:
-     def test_version(self, portal_mock):
-         portal_mock.check_version(1)
+@@ -13,13 +13,6 @@ class TestTrash:
+     def test_version(self, portals, dbus_con):
+         xdp.check_version(dbus_con, "Trash", 1)
  
--    def test_trash_file_fails(self, portal_mock):
--        trash_intf = portal_mock.get_dbus_interface()
+-    def test_trash_file_fails(self, portals, dbus_con):
+-        trash_intf = xdp.get_portal_iface(dbus_con, "Trash")
 -        with open("/proc/cmdline") as fd:
 -            result = trash_intf.TrashFile(fd.fileno())
 -
 -        assert result == 0
 -
-     def test_trash_file(self, portal_mock):
-         trash_intf = portal_mock.get_dbus_interface()
+     def test_trash_file(self, portals, dbus_con):
+         trash_intf = xdp.get_portal_iface(dbus_con, "Trash")
  

From 5dbc718f907fd98ef71c59764284fec35a4acb3d Mon Sep 17 00:00:00 2001
From: willow <52585984+Kek5chen@users.noreply.github.com>
Date: Mon, 10 Mar 2025 18:46:26 +0100
Subject: [PATCH 67/87] exodus: 24.41.6 -> 25.9.2

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

diff --git a/pkgs/by-name/ex/exodus/package.nix b/pkgs/by-name/ex/exodus/package.nix
index c3f467367b2d..ce356f5d15a0 100644
--- a/pkgs/by-name/ex/exodus/package.nix
+++ b/pkgs/by-name/ex/exodus/package.nix
@@ -28,12 +28,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "exodus";
-  version = "24.41.6";
+  version = "25.9.2";
 
   src = requireFile {
     name = "exodus-linux-x64-${finalAttrs.version}.zip";
     url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip";
-    hash = "sha256-lUL9n3EZVe2J7uCHUSJgI2g75Sp1Y/nfBTde7VId6sA=";
+    hash = "sha256-QEspr/n4TnwpCx9lBY874+dlcMvhXiYKhyqel7ebuzg=";
   };
 
   nativeBuildInputs = [ unzip ];

From b06d85e0bf14a4502ee1351e43ae99794e40181f Mon Sep 17 00:00:00 2001
From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 10 Mar 2025 23:38:40 +0530
Subject: [PATCH 68/87] google-chrome: add libuuid to update script path

---
 pkgs/by-name/go/google-chrome/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/go/google-chrome/update.sh b/pkgs/by-name/go/google-chrome/update.sh
index e7d2988ffe0a..f31a67b4b700 100755
--- a/pkgs/by-name/go/google-chrome/update.sh
+++ b/pkgs/by-name/go/google-chrome/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl jq gawk libossp_uuid libxml2 nix
+#!nix-shell -I nixpkgs=./. -i bash -p curl jq gawk libossp_uuid libuuid libxml2 nix
 # shellcheck shell=bash
 
 set -euo pipefail

From a881a1a8703ca3b94290814e960a6a5ae4a423ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Mon, 10 Mar 2025 19:11:51 +0100
Subject: [PATCH 69/87] unison-ucm: 0.5.33 -> 0.5.36

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

diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix
index 159d4419ed9e..72b90b28d193 100644
--- a/pkgs/by-name/un/unison-ucm/package.nix
+++ b/pkgs/by-name/un/unison-ucm/package.nix
@@ -14,21 +14,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unison-code-manager";
-  version = "0.5.33";
+  version = "0.5.36";
 
   src =
     {
       aarch64-darwin = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz";
-        hash = "sha256-DXqQMv1pEEFSHDsY8BICFfKAD4zaishRIDo1hwCVj54=";
+        hash = "sha256-GH0qZtb29qDxL39nArYSzCQ50/ssPOiN9CXnAvb9uVQ=";
       };
       x86_64-darwin = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz";
-        hash = "sha256-ffHbkujs3UMChPM2uL3tBcxInKEOHwRUMrIeh+k5ghY=";
+        hash = "sha256-seL8Ey20KYVsOLugGvfVXXIIVdv7q04PYXh3c6MoZDk=";
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz";
-        hash = "sha256-+kBuQn73P8yxa8l6/R3NGj61LB6kKwa2lfNKZmhI5Dk=";
+        hash = "sha256-Zb91ixXd3ueQj6+YjC9Wgq3PnfcKBKZZdCJfS0nQOV4=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");

From 6d7508279e263243e1915121ef0afbb2f90b7010 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 13:14:49 -0400
Subject: [PATCH 70/87] gleam: 1.8.1 -> 1.9.1

---
 pkgs/development/compilers/gleam/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index f190cb7490c6..82728fe8a823 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -7,6 +7,9 @@
   pkg-config,
   openssl,
   erlang,
+  nodejs,
+  bun,
+  deno,
   Security,
   nix-update-script,
   SystemConfiguration,
@@ -14,24 +17,27 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gleam";
-  version = "1.8.1";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-Qt2VQhbiNNORrGUR5LHeBb0q/EIqPNPz/adljj6xpS4=";
+    hash = "sha256-6vYVUdQST49TNctO9Y/XrRFyJ6hXng85SsO+4JBn1GA=";
   };
 
   nativeBuildInputs = [
     git
     pkg-config
+    erlang
+    nodejs
+    bun
+    deno
   ];
 
   buildInputs =
     [
       openssl
-      erlang
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       Security
@@ -39,7 +45,12 @@ rustPlatform.buildRustPackage rec {
     ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-7oawxv1s8BJsOxGuADKjf4XqJ/UT+zYOrPQCbQljArM=";
+  cargoHash = "sha256-arVtNxcYDVKRTGe9won6zb30wCxMD6MtsGs25UmOPjM=";
+
+  checkFlags = [
+    # Makes a network request
+    "--skip=tests::echo::echo_dict"
+  ];
 
   passthru.updateScript = nix-update-script { };
 

From 8ed2c5f96192addbf8e83dff1080df7ba2c15ca9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 10 Mar 2025 19:17:52 +0100
Subject: [PATCH 71/87] nixos/tests/firefox: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix | 26 +++++++++++++++++++++-----
 nixos/tests/firefox.nix   | 20 ++++++++++++++------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e8f38da60ab6..fc7ea0a75ae7 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -387,11 +387,27 @@ in {
   filesystems-overlayfs = runTest ./filesystems-overlayfs.nix;
   firefly-iii = handleTest ./firefly-iii.nix {};
   firefly-iii-data-importer = handleTest ./firefly-iii-data-importer.nix {};
-  firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; };
-  firefox-beta = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-beta; };
-  firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; };
-  firefox-esr    = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job
-  firefox-esr-128 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-128; };
+  firefox = runTest {
+    imports = [./firefox.nix ];
+    _module.args.firefoxPackage = pkgs.firefox;
+  };
+  firefox-beta = runTest {
+    imports = [ ./firefox.nix ] ;
+    _module.args.firefoxPackage = pkgs.firefox-beta;
+  };
+  firefox-devedition = runTest {
+    imports = [ ./firefox.nix ];
+    _module.args.firefoxPackage = pkgs.firefox-devedition;
+  };
+  firefox-esr = runTest {
+     # used in `tested` job
+    imports = [ ./firefox.nix ] ;
+    _module.args.firefoxPackage = pkgs.firefox-esr;
+  };
+  firefox-esr-128 = runTest {
+    imports = [ ./firefox.nix ] ;
+    _module.args.firefoxPackage = pkgs.firefox-esr-128;
+  };
   firefoxpwa = handleTest ./firefoxpwa.nix {};
   firejail = handleTest ./firejail.nix {};
   firewall = handleTest ./firewall.nix { nftables = false; };
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 9388af953a35..53dac8c3b794 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -1,4 +1,9 @@
-import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }:
+{
+  lib,
+  pkgs,
+  firefoxPackage,
+  ...
+}:
 {
   name = firefoxPackage.pname;
 
@@ -9,7 +14,8 @@ import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }:
   nodes.machine =
     { pkgs, ... }:
 
-    { imports = [ ./common/x11.nix ];
+    {
+      imports = [ ./common/x11.nix ];
       environment.systemPackages = [ pkgs.xdotool ];
 
       programs.firefox = {
@@ -31,9 +37,11 @@ import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }:
 
     };
 
-  testScript = let
-    exe = lib.getExe firefoxPackage;
-  in ''
+  testScript =
+    let
+      exe = lib.getExe firefoxPackage;
+    in
+    ''
       from contextlib import contextmanager
 
 
@@ -97,4 +105,4 @@ import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }:
           machine.screenshot("screen")
     '';
 
-})
+}

From bb75147fa44e22b00fabde1963fa6888bd85be04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 18:32:32 +0000
Subject: [PATCH 72/87] audacity: 3.7.1 -> 3.7.2

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

diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index 8c99fb7705bf..1f68d8af3a6a 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -61,13 +61,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "audacity";
-  version = "3.7.1";
+  version = "3.7.2";
 
   src = fetchFromGitHub {
     owner = "audacity";
     repo = "audacity";
     rev = "Audacity-${finalAttrs.version}";
-    hash = "sha256-QKydqpkqG7znBEdtVEayC2SyNGU8tQX6AfxdeJN8tDg=";
+    hash = "sha256-uRFLtjawMI5mHvlQNWkqSICPKbTiwp2bnBBsuj2JAP8=";
   };
 
   postPatch =

From 542a053b32f3005685c46755c045c45bb2a3f90f Mon Sep 17 00:00:00 2001
From: Emma Miler <emma.pi@protonmail.com>
Date: Tue, 4 Mar 2025 18:14:42 +0100
Subject: [PATCH 73/87] nixos/oci-containers: add autoRemoveOnStop option

Adds the autoRemoveOnStop option to allow stopped or killed containers to stay around after stop. Default behaviour remains the same.
---
 nixos/modules/virtualisation/oci-containers.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix
index 8f24eee80a83..d81246e31383 100644
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -381,6 +381,14 @@ let
           '';
         };
 
+        autoRemoveOnStop = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Automatically remove the container when it is stopped or killed
+          '';
+        };
+
         networks = mkOption {
           type = with types; listOf str;
           default = [ ];
@@ -468,7 +476,6 @@ let
         ++ map escapeShellArg container.preRunExtraOptions
         ++ [
           "run"
-          "--rm"
           "--name=${escapedName}"
           "--log-driver=${container.log-driver}"
         ]
@@ -489,6 +496,7 @@ let
         ++ (mapAttrsToList (k: v: "-l ${escapeShellArg k}=${escapeShellArg v}") container.labels)
         ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}"
         ++ optional (container.privileged) "--privileged"
+        ++ optional (container.autoRemoveOnStop) "--rm"
         ++ mapAttrsToList (k: _: "--cap-add=${escapeShellArg k}") (
           filterAttrs (_: v: v == true) container.capabilities
         )

From e7754d40bccd231dc6c0528a5324b0d783c65eea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 18:56:39 +0000
Subject: [PATCH 74/87] aiken: 1.1.12 -> 1.1.13

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

diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix
index 8e39095f1cc2..c5441f128389 100644
--- a/pkgs/by-name/ai/aiken/package.nix
+++ b/pkgs/by-name/ai/aiken/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "aiken";
-  version = "1.1.12";
+  version = "1.1.13";
 
   src = fetchFromGitHub {
     owner = "aiken-lang";
     repo = "aiken";
     rev = "v${version}";
-    hash = "sha256-QxIkqS+lqZjyuXUghSSd+4ud4Vrce7MgLrk2a5AQGmU=";
+    hash = "sha256-es1opcYGoryRLpEPJuuuusTSVDnNAoEoGLg+LB8VnM0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-vbwYoBDTdAHCpCOJEdVo9Ir8wd4284pgYjyQuy/STHc=";
+  cargoHash = "sha256-g4DHkHw6Nog+ZtquvVaRaZdfcuH/ReLYsLeARbnCqac=";
 
   buildInputs =
     [ openssl ]

From e9ecb45bf9227e0de1dfbd2c3b0af92ba4ba1294 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Mar 2025 19:01:21 +0000
Subject: [PATCH 75/87] kafkactl: 5.5.0 -> 5.5.1

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

diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix
index 4ee82fb5e58a..8cace7c251b0 100644
--- a/pkgs/by-name/ka/kafkactl/package.nix
+++ b/pkgs/by-name/ka/kafkactl/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kafkactl";
-  version = "5.5.0";
+  version = "5.5.1";
 
   src = fetchFromGitHub {
     owner = "deviceinsight";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-9xo/lg3IhAdJnmmLAmiMcKNCTMXkKK2jnYaGHIk8Rq4=";
+    hash = "sha256-lsYdq3+hf+8EPLmLbgnzuVHfeZXrUlqYmHY4kJ6HzC4=";
   };
 
   vendorHash = "sha256-0Kc8Z32YdmwhKMTBMBAK0ZdnXnH8/Ze1HcMDafosLvw=";

From c249dcf2f3f88308c7e3ec621ea1efa954da76f8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 10 Mar 2025 20:15:36 +0100
Subject: [PATCH 76/87] nixos/tests/botamusique: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix   |  2 +-
 nixos/tests/botamusique.nix | 88 +++++++++++++++++++------------------
 2 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index fc7ea0a75ae7..11890b415347 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -212,7 +212,7 @@ in {
   boot-stage2 = handleTest ./boot-stage2.nix {};
   borgbackup = handleTest ./borgbackup.nix {};
   borgmatic = handleTest ./borgmatic.nix {};
-  botamusique = handleTest ./botamusique.nix {};
+  botamusique = runTest ./botamusique.nix;
   bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {};
   bpftune = handleTest ./bpftune.nix {};
   breitbandmessung = handleTest ./breitbandmessung.nix {};
diff --git a/nixos/tests/botamusique.nix b/nixos/tests/botamusique.nix
index c87224d52a94..30a005aa49f9 100644
--- a/nixos/tests/botamusique.nix
+++ b/nixos/tests/botamusique.nix
@@ -1,55 +1,57 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
+{
+  pkgs,
+  lib,
+  ...
+}:
 
-  {
-    name = "botamusique";
-    meta.maintainers = with lib.maintainers; [ hexa ];
+{
+  name = "botamusique";
+  meta.maintainers = with lib.maintainers; [ hexa ];
 
-    nodes = {
-      machine =
-        { config, ... }:
-        {
-          networking.extraHosts = ''
-            127.0.0.1 all.api.radio-browser.info
-          '';
+  nodes = {
+    machine =
+      { config, ... }:
+      {
+        networking.extraHosts = ''
+          127.0.0.1 all.api.radio-browser.info
+        '';
 
-          services.murmur = {
-            enable = true;
-            registerName = "NixOS tests";
-          };
+        services.murmur = {
+          enable = true;
+          registerName = "NixOS tests";
+        };
 
-          services.botamusique = {
-            enable = true;
-            settings = {
-              server = {
-                channel = "NixOS tests";
-              };
-              bot = {
-                version = false;
-                auto_check_update = false;
-              };
+        services.botamusique = {
+          enable = true;
+          settings = {
+            server = {
+              channel = "NixOS tests";
+            };
+            bot = {
+              version = false;
+              auto_check_update = false;
             };
           };
         };
-    };
+      };
+  };
 
-    testScript = ''
-      start_all()
+  testScript = ''
+    start_all()
 
-      machine.wait_for_unit("murmur.service")
-      machine.wait_for_unit("botamusique.service")
+    machine.wait_for_unit("murmur.service")
+    machine.wait_for_unit("botamusique.service")
 
-      machine.sleep(10)
+    machine.sleep(10)
 
-      machine.wait_until_succeeds(
-          "journalctl -u murmur.service -e | grep -q '<1:botamusique(-1)> Authenticated'"
-      )
+    machine.wait_until_succeeds(
+        "journalctl -u murmur.service -e | grep -q '<1:botamusique(-1)> Authenticated'"
+    )
 
-      with subtest("Check systemd hardening"):
-          output = machine.execute("systemctl show botamusique.service")[1]
-          machine.log(output)
-          output = machine.execute("systemd-analyze security botamusique.service")[1]
-          machine.log(output)
-    '';
-  }
-)
+    with subtest("Check systemd hardening"):
+        output = machine.execute("systemctl show botamusique.service")[1]
+        machine.log(output)
+        output = machine.execute("systemd-analyze security botamusique.service")[1]
+        machine.log(output)
+  '';
+}

From 9b7b22afa112499fa239881f6951541d6ff0b2b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 10 Mar 2025 19:30:20 +0100
Subject: [PATCH 77/87] nixos/tests/babeld: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |   2 +-
 nixos/tests/babeld.nix    | 369 +++++++++++++++++++-------------------
 2 files changed, 186 insertions(+), 185 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 11890b415347..6d4086f2b2ee 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -190,7 +190,7 @@ in {
   avahi = handleTest ./avahi.nix {};
   avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };
   ayatana-indicators = runTest ./ayatana-indicators.nix;
-  babeld = handleTest ./babeld.nix {};
+  babeld = runTest ./babeld.nix;
   bazarr = handleTest ./bazarr.nix {};
   bcachefs = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bcachefs.nix {};
   beanstalkd = handleTest ./beanstalkd.nix {};
diff --git a/nixos/tests/babeld.nix b/nixos/tests/babeld.nix
index 8b2ee35370a2..4f536de2a7a5 100644
--- a/nixos/tests/babeld.nix
+++ b/nixos/tests/babeld.nix
@@ -1,210 +1,211 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
-  {
-    name = "babeld";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ hexa ];
-    };
+{
+  pkgs,
+  ...
+}:
+{
+  name = "babeld";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ hexa ];
+  };
 
-    nodes = {
-      client =
-        { pkgs, lib, ... }:
-        {
-          virtualisation.vlans = [ 10 ];
+  nodes = {
+    client =
+      { lib, ... }:
+      {
+        virtualisation.vlans = [ 10 ];
 
-          networking = {
-            useDHCP = false;
-            interfaces."eth1" = {
-              ipv4.addresses = lib.mkForce [
-                {
-                  address = "192.168.10.2";
-                  prefixLength = 24;
-                }
-              ];
-              ipv4.routes = lib.mkForce [
-                {
-                  address = "0.0.0.0";
-                  prefixLength = 0;
-                  via = "192.168.10.1";
-                }
-              ];
-              ipv6.addresses = lib.mkForce [
-                {
-                  address = "2001:db8:10::2";
-                  prefixLength = 64;
-                }
-              ];
-              ipv6.routes = lib.mkForce [
-                {
-                  address = "::";
-                  prefixLength = 0;
-                  via = "2001:db8:10::1";
-                }
-              ];
-            };
+        networking = {
+          useDHCP = false;
+          interfaces."eth1" = {
+            ipv4.addresses = lib.mkForce [
+              {
+                address = "192.168.10.2";
+                prefixLength = 24;
+              }
+            ];
+            ipv4.routes = lib.mkForce [
+              {
+                address = "0.0.0.0";
+                prefixLength = 0;
+                via = "192.168.10.1";
+              }
+            ];
+            ipv6.addresses = lib.mkForce [
+              {
+                address = "2001:db8:10::2";
+                prefixLength = 64;
+              }
+            ];
+            ipv6.routes = lib.mkForce [
+              {
+                address = "::";
+                prefixLength = 0;
+                via = "2001:db8:10::1";
+              }
+            ];
+          };
+        };
+      };
+
+    local_router =
+      { lib, ... }:
+      {
+        virtualisation.vlans = [
+          10
+          20
+        ];
+
+        networking = {
+          useDHCP = false;
+          firewall.enable = false;
+
+          interfaces."eth1" = {
+            ipv4.addresses = lib.mkForce [
+              {
+                address = "192.168.10.1";
+                prefixLength = 24;
+              }
+            ];
+            ipv6.addresses = lib.mkForce [
+              {
+                address = "2001:db8:10::1";
+                prefixLength = 64;
+              }
+            ];
+          };
+
+          interfaces."eth2" = {
+            ipv4.addresses = lib.mkForce [
+              {
+                address = "192.168.20.1";
+                prefixLength = 24;
+              }
+            ];
+            ipv6.addresses = lib.mkForce [
+              {
+                address = "2001:db8:20::1";
+                prefixLength = 64;
+              }
+            ];
           };
         };
 
-      local_router =
-        { pkgs, lib, ... }:
-        {
-          virtualisation.vlans = [
-            10
-            20
-          ];
+        services.babeld = {
+          enable = true;
+          interfaces.eth2 = {
+            hello-interval = 1;
+            type = "wired";
+          };
+          extraConfig = ''
+            local-port-readwrite 33123
 
-          networking = {
-            useDHCP = false;
-            firewall.enable = false;
+            import-table 254 # main
+            export-table 254 # main
 
-            interfaces."eth1" = {
-              ipv4.addresses = lib.mkForce [
-                {
-                  address = "192.168.10.1";
-                  prefixLength = 24;
-                }
-              ];
-              ipv6.addresses = lib.mkForce [
-                {
-                  address = "2001:db8:10::1";
-                  prefixLength = 64;
-                }
-              ];
-            };
+            in ip 192.168.10.0/24 deny
+            in ip 192.168.20.0/24 deny
+            in ip 2001:db8:10::/64 deny
+            in ip 2001:db8:20::/64 deny
 
-            interfaces."eth2" = {
-              ipv4.addresses = lib.mkForce [
-                {
-                  address = "192.168.20.1";
-                  prefixLength = 24;
-                }
-              ];
-              ipv6.addresses = lib.mkForce [
-                {
-                  address = "2001:db8:20::1";
-                  prefixLength = 64;
-                }
-              ];
-            };
+            in ip 192.168.30.0/24 allow
+            in ip 2001:db8:30::/64 allow
+
+            in deny
+
+            redistribute local proto 2
+            redistribute local deny
+          '';
+        };
+      };
+    remote_router =
+      { lib, ... }:
+      {
+        virtualisation.vlans = [
+          20
+          30
+        ];
+
+        networking = {
+          useDHCP = false;
+          firewall.enable = false;
+
+          interfaces."eth1" = {
+            ipv4.addresses = lib.mkForce [
+              {
+                address = "192.168.20.2";
+                prefixLength = 24;
+              }
+            ];
+            ipv6.addresses = lib.mkForce [
+              {
+                address = "2001:db8:20::2";
+                prefixLength = 64;
+              }
+            ];
           };
 
-          services.babeld = {
-            enable = true;
-            interfaces.eth2 = {
-              hello-interval = 1;
-              type = "wired";
-            };
-            extraConfig = ''
-              local-port-readwrite 33123
-
-              import-table 254 # main
-              export-table 254 # main
-
-              in ip 192.168.10.0/24 deny
-              in ip 192.168.20.0/24 deny
-              in ip 2001:db8:10::/64 deny
-              in ip 2001:db8:20::/64 deny
-
-              in ip 192.168.30.0/24 allow
-              in ip 2001:db8:30::/64 allow
-
-              in deny
-
-              redistribute local proto 2
-              redistribute local deny
-            '';
+          interfaces."eth2" = {
+            ipv4.addresses = lib.mkForce [
+              {
+                address = "192.168.30.1";
+                prefixLength = 24;
+              }
+            ];
+            ipv6.addresses = lib.mkForce [
+              {
+                address = "2001:db8:30::1";
+                prefixLength = 64;
+              }
+            ];
           };
         };
-      remote_router =
-        { pkgs, lib, ... }:
-        {
-          virtualisation.vlans = [
-            20
-            30
-          ];
 
-          networking = {
-            useDHCP = false;
-            firewall.enable = false;
-
-            interfaces."eth1" = {
-              ipv4.addresses = lib.mkForce [
-                {
-                  address = "192.168.20.2";
-                  prefixLength = 24;
-                }
-              ];
-              ipv6.addresses = lib.mkForce [
-                {
-                  address = "2001:db8:20::2";
-                  prefixLength = 64;
-                }
-              ];
-            };
-
-            interfaces."eth2" = {
-              ipv4.addresses = lib.mkForce [
-                {
-                  address = "192.168.30.1";
-                  prefixLength = 24;
-                }
-              ];
-              ipv6.addresses = lib.mkForce [
-                {
-                  address = "2001:db8:30::1";
-                  prefixLength = 64;
-                }
-              ];
-            };
+        services.babeld = {
+          enable = true;
+          interfaces.eth1 = {
+            hello-interval = 1;
+            type = "wired";
           };
+          extraConfig = ''
+            local-port-readwrite 33123
 
-          services.babeld = {
-            enable = true;
-            interfaces.eth1 = {
-              hello-interval = 1;
-              type = "wired";
-            };
-            extraConfig = ''
-              local-port-readwrite 33123
+            import-table 254 # main
+            export-table 254 # main
 
-              import-table 254 # main
-              export-table 254 # main
+            in ip 192.168.20.0/24 deny
+            in ip 192.168.30.0/24 deny
+            in ip 2001:db8:20::/64 deny
+            in ip 2001:db8:30::/64 deny
 
-              in ip 192.168.20.0/24 deny
-              in ip 192.168.30.0/24 deny
-              in ip 2001:db8:20::/64 deny
-              in ip 2001:db8:30::/64 deny
+            in ip 192.168.10.0/24 allow
+            in ip 2001:db8:10::/64 allow
 
-              in ip 192.168.10.0/24 allow
-              in ip 2001:db8:10::/64 allow
-
-              in deny
-
-              redistribute local proto 2
-              redistribute local deny
-            '';
-          };
+            in deny
 
+            redistribute local proto 2
+            redistribute local deny
+          '';
         };
-    };
 
-    testScript = ''
-      start_all()
+      };
+  };
 
-      local_router.wait_for_unit("babeld.service")
-      remote_router.wait_for_unit("babeld.service")
+  testScript = ''
+    start_all()
 
-      local_router.wait_until_succeeds("ip route get 192.168.30.1")
-      local_router.wait_until_succeeds("ip route get 2001:db8:30::1")
+    local_router.wait_for_unit("babeld.service")
+    remote_router.wait_for_unit("babeld.service")
 
-      remote_router.wait_until_succeeds("ip route get 192.168.10.1")
-      remote_router.wait_until_succeeds("ip route get 2001:db8:10::1")
+    local_router.wait_until_succeeds("ip route get 192.168.30.1")
+    local_router.wait_until_succeeds("ip route get 2001:db8:30::1")
 
-      client.succeed("ping -c1 192.168.30.1")
-      client.succeed("ping -c1 2001:db8:30::1")
+    remote_router.wait_until_succeeds("ip route get 192.168.10.1")
+    remote_router.wait_until_succeeds("ip route get 2001:db8:10::1")
 
-      remote_router.succeed("ping -c1 192.168.10.2")
-      remote_router.succeed("ping -c1 2001:db8:10::2")
-    '';
-  }
-)
+    client.succeed("ping -c1 192.168.30.1")
+    client.succeed("ping -c1 2001:db8:30::1")
+
+    remote_router.succeed("ping -c1 192.168.10.2")
+    remote_router.succeed("ping -c1 2001:db8:10::2")
+  '';
+}

From 6919956d08603f6eefcd816f9b3248f5b5bafe20 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 10 Mar 2025 20:20:04 +0100
Subject: [PATCH 78/87] nixos/tests/snapcast: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |   2 +-
 nixos/tests/snapcast.nix  | 157 +++++++++++++++++++-------------------
 2 files changed, 80 insertions(+), 79 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 6d4086f2b2ee..55603049d448 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1036,7 +1036,7 @@ in {
   slurm = handleTest ./slurm.nix {};
   snmpd = handleTest ./snmpd.nix {};
   smokeping = handleTest ./smokeping.nix {};
-  snapcast = handleTest ./snapcast.nix {};
+  snapcast = runTest ./snapcast.nix;
   snapper = handleTest ./snapper.nix {};
   snipe-it = runTest ./web-apps/snipe-it.nix;
   soapui = handleTest ./soapui.nix {};
diff --git a/nixos/tests/snapcast.nix b/nixos/tests/snapcast.nix
index 569a50ff39c1..2a3bf114ee70 100644
--- a/nixos/tests/snapcast.nix
+++ b/nixos/tests/snapcast.nix
@@ -1,93 +1,94 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
+{
+  pkgs,
+  ...
+}:
 
-  let
-    port = 10004;
-    tcpPort = 10005;
-    httpPort = 10080;
-    tcpStreamPort = 10006;
-    bufferSize = 742;
-  in
-  {
-    name = "snapcast";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ hexa ];
-    };
+let
+  port = 10004;
+  tcpPort = 10005;
+  httpPort = 10080;
+  tcpStreamPort = 10006;
+  bufferSize = 742;
+in
+{
+  name = "snapcast";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ hexa ];
+  };
 
-    nodes = {
-      server = {
-        services.snapserver = {
-          enable = true;
-          port = port;
-          tcp.port = tcpPort;
-          http.port = httpPort;
-          openFirewall = true;
-          buffer = bufferSize;
-          streams = {
-            mpd = {
-              type = "pipe";
-              location = "/run/snapserver/mpd";
-              query.mode = "create";
-            };
-            bluetooth = {
-              type = "pipe";
-              location = "/run/snapserver/bluetooth";
-            };
-            tcp = {
-              type = "tcp";
-              location = "127.0.0.1:${toString tcpStreamPort}";
-            };
-            meta = {
-              type = "meta";
-              location = "/mpd/bluetooth/tcp";
-            };
+  nodes = {
+    server = {
+      services.snapserver = {
+        enable = true;
+        port = port;
+        tcp.port = tcpPort;
+        http.port = httpPort;
+        openFirewall = true;
+        buffer = bufferSize;
+        streams = {
+          mpd = {
+            type = "pipe";
+            location = "/run/snapserver/mpd";
+            query.mode = "create";
+          };
+          bluetooth = {
+            type = "pipe";
+            location = "/run/snapserver/bluetooth";
+          };
+          tcp = {
+            type = "tcp";
+            location = "127.0.0.1:${toString tcpStreamPort}";
+          };
+          meta = {
+            type = "meta";
+            location = "/mpd/bluetooth/tcp";
           };
         };
-        environment.systemPackages = [ pkgs.snapcast ];
-      };
-      client = {
-        environment.systemPackages = [ pkgs.snapcast ];
       };
+      environment.systemPackages = [ pkgs.snapcast ];
     };
+    client = {
+      environment.systemPackages = [ pkgs.snapcast ];
+    };
+  };
 
-    testScript = ''
-      import json
+  testScript = ''
+    import json
 
-      get_rpc_version = {"id": "1", "jsonrpc": "2.0", "method": "Server.GetRPCVersion"}
+    get_rpc_version = {"id": "1", "jsonrpc": "2.0", "method": "Server.GetRPCVersion"}
 
-      start_all()
+    start_all()
 
-      server.wait_for_unit("snapserver.service")
-      server.wait_until_succeeds("ss -ntl | grep -q ${toString port}")
-      server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpPort}")
-      server.wait_until_succeeds("ss -ntl | grep -q ${toString httpPort}")
-      server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpStreamPort}")
+    server.wait_for_unit("snapserver.service")
+    server.wait_until_succeeds("ss -ntl | grep -q ${toString port}")
+    server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpPort}")
+    server.wait_until_succeeds("ss -ntl | grep -q ${toString httpPort}")
+    server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpStreamPort}")
 
-      with subtest("check that pipes are created"):
-          server.succeed("test -p /run/snapserver/mpd")
-          server.succeed("test -p /run/snapserver/bluetooth")
+    with subtest("check that pipes are created"):
+        server.succeed("test -p /run/snapserver/mpd")
+        server.succeed("test -p /run/snapserver/bluetooth")
 
-      with subtest("test tcp json-rpc"):
-          server.succeed(f"echo '{json.dumps(get_rpc_version)}' | nc -w 1 localhost ${toString tcpPort}")
+    with subtest("test tcp json-rpc"):
+        server.succeed(f"echo '{json.dumps(get_rpc_version)}' | nc -w 1 localhost ${toString tcpPort}")
 
-      with subtest("test http json-rpc"):
-          server.succeed(
-              "curl --fail http://localhost:${toString httpPort}/jsonrpc -d '{json.dumps(get_rpc_version)}'"
-          )
+    with subtest("test http json-rpc"):
+        server.succeed(
+            "curl --fail http://localhost:${toString httpPort}/jsonrpc -d '{json.dumps(get_rpc_version)}'"
+        )
 
-      with subtest("test a ipv6 connection"):
-          server.execute("systemd-run --unit=snapcast-local-client snapclient -h ::1 -p ${toString port}")
-          server.wait_until_succeeds(
-              "journalctl -o cat -u snapserver.service | grep -q 'Hello from'"
-          )
-          server.wait_until_succeeds("journalctl -o cat -u snapcast-local-client | grep -q 'buffer: ${toString bufferSize}'")
+    with subtest("test a ipv6 connection"):
+        server.execute("systemd-run --unit=snapcast-local-client snapclient -h ::1 -p ${toString port}")
+        server.wait_until_succeeds(
+            "journalctl -o cat -u snapserver.service | grep -q 'Hello from'"
+        )
+        server.wait_until_succeeds("journalctl -o cat -u snapcast-local-client | grep -q 'buffer: ${toString bufferSize}'")
 
-      with subtest("test a connection"):
-          client.execute("systemd-run --unit=snapcast-client snapclient -h server -p ${toString port}")
-          server.wait_until_succeeds(
-              "journalctl -o cat -u snapserver.service | grep -q 'Hello from'"
-          )
-          client.wait_until_succeeds("journalctl -o cat -u snapcast-client | grep -q 'buffer: ${toString bufferSize}'")
-    '';
-  }
-)
+    with subtest("test a connection"):
+        client.execute("systemd-run --unit=snapcast-client snapclient -h server -p ${toString port}")
+        server.wait_until_succeeds(
+            "journalctl -o cat -u snapserver.service | grep -q 'Hello from'"
+        )
+        client.wait_until_succeeds("journalctl -o cat -u snapcast-client | grep -q 'buffer: ${toString bufferSize}'")
+  '';
+}

From 5a80e9ed00c25c43943a2019061fead22927016a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 10 Mar 2025 20:23:59 +0100
Subject: [PATCH 79/87] nixos/tests/kea: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |   2 +-
 nixos/tests/kea.nix       | 388 +++++++++++++++++++-------------------
 2 files changed, 196 insertions(+), 194 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 55603049d448..7f463285a5d1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -575,7 +575,7 @@ in {
   kavita = handleTest ./kavita.nix {};
   kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {};
   kbd-update-search-paths-patch = handleTest ./kbd-update-search-paths-patch.nix {};
-  kea = handleTest ./kea.nix {};
+  kea = runTest ./kea.nix;
   keepalived = handleTest ./keepalived.nix {};
   keepassxc = handleTest ./keepassxc.nix {};
   kerberos = handleTest ./kerberos/default.nix {};
diff --git a/nixos/tests/kea.nix b/nixos/tests/kea.nix
index 90b9491039c4..bb361eba14fb 100644
--- a/nixos/tests/kea.nix
+++ b/nixos/tests/kea.nix
@@ -5,231 +5,233 @@
 # that the nameserver can resolve the clients fqdn to the correct IP
 # address.
 
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
-  {
-    meta.maintainers = with lib.maintainers; [ hexa ];
+{
+  pkgs,
+  lib,
+  ...
+}:
+{
+  meta.maintainers = with lib.maintainers; [ hexa ];
 
-    name = "kea";
+  name = "kea";
 
-    nodes = {
-      router =
-        { config, pkgs, ... }:
-        {
-          virtualisation.vlans = [ 1 ];
+  nodes = {
+    router =
+      { config, pkgs, ... }:
+      {
+        virtualisation.vlans = [ 1 ];
 
-          networking = {
-            useDHCP = false;
-            firewall.allowedUDPPorts = [ 67 ];
-          };
+        networking = {
+          useDHCP = false;
+          firewall.allowedUDPPorts = [ 67 ];
+        };
 
-          systemd.network = {
-            enable = true;
-            networks = {
-              "01-eth1" = {
-                name = "eth1";
-                networkConfig = {
-                  Address = "10.0.0.1/29";
-                };
+        systemd.network = {
+          enable = true;
+          networks = {
+            "01-eth1" = {
+              name = "eth1";
+              networkConfig = {
+                Address = "10.0.0.1/29";
               };
             };
           };
+        };
 
-          services.kea.dhcp4 = {
-            enable = true;
-            settings = {
-              valid-lifetime = 3600;
-              renew-timer = 900;
-              rebind-timer = 1800;
+        services.kea.dhcp4 = {
+          enable = true;
+          settings = {
+            valid-lifetime = 3600;
+            renew-timer = 900;
+            rebind-timer = 1800;
 
-              lease-database = {
-                type = "memfile";
-                persist = true;
-                name = "/var/lib/kea/dhcp4.leases";
-              };
+            lease-database = {
+              type = "memfile";
+              persist = true;
+              name = "/var/lib/kea/dhcp4.leases";
+            };
 
-              control-socket = {
-                socket-type = "unix";
-                socket-name = "/run/kea/dhcp4.sock";
-              };
+            control-socket = {
+              socket-type = "unix";
+              socket-name = "/run/kea/dhcp4.sock";
+            };
 
-              interfaces-config = {
-                dhcp-socket-type = "raw";
-                interfaces = [
-                  "eth1"
+            interfaces-config = {
+              dhcp-socket-type = "raw";
+              interfaces = [
+                "eth1"
+              ];
+            };
+
+            subnet4 = [
+              {
+                id = 1;
+                subnet = "10.0.0.0/29";
+                pools = [
+                  {
+                    pool = "10.0.0.3 - 10.0.0.3";
+                  }
                 ];
-              };
+              }
+            ];
 
-              subnet4 = [
+            # Enable communication between dhcp4 and a local dhcp-ddns
+            # instance.
+            # https://kea.readthedocs.io/en/kea-2.2.0/arm/dhcp4-srv.html#ddns-for-dhcpv4
+            dhcp-ddns = {
+              enable-updates = true;
+            };
+
+            ddns-send-updates = true;
+            ddns-qualifying-suffix = "lan.nixos.test.";
+          };
+        };
+
+        services.kea.dhcp-ddns = {
+          enable = true;
+          settings = {
+            forward-ddns = {
+              # Configure updates of a forward zone named `lan.nixos.test`
+              # hosted at the nameserver at 10.0.0.2
+              # https://kea.readthedocs.io/en/kea-2.2.0/arm/ddns.html#adding-forward-dns-servers
+              ddns-domains = [
                 {
-                  id = 1;
-                  subnet = "10.0.0.0/29";
-                  pools = [
+                  name = "lan.nixos.test.";
+                  # Use a TSIG key in production!
+                  key-name = "";
+                  dns-servers = [
                     {
-                      pool = "10.0.0.3 - 10.0.0.3";
+                      ip-address = "10.0.0.2";
+                      port = 53;
                     }
                   ];
                 }
               ];
-
-              # Enable communication between dhcp4 and a local dhcp-ddns
-              # instance.
-              # https://kea.readthedocs.io/en/kea-2.2.0/arm/dhcp4-srv.html#ddns-for-dhcpv4
-              dhcp-ddns = {
-                enable-updates = true;
-              };
-
-              ddns-send-updates = true;
-              ddns-qualifying-suffix = "lan.nixos.test.";
             };
           };
+        };
 
-          services.kea.dhcp-ddns = {
-            enable = true;
-            settings = {
-              forward-ddns = {
-                # Configure updates of a forward zone named `lan.nixos.test`
-                # hosted at the nameserver at 10.0.0.2
-                # https://kea.readthedocs.io/en/kea-2.2.0/arm/ddns.html#adding-forward-dns-servers
-                ddns-domains = [
-                  {
-                    name = "lan.nixos.test.";
-                    # Use a TSIG key in production!
-                    key-name = "";
-                    dns-servers = [
-                      {
-                        ip-address = "10.0.0.2";
-                        port = 53;
-                      }
-                    ];
-                  }
-                ];
+        services.kea.ctrl-agent = {
+          enable = true;
+          settings = {
+            http-host = "127.0.0.1";
+            http-port = 8000;
+            control-sockets.dhcp4 = {
+              socket-type = "unix";
+              socket-name = "/run/kea/dhcp4.sock";
+            };
+          };
+        };
+
+        services.prometheus.exporters.kea = {
+          enable = true;
+          controlSocketPaths = [
+            "http://127.0.0.1:8000"
+          ];
+        };
+      };
+
+    nameserver =
+      { config, pkgs, ... }:
+      {
+        virtualisation.vlans = [ 1 ];
+
+        networking = {
+          useDHCP = false;
+          firewall.allowedUDPPorts = [ 53 ];
+        };
+
+        systemd.network = {
+          enable = true;
+          networks = {
+            "01-eth1" = {
+              name = "eth1";
+              networkConfig = {
+                Address = "10.0.0.2/29";
               };
             };
           };
+        };
 
-          services.kea.ctrl-agent = {
-            enable = true;
-            settings = {
-              http-host = "127.0.0.1";
-              http-port = 8000;
-              control-sockets.dhcp4 = {
-                socket-type = "unix";
-                socket-name = "/run/kea/dhcp4.sock";
-              };
+        services.resolved.enable = false;
+
+        # Set up an authoritative nameserver, serving the `lan.nixos.test`
+        # zone and configure an ACL that allows dynamic updates from
+        # the router's ip address.
+        # This ACL is likely insufficient for production usage. Please
+        # use TSIG keys.
+        services.knot =
+          let
+            zone = pkgs.writeTextDir "lan.nixos.test.zone" ''
+              @ SOA ns.nixos.test nox.nixos.test 0 86400 7200 3600000 172800
+              @ NS nameserver
+              nameserver A 10.0.0.3
+              router A 10.0.0.1
+            '';
+            zonesDir = pkgs.buildEnv {
+              name = "knot-zones";
+              paths = [ zone ];
             };
-          };
-
-          services.prometheus.exporters.kea = {
+          in
+          {
             enable = true;
-            controlSocketPaths = [
-              "http://127.0.0.1:8000"
+            extraArgs = [
+              "-v"
             ];
-          };
-        };
-
-      nameserver =
-        { config, pkgs, ... }:
-        {
-          virtualisation.vlans = [ 1 ];
-
-          networking = {
-            useDHCP = false;
-            firewall.allowedUDPPorts = [ 53 ];
-          };
-
-          systemd.network = {
-            enable = true;
-            networks = {
-              "01-eth1" = {
-                name = "eth1";
-                networkConfig = {
-                  Address = "10.0.0.2/29";
-                };
-              };
-            };
-          };
-
-          services.resolved.enable = false;
-
-          # Set up an authoritative nameserver, serving the `lan.nixos.test`
-          # zone and configure an ACL that allows dynamic updates from
-          # the router's ip address.
-          # This ACL is likely insufficient for production usage. Please
-          # use TSIG keys.
-          services.knot =
-            let
-              zone = pkgs.writeTextDir "lan.nixos.test.zone" ''
-                @ SOA ns.nixos.test nox.nixos.test 0 86400 7200 3600000 172800
-                @ NS nameserver
-                nameserver A 10.0.0.3
-                router A 10.0.0.1
-              '';
-              zonesDir = pkgs.buildEnv {
-                name = "knot-zones";
-                paths = [ zone ];
-              };
-            in
-            {
-              enable = true;
-              extraArgs = [
-                "-v"
+            settings = {
+              server.listen = [
+                "0.0.0.0@53"
               ];
-              settings = {
-                server.listen = [
-                  "0.0.0.0@53"
+
+              log.syslog.any = "info";
+
+              acl.dhcp_ddns = {
+                address = "10.0.0.1";
+                action = "update";
+              };
+
+              template.default = {
+                storage = zonesDir;
+                zonefile-sync = "-1";
+                zonefile-load = "difference-no-serial";
+                journal-content = "all";
+              };
+
+              zone."lan.nixos.test" = {
+                file = "lan.nixos.test.zone";
+                acl = [
+                  "dhcp_ddns"
                 ];
-
-                log.syslog.any = "info";
-
-                acl.dhcp_ddns = {
-                  address = "10.0.0.1";
-                  action = "update";
-                };
-
-                template.default = {
-                  storage = zonesDir;
-                  zonefile-sync = "-1";
-                  zonefile-load = "difference-no-serial";
-                  journal-content = "all";
-                };
-
-                zone."lan.nixos.test" = {
-                  file = "lan.nixos.test.zone";
-                  acl = [
-                    "dhcp_ddns"
-                  ];
-                };
               };
             };
-
-        };
-
-      client =
-        { config, pkgs, ... }:
-        {
-          virtualisation.vlans = [ 1 ];
-          systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
-          networking = {
-            useNetworkd = true;
-            useDHCP = false;
-            firewall.enable = false;
-            interfaces.eth1.useDHCP = true;
           };
+
+      };
+
+    client =
+      { config, pkgs, ... }:
+      {
+        virtualisation.vlans = [ 1 ];
+        systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
+        networking = {
+          useNetworkd = true;
+          useDHCP = false;
+          firewall.enable = false;
+          interfaces.eth1.useDHCP = true;
         };
-    };
-    testScript =
-      { ... }:
-      ''
-        start_all()
-        router.wait_for_unit("kea-dhcp4-server.service")
-        client.systemctl("start systemd-networkd-wait-online.service")
-        client.wait_for_unit("systemd-networkd-wait-online.service")
-        client.wait_until_succeeds("ping -c 5 10.0.0.1")
-        router.wait_until_succeeds("ping -c 5 10.0.0.3")
-        nameserver.wait_until_succeeds("kdig +short client.lan.nixos.test @10.0.0.2 | grep -q 10.0.0.3")
-        router.log(router.execute("curl 127.0.0.1:9547")[1])
-        router.succeed("curl --no-buffer 127.0.0.1:9547 | grep -qE '^kea_dhcp4_addresses_assigned_total.*1.0$'")
-      '';
-  }
-)
+      };
+  };
+  testScript =
+    { ... }:
+    ''
+      start_all()
+      router.wait_for_unit("kea-dhcp4-server.service")
+      client.systemctl("start systemd-networkd-wait-online.service")
+      client.wait_for_unit("systemd-networkd-wait-online.service")
+      client.wait_until_succeeds("ping -c 5 10.0.0.1")
+      router.wait_until_succeeds("ping -c 5 10.0.0.3")
+      nameserver.wait_until_succeeds("kdig +short client.lan.nixos.test @10.0.0.2 | grep -q 10.0.0.3")
+      router.log(router.execute("curl 127.0.0.1:9547")[1])
+      router.succeed("curl --no-buffer 127.0.0.1:9547 | grep -qE '^kea_dhcp4_addresses_assigned_total.*1.0$'")
+    '';
+}

From 5d3d6037d8b92823e5cb106fa8d155a1b8333481 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 10 Mar 2025 20:27:45 +0100
Subject: [PATCH 80/87] nixos/tests/go-neb: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/go-neb.nix    | 95 ++++++++++++++++++++-------------------
 2 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7f463285a5d1..7a7b01238b6e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -460,7 +460,7 @@ in {
   gnupg = handleTest ./gnupg.nix {};
   goatcounter = handleTest ./goatcounter.nix {};
   go-camo = handleTest ./go-camo.nix { };
-  go-neb = handleTest ./go-neb.nix {};
+  go-neb = runTest ./go-neb.nix;
   gobgpd = handleTest ./gobgpd.nix {};
   gocd-agent = handleTest ./gocd-agent.nix {};
   gocd-server = handleTest ./gocd-server.nix {};
diff --git a/nixos/tests/go-neb.nix b/nixos/tests/go-neb.nix
index 38cf89c2a352..4aea2d436760 100644
--- a/nixos/tests/go-neb.nix
+++ b/nixos/tests/go-neb.nix
@@ -1,53 +1,54 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "go-neb";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [
-        hexa
-        maralorn
-      ];
-    };
+{
+  pkgs,
+  ...
+}:
+{
+  name = "go-neb";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [
+      hexa
+      maralorn
+    ];
+  };
 
-    nodes = {
-      server = {
-        services.go-neb = {
-          enable = true;
-          baseUrl = "http://localhost";
-          secretFile = pkgs.writeText "secrets" "ACCESS_TOKEN=changeme";
-          config = {
-            clients = [
-              {
-                UserId = "@test:localhost";
-                AccessToken = "$ACCESS_TOKEN";
-                HomeServerUrl = "http://localhost";
-                Sync = false;
-                AutoJoinRooms = false;
-                DisplayName = "neverbeseen";
-              }
-            ];
-            services = [
-              {
-                ID = "wikipedia_service";
-                Type = "wikipedia";
-                UserID = "@test:localhost";
-                Config = { };
-              }
-            ];
-          };
+  nodes = {
+    server = {
+      services.go-neb = {
+        enable = true;
+        baseUrl = "http://localhost";
+        secretFile = pkgs.writeText "secrets" "ACCESS_TOKEN=changeme";
+        config = {
+          clients = [
+            {
+              UserId = "@test:localhost";
+              AccessToken = "$ACCESS_TOKEN";
+              HomeServerUrl = "http://localhost";
+              Sync = false;
+              AutoJoinRooms = false;
+              DisplayName = "neverbeseen";
+            }
+          ];
+          services = [
+            {
+              ID = "wikipedia_service";
+              Type = "wikipedia";
+              UserID = "@test:localhost";
+              Config = { };
+            }
+          ];
         };
       };
     };
+  };
 
-    testScript = ''
-      start_all()
-      server.wait_for_unit("go-neb.service")
-      server.wait_until_succeeds("curl -fL http://localhost:4050/services/hooks/d2lraXBlZGlhX3NlcnZpY2U")
-      server.succeed(
-          "journalctl -eu go-neb -o cat | grep -q service_id=wikipedia_service",
-          "grep -q changeme /var/run/go-neb/config.yaml",
-      )
-    '';
+  testScript = ''
+    start_all()
+    server.wait_for_unit("go-neb.service")
+    server.wait_until_succeeds("curl -fL http://localhost:4050/services/hooks/d2lraXBlZGlhX3NlcnZpY2U")
+    server.succeed(
+        "journalctl -eu go-neb -o cat | grep -q service_id=wikipedia_service",
+        "grep -q changeme /var/run/go-neb/config.yaml",
+    )
+  '';
 
-  }
-)
+}

From 41ff93c1d84e5be4f3232598d5c35d75fc0926bb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 10 Mar 2025 20:30:17 +0100
Subject: [PATCH 81/87] nixos/tests/knot: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |   2 +-
 nixos/tests/knot.nix      | 456 +++++++++++++++++++-------------------
 2 files changed, 230 insertions(+), 228 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7a7b01238b6e..18599437c825 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -589,7 +589,7 @@ in {
   keymap = handleTest ./keymap.nix {};
   kimai = handleTest ./kimai.nix {};
   kmonad = runTest ./kmonad.nix;
-  knot = handleTest ./knot.nix {};
+  knot = runTest ./knot.nix;
   komga = handleTest ./komga.nix {};
   krb5 = discoverTests (import ./krb5);
   ksm = handleTest ./ksm.nix {};
diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix
index 10ab1390696f..651fccc21949 100644
--- a/nixos/tests/knot.nix
+++ b/nixos/tests/knot.nix
@@ -1,254 +1,256 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
-  let
-    common = {
-      networking.firewall.enable = false;
-      networking.useDHCP = false;
-    };
-    exampleZone = pkgs.writeTextDir "example.com.zone" ''
-      @ SOA ns.example.com. noc.example.com. 2019031301 86400 7200 3600000 172800
-      @       NS      ns1
-      @       NS      ns2
-      ns1     A       192.168.0.1
-      ns1     AAAA    fd00::1
-      ns2     A       192.168.0.2
-      ns2     AAAA    fd00::2
-      www     A       192.0.2.1
-      www     AAAA    2001:DB8::1
-      sub     NS      ns.example.com.
-    '';
-    delegatedZone = pkgs.writeTextDir "sub.example.com.zone" ''
-      @ SOA ns.example.com. noc.example.com. 2019031301 86400 7200 3600000 172800
-      @       NS      ns1.example.com.
-      @       NS      ns2.example.com.
-      @       A       192.0.2.2
-      @       AAAA    2001:DB8::2
-    '';
+{
+  pkgs,
+  lib,
+  ...
+}:
+let
+  common = {
+    networking.firewall.enable = false;
+    networking.useDHCP = false;
+  };
+  exampleZone = pkgs.writeTextDir "example.com.zone" ''
+    @ SOA ns.example.com. noc.example.com. 2019031301 86400 7200 3600000 172800
+    @       NS      ns1
+    @       NS      ns2
+    ns1     A       192.168.0.1
+    ns1     AAAA    fd00::1
+    ns2     A       192.168.0.2
+    ns2     AAAA    fd00::2
+    www     A       192.0.2.1
+    www     AAAA    2001:DB8::1
+    sub     NS      ns.example.com.
+  '';
+  delegatedZone = pkgs.writeTextDir "sub.example.com.zone" ''
+    @ SOA ns.example.com. noc.example.com. 2019031301 86400 7200 3600000 172800
+    @       NS      ns1.example.com.
+    @       NS      ns2.example.com.
+    @       A       192.0.2.2
+    @       AAAA    2001:DB8::2
+  '';
 
-    knotZonesEnv = pkgs.buildEnv {
-      name = "knot-zones";
-      paths = [
-        exampleZone
-        delegatedZone
-      ];
-    };
-    # DO NOT USE pkgs.writeText IN PRODUCTION. This put secrets in the nix store!
-    tsigFile = pkgs.writeText "tsig.conf" ''
-      key:
-        - id: xfr_key
-          algorithm: hmac-sha256
-          secret: zOYgOgnzx3TGe5J5I/0kxd7gTcxXhLYMEq3Ek3fY37s=
-    '';
-  in
-  {
-    name = "knot";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ hexa ];
-    };
+  knotZonesEnv = pkgs.buildEnv {
+    name = "knot-zones";
+    paths = [
+      exampleZone
+      delegatedZone
+    ];
+  };
+  # DO NOT USE pkgs.writeText IN PRODUCTION. This put secrets in the nix store!
+  tsigFile = pkgs.writeText "tsig.conf" ''
+    key:
+      - id: xfr_key
+        algorithm: hmac-sha256
+        secret: zOYgOgnzx3TGe5J5I/0kxd7gTcxXhLYMEq3Ek3fY37s=
+  '';
+in
+{
+  name = "knot";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ hexa ];
+  };
 
-    nodes = {
-      primary =
-        { lib, ... }:
-        {
-          imports = [ common ];
+  nodes = {
+    primary =
+      { lib, ... }:
+      {
+        imports = [ common ];
 
-          # trigger sched_setaffinity syscall
-          virtualisation.cores = 2;
+        # trigger sched_setaffinity syscall
+        virtualisation.cores = 2;
 
-          networking.interfaces.eth1 = {
-            ipv4.addresses = lib.mkForce [
-              {
-                address = "192.168.0.1";
-                prefixLength = 24;
-              }
+        networking.interfaces.eth1 = {
+          ipv4.addresses = lib.mkForce [
+            {
+              address = "192.168.0.1";
+              prefixLength = 24;
+            }
+          ];
+          ipv6.addresses = lib.mkForce [
+            {
+              address = "fd00::1";
+              prefixLength = 64;
+            }
+          ];
+        };
+        services.knot.enable = true;
+        services.knot.extraArgs = [ "-v" ];
+        services.knot.keyFiles = [ tsigFile ];
+        services.knot.settings = {
+          server = {
+            listen = [
+              "0.0.0.0@53"
+              "::@53"
             ];
-            ipv6.addresses = lib.mkForce [
-              {
-                address = "fd00::1";
-                prefixLength = 64;
-              }
+            listen-quic = [
+              "0.0.0.0@853"
+              "::@853"
             ];
+            automatic-acl = true;
           };
-          services.knot.enable = true;
-          services.knot.extraArgs = [ "-v" ];
-          services.knot.keyFiles = [ tsigFile ];
-          services.knot.settings = {
-            server = {
-              listen = [
-                "0.0.0.0@53"
-                "::@53"
-              ];
-              listen-quic = [
-                "0.0.0.0@853"
-                "::@853"
-              ];
-              automatic-acl = true;
-            };
 
-            acl.secondary_acl = {
+          acl.secondary_acl = {
+            address = "192.168.0.2";
+            key = "xfr_key";
+            action = "transfer";
+          };
+
+          remote.secondary.address = "192.168.0.2@53";
+
+          template.default = {
+            storage = knotZonesEnv;
+            notify = [ "secondary" ];
+            acl = [ "secondary_acl" ];
+            dnssec-signing = true;
+            # Input-only zone files
+            # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-3
+            # prevents modification of the zonefiles, since the zonefiles are immutable
+            zonefile-sync = -1;
+            zonefile-load = "difference";
+            journal-content = "changes";
+          };
+
+          zone = {
+            "example.com".file = "example.com.zone";
+            "sub.example.com".file = "sub.example.com.zone";
+          };
+
+          log.syslog.any = "info";
+        };
+      };
+
+    secondary =
+      { lib, ... }:
+      {
+        imports = [ common ];
+        networking.interfaces.eth1 = {
+          ipv4.addresses = lib.mkForce [
+            {
               address = "192.168.0.2";
-              key = "xfr_key";
-              action = "transfer";
-            };
-
-            remote.secondary.address = "192.168.0.2@53";
-
-            template.default = {
-              storage = knotZonesEnv;
-              notify = [ "secondary" ];
-              acl = [ "secondary_acl" ];
-              dnssec-signing = true;
-              # Input-only zone files
-              # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-3
-              # prevents modification of the zonefiles, since the zonefiles are immutable
-              zonefile-sync = -1;
-              zonefile-load = "difference";
-              journal-content = "changes";
-            };
-
-            zone = {
-              "example.com".file = "example.com.zone";
-              "sub.example.com".file = "sub.example.com.zone";
-            };
-
-            log.syslog.any = "info";
-          };
+              prefixLength = 24;
+            }
+          ];
+          ipv6.addresses = lib.mkForce [
+            {
+              address = "fd00::2";
+              prefixLength = 64;
+            }
+          ];
         };
-
-      secondary =
-        { lib, ... }:
-        {
-          imports = [ common ];
-          networking.interfaces.eth1 = {
-            ipv4.addresses = lib.mkForce [
-              {
-                address = "192.168.0.2";
-                prefixLength = 24;
-              }
-            ];
-            ipv6.addresses = lib.mkForce [
-              {
-                address = "fd00::2";
-                prefixLength = 64;
-              }
-            ];
+        services.knot.enable = true;
+        services.knot.keyFiles = [ tsigFile ];
+        services.knot.extraArgs = [ "-v" ];
+        services.knot.settings = {
+          server = {
+            automatic-acl = true;
           };
-          services.knot.enable = true;
-          services.knot.keyFiles = [ tsigFile ];
-          services.knot.extraArgs = [ "-v" ];
-          services.knot.settings = {
-            server = {
-              automatic-acl = true;
-            };
 
-            xdp = {
-              listen = [
-                "eth1"
-              ];
-              tcp = true;
-            };
-
-            remote.primary = {
-              address = "192.168.0.1@53";
-              key = "xfr_key";
-            };
-
-            remote.primary-quic = {
-              address = "192.168.0.1@853";
-              key = "xfr_key";
-              quic = true;
-            };
-
-            template.default = {
-              # zonefileless setup
-              # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2
-              zonefile-sync = "-1";
-              zonefile-load = "none";
-              journal-content = "all";
-            };
-
-            zone = {
-              "example.com" = {
-                master = "primary";
-                file = "example.com.zone";
-              };
-              "sub.example.com" = {
-                master = "primary-quic";
-                file = "sub.example.com.zone";
-              };
-            };
-
-            log.syslog.any = "debug";
+          xdp = {
+            listen = [
+              "eth1"
+            ];
+            tcp = true;
           };
+
+          remote.primary = {
+            address = "192.168.0.1@53";
+            key = "xfr_key";
+          };
+
+          remote.primary-quic = {
+            address = "192.168.0.1@853";
+            key = "xfr_key";
+            quic = true;
+          };
+
+          template.default = {
+            # zonefileless setup
+            # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2
+            zonefile-sync = "-1";
+            zonefile-load = "none";
+            journal-content = "all";
+          };
+
+          zone = {
+            "example.com" = {
+              master = "primary";
+              file = "example.com.zone";
+            };
+            "sub.example.com" = {
+              master = "primary-quic";
+              file = "sub.example.com.zone";
+            };
+          };
+
+          log.syslog.any = "debug";
         };
-      client =
-        { lib, nodes, ... }:
-        {
-          imports = [ common ];
-          networking.interfaces.eth1 = {
-            ipv4.addresses = [
-              {
-                address = "192.168.0.3";
-                prefixLength = 24;
-              }
-            ];
-            ipv6.addresses = [
-              {
-                address = "fd00::3";
-                prefixLength = 64;
-              }
-            ];
-          };
-          environment.systemPackages = [ pkgs.knot-dns ];
+      };
+    client =
+      { lib, nodes, ... }:
+      {
+        imports = [ common ];
+        networking.interfaces.eth1 = {
+          ipv4.addresses = [
+            {
+              address = "192.168.0.3";
+              prefixLength = 24;
+            }
+          ];
+          ipv6.addresses = [
+            {
+              address = "fd00::3";
+              prefixLength = 64;
+            }
+          ];
         };
-    };
+        environment.systemPackages = [ pkgs.knot-dns ];
+      };
+  };
 
-    testScript =
-      { nodes, ... }:
-      let
-        primary4 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv4.addresses).address;
-        primary6 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv6.addresses).address;
+  testScript =
+    { nodes, ... }:
+    let
+      primary4 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv4.addresses).address;
+      primary6 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv6.addresses).address;
 
-        secondary4 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv4.addresses).address;
-        secondary6 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv6.addresses).address;
-      in
-      ''
-        import re
+      secondary4 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv4.addresses).address;
+      secondary6 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv6.addresses).address;
+    in
+    ''
+      import re
 
-        start_all()
+      start_all()
 
-        client.wait_for_unit("network.target")
-        primary.wait_for_unit("knot.service")
-        secondary.wait_for_unit("knot.service")
+      client.wait_for_unit("network.target")
+      primary.wait_for_unit("knot.service")
+      secondary.wait_for_unit("knot.service")
 
-        for zone in ("example.com.", "sub.example.com."):
-            secondary.wait_until_succeeds(
-              f"knotc zone-status {zone} | grep -q 'serial: 2019031302'"
-            )
+      for zone in ("example.com.", "sub.example.com."):
+          secondary.wait_until_succeeds(
+            f"knotc zone-status {zone} | grep -q 'serial: 2019031302'"
+          )
 
-        def test(host, query_type, query, pattern):
-            out = client.succeed(f"khost -t {query_type} {query} {host}").strip()
-            client.log(f"{host} replied with: {out}")
-            assert re.search(pattern, out), f'Did not match "{pattern}"'
+      def test(host, query_type, query, pattern):
+          out = client.succeed(f"khost -t {query_type} {query} {host}").strip()
+          client.log(f"{host} replied with: {out}")
+          assert re.search(pattern, out), f'Did not match "{pattern}"'
 
 
-        for host in ("${primary4}", "${primary6}", "${secondary4}", "${secondary6}"):
-            with subtest(f"Interrogate {host}"):
-                test(host, "SOA", "example.com", r"start of authority.*noc\.example\.com\.")
-                test(host, "A", "example.com", r"has no [^ ]+ record")
-                test(host, "AAAA", "example.com", r"has no [^ ]+ record")
+      for host in ("${primary4}", "${primary6}", "${secondary4}", "${secondary6}"):
+          with subtest(f"Interrogate {host}"):
+              test(host, "SOA", "example.com", r"start of authority.*noc\.example\.com\.")
+              test(host, "A", "example.com", r"has no [^ ]+ record")
+              test(host, "AAAA", "example.com", r"has no [^ ]+ record")
 
-                test(host, "A", "www.example.com", r"address 192.0.2.1$")
-                test(host, "AAAA", "www.example.com", r"address 2001:db8::1$")
+              test(host, "A", "www.example.com", r"address 192.0.2.1$")
+              test(host, "AAAA", "www.example.com", r"address 2001:db8::1$")
 
-                test(host, "NS", "sub.example.com", r"nameserver is ns\d\.example\.com.$")
-                test(host, "A", "sub.example.com", r"address 192.0.2.2$")
-                test(host, "AAAA", "sub.example.com", r"address 2001:db8::2$")
+              test(host, "NS", "sub.example.com", r"nameserver is ns\d\.example\.com.$")
+              test(host, "A", "sub.example.com", r"address 192.0.2.2$")
+              test(host, "AAAA", "sub.example.com", r"address 2001:db8::2$")
 
-                test(host, "RRSIG", "www.example.com", r"RR set signature is")
-                test(host, "DNSKEY", "example.com", r"DNSSEC key is")
+              test(host, "RRSIG", "www.example.com", r"RR set signature is")
+              test(host, "DNSKEY", "example.com", r"DNSSEC key is")
 
-        primary.log(primary.succeed("systemd-analyze security knot.service | grep -v '✓'"))
-      '';
-  }
-)
+      primary.log(primary.succeed("systemd-analyze security knot.service | grep -v '✓'"))
+    '';
+}

From dd7cee4f04a8b708a1f2bd8dfb8e2acdc10816aa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 10 Mar 2025 20:31:40 +0100
Subject: [PATCH 82/87] nixos/tests/pinnwand: migrate to runTest

Part of #386873.
---
 nixos/tests/all-tests.nix |   2 +-
 nixos/tests/pinnwand.nix  | 171 +++++++++++++++++++-------------------
 2 files changed, 87 insertions(+), 86 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 18599437c825..c860c8a6a782 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -903,7 +903,7 @@ in {
   phylactery = handleTest ./web-apps/phylactery.nix {};
   pict-rs = handleTest ./pict-rs.nix {};
   pingvin-share = handleTest ./pingvin-share.nix {} ;
-  pinnwand = handleTest ./pinnwand.nix {};
+  pinnwand = runTest ./pinnwand.nix;
   plantuml-server = handleTest ./plantuml-server.nix {};
   plasma-bigscreen = handleTest ./plasma-bigscreen.nix {};
   plasma5 = handleTest ./plasma5.nix {};
diff --git a/nixos/tests/pinnwand.nix b/nixos/tests/pinnwand.nix
index 0d3d9083c6ac..e7e62ee7dacc 100644
--- a/nixos/tests/pinnwand.nix
+++ b/nixos/tests/pinnwand.nix
@@ -1,102 +1,103 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  let
-    port = 8000;
-    baseUrl = "http://server:${toString port}";
-  in
-  {
-    name = "pinnwand";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ hexa ];
-    };
+{
+  pkgs,
+  ...
+}:
+let
+  port = 8000;
+  baseUrl = "http://server:${toString port}";
+in
+{
+  name = "pinnwand";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ hexa ];
+  };
 
-    nodes = {
-      server =
-        { config, ... }:
-        {
-          networking.firewall.allowedTCPPorts = [
-            port
-          ];
+  nodes = {
+    server =
+      { config, ... }:
+      {
+        networking.firewall.allowedTCPPorts = [
+          port
+        ];
 
-          services.pinnwand = {
-            enable = true;
-            port = port;
-          };
+        services.pinnwand = {
+          enable = true;
+          port = port;
         };
+      };
 
-      client =
-        { pkgs, ... }:
-        {
-          environment.systemPackages = [
-            pkgs.steck
+    client =
+      { pkgs, ... }:
+      {
+        environment.systemPackages = [
+          pkgs.steck
 
-            (pkgs.writers.writePython3Bin "setup-steck.py"
-              {
-                libraries = with pkgs.python3.pkgs; [
-                  appdirs
-                  toml
-                ];
-                flakeIgnore = [
-                  "E501"
-                ];
+          (pkgs.writers.writePython3Bin "setup-steck.py"
+            {
+              libraries = with pkgs.python3.pkgs; [
+                appdirs
+                toml
+              ];
+              flakeIgnore = [
+                "E501"
+              ];
+            }
+            ''
+              import appdirs
+              import toml
+              import os
+
+              CONFIG = {
+                  "base": "${baseUrl}/",
+                  "confirm": False,
+                  "magic": True,
+                  "ignore": True
               }
-              ''
-                import appdirs
-                import toml
-                import os
 
-                CONFIG = {
-                    "base": "${baseUrl}/",
-                    "confirm": False,
-                    "magic": True,
-                    "ignore": True
-                }
+              os.makedirs(appdirs.user_config_dir('steck'))
+              with open(os.path.join(appdirs.user_config_dir('steck'), 'steck.toml'), "w") as fd:
+                  toml.dump(CONFIG, fd)
+            ''
+          )
+        ];
+      };
+  };
 
-                os.makedirs(appdirs.user_config_dir('steck'))
-                with open(os.path.join(appdirs.user_config_dir('steck'), 'steck.toml'), "w") as fd:
-                    toml.dump(CONFIG, fd)
-              ''
-            )
-          ];
-        };
-    };
+  testScript = ''
+    start_all()
 
-    testScript = ''
-      start_all()
+    server.wait_for_unit("pinnwand.service")
+    client.wait_for_unit("network.target")
 
-      server.wait_for_unit("pinnwand.service")
-      client.wait_for_unit("network.target")
+    # create steck.toml config file
+    client.succeed("setup-steck.py")
 
-      # create steck.toml config file
-      client.succeed("setup-steck.py")
+    # wait until the server running pinnwand is reachable
+    client.wait_until_succeeds("ping -c1 server")
 
-      # wait until the server running pinnwand is reachable
-      client.wait_until_succeeds("ping -c1 server")
+    # make sure pinnwand is listening
+    server.wait_for_open_port(${toString port})
 
-      # make sure pinnwand is listening
-      server.wait_for_open_port(${toString port})
+    # send the contents of /etc/machine-id
+    response = client.succeed("steck paste /etc/machine-id")
 
-      # send the contents of /etc/machine-id
-      response = client.succeed("steck paste /etc/machine-id")
+    # parse the steck response
+    raw_url = None
+    removal_link = None
+    for line in response.split("\n"):
+        if line.startswith("View link:"):
+            raw_url = f"${baseUrl}/raw/{line.split('/')[-1]}"
+        if line.startswith("Removal link:"):
+            removal_link = line.split(":", 1)[1]
 
-      # parse the steck response
-      raw_url = None
-      removal_link = None
-      for line in response.split("\n"):
-          if line.startswith("View link:"):
-              raw_url = f"${baseUrl}/raw/{line.split('/')[-1]}"
-          if line.startswith("Removal link:"):
-              removal_link = line.split(":", 1)[1]
+    # check whether paste matches what we sent
+    client.succeed(f"curl {raw_url} > /tmp/machine-id")
+    client.succeed("diff /tmp/machine-id /etc/machine-id")
 
-      # check whether paste matches what we sent
-      client.succeed(f"curl {raw_url} > /tmp/machine-id")
-      client.succeed("diff /tmp/machine-id /etc/machine-id")
+    # remove paste and check that it's not available any more
+    client.succeed(f"curl {removal_link}")
+    client.fail(f"curl --fail {raw_url}")
 
-      # remove paste and check that it's not available any more
-      client.succeed(f"curl {removal_link}")
-      client.fail(f"curl --fail {raw_url}")
-
-      server.log(server.execute("systemd-analyze security pinnwand | grep '✗'")[1])
-    '';
-  }
-)
+    server.log(server.execute("systemd-analyze security pinnwand | grep '✗'")[1])
+  '';
+}

From e2e41f05a6b1f99fe7a634c7e538dce7217f6f25 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 10 Mar 2025 20:56:44 +0100
Subject: [PATCH 83/87] dlib: 19.24.6 -> 19.24.8

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

diff --git a/pkgs/by-name/dl/dlib/package.nix b/pkgs/by-name/dl/dlib/package.nix
index 8fca85081b32..16c34f2168dc 100644
--- a/pkgs/by-name/dl/dlib/package.nix
+++ b/pkgs/by-name/dl/dlib/package.nix
@@ -20,13 +20,13 @@
 }@inputs:
 (if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec {
   pname = "dlib";
-  version = "19.24.6";
+  version = "19.24.8";
 
   src = fetchFromGitHub {
     owner = "davisking";
     repo = "dlib";
     tag = "v${version}";
-    sha256 = "sha256-BpE7ZrtiiaDqwy1G4IHOQBJMr6sAadFbRxsdObs1SIY=";
+    sha256 = "sha256-b8DFlfBnF4Fk7beJPxQJDVHaCR7s5/4uAPi3RV9cBZ4=";
   };
 
   postPatch = ''

From 596c56b197525cf1329ecedd46eebd0dbb69125f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 10 Mar 2025 21:03:39 +0100
Subject: [PATCH 84/87] python312Packages.torchrl: 0.7.1 -> 0.7.2

Diff: https://github.com/pytorch/rl/compare/refs/tags/v0.7.1...v0.7.2

Changelog: https://github.com/pytorch/rl/releases/tag/v0.7.2
---
 pkgs/development/python-modules/torchrl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix
index d2131e808c51..13e8a5870a22 100644
--- a/pkgs/development/python-modules/torchrl/default.nix
+++ b/pkgs/development/python-modules/torchrl/default.nix
@@ -38,7 +38,7 @@
   tensorboard,
   wandb,
 
-  # checks
+  # tests
   imageio,
   pytest-rerunfailures,
   pytestCheckHook,
@@ -48,14 +48,14 @@
 
 buildPythonPackage rec {
   pname = "torchrl";
-  version = "0.7.1";
+  version = "0.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "rl";
     tag = "v${version}";
-    hash = "sha256-+GE84GusipNZ18euV8ag0AbOtUrYfOxUAeXeCgF2OiI=";
+    hash = "sha256-hcCZSASAp9jbOhbFLJndridYn76R99K+LxRxQl3uaxM=";
   };
 
   build-system = [
@@ -183,7 +183,7 @@ buildPythonPackage rec {
   meta = {
     description = "Modular, primitive-first, python-first PyTorch library for Reinforcement Learning";
     homepage = "https://github.com/pytorch/rl";
-    changelog = "https://github.com/pytorch/rl/releases/tag/${src.tag}";
+    changelog = "https://github.com/pytorch/rl/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
     # torhcrl is not compatible with our current version of gymnasium (>=1.0)

From 607b2513c1b9f76b0a954525a7f6f75f79e6223d Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 10 Mar 2025 21:38:52 +0100
Subject: [PATCH 85/87] viennarna: use dlib sources from nixpkgs

---
 pkgs/by-name/vi/viennarna/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/vi/viennarna/package.nix b/pkgs/by-name/vi/viennarna/package.nix
index c8e08c2a2d38..61cf15ea0db0 100644
--- a/pkgs/by-name/vi/viennarna/package.nix
+++ b/pkgs/by-name/vi/viennarna/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  dlib,
   gsl,
   mpfr,
   perl,
@@ -17,6 +18,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-mpn9aO04CJTe+01eaooocWKScAKM338W8KBdpujHFHM=";
   };
 
+  # use nixpkgs dlib sources instead of bundled ones
+  # using dlib-19.24.8 fixes the build with modern compilers (such as clang-19)
+  postPatch = ''
+    rm -rf ./src/dlib-19.24
+    cp -a ${dlib.src} ./src/dlib-19.24
+    find ./src/dlib-19.24 -type d -exec chmod +w {} \;
+  '';
+
   buildInputs = [
     gsl
     mpfr

From b17fd7b4eedf8f3f4cce28ecf820e67c8a9a512e Mon Sep 17 00:00:00 2001
From: Austin Butler <austin@butler.lol>
Date: Mon, 10 Mar 2025 14:16:31 -0700
Subject: [PATCH 86/87] mnamer: 2.5.4 -> 2.5.5

---
 .../mn/mnamer/cached_session_error.patch      | 28 +++++++++++++
 pkgs/by-name/mn/mnamer/package.nix            | 41 +++++++++++--------
 .../mn/mnamer/remove_requirements.patch       | 21 ----------
 pkgs/by-name/mn/mnamer/update_hack.patch      | 13 ------
 4 files changed, 53 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/by-name/mn/mnamer/cached_session_error.patch
 delete mode 100644 pkgs/by-name/mn/mnamer/remove_requirements.patch
 delete mode 100644 pkgs/by-name/mn/mnamer/update_hack.patch

diff --git a/pkgs/by-name/mn/mnamer/cached_session_error.patch b/pkgs/by-name/mn/mnamer/cached_session_error.patch
new file mode 100644
index 000000000000..f6a3d9a15f2f
--- /dev/null
+++ b/pkgs/by-name/mn/mnamer/cached_session_error.patch
@@ -0,0 +1,28 @@
+From 94ea94de526770e783d04d75b981dfa3ac90fd20 Mon Sep 17 00:00:00 2001
+From: o7-machienhum <ryan.cjw@gmail.com>
+Date: Tue, 30 Jan 2024 03:29:09 -0800
+Subject: [PATCH] Fixes crash
+
+---
+ mnamer/utils.py | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/mnamer/utils.py b/mnamer/utils.py
+index 84df7870..8eba68f8 100644
+--- a/mnamer/utils.py
++++ b/mnamer/utils.py
+@@ -256,7 +256,6 @@ def request_json(
+         "like Gecko) Chrome/79.0.3945.88 Safari/537.36"
+     )
+ 
+-    initial_cache_state = session._disabled  # yes, i'm a bad person
+     try:
+         session._disabled = not cache
+         response = session.request(
+@@ -272,8 +271,6 @@ def request_json(
+     except:
+         content = None
+         status = 500
+-    finally:
+-        session._disabled = initial_cache_state
+     return status, (content or {})
diff --git a/pkgs/by-name/mn/mnamer/package.nix b/pkgs/by-name/mn/mnamer/package.nix
index 8477f95ab666..6935fbf5d1de 100644
--- a/pkgs/by-name/mn/mnamer/package.nix
+++ b/pkgs/by-name/mn/mnamer/package.nix
@@ -1,31 +1,40 @@
-{ python3Packages, fetchFromGitHub, lib }:
+{
+  python3Packages,
+  fetchFromGitHub,
+  lib,
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "mnamer";
-  version = "2.5.4";
+  version = "2.5.5";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "jkwill87";
     repo = "mnamer";
-    rev = version;
-    sha256 = "sha256-fONQq/RboWHFuEFU7HP1ThUpSjOIlkg54c2WlMUKwuk=";
+    tag = version;
+    sha256 = "sha256-qQu5V1GOsbrR00HOrot6TTAkc3KRasBPDEU7ZojUBio=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
-    babelfish
-    requests
-    appdirs
-    teletype
-    requests-cache
-    guessit
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
   ];
 
-  patches = [
-    # requires specific old versions of dependencies which have been updated in nixpkgs
-    ./remove_requirements.patch
+  dependencies = with python3Packages; [
+    appdirs
+    babelfish
+    guessit
+    requests
+    requests-cache
+    teletype
+  ];
 
-    # author reads a private property that changed between versions
-    ./update_hack.patch
+  pythonRelaxDeps = true;
+
+  patches = [
+    # https://github.com/jkwill87/mnamer/pull/291
+    ./cached_session_error.patch
   ];
 
   nativeCheckInputs = [ python3Packages.pytestCheckHook ];
diff --git a/pkgs/by-name/mn/mnamer/remove_requirements.patch b/pkgs/by-name/mn/mnamer/remove_requirements.patch
deleted file mode 100644
index 46fc0571ce5e..000000000000
--- a/pkgs/by-name/mn/mnamer/remove_requirements.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 245c1dd..fdc17ab 100755
---- a/setup.py
-+++ b/setup.py
-@@ -7,16 +7,12 @@ from mnamer.__version__ import VERSION
- with open("readme.md", "r", encoding="utf8") as fp:
-     LONG_DESCRIPTION = fp.read()
- 
--with open("requirements.txt", "r", encoding="utf8") as fp:
--    REQUIREMENTS = fp.read().splitlines()
--
- setup(
-     author="Jessy Williams",
-     author_email="jessy@jessywilliams.com",
-     description="A media file organiser",
-     entry_points={"console_scripts": ["mnamer=mnamer.__main__:main"]},
-     include_package_data=True,
--    install_requires=REQUIREMENTS,
-     license="MIT",
-     long_description=LONG_DESCRIPTION,
-     long_description_content_type="text/markdown",
diff --git a/pkgs/by-name/mn/mnamer/update_hack.patch b/pkgs/by-name/mn/mnamer/update_hack.patch
deleted file mode 100644
index 56c83a20a9ce..000000000000
--- a/pkgs/by-name/mn/mnamer/update_hack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mnamer/utils.py b/mnamer/utils.py
-index 636b596..e52bd37 100644
---- a/mnamer/utils.py
-+++ b/mnamer/utils.py
-@@ -280,7 +280,7 @@ def request_json(
-         "like Gecko) Chrome/79.0.3945.88 Safari/537.36"
-     )
- 
--    initial_cache_state = session._is_cache_disabled  # yes, i'm a bad person
-+    initial_cache_state = session._disabled  # yes, i'm a bad person
-     try:
-         session._is_cache_disabled = not cache
-         response = session.request(

From bd98cca6fa570df552c0e254d5f65fb021377699 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 10 Mar 2025 22:32:31 +0100
Subject: [PATCH 87/87] anup: remove leftover Cargo.lock

---
 pkgs/applications/misc/anup/Cargo.lock | 1179 ------------------------
 1 file changed, 1179 deletions(-)
 delete mode 100644 pkgs/applications/misc/anup/Cargo.lock

diff --git a/pkgs/applications/misc/anup/Cargo.lock b/pkgs/applications/misc/anup/Cargo.lock
deleted file mode 100644
index 2482edcce7a1..000000000000
--- a/pkgs/applications/misc/anup/Cargo.lock
+++ /dev/null
@@ -1,1179 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "anime"
-version = "0.1.0"
-dependencies = [
- "attohttpc",
- "base64 0.13.0",
- "chrono",
- "diesel",
- "enum_dispatch",
- "nom",
- "serde",
- "serde_derive",
- "serde_json",
- "smallvec",
- "strsim",
- "thiserror",
-]
-
-[[package]]
-name = "anup"
-version = "0.4.0"
-dependencies = [
- "anime",
- "anyhow",
- "argh",
- "bincode",
- "bitflags",
- "chrono",
- "crossterm 0.19.0",
- "diesel",
- "dirs-next",
- "futures",
- "once_cell",
- "parking_lot",
- "pico-args",
- "ron",
- "serde",
- "serde_derive",
- "smallvec",
- "strsim",
- "thiserror",
- "tokio",
- "tui",
- "tui-utils",
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767"
-
-[[package]]
-name = "argh"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91792f088f87cdc7a2cfb1d617fa5ea18d7f1dc22ef0e1b5f82f3157cdc522be"
-dependencies = [
- "argh_derive",
- "argh_shared",
-]
-
-[[package]]
-name = "argh_derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4eb0c0c120ad477412dc95a4ce31e38f2113e46bd13511253f79196ca68b067"
-dependencies = [
- "argh_shared",
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "argh_shared"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "781f336cc9826dbaddb9754cb5db61e64cab4f69668bd19dcc4a0394a86f4cb1"
-
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
-[[package]]
-name = "attohttpc"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb8867f378f33f78a811a8eb9bf108ad99430d7aad43315dd9319c827ef6247"
-dependencies = [
- "http",
- "log",
- "rustls",
- "serde",
- "serde_json",
- "url",
- "webpki",
- "webpki-roots",
- "wildmatch",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "bincode"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772"
-dependencies = [
- "byteorder",
- "serde",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "bitvec"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-
-[[package]]
-name = "bytes"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
-
-[[package]]
-name = "cassowary"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
-
-[[package]]
-name = "cc"
-version = "1.0.67"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
-dependencies = [
- "libc",
- "num-integer",
- "num-traits",
- "time",
- "winapi",
-]
-
-[[package]]
-name = "crossterm"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e86d73f2a0b407b5768d10a8c720cf5d2df49a9efc10ca09176d201ead4b7fb"
-dependencies = [
- "bitflags",
- "crossterm_winapi 0.6.2",
- "lazy_static",
- "libc",
- "mio",
- "parking_lot",
- "signal-hook",
- "winapi",
-]
-
-[[package]]
-name = "crossterm"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c36c10130df424b2f3552fcc2ddcd9b28a27b1e54b358b45874f88d1ca6888c"
-dependencies = [
- "bitflags",
- "crossterm_winapi 0.7.0",
- "futures-core",
- "lazy_static",
- "libc",
- "mio",
- "parking_lot",
- "serde",
- "signal-hook",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da8964ace4d3e4a044fd027919b2237000b24315a37c916f61809f1ff2140b9"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "diesel"
-version = "1.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "047bfc4d5c3bd2ef6ca6f981941046113524b9a9f9a7cbdfdd7ff40f58e6f542"
-dependencies = [
- "byteorder",
- "diesel_derives",
- "libsqlite3-sys",
-]
-
-[[package]]
-name = "diesel_derives"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "enum_dispatch"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e"
-dependencies = [
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "funty"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
-
-[[package]]
-name = "futures"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
-
-[[package]]
-name = "futures-task"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
-
-[[package]]
-name = "futures-util"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
- "slab",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "heck"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "http"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "idna"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
-
-[[package]]
-name = "js-sys"
-version = "0.3.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lexical-core"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374"
-dependencies = [
- "arrayvec",
- "bitflags",
- "cfg-if",
- "ryu",
- "static_assertions",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.90"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae"
-
-[[package]]
-name = "libsqlite3-sys"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd"
-dependencies = [
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-
-[[package]]
-name = "memchr"
-version = "2.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
-
-[[package]]
-name = "mio"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2182a122f3b7f3f5329cb1972cee089ba2459a0a80a56935e6e674f096f8d839"
-dependencies = [
- "libc",
- "log",
- "miow",
- "ntapi",
- "winapi",
-]
-
-[[package]]
-name = "miow"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
-dependencies = [
- "socket2",
- "winapi",
-]
-
-[[package]]
-name = "nom"
-version = "6.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
-dependencies = [
- "bitvec",
- "funty",
- "lexical-core",
- "memchr",
- "version_check",
-]
-
-[[package]]
-name = "ntapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pico-args"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d70072c20945e1ab871c472a285fc772aefd4f5407723c206242f2c6f94595d6"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radium"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
-dependencies = [
- "getrandom",
- "redox_syscall",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ron"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064ea8613fb712a19faf920022ec8ddf134984f100090764a4e1d768f3827f1f"
-dependencies = [
- "base64 0.13.0",
- "bitflags",
- "serde",
-]
-
-[[package]]
-name = "rustls"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
-dependencies = [
- "base64 0.12.3",
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "sct"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.124"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.124"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
-dependencies = [
- "libc",
- "mio",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-
-[[package]]
-name = "smallvec"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
-
-[[package]]
-name = "socket2"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
-dependencies = [
- "cfg-if",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "syn"
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "thiserror"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "time"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "tokio"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722"
-dependencies = [
- "autocfg",
- "bytes",
- "libc",
- "mio",
- "once_cell",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "winapi",
-]
-
-[[package]]
-name = "tui"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ced152a8e9295a5b168adc254074525c17ac4a83c90b2716274cc38118bddc9"
-dependencies = [
- "bitflags",
- "cassowary",
- "crossterm 0.18.2",
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "tui-utils"
-version = "0.10.0"
-source = "git+https://github.com/Acizza/tui-utils?rev=0.10.0#109a7f264b0c160799552d209fffaee0c3f1c703"
-dependencies = [
- "smallvec",
- "tui",
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "url"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
-dependencies = [
- "form_urlencoded",
- "idna",
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "vcpkg"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
-
-[[package]]
-name = "version_check"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
-
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa"
-
-[[package]]
-name = "web-sys"
-version = "0.3.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "wildmatch"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "wyz"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"