From a5cd82587fc2c3dc30fc1361380dc2cf4157dccb Mon Sep 17 00:00:00 2001
From: Ivy Fan-Chiang <dev@ivyfanchiang.ca>
Date: Tue, 4 Feb 2025 19:20:11 -0500
Subject: [PATCH 01/40] detect-it-easy: add missing yara rules into package

---
 pkgs/by-name/de/detect-it-easy/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix
index df1eeece456a..ba20cccd88d9 100644
--- a/pkgs/by-name/de/detect-it-easy/package.nix
+++ b/pkgs/by-name/de/detect-it-easy/package.nix
@@ -51,9 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $out/share/icons
   '';
 
-  # clean up wrongly created dirs in `install.sh` and broken .desktop file
   postInstall = ''
-    grep -v "Version=#VERSION#" $src/LINUX/die.desktop > $out/share/applications/die.desktop
+    cp -r $src/XYara/yara_rules $out/lib/die/
   '';
 
   meta = {

From 80c81eaba50ad8575d943dc806b0f2c4575122e5 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Tue, 1 Apr 2025 09:43:02 +0200
Subject: [PATCH 02/40] gammastep: 2.0.9 -> 2.0.11

---
 pkgs/applications/misc/redshift/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 31e866d0e7c5..63957b2bd4ea 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -180,13 +180,13 @@ rec {
 
   gammastep = mkRedshift rec {
     pname = "gammastep";
-    version = "2.0.9";
+    version = "2.0.11";
 
     src = fetchFromGitLab {
       owner = "chinstrap";
       repo = pname;
       rev = "v${version}";
-      hash = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU=";
+      hash = "sha256-c8JpQLHHLYuzSC9bdymzRTF6dNqOLwYqgwUOpKcgAEU=";
     };
 
     meta = redshift.meta // {

From 805d682ff865dc1b8eea6b2bfbc14ddc3d04c97c Mon Sep 17 00:00:00 2001
From: Nobody_alias_N <165517462+Nobody-alias-N@users.noreply.github.com>
Date: Wed, 2 Apr 2025 14:36:16 +0300
Subject: [PATCH 03/40] slade: 3.2.6 -> 3.2.7

---
 pkgs/games/doom-ports/slade/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix
index 6db8e8dd2a91..99418f2499ea 100644
--- a/pkgs/games/doom-ports/slade/default.nix
+++ b/pkgs/games/doom-ports/slade/default.nix
@@ -8,7 +8,7 @@
   zip,
   wxGTK,
   gtk3,
-  sfml,
+  sfml_2,
   fluidsynth,
   curl,
   freeimage,
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "slade";
-  version = "3.2.6";
+  version = "3.2.7";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
     rev = version;
-    hash = "sha256-pcWmv1fnH18X/S8ljfHxaL1PjApo5jyM8W+WYn+/7zI=";
+    hash = "sha256-+i506uzO2q/9k7en6CKs4ui9gjszrMOYwW+V9W5Lvns=";
   };
 
   nativeBuildInputs = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     wxGTK
     gtk3
-    sfml
+    sfml_2
     fluidsynth
     curl
     freeimage
@@ -64,11 +64,11 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Doom editor";
     homepage = "http://slade.mancubus.net/";
-    license = licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ abbradar ];
   };
 }

From bb4be9a474c87dd9366eca69fa8e2f0aa16fcc83 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Thu, 27 Feb 2025 16:27:32 -0300
Subject: [PATCH 04/40] lib.strings: init splitStringBy

---
 lib/default.nix    |  1 +
 lib/strings.nix    | 91 ++++++++++++++++++++++++++++++++++++++++++++
 lib/tests/misc.nix | 95 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 187 insertions(+)

diff --git a/lib/default.nix b/lib/default.nix
index 19316addb8cb..c433ca6a3e09 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -347,6 +347,7 @@ let
         toSentenceCase
         addContextFrom
         splitString
+        splitStringBy
         removePrefix
         removeSuffix
         versionOlder
diff --git a/lib/strings.nix b/lib/strings.nix
index d281120cad7f..70f3a6cc8a25 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1588,6 +1588,97 @@ rec {
     in
     map (addContextFrom s) splits;
 
+  /**
+    Splits a string into substrings based on a predicate that examines adjacent characters.
+
+    This function provides a flexible way to split strings by checking pairs of characters
+    against a custom predicate function. Unlike simpler splitting functions, this allows
+    for context-aware splitting based on character transitions and patterns.
+
+    # Inputs
+
+    `predicate`
+    : Function that takes two arguments (previous character and current character)
+      and returns true when the string should be split at the current position.
+      For the first character, previous will be "" (empty string).
+
+    `keepSplit`
+    : Boolean that determines whether the splitting character should be kept as
+      part of the result. If true, the character will be included at the beginning
+      of the next substring; if false, it will be discarded.
+
+    `str`
+    : The input string to split.
+
+    # Return
+
+    A list of substrings from the original string, split according to the predicate.
+
+    # Type
+
+    ```
+    splitStringBy :: (string -> string -> bool) -> bool -> string -> [string]
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.splitStringBy` usage example
+
+    Split on periods and hyphens, discarding the separators:
+    ```nix
+    splitStringBy (prev: curr: builtins.elem curr [ "." "-" ]) false "foo.bar-baz"
+    => [ "foo" "bar" "baz" ]
+    ```
+
+    Split on transitions from lowercase to uppercase, keeping the uppercase characters:
+    ```nix
+    splitStringBy (prev: curr: builtins.match "[a-z]" prev != null && builtins.match "[A-Z]" curr != null) true "fooBarBaz"
+    => [ "foo" "Bar" "Baz" ]
+    ```
+
+    Handle leading separators correctly:
+    ```nix
+    splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ".foo.bar.baz"
+    => [ "" "foo" "bar" "baz" ]
+    ```
+
+    Handle trailing separators correctly:
+    ```nix
+    splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo.bar.baz."
+    => [ "foo" "bar" "baz" "" ]
+    ```
+    :::
+  */
+  splitStringBy =
+    predicate: keepSplit: str:
+    let
+      len = stringLength str;
+
+      # Helper function that processes the string character by character
+      go =
+        pos: currentPart: result:
+        # Base case: reached end of string
+        if pos == len then
+          result ++ [ currentPart ]
+        else
+          let
+            currChar = substring pos 1 str;
+            prevChar = if pos > 0 then substring (pos - 1) 1 str else "";
+            isSplit = predicate prevChar currChar;
+          in
+          if isSplit then
+            # Split here - add current part to results and start a new one
+            let
+              newResult = result ++ [ currentPart ];
+              newCurrentPart = if keepSplit then currChar else "";
+            in
+            go (pos + 1) newCurrentPart newResult
+          else
+            # Keep building current part
+            go (pos + 1) (currentPart + currChar) result;
+    in
+    if len == 0 then [ (addContextFrom str "") ] else map (addContextFrom str) (go 0 "" [ ]);
+
   /**
     Return a string without the specified prefix, if the prefix matches.
 
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index f5f1fb5e7c2d..f9f2b0264b9e 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -631,6 +631,101 @@ runTests {
     ];
   };
 
+  testSplitStringBySimpleDelimiter = {
+    expr = strings.splitStringBy (
+      prev: curr:
+      builtins.elem curr [
+        "."
+        "-"
+      ]
+    ) false "foo.bar-baz";
+    expected = [
+      "foo"
+      "bar"
+      "baz"
+    ];
+  };
+
+  testSplitStringByLeadingDelimiter = {
+    expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ".foo.bar.baz";
+    expected = [
+      ""
+      "foo"
+      "bar"
+      "baz"
+    ];
+  };
+
+  testSplitStringByTrailingDelimiter = {
+    expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo.bar.baz.";
+    expected = [
+      "foo"
+      "bar"
+      "baz"
+      ""
+    ];
+  };
+
+  testSplitStringByMultipleConsecutiveDelimiters = {
+    expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo...bar";
+    expected = [
+      "foo"
+      ""
+      ""
+      "bar"
+    ];
+  };
+
+  testSplitStringByKeepingSplitChar = {
+    expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) true "foo.bar.baz";
+    expected = [
+      "foo"
+      ".bar"
+      ".baz"
+    ];
+  };
+
+  testSplitStringByCaseTransition = {
+    expr = strings.splitStringBy (
+      prev: curr: builtins.match "[a-z]" prev != null && builtins.match "[A-Z]" curr != null
+    ) true "fooBarBaz";
+    expected = [
+      "foo"
+      "Bar"
+      "Baz"
+    ];
+  };
+
+  testSplitStringByEmptyString = {
+    expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "";
+    expected = [ "" ];
+  };
+
+  testSplitStringByComplexPredicate = {
+    expr = strings.splitStringBy (
+      prev: curr:
+      prev != ""
+      && curr != ""
+      && builtins.match "[0-9]" prev != null
+      && builtins.match "[a-z]" curr != null
+    ) true "123abc456def";
+    expected = [
+      "123"
+      "abc456"
+      "def"
+    ];
+  };
+
+  testSplitStringByUpperCaseStart = {
+    expr = strings.splitStringBy (prev: curr: builtins.match "[A-Z]" curr != null) true "FooBarBaz";
+    expected = [
+      ""
+      "Foo"
+      "Bar"
+      "Baz"
+    ];
+  };
+
   testEscapeShellArg = {
     expr = strings.escapeShellArg "esc'ape\nme";
     expected = "'esc'\\''ape\nme'";

From 4ed08cd55609ca9908fed4a5008b4180f4ee21be Mon Sep 17 00:00:00 2001
From: Frank Doepper <woffs@woffs.de>
Date: Mon, 7 Apr 2025 18:39:05 +0200
Subject: [PATCH 05/40] loadwatch: 1.1-1 -> 1.1-4

- fixes build by lifting https://github.com/NixOS/nixpkgs/pull/396704
  upstream
---
 pkgs/by-name/lo/loadwatch/package.nix | 30 +++++++++++++--------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/lo/loadwatch/package.nix b/pkgs/by-name/lo/loadwatch/package.nix
index 95990bc5190d..d3db7c30cd5b 100644
--- a/pkgs/by-name/lo/loadwatch/package.nix
+++ b/pkgs/by-name/lo/loadwatch/package.nix
@@ -1,28 +1,26 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchFromSourcehut,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "loadwatch";
-  version = "1.1-1-g6d2544c";
+  version = "1.1-4-g868bd29";
 
-  src = fetchgit {
-    url = "git://woffs.de/git/fd/loadwatch.git";
-    sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b";
-    rev = "6d2544c0caaa8a64bbafc3f851e06b8056c30e6e";
+  src = fetchFromSourcehut {
+    owner = "~woffs";
+    repo = "loadwatch";
+    hash = "sha256-/4kfGdpYJWQyb7mRaVUpyQQC5VP96bDsBDfM3XhcJXw=";
+    rev = finalAttrs.version;
   };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    install loadwatch lw-ctl $out/bin
-  '';
+  makeFlags = [ "bindir=$(out)/bin" ];
 
-  meta = with lib; {
+  meta = {
     description = "Run a program using only idle cycles";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ woffs ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ woffs ];
+    platforms = lib.platforms.all;
   };
-}
+})

From 95cf864ca78bdd21d733e51ce392f2dc51207674 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sat, 19 Apr 2025 21:02:08 +0200
Subject: [PATCH 06/40] readest: 0.9.35 -> 0.9.36

Changelog: https://github.com/readest/readest/releases/tag/v0.9.36
Diff: https://github.com/readest/readest/compare/v0.9.35...v0.9.36
---
 pkgs/by-name/re/readest/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index b0a85304ab84..0ef4a4eca7a0 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -19,13 +19,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.35";
+  version = "0.9.36";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-w6aMfJwQDEG5WmFdZhtxeTi9w8X3tBqBmpo0nItLYrE=";
+    hash = "sha256-r/mpqeHKo6oQqNCnFByxHZf7RSWD5esZbweAEuda9ME=";
     fetchSubmodules = true;
   };
 

From eb8cdd126eadf2210c7af92e5f50daf0df8b5de6 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 20 Apr 2025 11:52:12 +0200
Subject: [PATCH 07/40] prismlauncher-unwrapped: backport Qt 6.9 fix for darwin

This only affects darwin builds, but I decided to apply the backport
unconditionally as it's just a one-line change.

https://github.com/PrismLauncher/PrismLauncher/pull/3622
https://github.com/NixOS/nixpkgs/issues/400119

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/pr/prismlauncher-unwrapped/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
index 3e6f66e430a6..d05ab5abcb56 100644
--- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
@@ -5,7 +5,7 @@
   cmake,
   cmark,
   extra-cmake-modules,
-  fetchpatch,
+  fetchpatch2,
   gamemode,
   ghc_filesystem,
   jdk17,
@@ -45,6 +45,16 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${libnbtplusplus} source/libraries/libnbtplusplus
   '';
 
+  patches = [
+    # https://github.com/PrismLauncher/PrismLauncher/pull/3622
+    # https://github.com/NixOS/nixpkgs/issues/400119
+    (fetchpatch2 {
+      name = "fix-qt6.9-compatibility.patch";
+      url = "https://github.com/PrismLauncher/PrismLauncher/commit/8bb9b168fb996df9209e1e34be854235eda3d42a.diff";
+      hash = "sha256-hOqWBrUrVUhMir2cfc10gu1i8prdNxefTyr7lH6KA2c=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja

From 808f94a757d06fb3a08b0ed653ef9220fc0ce99c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Apr 2025 10:29:52 +0000
Subject: [PATCH 08/40] python312Packages.graph-tool: 2.96 -> 2.97

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

diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix
index a4bc599eb0ef..3cc2c2394f64 100644
--- a/pkgs/development/python-modules/graph-tool/default.nix
+++ b/pkgs/development/python-modules/graph-tool/default.nix
@@ -32,12 +32,12 @@ let
 in
 buildPythonPackage rec {
   pname = "graph-tool";
-  version = "2.96";
+  version = "2.97";
   format = "other";
 
   src = fetchurl {
     url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
-    hash = "sha256-kNW09I/5U2kwKFOCWRdsedoXtIdnZhg9Bjy1GOw1rVc=";
+    hash = "sha256-Yt2PuLuvvv4iNcv6UHzr5lTwFkReVtVO/znSADkxjKU=";
   };
 
   postPatch = ''

From c4a7eb686726ab7a47dee4a76bd9660240f0c84d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Apr 2025 12:00:31 +0000
Subject: [PATCH 09/40] python312Packages.gguf: 0.14.0 -> 0.16.2

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

diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix
index 5353a2b618f5..7e78143339e2 100644
--- a/pkgs/development/python-modules/gguf/default.nix
+++ b/pkgs/development/python-modules/gguf/default.nix
@@ -11,14 +11,14 @@
 }:
 buildPythonPackage rec {
   pname = "gguf";
-  version = "0.14.0";
+  version = "0.16.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2ZlvGXp3eDHPngHvrCTL+oF3hzdTBbjE7hYHR3jivOg=";
+    hash = "sha256-D8lWKJow0PHzr9dewNST9zriYpo/IfOEbdFofYeRx8E=";
   };
 
   dependencies = [

From 4bc3397ceb9f6026839383b3fca98f9d3a7ef7a1 Mon Sep 17 00:00:00 2001
From: GueLaKais <koroyeldiores@gmail.com>
Date: Tue, 15 Apr 2025 10:32:42 +0200
Subject: [PATCH 10/40] cargo-ament-build: init at 0.1.9

---
 pkgs/by-name/ca/cargo-ament-build/Cargo.lock  | 122 ++++++++++++++++++
 pkgs/by-name/ca/cargo-ament-build/package.nix |  36 ++++++
 2 files changed, 158 insertions(+)
 create mode 100644 pkgs/by-name/ca/cargo-ament-build/Cargo.lock
 create mode 100644 pkgs/by-name/ca/cargo-ament-build/package.nix

diff --git a/pkgs/by-name/ca/cargo-ament-build/Cargo.lock b/pkgs/by-name/ca/cargo-ament-build/Cargo.lock
new file mode 100644
index 000000000000..741bf0371325
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-ament-build/Cargo.lock
@@ -0,0 +1,122 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "anyhow"
+version = "1.0.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "cargo-ament-build"
+version = "0.1.9"
+dependencies = [
+ "anyhow",
+ "cargo-manifest",
+ "pico-args",
+]
+
+[[package]]
+name = "cargo-manifest"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf5acda331466fdea759172dbc2fb9e650e382dbca6a8dd3f576d9aeeac76da6"
+dependencies = [
+ "serde",
+ "serde_derive",
+ "toml",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
+[[package]]
+name = "pico-args"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "indexmap",
+ "serde",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
diff --git a/pkgs/by-name/ca/cargo-ament-build/package.nix b/pkgs/by-name/ca/cargo-ament-build/package.nix
new file mode 100644
index 000000000000..d453f34dba96
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-ament-build/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cargo-ament-build";
+  version = "0.1.9";
+
+  src = fetchFromGitHub {
+    owner = "ros2-rust";
+    repo = "cargo-ament-build";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5D0eB3GCQLgVYuYkHMTkboruiYSAaWy3qZjF/hVpRP0=";
+  };
+
+  cargoLock.lockFile = ./Cargo.lock;
+
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+  '';
+
+  nativeBuildInputs = [ pkg-config ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Cargo plugin for use with colcon workspaces";
+    homepage = "https://github.com/ros2-rust/cargo-ament-build";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ guelakais ];
+  };
+})

From 61193327f1ad3716d9974cb1f611a1aa08baa2f5 Mon Sep 17 00:00:00 2001
From: x807x <s10855168@gmail.com>
Date: Tue, 4 Mar 2025 15:40:37 +0800
Subject: [PATCH 11/40] maintainers: add x807x

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 652c4355be8d..4677d4cde5c6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26312,6 +26312,13 @@
     github = "x3rAx";
     githubId = 2268851;
   };
+  x807x = {
+    name = "x807x";
+    email = "s10855168@gmail.com";
+    matrix = "@x807x:matrix.org";
+    github = "x807x";
+    githubId = 86676478;
+  };
   xanderio = {
     name = "Alexander Sieg";
     email = "alex@xanderio.de";

From 8b1f7e96adca22356ab2578a6adb4327552a33b9 Mon Sep 17 00:00:00 2001
From: x807x <s10855168@gmail.com>
Date: Mon, 3 Mar 2025 13:48:29 +0800
Subject: [PATCH 12/40] usbfluxd: init at 1.0

---
 pkgs/by-name/us/usbfluxd/package.nix | 52 ++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/us/usbfluxd/package.nix

diff --git a/pkgs/by-name/us/usbfluxd/package.nix b/pkgs/by-name/us/usbfluxd/package.nix
new file mode 100644
index 000000000000..db2d9490f68c
--- /dev/null
+++ b/pkgs/by-name/us/usbfluxd/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  libimobiledevice,
+  libusb1,
+  libusbmuxd,
+  usbmuxd,
+  libplist,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "usbfluxd";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "corellium";
+    repo = "usbfluxd";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tfAy3e2UssPlRB/8uReLS5f8N/xUUzbjs8sKNlr40T0=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    libimobiledevice
+    libusb1
+    libusbmuxd
+    usbmuxd
+    libplist
+  ];
+
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace-fail 'with_static_libplist=yes' 'with_static_libplist=no'
+    substituteInPlace usbfluxd/utils.h \
+      --replace-fail PLIST_FORMAT_BINARY //PLIST_FORMAT_BINARY \
+      --replace-fail PLIST_FORMAT_XML, NOT_PLIST_FORMAT_XML
+  '';
+
+  meta = {
+    homepage = "https://github.com/corellium/usbfluxd";
+    description = "Redirects the standard usbmuxd socket to allow connections to local and remote usbmuxd instances so remote devices appear connected locally";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "usbfluxctl";
+    maintainers = with lib.maintainers; [ x807x ];
+  };
+})

From 11988bdfae4e24b9b0227082dfd472ea23c1a8d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Apr 2025 11:22:13 +0000
Subject: [PATCH 13/40] python312Packages.pystac: 1.12.2 -> 1.13.0

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

diff --git a/pkgs/development/python-modules/pystac/default.nix b/pkgs/development/python-modules/pystac/default.nix
index 521511ca3a82..ce5407f191a3 100644
--- a/pkgs/development/python-modules/pystac/default.nix
+++ b/pkgs/development/python-modules/pystac/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pystac";
-  version = "1.12.2";
+  version = "1.13.0";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "stac-utils";
     repo = "pystac";
     tag = "v${version}";
-    hash = "sha256-Cz9VyHIAfeRvK+az1ETVrTXvBh/VpkgmtERElfgAdBo=";
+    hash = "sha256-DxRJsnbzXBnpQSJE0VwkXV3vyH6WffiMaZ3119XBxJ8=";
   };
 
   build-system = [ setuptools ];

From d6b65b5c99d36f6580e1451ca1bc129def861cce Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 22 Apr 2025 19:05:36 +0300
Subject: [PATCH 14/40] pdfcpu: use writableTmpDirAsHomeHook

---
 pkgs/by-name/pd/pdfcpu/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix
index 438d0a12e976..4c538e198f49 100644
--- a/pkgs/by-name/pd/pdfcpu/package.nix
+++ b/pkgs/by-name/pd/pdfcpu/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule rec {
@@ -52,12 +53,16 @@ buildGoModule rec {
   # No tests
   doCheck = false;
   doInstallCheck = true;
+  installCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+  # NOTE: Can't use `versionCheckHook` since a writeable $HOME is required and
+  # `versionCheckHook` uses --ignore-environment
   installCheckPhase = ''
-    export HOME=$(mktemp -d)
     echo checking the version print of pdfcpu
     $out/bin/pdfcpu version | grep ${version}
-    $out/bin/pdfcpu version | grep $(cat COMMIT | cut -c1-8)
-    $out/bin/pdfcpu version | grep $(cat SOURCE_DATE)
+    $out/bin/pdfcpu version | grep -q $(cat COMMIT | cut -c1-8)
+    $out/bin/pdfcpu version | grep -q $(cat SOURCE_DATE)
   '';
 
   subPackages = [ "cmd/pdfcpu" ];

From d080e470f73a7711b06086f71465b701aae99d38 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 22 Apr 2025 19:10:23 +0300
Subject: [PATCH 15/40] pdfcpu: Use a grep-less version parts identification

---
 pkgs/by-name/pd/pdfcpu/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix
index 4c538e198f49..5d85522796a4 100644
--- a/pkgs/by-name/pd/pdfcpu/package.nix
+++ b/pkgs/by-name/pd/pdfcpu/package.nix
@@ -60,9 +60,14 @@ buildGoModule rec {
   # `versionCheckHook` uses --ignore-environment
   installCheckPhase = ''
     echo checking the version print of pdfcpu
-    $out/bin/pdfcpu version | grep ${version}
-    $out/bin/pdfcpu version | grep -q $(cat COMMIT | cut -c1-8)
-    $out/bin/pdfcpu version | grep -q $(cat SOURCE_DATE)
+    versionOutput="$($out/bin/pdfcpu version)"
+    for part in ${version} $(cat COMMIT | cut -c1-8) $(cat SOURCE_DATE); do
+      if [[ ! "$versionOutput" =~ "$part" ]]; then
+          echo version output did not contain expected part $part . Output was:
+          echo "$versionOutput"
+          exit 3
+      fi
+    done
   '';
 
   subPackages = [ "cmd/pdfcpu" ];

From 877c0c5fd18335f93aa4154d527da154a36e31a1 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 22 Apr 2025 19:11:45 +0300
Subject: [PATCH 16/40] pdfcpu: 0.9.1 -> 0.10.1

Diff: https://github.com/pdfcpu/pdfcpu/compare/v0.9.1...v0.10.1
---
 pkgs/by-name/pd/pdfcpu/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix
index 5d85522796a4..13b9f144b950 100644
--- a/pkgs/by-name/pd/pdfcpu/package.nix
+++ b/pkgs/by-name/pd/pdfcpu/package.nix
@@ -1,19 +1,20 @@
 {
   lib,
   buildGoModule,
+  stdenv,
   fetchFromGitHub,
   writableTmpDirAsHomeHook,
 }:
 
 buildGoModule rec {
   pname = "pdfcpu";
-  version = "0.9.1";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-PJTEaWU/erqVJakvxfB0aYRsi/tcGxYYZjCdEvThmzM=";
+    hash = "sha256-IODE6/TIXZZC5Z8guFK24iiHTwj84fcf9RiAyFkX2F8=";
     # Apparently upstream requires that the compiled executable will know the
     # commit hash and the date of the commit. This information is also presented
     # in the output of `pdfcpu version` which we use as a sanity check in the
@@ -36,7 +37,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-x5EXv2LkJg2LAdml+1I4MzgTvNo6Gl+6e6UHVQ+Z9rU=";
+  vendorHash = "sha256-27YTR/vYuNggjUIbpKs3/yEJheUXMaLZk8quGPwgNNk=";
 
   ldflags = [
     "-s"
@@ -60,6 +61,9 @@ buildGoModule rec {
   # `versionCheckHook` uses --ignore-environment
   installCheckPhase = ''
     echo checking the version print of pdfcpu
+    mkdir -p $HOME/"${
+      if stdenv.hostPlatform.isDarwin then "Library/Application Support" else ".config"
+    }"/pdfcpu
     versionOutput="$($out/bin/pdfcpu version)"
     for part in ${version} $(cat COMMIT | cut -c1-8) $(cat SOURCE_DATE); do
       if [[ ! "$versionOutput" =~ "$part" ]]; then

From 492248f5364b9c4ae1a137e347c815974eba8cee Mon Sep 17 00:00:00 2001
From: Joaqim Planstedt <mail@joaqim.xyz>
Date: Tue, 22 Apr 2025 19:36:31 +0200
Subject: [PATCH 17/40] commitizen: 4.5.0 -> 4.6.0

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

diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix
index 381d55fd5b02..dab1786c7349 100644
--- a/pkgs/development/python-modules/commitizen/default.nix
+++ b/pkgs/development/python-modules/commitizen/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "commitizen";
-  version = "4.5.0";
+  version = "4.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     owner = "commitizen-tools";
     repo = "commitizen";
     tag = "v${version}";
-    hash = "sha256-J3jwCgiwM2SOJJ8tpXNxHodyhkMb631cb1Usr8Cnwx0=";
+    hash = "sha256-tn87aMJf6UeiTaMmG7Yr+1MenGBTSWrNRIM+QME+8uI=";
   };
 
   pythonRelaxDeps = [

From b29c65613c8e5b24520e41f9c8514c4a32b8257b Mon Sep 17 00:00:00 2001
From: FKouhai <frandres00@gmail.com>
Date: Tue, 22 Apr 2025 21:54:58 +0200
Subject: [PATCH 18/40] various: remove linuxmobile as maintainer

---
 maintainers/maintainer-list.nix    | 6 ------
 pkgs/by-name/fu/fum/package.nix    | 2 +-
 pkgs/by-name/tu/tuicam/package.nix | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5654fb0b546d..0223bb59adf4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13888,12 +13888,6 @@
     githubId = 74221543;
     name = "Moritz Goltdammer";
   };
-  linuxmobile = {
-    email = "bdiez19@gmail.com";
-    github = "linuxmobile";
-    githubId = 10554636;
-    name = "Braian A. Diez";
-  };
   linuxwhata = {
     email = "linuxwhata@qq.com";
     matrix = "@lwa:envs.net";
diff --git a/pkgs/by-name/fu/fum/package.nix b/pkgs/by-name/fu/fum/package.nix
index 5e44c8745a31..cc95bfdf5ff2 100644
--- a/pkgs/by-name/fu/fum/package.nix
+++ b/pkgs/by-name/fu/fum/package.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/qxb3/fum";
     changelog = "https://github.com/qxb3/fum/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ linuxmobile ];
+    maintainers = with lib.maintainers; [ FKouhai ];
     platforms = lib.platforms.linux;
     mainProgram = "fum";
   };
diff --git a/pkgs/by-name/tu/tuicam/package.nix b/pkgs/by-name/tu/tuicam/package.nix
index 338519fbeea1..344478d30ab1 100644
--- a/pkgs/by-name/tu/tuicam/package.nix
+++ b/pkgs/by-name/tu/tuicam/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/hlsxx/tuicam";
     changelog = "https://github.com/hlsxx/tuicam/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ linuxmobile ];
+    maintainers = with lib.maintainers; [ FKouhai ];
     platforms = lib.platforms.linux;
     mainProgram = "tuicam";
   };

From 11effb9b9872bceb35c24e8284cedca92cc18679 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 Apr 2025 18:15:50 +0200
Subject: [PATCH 19/40] slurm-nm: declare all unix platforms as officially
 supported

---
 pkgs/by-name/sl/slurm-nm/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sl/slurm-nm/package.nix b/pkgs/by-name/sl/slurm-nm/package.nix
index cee4e5ee8f75..13c617d79cd2 100644
--- a/pkgs/by-name/sl/slurm-nm/package.nix
+++ b/pkgs/by-name/sl/slurm-nm/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Generic network load monitor";
     homepage = "https://github.com/mattthias/slurm";
     license = licenses.gpl2Plus;
-    platforms = [ "x86_64-linux" ];
+    platforms = platforms.unix;
     maintainers = with maintainers; [ mikaelfangel ];
     mainProgram = "slurm";
   };

From 9a10be54058e718de9b5e1447d3783bf721d69c3 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 22 Apr 2025 23:04:35 +0200
Subject: [PATCH 20/40] traefik:  use finalAttrs pattern

---
 pkgs/by-name/tr/traefik/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix
index e2842ed056bd..ebf24214ddea 100644
--- a/pkgs/by-name/tr/traefik/package.nix
+++ b/pkgs/by-name/tr/traefik/package.nix
@@ -6,13 +6,13 @@
   nix-update-script,
 }:
 
-buildGo124Module rec {
+buildGo124Module (finalAttrs: {
   pname = "traefik";
   version = "3.3.6";
 
   # Archive with static assets for webui
   src = fetchzip {
-    url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
+    url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
     hash = "sha256-HA/JSwcss5ytGPqe2dqsKTZxuhWeC/yi8Mva4YVFeDs=";
     stripRoot = false;
   };
@@ -30,8 +30,8 @@ buildGo124Module rec {
 
     ldflags="-s"
     ldflags+=" -w"
-    ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Version=${version}"
-    ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Codename=$CODENAME"
+    ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major finalAttrs.version}/pkg/version.Version=${finalAttrs.version}"
+    ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major finalAttrs.version}/pkg/version.Codename=$CODENAME"
   '';
 
   doCheck = false;
@@ -45,7 +45,7 @@ buildGo124Module rec {
   meta = with lib; {
     homepage = "https://traefik.io";
     description = "Modern reverse proxy";
-    changelog = "https://github.com/traefik/traefik/raw/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/traefik/traefik/raw/v${finalAttrs.version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
       djds
@@ -53,4 +53,4 @@ buildGo124Module rec {
     ];
     mainProgram = "traefik";
   };
-}
+})

From 09787fba34015ffec55ffac5e1f3956f5fd23217 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 22 Apr 2025 23:08:46 +0200
Subject: [PATCH 21/40] traefik: remove with lib from meta

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

diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix
index ebf24214ddea..238d77561386 100644
--- a/pkgs/by-name/tr/traefik/package.nix
+++ b/pkgs/by-name/tr/traefik/package.nix
@@ -42,12 +42,12 @@ buildGo124Module (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://traefik.io";
     description = "Modern reverse proxy";
     changelog = "https://github.com/traefik/traefik/raw/v${finalAttrs.version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       djds
       vdemeester
     ];

From fee2c0bcb434f74b4abd3b303ddcb2534e0846a3 Mon Sep 17 00:00:00 2001
From: Grimm <fvckgrimm@protonmail.ch>
Date: Thu, 29 Aug 2024 09:56:09 -0700
Subject: [PATCH 22/40] maintainers: add fvckgrimm

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5654fb0b546d..8d26d4ed0a1a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8488,6 +8488,12 @@
     githubId = 12715461;
     name = "Anders Bo Rasmussen";
   };
+  fvckgrimm = {
+    email = "nixpkgs@grimm.wtf";
+    github = "fvckgrimm";
+    githubId = 55907409;
+    name = "Grimm";
+  };
   fwc = {
     github = "fwc";
     githubId = 29337229;

From 5aa70730efad266bf1e5b55b27d30ce2744df7bf Mon Sep 17 00:00:00 2001
From: Grimm <fvckgrimm@protonmail.ch>
Date: Thu, 29 Aug 2024 10:07:19 -0700
Subject: [PATCH 23/40] angryoxide: init at 0.8.32

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

diff --git a/pkgs/by-name/an/angryoxide/package.nix b/pkgs/by-name/an/angryoxide/package.nix
new file mode 100644
index 000000000000..5abe04cd555a
--- /dev/null
+++ b/pkgs/by-name/an/angryoxide/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  libxkbcommon,
+  sqlite,
+  zlib,
+  wayland,
+}:
+
+let
+  libwifi = fetchFromGitHub {
+    owner = "Ragnt";
+    repo = "libwifi";
+    rev = "71268e1898ad88b8b5d709e186836db417b33e81";
+    hash = "sha256-2X/TZyLX9Tb54c6Sdla4bsWdq05NU72MVSuPvNfxySk=";
+  };
+in
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "angryoxide";
+  version = "0.8.32";
+
+  src = fetchFromGitHub {
+    owner = "Ragnt";
+    repo = "AngryOxide";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Sla5lvyqZho9JE4QVS9r0fx5+DVlU90c8OSfO4/f0B4=";
+  };
+
+  postPatch = ''
+    rm -r libs/libwifi
+    ln -s ${libwifi} libs/libwifi
+  '';
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-mry4l0a7DZOWkrChU40OVRCBjKwI39cyZtvEBA5tro0=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libxkbcommon
+    sqlite
+    wayland
+    zlib
+  ];
+
+  meta = {
+    description = "802.11 Attack Tool";
+    changelog = "https://github.com/Ragnt/AngryOxide/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/Ragnt/AngryOxide/";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fvckgrimm ];
+    mainProgram = "angryoxide";
+    platforms = lib.platforms.linux;
+  };
+})

From 9b5e54fa653ad6ce03edb1c162aeea41dba64e98 Mon Sep 17 00:00:00 2001
From: Andy Zhang <1329212+zh4ngx@users.noreply.github.com>
Date: Fri, 18 Apr 2025 14:37:45 -0700
Subject: [PATCH 24/40] beeper: fix desktop entry copy

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

diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index ac81afa387b1..eba68ca2380e 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -27,12 +27,12 @@ appimageTools.wrapType2 {
     # disable creating a desktop file and icon in the home folder during runtime
     linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs
     echo "export function registerLinuxConfig() {}" > $linuxConfigFilename
-    substituteInPlace $out/beepertexts.desktop --replace-fail "AppRun" "beeper"
   '';
 
   extraInstallCommands = ''
     install -Dm 644 ${appimageContents}/beepertexts.png $out/share/icons/hicolor/512x512/apps/beepertexts.png
     install -Dm 644 ${appimageContents}/beepertexts.desktop -t $out/share/applications/
+    substituteInPlace $out/share/applications/beepertexts.desktop --replace-fail "AppRun" "beeper"
 
     . ${makeWrapper}/nix-support/setup-hook
     wrapProgram $out/bin/beeper \

From e88a9b669c25bcebce56cb666d9e78566dee4c70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Apr 2025 23:35:46 +0000
Subject: [PATCH 25/40] weaviate: 1.29.1 -> 1.30.1

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

diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix
index ef0e55faacb4..587798733f30 100644
--- a/pkgs/by-name/we/weaviate/package.nix
+++ b/pkgs/by-name/we/weaviate/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "weaviate";
-  version = "1.29.1";
+  version = "1.30.1";
 
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate";
     rev = "v${version}";
-    hash = "sha256-Akg0iY5M3X6ztKxhNEkhi03VnbNpNW7/Vcbv2KB6X54=";
+    hash = "sha256-Rxi21DifRnOzUgPO3U74LMQ/27NwvYzcj3INplTT1j4=";
   };
 
-  vendorHash = "sha256-U2ean49ESKmcQ3fTtd6y9MwfWPr6tolvgioyKbQsBmU=";
+  vendorHash = "sha256-jXfVPdORMBOAl3Od3GknGo7Qtfb4H3RqGYdI6Jx1/5I=";
 
   subPackages = [ "cmd/weaviate-server" ];
 

From 653797d4e61603df11714c041407e3060a433531 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 22 Apr 2025 23:52:15 +0000
Subject: [PATCH 26/40] glance: 0.7.12 -> 0.7.13

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

diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix
index b62400a864e7..d40556da08fb 100644
--- a/pkgs/by-name/gl/glance/package.nix
+++ b/pkgs/by-name/gl/glance/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "glance";
-  version = "0.7.12";
+  version = "0.7.13";
 
   src = fetchFromGitHub {
     owner = "glanceapp";
     repo = "glance";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HytxMin0IM6KAqGu/Cq/WCT79DiH01LpTK3RNgWf7iQ=";
+    hash = "sha256-MinskibgOCb8OytC+Uxg31g00Ha/un7MF+uvL9xosUU=";
   };
 
   vendorHash = "sha256-+7mOCU5GNQV8+s9QPki+7CDi4qtOIpwjC//QracwzHI=";

From 43429d17c10b287eeb506924883b67b29a5c90c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Apr 2025 00:13:10 +0000
Subject: [PATCH 27/40] yaziPlugins.toggle-pane: 25.2.26-unstable-2025-03-19 ->
 25.2.26-unstable-2025-04-21

---
 pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
index 5a1cefc8fda9..c01ac9a097da 100644
--- a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "toggle-pane.yazi";
-  version = "25.2.26-unstable-2025-03-19";
+  version = "25.2.26-unstable-2025-04-21";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "273019910c1111a388dd20e057606016f4bd0d17";
-    hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I=";
+    rev = "4b027c79371af963d4ae3a8b69e42177aa3fa6ee";
+    hash = "sha256-auGNSn6tX72go7kYaH16hxRng+iZWw99dKTTUN91Cow=";
   };
 
   meta = {

From e76b49e83ecc46fad3bcb18819921a3a4528ad0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Apr 2025 00:17:54 +0000
Subject: [PATCH 28/40] yaziPlugins.rich-preview: 0-unstable-2025-01-18 ->
 0-unstable-2025-04-22

---
 pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
index ae6e5e8be0f0..ddc7f3dd9264 100644
--- a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "rich-preview.yazi";
-  version = "0-unstable-2025-01-18";
+  version = "0-unstable-2025-04-22";
 
   src = fetchFromGitHub {
     owner = "AnirudhG07";
     repo = "rich-preview.yazi";
-    rev = "2559e5fa7c1651dbe7c5615ef6f3b5291347d81a";
-    hash = "sha256-dW2gAAv173MTcQdqMV32urzfrsEX6STR+oCJoRVGGpA=";
+    rev = "fdcf37320e35f7c12e8087900eebffcdafaee8cb";
+    hash = "sha256-HO9hTCfgGTDERClZaLnUEWDvsV9GMK1kwFpWNM1wq8I=";
   };
 
   meta = {

From 5df569cff455d56fedc90350260fe87649e5b392 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Apr 2025 00:21:27 +0000
Subject: [PATCH 29/40] yaziPlugins.duckdb: 25.4.8-unstable-2025-04-09 ->
 25.4.8-unstable-2025-04-20

---
 pkgs/by-name/ya/yazi/plugins/duckdb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix
index 9e022261fbad..91c8f9e5f99d 100644
--- a/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "duckdb.yazi";
-  version = "25.4.8-unstable-2025-04-09";
+  version = "25.4.8-unstable-2025-04-20";
 
   src = fetchFromGitHub {
     owner = "wylie102";
     repo = "duckdb.yazi";
-    rev = "eaa748c62e24f593104569d2dc15d50b1d48497b";
-    hash = "sha256-snQ+n7n+71mqAsdzrXcI2v7Bg0trrbiHv3mIAxldqlc=";
+    rev = "6259e2d26236854b966ebc71d28de0397ddbe4d8";
+    hash = "sha256-9DMqE/pihp4xT6Mo2xr51JJjudMRAesxD5JqQ4WXiM4=";
   };
 
   meta = {

From cc83e5d5a0bc37c3c75c63f53b3cd22e3744adae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Apr 2025 00:24:53 +0000
Subject: [PATCH 30/40] yaziPlugins.starship: 25.4.8-unstable-2025-04-09 ->
 25.4.8-unstable-2025-04-20

---
 pkgs/by-name/ya/yazi/plugins/starship/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix
index f3cc5e0863c6..27ec12b801b3 100644
--- a/pkgs/by-name/ya/yazi/plugins/starship/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "starship.yazi";
-  version = "25.4.8-unstable-2025-04-09";
+  version = "25.4.8-unstable-2025-04-20";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "starship.yazi";
-    rev = "c0707544f1d526f704dab2da15f379ec90d613c2";
-    hash = "sha256-H8j+9jcdcpPFXVO/XQZL3zq1l5f/WiOm4YUxAMduSRs=";
+    rev = "6fde3b2d9dc9a12c14588eb85cf4964e619842e6";
+    hash = "sha256-+CSdghcIl50z0MXmFwbJ0koIkWIksm3XxYvTAwoRlDY=";
   };
 
   meta = {

From 3204bcc765a2ef97cc0c8655fc4cb1044caed463 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Apr 2025 00:28:31 +0000
Subject: [PATCH 31/40] allure: 2.33.0 -> 2.34.0

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

diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix
index bcce322418c9..cbb780c2ee5d 100644
--- a/pkgs/by-name/al/allure/package.nix
+++ b/pkgs/by-name/al/allure/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "allure";
-  version = "2.33.0";
+  version = "2.34.0";
 
   src = fetchurl {
     url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz";
-    hash = "sha256-ZRAvIBF89LFYWfmO/bPqL85/XQ9l0TRGOs/uQ9no7tA=";
+    hash = "sha256-1R4x8LjUv4ZQXfFeJ1HkHml3sRLhb1tRV3UqApVEo7U=";
   };
 
   dontConfigure = true;

From 8e00b8a60022155759f4e79d53383f035d5a2e78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Apr 2025 00:36:53 +0000
Subject: [PATCH 32/40] python312Packages.docling-serve: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix
index 4a521fbadbec..16694ea49e2f 100644
--- a/pkgs/development/python-modules/docling-serve/default.nix
+++ b/pkgs/development/python-modules/docling-serve/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "docling-serve";
-  version = "0.7.0";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-serve";
     tag = "v${version}";
-    hash = "sha256-QasHVoJITOuys4hASwC43eIy5854G12Yvu7Zncr9ia8=";
+    hash = "sha256-ACoqhaGiYHf2dqulxfHQDH/JIhuUlH7wyu0JY4hd0U8=";
   };
 
   build-system = [

From 2152f51ec73f4c7e18202b1846ac35a59c21f620 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Apr 2025 00:57:28 +0000
Subject: [PATCH 33/40] chamber: 3.1.1 -> 3.1.2

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

diff --git a/pkgs/by-name/ch/chamber/package.nix b/pkgs/by-name/ch/chamber/package.nix
index 4f6dd8670f67..9f721954031f 100644
--- a/pkgs/by-name/ch/chamber/package.nix
+++ b/pkgs/by-name/ch/chamber/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "chamber";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "segmentio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-1ySOlP0sFk3+IRt/zstZK6lEE2pzoVSiZz3wFxdesgc=";
+    sha256 = "sha256-9+I/zH4sHlLQkEn+fCboI3vCjYjlk+hdYnWuxq47r5I=";
   };
 
   env.CGO_ENABLED = 0;
 
-  vendorHash = "sha256-KlouLjW9hVKFi9uz34XHd4CzNOiyO245QNygkB338YQ=";
+  vendorHash = "sha256-IjCBf1h6r+EDLfgGqP/VfsHaD5oPkIR33nYBAcb6SLY=";
 
   ldflags = [
     "-s"

From 1f0c0201d1aab1721b25ff75614c065962de89dd Mon Sep 17 00:00:00 2001
From: VuiMuich <vuimuich@quantentunnel.de>
Date: Wed, 23 Apr 2025 04:21:43 +0200
Subject: [PATCH 34/40] blender: 4.4.0 -> 4.4.1 (#399292)

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

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 87dbe51ba6b5..ea942a8ec9f6 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -112,12 +112,12 @@ in
 
 stdenv'.mkDerivation (finalAttrs: {
   pname = "blender";
-  version = "4.4.0";
+  version = "4.4.1";
 
   srcs = fetchzip {
     name = "source";
     url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-    hash = "sha256-pAzOayAPyRYgTixAyg2prkUtI70uFulRuBYhgU9ZNw4=";
+    hash = "sha256-5MsJ7UFpwwtaq905CiTkas/qPYOaeiacSSl3qu9h5w0=";
   };
 
   patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;

From b823d7721f174ac9094f0eeb666f6180a6486d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?=
 <33058747+GaetanLepage@users.noreply.github.com>
Date: Wed, 23 Apr 2025 04:23:11 +0200
Subject: [PATCH 35/40] python312Packages.vector: 1.6.1 -> 1.6.2 (#400912)

Diff: https://github.com/scikit-hep/vector/compare/refs/tags/v1.6.1...refs/tags/v1.6.2

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

diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix
index 715a13dbdf06..f39a670a898a 100644
--- a/pkgs/development/python-modules/vector/default.nix
+++ b/pkgs/development/python-modules/vector/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "vector";
-  version = "1.6.1";
+  version = "1.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "vector";
     tag = "v${version}";
-    hash = "sha256-EHvdz6Tv3qJr6yUAw3/TuoMSrOCAQpsFBF1sS5I2p2k=";
+    hash = "sha256-IMr3+YveR/FDQ2MbgbWr1KJFrdH9B+KOFVNGJjz6Zdk=";
   };
 
   build-system = [

From 465759d454d40d1708ca769f1bf9a50002073eaa Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Fri, 18 Apr 2025 19:22:33 -0500
Subject: [PATCH 36/40] fooyin: fix build, add libebur128 for ReplayGain

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

diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix
index f4723504c5cf..e2341b74e49b 100644
--- a/pkgs/by-name/fo/fooyin/package.nix
+++ b/pkgs/by-name/fo/fooyin/package.nix
@@ -10,12 +10,14 @@
   kdsingleapplication,
   pipewire,
   taglib,
+  libebur128,
   libvgm,
   libsndfile,
   libarchive,
   libopenmpt,
   game-music-emu,
   SDL2,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     pipewire
     SDL2
     # input plugins
+    libebur128
     libvgm
     libsndfile
     libarchive
@@ -63,6 +66,15 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "INSTALL_FHS" true)
   ];
 
+  # Remove after next release
+  patches = [
+    (fetchpatch {
+      name = "qbrush.patch";
+      url = "https://github.com/fooyin/fooyin/commit/e44e08abb33f01fe85cc896170c55dbf732ffcc9.patch";
+      hash = "sha256-soDj/SFctxxsnkePv4dZgyDHYD2eshlEziILOZC4ddM=";
+    })
+  ];
+
   env.LANG = "C.UTF-8";
 
   meta = {

From 21f623d62d0af0381e7a143db89597eaefd42644 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Tue, 22 Apr 2025 19:47:13 -0700
Subject: [PATCH 37/40] maintainers: awwpotato add matrix

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7f0f40563522..5c1d1fb103c8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2513,6 +2513,7 @@
   };
   awwpotato = {
     email = "awwpotato@voidq.com";
+    matrix = "@awwpotato:envs.net";
     github = "awwpotato";
     githubId = 153149335;
     name = "awwpotato";

From 8923784c1365ed59297104df16dd8e2a310f9a28 Mon Sep 17 00:00:00 2001
From: Morxemplum <morxemplum+github@gmail.com>
Date: Wed, 23 Apr 2025 00:13:06 -0400
Subject: [PATCH 38/40] mcpelauncher-ui-qt: fix build on Qt 6.9

---
 pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix
index 81352635f66d..d0c0241be79d 100644
--- a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix
+++ b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   mcpelauncher-client,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   zlib,
@@ -27,6 +28,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./dont_download_glfw_ui.patch
+    # Qt 6.9 no longer implicitly converts non-char types (such as booleans) to
+    # construct a QChar. This leads to a build failure with Qt 6.9. Upstream
+    # has merged a patch, but has not yet formalized it through a release, so
+    # we must fetch it manually. Remove this fetch on the next point release.
+    (fetchpatch {
+      url = "https://github.com/minecraft-linux/mcpelauncher-ui-qt/commit/0526b1fd6234d84f63b216bf0797463f41d2bea0.diff";
+      hash = "sha256-vL5iqbs50qVh4BKDxTOpCwFQWO2gLeqrVLfnpeB6Yp8=";
+      stripLen = 1;
+      extraPrefix = "mcpelauncher-ui-qt/";
+    })
   ];
 
   nativeBuildInputs = [

From 4c38c704aacd3b89c54fff2998354e5513363e76 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 23 Apr 2025 08:10:54 +0300
Subject: [PATCH 39/40] Revert "mongoc: 1.30.2 -> 2.0.0"

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

diff --git a/pkgs/by-name/mo/mongoc/package.nix b/pkgs/by-name/mo/mongoc/package.nix
index 68d892aedd33..5812ffda8bef 100644
--- a/pkgs/by-name/mo/mongoc/package.nix
+++ b/pkgs/by-name/mo/mongoc/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mongoc";
-  version = "2.0.0";
+  version = "1.30.2";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-c-driver";
     tag = version;
-    hash = "sha256-GKXfTrZqdfgxzNi0fM9Ik4XeZGn9IlX75+cXmm5tXPY=";
+    hash = "sha256-RDUrD8MPZd1VBePyR+L5GiT/j5EZIY1KHLQKG5MsuSM=";
   };
 
   nativeBuildInputs = [

From ed3789c02b5eb3544af1ad6e1ecd1ea702e9f507 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 22 Apr 2025 06:00:15 +0800
Subject: [PATCH 40/40] duply: 2.4 -> 2.5.5

---
 pkgs/by-name/du/duply/package.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/du/duply/package.nix b/pkgs/by-name/du/duply/package.nix
index c963bc589be8..d3157d64781e 100644
--- a/pkgs/by-name/du/duply/package.nix
+++ b/pkgs/by-name/du/duply/package.nix
@@ -14,21 +14,24 @@
   which,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "duply";
-  version = "2.4";
+  version = "2.5.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.4.x/duply_${version}.tgz";
-    hash = "sha256-DCrp3o/ukzkfnVaLbIK84bmYnXvqKsvlkGn3GJY3iNg=";
+    url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.5.x/duply_${finalAttrs.version}.tgz";
+    hash = "sha256-ABryuV5jJNoxcJLsSjODLOHuLKrSEhY3buzy1cQh+AU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
+
   buildInputs = [ txt2man ];
 
   postPatch = "patchShebangs .";
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p "$out/bin"
     mkdir -p "$out/share/man/man1"
     install -vD duply "$out/bin"
@@ -45,9 +48,11 @@ stdenv.mkDerivation rec {
           which
         ]}
     "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1"
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Shell front end for the duplicity backup tool";
     mainProgram = "duply";
     longDescription = ''
@@ -57,8 +62,8 @@ stdenv.mkDerivation rec {
       secure backups on non-trusted spaces are no child's play?
     '';
     homepage = "https://duply.net/";
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.bjornfor ];
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.bjornfor ];
     platforms = lib.platforms.unix;
   };
-}
+})