From 69f37ce6dca756d9e95be8f3194c790ebbdafc7a Mon Sep 17 00:00:00 2001
From: Chuang Zhu <git@chuang.cz>
Date: Thu, 7 Nov 2024 17:53:02 +0800
Subject: [PATCH 01/40] nixos/environment: make {sessionV,v}ariables items
 nullable

---
 nixos/modules/config/shells-environment.nix |  8 ++++++--
 nixos/modules/config/system-environment.nix |  3 +++
 nixos/tests/env.nix                         | 12 ++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 9289eced109f..7897e20d53fb 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -34,14 +34,18 @@ in
       description = ''
         A set of environment variables used in the global environment.
         These variables will be set on shell initialisation (e.g. in /etc/profile).
+
         The value of each variable can be either a string or a list of
         strings.  The latter is concatenated, interspersed with colon
         characters.
+
+        Setting a variable to `null` does nothing. You can override a
+        variable set by another module to `null` to unset it.
       '';
-      type = with lib.types; attrsOf (oneOf [ (listOf (oneOf [ int str path ])) int str path ]);
+      type = with lib.types; attrsOf (nullOr (oneOf [ (listOf (oneOf [ int str path ])) int str path ]));
       apply = let
         toStr = v: if lib.isPath v then "${v}" else toString v;
-      in lib.mapAttrs (n: v: if lib.isList v then lib.concatMapStringsSep ":" toStr v else toStr v);
+      in attrs: lib.mapAttrs (n: v: if lib.isList v then lib.concatMapStringsSep ":" toStr v else toStr v) (lib.filterAttrs (n: v: v != null) attrs);
     };
 
     environment.profiles = lib.mkOption {
diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
index ef49701fb492..d5020d14f7d1 100644
--- a/nixos/modules/config/system-environment.nix
+++ b/nixos/modules/config/system-environment.nix
@@ -21,6 +21,9 @@ in
         list of strings. The latter is concatenated, interspersed with
         colon characters.
 
+        Setting a variable to `null` does nothing. You can override a
+        variable set by another module to `null` to unset it.
+
         Note, due to limitations in the PAM format values may not
         contain the `"` character.
 
diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix
index dec17b6b565a..cf526e5aa011 100644
--- a/nixos/tests/env.nix
+++ b/nixos/tests/env.nix
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
     maintainers = [ nequissimus ];
   };
 
-  nodes.machine = { pkgs, ... }:
+  nodes.machine = { pkgs, lib, ... }: lib.mkMerge [
     {
       boot.kernelPackages = pkgs.linuxPackages;
       environment.etc.plainFile.text = ''
@@ -17,8 +17,15 @@ import ./make-test-python.nix ({ pkgs, ...} : {
       environment.sessionVariables = {
         TERMINFO_DIRS = "/run/current-system/sw/share/terminfo";
         NIXCON = "awesome";
+        SHOULD_NOT_BE_SET = "oops";
       };
-    };
+    }
+    {
+      environment.sessionVariables = {
+        SHOULD_NOT_BE_SET = lib.mkForce null;
+      };
+    }
+  ];
 
   testScript = ''
     machine.succeed('[ -L "/etc/plainFile" ]')
@@ -32,5 +39,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
         "echo ''${TERMINFO_DIRS}"
     )
     assert "awesome" in machine.succeed("echo ''${NIXCON}")
+    machine.fail("printenv SHOULD_NOT_BE_SET")
   '';
 })

From d766ff4ccfe7de0690da9aa6a711ed214dbe2856 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 11 Mar 2025 22:13:45 +0100
Subject: [PATCH 02/40] rpm-ostree: upgrade pcre to pcre2

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

diff --git a/pkgs/by-name/rp/rpm-ostree/package.nix b/pkgs/by-name/rp/rpm-ostree/package.nix
index 63b14942e5de..592c12c19dc8 100644
--- a/pkgs/by-name/rp/rpm-ostree/package.nix
+++ b/pkgs/by-name/rp/rpm-ostree/package.nix
@@ -29,7 +29,7 @@
   librepo,
   polkit,
   bubblewrap,
-  pcre,
+  pcre2,
   check,
   python3,
   json_c,
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
     libarchive
     libsolv
     librepo
-    pcre
+    pcre2
     check
 
     # libdnf # vendored unstable branch

From 9ee92a821d615e6a1d4a4ce4afe306d460f7fc29 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 10 Mar 2025 01:48:12 +0800
Subject: [PATCH 03/40] vampire: 4.6.1 -> 4.9

---
 .../science/logic/vampire/default.nix         | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix
index 407845e38d09..7e8f209702f8 100644
--- a/pkgs/applications/science/logic/vampire/default.nix
+++ b/pkgs/applications/science/logic/vampire/default.nix
@@ -2,20 +2,19 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   z3,
   zlib,
 }:
 
 stdenv.mkDerivation rec {
   pname = "vampire";
-  version = "4.6.1";
+  version = "4.9";
 
   src = fetchFromGitHub {
     owner = "vprover";
     repo = "vampire";
-    rev = "v${version}";
-    sha256 = "0z71nxjak3ibp842r8iv37w1x3cbkrmjs88lpvxqb4sgrbyk38zd";
+    tag = "v${version}casc2024";
+    hash = "sha256-NHAlPIy33u+TRmTuFoLRlPCvi3g62ilTfJ0wleboMNU=";
   };
 
   buildInputs = [
@@ -29,21 +28,6 @@ stdenv.mkDerivation rec {
     "CXX:=$(CXX)"
   ];
 
-  patches = [
-    # https://github.com/vprover/vampire/pull/54
-    (fetchpatch {
-      name = "fix-apple-cygwin-defines.patch";
-      url = "https://github.com/vprover/vampire/commit/b4bddd3bcac6a7688742da75c369b7b3213f6d1c.patch";
-      sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza";
-    })
-    # https://github.com/vprover/vampire/pull/55
-    (fetchpatch {
-      name = "fix-wait-any.patch";
-      url = "https://github.com/vprover/vampire/commit/6da10eabb333aec54cdf13833ea33cb851159543.patch";
-      sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l";
-    })
-  ];
-
   postPatch = ''
     patch -p1 -i ${../avy/minisat-fenv.patch} -d Minisat || true
   '';
@@ -51,19 +35,27 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   fixupPhase = ''
+    runHook preFixup
+
     rm -rf z3
+
+    runHook postFixup
   '';
 
   installPhase = ''
+    runHook preInstall
+
     install -m0755 -D vampire_z3_rel* $out/bin/vampire
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://vprover.github.io/";
     description = "Vampire Theorem Prover";
     mainProgram = "vampire";
-    platforms = platforms.unix;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ];
   };
 }

From 36bd42bca91fad276214fe5608a22176276f421f Mon Sep 17 00:00:00 2001
From: Karl Ericsson <git@services.karlericsson.com>
Date: Mon, 17 Mar 2025 14:09:21 +0100
Subject: [PATCH 04/40] trippy: avoid building example binaries

Disable the default behavior of building example binaries "hello-world"
and "traceroute". The latter is particularly problematic as it conflicts
with the system's traceroute binary.

Related: https://github.com/fujiapple852/trippy/pull/1503
---
 pkgs/by-name/tr/trippy/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/tr/trippy/package.nix b/pkgs/by-name/tr/trippy/package.nix
index 9df1eb487f23..a4fc54a9a0ac 100644
--- a/pkgs/by-name/tr/trippy/package.nix
+++ b/pkgs/by-name/tr/trippy/package.nix
@@ -21,6 +21,8 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-+PaSLq++tKA6dy4CI1EYrEDdXi2TI9XHjvMLfwDp/HA=";
 
+  cargoBuildFlags = [ "--package trippy" ];
+
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     local INSTALL="$out/bin/trip"
     installShellCompletion --cmd trip \

From de5d17112156bf80bb0f3870167c8a9f5268ebeb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Mar 2025 23:02:36 +0000
Subject: [PATCH 05/40] sonarr: 4.0.13.2932 -> 4.0.14.2939

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

diff --git a/pkgs/by-name/so/sonarr/deps.json b/pkgs/by-name/so/sonarr/deps.json
index e732b9a5c68a..a024d530ea4d 100644
--- a/pkgs/by-name/so/sonarr/deps.json
+++ b/pkgs/by-name/so/sonarr/deps.json
@@ -955,8 +955,8 @@
   },
   {
     "pname": "SixLabors.ImageSharp",
-    "version": "3.1.6",
-    "hash": "sha256-FQjLyC4158F1GyhlKjzjGo6TxAu698rYWTY9lkko/fA="
+    "version": "3.1.7",
+    "hash": "sha256-jMD/FiIwW1kNhTI6hKig8/QFOO3eTQX/C22cSAcKBH4="
   },
   {
     "pname": "Swashbuckle.AspNetCore.Annotations",
diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix
index 88bd0da6bee8..ae45fb817bff 100644
--- a/pkgs/by-name/so/sonarr/package.nix
+++ b/pkgs/by-name/so/sonarr/package.nix
@@ -21,7 +21,7 @@
   applyPatches,
 }:
 let
-  version = "4.0.13.2932";
+  version = "4.0.14.2939";
   # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
   # the already patched lockfile to `fetchYarnDeps`.
   src = applyPatches {
@@ -29,7 +29,7 @@ let
       owner = "Sonarr";
       repo = "Sonarr";
       tag = "v${version}";
-      hash = "sha256-BR7CU8q+L2CY2UqR9n0cbX9R7ergzRPPvSrLl7Cn7EU=";
+      hash = "sha256-gtEDrAosI0Kyk712Kf8QDuloUBq9AArKdukX/PKAo8M=";
     };
     patches =
       [

From aec6ccc985b15692c2cde29fd7af8773664bb883 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Mar 2025 00:33:49 +0000
Subject: [PATCH 06/40] libjodycode: 3.1.1 -> 3.1.2

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

diff --git a/pkgs/by-name/li/libjodycode/package.nix b/pkgs/by-name/li/libjodycode/package.nix
index acac78266f88..164fdb1f66e8 100644
--- a/pkgs/by-name/li/libjodycode/package.nix
+++ b/pkgs/by-name/li/libjodycode/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libjodycode";
-  version = "3.1.1";
+  version = "3.1.2";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "jbruchon";
     repo = "libjodycode";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-sVEa2gNvgRJK1Ycmv4inbViTBPQFjzcZ8XHlAdsNzOk=";
+    hash = "sha256-doTGeIElftC4SAcn3MTQ+DffQFMv1Elo28i/MFxjFzk=";
   };
 
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

From e69c6d0fdc392864445dd78c7a2e0ba39a9fa33e Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Wed, 19 Mar 2025 11:33:37 +0100
Subject: [PATCH 07/40] reposilite: add updateScript

this script also updates the plugin hashes
---
 pkgs/by-name/re/reposilite/package.nix  |  2 ++
 pkgs/by-name/re/reposilite/plugins.json |  7 +++++++
 pkgs/by-name/re/reposilite/plugins.nix  | 12 +++++-------
 pkgs/by-name/re/reposilite/update.sh    | 20 ++++++++++++++++++++
 4 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/by-name/re/reposilite/plugins.json
 create mode 100755 pkgs/by-name/re/reposilite/update.sh

diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix
index 1a8a443a3598..c982a7aac043 100644
--- a/pkgs/by-name/re/reposilite/package.nix
+++ b/pkgs/by-name/re/reposilite/package.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Lightweight and easy-to-use repository management software dedicated for the Maven based artifacts in the JVM ecosystem";
     homepage = "https://github.com/dzikoysk/reposilite";
diff --git a/pkgs/by-name/re/reposilite/plugins.json b/pkgs/by-name/re/reposilite/plugins.json
new file mode 100644
index 000000000000..6cbf15625a2e
--- /dev/null
+++ b/pkgs/by-name/re/reposilite/plugins.json
@@ -0,0 +1,7 @@
+{
+  "checksum": "sha256-s7GADQqFsoEDM2vtJFE/C/F5jGyQeYlT3BntvHS4DtQ=",
+  "groovy": "sha256-8HWMqZZNIqCBpkMuCjKxqTLcQ2dYaOAAYON9QrXYEyo=",
+  "migration": "sha256-Xv0+RsXZzyGV/4v0IT3hfNANiC1OWVYFoTZHDxduKh0=",
+  "prometheus": "sha256-F5fSUo6wt7L3R/xCike0SlfG3CyxHKrlrg+SNrUYtm4=",
+  "swagger": "sha256-wyXKrYBhigHVtxq/RZiJhnigc3Z/UCbYotrF6VLLTGA="
+}
diff --git a/pkgs/by-name/re/reposilite/plugins.nix b/pkgs/by-name/re/reposilite/plugins.nix
index 8b5881181553..68a0ea2cfffb 100644
--- a/pkgs/by-name/re/reposilite/plugins.nix
+++ b/pkgs/by-name/re/reposilite/plugins.nix
@@ -1,7 +1,11 @@
 {
+  lib,
   generateSplicesForMkScope,
   makeScopeWithSplicing',
 }:
+let
+  pluginHashes = lib.importJSON ./plugins.json;
+in
 makeScopeWithSplicing' {
   otherSplices = generateSplicesForMkScope "reposilitePlugins";
   f =
@@ -39,11 +43,5 @@ makeScopeWithSplicing' {
         )
       ) { };
     }
-    // builtins.mapAttrs (name: hash: self.fetchPlugin { inherit name hash; }) {
-      checksum = "sha256-s7GADQqFsoEDM2vtJFE/C/F5jGyQeYlT3BntvHS4DtQ=";
-      groovy = "sha256-8HWMqZZNIqCBpkMuCjKxqTLcQ2dYaOAAYON9QrXYEyo=";
-      migration = "sha256-Xv0+RsXZzyGV/4v0IT3hfNANiC1OWVYFoTZHDxduKh0=";
-      prometheus = "sha256-F5fSUo6wt7L3R/xCike0SlfG3CyxHKrlrg+SNrUYtm4=";
-      swagger = "sha256-wyXKrYBhigHVtxq/RZiJhnigc3Z/UCbYotrF6VLLTGA=";
-    };
+    // builtins.mapAttrs (name: hash: self.fetchPlugin { inherit name hash; }) pluginHashes;
 }
diff --git a/pkgs/by-name/re/reposilite/update.sh b/pkgs/by-name/re/reposilite/update.sh
new file mode 100755
index 000000000000..806a75716771
--- /dev/null
+++ b/pkgs/by-name/re/reposilite/update.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+
+# shellcheck shell=bash
+
+set -euo pipefail
+
+latestVersion=$(list-git-tags --url=https://github.com/dzikoysk/reposilite | grep -E '^[0-9.]+$' | sort --reverse --version-sort | head -n 1)
+
+update-source-version reposilite "$latestVersion"
+
+jq -r 'keys[]' ./pkgs/by-name/re/reposilite/plugins.json | while read -r plugin; do
+    tmpfile=$(mktemp)
+    curl -o "$tmpfile" "https://maven.reposilite.com/releases/com/reposilite/plugin/$plugin-plugin/$latestVersion/$plugin-plugin-$latestVersion-all.jar"
+    hash=$(nix-hash --sri --flat --type sha256 "$tmpfile")
+
+    updatedContent=$(jq ".$plugin = \"$hash\"" ./pkgs/by-name/re/reposilite/plugins.json)
+    echo -E "$updatedContent" > ./pkgs/by-name/re/reposilite/plugins.json
+done
+

From 961f340355ad48966e877d0fc9a5ebdca31cff1f Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Wed, 19 Mar 2025 10:38:06 +0000
Subject: [PATCH 08/40] reposilite: 3.5.21 -> 3.5.22

---
 pkgs/by-name/re/reposilite/package.nix  |  4 ++--
 pkgs/by-name/re/reposilite/plugins.json | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix
index c982a7aac043..ca5bd30a0010 100644
--- a/pkgs/by-name/re/reposilite/package.nix
+++ b/pkgs/by-name/re/reposilite/package.nix
@@ -17,11 +17,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "Reposilite";
-  version = "3.5.21";
+  version = "3.5.22";
 
   src = fetchurl {
     url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar";
-    hash = "sha256-jE9wCShscLp3rUbybd35kBL4UvvENExuUlJXr55qnow=";
+    hash = "sha256-6wrvV4o81Y5nO3i0mRS/ERgNG3IqH95VdrJEYOm0z3E=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/re/reposilite/plugins.json b/pkgs/by-name/re/reposilite/plugins.json
index 6cbf15625a2e..53db0ae00a73 100644
--- a/pkgs/by-name/re/reposilite/plugins.json
+++ b/pkgs/by-name/re/reposilite/plugins.json
@@ -1,7 +1,7 @@
 {
-  "checksum": "sha256-s7GADQqFsoEDM2vtJFE/C/F5jGyQeYlT3BntvHS4DtQ=",
-  "groovy": "sha256-8HWMqZZNIqCBpkMuCjKxqTLcQ2dYaOAAYON9QrXYEyo=",
-  "migration": "sha256-Xv0+RsXZzyGV/4v0IT3hfNANiC1OWVYFoTZHDxduKh0=",
-  "prometheus": "sha256-F5fSUo6wt7L3R/xCike0SlfG3CyxHKrlrg+SNrUYtm4=",
-  "swagger": "sha256-wyXKrYBhigHVtxq/RZiJhnigc3Z/UCbYotrF6VLLTGA="
+  "checksum": "sha256-Esxe2RBeJla2o8qLT5bLSLGCtsakM5nKk2rTd+eOleE=",
+  "groovy": "sha256-Jt2LX9P9PMOY6An2k73CNKbQ8Zi/8wz0a4YTsRS7v7E=",
+  "migration": "sha256-j71SqHQZN6O1fmbCLqqyBL58bGe6WQf0brjRgGEEW+c=",
+  "prometheus": "sha256-AjwuA58XutkCJK4/b44CSNS3GAM6GZKkAlvVwBEF93k=",
+  "swagger": "sha256-I4I3PCgAUYbUlJHLj6yb+3UME+G8/5+EaUXG4HbMS58="
 }

From 8860f159672eca8c5dddabb2d368b495e7fae8d1 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 24 Mar 2025 00:20:41 +0000
Subject: [PATCH 09/40] citations: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/by-name/ci/citations/package.nix b/pkgs/by-name/ci/citations/package.nix
index e18b80bf04aa..7fc6357ac63b 100644
--- a/pkgs/by-name/ci/citations/package.nix
+++ b/pkgs/by-name/ci/citations/package.nix
@@ -24,19 +24,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "citations";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "citations";
     rev = finalAttrs.version;
-    hash = "sha256-WYy6cyPmyWL/11yHf+dRbcZGBfvVfELeTwKvpJMu5ns=";
+    hash = "sha256-aJp9UrfRXAsnHFGgMTHGRgCvlPEa62r9/0hEp5YKRzE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     src = finalAttrs.src;
-    hash = "sha256-bqZZIA7sE0viAhI5GUFIVCXTkK+U9aWPvCPCug5SR94=";
+    hash = "sha256-ZoflXdou6S7CYFF5x1pB71Ur08X1W6wPaJIm1sYsI2w=";
   };
 
   nativeBuildInputs = [

From b62f17379d6c7c8422187b45e323e655788a65d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 24 Mar 2025 03:19:45 +0000
Subject: [PATCH 10/40] openhantek6022: 3.3.3 -> 3.4.0

---
 .../science/electronics/openhantek6022/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix
index 5f3ce59053ce..9aab0615d9fc 100644
--- a/pkgs/applications/science/electronics/openhantek6022/default.nix
+++ b/pkgs/applications/science/electronics/openhantek6022/default.nix
@@ -13,13 +13,13 @@
 
 mkDerivation rec {
   pname = "openhantek6022";
-  version = "3.3.3";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "OpenHantek";
     repo = "OpenHantek6022";
     rev = version;
-    sha256 = "sha256-y2pNLAa0P/r0YEdKjQ3iP66cqtTWERG8lTOZDR64WTk=";
+    sha256 = "sha256-FT+DyfD5WHBblRXWXFnyB2xwoIgoh84oB+QN32wx78c=";
   };
 
   nativeBuildInputs = [

From 00a3a62a70f6c2ca919befeda4b8a7319ce8be2b Mon Sep 17 00:00:00 2001
From: Kai <k.clasen@fastmail.net>
Date: Sun, 23 Mar 2025 07:47:00 +0100
Subject: [PATCH 11/40] immich-go: 0.22.1 -> 0.25.0

Diff: https://github.com/simulot/immich-go/compare/0.22.1...v0.25.0

Changelog: https://github.com/simulot/immich-go/releases/tag/v0.25.0
---
 pkgs/by-name/im/immich-go/package.nix | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix
index 22337bcf166b..c5489541fc69 100644
--- a/pkgs/by-name/im/immich-go/package.nix
+++ b/pkgs/by-name/im/immich-go/package.nix
@@ -5,16 +5,17 @@
   nix-update-script,
   testers,
   immich-go,
+  writableTmpDirAsHomeHook,
 }:
 buildGoModule rec {
   pname = "immich-go";
-  version = "0.22.1";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "simulot";
     repo = "immich-go";
-    rev = "${version}";
-    hash = "sha256-6bLjHKkEghbY+UQFrgbfeHwOjtks1HjXbDXEr7DuJbU=";
+    tag = "v${version}";
+    hash = "sha256-C7QfuCJNraOan6N67k7k30hKwJUDzRCNvWpJM3N328s=";
 
     # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32
     # The intention here is to write the information into files in the `src`'s
@@ -31,27 +32,31 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-jED1K2zHv60zxMY4P7Z739uzf7PtlsnvZyStOSLKi4M=";
+  vendorHash = "sha256-J8vqii0X6GGmOCJ6L9lILz9NQEPa7Idg/ULrdRqBS9U=";
 
   # options used by upstream:
-  # https://github.com/simulot/immich-go/blob/0.13.2/.goreleaser.yaml
+  # https://github.com/simulot/immich-go/blob/v0.25.0/.goreleaser.yaml
   ldflags = [
     "-s"
     "-w"
     "-extldflags=-static"
-    "-X main.version=${version}"
+    "-X github.com/simulot/immich-go/app.Version=${version}"
   ];
 
   preBuild = ''
-    ldflags+=" -X main.commit=$(cat COMMIT)"
-    ldflags+=" -X main.date=$(cat SOURCE_DATE)"
+    ldflags+=" -X github.com/simulot/immich-go/Commit=$(cat COMMIT)"
+    ldflags+=" -X github.com/simulot/immich-go/Date=$(cat SOURCE_DATE)"
   '';
 
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
   passthru = {
     updateScript = nix-update-script { };
     tests.versionTest = testers.testVersion {
       package = immich-go;
-      command = "immich-go -version";
+      command = "immich-go --version";
       version = version;
     };
   };
@@ -66,6 +71,6 @@ buildGoModule rec {
     mainProgram = "immich-go";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ kai-tub ];
-    changelog = "https://github.com/simulot/immich-go/releases/tag/${version}";
+    changelog = "https://github.com/simulot/immich-go/releases/tag/${src.tag}";
   };
 }

From 000f6a6729016825ae76ae0963c55aef2a23b538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 24 Mar 2025 21:57:00 -0700
Subject: [PATCH 12/40] python313Packages.albumentations: 2.0.0 -> 2.0.5

Diff: https://github.com/albumentations-team/albumentations/compare/refs/tags/2.0.0...2.0.5

Changelog: https://github.com/albumentations-team/albumentations/releases/tag/2.0.5
---
 .../python-modules/albumentations/default.nix | 19 ++++++++++---------
 .../dont-check-for-updates.patch              | 10 +++++-----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix
index 68190b121656..35a5da9bf069 100644
--- a/pkgs/development/python-modules/albumentations/default.nix
+++ b/pkgs/development/python-modules/albumentations/default.nix
@@ -9,29 +9,29 @@
 
   # dependencies
   albucore,
-  eval-type-backport,
   numpy,
   opencv-python,
   pydantic,
   pyyaml,
-  scikit-image,
   scipy,
 
   # optional dependencies
   huggingface-hub,
   pillow,
+  torch,
 
   # tests
   deepdiff,
   pytestCheckHook,
   pytest-mock,
-  torch,
+  scikit-image,
+  scikit-learn,
   torchvision,
 }:
 
 buildPythonPackage rec {
   pname = "albumentations";
-  version = "2.0.0";
+  version = "2.0.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     owner = "albumentations-team";
     repo = "albumentations";
     tag = version;
-    hash = "sha256-8WEOI2J2H4PNhyb9LoIUMofGKx9AHPiPddkQCSdh8/A=";
+    hash = "sha256-WqU25I1DxBqZAXd2+sNMUv/HOL4towlGTnFnpCGmMgY=";
   };
 
   patches = [
@@ -53,17 +53,16 @@ buildPythonPackage rec {
 
   dependencies = [
     albucore
-    eval-type-backport
     numpy
     opencv-python
     pydantic
     pyyaml
-    scikit-image
     scipy
   ];
 
   optional-dependencies = {
     hub = [ huggingface-hub ];
+    pytorch = [ torch ];
     text = [ pillow ];
   };
 
@@ -71,14 +70,16 @@ buildPythonPackage rec {
     deepdiff
     pytestCheckHook
     pytest-mock
+    scikit-image
+    scikit-learn
     torch
     torchvision
   ];
 
   disabledTests = [
     "test_pca_inverse_transform"
-    # this test hangs up
-    "test_transforms"
+    # test hangs
+    "test_keypoint_remap_methods"
   ];
 
   pythonImportsCheck = [ "albumentations" ];
diff --git a/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch b/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch
index 617ce259ca2b..6f9214e02f70 100644
--- a/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch
+++ b/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch
@@ -1,11 +1,11 @@
 diff --git a/albumentations/__init__.py b/albumentations/__init__.py
-index 0b3b531..7c69c65 100644
+index 44ee9b9..ea3bc50 100644
 --- a/albumentations/__init__.py
 +++ b/albumentations/__init__.py
-@@ -7,7 +7,3 @@ from .augmentations import *
- from .core.composition import *
- from .core.serialization import *
- from .core.transforms_interface import *
+@@ -22,7 +22,3 @@ from .core.transforms_interface import *
+ 
+ with suppress(ImportError):
+     from .pytorch import *
 -
 -# Perform the version check after all other initializations
 -if os.getenv("NO_ALBUMENTATIONS_UPDATE", "").lower() not in {"true", "1"}:

From 6b076e9c2628775e64105829cd1c3368cba62546 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 25 Mar 2025 20:00:59 +0200
Subject: [PATCH 13/40] linuxPackages.zenpower: Switch to renamed upstream

Same hash and output
---
 pkgs/os-specific/linux/zenpower/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix
index 019734b0a8eb..803e1daafa96 100644
--- a/pkgs/os-specific/linux/zenpower/default.nix
+++ b/pkgs/os-specific/linux/zenpower/default.nix
@@ -2,17 +2,15 @@
   lib,
   stdenv,
   kernel,
-  fetchFromGitea,
+  fetchgit,
 }:
 
 stdenv.mkDerivation rec {
   pname = "zenpower";
   version = "unstable-2022-11-04";
 
-  src = fetchFromGitea {
-    domain = "git.exozy.me";
-    owner = "a";
-    repo = "zenpower3";
+  src = fetchgit {
+    url = "https://git.unnamed.website/zenpower3/";
     rev = "c176fdb0d5bcba6ba2aba99ea36812e40f47751f";
     sha256 = "sha256-d2WH8Zv7F0phZmEKcDiaak9On+Mo9bAFhMulT/N5FWI=";
   };

From d9575d93ac2f48191a40a990f2491bfb6bad584f Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 25 Mar 2025 22:29:54 +0200
Subject: [PATCH 14/40] linuxPackages.zenpower: unstable-2022-11-04 ->
 unstable-2025-02-28

Switch to a fork made by a copr maintainer

https://copr.fedorainfracloud.org/coprs/shdwchn10/zenpower3/package/zenpower3-kmod/
https://gitlab.com/shdwchn10/copr-zenpower3
https://gitlab.com/shdwchn10/zenpower3

Old git.exozy.me is now https://git.unnamed.website/zenpower3/
---
 pkgs/os-specific/linux/zenpower/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix
index 803e1daafa96..10a61bfafa53 100644
--- a/pkgs/os-specific/linux/zenpower/default.nix
+++ b/pkgs/os-specific/linux/zenpower/default.nix
@@ -2,17 +2,18 @@
   lib,
   stdenv,
   kernel,
-  fetchgit,
+  fetchFromGitLab,
 }:
 
 stdenv.mkDerivation rec {
   pname = "zenpower";
-  version = "unstable-2022-11-04";
+  version = "unstable-2025-02-28";
 
-  src = fetchgit {
-    url = "https://git.unnamed.website/zenpower3/";
-    rev = "c176fdb0d5bcba6ba2aba99ea36812e40f47751f";
-    sha256 = "sha256-d2WH8Zv7F0phZmEKcDiaak9On+Mo9bAFhMulT/N5FWI=";
+  src = fetchFromGitLab {
+    owner = "shdwchn10";
+    repo = "zenpower3";
+    rev = "138fa0637b46a0b0a087f2ba4e9146d2f9ba2475";
+    sha256 = "sha256-kLtkG97Lje+Fd5FoYf+UlSaEyxFaETtXrSjYzFnHkjY=";
   };
 
   hardeningDisable = [ "pic" ];

From 1e5ef0ca2820ebc9fcfd6c04b907ca60658a53b5 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 25 Mar 2025 22:34:13 +0200
Subject: [PATCH 15/40] zenmonitor: unstable-2024-05-21 -> unstable-2024-12-19

https://copr.fedorainfracloud.org/coprs/shdwchn10/zenpower3/package/zenpower3-kmod/
https://gitlab.com/shdwchn10/copr-zenpower3
https://gitlab.com/shdwchn10/zenpower3

Old git.exozy.me is now https://git.unnamed.website/zenmonitor3/
---
 pkgs/by-name/ze/zenmonitor/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ze/zenmonitor/package.nix b/pkgs/by-name/ze/zenmonitor/package.nix
index 648e0e96d720..4d4d35dffcc1 100644
--- a/pkgs/by-name/ze/zenmonitor/package.nix
+++ b/pkgs/by-name/ze/zenmonitor/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromGitea,
+  fetchFromGitLab,
   pkg-config,
   gtk3,
   wrapGAppsHook3,
@@ -9,11 +9,10 @@
 
 stdenv.mkDerivation rec {
   pname = "zenmonitor";
-  version = "unstable-2024-05-21";
+  version = "unstable-2024-12-19";
 
-  src = fetchFromGitea {
-    domain = "git.exozy.me";
-    owner = "a";
+  src = fetchFromGitLab {
+    owner = "shdwchn10";
     repo = "zenmonitor3";
     rev = "a09f0b25d33967fd32f3831304be049b008cdabf";
     sha256 = "sha256-5N1Hhv2s0cv4Rujw4wFGHyIy7NyKAFThVvAo+xXqSyk=";

From d4bd5e0444b13bcec20e8fcb5d21d4c1945aa4ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 02:04:09 +0000
Subject: [PATCH 16/40] python312Packages.internetarchive: 5.2.1 -> 5.3.0

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

diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index bc23a5c41e72..51b1a8171551 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "internetarchive";
-  version = "5.2.1";
+  version = "5.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "jjjake";
     repo = "internetarchive";
     tag = "v${version}";
-    hash = "sha256-2CShbIS5hq+queeHHlE53Vf8sl4HQySp1ZU8mz67Qbc=";
+    hash = "sha256-1DJ4ZPL1Px1BKP9RHY/evoIwLzxG0aQNq9gteBi4RZs=";
   };
 
   build-system = [ setuptools ];

From 64d2baf7102ed075a8ece0b39fb9a2a721ae0c32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 08:48:54 +0000
Subject: [PATCH 17/40] tabby: 0.24.0 -> 0.26.0

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

diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix
index 987d08c8efaa..38deef08262d 100644
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@@ -32,7 +32,7 @@ let
   # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix
 
   pname = "tabby";
-  version = "0.24.0";
+  version = "0.26.0";
 
   availableAccelerations = flatten [
     (optional cudaSupport "cuda")
@@ -121,12 +121,12 @@ rustPlatform.buildRustPackage {
     owner = "TabbyML";
     repo = "tabby";
     tag = "v${version}";
-    hash = "sha256-poWUfPp/7w6dNjh6yoP5oTbaP4lL91hb1+zQG8tjUDE=";
+    hash = "sha256-OIt0UtknzPikGowfYWMufBXl0Ktt6zsZKqRMx63UqR4=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-CTn/b42FI+Y6qy3MKVESIbIlsXmIkZBlxUXnRtHWZcc=";
+  cargoHash = "sha256-wkd2EVCyWkUEo/gqNuX+P5wDeNmx0Jrd7UhhvIZwAFU=";
 
   # Don't need to build llama-cpp-server (included in default build)
   # We also don't add CUDA features here since we're using the overridden llama-cpp package

From 0527e36099a7e90178377a356d2106327e1fa3e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 09:28:48 +0000
Subject: [PATCH 18/40] upbound-main: 0.39.0-0.rc.0.161.gfb781f0d ->
 0.39.0-0.rc.0.249.g7b07f31c

---
 pkgs/by-name/up/upbound/sources-main.json | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json
index 80833b96a637..23aba8c6550c 100644
--- a/pkgs/by-name/up/upbound/sources-main.json
+++ b/pkgs/by-name/up/upbound/sources-main.json
@@ -8,38 +8,38 @@
   "fetchurlAttrSet": {
     "docker-credential-up": {
       "aarch64-darwin": {
-        "hash": "sha256-OeFMycBwFtZStrXduaGRY0VCB/EFWndzkx7IgGsB+XQ=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/darwin_arm64.tar.gz"
+        "hash": "sha256-AYOZmdNaiGZLwvbyl6DaubWyXDqZcSbWP1/jJ3Idx6Q=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/darwin_arm64.tar.gz"
       },
       "aarch64-linux": {
-        "hash": "sha256-XTtcnxJ+N9DPBunyBd9mk5JSN12H//73aZiiWZ5JNEM=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/linux_arm64.tar.gz"
+        "hash": "sha256-r4chc5wMENvoEHtSIGw1fSys6ixZmg1WqfR+0ovdCDg=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/linux_arm64.tar.gz"
       },
       "x86_64-darwin": {
-        "hash": "sha256-QmFB1w1CgrjE1ON4FHuyjyXyvmplNhmcFH+3Xew5nsE=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/darwin_amd64.tar.gz"
+        "hash": "sha256-x4b3j1fyS3P5ouJTDovgJcZVaNzxvqiZn++p5d6WDRI=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/darwin_amd64.tar.gz"
       },
       "x86_64-linux": {
-        "hash": "sha256-Xa26xnlJ2s7rjMyV+Xo7A/OjAjsAg3fZ21rTCkLHOAM=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/linux_amd64.tar.gz"
+        "hash": "sha256-uZPfsXNz3Z0cdBV9hJ4x7HPSXFVDiXqDf/NA1CMBa/M=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/linux_amd64.tar.gz"
       }
     },
     "up": {
       "aarch64-darwin": {
-        "hash": "sha256-Md+lA+JqVaA60hJLQBDKfQYBbUwMQBVT/kPsgSCEuIY=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/darwin_arm64.tar.gz"
+        "hash": "sha256-CcJi11DZivlcelg6nKYUyWstTUqQ6r9EIt6dhWI3fbQ=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/darwin_arm64.tar.gz"
       },
       "aarch64-linux": {
-        "hash": "sha256-fCuvg8kQg9GozlrQfYHGZtPGYVJgJccW1LkYUxMF4DI=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/linux_arm64.tar.gz"
+        "hash": "sha256-QKdkDzoVzxbO677nl8tMoJA4/oqV4V8/h72HikOzxTc=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/linux_arm64.tar.gz"
       },
       "x86_64-darwin": {
-        "hash": "sha256-nzRUk4FG4oHb6IPHHKBfUlJJvn74RM632Vmo+SF/EHg=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/darwin_amd64.tar.gz"
+        "hash": "sha256-xfvMty4OkVFG+UkIfOgD6ZOOXILbPGTjApKH0oJKsKY=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/darwin_amd64.tar.gz"
       },
       "x86_64-linux": {
-        "hash": "sha256-FpILjL2IV4EJ7UfLuBPHUfCDxx0a86+P5AZm3yinHuA=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/linux_amd64.tar.gz"
+        "hash": "sha256-/5/+dPh6V/69RrqPj/0D4bECX2/2pqQJjo/dNgi/EgE=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/linux_amd64.tar.gz"
       }
     }
   },
@@ -49,5 +49,5 @@
     "x86_64-darwin",
     "x86_64-linux"
   ],
-  "version": "0.39.0-0.rc.0.161.gfb781f0d"
+  "version": "0.39.0-0.rc.0.249.g7b07f31c"
 }

From bcc57092e37f2623f701ab3afb8a853da48441fa Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 26 Mar 2025 22:24:10 +0100
Subject: [PATCH 19/40] python312Packages.pylance: 0.25.0 -> 0.25.1

Diff: https://github.com/lancedb/lance/compare/refs/tags/v0.25.0...v0.25.1

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

diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index dc7b0074079e..cba2e2cba64e 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "pylance";
-  version = "0.25.0";
+  version = "0.25.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     tag = "v${version}";
-    hash = "sha256-LIrRO5v7XjTLW7ghFTAcrklN2Zlx8tOaUaSqhfFIlnQ=";
+    hash = "sha256-mAVHpQfuAr4RQ8ZwsJHwKtlAtWO3ssm0ic6Y2/c1tZk=";
   };
 
   sourceRoot = "${src.name}/python";
@@ -50,7 +50,7 @@ buildPythonPackage rec {
       src
       sourceRoot
       ;
-    hash = "sha256-ZyfrIouMGlrgDNcoxmPZpDmLEKEX9oROAsYwOQXCQnI=";
+    hash = "sha256-auL8d8gu2V7kCb4LKdP7mmJZys4YLi2s856/aE73e7Q=";
   };
 
   nativeBuildInputs = [

From facba1f63adac7920f0460a5cf94c358606fb72d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 10 Mar 2025 10:09:37 +0100
Subject: [PATCH 20/40] nixos/code-server: recommend libargon2 over `npx
 argon2-cli`

---
 nixos/modules/services/web-apps/code-server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/code-server.nix b/nixos/modules/services/web-apps/code-server.nix
index c310fa70b944..3ec119d76b0a 100644
--- a/nixos/modules/services/web-apps/code-server.nix
+++ b/nixos/modules/services/web-apps/code-server.nix
@@ -86,7 +86,7 @@ in
       hashedPassword = lib.mkOption {
         default = "";
         description = ''
-          Create the password with: `echo -n 'thisismypassword' | npx argon2-cli -e`.
+          Create the password with: {command}`echo -n 'thisismypassword' | nix run nixpkgs#libargon2 -- "$(head -c 20 /dev/random | base64)" -e`
         '';
         type = lib.types.str;
       };

From beb9f2c3b6f830ddfe64116103c93adf8839a6e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 22:57:51 +0000
Subject: [PATCH 21/40] nezha: 1.9.11 -> 1.10.4

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

diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix
index efe4793aaab2..4dd38bfc91ca 100644
--- a/pkgs/by-name/ne/nezha/package.nix
+++ b/pkgs/by-name/ne/nezha/package.nix
@@ -14,7 +14,7 @@
 
 let
   pname = "nezha";
-  version = "1.9.11";
+  version = "1.10.4";
 
   frontendName = lib.removePrefix "nezha-theme-";
 
@@ -58,7 +58,7 @@ buildGo124Module {
     owner = "nezhahq";
     repo = "nezha";
     tag = "v${version}";
-    hash = "sha256-qGWOy4nKgCXt2AzQB/tbllRifuXxfZCt9ITE+KtThDU=";
+    hash = "sha256-9dw1MT3v7ZCpC/MrlZDJmZ9EdTNVIbE0b45ao3eXO7o=";
   };
 
   proxyVendor = true;
@@ -97,7 +97,7 @@ buildGo124Module {
     GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false
   '';
 
-  vendorHash = "sha256-VEWev+RPt7WSa8UsiADxUndeCmnUmhQddriJ2tQoNxA=";
+  vendorHash = "sha256-ftVcbO1QYIEYUwPqxAHE/7TNBwzgN5BNyu5+rTnOgIs=";
 
   ldflags = [
     "-s"

From 58c3c75a0acf8264bc6e834a0c7bfc8bcf879360 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Thu, 27 Mar 2025 00:19:28 +0100
Subject: [PATCH 22/40] home-assistant-custom-components.localtuya: 2025.3.1 ->
 2025.3.2 https://github.com/xZetsubou/hass-localtuya/releases/tag/2025.3.2

---
 .../home-assistant/custom-components/localtuya/package.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/localtuya/package.nix b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix
index f7b0f8a81fe8..5c4e63386784 100644
--- a/pkgs/servers/home-assistant/custom-components/localtuya/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "xZetsubou";
   domain = "localtuya";
-  version = "2025.3.1";
+  version = "2025.3.2";
 
   src = fetchFromGitHub {
     owner = "xZetsubou";
     repo = "hass-localtuya";
     rev = version;
-    hash = "sha256-DZ0TS6vdMDBCYP661GeRm+pAmm387/+/DayIBkeuPQA=";
+    hash = "sha256-6JE2hVD650YE7pSrLt+Ie1QpvHcG0bJ2yrTpwTukBG0=";
   };
 
   meta = with lib; {

From 391f8c94bd2a8754285a60fccbc023c2028af4d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 00:05:44 +0000
Subject: [PATCH 23/40] opengamepadui: 0.37.0 -> 0.39.0

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

diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix
index 155f3342bed4..807b5ad92204 100644
--- a/pkgs/by-name/op/opengamepadui/package.nix
+++ b/pkgs/by-name/op/opengamepadui/package.nix
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opengamepadui";
-  version = "0.37.0";
+  version = "0.39.0";
 
   buildType = if withDebug then "debug" else "release";
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ShadowBlip";
     repo = "OpenGamepadUI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kzGFyzOu4Pkj+a7kExFwxFu35qfoLoWz3uqd8COUTNA=";
+    hash = "sha256-eBHDJVbPL4Lw1TDOOJT4rzvSb+F7J6EdsLbL4co69nk=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 492f746e4096b6e19beb67b3c8630bbdfbf63a33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 00:06:37 +0000
Subject: [PATCH 24/40] cura-appimage: 5.9.1 -> 5.10.0

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

diff --git a/pkgs/by-name/cu/cura-appimage/package.nix b/pkgs/by-name/cu/cura-appimage/package.nix
index a6a764697726..4bfad00819b6 100644
--- a/pkgs/by-name/cu/cura-appimage/package.nix
+++ b/pkgs/by-name/cu/cura-appimage/package.nix
@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cura-appimage";
-  version = "5.9.1";
+  version = "5.10.0";
 
   # Give some good names so the intermediate packages are easy
   # to recognise by name in the Nix store.
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
-    hash = "sha256-kkZGmpskFXEtTYHh62/Zyk6JBZsH5mSiQwzqrfjCrqU=";
+    hash = "sha256-8Km249t0m4YnOsyXyjJJD0y4n9kUCrA/AcsqBcrVf5Q=";
   };
 
   appimageContents = appimageTools.extract {

From 8af4a78d0d0486de96e0207eba72ff43382eb2dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 23 Mar 2025 11:56:53 -0700
Subject: [PATCH 25/40] nodePackages.@prisma/language-server: drop

It fails to build with

    npm error [esbuild] Trying to download "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz"
    npm error [esbuild] Failed to download "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz": getaddrinfo EAI_AGAIN registry.npmjs.org
    npm error /nix/store/ahim2fxl8zamjrgnr6kkn0495s10ljzx-_at_prisma_slash_language-server-6.5.0/lib/node_modules/@prisma/language-server/node_modules/esbuild/install.js:275
    npm error         throw new Error(`Failed to install package "${pkg}"`);
    npm error               ^
    npm error
    npm error Error: Failed to install package "@esbuild/linux-x64"
    npm error     at checkAndPreparePackage (/nix/store/ahim2fxl8zamjrgnr6kkn0495s10ljzx-_at_prisma_slash_language-server-6.5.0/lib/node_modules/@prisma/language-server/node_modules/esbuild/install.js:275:15)
    npm error     at process.processTicksAndRejections (node:internal/process/task_queues:105:5)
---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/main-programs.nix           |  1 -
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 40 -------------------
 4 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index b0ca889b0ea3..0ce778f48cd3 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -49,6 +49,7 @@ mapAliases {
   "@mermaid-js/mermaid-cli" = pkgs.mermaid-cli; # added 2023-10-01
   "@nerdwallet/shepherd" = pkgs.shepherd; # added 2023-09-30
   "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
+  "@prisma/language-server" = throw "@prisma/language-server has been removed because it was broken"; # added 2025-03-23
   "@shopify/cli" = throw "@shopify/cli has been removed because it was broken"; # added 2025-03-12
   "@tailwindcss/language-server" = pkgs.tailwindcss-language-server; # added 2024-01-22
   "@volar/vue-language-server" = pkgs.vue-language-server; # added 2024-06-15
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index e3fb4b7cc351..57593ddb6016 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -11,7 +11,6 @@
   "@babel/cli" = "babel";
   "@commitlint/cli" = "commitlint";
   "@gitbeaker/cli" = "gitbeaker";
-  "@prisma/language-server" = "prisma-language-server";
   "@uppy/companion" = "companion";
   "@webassemblyjs/repl-1.11.1" = "wasm";
   "@webassemblyjs/wasm-strip" = "wasm-strip";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 37039162797c..449245e8f041 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -132,7 +132,6 @@
 , "postcss-cli"
 , "prebuild-install"
 , "prettier"
-, "@prisma/language-server"
 , "pscid"
 , "pulp"
 , "purescript-language-server"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 60dab89c1b20..d3a9cee446fb 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -61563,46 +61563,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@prisma/language-server" = nodeEnv.buildNodePackage {
-    name = "_at_prisma_slash_language-server";
-    packageName = "@prisma/language-server";
-    version = "6.5.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-6.5.0.tgz";
-      sha512 = "Cot58P6uJ9IJ5MHJBakSLe87jSj2zC54jJuBjYQ9rJFsNy4Y/bQ605BC1TbxXqJjgpzrYOjTbkLCCU/XIG7PbA==";
-    };
-    dependencies = [
-      sources."@prisma/config-6.5.0"
-      sources."@prisma/prisma-schema-wasm-6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60"
-      sources."@prisma/schema-files-loader-6.5.0"
-      sources."@types/js-levenshtein-1.1.3"
-      sources."debug-4.4.0"
-      sources."esbuild-0.25.1"
-      sources."esbuild-register-3.6.0"
-      sources."fs-extra-11.3.0"
-      sources."graceful-fs-4.2.11"
-      sources."js-levenshtein-1.1.6"
-      sources."jsonfile-6.1.0"
-      sources."klona-2.0.6"
-      sources."ms-2.1.3"
-      sources."universalify-2.0.1"
-      sources."vscode-jsonrpc-8.1.0"
-      sources."vscode-languageserver-8.1.0"
-      sources."vscode-languageserver-protocol-3.17.3"
-      sources."vscode-languageserver-textdocument-1.0.11"
-      sources."vscode-languageserver-types-3.17.3"
-      sources."vscode-uri-3.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Prisma Language Server";
-      homepage = "https://github.com/prisma/language-tools#readme";
-      license = "Apache-2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   pscid = nodeEnv.buildNodePackage {
     name = "pscid";
     packageName = "pscid";

From c8f31c22ebf0388d50ba20c22187201160849ae8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 00:19:29 +0000
Subject: [PATCH 26/40] crystal-dock: 2.10 -> 2.11

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

diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix
index 9c47b0a1ead4..59797607d4fd 100644
--- a/pkgs/by-name/cr/crystal-dock/package.nix
+++ b/pkgs/by-name/cr/crystal-dock/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "crystal-dock";
-  version = "2.10";
+  version = "2.11";
 
   src = fetchFromGitHub {
     owner = "dangvd";
     repo = "crystal-dock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-to6+sGPhc3kKVq78HljjxeMPWQcNbJjr5FMFcREGAX8=";
+    hash = "sha256-edTBlqCJkw9ER06yZeXvJXQeQ5bJn//ss5ceYwt0QUU=";
   };
 
   nativeBuildInputs = [

From 2f11d9378aa946e5e434a1fdebc1325fe8fec666 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 00:21:20 +0000
Subject: [PATCH 27/40] factorio-demo: 2.0.27 -> 2.0.42

---
 pkgs/by-name/fa/factorio/versions.json | 84 +++++++++++++-------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index c28ecb7d03d3..74eb8b077faf 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,99 +3,99 @@
     "alpha": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.41.tar.xz"
+          "factorio_linux_2.0.43.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.41.tar.xz",
+        "name": "factorio_alpha_x64-2.0.43.tar.xz",
         "needsAuth": true,
-        "sha256": "d6f632845056b94601f16ee6a9b818991e492a8dc687213ab49d555b7cad2069",
+        "sha256": "971c293f46d2e021be762eb23c45c17746aa5b8ec74e30fef5f46fa32bb7e1aa",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.41/alpha/linux64",
-        "version": "2.0.41"
+        "url": "https://factorio.com/get-download/2.0.43/alpha/linux64",
+        "version": "2.0.43"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.41.tar.xz"
+          "factorio_linux_2.0.42.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.41.tar.xz",
+        "name": "factorio_alpha_x64-2.0.42.tar.xz",
         "needsAuth": true,
-        "sha256": "d6f632845056b94601f16ee6a9b818991e492a8dc687213ab49d555b7cad2069",
+        "sha256": "c99a4349d4e29e0fd16ecbd710958232d454d3a412ec23b4ff2bd93a31e306ff",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.41/alpha/linux64",
-        "version": "2.0.41"
+        "url": "https://factorio.com/get-download/2.0.42/alpha/linux64",
+        "version": "2.0.42"
       }
     },
     "demo": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-demo_linux_2.0.40.tar.xz"
+          "factorio-demo_linux_2.0.42.tar.xz"
         ],
-        "name": "factorio_demo_x64-2.0.40.tar.xz",
+        "name": "factorio_demo_x64-2.0.42.tar.xz",
         "needsAuth": false,
-        "sha256": "91ab921f8599c575f6090f5539090fb2eb42eb0d8bc83f366da078d995c639e6",
+        "sha256": "eb06c7521f7ed557e6642a7954b0395ee5c993367e1f97c65f0336a94abbba42",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.40/demo/linux64",
-        "version": "2.0.40"
+        "url": "https://factorio.com/get-download/2.0.42/demo/linux64",
+        "version": "2.0.42"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-demo_linux_2.0.27.tar.xz"
+          "factorio-demo_linux_2.0.42.tar.xz"
         ],
-        "name": "factorio_demo_x64-2.0.27.tar.xz",
+        "name": "factorio_demo_x64-2.0.42.tar.xz",
         "needsAuth": false,
-        "sha256": "75938e76d0e730273616e2441ae3c3bc238bb3cfa38d34a43e5fb25a3d1f2323",
+        "sha256": "eb06c7521f7ed557e6642a7954b0395ee5c993367e1f97c65f0336a94abbba42",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.27/demo/linux64",
-        "version": "2.0.27"
+        "url": "https://factorio.com/get-download/2.0.42/demo/linux64",
+        "version": "2.0.42"
       }
     },
     "expansion": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.41.tar.xz"
+          "factorio-space-age_linux_2.0.43.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.41.tar.xz",
+        "name": "factorio_expansion_x64-2.0.43.tar.xz",
         "needsAuth": true,
-        "sha256": "b1a085cb98b5d8800cb296578ca8f38df233b036f5c99c82e33f3eb868bb783f",
+        "sha256": "43d98f9dfa4edc15a622b9881f71673902710ef8aa12cccc7f6e8ccd7962488e",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.41/expansion/linux64",
-        "version": "2.0.41"
+        "url": "https://factorio.com/get-download/2.0.43/expansion/linux64",
+        "version": "2.0.43"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.41.tar.xz"
+          "factorio-space-age_linux_2.0.42.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.41.tar.xz",
+        "name": "factorio_expansion_x64-2.0.42.tar.xz",
         "needsAuth": true,
-        "sha256": "b1a085cb98b5d8800cb296578ca8f38df233b036f5c99c82e33f3eb868bb783f",
+        "sha256": "41c8c8dacad22f5d94399cd5272a3311e38917937bd1a4d102aac7286afc580e",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.41/expansion/linux64",
-        "version": "2.0.41"
+        "url": "https://factorio.com/get-download/2.0.42/expansion/linux64",
+        "version": "2.0.42"
       }
     },
     "headless": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.41.tar.xz",
-          "factorio_headless_x64_2.0.41.tar.xz"
+          "factorio-headless_linux_2.0.43.tar.xz",
+          "factorio_headless_x64_2.0.43.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.41.tar.xz",
+        "name": "factorio_headless_x64-2.0.43.tar.xz",
         "needsAuth": false,
-        "sha256": "77ebccae8167fc1a9fc4da8c11e8410f6017b92b1a0913eb58ac5285c9eec399",
+        "sha256": "bde6e167330c4439ce7df3ac519ea445120258ef676f1f6ad31d0c2816d3aee3",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.41/headless/linux64",
-        "version": "2.0.41"
+        "url": "https://factorio.com/get-download/2.0.43/headless/linux64",
+        "version": "2.0.43"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.41.tar.xz",
-          "factorio_headless_x64_2.0.41.tar.xz"
+          "factorio-headless_linux_2.0.42.tar.xz",
+          "factorio_headless_x64_2.0.42.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.41.tar.xz",
+        "name": "factorio_headless_x64-2.0.42.tar.xz",
         "needsAuth": false,
-        "sha256": "77ebccae8167fc1a9fc4da8c11e8410f6017b92b1a0913eb58ac5285c9eec399",
+        "sha256": "b5b8b8bdc915e67dbc1710cd3d6aa6802d397b7c0f47db07da8acf39d5bd6376",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.41/headless/linux64",
-        "version": "2.0.41"
+        "url": "https://factorio.com/get-download/2.0.42/headless/linux64",
+        "version": "2.0.42"
       }
     }
   }

From e529c511ba18a9ed75ed3a1d7d7bf759f95a144a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 26 Mar 2025 18:58:21 +0100
Subject: [PATCH 28/40] python312Packages.sentence-transformers: 3.4.1 -> 4.0.1

Diff: https://github.com/UKPLab/sentence-transformers/compare/refs/tags/v3.4.1...v4.0.1

Changelog: https://github.com/UKPLab/sentence-transformers/releases/tag/v4.0.1
---
 .../python-modules/sentence-transformers/default.nix   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix
index 6a4a26b0ce5b..2ba0e892ac86 100644
--- a/pkgs/development/python-modules/sentence-transformers/default.nix
+++ b/pkgs/development/python-modules/sentence-transformers/default.nix
@@ -17,6 +17,7 @@
   torch,
   tqdm,
   transformers,
+  typing-extensions,
 
   # tests
   pytestCheckHook,
@@ -25,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "sentence-transformers";
-  version = "3.4.1";
+  version = "4.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "UKPLab";
     repo = "sentence-transformers";
     tag = "v${version}";
-    hash = "sha256-TNqCukHdjQYxK/UkAV/lm+TTAm5NyoZjVPUyHPyE3Ko=";
+    hash = "sha256-Hjf82IIkFO8e+xDK1lMp1DrkuUb6TSVQtVpmT/He/VI=";
   };
 
   build-system = [ setuptools ];
@@ -45,6 +46,7 @@ buildPythonPackage rec {
     torch
     tqdm
     transformers
+    typing-extensions
   ];
 
   optional-dependencies = {
@@ -78,6 +80,7 @@ buildPythonPackage rec {
     "test_model_card_reuse"
     "test_nanobeir_evaluator"
     "test_paraphrase_mining"
+    "test_pretrained_model"
     "test_save_and_load"
     "test_simple_encode"
     "test_tokenize"
@@ -88,9 +91,10 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # Tests require network access
+    "tests/cross_encoder/test_cross_encoder.py"
+    "tests/cross_encoder/test_train_stsb.py"
     "tests/evaluation/test_information_retrieval_evaluator.py"
     "tests/test_compute_embeddings.py"
-    "tests/test_cross_encoder.py"
     "tests/test_model_card_data.py"
     "tests/test_multi_process.py"
     "tests/test_pretrained_stsb.py"

From 29ed28180ba0119ce7a103a6aa87ceea57daa51f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 01:46:34 +0000
Subject: [PATCH 29/40] svu: 3.2.2 -> 3.2.3

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

diff --git a/pkgs/by-name/sv/svu/package.nix b/pkgs/by-name/sv/svu/package.nix
index 12157ae7f013..82eddfa960d7 100644
--- a/pkgs/by-name/sv/svu/package.nix
+++ b/pkgs/by-name/sv/svu/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "svu";
-  version = "3.2.2";
+  version = "3.2.3";
 
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-eZjwZBmc+rOk4nlsWPVmL7FXXmiJYTCSdeDl/CfZZQk=";
+    sha256 = "sha256-jnUVl34luj6kUyx27+zWFxKZMD+R1uzu78oJV7ziSag=";
   };
 
-  vendorHash = "sha256-lqE5S13VQ7WLow6tXcFOWcK/dw7LvvEDpgRTQ8aJGeg=";
+  vendorHash = "sha256-P5Ys4XjT5wKCbnxl3tKjpouiSZBFf/zfXKrV8MaGyMU=";
 
   ldflags = [
     "-s"

From a29b770cd77437a18a0d52b125bdc72bc3043465 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 01:48:16 +0000
Subject: [PATCH 30/40] brush: 0.2.15 -> 0.2.16

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

diff --git a/pkgs/by-name/br/brush/package.nix b/pkgs/by-name/br/brush/package.nix
index 80c5c2dac5dc..387af37b02d8 100644
--- a/pkgs/by-name/br/brush/package.nix
+++ b/pkgs/by-name/br/brush/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "brush";
-  version = "0.2.15";
+  version = "0.2.16";
 
   src = fetchFromGitHub {
     owner = "reubeno";
     repo = "brush";
     tag = "brush-shell-v${version}";
-    hash = "sha256-hPF2nXYXAM+5Lz2VJw9vZ6RFZ40y+YkO94Jc/sLUYsg=";
+    hash = "sha256-ZQ1IiWkM888CWEtwWJ+dMjJO1sGvBTA8E6f9v9JLh/w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-A4v4i6U6BwUMNTI/TO7wTQvNVtQYKGiQfDXOCy8hFTE=";
+  cargoHash = "sha256-Vg5efRierCc7sT+7b94/4i4+3L5CoOrDoeMx/Rzg5mE=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 0162ad243dfdad053872ac36951cdbf4e010841a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 27 Mar 2025 03:33:16 +0100
Subject: [PATCH 31/40] remarshal_0_17,python3Packages.remarshal: add
 mainProgram (#390902)

add mainProgram for the 2 remarshal packages
---
 pkgs/by-name/re/remarshal_0_17/package.nix            | 1 +
 pkgs/development/python-modules/remarshal/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix
index 97a39d340fcd..112df133fcd0 100644
--- a/pkgs/by-name/re/remarshal_0_17/package.nix
+++ b/pkgs/by-name/re/remarshal_0_17/package.nix
@@ -58,5 +58,6 @@ pythonPackages.buildPythonApplication rec {
     license = licenses.mit;
     homepage = "https://github.com/dbohdan/remarshal";
     maintainers = with maintainers; [ hexa ];
+    mainProgram = "remarshal";
   };
 }
diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix
index 3889396c5d9f..45b745d0f887 100644
--- a/pkgs/development/python-modules/remarshal/default.nix
+++ b/pkgs/development/python-modules/remarshal/default.nix
@@ -53,5 +53,6 @@ buildPythonPackage rec {
     license = licenses.mit;
     homepage = "https://github.com/dbohdan/remarshal";
     maintainers = with maintainers; [ offline ];
+    mainProgram = "remarshal";
   };
 }

From 08670a0032f697dc85661d29bb86a02cdeb8930b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 27 Mar 2025 03:47:01 +0100
Subject: [PATCH 32/40] evcc: 0.201.1 -> 0.202.0

https://github.com/evcc-io/evcc/releases/tag/0.202.0
---
 pkgs/by-name/ev/evcc/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index ebda1afcdba1..32f7fd3cb3e4 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "0.201.1";
+  version = "0.202.0";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-nsA/tJXRuL1Ql0N1OR5DeFjXI0PUtSa65hXH6C0Uxds=";
+    hash = "sha256-J2rYM+lQ9I3d9zK0Ez458+52V+h1VuX+zmTc1sPzlHU=";
   };
 
-  vendorHash = "sha256-NUDGqBmRL7L7/RDy68YG+nAz9Sj1Ink0tAbx9or/h1Q=";
+  vendorHash = "sha256-QIFWrrF0Rl4N/Qac7yevf35tAPAAB9HUbiyth/mlI1U=";
 
   commonMeta = with lib; {
     license = licenses.mit;
@@ -52,7 +52,7 @@ buildGo124Module rec {
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-iaQNLbbNvklSAEGAveOqStruL+LOpHdmGQqtERkagWU=";
+    hash = "sha256-xv7RG/Am/SXXMhETCpQZPzXIpi2uMwyE/TY/UXWJLsA=";
   };
 
   nativeBuildInputs = [

From f8590e2e4197f78a3e00e4d0fe007d98ffb0023a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 27 Mar 2025 04:38:42 +0100
Subject: [PATCH 33/40] pretix: 2025.2.0 -> 2025.3.0

https://pretix.eu/about/en/blog/20250326-release-2025-3/
https://github.com/pretix/pretix/compare/refs/tags/v2025.2.0...v2025.3.0
---
 pkgs/by-name/pr/pretix/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index c5baa51d8dbe..f4582f124a83 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -52,13 +52,13 @@ let
   };
 
   pname = "pretix";
-  version = "2025.2.0";
+  version = "2025.3.0";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZVrdkIeVUAKb4617BCcfvs0HqFmctPb7zriDJplyUns=";
+    hash = "sha256-D/j1RzKhRvdqMxcHg/NPZSoroN3etzh6/V38XV9W1cs=";
   };
 
   npmDeps = buildNpmPackage {
@@ -66,7 +66,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/src/pretix/static/npm_dir";
-    npmDepsHash = "sha256-MOxOzaP6p6Q61ZuDVzbYJvMXpCQ1pzQx86Yl24yt4SQ=";
+    npmDepsHash = "sha256-6qjG0p7pLtTd9CBVVzoeUPv6Vdr5se1wuI5qcKJH2Os=";
 
     dontBuild = true;
 
@@ -99,6 +99,7 @@ python.pkgs.buildPythonApplication rec {
     "importlib-metadata"
     "kombu"
     "markdown"
+    "phonenumberslite"
     "pillow"
     "protobuf"
     "pycryptodome"

From 4604e203304fb398d32140820dce9532ac514692 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 27 Mar 2025 04:40:43 +0100
Subject: [PATCH 34/40] pretix.plugins.mollie: 2.3.0 -> 2.3.1

https://github.com/pretix/pretix-mollie/compare/refs/tags/v2.3.0...v2.3.1
---
 pkgs/by-name/pr/pretix/plugins/mollie/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
index 2fbb90af1d90..a636955082fb 100644
--- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-mollie";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-mollie";
     tag = "v${version}";
-    hash = "sha256-sI4uHMACCf9HmcJUxJlkGgT70ra/bRs6XorghX99iJo=";
+    hash = "sha256-6VwS8yzueeZ7Yf8U98nljFlFPNVJt6ncd9Qr8nz/SWE=";
   };
 
   build-system = [

From 0001116074cc3ccbc30583e945edc0196be82a4a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 27 Mar 2025 04:44:37 +0100
Subject: [PATCH 35/40] pretix.plugins.servicefees: init at 1.13.1

---
 .../pr/pretix/plugins/servicefees/package.nix | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/pr/pretix/plugins/servicefees/package.nix

diff --git a/pkgs/by-name/pr/pretix/plugins/servicefees/package.nix b/pkgs/by-name/pr/pretix/plugins/servicefees/package.nix
new file mode 100644
index 000000000000..918b41d57dba
--- /dev/null
+++ b/pkgs/by-name/pr/pretix/plugins/servicefees/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  django,
+  pretix-plugin-build,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pretix-servicefees";
+  version = "1.13.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pretix";
+    repo = "pretix-servicefees";
+    tag = "v${version}";
+    hash = "sha256-oZXJd7Pj9dPfSZ1FqTxT6FlNA8cJDWIPPLS8nN+l7ZM=";
+  };
+
+  build-system = [
+    django
+    pretix-plugin-build
+    setuptools
+  ];
+
+  postBuild = ''
+    make
+  '';
+
+  doCheck = false; # no tests
+
+  pythonImportsCheck = [ "pretix_servicefees" ];
+
+  meta = with lib; {
+    description = "Allows to charge a flat fee on all orders";
+    homepage = "https://github.com/pretix/pretix-servicefees";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ hexa ];
+  };
+}

From 8cf61a370677a3d46207ba36533b5d10c316d1dd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 27 Mar 2025 04:48:04 +0100
Subject: [PATCH 36/40] pretix.plugins.stretchgoals: unstable-2023-11-27 ->
 1.0.1

---
 .../pr/pretix/plugins/stretchgoals/package.nix       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/plugins/stretchgoals/package.nix b/pkgs/by-name/pr/pretix/plugins/stretchgoals/package.nix
index afdb4616bcd1..1fe4127fcdb9 100644
--- a/pkgs/by-name/pr/pretix/plugins/stretchgoals/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/stretchgoals/package.nix
@@ -7,15 +7,15 @@
 }:
 
 buildPythonPackage {
-  pname = "pretix-avgchart";
-  version = "unstable-2023-11-27";
+  pname = "pretix-stretchgoals";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rixx";
-    repo = "pretix-avgchart";
-    rev = "219816c7ec523a5c23778523b2616ac0c835cb3a";
-    hash = "sha256-1V/0PUvStgQeBQ0v6GoofAgyPmWs3RD+v5ekmAO9vFU=";
+    repo = "pretix-stretchgoals";
+    rev = "177238920a863f71cf03f174e2841f5b630574e9";
+    hash = "sha256-Sbbxg6viRdALjZwqEmN2Js/qbMShe5xMg00jUccnhsA=";
   };
 
   build-system = [
@@ -31,7 +31,7 @@ buildPythonPackage {
 
   meta = with lib; {
     description = "Display the average ticket sales price over time";
-    homepage = "https://github.com/rixx/pretix-avgchart";
+    homepage = "https://github.com/rixx/pretix-stretchgoals";
     license = licenses.asl20;
     maintainers = with maintainers; [ hexa ];
   };

From c8560d1673ba986f5dfb89dfb168bd8713195d77 Mon Sep 17 00:00:00 2001
From: ulic-youthlic <ulic.youthlic@gmail.com>
Date: Sun, 16 Mar 2025 06:20:27 +0800
Subject: [PATCH 37/40] maintainers: add ulic-youthlic

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 42ecfa87f611..3fde3cf058ad 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24725,6 +24725,12 @@
     github = "uku3lig";
     githubId = 61147779;
   };
+  ulic-youthlic = {
+    name = "youthlic";
+    email = "ulic.youthlic+nixpkgs@gmail.com";
+    github = "ulic-youthlic";
+    githubId = 121918198;
+  };
   ulinja = {
     email = "julian@lobbes.dev";
     github = "ulinja";

From 2a5b34dc0d5981cb853b4195350dc6c051bda633 Mon Sep 17 00:00:00 2001
From: ulic-youthlic <ulic.youthlic@gmail.com>
Date: Sun, 16 Mar 2025 06:42:30 +0800
Subject: [PATCH 38/40] dioxionary: init at 1.1.4

---
 pkgs/by-name/di/dioxionary/package.nix | 59 ++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 pkgs/by-name/di/dioxionary/package.nix

diff --git a/pkgs/by-name/di/dioxionary/package.nix b/pkgs/by-name/di/dioxionary/package.nix
new file mode 100644
index 000000000000..a4de07a41b84
--- /dev/null
+++ b/pkgs/by-name/di/dioxionary/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  stdenv,
+  installShellFiles,
+  nix-update-script,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "dioxionary";
+  version = "1.1.4";
+  src = fetchFromGitHub {
+    owner = "vaaandark";
+    repo = "dioxionary";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7Kex5o518L7v5EAhlr4BGoT7LynTe5JmDU8Urn0H3vA=";
+    # enable fetchSubmodules since the tests require dictionaries from the submodules
+    fetchSubmodules = true;
+  };
+
+  cargoHash = "sha256-3Cny2OtEoevlUilL0/xtYbyHcuBsFGEFZG6EX35PL+M=";
+  useFetchCargoVendor = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ];
+  buildInputs = [ openssl.dev ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd dioxionary \
+      --bash <($out/bin/dioxionary completion bash) \
+      --zsh <($out/bin/dioxionary completion zsh) \
+      --fish <($out/bin/dioxionary completion fish)
+  '';
+
+  checkFlags = [
+    # skip these tests since they require internet access
+    "--skip=dict::online::test::look_up_online_by_chinese"
+    "--skip=dict::online::test::look_up_online_by_english"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Rusty stardict. Enables terminal-based word lookup and vocabulary memorization using offline or online dictionaries";
+    homepage = "https://github.com/vaaandark/dioxionary";
+    changelog = "https://github.com/vaaandark/dioxionary/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ ulic-youthlic ];
+    mainProgram = "dioxionary";
+  };
+})

From be459749dc4c0171b162a6efae875a87969567d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 03:52:35 +0000
Subject: [PATCH 39/40] python312Packages.wolf-comm: 0.0.23 -> 0.0.47

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

diff --git a/pkgs/development/python-modules/wolf-comm/default.nix b/pkgs/development/python-modules/wolf-comm/default.nix
index f7171efca681..1cfb1bf01ad6 100644
--- a/pkgs/development/python-modules/wolf-comm/default.nix
+++ b/pkgs/development/python-modules/wolf-comm/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "wolf-comm";
-  version = "0.0.23";
+  version = "0.0.47";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "janrothkegel";
     repo = "wolf-comm";
     tag = version;
-    hash = "sha256-LpehooW3vmohiyMwOQTFNLiNCsaLKelWQxQk8bl+y1k=";
+    hash = "sha256-/34smUrsWKNEd5OPPIsDnW3zfq6nhKX3Yp+UBk+Nibw=";
   };
 
   build-system = [ setuptools ];

From c68b327aeda6d4fd2e352384fc0b22d8aa280266 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 24 Mar 2025 22:52:43 +0200
Subject: [PATCH 40/40] =?UTF-8?q?zulip:=205.11.1=20=E2=86=92=205.12.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/zu/zulip/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix
index 27f9b0a4cc2a..0385942bb7d4 100644
--- a/pkgs/by-name/zu/zulip/package.nix
+++ b/pkgs/by-name/zu/zulip/package.nix
@@ -1,7 +1,8 @@
 { lib
 , fetchFromGitHub
 , buildNpmPackage
-, electron_32
+, python3
+, electron_35
 , makeDesktopItem
 , makeShellWrapper
 , copyDesktopItems
@@ -9,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "zulip";
-  version = "5.11.1";
+  version = "5.12.0";
 
   src = fetchFromGitHub {
     owner = "zulip";
     repo = "zulip-desktop";
-    rev = "v${version}";
-    hash = "sha256-ELuQ/K5QhtS4QiTR35J9VtYNe1qBrS56Ay6mtcGL+FI=";
+    tag = "v${version}";
+    hash = "sha256-YDb69tJCR58DARssnZgdVxtRpR8vHsawCTv7kQ56y+8=";
   };
 
-  npmDepsHash = "sha256-13Rlqa7TC2JUq6q1b2U5X3EXpOJGZ62IeF163/mTo68=";
+  npmDepsHash = "sha256-MKKN6prUdWaHm27GybdbswDMNJH0xVffXsT2ZwroOHI=";
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
@@ -27,6 +28,7 @@ buildNpmPackage rec {
   nativeBuildInputs = [
     makeShellWrapper
     copyDesktopItems
+    (python3.withPackages (ps: with ps; [ distutils ]))
   ];
 
   dontNpmBuild = true;
@@ -34,8 +36,8 @@ buildNpmPackage rec {
     runHook preBuild
 
     npm run pack -- \
-      -c.electronDist=${electron_32}/libexec/electron \
-      -c.electronVersion=${electron_32.version}
+      -c.electronDist=${electron_35}/libexec/electron \
+      -c.electronVersion=${electron_35.version}
 
     runHook postBuild
   '';
@@ -48,7 +50,7 @@ buildNpmPackage rec {
 
     install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png
 
-    makeShellWrapper '${lib.getExe electron_32}' "$out/bin/zulip" \
+    makeShellWrapper '${lib.getExe electron_35}' "$out/bin/zulip" \
       --add-flags "$out/share/lib/zulip/app.asar" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \
       --inherit-argv0