From 79ecd7eca4a732598a3e427ecfbb008fda2e17f0 Mon Sep 17 00:00:00 2001
From: Alexis Destrez <krostar@users.noreply.github.com>
Date: Mon, 20 Jan 2025 20:09:32 +0100
Subject: [PATCH 001/144] goverter: init at 1.7.0

---
 pkgs/by-name/go/goverter/package.nix | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/go/goverter/package.nix

diff --git a/pkgs/by-name/go/goverter/package.nix b/pkgs/by-name/go/goverter/package.nix
new file mode 100644
index 000000000000..073aed4a0813
--- /dev/null
+++ b/pkgs/by-name/go/goverter/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+buildGoModule rec {
+  pname = "goverter";
+  version = "1.7.0";
+
+  src = fetchFromGitHub {
+    owner = "jmattheis";
+    repo = "goverter";
+    tag = "v${version}";
+    hash = "sha256-VgwmnB6FP7hlUrZpKun38T4K2YSDl9yYuMjdzsEhCF4=";
+  };
+
+  vendorHash = "sha256-uQ1qKZLRwsgXKqSAERSqf+1cYKp6MTeVbfGs+qcdakE=";
+
+  subPackages = [ "cmd/goverter" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Generate type-safe Go converters by defining function signatures.";
+    homepage = "https://github.com/jmattheis/goverter";
+    changelog = "https://goverter.jmattheis.de/changelog";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ krostar ];
+    mainProgram = "goverter";
+  };
+}

From d54c0f64215754af5a02100f89778b41101aa757 Mon Sep 17 00:00:00 2001
From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com>
Date: Thu, 30 Jan 2025 17:42:11 +0100
Subject: [PATCH 002/144] maintainers: add oskardotglobal

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9d1d1f3e2b19..f5e398314525 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17336,6 +17336,12 @@
     githubId = 111265;
     name = "Ozan Sener";
   };
+  oskardotglobal = {
+    email = "me@oskar.global";
+    github = "oskardotglobal";
+    githubId = 52569953;
+    name = "Oskar Manhart";
+  };
   osnyx = {
     email = "os@flyingcircus.io";
     github = "osnyx";

From 60d17e0b5b17afd1d22b44b3cb0538b76f69bd5e Mon Sep 17 00:00:00 2001
From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com>
Date: Thu, 30 Jan 2025 17:42:38 +0100
Subject: [PATCH 003/144] tombl: init at 0.2.3

---
 pkgs/by-name/to/tombl/package.nix | 36 +++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/to/tombl/package.nix

diff --git a/pkgs/by-name/to/tombl/package.nix b/pkgs/by-name/to/tombl/package.nix
new file mode 100644
index 000000000000..d4dba7abdf4f
--- /dev/null
+++ b/pkgs/by-name/to/tombl/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "tombl";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "snyball";
+    repo = "tombl";
+    tag = "v${version}";
+    hash = "sha256-XHvAgJ8/+ZkBxwZpMgaDchr0hBa1FXAd/j1+HH9N6qw=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-A3zdDzmwX2gdTLLWnUGeiqY1R5PBKZRmEHdIi1Uveaw=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Easily query TOML files from bash";
+    homepage = "https://github.com/snyball/tombl";
+    changelog = "https://github.com/snyball/tombl/releases/tag/v${version}";
+    mainProgram = "tombl";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ oskardotglobal ];
+  };
+}

From d489575942518f7e20a0c9584003070e2a558a5c Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Tue, 4 Feb 2025 15:50:58 +0100
Subject: [PATCH 004/144] bat-extras: heavily refactor

---
 .../misc/bat-extras/buildBatExtrasPkg.nix     |  77 +++++++
 pkgs/tools/misc/bat-extras/default.nix        | 208 +-----------------
 .../tools/misc/bat-extras/modules/batdiff.nix |  18 ++
 .../tools/misc/bat-extras/modules/batgrep.nix |  15 ++
 pkgs/tools/misc/bat-extras/modules/batman.nix |  11 +
 .../tools/misc/bat-extras/modules/batpipe.nix |   9 +
 .../misc/bat-extras/modules/batwatch.nix      |  17 ++
 pkgs/tools/misc/bat-extras/modules/core.nix   |  86 ++++++++
 .../misc/bat-extras/modules/prettybat.nix     |  22 ++
 .../{ => patches}/disable-theme-tests.patch   |   0
 pkgs/top-level/all-packages.nix               |   2 +-
 11 files changed, 266 insertions(+), 199 deletions(-)
 create mode 100644 pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
 create mode 100644 pkgs/tools/misc/bat-extras/modules/batdiff.nix
 create mode 100644 pkgs/tools/misc/bat-extras/modules/batgrep.nix
 create mode 100644 pkgs/tools/misc/bat-extras/modules/batman.nix
 create mode 100644 pkgs/tools/misc/bat-extras/modules/batpipe.nix
 create mode 100644 pkgs/tools/misc/bat-extras/modules/batwatch.nix
 create mode 100644 pkgs/tools/misc/bat-extras/modules/core.nix
 create mode 100644 pkgs/tools/misc/bat-extras/modules/prettybat.nix
 rename pkgs/tools/misc/bat-extras/{ => patches}/disable-theme-tests.patch (100%)

diff --git a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
new file mode 100644
index 000000000000..adc621108c58
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  core,
+
+  bash,
+  bat,
+  fish,
+  getconf,
+  makeWrapper,
+  zsh,
+}:
+let
+  cleanArgs = lib.flip builtins.removeAttrs [
+    "dependencies"
+    "meta"
+  ];
+in
+{
+  name,
+  dependencies,
+  meta ? { },
+  ...
+}@args:
+stdenv.mkDerivation (
+  finalAttrs:
+  cleanArgs args
+  // {
+    inherit (core) version;
+
+    src = core;
+
+    nativeBuildInputs = [ makeWrapper ];
+    # Make the dependencies available to the tests.
+    buildInputs = dependencies;
+
+    # Patch shebangs now because our tests rely on them
+    postPatch = ''
+      patchShebangs --host bin/${name}
+    '';
+
+    dontConfigure = true;
+    dontBuild = true; # we've already built
+
+    doCheck = true;
+    nativeCheckInputs = [
+      bat
+      bash
+      fish
+      zsh
+    ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
+    checkPhase = ''
+      runHook preCheck
+      bash ./test.sh --compiled --suite ${name}
+      runHook postCheck
+    '';
+
+    installPhase =
+      ''
+        runHook preInstall
+        mkdir -p $out/bin
+        cp -p bin/${name} $out/bin/${name}
+      ''
+      + lib.optionalString (dependencies != [ ]) ''
+        wrapProgram $out/bin/${name} \
+          --prefix PATH : ${lib.makeBinPath dependencies}
+      ''
+      + ''
+        runHook postInstall
+      '';
+
+    # We already patched
+    dontPatchShebangs = true;
+
+    meta = core.meta // { mainProgram = name; } // meta;
+  }
+)
diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index 323b1dc21cc7..e10913b37852 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -1,200 +1,12 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  makeWrapper,
-  bat,
-  # batdiff, batgrep, and batwatch
-  coreutils,
-  getconf,
-  less,
-  # tests
-  bash,
-  zsh,
-  fish,
-  # batgrep
-  ripgrep,
-  # prettybat
-  withShFmt ? shfmt != null,
-  shfmt ? null,
-  withPrettier ? nodePackages ? prettier,
-  nodePackages ? null,
-  withClangTools ? clang-tools != null,
-  clang-tools ? null,
-  withRustFmt ? rustfmt != null,
-  rustfmt ? null,
-  # batwatch
-  withEntr ? entr != null,
-  entr ? null,
-  # batdiff
-  gitMinimal,
-  withDelta ? delta != null,
-  delta ? null,
-  # batman
-  util-linux,
-}:
+{ }:
+self: {
+  buildBatExtrasPkg = self.callPackage ./buildBatExtrasPkg.nix { };
 
-let
-  # Core derivation that all the others are based on.
-  # This includes the complete source so the per-script derivations can run the tests.
-  core = stdenv.mkDerivation rec {
-    pname = "bat-extras";
-    version = "2024.07.10";
-
-    src = fetchFromGitHub {
-      owner = "eth-p";
-      repo = "bat-extras";
-      rev = "v${version}";
-      hash = "sha256-6IRAKSy5f/WcQZBcJKVSweTjHLznzdxhsyx074bXnUQ=";
-      fetchSubmodules = true;
-    };
-
-    # bat needs to be in the PATH during building so EXECUTABLE_BAT picks it up
-    nativeBuildInputs = [ bat ];
-
-    dontConfigure = true;
-
-    patches = [ ./disable-theme-tests.patch ];
-
-    postPatch = ''
-      patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-      bash ./build.sh --minify=none --no-verify
-      runHook postBuild
-    '';
-
-    # Run the library tests as they don't have external dependencies
-    doCheck = true;
-    nativeCheckInputs = [
-      bash
-      fish
-      zsh
-    ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
-    checkPhase = ''
-      runHook preCheck
-      # test list repeats suites. Unique them
-      declare -A test_suites
-      while read -r action arg _; do
-        [[ "$action" == "test_suite" && "$arg" == lib_* ]] &&
-        test_suites+=(["$arg"]=1)
-      done <<<"$(./test.sh --compiled --list --porcelain)"
-      (( ''${#test_suites[@]} != 0 )) || {
-        echo "Couldn't find any library test suites"
-        exit 1
-      }
-      ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}")
-      runHook postCheck
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      cp -a . $out
-      runHook postInstall
-    '';
-
-    # A few random files have shebangs. Don't patch them, they don't make it into the final output.
-    # The per-script derivations will go ahead and patch the files they actually install.
-    dontPatchShebangs = true;
-
-    meta = with lib; {
-      description = "Bash scripts that integrate bat with various command line tools";
-      homepage = "https://github.com/eth-p/bat-extras";
-      license = with licenses; [ mit ];
-      maintainers = with maintainers; [ bbigras ];
-      platforms = platforms.all;
-    };
-  };
-  script =
-    name: # the name of the script
-    dependencies: # the tools we need to prefix onto PATH
-    stdenv.mkDerivation {
-      pname = name;
-      inherit (core) version;
-
-      src = core;
-
-      nativeBuildInputs = [ makeWrapper ];
-      # Make the dependencies available to the tests.
-      buildInputs = dependencies;
-
-      # Patch shebangs now because our tests rely on them
-      postPatch = ''
-        patchShebangs --host bin/${name}
-      '';
-
-      dontConfigure = true;
-      dontBuild = true; # we've already built
-
-      doCheck = true;
-      nativeCheckInputs = [
-        bat
-        bash
-        fish
-        zsh
-      ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
-      checkPhase = ''
-        runHook preCheck
-        bash ./test.sh --compiled --suite ${name}
-        runHook postCheck
-      '';
-
-      installPhase =
-        ''
-          runHook preInstall
-          mkdir -p $out/bin
-          cp -p bin/${name} $out/bin/${name}
-        ''
-        + lib.optionalString (dependencies != [ ]) ''
-          wrapProgram $out/bin/${name} \
-            --prefix PATH : ${lib.makeBinPath dependencies}
-        ''
-        + ''
-          runHook postInstall
-        '';
-
-      # We already patched
-      dontPatchShebangs = true;
-
-      meta = core.meta // {
-        mainProgram = name;
-      };
-    };
-  optionalDep =
-    cond: dep:
-    assert cond -> dep != null;
-    lib.optional cond dep;
-in
-{
-  batdiff = script "batdiff" (
-    [
-      less
-      coreutils
-      gitMinimal
-    ]
-    ++ optionalDep withDelta delta
-  );
-  batgrep = script "batgrep" [
-    less
-    coreutils
-    ripgrep
-  ];
-  batman = script "batman" (lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]);
-  batpipe = script "batpipe" [ less ];
-  batwatch = script "batwatch" (
-    [
-      less
-      coreutils
-    ]
-    ++ optionalDep withEntr entr
-  );
-  prettybat = script "prettybat" (
-    [ ]
-    ++ optionalDep withShFmt shfmt
-    ++ optionalDep withPrettier nodePackages.prettier
-    ++ optionalDep withClangTools clang-tools
-    ++ optionalDep withRustFmt rustfmt
-  );
+  core = self.callPackage ./modules/core.nix { };
+  batdiff = self.callPackage ./modules/batdiff.nix { };
+  batgrep = self.callPackage ./modules/batgrep.nix { };
+  batman = self.callPackage ./modules/batman.nix { };
+  batpipe = self.callPackage ./modules/batpipe.nix { };
+  batwatch = self.callPackage ./modules/batwatch.nix { };
+  prettybat = self.callPackage ./modules/prettybat.nix { };
 }
diff --git a/pkgs/tools/misc/bat-extras/modules/batdiff.nix b/pkgs/tools/misc/bat-extras/modules/batdiff.nix
new file mode 100644
index 000000000000..57110cc4111f
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/modules/batdiff.nix
@@ -0,0 +1,18 @@
+{
+  lib,
+  buildBatExtrasPkg,
+  less,
+  coreutils,
+  gitMinimal,
+  delta,
+  withDelta ? true,
+}:
+buildBatExtrasPkg {
+  name = "batdiff";
+  dependencies = [
+    less
+    coreutils
+    gitMinimal
+  ] ++ lib.optional withDelta delta;
+  meta.description = "Diff a file against the current git index, or display the diff between two files";
+}
diff --git a/pkgs/tools/misc/bat-extras/modules/batgrep.nix b/pkgs/tools/misc/bat-extras/modules/batgrep.nix
new file mode 100644
index 000000000000..8ce898761c5b
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/modules/batgrep.nix
@@ -0,0 +1,15 @@
+{
+  buildBatExtrasPkg,
+  less,
+  coreutils,
+  ripgrep,
+}:
+buildBatExtrasPkg {
+  name = "batgrep";
+  dependencies = [
+    less
+    coreutils
+    ripgrep
+  ];
+  meta.description = "Quickly search through and highlight files using ripgrep";
+}
diff --git a/pkgs/tools/misc/bat-extras/modules/batman.nix b/pkgs/tools/misc/bat-extras/modules/batman.nix
new file mode 100644
index 000000000000..a08067f7df5e
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/modules/batman.nix
@@ -0,0 +1,11 @@
+{
+  lib,
+  stdenv,
+  buildBatExtrasPkg,
+  util-linux,
+}:
+buildBatExtrasPkg {
+  name = "batman";
+  dependencies = lib.optional stdenv.targetPlatform.isLinux util-linux;
+  meta.description = "Read system manual pages (man) using bat as the manual page formatter";
+}
diff --git a/pkgs/tools/misc/bat-extras/modules/batpipe.nix b/pkgs/tools/misc/bat-extras/modules/batpipe.nix
new file mode 100644
index 000000000000..aa145c82db23
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/modules/batpipe.nix
@@ -0,0 +1,9 @@
+{
+  buildBatExtrasPkg,
+  less,
+}:
+buildBatExtrasPkg {
+  name = "batpipe";
+  dependencies = [ less ];
+  meta.description = "less (and soon bat) preprocessor for viewing more types of files in the terminal";
+}
diff --git a/pkgs/tools/misc/bat-extras/modules/batwatch.nix b/pkgs/tools/misc/bat-extras/modules/batwatch.nix
new file mode 100644
index 000000000000..0293629dddc2
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/modules/batwatch.nix
@@ -0,0 +1,17 @@
+{
+  lib,
+  buildBatExtrasPkg,
+  less,
+  coreutils,
+  entr,
+
+  withEntr ? true,
+}:
+buildBatExtrasPkg {
+  name = "batwatch";
+  dependencies = [
+    less
+    coreutils
+  ] ++ lib.optional withEntr entr;
+  meta.description = "Watch for changes in one or more files, and print them with bat";
+}
diff --git a/pkgs/tools/misc/bat-extras/modules/core.nix b/pkgs/tools/misc/bat-extras/modules/core.nix
new file mode 100644
index 000000000000..6bb09788c948
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/modules/core.nix
@@ -0,0 +1,86 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  bash,
+  bat,
+  fish,
+  getconf,
+  nix-update-script,
+  zsh,
+}:
+stdenv.mkDerivation rec {
+  pname = "bat-extras";
+  version = "2024.08.24";
+
+  src = fetchFromGitHub {
+    owner = "eth-p";
+    repo = "bat-extras";
+    tag = "v${version}";
+    hash = "sha256-xkND/w6UNC58dC8WrsifwjqU9ZI4yUUq+ZljkhhUNT8=";
+    fetchSubmodules = true;
+  };
+
+  # bat needs to be in the PATH during building so EXECUTABLE_BAT picks it up
+  nativeBuildInputs = [ bat ];
+
+  dontConfigure = true;
+
+  patches = [ ../patches/disable-theme-tests.patch ];
+
+  postPatch = ''
+    patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    bash ./build.sh --minify=none --no-verify
+    runHook postBuild
+  '';
+
+  # Run the library tests as they don't have external dependencies
+  doCheck = true;
+  nativeCheckInputs = [
+    bash
+    fish
+    zsh
+  ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
+  checkPhase = ''
+    runHook preCheck
+    # test list repeats suites. Unique them
+    declare -A test_suites
+    while read -r action arg _; do
+      [[ "$action" == "test_suite" && "$arg" == lib_* ]] &&
+      test_suites+=(["$arg"]=1)
+    done <<<"$(./test.sh --compiled --list --porcelain)"
+    (( ''${#test_suites[@]} != 0 )) || {
+      echo "Couldn't find any library test suites"
+      exit 1
+    }
+    ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}")
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    cp -a . $out
+    runHook postInstall
+  '';
+
+  # A few random files have shebangs. Don't patch them, they don't make it into the final output.
+  # The per-script derivations will go ahead and patch the files they actually install.
+  dontPatchShebangs = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Bash scripts that integrate bat with various command line tools";
+    homepage = "https://github.com/eth-p/bat-extras";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [
+      bbigras
+      perchun
+    ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/tools/misc/bat-extras/modules/prettybat.nix b/pkgs/tools/misc/bat-extras/modules/prettybat.nix
new file mode 100644
index 000000000000..618f6ac10a00
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/modules/prettybat.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  buildBatExtrasPkg,
+  shfmt,
+  nodePackages,
+  clang-tools,
+  rustfmt,
+
+  withShFmt ? true,
+  withPrettier ? true,
+  withClangTools ? true,
+  withRustFmt ? true,
+}:
+buildBatExtrasPkg {
+  name = "prettybat";
+  dependencies =
+    lib.optional withShFmt shfmt
+    ++ lib.optional withPrettier nodePackages.prettier
+    ++ lib.optional withClangTools clang-tools
+    ++ lib.optional withRustFmt rustfmt;
+  meta.description = "Pretty-print source code and highlight it with bat";
+}
diff --git a/pkgs/tools/misc/bat-extras/disable-theme-tests.patch b/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch
similarity index 100%
rename from pkgs/tools/misc/bat-extras/disable-theme-tests.patch
rename to pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30f86fc3ec11..0a39fe7db907 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1941,7 +1941,7 @@ with pkgs;
 
   babelfish = callPackage ../shells/fish/babelfish.nix { };
 
-  bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { });
+  bat-extras = recurseIntoAttrs (lib.makeScope newScope (callPackage ../tools/misc/bat-extras { }));
 
   beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme {
     inherit (plasma5Packages) breeze-icons;

From 483518ffc9e6cfe6c57d25296d3445377b97face Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Tue, 11 Feb 2025 21:50:02 -0800
Subject: [PATCH 005/144] zigimports: init at 0.1.0

---
 pkgs/by-name/zi/zigimports/package.nix | 39 ++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/zi/zigimports/package.nix

diff --git a/pkgs/by-name/zi/zigimports/package.nix b/pkgs/by-name/zi/zigimports/package.nix
new file mode 100644
index 000000000000..75e40f07299f
--- /dev/null
+++ b/pkgs/by-name/zi/zigimports/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  zig_0_13,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zigimports";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "tusharsadhwani";
+    repo = "zigimports";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2cri+5mhhTQqlkv9db/3CQ3rCMq4yW4drMoRTZBhndE=";
+  };
+
+  nativeBuildInputs = [
+    zig_0_13.hook
+  ];
+
+  # Remove the system suffix on the program name.
+  postInstall = ''
+    mv $out/bin/zigimports{*,}
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Automatically remove unused imports and globals from Zig files";
+    homepage = "https://github.com/tusharsadhwani/zigimports";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jmbaur ];
+    mainProgram = "zigimports";
+    inherit (zig_0_13.meta) platforms;
+  };
+})

From 875aa2ab4afee6082a6383b26ee47ee263af031a Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 19 Jan 2025 21:37:51 +0100
Subject: [PATCH 006/144] maintainers: add petrzjunior

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe00f03a8a3a..1e6667c1892b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18184,6 +18184,11 @@
     githubId = 939420;
     name = "Petros Angelatos";
   };
+  petrzjunior = {
+    github = "petrzjunior";
+    githubId = 7000918;
+    name = "Petr Zahradnik";
+  };
   petterstorvik = {
     email = "petterstorvik@gmail.com";
     github = "storvik";

From 5af070ed42359801e392ec7acaf2cd410b8ecd73 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 19 Jan 2025 21:37:51 +0100
Subject: [PATCH 007/144] hl-log-viewer: init at 0.30.3

---
 pkgs/by-name/hl/hl-log-viewer/package.nix | 51 +++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/hl/hl-log-viewer/package.nix

diff --git a/pkgs/by-name/hl/hl-log-viewer/package.nix b/pkgs/by-name/hl/hl-log-viewer/package.nix
new file mode 100644
index 000000000000..433ad08570cc
--- /dev/null
+++ b/pkgs/by-name/hl/hl-log-viewer/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  rustPlatform,
+  installShellFiles,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "hl-log-viewer";
+  version = "0.30.3";
+
+  src = fetchFromGitHub {
+    owner = "pamburus";
+    repo = "hl";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-18FzXUvpMHu3EfECgcslhReinMM6Oa1qdTKbbqFiv1w=";
+  };
+
+  cargoHash = "sha256-qx3NxWgCsCurU+TObQIvn1Xyn5IRP/iNem3s201MD4A=";
+  useFetchCargoVendor = true;
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --cmd hl \
+      --bash <($out/bin/hl --shell-completions bash) \
+      --fish <($out/bin/hl --shell-completions fish) \
+      --zsh <($out/bin/hl --shell-completions zsh)
+    $out/bin/hl --man-page >hl.1
+    installManPage hl.1
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/hl";
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "JSON and logfmt log converter to human readable representation";
+    homepage = "https://github.com/pamburus/hl";
+    changelog = "https://github.com/pamburus/hl/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    mainProgram = "hl";
+    maintainers = with lib.maintainers; [ petrzjunior ];
+  };
+})

From 2a10d4d6729b1a3a52f1457f6b0a0157f648f169 Mon Sep 17 00:00:00 2001
From: heisfer <heisfer@refract.dev>
Date: Fri, 21 Mar 2025 12:04:03 +0200
Subject: [PATCH 008/144] jqfmt: init at 0-unstable-2024-08-15

---
 pkgs/by-name/jq/jqfmt/package.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/jq/jqfmt/package.nix

diff --git a/pkgs/by-name/jq/jqfmt/package.nix b/pkgs/by-name/jq/jqfmt/package.nix
new file mode 100644
index 000000000000..066b72db67c3
--- /dev/null
+++ b/pkgs/by-name/jq/jqfmt/package.nix
@@ -0,0 +1,29 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+}:
+buildGoModule {
+  pname = "jqfmt";
+  version = "0-unstable-2024-08-15";
+
+  src = fetchFromGitHub {
+    owner = "noperator";
+    repo = "jqfmt";
+    rev = "8fc6f864c295e6bd6b08f36f503b3d809270da61";
+    hash = "sha256-tvFp1SJeosJdCHs3c+vceBfacypJc/aFYSj55mBfkB8=";
+  };
+
+  vendorHash = "sha256-avpZSgQKFZxLmYGj+2Gi+wSDHnAgF0/hyp4HtoQ0ZCo=";
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
+
+  meta = {
+    description = "Like gofmt, but for jq";
+    homepage = "https://github.com/noperator/jqfmt";
+    license = lib.licenses.mit; # Doesn't have Licence file, but Readme points to MIT
+    maintainers = with lib.maintainers; [ heisfer ];
+    mainProgram = "jqfmt";
+  };
+}

From a4b2908bc6740fe978a4c6c1a09da215e6c4d4f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 23 Mar 2025 14:44:25 +0100
Subject: [PATCH 009/144] python313Packages.pytest-docker-tools: 3.1.3 -> 3.1.9

Diff: https://github.com/Jc2k/pytest-docker-tools/compare/refs/tags/v3.1.3...v3.1.9

Changelog: https://github.com/Jc2k/pytest-docker-tools/releases/tag/3.1.9
---
 .../pytest-docker-tools/default.nix           | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-docker-tools/default.nix b/pkgs/development/python-modules/pytest-docker-tools/default.nix
index 309db021c297..4462dde07535 100644
--- a/pkgs/development/python-modules/pytest-docker-tools/default.nix
+++ b/pkgs/development/python-modules/pytest-docker-tools/default.nix
@@ -3,37 +3,27 @@
   buildPythonPackage,
   docker,
   fetchFromGitHub,
-  fetchpatch,
-  poetry-core,
   pytest,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-docker-tools";
-  version = "3.1.3";
+  version = "3.1.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "Jc2k";
     repo = "pytest-docker-tools";
-    tag = version;
-    hash = "sha256-6F3aSUyDlBBYG1kwOQvey7rujDdK83uJ3Q1dr8Uo1pw=";
+    tag = "v${version}";
+    hash = "sha256-WYfgO7Ch1hCj9cE43jgI+2JEwDOzNvuMtkVV3PdMiBs=";
   };
 
-  patches = [
-    # Switch to poetry-core, https://github.com/Jc2k/pytest-docker-tools/pull/48
-    (fetchpatch {
-      name = "switch-poetry-core.patch";
-      url = "https://github.com/Jc2k/pytest-docker-tools/pull/48/commits/a655e4a32b075e06e89dd907b06bc4ad90703988.patch";
-      hash = "sha256-CwCBld7p+bqBfxV9IyxcCvfxXfnUSzCLF2m0ZduIqkU=";
-    })
-  ];
-
-  build-system = [ poetry-core ];
+  build-system = [ setuptools ];
 
   buildInputs = [ pytest ];
 

From b474165b61a8597b20b94138d1c565658e42df8e Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Wed, 26 Mar 2025 16:59:12 +0200
Subject: [PATCH 010/144] flatpak-xdg-utils: init at 1.0.6

---
 pkgs/by-name/fl/flatpak-xdg-utils/package.nix | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/fl/flatpak-xdg-utils/package.nix

diff --git a/pkgs/by-name/fl/flatpak-xdg-utils/package.nix b/pkgs/by-name/fl/flatpak-xdg-utils/package.nix
new file mode 100644
index 000000000000..6ca52f1f2144
--- /dev/null
+++ b/pkgs/by-name/fl/flatpak-xdg-utils/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  fetchFromGitHub,
+  glib,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "flatpak-xdg-utils";
+  version = "1.0.6";
+
+  src = fetchFromGitHub {
+    owner = "flatpak";
+    repo = "flatpak-xdg-utils";
+    tag = finalAttrs.version;
+    hash = "sha256-j5A5msgKjQSIvCvFSZGL8QfwH+SJGJ4S3PPCHOmM/bk=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/flatpak/flatpak-xdg-utils/releases/tag/${finalAttrs.version}";
+    description = "Commandline utilities for use inside Flatpak sandboxes";
+    homepage = "https://flatpak.org/";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ michaelgrahamevans ];
+    platforms = lib.platforms.linux;
+  };
+})

From 1d2cd5bfbbbfeed118a8a4909c5436bf3de10bea Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Wed, 26 Mar 2025 16:59:51 +0200
Subject: [PATCH 011/144] warehouse: init at 2.0.2

---
 pkgs/by-name/wa/warehouse/package.nix | 72 +++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 pkgs/by-name/wa/warehouse/package.nix

diff --git a/pkgs/by-name/wa/warehouse/package.nix b/pkgs/by-name/wa/warehouse/package.nix
new file mode 100644
index 000000000000..7fd50af13e08
--- /dev/null
+++ b/pkgs/by-name/wa/warehouse/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  blueprint-compiler,
+  desktop-file-utils,
+  fetchFromGitHub,
+  flatpak,
+  flatpak-xdg-utils,
+  glib,
+  gobject-introspection,
+  gtk4,
+  libadwaita,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  python3,
+  stdenv,
+  wrapGAppsHook4,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "warehouse";
+  version = "2.0.2";
+
+  src = fetchFromGitHub {
+    owner = "flattool";
+    repo = "warehouse";
+    tag = finalAttrs.version;
+    hash = "sha256-EcpHFS0EczUDFs0A/7IuNs1082hsuuS0J6wxSq47vaQ=";
+  };
+
+  nativeBuildInputs = [
+    blueprint-compiler
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    flatpak
+    flatpak-xdg-utils
+    glib
+    gtk4
+    libadwaita
+    (python3.withPackages (
+      ps: with ps; [
+        pygobject3
+      ]
+    ))
+  ];
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --suffix PATH : "${lib.makeBinPath [ flatpak-xdg-utils ]}"
+    )
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/flattool/warehouse/releases/tag/${finalAttrs.version}";
+    description = "Manage all things Flatpak";
+    homepage = "https://github.com/flattool/warehouse";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "warehouse";
+    maintainers = with lib.maintainers; [ michaelgrahamevans ];
+    platforms = lib.platforms.linux;
+  };
+})

From 74c5c8069d5d6503af52cc58d09d07b7cf5d2303 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 1 Apr 2025 13:40:54 +0300
Subject: [PATCH 012/144] jbofihe: fix build with gcc14

- add patch fixing gcc14 errors:
`implicit-int`:
```
rpc_tab.c:1:8: error: type defaults to 'int' in declaration of
'elide_trace_reduce' [-Wimplicit-int]
    1 | extern elide_trace_reduce(int, int);
      |        ^~~~~~~~~~~~~~~~~~
rpc_tab.c:2:8: error: type defaults to 'int' in declaration of
'elide_trace_shift' [-Wimplicit-int]
    2 | extern elide_trace_shift(int,int);
      |        ^~~~~~~~~~~~~~~~~
rpc_tab.c:3:8: error: type defaults to 'int' in declaration of
'report_trace_shift' [-Wimplicit-int]
    3 | extern report_trace_shift(int);
      |        ^~~~~~~~~~~~~~~~~~
rpc_tab.c:4:8: error: type defaults to 'int' in declaration of
'report_trace_reduce' [-Wimplicit-int]
    4 | extern report_trace_reduce(int, int);
      |        ^~~~~~~~~~~~~~~~~~~
rpc_tab.c:5:8: error: type defaults to 'int' in declaration of
'report_trace_error' [-Wimplicit-int]
    5 | extern report_trace_error(short *yyss, short *yyssp);
      |        ^~~~~~~~~~~~~~~~~~
```

`implicit-function-declaration`:
```
parse.tab.c: In function 'yyparse':
parse.tab.c:1148:16: error: implicit declaration of function 'yylex'
[-Wimplicit-function-declaration]
 1148 |       yychar = yylex ();
      |                ^~~~~

parse.tab.c:1595:7: error: implicit declaration of function 'yyerror';
did you mean 'yyerrok'? [-Wimplicit-function-declaration]
 1595 |       yyerror (YY_("syntax error"));
      |       ^~~~~~~
      |       yyerrok

n2d.c: In function 'main':
n2d.c:1529:12: error: implicit declaration of function 'yyparse'
[-Wimplicit-function-declaration]
 1529 |   result = yyparse();
      |            ^~~~~~~
```
---
 .../by-name/jb/jbofihe/fix-gcc14-errors.patch | 37 +++++++++++++++++++
 pkgs/by-name/jb/jbofihe/package.nix           |  6 +++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/jb/jbofihe/fix-gcc14-errors.patch

diff --git a/pkgs/by-name/jb/jbofihe/fix-gcc14-errors.patch b/pkgs/by-name/jb/jbofihe/fix-gcc14-errors.patch
new file mode 100644
index 000000000000..0c95bf305c84
--- /dev/null
+++ b/pkgs/by-name/jb/jbofihe/fix-gcc14-errors.patch
@@ -0,0 +1,37 @@
+diff --git a/add_trace_to_tabc.pl b/add_trace_to_tabc.pl
+index 04be787..3186075 100644
+--- a/add_trace_to_tabc.pl
++++ b/add_trace_to_tabc.pl
+@@ -15,11 +15,11 @@
+ # COPYRIGHT
+ 
+ print <<EOF;
+-extern elide_trace_reduce(int, int);
+-extern elide_trace_shift(int,int);
+-extern report_trace_shift(int);
+-extern report_trace_reduce(int, int);
+-extern report_trace_error(short *yyss, short *yyssp);
++extern void elide_trace_reduce(int, int);
++extern void elide_trace_shift(int,int);
++extern void report_trace_shift(int);
++extern void report_trace_reduce(int, int);
++extern void report_trace_error(short *yyss, short *yyssp);
+ EOF
+ 
+ while (<>) {
+diff --git a/dfasyn/n2d.h b/dfasyn/n2d.h
+index b2159ba..6c56abb 100644
+--- a/dfasyn/n2d.h
++++ b/dfasyn/n2d.h
+@@ -181,6 +181,10 @@ Expr * new_xor_expr(Expr *c1, Expr *c2);
+ Expr * new_cond_expr(Expr *c1, Expr *c2, Expr *c3);
+ Expr * new_sym_expr(char *sym_name);
+ 
++int yyparse(void);
++void yyerror(char *);
++int yylex(void);
++
+ void define_symbol(Evaluator *x, char *name, Expr *e);
+ void define_result(Evaluator *x, char *string, Expr *e, int early);
+ void define_symresult(Evaluator *x, char *string, Expr *e, int early);
+
diff --git a/pkgs/by-name/jb/jbofihe/package.nix b/pkgs/by-name/jb/jbofihe/package.nix
index 199ee632c19c..31260fde1b90 100644
--- a/pkgs/by-name/jb/jbofihe/package.nix
+++ b/pkgs/by-name/jb/jbofihe/package.nix
@@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
     sha256 = "1xx7x1256sjncyzx656jl6jl546vn8zz0siymqalz6v9yf341p98";
   };
 
+  patches = [
+    # fix build with gcc14:
+    # https://github.com/lojban/jbofihe/pull/19
+    ./fix-gcc14-errors.patch
+  ];
+
   nativeBuildInputs = [
     bison
     flex

From 04584e18359563fc9a3fbcda66caf318834011e6 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 1 Apr 2025 20:13:01 +0300
Subject: [PATCH 013/144] jbofihe: modernize

- replace `rec` with `finalAttrs`
- remove `with lib;` from `meta`
---
 pkgs/by-name/jb/jbofihe/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/jb/jbofihe/package.nix b/pkgs/by-name/jb/jbofihe/package.nix
index 31260fde1b90..8bd66a04af6d 100644
--- a/pkgs/by-name/jb/jbofihe/package.nix
+++ b/pkgs/by-name/jb/jbofihe/package.nix
@@ -7,14 +7,14 @@
   perl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jbofihe";
   version = "0.43";
 
   src = fetchFromGitHub {
     owner = "lojban";
     repo = "jbofihe";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "1xx7x1256sjncyzx656jl6jl546vn8zz0siymqalz6v9yf341p98";
   };
 
@@ -37,10 +37,10 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Parser & analyser for Lojban";
     homepage = "https://github.com/lojban/jbofihe";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ chkno ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ chkno ];
   };
-}
+})

From c4ac0aeb7036cbd89d4e7bb77d6fb916716d3e1b Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 7 Apr 2025 13:29:22 +0200
Subject: [PATCH 014/144] python3Packages.foundationdb: init 7.3.42

---
 .../python-modules/foundationdb/default.nix   | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/foundationdb/default.nix

diff --git a/pkgs/development/python-modules/foundationdb/default.nix b/pkgs/development/python-modules/foundationdb/default.nix
new file mode 100644
index 000000000000..56d0b7eb9e02
--- /dev/null
+++ b/pkgs/development/python-modules/foundationdb/default.nix
@@ -0,0 +1,27 @@
+{
+  buildPythonPackage,
+  lib,
+  foundationdb,
+}:
+
+buildPythonPackage {
+  pname = "foundationdb";
+  version = foundationdb.version;
+
+  src = foundationdb.pythonsrc;
+  unpackCmd = "tar xf $curSrc";
+
+  patchPhase = ''
+    substituteInPlace ./fdb/impl.py \
+      --replace libfdb_c.so "${foundationdb.lib}/lib/libfdb_c.so"
+  '';
+
+  doCheck = false;
+
+  meta = {
+    description = "Python bindings for FoundationDB";
+    homepage = "https://www.foundationdb.org";
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index adb6667984aa..c35cf987efd7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5166,8 +5166,8 @@ self: super: with self; {
 
   fortiosapi = callPackage ../development/python-modules/fortiosapi { };
 
-  foundationdb73 = callPackage ../servers/foundationdb/python.nix {
-    foundationdb = pkgs.foundationdb73;
+  foundationdb = callPackage ../development/python-modules/foundationdb {
+    inherit (pkgs) foundationdb;
   };
 
   fountains = callPackage ../development/python-modules/fountains { };

From 17d089705092345a8eed561aad879d3f907293b4 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 7 Apr 2025 13:29:40 +0200
Subject: [PATCH 015/144] foundationdb: move to pkgs/by-name

---
 .../fo/foundationdb}/disable-flowbench.patch  |   0
 .../don-t-use-static-boost-libs.patch         |   0
 pkgs/by-name/fo/foundationdb/package.nix      | 175 +++++++++++++++++
 pkgs/servers/foundationdb/cmake.nix           | 178 ------------------
 pkgs/servers/foundationdb/default.nix         |  49 -----
 pkgs/servers/foundationdb/python.nix          |  27 ---
 pkgs/top-level/all-packages.nix               |   8 -
 pkgs/top-level/packages-config.nix            |   1 -
 8 files changed, 175 insertions(+), 263 deletions(-)
 rename pkgs/{servers/foundationdb/patches => by-name/fo/foundationdb}/disable-flowbench.patch (100%)
 rename pkgs/{servers/foundationdb/patches => by-name/fo/foundationdb}/don-t-use-static-boost-libs.patch (100%)
 create mode 100644 pkgs/by-name/fo/foundationdb/package.nix
 delete mode 100644 pkgs/servers/foundationdb/cmake.nix
 delete mode 100644 pkgs/servers/foundationdb/default.nix
 delete mode 100644 pkgs/servers/foundationdb/python.nix

diff --git a/pkgs/servers/foundationdb/patches/disable-flowbench.patch b/pkgs/by-name/fo/foundationdb/disable-flowbench.patch
similarity index 100%
rename from pkgs/servers/foundationdb/patches/disable-flowbench.patch
rename to pkgs/by-name/fo/foundationdb/disable-flowbench.patch
diff --git a/pkgs/servers/foundationdb/patches/don-t-use-static-boost-libs.patch b/pkgs/by-name/fo/foundationdb/don-t-use-static-boost-libs.patch
similarity index 100%
rename from pkgs/servers/foundationdb/patches/don-t-use-static-boost-libs.patch
rename to pkgs/by-name/fo/foundationdb/don-t-use-static-boost-libs.patch
diff --git a/pkgs/by-name/fo/foundationdb/package.nix b/pkgs/by-name/fo/foundationdb/package.nix
new file mode 100644
index 000000000000..06fb2e1d85f0
--- /dev/null
+++ b/pkgs/by-name/fo/foundationdb/package.nix
@@ -0,0 +1,175 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  lib,
+  fetchpatch,
+  cmake,
+  ninja,
+  python3,
+  openjdk,
+  mono,
+  openssl,
+  boost186,
+  pkg-config,
+  msgpack-cxx,
+  toml11,
+  jemalloc,
+  doctest,
+}:
+let
+  boost = boost186;
+  # Only even numbered versions compile on aarch64; odd numbered versions have avx enabled.
+  avxEnabled =
+    version:
+    let
+      isOdd = n: lib.trivial.mod n 2 != 0;
+      patch = lib.toInt (lib.versions.patch version);
+    in
+    isOdd patch;
+in
+stdenv.mkDerivation rec {
+  name = "foundationdb";
+  version = "7.3.42";
+
+  src = fetchFromGitHub {
+    owner = "apple";
+    repo = "foundationdb";
+    tag = version;
+    hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c=";
+  };
+
+  patches = [
+    ./disable-flowbench.patch
+    ./don-t-use-static-boost-libs.patch
+    # GetMsgpack: add 4+ versions of upstream
+    # https://github.com/apple/foundationdb/pull/10935
+    (fetchpatch {
+      url = "https://github.com/apple/foundationdb/commit/c35a23d3f6b65698c3b888d76de2d93a725bff9c.patch";
+      hash = "sha256-bneRoZvCzJp0Hp/G0SzAyUyuDrWErSpzv+ickZQJR5w=";
+    })
+    # Add a dependency that prevents bindingtester to run before the python bindings are generated
+    # https://github.com/apple/foundationdb/pull/11859
+    (fetchpatch {
+      url = "https://github.com/apple/foundationdb/commit/8d04c97a74c6b83dd8aa6ff5af67587044c2a572.patch";
+      hash = "sha256-ZLIcmcfirm1+96DtTIr53HfM5z38uTLZrRNHAmZL6rc=";
+    })
+  ];
+
+  hardeningDisable = [ "fortify" ];
+
+  postPatch = ''
+    # allow using any msgpack-cxx version
+    substituteInPlace cmake/GetMsgpack.cmake \
+      --replace-warn 'find_package(msgpack-cxx 6 QUIET CONFIG)' 'find_package(msgpack-cxx QUIET CONFIG)'
+
+    # Use our doctest package
+    substituteInPlace bindings/c/test/unit/third_party/CMakeLists.txt \
+      --replace-fail '/opt/doctest_proj_2.4.8' '${doctest}/include'
+
+    # Upstream upgraded to Boost 1.86 with no code changes; see:
+    # <https://github.com/apple/foundationdb/pull/11788>
+    substituteInPlace cmake/CompileBoost.cmake \
+      --replace-fail 'find_package(Boost 1.78.0 EXACT ' 'find_package(Boost '
+  '';
+
+  buildInputs = [
+    boost
+    jemalloc
+    msgpack-cxx
+    openssl
+    toml11
+  ];
+
+  checkInputs = [ doctest ];
+
+  nativeBuildInputs = [
+    cmake
+    mono
+    ninja
+    openjdk
+    pkg-config
+    python3
+  ];
+
+  separateDebugInfo = true;
+  dontFixCmake = true;
+
+  cmakeFlags = [
+    "-DFDB_RELEASE=TRUE"
+
+    # Disable CMake warnings for project developers.
+    "-Wno-dev"
+
+    # CMake Error at fdbserver/CMakeLists.txt:332 (find_library):
+    # >   Could not find lz4_STATIC_LIBRARIES using the following names: liblz4.a
+    "-DSSD_ROCKSDB_EXPERIMENTAL=FALSE"
+
+    "-DBUILD_DOCUMENTATION=FALSE"
+
+    # LTO brings up overall build time, but results in much smaller
+    # binaries for all users and the cache.
+    "-DUSE_LTO=ON"
+
+    # Gold helps alleviate the link time, especially when LTO is
+    # enabled. But even then, it still takes a majority of the time.
+    "-DUSE_LD=GOLD"
+
+    # FIXME: why can't openssl be found automatically?
+    "-DOPENSSL_USE_STATIC_LIBS=FALSE"
+    "-DOPENSSL_CRYPTO_LIBRARY=${openssl.out}/lib/libcrypto.so"
+    "-DOPENSSL_SSL_LIBRARY=${openssl.out}/lib/libssl.so"
+  ];
+
+  # the install phase for cmake is pretty wonky right now since it's not designed to
+  # coherently install packages as most linux distros expect -- it's designed to build
+  # packaged artifacts that are shipped in RPMs, etc. we need to add some extra code to
+  # cmake upstream to fix this, and if we do, i think most of this can go away.
+  postInstall = ''
+    mv $out/sbin/fdbmonitor $out/bin/fdbmonitor
+    mkdir $out/libexec && mv $out/usr/lib/foundationdb/backup_agent/backup_agent $out/libexec/backup_agent
+    mv $out/sbin/fdbserver $out/bin/fdbserver
+
+    rm -rf $out/etc $out/lib/foundationdb $out/lib/systemd $out/log $out/sbin $out/usr $out/var
+
+    # move results into multi outputs
+    mkdir -p $dev $lib
+    mv $out/include $dev/include
+    mv $out/lib $lib/lib
+
+    # python bindings
+    # NB: use the original setup.py.in, so we can substitute VERSION correctly
+    cp ../LICENSE ./bindings/python
+    substitute ../bindings/python/setup.py.in ./bindings/python/setup.py \
+      --replace 'VERSION' "${version}"
+    rm -f ./bindings/python/setup.py.* ./bindings/python/CMakeLists.txt
+    rm -f ./bindings/python/fdb/*.pth # remove useless files
+    rm -f ./bindings/python/*.rst ./bindings/python/*.mk
+
+    cp -R ./bindings/python/                          tmp-pythonsrc/
+    tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/
+
+    # java bindings
+    mkdir -p $lib/share/java
+    mv lib/fdb-java-*.jar $lib/share/java/fdb-java.jar
+  '';
+
+  outputs = [
+    "out"
+    "dev"
+    "lib"
+    "pythonsrc"
+  ];
+
+  meta = {
+    description = "Open source, distributed, transactional key-value store";
+    homepage = "https://www.foundationdb.org";
+    license = lib.licenses.asl20;
+    platforms = [ "x86_64-linux" ] ++ lib.optionals (!(avxEnabled version)) [ "aarch64-linux" ];
+    # Fails when cross-compiling with "/bin/sh: gcc-ar: not found"
+    broken = stdenv.buildPlatform != stdenv.hostPlatform;
+    maintainers = with lib.maintainers; [
+      thoughtpolice
+      lostnet
+    ];
+  };
+}
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
deleted file mode 100644
index e8246a7813d2..000000000000
--- a/pkgs/servers/foundationdb/cmake.nix
+++ /dev/null
@@ -1,178 +0,0 @@
-# This builder is for FoundationDB CMake build system.
-
-{
-  lib,
-  fetchFromGitHub,
-  cmake,
-  ninja,
-  python3,
-  openjdk,
-  mono,
-  pkg-config,
-  msgpack-cxx,
-  toml11,
-  jemalloc,
-  doctest,
-
-  gccStdenv,
-  llvmPackages,
-  useClang ? false,
-  ...
-}:
-
-let
-  stdenv = if useClang then llvmPackages.libcxxStdenv else gccStdenv;
-
-  # Only even numbered versions compile on aarch64; odd numbered versions have avx enabled.
-  avxEnabled =
-    version:
-    let
-      isOdd = n: lib.trivial.mod n 2 != 0;
-      patch = lib.toInt (lib.versions.patch version);
-    in
-    isOdd patch;
-
-  makeFdb =
-    {
-      version,
-      hash,
-      rev ? "refs/tags/${version}",
-      officialRelease ? true,
-      patches ? [ ],
-      boost,
-      ssl,
-    }:
-    stdenv.mkDerivation {
-      pname = "foundationdb";
-      inherit version;
-
-      src = fetchFromGitHub {
-        owner = "apple";
-        repo = "foundationdb";
-        inherit rev hash;
-      };
-
-      buildInputs = [
-        ssl
-        boost
-        msgpack-cxx
-        toml11
-        jemalloc
-      ];
-
-      checkInputs = [ doctest ];
-
-      nativeBuildInputs = [
-        pkg-config
-        cmake
-        ninja
-        python3
-        openjdk
-        mono
-      ] ++ lib.optionals useClang [ llvmPackages.lld ];
-
-      separateDebugInfo = true;
-      dontFixCmake = true;
-
-      cmakeFlags = [
-        (lib.optionalString officialRelease "-DFDB_RELEASE=TRUE")
-
-        # Disable CMake warnings for project developers.
-        "-Wno-dev"
-
-        # CMake Error at fdbserver/CMakeLists.txt:332 (find_library):
-        # >   Could not find lz4_STATIC_LIBRARIES using the following names: liblz4.a
-        "-DSSD_ROCKSDB_EXPERIMENTAL=FALSE"
-
-        "-DBUILD_DOCUMENTATION=FALSE"
-
-        # LTO brings up overall build time, but results in much smaller
-        # binaries for all users and the cache.
-        (lib.optionalString (!useClang) "-DUSE_LTO=ON")
-
-        # Gold helps alleviate the link time, especially when LTO is
-        # enabled. But even then, it still takes a majority of the time.
-        # Same with LLD when Clang is available.
-        (lib.optionalString useClang "-DUSE_LD=LLD")
-        (lib.optionalString (!useClang) "-DUSE_LD=GOLD")
-
-        # FIXME: why can't openssl be found automatically?
-        "-DOPENSSL_USE_STATIC_LIBS=FALSE"
-        "-DOPENSSL_CRYPTO_LIBRARY=${ssl.out}/lib/libcrypto.so"
-        "-DOPENSSL_SSL_LIBRARY=${ssl.out}/lib/libssl.so"
-      ];
-
-      hardeningDisable = [ "fortify" ];
-
-      inherit patches;
-
-      postPatch = ''
-        # allow using any msgpack-cxx version
-        substituteInPlace cmake/GetMsgpack.cmake \
-          --replace-warn 'find_package(msgpack-cxx 6 QUIET CONFIG)' 'find_package(msgpack-cxx QUIET CONFIG)'
-
-        # Use our doctest package
-        substituteInPlace bindings/c/test/unit/third_party/CMakeLists.txt \
-          --replace-fail '/opt/doctest_proj_2.4.8' '${doctest}/include'
-
-        # Upstream upgraded to Boost 1.86 with no code changes; see:
-        # <https://github.com/apple/foundationdb/pull/11788>
-        substituteInPlace cmake/CompileBoost.cmake \
-          --replace-fail 'find_package(Boost 1.78.0 EXACT ' 'find_package(Boost '
-      '';
-
-      # the install phase for cmake is pretty wonky right now since it's not designed to
-      # coherently install packages as most linux distros expect -- it's designed to build
-      # packaged artifacts that are shipped in RPMs, etc. we need to add some extra code to
-      # cmake upstream to fix this, and if we do, i think most of this can go away.
-      postInstall = ''
-        mv $out/sbin/fdbmonitor $out/bin/fdbmonitor
-        mkdir $out/libexec && mv $out/usr/lib/foundationdb/backup_agent/backup_agent $out/libexec/backup_agent
-        mv $out/sbin/fdbserver $out/bin/fdbserver
-
-        rm -rf $out/etc $out/lib/foundationdb $out/lib/systemd $out/log $out/sbin $out/usr $out/var
-
-        # move results into multi outputs
-        mkdir -p $dev $lib
-        mv $out/include $dev/include
-        mv $out/lib $lib/lib
-
-        # python bindings
-        # NB: use the original setup.py.in, so we can substitute VERSION correctly
-        cp ../LICENSE ./bindings/python
-        substitute ../bindings/python/setup.py.in ./bindings/python/setup.py \
-          --replace 'VERSION' "${version}"
-        rm -f ./bindings/python/setup.py.* ./bindings/python/CMakeLists.txt
-        rm -f ./bindings/python/fdb/*.pth # remove useless files
-        rm -f ./bindings/python/*.rst ./bindings/python/*.mk
-
-        cp -R ./bindings/python/                          tmp-pythonsrc/
-        tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/
-
-        # java bindings
-        mkdir -p $lib/share/java
-        mv lib/fdb-java-*.jar $lib/share/java/fdb-java.jar
-      '';
-
-      outputs = [
-        "out"
-        "dev"
-        "lib"
-        "pythonsrc"
-      ];
-
-      meta = with lib; {
-        description = "Open source, distributed, transactional key-value store";
-        homepage = "https://www.foundationdb.org";
-        license = licenses.asl20;
-        platforms = [ "x86_64-linux" ] ++ lib.optionals (!(avxEnabled version)) [ "aarch64-linux" ];
-        # Fails when cross-compiling with "/bin/sh: gcc-ar: not found"
-        broken = stdenv.buildPlatform != stdenv.hostPlatform;
-        maintainers = with maintainers; [
-          thoughtpolice
-          lostnet
-        ];
-      };
-    };
-in
-makeFdb
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
deleted file mode 100644
index 591e45485aea..000000000000
--- a/pkgs/servers/foundationdb/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  gccStdenv,
-  llvmPackages,
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-
-  cmake,
-  ninja,
-  python3,
-  openjdk,
-  mono,
-  openssl,
-  boost186,
-  pkg-config,
-  msgpack-cxx,
-  toml11,
-  jemalloc,
-  doctest,
-}@args:
-
-let
-  cmakeBuild = import ./cmake.nix args;
-in
-{
-  foundationdb73 = cmakeBuild {
-    version = "7.3.42";
-    hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c=";
-    boost = boost186;
-    ssl = openssl;
-
-    patches = [
-      ./patches/disable-flowbench.patch
-      ./patches/don-t-use-static-boost-libs.patch
-      # GetMsgpack: add 4+ versions of upstream
-      # https://github.com/apple/foundationdb/pull/10935
-      (fetchpatch {
-        url = "https://github.com/apple/foundationdb/commit/c35a23d3f6b65698c3b888d76de2d93a725bff9c.patch";
-        hash = "sha256-bneRoZvCzJp0Hp/G0SzAyUyuDrWErSpzv+ickZQJR5w=";
-      })
-      # Add a dependency that prevents bindingtester to run before the python bindings are generated
-      # https://github.com/apple/foundationdb/pull/11859
-      (fetchpatch {
-        url = "https://github.com/apple/foundationdb/commit/8d04c97a74c6b83dd8aa6ff5af67587044c2a572.patch";
-        hash = "sha256-ZLIcmcfirm1+96DtTIr53HfM5z38uTLZrRNHAmZL6rc=";
-      })
-    ];
-  };
-}
diff --git a/pkgs/servers/foundationdb/python.nix b/pkgs/servers/foundationdb/python.nix
deleted file mode 100644
index 152f704ee147..000000000000
--- a/pkgs/servers/foundationdb/python.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  buildPythonPackage,
-  lib,
-  foundationdb,
-}:
-
-buildPythonPackage {
-  pname = "foundationdb";
-  version = foundationdb.version;
-
-  src = foundationdb.pythonsrc;
-  unpackCmd = "tar xf $curSrc";
-
-  patchPhase = ''
-    substituteInPlace ./fdb/impl.py \
-      --replace libfdb_c.so "${foundationdb.lib}/lib/libfdb_c.so"
-  '';
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Python bindings for FoundationDB";
-    homepage = "https://www.foundationdb.org";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ thoughtpolice ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df389f32233d..84bc5c9bef29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3508,14 +3508,6 @@ with pkgs;
 
   fstl = qt5.callPackage ../applications/graphics/fstl { };
 
-  fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { });
-
-  inherit (fdbPackages)
-    foundationdb73
-    ;
-
-  foundationdb = foundationdb73;
-
   fuse-ext2 = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/fuse-ext2 { };
 
   fwknop = callPackage ../tools/security/fwknop {
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index 8c8d1686c70d..3c3253b797f7 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -13,7 +13,6 @@
       inherit (super)
         agdaPackages
         apacheHttpdPackages
-        fdbPackages
         fusePackages
         gns3Packages
         haskellPackages

From cb19a0b8ebb1b7b819beee0d370b2744088e09c3 Mon Sep 17 00:00:00 2001
From: Benjamin LeBrun <17264415+bglebrun@users.noreply.github.com>
Date: Wed, 9 Apr 2025 17:08:40 -0600
Subject: [PATCH 016/144] Update firefoxpwa and fixed chrome.sys.mjs path

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

diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix
index 5e1818a36630..42a9d2ea1446 100644
--- a/pkgs/by-name/fi/firefoxpwa/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa/package.nix
@@ -28,25 +28,25 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "firefoxpwa";
-  version = "2.13.3";
+  version = "2.14.1";
 
   src = fetchFromGitHub {
     owner = "filips123";
     repo = "PWAsForFirefox";
     rev = "v${version}";
-    hash = "sha256-u6zKB5+P/f3qM5Sqmhk2ts1AhgRN8Oq877uKQuJ6Uao=";
+    hash = "sha256-yYvQxz+lAxKXpAWeLiBnepGuwYfNLyIhu4vQ8NdH3pc=";
   };
 
   sourceRoot = "${src.name}/native";
   buildFeatures = [ "immutable-runtime" ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-23XTb+gAN0D67llZj8Er43cFfhLSdEA6X6V6Ds1rvV8=";
+  cargoHash = "sha256-elVthXdjlI9DSQgaIRzu3M72dgGNXGgMiUXEICaBJCQ=";
 
   preConfigure = ''
     sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml
     sed -zi 's;name = "firefoxpwa"\nversion = "0.0.0";name = "firefoxpwa"\nversion = "${version}";' Cargo.lock
-    sed -i $'s;DISTRIBUTION_VERSION = \'0.0.0\';DISTRIBUTION_VERSION = \'${version}\';' userchrome/profile/chrome/pwa/chrome.jsm
+    sed -i $'s;DISTRIBUTION_VERSION = \'0.0.0\';DISTRIBUTION_VERSION = \'${version}\';' userchrome/profile/chrome/pwa/chrome.sys.mjs
   '';
 
   nativeBuildInputs = [

From 434e07601ec559e92cac36b8ea34a162d8780d9b Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 12 Apr 2025 23:24:38 +0100
Subject: [PATCH 017/144] nlopt: Correct build process

Now uses cmakeFlags to determine what gets built.
Adds proper support for potential Python and Octave bindings
---
 pkgs/development/libraries/nlopt/default.nix | 79 +++++++++++++-------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 1e1f5f01c382..db7071ba429e 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -3,49 +3,74 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  octave ? null,
-  libiconv,
+  # Optionally build Python bindings
+  withPython ? false,
+  python3,
+  python3Packages,
+  swig,
+  # Optionally build Octave bindings
+  withOctave ? false,
+  octave,
+  # Build static on-demand
+  withStatic ? stdenv.hostPlatform.isStatic,
 }:
-
-stdenv.mkDerivation rec {
+let
+  buildPythonBindingsEnv = python3.withPackages (p: [ p.numpy ]);
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "nlopt";
   version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "stevengj";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o=";
+    repo = "nlopt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o=";
   };
 
-  nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-  buildInputs = [ octave ];
-
-  configureFlags =
-    [
-      "--with-cxx"
-      "--enable-shared"
-      "--with-pic"
-      "--without-guile"
-      "--without-python"
-      "--without-matlab"
+  nativeBuildInputs =
+    [ cmake ]
+    ## Building the python bindings requires SWIG, and numpy in addition to the CXX routines.
+    ## The tests also make use of the same interpreter to test the bindings.
+    ++ lib.optionals withPython [
+      swig
+      buildPythonBindingsEnv
     ]
-    ++ lib.optionals (octave != null) [
-      "--with-octave"
-      "M_INSTALL_DIR=$(out)/${octave.sitePath}/m"
-      "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct"
-    ];
+    ## Building octave bindings requires `mkoctfile` to be installed.
+    ++ lib.optional withOctave octave;
+
+  # Python bindings depend on numpy at import time.
+  propagatedBuildInputs = lib.optional withPython python3Packages.numpy;
+
+  cmakeFlags =
+    [
+      (lib.cmakeBool "BUILD_SHARED_LIBS" (!withStatic))
+      (lib.cmakeBool "NLOPT_CXX" true)
+      (lib.cmakeBool "NLOPT_PYTHON" withPython)
+      (lib.cmakeBool "NLOPT_OCTAVE" withOctave)
+      (lib.cmakeBool "NLOPT_SWIG" withPython)
+      (lib.cmakeBool "NLOPT_FORTRAN" false)
+      (lib.cmakeBool "NLOPT_MATLAB" false)
+      (lib.cmakeBool "NLOPT_GUILE" false)
+      (lib.cmakeBool "NLOPT_TESTS" finalAttrs.doCheck)
+    ]
+    ++ lib.optional withPython (
+      lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}"
+    );
+
+  doCheck = true;
 
   postFixup = ''
-    substituteInPlace $out/lib/cmake/nlopt/NLoptLibraryDepends.cmake --replace \
+    substituteInPlace $out/lib/cmake/nlopt/NLoptLibraryDepends.cmake --replace-fail \
       'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/' 'INTERFACE_INCLUDE_DIRECTORIES "'
   '';
 
   meta = {
     homepage = "https://nlopt.readthedocs.io/en/latest/";
+    changelog = "https://github.com/stevengj/nlopt/releases/tag/v${finalAttrs.version}";
     description = "Free open-source library for nonlinear optimization";
     license = lib.licenses.lgpl21Plus;
-    hydraPlatforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.bengsparks ];
   };
-
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a2161727e00..bdcbd816ac72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4298,7 +4298,7 @@ with pkgs;
 
   nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { };
 
-  nlopt = callPackage ../development/libraries/nlopt { octave = null; };
+  nlopt = callPackage ../development/libraries/nlopt { };
 
   notation = callPackage ../by-name/no/notation/package.nix {
     buildGoModule = buildGo123Module;

From 9d2808a3187d503bce78d748ccab1ec3e6f1443a Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sun, 23 Mar 2025 23:36:32 +0100
Subject: [PATCH 018/144] python3Packages.nlopt: init

---
 pkgs/development/python-modules/nlopt/default.nix | 5 +++++
 pkgs/top-level/python-packages.nix                | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/development/python-modules/nlopt/default.nix

diff --git a/pkgs/development/python-modules/nlopt/default.nix b/pkgs/development/python-modules/nlopt/default.nix
new file mode 100644
index 000000000000..55bfc2d2884c
--- /dev/null
+++ b/pkgs/development/python-modules/nlopt/default.nix
@@ -0,0 +1,5 @@
+{
+  toPythonModule,
+  pkgs,
+}:
+toPythonModule (pkgs.nlopt.override { withPython = true; })
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9abac7174fad..cce6ef086220 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10547,6 +10547,8 @@ self: super: with self; {
 
   nkdfu = callPackage ../development/python-modules/nkdfu { };
 
+  nlopt = callPackage ../development/python-modules/nlopt { };
+
   nlpcloud = callPackage ../development/python-modules/nlpcloud { };
 
   nlpo3 = callPackage ../development/python-modules/nlpo3 { };

From 1d15d511ae795718efdeb4c8ee8d2080c0b55d9a Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Tue, 8 Apr 2025 12:38:59 +0100
Subject: [PATCH 019/144] nlopt: add passthru.updateScript

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

diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index db7071ba429e..ec5effa6dae3 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  nix-update-script,
   # Optionally build Python bindings
   withPython ? false,
   python3,
@@ -65,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
       'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/' 'INTERFACE_INCLUDE_DIRECTORIES "'
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     homepage = "https://nlopt.readthedocs.io/en/latest/";
     changelog = "https://github.com/stevengj/nlopt/releases/tag/v${finalAttrs.version}";

From 43a09052f12503bb63702977acf27f36e99c1e2c Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 12 Apr 2025 22:02:05 +0100
Subject: [PATCH 020/144] nlopt: 2.7.1 -> 2.10.0

v2.10.0 introduced / fixed:
- Java bindings
- Disabling Luksan solvers to allow licensing under the MIT license
- Docs can now be built
---
 pkgs/development/libraries/nlopt/default.nix | 83 ++++++++++++++++++--
 1 file changed, 77 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index ec5effa6dae3..51386f659748 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -2,33 +2,90 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   nix-update-script,
   # Optionally build Python bindings
   withPython ? false,
   python3,
   python3Packages,
-  swig,
   # Optionally build Octave bindings
   withOctave ? false,
   octave,
+  # Optionally build Java bindings
+  withJava ? false,
+  jdk,
+  # Required for building the Python and Java bindings
+  swig,
+  # Optionally exclude Luksan solvers to allow licensing under MIT
+  withoutLuksanSolvers ? false,
   # Build static on-demand
   withStatic ? stdenv.hostPlatform.isStatic,
+
+  # v2.8.0 introduced a regression where testing on Linux platforms fails with a buffer overflow
+  # when compiled with -D_FORTIFY_SOURCE=3.
+  # This was deemed to be a compiler false positive by the library's author in https://github.com/stevengj/nlopt/issues/563.
+  # Building with `clangStdenv` prevents this from occurring.
+  clangStdenv,
 }:
 let
   buildPythonBindingsEnv = python3.withPackages (p: [ p.numpy ]);
+  buildDocsEnv = python3.withPackages (p: [
+    p.mkdocs
+    p.python-markdown-math
+  ]);
 in
-stdenv.mkDerivation (finalAttrs: {
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "nlopt";
-  version = "2.7.1";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "stevengj";
     repo = "nlopt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o=";
+    hash = "sha256-mZRmhXrApxfiJedk+L/poIP2DR/BkV04c5fiwPGAyjI=";
   };
 
+  outputs = [
+    "out"
+    "doc"
+  ];
+
+  patches = [
+    # 26-03-2025: `mkdocs.yml` is missing a link for the subpage related to the Java bindings.
+    # 26-03-2025: This commit was merged after v2.10.0 was released, and has not been made
+    # 26-03-2025: part of a release.
+    (fetchpatch {
+      name = "missing-java-reference-mkdocs";
+      url = "https://github.com/stevengj/nlopt/commit/7e34f1a6fe82ed27daa6111d83c4d5629555454b.patch";
+      hash = "sha256-XivfZtgIGLyTtU+Zo2jSQAx2mVdGLJ8PD7VSSvGR/5Q=";
+    })
+
+    # 26-03-2025: The docs pages still list v2.7.1 as the newest version.
+    # 26-03-2025: This commit was merged after v2.10.0 was released, and has not been made
+    # 26-03-2025: part of a release.
+    (fetchpatch {
+      name = "update-index-md";
+      url = "https://github.com/stevengj/nlopt/commit/2c4147832eff7ea15d0536c82351a9e169f85e43.patch";
+      hash = "sha256-BXcbNUyu20f3N146v6v9cpjSj5CwuDtesp6lAqOK2KY=";
+    })
+
+    # 26-03-2025: There is an off-by-one error in the test/CMakeLists.txt
+    # 26-03-2025: that causes the tests to attempt to run disabled Luksan solver code,
+    # 26-03-2025: which in turn causes the test suite to fail.
+    # 26-03-2025: See https://github.com/stevengj/nlopt/pull/605
+    (fetchpatch {
+      name = "fix-nondisabled-luksan-algorithm";
+      url = "https://github.com/stevengj/nlopt/commit/7817ec19f21be6877a4b79777fc5315a52c6850b.patch";
+      hash = "sha256-KgdAMSYKOQuraun4HNr9GOx48yjyeQk6W3IgWRA44oo=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace nlopt.pc.in \
+      --replace-fail 'libdir=''${exec_prefix}/@NLOPT_INSTALL_LIBDIR@' 'libdir=@NLOPT_INSTALL_LIBDIR@'
+  '';
+
   nativeBuildInputs =
     [ cmake ]
     ## Building the python bindings requires SWIG, and numpy in addition to the CXX routines.
@@ -37,6 +94,11 @@ stdenv.mkDerivation (finalAttrs: {
       swig
       buildPythonBindingsEnv
     ]
+    ## Building the java bindings requires SWIG, C++, JNI and Java
+    ++ lib.optionals withJava [
+      swig
+      jdk
+    ]
     ## Building octave bindings requires `mkoctfile` to be installed.
     ++ lib.optional withOctave octave;
 
@@ -49,16 +111,25 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.cmakeBool "NLOPT_CXX" true)
       (lib.cmakeBool "NLOPT_PYTHON" withPython)
       (lib.cmakeBool "NLOPT_OCTAVE" withOctave)
-      (lib.cmakeBool "NLOPT_SWIG" withPython)
+      (lib.cmakeBool "NLOPT_JAVA" withJava)
+      (lib.cmakeBool "NLOPT_SWIG" (withPython || withJava))
       (lib.cmakeBool "NLOPT_FORTRAN" false)
       (lib.cmakeBool "NLOPT_MATLAB" false)
       (lib.cmakeBool "NLOPT_GUILE" false)
+      (lib.cmakeBool "NLOPT_LUKSAN" (!withoutLuksanSolvers))
       (lib.cmakeBool "NLOPT_TESTS" finalAttrs.doCheck)
     ]
     ++ lib.optional withPython (
       lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}"
     );
 
+  postBuild = ''
+    ${buildDocsEnv.interpreter} -m mkdocs build \
+      --config-file ../mkdocs.yml \
+      --site-dir $doc \
+      --no-directory-urls
+  '';
+
   doCheck = true;
 
   postFixup = ''
@@ -72,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://nlopt.readthedocs.io/en/latest/";
     changelog = "https://github.com/stevengj/nlopt/releases/tag/v${finalAttrs.version}";
     description = "Free open-source library for nonlinear optimization";
-    license = lib.licenses.lgpl21Plus;
+    license = if withoutLuksanSolvers then lib.licenses.mit else lib.licenses.lgpl21Plus;
     platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.bengsparks ];
   };

From 414a3487535b7ff3ac700d0bb2c18753324874b8 Mon Sep 17 00:00:00 2001
From: ruro <ruro.ruro@ya.ru>
Date: Mon, 14 Apr 2025 23:37:46 +0300
Subject: [PATCH 021/144] telegram-desktop: use version/meta/passthru from
 final version of unwrapped

---
 .../instant-messengers/telegram/telegram-desktop/default.nix    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
index aec348dfa91c..d33cdaf0e5c7 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@@ -16,7 +16,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
-  inherit (unwrapped) version meta passthru;
+  inherit (finalAttrs.unwrapped) version meta passthru;
 
   inherit unwrapped;
 

From 8f45a43b000127a96a23647baa21ad9ced2dc5e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Apr 2025 23:42:57 +0000
Subject: [PATCH 022/144] python312Packages.jupyterlab-git: 0.51.0 -> 0.51.1

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

diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index 74073f617def..eced578e768b 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab-git";
-  version = "0.51.0";
+  version = "0.51.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "jupyterlab_git";
     inherit version;
-    hash = "sha256-qWkkZsYgYq8uBZY2BJra3ef3H9ZWTOd6obdSaMYUF7M=";
+    hash = "sha256-t7zol5XVzojIqvDXnrepPQU1Yi+b5rAZyprk07mpymo=";
   };
 
   nativeBuildInputs = [

From c55a2c6610435ffb0f833685536a72166c4db90f Mon Sep 17 00:00:00 2001
From: Rehno Lindeque <rehno.lindeque@gmail.com>
Date: Fri, 18 Apr 2025 15:28:29 +0000
Subject: [PATCH 023/144] python3Packages.deep-chainmap: fix 0.1.2 build system
 change to hatchling

---
 pkgs/development/python-modules/deep-chainmap/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/deep-chainmap/default.nix b/pkgs/development/python-modules/deep-chainmap/default.nix
index f682de99cbad..9b3c6c9ac240 100644
--- a/pkgs/development/python-modules/deep-chainmap/default.nix
+++ b/pkgs/development/python-modules/deep-chainmap/default.nix
@@ -2,12 +2,13 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  hatchling,
 }:
 
 buildPythonPackage rec {
   pname = "deep-chainmap";
   version = "0.1.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "deep_chainmap";
@@ -15,6 +16,8 @@ buildPythonPackage rec {
     hash = "sha256-R7Pfh+1bYJ7LCU+0SyZi2XGOsgL1zWiMkp1z9HD1I1w=";
   };
 
+  build-system = [ hatchling ];
+
   # Tests are not published to pypi
   doCheck = false;
 
@@ -23,7 +26,7 @@ buildPythonPackage rec {
   # See the guide for more information: https://nixos.org/nixpkgs/manual/#chap-meta
   meta = with lib; {
     description = "Recursive subclass of ChainMap";
-    homepage = "https://github.com/neutrinoceros/deep-chainmap";
+    homepage = "https://github.com/neutrinoceros/deep_chainmap";
     license = licenses.mit;
     maintainers = with maintainers; [ rehno-lindeque ];
   };

From d31a0e0edab3378d2558e5d56e46142e1b6ab367 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 07:26:42 +0000
Subject: [PATCH 024/144] python312Packages.instructor: 1.7.4 -> 1.7.9

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

diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix
index 0b4a174f9ecc..e8c1c0023319 100644
--- a/pkgs/development/python-modules/instructor/default.nix
+++ b/pkgs/development/python-modules/instructor/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "instructor";
-  version = "1.7.4";
+  version = "1.7.9";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     owner = "jxnl";
     repo = "instructor";
     tag = version;
-    hash = "sha256-TrNGTWnZShOYeMGonSEib7NiEbrwWNtujeWo2gaewf4=";
+    hash = "sha256-3IwvbepDrylOIlL+IteyFChqYc/ZIu6IieIkbAPL+mw=";
   };
 
   build-system = [ hatchling ];

From 5e43d1798884892aa0679af790479d008651ba48 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 19 Apr 2025 21:53:08 +0200
Subject: [PATCH 025/144] python312Packages.instructor: update dependencies

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

diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix
index e8c1c0023319..9101ae571f64 100644
--- a/pkgs/development/python-modules/instructor/default.nix
+++ b/pkgs/development/python-modules/instructor/default.nix
@@ -10,9 +10,11 @@
   # dependencies
   aiohttp,
   docstring-parser,
+  jinja2,
   jiter,
   openai,
   pydantic,
+  requests,
   rich,
   tenacity,
   typer,
@@ -22,7 +24,6 @@
   diskcache,
   fastapi,
   google-generativeai,
-  jinja2,
   pytest-asyncio,
   pytestCheckHook,
   python-dotenv,
@@ -50,9 +51,11 @@ buildPythonPackage rec {
   dependencies = [
     aiohttp
     docstring-parser
+    jinja2
     jiter
     openai
     pydantic
+    requests
     rich
     tenacity
     typer
@@ -63,7 +66,6 @@ buildPythonPackage rec {
     diskcache
     fastapi
     google-generativeai
-    jinja2
     pytest-asyncio
     pytestCheckHook
     python-dotenv

From 7242e19290de2d3afb22a202e3412502bbb9ca9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 20:20:34 +0000
Subject: [PATCH 026/144] nextcloud-client: 3.16.2 -> 3.16.3

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

diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index 7865f43c6921..b91bd9401033 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud-client";
-  version = "3.16.2";
+  version = "3.16.3";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "nextcloud-releases";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-CBGvASIPN5xB2kgSDXg2vWpnsFBD3c3wudUAL6u64U8=";
+    hash = "sha256-C/IfCNOFsSnpJMVSVhOkfx1F2IhOM8ntgdKjr7MKdkc=";
   };
 
   patches = [

From c4241462331cc52c6513aadc741e0a02a7eab756 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Apr 2025 04:39:37 +0000
Subject: [PATCH 027/144] wakatime-cli: 1.112.1 -> 1.115.1

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

diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix
index 9126211e5d30..2cd669cafdf4 100644
--- a/pkgs/by-name/wa/wakatime-cli/package.nix
+++ b/pkgs/by-name/wa/wakatime-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "wakatime-cli";
-  version = "1.112.1";
+  version = "1.115.1";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime-cli";
     tag = "v${version}";
-    hash = "sha256-J8hEQkTCaJhYYnuO8J2Tvgm/lWuPKHubKESb7WPzzkk=";
+    hash = "sha256-vvJzYUL9lGPxe2XzeooDJ09jT3/Zv5x8rf6T7Byb7TY=";
   };
 
-  vendorHash = "sha256-Zy54fGyTvLfrFEiPIcNtx25EqaIaYq46DYBpbZXfOFQ=";
+  vendorHash = "sha256-1yqpz3DqWHXw3ihh7YAKtl5Co91VAbBMRu68S/igrMc=";
 
   ldflags = [
     "-s"

From d18ac66cdcfa6d6ba74367d25a00c0bc320064d2 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Wed, 23 Apr 2025 13:58:00 +0200
Subject: [PATCH 028/144] waypipe: remove use of with lib;

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

diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix
index 158e1733aece..64288195166d 100644
--- a/pkgs/by-name/wa/waypipe/package.nix
+++ b/pkgs/by-name/wa/waypipe/package.nix
@@ -69,7 +69,7 @@ llvmPackages.stdenv.mkDerivation rec {
     vulkan-loader
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Network proxy for Wayland clients (applications)";
     longDescription = ''
       waypipe is a proxy for Wayland clients. It forwards Wayland messages and
@@ -78,9 +78,9 @@ llvmPackages.stdenv.mkDerivation rec {
     '';
     homepage = "https://mstoeckl.com/notes/gsoc/blog.html";
     changelog = "https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases#v${version}";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ mic92 ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ mic92 ];
     mainProgram = "waypipe";
   };
 }

From 52e443eb51a367d3c50fc7cb9bbd712ec28c0738 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Apr 2025 12:34:57 +0000
Subject: [PATCH 029/144] ani-cli: 4.9 -> 4.10

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

diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix
index 2d2d8f10f8ce..4a9f8b82eb80 100644
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -27,13 +27,13 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ani-cli";
-  version = "4.9";
+  version = "4.10";
 
   src = fetchFromGitHub {
     owner = "pystardust";
     repo = "ani-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7zuepWTtrFp9RW3zTSjPzyJ9e+09PdKgwcnV+DqPEUY=";
+    hash = "sha256-R/YQ02ctTcAEzrVyWlaCHi1YW82iPrMBbbMNP21r0p8=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 2b9ac4b05e3e8f42a0b579ea6d9069b941a4a5ff Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Wed, 23 Apr 2025 14:46:39 +0200
Subject: [PATCH 030/144] waypipe: use finalAttrs pattern

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

diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix
index 64288195166d..3fe1067aa369 100644
--- a/pkgs/by-name/wa/waypipe/package.nix
+++ b/pkgs/by-name/wa/waypipe/package.nix
@@ -20,7 +20,7 @@
   wayland-scanner,
   rust-bindgen,
 }:
-llvmPackages.stdenv.mkDerivation rec {
+llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "waypipe";
   version = "0.10.4";
 
@@ -28,11 +28,11 @@ llvmPackages.stdenv.mkDerivation rec {
     domain = "gitlab.freedesktop.org";
     owner = "mstoeckl";
     repo = "waypipe";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-O47b1CHCEwUSigjk0Ml3uLhRRxcPC6Phj2cnIlX1Hkg=";
   };
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
+    inherit (finalAttrs) pname version src;
     hash = "sha256-c561GpU2XENILSzk0Zka0qrtXZm7xaq/hiJA4Iv++QI=";
   };
 
@@ -77,10 +77,10 @@ llvmPackages.stdenv.mkDerivation rec {
       makes application forwarding similar to ssh -X feasible.
     '';
     homepage = "https://mstoeckl.com/notes/gsoc/blog.html";
-    changelog = "https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases#v${version}";
+    changelog = "https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases#v${finalAttrs.version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ mic92 ];
     mainProgram = "waypipe";
   };
-}
+})

From 4fe61874741cf97d8304166a8644eaebe0e94e4c Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Wed, 23 Apr 2025 15:34:19 +0200
Subject: [PATCH 031/144] waypipe: provide update script

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

diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix
index 3fe1067aa369..d163798486f6 100644
--- a/pkgs/by-name/wa/waypipe/package.nix
+++ b/pkgs/by-name/wa/waypipe/package.nix
@@ -19,6 +19,7 @@
   autoPatchelfHook,
   wayland-scanner,
   rust-bindgen,
+  nix-update-script,
 }:
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "waypipe";
@@ -69,6 +70,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     vulkan-loader
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Network proxy for Wayland clients (applications)";
     longDescription = ''

From af38a2c6fece517ce838610dbac3317bdd7ca7e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 02:35:18 +0000
Subject: [PATCH 032/144] mainsail: 2.13.2 -> 2.14.0

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

diff --git a/pkgs/by-name/ma/mainsail/package.nix b/pkgs/by-name/ma/mainsail/package.nix
index 3f0c7578f18d..8083e0147e4a 100644
--- a/pkgs/by-name/ma/mainsail/package.nix
+++ b/pkgs/by-name/ma/mainsail/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "mainsail";
-  version = "2.13.2";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner = "mainsail-crew";
     repo = "mainsail";
     rev = "v${version}";
-    hash = "sha256-rXavUkoFRw5fWCisdz/eD+wL1Sc+vExyjskVEIN4QNQ=";
+    hash = "sha256-hZgENY1Vb0wr6fqQfodjXQ+a/JAca0AQFKHlTc4EG68=";
   };
 
-  npmDepsHash = "sha256-MzPXDy9sX7Y5dUm3qp3OORdEz8QyL5j4M4eXl0gtopo=";
+  npmDepsHash = "sha256-9pkcQS281OC9q9WadctQ/GAgbaeejrj7HLwKK/SDkAU=";
 
   # Prevent Cypress binary download.
   CYPRESS_INSTALL_BINARY = 0;

From 60058c64dbbfc27a08be21243dc0fd170884f3ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 05:53:15 +0000
Subject: [PATCH 033/144] bazel-gazelle: 0.40.0 -> 0.43.0

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

diff --git a/pkgs/by-name/ba/bazel-gazelle/package.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix
index 5bfcb0b5ad6e..65d514eb6438 100644
--- a/pkgs/by-name/ba/bazel-gazelle/package.nix
+++ b/pkgs/by-name/ba/bazel-gazelle/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "bazel-gazelle";
-  version = "0.40.0";
+  version = "0.43.0";
 
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-cGRE+AX62U6lZbUEid0QWb9zMTiIemop6Gqrqvz5+nk=";
+    hash = "sha256-jj2mAGzz5BOim008LNRH0tVLbJy/mNodsTENMVbjUbk=";
   };
 
   vendorHash = null;

From cc0dc82260d4840ed211ea5a9a8db8400f6d7c29 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Thu, 24 Apr 2025 15:44:07 +0900
Subject: [PATCH 034/144] glab: 1.55.0 -> 1.56.0

https://gitlab.com/gitlab-org/cli/-/releases/v1.56.0

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/gl/glab/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index d14b0cb538ad..6f6b9c8b0390 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "glab";
-  version = "1.55.0";
+  version = "1.56.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-K1zjb4QCLBp7GwT2580DXYKx3yTaIyNytKObMbzjvlQ=";
+    hash = "sha256-dFyVhl4+WdQeoSZSY8JbkjJBhqOX/oN2b9q1CGlLhpc=";
   };
 
-  vendorHash = "sha256-ODTyWArYcCxsWbN9fuppAcRYtKGxcadeRPIwfPiAuOE=";
+  vendorHash = "sha256-m4IWtK2PNjs2UxzVCT2oSx6Gic2flN4Fq8w0mNIhHxo=";
 
   ldflags = [
     "-s"

From 9422c3c214e0e64071406f3c89c16bd1eb2991e6 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 24 Apr 2025 11:57:59 +0200
Subject: [PATCH 035/144] nginx: 1.26.3 -> 1.28.0

https://nginx.org/en/CHANGES-1.28
---
 pkgs/servers/http/nginx/stable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix
index d331ba630117..d38c5d9f27cd 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/pkgs/servers/http/nginx/stable.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.26.3";
-  hash = "sha256-ae4rI3dEA25h0kuDZmiq0wQN2kYf5vVw8Xh+q1cMdao=";
+  version = "1.28.0";
+  hash = "sha256-xrXGsIbA3508o/9eCEwdDvkJ5gOCecccHD6YX1dv92o=";
 }

From 5efc9303f0ec00558ebde011a3e4e14b90fdd556 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 11:44:29 +0000
Subject: [PATCH 036/144] sshs: 4.5.1 -> 4.7.2

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

diff --git a/pkgs/by-name/ss/sshs/package.nix b/pkgs/by-name/ss/sshs/package.nix
index 3d1dff4682fb..fdec7c7040db 100644
--- a/pkgs/by-name/ss/sshs/package.nix
+++ b/pkgs/by-name/ss/sshs/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sshs";
-  version = "4.5.1";
+  version = "4.7.2";
 
   src = fetchFromGitHub {
     owner = "quantumsheep";
     repo = "sshs";
     rev = version;
-    hash = "sha256-8tIIpGEQBXfLQ/Bok4KrpDGwoYhIQz/ylg6fUc6mBdc=";
+    hash = "sha256-Xr1S6KSw3a/+TIrw2hUPpUOd22+49YMuGK2TVxfwPHU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-U1E11NB+MVte31hfSAwhzXsId7U5uGy5C6Ubk6RPNvA=";
+  cargoHash = "sha256-Py85+zv54KHFXjhiThTPXgJQmCImXN42ePOjazjzxIQ=";
 
   passthru.tests.version = testers.testVersion { package = sshs; };
 

From a6fa79d4b986cb58a4e3b951fb5c1bee9f49c8c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 12:54:18 +0000
Subject: [PATCH 037/144] astyle: 3.6.8 -> 3.6.9

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

diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix
index 9627a5177890..94c9dad7dae8 100644
--- a/pkgs/by-name/as/astyle/package.nix
+++ b/pkgs/by-name/as/astyle/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "astyle";
-  version = "3.6.8";
+  version = "3.6.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    hash = "sha256-WviuegXF5hbdH4TXWLSQnC0uz8F5+IP9EE0iPzTMbf8=";
+    hash = "sha256-tkRZdlTfW0AIe+SkZyPGUED3zlnzNp8bj2kPnBDKurw=";
   };
 
   nativeBuildInputs = [ cmake ];

From 2b88fad7ba3f76c9f7cd1f6b1c94fa3a0ec7317a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 14:55:50 +0000
Subject: [PATCH 038/144] pay-respects: 0.7.5 -> 0.7.6

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

diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix
index 06a7ef07bc03..0c9ffdb2eb4e 100644
--- a/pkgs/by-name/pa/pay-respects/package.nix
+++ b/pkgs/by-name/pa/pay-respects/package.nix
@@ -5,18 +5,18 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "pay-respects";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "iff";
     repo = "pay-respects";
     rev = "v${version}";
-    hash = "sha256-NmFuu6uS8maAoN9U2ZdEyeJeozR3ubhoMrhvWKDxbMI=";
+    hash = "sha256-+50MKpZgJqjuUvJeFFv8fMILkJ3cOAN7R7kmlR+98II=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-xqq4PXvon6edjJ4VhrhXD8QtDGWlMeJnl8mnH8rdIvU=";
+  cargoHash = "sha256-TJP+GPkXwPvnBwiF0SCkn8NGz/xyrYjbUZKCbUUSqHQ=";
 
   meta = {
     description = "Terminal command correction, alternative to `thefuck`, written in Rust";

From 617beb6e8d43e11a3ad580dfc3a55e66c26af84a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 15:25:08 +0000
Subject: [PATCH 039/144] python312Packages.qbittorrent-api: 2025.2.0 ->
 2025.4.0

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

diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix
index 7b541136db90..a9e8f8241a72 100644
--- a/pkgs/development/python-modules/qbittorrent-api/default.nix
+++ b/pkgs/development/python-modules/qbittorrent-api/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "qbittorrent-api";
-  version = "2025.2.0";
+  version = "2025.4.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "qbittorrent_api";
     inherit version;
-    hash = "sha256-e7MMiDxgJxR72dMBqyZSXAsrL067ACs83WNszr+z0ms=";
+    hash = "sha256-E3kvY3zhxf7bbnkfBR4LnjlRfz+PKcWvt7M8uvIFoRg=";
   };
 
   build-system = [

From 0d2c47650cce246eac4f2246d802e4ba771e2f2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 15:39:13 +0000
Subject: [PATCH 040/144] minio-client: 2025-04-08T15-39-49Z ->
 2025-04-16T18-13-26Z

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

diff --git a/pkgs/by-name/mi/minio-client/package.nix b/pkgs/by-name/mi/minio-client/package.nix
index 07c818eafdfe..a5d1f8d023b8 100644
--- a/pkgs/by-name/mi/minio-client/package.nix
+++ b/pkgs/by-name/mi/minio-client/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "minio-client";
-  version = "2025-04-08T15-39-49Z";
+  version = "2025-04-16T18-13-26Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "sha256-H/iIlzdOLcE2xn96FuyyFcXC0is94MUYbfjA5b/hEqg=";
+    sha256 = "sha256-23shNQWVIuTLL0FLM00919JaT2QR4R0ou5ZA2/mQ4PA=";
   };
 
-  vendorHash = "sha256-0Lfjhd4DlIpnbMp/4gObgeO9L1QC03FhJbFDLXW6UOQ=";
+  vendorHash = "sha256-MpLQZFrf2sBAweXtYeFi5j6p6GaXuN99x+r4UK8D9xM=";
 
   subPackages = [ "." ];
 

From fb8656e60f8bbc89701058b3dee58fca7557b1a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 15:47:01 +0000
Subject: [PATCH 041/144] python312Packages.mkdocs-drawio-exporter: 0.10.1 ->
 0.10.2

---
 .../python-modules/mkdocs-drawio-exporter/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix b/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix
index 0609cf4019d8..d63cfef83694 100644
--- a/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix
+++ b/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-drawio-exporter";
-  version = "0.10.1";
+  version = "0.10.2";
   pyproject = true;
 
   disabled = !isPy3k;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "mkdocs_drawio_exporter";
     inherit version;
-    hash = "sha256-7DbJE5UHXRO3kQYM2HuzxQeEhWBKFE06WFSf5GTYGZ8=";
+    hash = "sha256-LbHnV6WLIgab6CrripZnnqc5kkVyF4E+Ls00h1bXjHc=";
   };
 
   build-system = [ poetry-core ];

From 9848dca6688b2562c6be0d3fe5c89e5594e73755 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 21 Apr 2025 20:05:41 -0700
Subject: [PATCH 042/144] mlv-app: 1.14 -> 1.15

---
 pkgs/applications/video/mlv-app/aarch64-flags.patch | 13 -------------
 pkgs/applications/video/mlv-app/default.nix         | 11 +++--------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/applications/video/mlv-app/aarch64-flags.patch

diff --git a/pkgs/applications/video/mlv-app/aarch64-flags.patch b/pkgs/applications/video/mlv-app/aarch64-flags.patch
deleted file mode 100644
index 4d26bfdd39d0..000000000000
--- a/pkgs/applications/video/mlv-app/aarch64-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro
-index ebdc552..3e37573 100644
---- a/platform/qt/MLVApp.pro
-+++ b/platform/qt/MLVApp.pro
-@@ -120,7 +120,7 @@ win32{
-
- # Linux
- linux-g++*{
--    QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -ftree-vectorize
-+    QMAKE_CFLAGS += -O3 -fopenmp -std=c99 -ftree-vectorize
-     QMAKE_CXXFLAGS += -fopenmp -std=c++11 -ftree-vectorize
-     LIBS += -lgomp
- }
diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix
index d008e08f3d2b..4d1ae328e125 100644
--- a/pkgs/applications/video/mlv-app/default.nix
+++ b/pkgs/applications/video/mlv-app/default.nix
@@ -10,20 +10,15 @@
 
 mkDerivation rec {
   pname = "mlv-app";
-  version = "1.14";
+  version = "1.15";
 
   src = fetchFromGitHub {
     owner = "ilia3101";
     repo = "MLV-App";
     rev = "QTv${version}";
-    sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU=";
+    sha256 = "sha256-boYnIGDowV4yRxdE98U5ngeAwqi5HTRDFh5gVwW/kN8=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isAarch64 [
-    # remove optimization flags with x86 only instruction sets
-    ./aarch64-flags.patch
-  ];
-
   installPhase = ''
     runHook preInstall
     install -Dm555 -t $out/bin                mlvapp
@@ -59,7 +54,7 @@ mkDerivation rec {
     homepage = "https://mlv.app";
     license = licenses.gpl3;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     mainProgram = "mlvapp";
   };
 }

From 6f04b65d2dcf2e6ccb88d409e6e0f7c8e467e0aa Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 21 Apr 2025 20:05:49 -0700
Subject: [PATCH 043/144] mlv-app: unbreak on GCC 14

---
 pkgs/applications/video/mlv-app/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix
index 4d1ae328e125..cfdd4f61e905 100644
--- a/pkgs/applications/video/mlv-app/default.nix
+++ b/pkgs/applications/video/mlv-app/default.nix
@@ -2,6 +2,7 @@
   fetchFromGitHub,
   lib,
   mkDerivation,
+  fetchpatch,
   qmake,
   qtbase,
   qtmultimedia,
@@ -19,6 +20,13 @@ mkDerivation rec {
     sha256 = "sha256-boYnIGDowV4yRxdE98U5ngeAwqi5HTRDFh5gVwW/kN8=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/ilia3101/MLV-App/commit/b7643b1031955f085ade30e27974ddd889a4641f.patch";
+      hash = "sha256-DQkoB+fjshWDLzKouhEQXzpqn78WL+eqo5oTfE9ltEk=";
+    })
+  ];
+
   installPhase = ''
     runHook preInstall
     install -Dm555 -t $out/bin                mlvapp

From c73b41799866f1412a6186f78590b981975aef98 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 24 Apr 2025 13:44:23 -0400
Subject: [PATCH 044/144] trojan-go: enable go debug binary stripping

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/tr/trojan-go/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/tr/trojan-go/package.nix b/pkgs/by-name/tr/trojan-go/package.nix
index 7724ca0924a6..f11abb725c66 100644
--- a/pkgs/by-name/tr/trojan-go/package.nix
+++ b/pkgs/by-name/tr/trojan-go/package.nix
@@ -20,6 +20,8 @@ buildGoModule rec {
   vendorHash = "sha256-c6H/8/dmCWasFKVR15U/kty4AzQAqmiL/VLKrPtH+s4=";
 
   ldflags = [
+    "-s"
+    "-w"
     "-X github.com/p4gefau1t/trojan-go/constant.Version=v${version}"
     "-X github.com/p4gefau1t/trojan-go/constant.Commit=v${version}"
   ];

From 7e37b62126f894ede80b1ccfe8863fbdd1fc3d4d Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Thu, 24 Apr 2025 17:48:50 +0000
Subject: [PATCH 045/144] jjui: 0.8.4 -> 0.8.5

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

diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index 595709181a23..0dbc5aa5f388 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "jjui";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${version}";
-    hash = "sha256-9o7I4qk0flaFlrO5fBuntJO3XSEWAM9WuoPEA/Y+LXE=";
+    hash = "sha256-2M69r3r4VeESymiJzLr2tfKBsmTcAZJsCLEYQkRKoMw=";
   };
 
   vendorHash = "sha256-YlOK+NvyH/3uvvFcCZixv2+Y2m26TP8+ohUSdl3ppro=";

From 5dbb2f2b7579af8495128321f080fe0e4659a02e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 17:55:21 +0000
Subject: [PATCH 046/144] kubeshark: 52.6.0 -> 52.7.0

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

diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix
index 8a1ad1760eba..d0b56e31724e 100644
--- a/pkgs/by-name/ku/kubeshark/package.nix
+++ b/pkgs/by-name/ku/kubeshark/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "kubeshark";
-  version = "52.6.0";
+  version = "52.7.0";
 
   src = fetchFromGitHub {
     owner = "kubeshark";
     repo = "kubeshark";
     rev = "v${version}";
-    hash = "sha256-Mxj42D+MxYn0/csI/ZsMdU8xOz8P/IzsHr7vtmlQPa0=";
+    hash = "sha256-D3mHLYN6OVk7f1MCCWqSg/3qeg83EHcpqvkm1UTOaaM=";
   };
 
   vendorHash = "sha256-kzyQW4bVE7oMOlHVG7LKG1AMTRYa5GLiiEhdarIhMSo=";

From c289265730808752ca2b833143b11f9f68caa28f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 19:40:27 +0000
Subject: [PATCH 047/144] katana: 1.1.2 -> 1.1.3

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

diff --git a/pkgs/by-name/ka/katana/package.nix b/pkgs/by-name/ka/katana/package.nix
index a5d32857aca6..a48cc34f4365 100644
--- a/pkgs/by-name/ka/katana/package.nix
+++ b/pkgs/by-name/ka/katana/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "katana";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "katana";
     tag = "v${version}";
-    hash = "sha256-cRzLJcX7U9jhKMYnpOyo8S8hN6cIeUYFElcmOqbv0GY=";
+    hash = "sha256-KwnGEWWrWpano+5gSG0YO4UE2ceKvgXmrtlhlda2xq4=";
   };
 
-  vendorHash = "sha256-NaPVrgFbw77kxl2sw1nHhqr1ePn5TYhS2rS0et7qJKs=";
+  vendorHash = "sha256-L7ycSzLbZUJ/4E+2lyN52xQFOJoxiRopgTfJkflFP9Q=";
 
   subPackages = [ "cmd/katana" ];
 

From 646c5018b18d2d1501ff196cfd8c49c76ce617df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 20:02:32 +0000
Subject: [PATCH 048/144] ibus-engines.table-others: 1.3.19 -> 1.3.20

---
 .../inputmethods/ibus-engines/ibus-table-others/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index 42a92b11b2fd..134a6602f23d 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-table-others";
-  version = "1.3.19";
+  version = "1.3.20";
 
   src = fetchurl {
     url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-3kNEM3RaSQX5doerqALtKHQ9P+Jt8twC5inNFmDS/gg=";
+    hash = "sha256-mi2vF+OH3c9lgWFxswzCbENCleTWLHNE8clzZcdcwfM=";
   };
 
   nativeBuildInputs = [

From 278780fe7c1b9611bcf1c91e602cd29b0095c28f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 20:15:02 +0000
Subject: [PATCH 049/144] dotenvx: 1.39.1 -> 1.41.0

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

diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index 355dcb36b648..010cad0a3c74 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "dotenvx";
-  version = "1.39.1";
+  version = "1.41.0";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
     tag = "v${version}";
-    hash = "sha256-viIW2bQTcfoMhppv96TxD+i85ltGzNrPzZAeYPNcHeI=";
+    hash = "sha256-qYigFqJF/+37bd8LPg8u9EkI/50ULxTs3LwjrcAYntk=";
   };
 
-  npmDepsHash = "sha256-SVrsvl2Mw59hsh+RBZV5bZ5Qz5reg1hrDYRYq5y0UIw=";
+  npmDepsHash = "sha256-k+M3AdEHSrpl+rKTbxmTkcHVgwm5lHt3xjj2fQ4UFiI=";
 
   dontNpmBuild = true;
 

From 87e0dd91ebd28b65d14ba4b0e2de8145bac1caed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 20:15:51 +0000
Subject: [PATCH 050/144] eks-node-viewer: 0.7.1 -> 0.7.4

---
 pkgs/by-name/ek/eks-node-viewer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ek/eks-node-viewer/package.nix b/pkgs/by-name/ek/eks-node-viewer/package.nix
index 3b14dc2f441d..93457be17b94 100644
--- a/pkgs/by-name/ek/eks-node-viewer/package.nix
+++ b/pkgs/by-name/ek/eks-node-viewer/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "eks-node-viewer";
-  version = "0.7.1";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-KdddfixQewj30rIC1qZzyS3h/jq+RdxId9WgQPqW8nE=";
+    hash = "sha256-VCRwGxH7adwB6p+UCF1GmAa5f/7GgJlJ7GvRSFOlOto=";
   };
 
-  vendorHash = "sha256-yTF1PRRUlJ27ZrKO0FW4IztIE1Wo05qixTCFvETg358=";
+  vendorHash = "sha256-ZBkiiDAcgOkIezDHcDjqJ3w5+k5kXdfw2TCZoTx12hc=";
 
   excludedPackages = [ "hack" ];
 

From c4180aa56185c47325190b2142640b08ef126327 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 21:58:05 +0000
Subject: [PATCH 051/144] python312Packages.curated-tokenizers: 0.0.9 -> 2.0.0

---
 .../python-modules/curated-tokenizers/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/curated-tokenizers/default.nix b/pkgs/development/python-modules/curated-tokenizers/default.nix
index 77f4a77f906b..2b206e00d600 100644
--- a/pkgs/development/python-modules/curated-tokenizers/default.nix
+++ b/pkgs/development/python-modules/curated-tokenizers/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "curated-tokenizers";
-  version = "0.0.9";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "explosion";
     repo = "curated-tokenizers";
     tag = "v${version}";
-    hash = "sha256-P8kpPnaU3el7sc/vUn4waQN+JV7F9b49i6BtC4BFfIg=";
+    hash = "sha256-VkDV/9c5b8TzYlthCZ38ufbrne4rihtkmkZ/gyAQXLE=";
     fetchSubmodules = true;
   };
 
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Lightweight piece tokenization library";
     homepage = "https://github.com/explosion/curated-tokenizers";
-    changelog = "https://github.com/explosion/curated-tokenizers/releases/tag/v${version}";
+    changelog = "https://github.com/explosion/curated-tokenizers/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ danieldk ];
   };

From aa53faaaa54804faa90069ff807f6df63d607fac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 21:58:09 +0000
Subject: [PATCH 052/144] qtorganizer-mkcal: 0-unstable-2025-02-19 ->
 0-unstable-2025-04-24

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

diff --git a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
index 07085a003207..6a0e30811d64 100644
--- a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
+++ b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtorganizer-mkcal";
-  version = "0-unstable-2025-02-19";
+  version = "0-unstable-2025-04-24";
 
   src = fetchFromGitHub {
     owner = "dcaliste";
     repo = "qtorganizer-mkcal";
-    rev = "312412de3f810fbedc7c4f27bd33adb2c3fbe967";
-    hash = "sha256-uv2cEs84bM614vg5K+t4vyXas+1b5Jm39tfGSwWj6n0=";
+    rev = "45906b1df8ad758a824369873f423d9e0c457fbf";
+    hash = "sha256-sgYCO8LxBFhMkjGnKVvOx2d4hyw9Oa5lbu6LKhuwl8s=";
   };
 
   postPatch = ''

From 05305bf0931160e0e8b0ed442fa257c049d43489 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 00:28:11 +0000
Subject: [PATCH 053/144] ada: 3.2.2 -> 3.2.3

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

diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix
index dd0cf99a7831..2b6d226dacf0 100644
--- a/pkgs/by-name/ad/ada/package.nix
+++ b/pkgs/by-name/ad/ada/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ada";
-  version = "3.2.2";
+  version = "3.2.3";
 
   src = fetchFromGitHub {
     owner = "ada-url";
     repo = "ada";
     tag = "v${version}";
-    hash = "sha256-Qag6cWybRxbQC7LvQmxLVcCw4RtMJ5TOSDwCmNs2XFA=";
+    hash = "sha256-35vw/hGlOPhpjY43jWTrWxqazaYzhdviXxBe53cKEzg=";
   };
 
   nativeBuildInputs = [ cmake ];

From a6ec0cd2619bb89890999e4d742cda1ea5496e0e Mon Sep 17 00:00:00 2001
From: kb <kim@simple.industries>
Date: Fri, 25 Apr 2025 10:53:14 +1000
Subject: [PATCH 054/144] ameba: remove kimburgess as maintainer

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

diff --git a/pkgs/by-name/am/ameba/package.nix b/pkgs/by-name/am/ameba/package.nix
index 6e0ae32c5f9e..f7f7f8bd98b6 100644
--- a/pkgs/by-name/am/ameba/package.nix
+++ b/pkgs/by-name/am/ameba/package.nix
@@ -25,6 +25,6 @@ crystal.buildCrystalPackage rec {
     homepage = "https://crystal-ameba.github.io";
     changelog = "https://github.com/crystal-ameba/ameba/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ kimburgess ];
+    maintainers = with maintainers; [ ];
   };
 }

From e090b6e06c15154f327f277325d495f2931065ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 01:33:20 +0000
Subject: [PATCH 055/144] go-md2man: 2.0.6 -> 2.0.7

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

diff --git a/pkgs/by-name/go/go-md2man/package.nix b/pkgs/by-name/go/go-md2man/package.nix
index f06d54a10974..1cdce31b86b0 100644
--- a/pkgs/by-name/go/go-md2man/package.nix
+++ b/pkgs/by-name/go/go-md2man/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule rec {
   pname = "go-md2man";
-  version = "2.0.6";
+  version = "2.0.7";
 
   vendorHash = "sha256-aMLL/tmRLyGze3RSB9dKnoTv5ZK1eRtgV8fkajWEbU0=";
 
@@ -14,7 +14,7 @@ buildGoModule rec {
     rev = "v${version}";
     owner = "cpuguy83";
     repo = "go-md2man";
-    sha256 = "sha256-wJnHgp+NPchXkR71ARLMjo4VryzgGkz2tYWPsC+3eFo=";
+    sha256 = "sha256-DKqGvdidl6J4lPhIk3okhU4k6MvtSr+hJ9huU/JTai0=";
   };
 
   meta = with lib; {

From 226de3b0418c99d0a62e146d02cacea2ea1d6a14 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 24 Apr 2025 18:54:48 -0700
Subject: [PATCH 056/144] whatstyle: 0.1.8 -> 0.2.0

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

diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix
index e7dd2ec40735..d84385d93c6c 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/pkgs/development/tools/misc/whatstyle/default.nix
@@ -7,12 +7,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "whatstyle";
-  version = "0.1.8";
+  version = "0.2.0";
   src = fetchFromGitHub {
     owner = "mikr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "08lfd8h5fnvy5gci4f3an411cypad7p2yiahvbmlp51r9xwpaiwr";
+    sha256 = "sha256-4LCZAEUQFPl4CBPeuqsodiAlwd8uBg+SudF5d+Vz4Gc=";
   };
 
   # Fix references to previous version, to avoid confusion:

From 51adf2dbdee87d06f2067e559fe95da3b4facac2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 02:03:36 +0000
Subject: [PATCH 057/144] terraform-providers.auth0: 1.15.0 -> 1.16.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index accf1bb287a2..63e75c647681 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -90,13 +90,13 @@
     "vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c="
   },
   "auth0": {
-    "hash": "sha256-NBY9f1/VGU6VyPwy7LqgmsulLlzz17Ie8nU7JOirlFo=",
+    "hash": "sha256-ZSbanDR9PpvHHVr7uObGbf0nQD3CzKzT5QKCEwJojH8=",
     "homepage": "https://registry.terraform.io/providers/auth0/auth0",
     "owner": "auth0",
     "repo": "terraform-provider-auth0",
-    "rev": "v1.15.0",
+    "rev": "v1.16.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Tfkk3+PWzlC7nZlhnD7rEYO+6OKps6pXgi+eqfmRSic="
+    "vendorHash": "sha256-ZBvIfLUMgGXJM5VgsOrerfN3TiMou3VFUrMqzMAwWaA="
   },
   "avi": {
     "hash": "sha256-e8yzc3nRP0ktcuuKyBXydS9NhoceYZKzJcqCWOfaPL0=",

From 52b0109b985326cc83ed0ad7727e14af27a79c13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 02:10:27 +0000
Subject: [PATCH 058/144] prometheus-pve-exporter: 3.5.2 -> 3.5.3

---
 pkgs/servers/monitoring/prometheus/pve-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix
index 307b0d74e6b3..16a72743ffcc 100644
--- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix
@@ -7,11 +7,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "prometheus_pve_exporter";
-  version = "3.5.2";
+  version = "3.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-910ZDSaUXIbTu8Xkbu0kvPhRncHw1jC4C7GJQdACL2U=";
+    hash = "sha256-8QFXhGQWmkrKdZQwlIrdTa76NrNlC/lW3BI0taybpOI=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From e00a58b94967a3c440c2a9b02408de99e5deae6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 02:14:10 +0000
Subject: [PATCH 059/144] cyme: 2.1.3 -> 2.2.0

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

diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix
index 748be9e0bfae..ccf33e9fc15b 100644
--- a/pkgs/by-name/cy/cyme/package.nix
+++ b/pkgs/by-name/cy/cyme/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cyme";
-  version = "2.1.3";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "tuna-f1sh";
     repo = "cyme";
     rev = "v${version}";
-    hash = "sha256-7V/MExL1OJ+mBPlLcYiK6HTjvbHbIbrf13Rak+Za3d4=";
+    hash = "sha256-asg8ATzM2cwh+crnzqjWMsee1I9BPm9an8d3lzj6yS4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-4QxxwCBiPYd83rKEcoRJhHhQArzq9oQ287UBVrjbElg=";
+  cargoHash = "sha256-DFAlFEJfR6jUplQ50AK4SszdBIw0jbxFRgYNHg3sN8c=";
 
   nativeBuildInputs =
     [

From e617d61f72aa97d7248fb63d9058e4eab8df5022 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 02:31:47 +0000
Subject: [PATCH 060/144] lacus: 1.13.1 -> 1.14.0

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

diff --git a/pkgs/by-name/la/lacus/package.nix b/pkgs/by-name/la/lacus/package.nix
index b989d86c1d26..da00f13d0df5 100644
--- a/pkgs/by-name/la/lacus/package.nix
+++ b/pkgs/by-name/la/lacus/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "lacus";
-  version = "1.13.1";
+  version = "1.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ail-project";
     repo = "lacus";
     tag = "v${version}";
-    hash = "sha256-M9ZRlvQvDV5eiWOHh3LgezIN5gUgJ6w24OEo4RArip8=";
+    hash = "sha256-fk6NfBdUGGyOhVOJcGCRNldcw4JRHFr7p+tFuccYp7Y=";
   };
 
   pythonRelaxDeps = [

From 9aafac96ef762756e29ac2847958bc2c212c151e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 03:12:31 +0000
Subject: [PATCH 061/144] terraform-providers.docker: 3.1.2 -> 3.3.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index accf1bb287a2..ebddffb2e8b9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -390,13 +390,13 @@
     "vendorHash": "sha256-WZqwBkVXoFmDikIyt9GWszLA/9YBoQHAdBuWbGKZBZw="
   },
   "docker": {
-    "hash": "sha256-0GMZnrmuRKWnI3Fu97MPtKiNh9XSUkFO/U35+ym2xLk=",
+    "hash": "sha256-dhHhalHUHvM5vIyqXBmmYSYWPVXfYZEkQeREg17Clu8=",
     "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker",
     "owner": "kreuzwerker",
     "repo": "terraform-provider-docker",
-    "rev": "v3.1.2",
+    "rev": "v3.3.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-YTxWawv5KbitMD9CoiDLt8FjZUvjyIjcoqQVmz9xZGs="
+    "vendorHash": "sha256-yxa2MTNsmbcZTG8QjnYHkWhow6s1IeutPmww/A0K3zw="
   },
   "doppler": {
     "hash": "sha256-VzdtksB/zrsf3z3J/1UEehiuQYM7cyxTef892PGYrxo=",

From 7a8bed3fe9de12274e86f5e6426c759af569909c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 03:23:34 +0000
Subject: [PATCH 062/144] terraform-providers.cloudinit: 2.3.6 -> 2.3.7

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index accf1bb287a2..c0c40cb3b0aa 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -271,13 +271,13 @@
     "vendorHash": "sha256-6MKWpiDq4yI3mfIJyzEsWLa7gi0+DScI5jKcOcM6Qs0="
   },
   "cloudinit": {
-    "hash": "sha256-RRvLQXgF/g+jIn8hO+Ma/tNsRaZEETWu/jNqDADVYGI=",
+    "hash": "sha256-xDHp2bG0/T4pE3j8L4zTVnaQ9te5MuAbiGmopFedOpk=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit",
     "owner": "hashicorp",
     "repo": "terraform-provider-cloudinit",
-    "rev": "v2.3.6",
+    "rev": "v2.3.7",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-YdzNaMJcDiV194HiDBt+5RHw/BLn8H+wNcrpFSxqDOY="
+    "vendorHash": "sha256-bD8BHhP4jxBRnFjmZE1MMkBn2/sMqNEaxTlQRMj2Crw="
   },
   "cloudscale": {
     "hash": "sha256-4RU1CD0WwLMd3NsnJWl2Smc8XBYlP9K8Iev16uqsetE=",

From d0a1ed6ade50377a502874176e70ac1f16d9b734 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 03:27:34 +0000
Subject: [PATCH 063/144] terraform-providers.venafi: 0.21.2 -> 0.22.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index accf1bb287a2..2db557e1eb1d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1409,13 +1409,13 @@
     "vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4="
   },
   "venafi": {
-    "hash": "sha256-/fRqTu/M3OHR5v7pWAE04ijq70F7MxRILP1Ab2hw7gs=",
+    "hash": "sha256-vMZH0BQMkoizbME1pYCn+iMqwI8aSvhe0Dcrvstzots=",
     "homepage": "https://registry.terraform.io/providers/Venafi/venafi",
     "owner": "Venafi",
     "repo": "terraform-provider-venafi",
-    "rev": "v0.21.2",
+    "rev": "v0.22.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-kZ0JLjAYu3b01zHfp+VWTZ8sUCivfaS1Ld2/SDMOrks="
+    "vendorHash": "sha256-OUQgisFi8ZR/Hv70pKB5Kwdk+Rd/Ll6qx3vKaX4NNtA="
   },
   "vinyldns": {
     "hash": "sha256-ow+o9fRw/t2i4N65zuVFbfPb68ZUcJfNB5ARYqRTsIs=",

From 84a1c25792643d32132ee1935c13c62de4b00828 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 06:02:42 +0000
Subject: [PATCH 064/144] release-plz: 0.3.132 -> 0.3.133

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

diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix
index b74644fd4b74..7e63c00ec949 100644
--- a/pkgs/by-name/re/release-plz/package.nix
+++ b/pkgs/by-name/re/release-plz/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "release-plz";
-  version = "0.3.132";
+  version = "0.3.133";
 
   src = fetchFromGitHub {
     owner = "MarcoIeni";
     repo = "release-plz";
     rev = "release-plz-v${version}";
-    hash = "sha256-J2ViqVJEBGBiKfG9S7/p5RNjFNNp0A6b3Htv5c0On6M=";
+    hash = "sha256-WxuW5qz8ACaKoLOiKug1BRGiMqgS8fv1lL6gmJFdlRE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-z67GXNJ9QSRIafTCeVjr0T+EYdcT/Blr7pBGQJgobdc=";
+  cargoHash = "sha256-xWvQfPqLIisHtn1yxXkPcPlZGb0AV/e8aFbihxCQ8zA=";
 
   nativeBuildInputs = [
     installShellFiles

From acd4aab57c6ac305c249d3771e3619bcb758d6af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 06:12:58 +0000
Subject: [PATCH 065/144] firebase-tools: 14.2.0 -> 14.2.1

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

diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 594265c13c2c..ce38c96f34a2 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "14.2.0";
+  version = "14.2.1";
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-ga0UsU/VTDIoz88XxdQIGX+md1G21DgctYYmXPr3zbQ=";
+    hash = "sha256-3eAzLtVNlgjktnuQ1ZJIyE2CsKZISPRuGjUTHZxX/6k=";
   };
 
-  npmDepsHash = "sha256-XiOLtZCm3qxd2Oq3vqMzxU64y37ZZfhivvkxT6m7ES4=";
+  npmDepsHash = "sha256-/mij1GjkRldQWaBv1YEwxMWoP6CG3ydLV2aI+K2R+t4=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From f1316914e2ff4e857f016895a95a025fc3abbc6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 06:12:58 +0000
Subject: [PATCH 066/144] files-cli: 2.13.278 -> 2.13.279

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

diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index df2b746892fc..346f49c9a6f6 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "files-cli";
-  version = "2.13.278";
+  version = "2.13.279";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${version}";
-    hash = "sha256-/488GRkU3pQDEkQhLoKQ4ohv4olSnCaLAca/jvq/lsA=";
+    hash = "sha256-R8h69JspAUnDJaQdYNwZINH86FQIPKsFkw0d85uYQAg=";
   };
 
-  vendorHash = "sha256-QulVxCaPvXlFwkxe15Et1+rReolABBssTxZspV8KzMs=";
+  vendorHash = "sha256-nhpgHC/gj72f6fk5Q2SGTN9kGU3HbfgiHg/MnC79Lzg=";
 
   ldflags = [
     "-s"

From a2e32392f16632eae040cac8289df447e5e7310e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 06:24:11 +0000
Subject: [PATCH 067/144] terraform-providers.nomad: 2.4.0 -> 2.5.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index accf1bb287a2..634ffb663376 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -876,13 +876,13 @@
     "vendorHash": "sha256-wOpR+AJYW7YiARSIACta8Tr4bmGLUONRTEBLxHyHZZk="
   },
   "nomad": {
-    "hash": "sha256-k61iQ9FQG3nscBp5CE/fFCbHpeLawbUAtGPM+IZtfVc=",
+    "hash": "sha256-0ShkpPAxCT9lmfrVUoyjx7DhwlSYz9uEIujsKSB+dgA=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/nomad",
     "owner": "hashicorp",
     "repo": "terraform-provider-nomad",
-    "rev": "v2.4.0",
+    "rev": "v2.5.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-YmZvHzrEZVvXI8CIcjX40s+MHTThPeXNQ05cnqkNbbE="
+    "vendorHash": "sha256-U8eA/9og4LIedhPSEN9SyInLQuJSzvm0AeFhzC3oqyQ="
   },
   "ns1": {
     "hash": "sha256-Ufj6mrxeTVpc9rWJX3hpzoBGNnNxOMMb8TgC39Z1vqo=",

From f19ea5951dbe241cbdbeb2ff0e20854aa9aab8f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 06:41:58 +0000
Subject: [PATCH 068/144] terraform-providers.null: 3.2.3 -> 3.2.4

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..7de92623854a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -894,13 +894,13 @@
     "vendorHash": "sha256-QmL/LghZgOtdkgy102/76zFD+1lxnxn2d/11WaETIE4="
   },
   "null": {
-    "hash": "sha256-zvzBWnxWVXNOebnlgaP8lzwk6DMwwkGxx4i1QKCLSz0=",
+    "hash": "sha256-hPAcFWkeK1vjl1Cg/d7FaZpPhyU3pkU6VBIwxX2gEvA=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/null",
     "owner": "hashicorp",
     "repo": "terraform-provider-null",
-    "rev": "v3.2.3",
+    "rev": "v3.2.4",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-btTvl9WcqWMa5YGkY0PT8c64H6ToNghLKX03dN/3IPs="
+    "vendorHash": "sha256-ssmAveYUVI8z/1UWNeaMX0qdUewowCHNufJIFMirdVg="
   },
   "nutanix": {
     "deleteVendor": true,

From 9493d3d940de55491456f995d131e5729be78004 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 07:02:45 +0000
Subject: [PATCH 069/144] terraform-providers.tls: 4.0.6 -> 4.1.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..7b865e6f5eb9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1345,13 +1345,13 @@
     "vendorHash": "sha256-0o7WKJm4IesxparbbWhzXJNL80qxCUkJvQFypMobR1A="
   },
   "tls": {
-    "hash": "sha256-MK75g9gbi+f994hKHBAQRXrPG+hbZqnlyrK8WROiG5Y=",
+    "hash": "sha256-t/nUt0deyckP8opNiPZc5rbC1SleZwkrFXuQFw47sqA=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tls",
     "owner": "hashicorp",
     "repo": "terraform-provider-tls",
-    "rev": "v4.0.6",
+    "rev": "v4.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-qsbB7Scw9W4our6B+9NzsK4hrbWP34na7/eNLC99yKc="
+    "vendorHash": "sha256-tYvQURTrFtr+rgSMGq2zi/5p5jJVGIse7+hj95gz68U="
   },
   "triton": {
     "deleteVendor": true,

From 0352de7a63efa2b3ad9b296275aeb437a7b76ec9 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Fri, 7 Mar 2025 23:14:10 +0900
Subject: [PATCH 070/144] pdm: 2.22.3 -> 2.24.1

https://github.com/pdm-project/pdm/releases/tag/2.22.4
https://github.com/pdm-project/pdm/releases/tag/2.23.0
https://github.com/pdm-project/pdm/releases/tag/2.23.1
https://github.com/pdm-project/pdm/releases/tag/2.24.0
https://github.com/pdm-project/pdm/releases/tag/2.24.1

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/pd/pdm/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index ebedb85b3f3f..2e4837f6899a 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -30,7 +30,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "pdm";
-  version = "2.22.3";
+  version = "2.24.1";
   pyproject = true;
 
   disabled = python.pkgs.pythonOlder "3.8";
@@ -39,7 +39,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "pdm-project";
     repo = "pdm";
     tag = version;
-    hash = "sha256-+qUvVQJO/xfBZJuMBezu/LdKhKag1BCQ3To2qFXiOzY=";
+    hash = "sha256-YChgPJmHWJ4tftosa24SKB0J7uV/zR6VWX18poEEsLY=";
   };
 
   pythonRelaxDeps = [ "hishel" ];
@@ -73,6 +73,7 @@ python.pkgs.buildPythonApplication rec {
       tomlkit
       truststore
       unearth
+      id
       virtualenv
     ]
     ++ httpx.optional-dependencies.socks;
@@ -124,6 +125,9 @@ python.pkgs.buildPythonApplication rec {
     "test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV"
     "test_build_distributions"
     "test_init_project_respect"
+    "test_use_python_write_file_multiple_versions"
+    "test_repository_get_token_from_oidc"
+    "test_repository_get_token_misconfigured_github"
   ];
 
   __darwinAllowLocalNetworking = true;

From 5d3dc6dbf01553c25c51f3227e37b28f4496cd1c Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Sat, 5 Apr 2025 21:48:15 +0700
Subject: [PATCH 071/144] x265: fix build for armv7l & add neon support

---
 pkgs/by-name/x2/x265/package.nix | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/x2/x265/package.nix b/pkgs/by-name/x2/x265/package.nix
index eec407eeaf1b..1f7f8cdff97c 100644
--- a/pkgs/by-name/x2/x265/package.nix
+++ b/pkgs/by-name/x2/x265/package.nix
@@ -5,6 +5,7 @@
   fetchurl,
   cmake,
   nasm,
+  fetchpatch2,
 
   # NUMA support enabled by default on NUMA platforms:
   numaSupport ? (
@@ -25,6 +26,9 @@
   unittestsSupport ? stdenv.hostPlatform.isx86_64, # Unit tests - only testing x64 assembly
   vtuneSupport ? false, # Vtune profiling instrumentation
   werrorSupport ? false, # Warnings as errors
+  # NEON support is always enabled for aarch64
+  # this flag is only needed for armv7.
+  neonSupport ? false, # force enable the NEON fpu support for arm v7 CPUs
 }:
 
 let
@@ -49,9 +53,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-oxaZxqiYBrdLAVHl5qffZd5LSQUEgv5ev4pDedevjyk=";
   };
 
-  patches = [
-    ./darwin-__rdtsc.patch
-  ];
+  patches =
+    [
+      ./darwin-__rdtsc.patch
+    ]
+    # TODO: remove after update to version 4.2
+    ++ lib.optionals (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isLinux) [
+      (fetchpatch2 {
+        url = "https://bitbucket.org/multicoreware/x265_git/commits/ddb1933598736394b646cb0f78da4a4201ffc656/raw";
+        hash = "sha256-ZH+jbVtfNJ+CwRUEgsnzyPVzajR/+4nDnUDz5RONO6c=";
+        stripLen = 1;
+      })
+    ];
 
   sourceRoot = "x265_${version}/source";
 
@@ -88,7 +101,13 @@ stdenv.mkDerivation rec {
     # Clang does not support the endfunc directive so use GCC.
     ++ lib.optional (
       stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isFreeBSD
-    ) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc";
+    ) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"
+    # Neon support
+    ++ lib.optionals (neonSupport && stdenv.hostPlatform.isAarch32) [
+      "-DENABLE_NEON=ON"
+      "-DCPU_HAS_NEON=ON"
+      "-DENABLE_ASSEMBLY=ON"
+    ];
 
   cmakeStaticLibFlags =
     [

From 21f260aab49f9425f177b2136dd7afbd26c2fcac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 08:34:59 +0000
Subject: [PATCH 072/144] terraform-providers.pagerduty: 3.24.0 -> 3.24.2

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..4cfb155624b6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1003,11 +1003,11 @@
     "vendorHash": null
   },
   "pagerduty": {
-    "hash": "sha256-7C1oVVLrv1yoBVngUdBAjjLrGeaQhbiLp/g+5danDo4=",
+    "hash": "sha256-zY5aBpr/XPuGnRIsDgh4vzug6kUVJ76iF6tLhck2uGY=",
     "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
     "owner": "PagerDuty",
     "repo": "terraform-provider-pagerduty",
-    "rev": "v3.24.0",
+    "rev": "v3.24.2",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 85dcfac50e45f630c895d521b1fba385093a6b40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 08:42:08 +0000
Subject: [PATCH 073/144] terraform-providers.dexidp: 0.6.1 -> 0.7.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..e996a8583776 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -335,13 +335,13 @@
     "vendorHash": "sha256-mJXQVfCmW7ssFCrrRSiNb5Vg2QnS9NoBCgZlDDPMoEU="
   },
   "dexidp": {
-    "hash": "sha256-ommpazPlY4dMAOB1pgI7942aGH6YYPn6WtaowucQpZY=",
+    "hash": "sha256-un+jAmcK1MYljcAFyIHw0AFmvz4GltAsWxTOd/zXxyU=",
     "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp",
     "owner": "marcofranssen",
     "repo": "terraform-provider-dexidp",
-    "rev": "v0.6.1",
+    "rev": "v0.7.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-3swcRmm+JZ4ZQX0hvXZosYDGwk0KSyZcqEdNGDYcyYE="
+    "vendorHash": "sha256-0yoaiVn6j6g//iTPgX/y6M0A+cWAASDIuWMIHi/4w1o="
   },
   "dhall": {
     "hash": "sha256-QjY5ZazQn4HiLQtdmw9X7o5tFw+27B2IISzmzMMHjHE=",

From 72e185b6fd28cc1edff7ca3580c53857fa9063f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 08:51:18 +0000
Subject: [PATCH 074/144] terraform-providers.http: 3.4.5 -> 3.5.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..0b844d8f537e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -606,13 +606,13 @@
     "vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs="
   },
   "http": {
-    "hash": "sha256-eNF6OQZmJfzVXfvrhjtMJZG7mNYjS61Bplff+VaxrCA=",
+    "hash": "sha256-IXqKZ9RQP0kZVxc9OfaWglF8GeycSAl5DATdqc8n35g=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/http",
     "owner": "hashicorp",
     "repo": "terraform-provider-http",
-    "rev": "v3.4.5",
+    "rev": "v3.5.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8="
+    "vendorHash": "sha256-SsEWNIBkgcdTlSrB4hIvRmhMv2eJ2qQaPUmiN09A+NM="
   },
   "huaweicloud": {
     "hash": "sha256-MzXzdUzhYB7eDW7sNag4PIlz4Z7Q4GZDeHsjLSnc9Ck=",

From ff1993b46c0569c307c3c7d98699c6410f2bef97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 08:58:40 +0000
Subject: [PATCH 075/144] terraform-providers.hcloud: 1.50.0 -> 1.50.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..a22574b43d3a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -561,13 +561,13 @@
     "vendorHash": "sha256-6kK9FMT+Ew6RBzNNR9OxYaCz1NjzKRv75Aa9l+p+B5E="
   },
   "hcloud": {
-    "hash": "sha256-wst3+LIcybM3VZlAzbkacJtAjl08je4rdeIJz1632yM=",
+    "hash": "sha256-DSTxn4t6YWxRBimMlqkP1VLqqxk1Kox+h0u9i9rSdhc=",
     "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
     "owner": "hetznercloud",
     "repo": "terraform-provider-hcloud",
-    "rev": "v1.50.0",
+    "rev": "v1.50.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ealJRIeNapOteRsRzEN5FayhG629gJ+eAV2ohTwHWL0="
+    "vendorHash": "sha256-jbNkhNSSO9jT20J6dVhBEbN9cwtNrvx5EUcyOZcMd4Y="
   },
   "helm": {
     "hash": "sha256-LCvsZNeGQb4wWIASnQxXbH/3YJJaUZS9nY8mHq6M4FM=",

From 43e525ef5253bb0bf1de0cf9a6e8fc63d0587b5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 08:58:51 +0000
Subject: [PATCH 076/144] terraform-providers.random: 3.7.1 -> 3.7.2

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..d9f7c5a5f01a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1084,13 +1084,13 @@
     "vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA="
   },
   "random": {
-    "hash": "sha256-bbqTCLPjL1EowsEIx9SiwKAUt11LYxOOtj3syW/7gjQ=",
+    "hash": "sha256-tdTVqSJmQ6Ht3kdoYMxhoRN+XJqvu8BPVB0VQghcDVs=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/random",
     "owner": "hashicorp",
     "repo": "terraform-provider-random",
-    "rev": "v3.7.1",
+    "rev": "v3.7.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ILdu9D/SQ39zDcvl13IMhN+aocbTZO5SI8n6wvdS9I8="
+    "vendorHash": "sha256-jyfzk3vbgZwHlyiFFw1mhD+us/7WNatUQTGN4WsrfgE="
   },
   "remote": {
     "hash": "sha256-zuKtkJLTMsrGgk7OIY+K/HhEddgFuEfzK7DcwPnUX6k=",

From c2802724d02e9afb5bd7b443ace42b3f65488c87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 09:09:03 +0000
Subject: [PATCH 077/144] terraform-providers.vsphere: 2.11.1 -> 2.12.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..8d1c1cf1d6c4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1454,13 +1454,13 @@
     "vendorHash": null
   },
   "vsphere": {
-    "hash": "sha256-ce3nKSBvF7Enk3wsW4ackEBIDPKPP0qkjZ7Dm9SGKV4=",
+    "hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere",
     "owner": "hashicorp",
     "repo": "terraform-provider-vsphere",
-    "rev": "v2.11.1",
+    "rev": "v2.12.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-3RylkFRnCG5Z9G/4iV8YJgBnNKYS4T3AhA2JdI+1FEY="
+    "vendorHash": "sha256-47xWjlzpQ/EYzjbuuMKQiu5cfYAXdYkXRl+AOEP+sA4="
   },
   "vultr": {
     "hash": "sha256-1ZzydEpNF06NUC0wYtFcPHpdj4FFPI+qF6pVRNsUxTs=",

From 10f1444463732364957dd9ca6b0e137b79df584d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 25 Apr 2025 02:11:44 -0700
Subject: [PATCH 078/144] libdeltachat: 1.159.1 -> 1.159.3

Diff: https://github.com/chatmail/core/compare/refs/tags/v1.159.1...refs/tags/v1.159.3

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

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index c8e922edf339..f2f86625c423 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.159.1";
+  version = "1.159.3";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${version}";
-    hash = "sha256-ASEGwcmSlUgR69wqc3h53abmKObowuVC6CFP2G+H/0s=";
+    hash = "sha256-ghUPbHwOEND/ab8PELCJn3ADBWBe2v8u5xMrp9wiwjY=";
   };
 
   patches = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "deltachat-core-rust";
     inherit version src;
-    hash = "sha256-gu0Cxaw+Lpu2mGqX0lFTmK1MWHt0icM8BbA1yiKVpzs=";
+    hash = "sha256-S46y3By/81qEOY54JqMJtnb6zXvd+e7PG4THmxPRQcY=";
   };
 
   nativeBuildInputs =

From 26437fd80fcc71ea0193efcae9c55af9c4c9882a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 09:24:35 +0000
Subject: [PATCH 079/144] terraform-providers.bitwarden: 0.13.5 -> 0.13.6

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..54b31ff3ae60 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -180,13 +180,13 @@
     "vendorHash": "sha256-XD7xvp8P9zaDJ5J07+cc+mFZA3F1JQDvK+1Tgqb6k/o="
   },
   "bitwarden": {
-    "hash": "sha256-fUmwIfRiLpbhENPZwc9CWZsIugppfc68qGR1Iy1UyBE=",
+    "hash": "sha256-pEvTdaXuxsfrmJmgYo9mC3OSzU7q0DHEj2esXiumpMk=",
     "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden",
     "owner": "maxlaverse",
     "repo": "terraform-provider-bitwarden",
-    "rev": "v0.13.5",
+    "rev": "v0.13.6",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-oO9+r/CSVSsD+xnJrAhNReWQjUNnHl6qCkoAQfD/VOg="
+    "vendorHash": "sha256-nL0kii/BGihXiNp/69Kk/2J5o4lmYPHx6IqTF/IyWaU="
   },
   "brightbox": {
     "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",

From b81b899d886e173a8e5535b395d85d3be359c046 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 09:24:35 +0000
Subject: [PATCH 080/144] terraform-providers.newrelic: 3.60.2 -> 3.61.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..fc3a226cd2a0 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -858,13 +858,13 @@
     "vendorHash": null
   },
   "newrelic": {
-    "hash": "sha256-ybOBWUxboRw+KTnWcDPPXo/oZVJs4qyWEekYoIB8bsI=",
+    "hash": "sha256-2Bmk1b84oL8DkPShff4RPQSlAu6ufwcb7sp6mJGeo84=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.60.2",
+    "rev": "v3.61.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-WmrqA3wVUStJunm1eiftKekHJaPRvCAua5guqskd6CE="
+    "vendorHash": "sha256-wqraBQqxpD69iIM45MZLWhgIEiyu300bok3OST+Hegs="
   },
   "nexus": {
     "hash": "sha256-6RPga80ZoqEEFL7I2OVXcrwaxbdhSzZDEV07xL07rZs=",

From a72a40f3e98807b4a7e27faa9e2d758d1a75ca68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 09:26:33 +0000
Subject: [PATCH 081/144] terraform-providers.linode: 2.37.0 -> 2.38.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..4652aa32f6e8 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -750,13 +750,13 @@
     "vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
   },
   "linode": {
-    "hash": "sha256-yMLX72T2TG1wyGrn0pmpgPFPNVIVMSkiqAAl3OAvEuA=",
+    "hash": "sha256-4LtP1mgLXT0MEAeszT+lFQ4wiCpUaK5s9ww41uJR+SU=",
     "homepage": "https://registry.terraform.io/providers/linode/linode",
     "owner": "linode",
     "repo": "terraform-provider-linode",
-    "rev": "v2.37.0",
+    "rev": "v2.38.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-hp2gtyC+AXlsbYJlloDnRRvbaF1s/cAc2XIniKdUf08="
+    "vendorHash": "sha256-rQtSLqOsro/PERvykaNwRfW9zWN9o9I9MQP39P6FnoQ="
   },
   "linuxbox": {
     "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",

From 6227a4821f0c55b993ad7e448dab49947904891b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 25 Apr 2025 02:29:01 -0700
Subject: [PATCH 082/144] python313Packages.safety-schemas: 0.0.12 -> 0.0.14

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

diff --git a/pkgs/development/python-modules/safety-schemas/default.nix b/pkgs/development/python-modules/safety-schemas/default.nix
index a1e9e688e98e..a22709ff5a52 100644
--- a/pkgs/development/python-modules/safety-schemas/default.nix
+++ b/pkgs/development/python-modules/safety-schemas/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "safety-schemas";
-  version = "0.0.12";
+  version = "0.0.14";
   pyproject = true;
 
   src = fetchPypi {
     pname = "safety_schemas";
     inherit version;
-    hash = "sha256-i4ejATIA9MDv+ZmCxnj5roYkeKPaKqk07AcCH3/AtcA=";
+    hash = "sha256-SZU/elnpGVcr4lWVqJRvnLvNIGb+PhYMlGfZ0dbXr2o=";
   };
 
   postPatch = ''

From b10f39937e069cfa3e3496a726c387e806af5f1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 09:32:50 +0000
Subject: [PATCH 083/144] terraform-providers.vault: 4.7.0 -> 4.8.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..b133e00bffab 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1391,11 +1391,11 @@
     "vendorHash": "sha256-rHJabyfgu3wU79h3DHHYQauFmcR/SDuikauBF+CybZA="
   },
   "vault": {
-    "hash": "sha256-GlRaV9CYm8IuIzeN/KRJWLCHIhc7Fdb5DL4fTA/dzV0=",
+    "hash": "sha256-6gCpXzvF4p2otwo3dJ8c+EvzbsMZfzVZymb41+hEZoM=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/vault",
     "owner": "hashicorp",
     "repo": "terraform-provider-vault",
-    "rev": "v4.7.0",
+    "rev": "v4.8.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-5e6WQ0lByT3BWcuJvG/LYRVeiiIYQDkV4A74CJhiUBA="
   },

From 0e0168b286b1faaaab66af671e80046d29e7fbbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 09:39:54 +0000
Subject: [PATCH 084/144] dolt: 1.51.4 -> 1.52.2

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

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index 549fa6947a97..2200b22cabda 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "dolt";
-  version = "1.51.4";
+  version = "1.52.2";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     rev = "v${version}";
-    sha256 = "sha256-UlFWGvrm2X54YZDywSiJne/i/6krQ61sJXEyt5cgVAM=";
+    sha256 = "sha256-bEF85lWebcpwz3rYEMqA4h0eMS5AzvuzDTXIrs0izJs=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-n4fS9QbtMIO1QtLoESzAjNrnzNH81xUBHYM9OomGia0=";
+  vendorHash = "sha256-wMnFzeZG2eBTddZt3abT4Q+X2getjcyd7JHmhywtyWs=";
   proxyVendor = true;
   doCheck = false;
 

From 0fc10c616391ebbb05f7a7f4a74f26280d81eb36 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 10:11:41 +0000
Subject: [PATCH 085/144] libretro.stella: 0-unstable-2025-03-29 ->
 0-unstable-2025-04-19

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

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index f5a33a581aea..374a4b30b6ed 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2025-03-29";
+  version = "0-unstable-2025-04-19";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "b753f6eefa4bf02af20eacae98caab7d5aabc4a8";
-    hash = "sha256-uPRNa7Ofaonyp1ErFel12DyKox9ETYGoT1s3aG96VkU=";
+    rev = "7b5c19ff5e28dfeb814e912d028cb34b53c01f10";
+    hash = "sha256-RdRdmvUZB1jGgeuNBGhqztZadag0/8USTjtTAKjaxSo=";
   };
 
   makefile = "Makefile";

From 577bf6a5b93722081f50581bf2c6771db93a3741 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 10:25:53 +0000
Subject: [PATCH 086/144] libretro.ppsspp: 0-unstable-2025-04-15 ->
 0-unstable-2025-04-24

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

diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index dcaf99312532..3aef0140b9f6 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2025-04-15";
+  version = "0-unstable-2025-04-24";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "599edb24f01bbb7ce0e685e3c5585a02781549c7";
-    hash = "sha256-cPalfNXV6U2jLCTqXedQzn9pyWiscaZrrQM32D70uYE=";
+    rev = "a39eb4dc4ba05f5c7d292f7547a1502986b07e9f";
+    hash = "sha256-MlNQMQY+0XDftaEOiiE+uZePYLsCzG4auRfqpw8Qzw4=";
     fetchSubmodules = true;
   };
 

From d2ebe162cea06fbb8b9b2fc26dcfc4efd8bc585a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 10:38:06 +0000
Subject: [PATCH 087/144] libretro.fbneo: 0-unstable-2025-04-15 ->
 0-unstable-2025-04-24

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

diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix
index f366a11eb0c6..9e1231cb02a6 100644
--- a/pkgs/applications/emulators/libretro/cores/fbneo.nix
+++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fbneo";
-  version = "0-unstable-2025-04-15";
+  version = "0-unstable-2025-04-24";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fbneo";
-    rev = "ffdacc6a7ce719b6371ad0a6143ce46726ed5d25";
-    hash = "sha256-Pdp/pPsZujbAK6pEE5LT6KCdJ/RFW1zR67bWvI/efJI=";
+    rev = "8a1e2d68b1065cb1d3686e37b2643f54ab50f527";
+    hash = "sha256-X1GWOHcIUnazno4ZkqlB+ugOtsAgADQqXFFBZy5OV4g=";
   };
 
   makefile = "Makefile";

From 03f0c8d0eb992f53155325e59276ea13e223689f Mon Sep 17 00:00:00 2001
From: Michael Livshin <mlivshin@gmail.com>
Date: Fri, 25 Apr 2025 13:40:12 +0300
Subject: [PATCH 088/144] urbit: fix update script

---
 pkgs/by-name/ur/urbit/update-bin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ur/urbit/update-bin.sh b/pkgs/by-name/ur/urbit/update-bin.sh
index b7ee514e10a7..b7c4af1028e1 100755
--- a/pkgs/by-name/ur/urbit/update-bin.sh
+++ b/pkgs/by-name/ur/urbit/update-bin.sh
@@ -4,7 +4,7 @@
 set -euo pipefail
 
 ROOT="$(dirname "$(readlink -f "$0")")"
-NIX_DRV="$ROOT/default.nix"
+NIX_DRV="$ROOT/package.nix"
 if [ ! -f "$NIX_DRV" ]; then
   echo "ERROR: cannot find urbit in $ROOT"
   exit 1

From 706c93de7bf75d602728a2e437a43d85c85c0e57 Mon Sep 17 00:00:00 2001
From: Michael Livshin <mlivshin@gmail.com>
Date: Fri, 25 Apr 2025 13:40:38 +0300
Subject: [PATCH 089/144] urbit: 3.1 -> 3.2

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

diff --git a/pkgs/by-name/ur/urbit/package.nix b/pkgs/by-name/ur/urbit/package.nix
index e0758ddba61c..7c8aa173af57 100644
--- a/pkgs/by-name/ur/urbit/package.nix
+++ b/pkgs/by-name/ur/urbit/package.nix
@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "urbit";
-  version = "3.1";
+  version = "3.2";
 
   src = fetchzip {
     url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz";
     sha256 =
       {
-        x86_64-linux = "sha256-51Zgv9QANQVMk/dc7/heYmCNfeu4k7mrYNke1/oz/94=";
-        aarch64-linux = "sha256-Tdn/ve9iCjsY/b39TZ7ErHV14mIAHdtmycgUPIzRihQ=";
-        x86_64-darwin = "sha256-y/FQIVcEn6dLWXPztC34+7+5eDMO7Xcx25D2+0p7Mxk=";
-        aarch64-darwin = "sha256-YJGRZlpTdm1x4P+GnZiKC1411tcEX+Jdnm+iyxUlsU0=";
+        x86_64-linux = "sha256-T5d9C2JSmN5y1PSpHLofTKOr32VxLDwjYH9UD0+wAXM=";
+        aarch64-linux = "sha256-wUVqz3VPJ/ZEkS+6MJbbSqqS9vhHPGxTdAty5mIyKgA=";
+        x86_64-darwin = "sha256-uPBTkOCZCpG3mb0D6S710vxaGRAaly5d3UHL1j/+uzo=";
+        aarch64-darwin = "sha256-wfgk3+Z16FThXJdD34vxitXYx/4TdwqboMlXs5IAFDs=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };

From a3f35322632f8cd7203789b837e5f30693ead453 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 10:43:49 +0000
Subject: [PATCH 090/144] python312Packages.x-transformers: 2.2.11 -> 2.3.1

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

diff --git a/pkgs/development/python-modules/x-transformers/default.nix b/pkgs/development/python-modules/x-transformers/default.nix
index 3afb4b68c2f3..3c7d2f9da95e 100644
--- a/pkgs/development/python-modules/x-transformers/default.nix
+++ b/pkgs/development/python-modules/x-transformers/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "x-transformers";
-  version = "2.2.11";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lucidrains";
     repo = "x-transformers";
     tag = version;
-    hash = "sha256-8+uSxB91vaPMDYPUByqWfCy2G4l9KEdQhp2SxQXY6Tk=";
+    hash = "sha256-c2bY0syB7p7FEtY5pHB8XiAjSnuFiKu9B2jMZ1S2Sso=";
   };
 
   build-system = [ hatchling ];

From 514ee9e40f4dcfa373dc94178a913fcbea7a1f6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 10:47:09 +0000
Subject: [PATCH 091/144] libretro.flycast: 0-unstable-2025-04-15 ->
 0-unstable-2025-04-24

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

diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix
index 24cd24aa79f4..5ae73f45af73 100644
--- a/pkgs/applications/emulators/libretro/cores/flycast.nix
+++ b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2025-04-15";
+  version = "0-unstable-2025-04-24";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "25a882341d5ebbf8124ddd2a7421592678dfac2e";
-    hash = "sha256-N/7JZbEzYaOAoUShkmQd1G61ke1U3OSeFMXS0lqftYU=";
+    rev = "b04f0eb530c09f4b2a7402bd7f3b82e5daa4d173";
+    hash = "sha256-JCQEMfQDvnhUcSNiaVwDXAQmkFhgtwtW5XjAD/CBYjo=";
     fetchSubmodules = true;
   };
 

From 55adf818f1bbeadfcf90473a04c6e2a88ed754f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 11:08:40 +0000
Subject: [PATCH 092/144] libretro.dosbox-pure: 0-unstable-2025-04-10 ->
 0-unstable-2025-04-24

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

diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
index dd0e95243d5f..3bbd3e4765e9 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2025-04-10";
+  version = "0-unstable-2025-04-24";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "51ca5126ee67e88827c87c761a097a6318ad25e7";
-    hash = "sha256-OBC8y53ljmgmfow7qBWIJYgjAiyv2bVa3CqQFkaJRhQ=";
+    rev = "d3b7313d232156a1f60ce31749fe68e498ad3bf4";
+    hash = "sha256-rU2HA0ap8O02qJHHksKigjAeRgnkV6F6z5JIusWlDZM=";
   };
 
   hardeningDisable = [ "format" ];

From a255e5eaaa1e2ca3097d43b1d7776161ac2d7923 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 11:09:35 +0000
Subject: [PATCH 093/144] moonraker: 0.9.3-unstable-2025-04-03 ->
 0.9.3-unstable-2025-04-22

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

diff --git a/pkgs/by-name/mo/moonraker/package.nix b/pkgs/by-name/mo/moonraker/package.nix
index 91d874092568..930a5e0d490a 100644
--- a/pkgs/by-name/mo/moonraker/package.nix
+++ b/pkgs/by-name/mo/moonraker/package.nix
@@ -35,13 +35,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "moonraker";
-  version = "0.9.3-unstable-2025-04-03";
+  version = "0.9.3-unstable-2025-04-22";
 
   src = fetchFromGitHub {
     owner = "Arksine";
     repo = "moonraker";
-    rev = "7cdcca3cb4b7caf27d511d1c4e32fa3297391709";
-    sha256 = "sha256-fjmbmv+0y/NsgvrscaA2gv9Tv8esWiMpbA35LuzFfFg=";
+    rev = "1c124149720e24f52b80ce82ce906e69476b7724";
+    sha256 = "sha256-+Yk0TBU8dIa9mf0s+F+mTop8jLxdVDDCP8ST8pRgCiY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7ac0b25358e89278ee692e4bb110641c4d320e27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 11:34:05 +0000
Subject: [PATCH 094/144] terraform-providers.oci: 6.34.0 -> 6.35.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..405ecbf3a54f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -913,11 +913,11 @@
     "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
   },
   "oci": {
-    "hash": "sha256-S3OsFoSPYOcD+mjOy1gBAVGpqd61G5S2Zl2GGknKA5o=",
+    "hash": "sha256-4e73gmiMF95V3E63kUofImW+E6lvQcpMvBTuViAARjM=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v6.34.0",
+    "rev": "v6.35.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From e2f09e21c9f300e161031eaf2f5c6c9d1fd6410b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 25 Apr 2025 13:37:59 +0200
Subject: [PATCH 095/144] golangci-lint: 2.1.2 -> 2.1.5

Diff: https://github.com/golangci/golangci-lint/compare/v2.1.2...v2.1.5

Changelog: https://github.com/golangci/golangci-lint/blob/v2.1.5/CHANGELOG.md
---
 pkgs/by-name/go/golangci-lint/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index 039deb97ab33..232cf3f9be0a 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -7,16 +7,16 @@
 
 buildGo124Module rec {
   pname = "golangci-lint";
-  version = "2.1.2";
+  version = "2.1.5";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    hash = "sha256-CAO+oo3l3mlZIiC1Srhc0EfZffQOHvVkamPHzSKRSFw=";
+    hash = "sha256-wCBGtKlaKW6Btim9xe0K8IzdNVcBDEidhr6LCwLUx98=";
   };
 
-  vendorHash = "sha256-2GQp/sgYRlDengx8uy3zzqi9hwHh4CQUHoj1zaxNNLE=";
+  vendorHash = "sha256-Dd4GTjkq1LTH7G1Qj8y+q0LW/8cQECN8o+3xHFtmpwI=";
 
   subPackages = [ "cmd/golangci-lint" ];
 

From 0f5498d97e261fd0c733102440408a89e212ac1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 25 Apr 2025 02:29:13 -0700
Subject: [PATCH 096/144] python313Packages.safety: 3.3.1 -> 3.4.0

Diff: https://github.com/pyupio/safety/compare/refs/tags/3.3.1...refs/tags/3.4.0

Changelog: https://github.com/pyupio/safety/blob/3.4.0/CHANGELOG.md
---
 .../python-modules/safety/default.nix         | 30 +++++-----
 .../safety/disable-telemetry.patch            | 57 +++++++++++++++++++
 2 files changed, 70 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/safety/disable-telemetry.patch

diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix
index 69de04c60202..75c0b68856c4 100644
--- a/pkgs/development/python-modules/safety/default.nix
+++ b/pkgs/development/python-modules/safety/default.nix
@@ -20,34 +20,30 @@
   typing-extensions,
   filelock,
   psutil,
+  httpx,
+  tenacity,
+  tomlkit,
   git,
   pytestCheckHook,
   tomli,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "safety";
-  version = "3.3.1";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyupio";
     repo = "safety";
     tag = version;
-    hash = "sha256-u+ysRpWLHDQdNRBSlYXz80e/MCT4smmv/YX8sfIrn24=";
+    hash = "sha256-CyEBgB3YgTQDzqJloL0XaRF0h6soNOWmtWTjP423MmY=";
   };
 
-  postPatch = ''
-    substituteInPlace safety/safety.py \
-      --replace-fail "telemetry: bool = True" "telemetry: bool = False"
-    substituteInPlace safety/util.py \
-      --replace-fail "telemetry: bool = True" "telemetry: bool = False"
-    substituteInPlace safety/cli.py \
-      --replace-fail "disable-optional-telemetry', default=False" \
-                     "disable-optional-telemetry', default=True"
-    substituteInPlace safety/scan/finder/handlers.py \
-      --replace-fail "telemetry=True" "telemetry=False"
-  '';
+  patches = [
+    ./disable-telemetry.patch
+  ];
 
   build-system = [ hatchling ];
 
@@ -74,12 +70,16 @@ buildPythonPackage rec {
     typing-extensions
     filelock
     psutil
+    httpx
+    tenacity
+    tomlkit
   ];
 
   nativeCheckInputs = [
     git
     pytestCheckHook
     tomli
+    writableTmpDirAsHomeHook
   ];
 
   disabledTests = [
@@ -95,10 +95,6 @@ buildPythonPackage rec {
   # ImportError: cannot import name 'get_command_for' from partially initialized module 'safety.cli_util' (most likely due to a circular import)
   disabledTestPaths = [ "tests/alerts/test_utils.py" ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   meta = {
     description = "Checks installed dependencies for known vulnerabilities";
     mainProgram = "safety";
diff --git a/pkgs/development/python-modules/safety/disable-telemetry.patch b/pkgs/development/python-modules/safety/disable-telemetry.patch
new file mode 100644
index 000000000000..986962b20071
--- /dev/null
+++ b/pkgs/development/python-modules/safety/disable-telemetry.patch
@@ -0,0 +1,57 @@
+diff --git a/safety/cli.py b/safety/cli.py
+index 4d1f0c5..db4d930 100644
+--- a/safety/cli.py
++++ b/safety/cli.py
+@@ -228,7 +228,7 @@ def configure_logger(ctx, param, debug):
+ @proxy_options
+ @click.option(
+     "--disable-optional-telemetry",
+-    default=False,
++    default=True,
+     is_flag=True,
+     show_default=True,
+     help=CLI_DISABLE_OPTIONAL_TELEMETRY_DATA_HELP,
+diff --git a/safety/safety.py b/safety/safety.py
+index e41f5ae..7d29a50 100644
+--- a/safety/safety.py
++++ b/safety/safety.py
+@@ -143,7 +143,7 @@ def fetch_database_url(
+     mirror: str,
+     db_name: str,
+     cached: int,
+-    telemetry: bool = True,
++    telemetry: bool = False,
+     ecosystem: Ecosystem = Ecosystem.PYTHON,
+     from_cache: bool = True
+ ) -> Dict[str, Any]:
+diff --git a/safety/scan/finder/handlers.py b/safety/scan/finder/handlers.py
+index 80a3db6..61a10cc 100644
+--- a/safety/scan/finder/handlers.py
++++ b/safety/scan/finder/handlers.py
+@@ -91,11 +91,11 @@ class PythonFileHandler(FileHandler):
+ 
+         # Fetch both the full and partial Safety databases
+         fetch_database(session=session, full=False, db=db, cached=True,
+-                       telemetry=True, ecosystem=Ecosystem.PYTHON,
++                       telemetry=False, ecosystem=Ecosystem.PYTHON,
+                        from_cache=False)
+ 
+         fetch_database(session=session, full=True, db=db, cached=True,
+-                                telemetry=True, ecosystem=Ecosystem.PYTHON,
++                                telemetry=False, ecosystem=Ecosystem.PYTHON,
+                                 from_cache=False)
+ 
+ 
+diff --git a/safety/util.py b/safety/util.py
+index 2a02236..5feef8d 100644
+--- a/safety/util.py
++++ b/safety/util.py
+@@ -351,7 +351,7 @@ def filter_announcements(
+ 
+ 
+ def build_telemetry_data(
+-    telemetry: bool = True,
++    telemetry: bool = False,
+     command: Optional[str] = None,
+     subcommand: Optional[str] = None,
+ ) -> TelemetryModel:

From a7267f91f6faac61611b20b5028218d970edbb1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 12:11:58 +0000
Subject: [PATCH 097/144] kube-review: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/by-name/ku/kube-review/package.nix b/pkgs/by-name/ku/kube-review/package.nix
index d79fe86c261f..ac50c2f26999 100644
--- a/pkgs/by-name/ku/kube-review/package.nix
+++ b/pkgs/by-name/ku/kube-review/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "kube-review";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "anderseknert";
     repo = "kube-review";
     tag = "v${version}";
-    hash = "sha256-0wDapaV1e6QNZWeHG86t12iu1yW1LW6mnpdWIrwvBFk=";
+    hash = "sha256-W+JF8MR+x6vova6hRw0omXXhT40qXmdZciAdt2bi6jM=";
   };
 
-  vendorHash = "sha256-lzhjIX+67S+68erlJNHVXMKgRFUUyG+ymZEKVKRRpRc=";
+  vendorHash = "sha256-xHiHeSoiT/5h8pHTBTq1g/zJtnCbcUs+qMJ4vHjWzog=";
   ldflags = [
     "-X github.com/anderseknert/kube-review/cmd.version=v${version}"
   ];

From 14790f7d0daae6b26c63df12435993f6ae8b9878 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 13:07:07 +0000
Subject: [PATCH 098/144] prometheus-sql-exporter: 0.5.9 -> 0.6

---
 pkgs/servers/monitoring/prometheus/sql-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
index 83423fef422c..1673def44846 100644
--- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "sql_exporter";
-  version = "0.5.9";
+  version = "0.6";
 
   src = fetchFromGitHub {
     owner = "justwatchcom";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-KygxnNbElzRtVwjKmlbgdCxO3oEYssfFl5UAk5+F50c=";
+    sha256 = "sha256-XFI4vuTiy6cbqsb8XitD7fX68QdvQ7X8BUznr9H0OPg=";
   };
 
   vendorHash = null;

From 09b94a8a635817517d16ff5726e9daa0148a06b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 13:11:39 +0000
Subject: [PATCH 099/144] terraform-providers.azurerm: 4.26.0 -> 4.27.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6258ebdbf37c..d9c76314d4be 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -135,11 +135,11 @@
     "vendorHash": null
   },
   "azurerm": {
-    "hash": "sha256-pbXkGKym7amioTZlguwBpoFvfvYnCGOxZ7PIT8I3dxY=",
+    "hash": "sha256-r2ttKyaV/cjIXYECwYmKuTe2Z1HYgiJFfMzd58Se99g=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.26.0",
+    "rev": "v4.27.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 3d94ec323e891bfba958739348d5366a70a732db Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Wed, 23 Apr 2025 21:02:19 -0400
Subject: [PATCH 100/144] unshieldv3: init at 0.2.2

---
 pkgs/by-name/un/unshieldv3/package.nix | 41 ++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/un/unshieldv3/package.nix

diff --git a/pkgs/by-name/un/unshieldv3/package.nix b/pkgs/by-name/un/unshieldv3/package.nix
new file mode 100644
index 000000000000..d16290f29a20
--- /dev/null
+++ b/pkgs/by-name/un/unshieldv3/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "unshieldv3";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "wfr";
+    repo = "unshieldv3";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-ScUlKuvkq4UglEVJL8NreAGDZFLVrEpEBQCZvu7XOrg=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  doCheck = true;
+  postCheck = ''
+    for i in $src/test-data/*.Z; do
+      mkdir -p test
+      ./unshieldv3 extract $i test
+    done
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool to extract .Z files from InstallShield V3 (Z) installers";
+    homepage = "https://github.com/wfr/unshieldv3";
+    changelog = "https://github.com/wfr/unshieldv3/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    mainProgram = "unshieldv3";
+    maintainers = [ lib.maintainers.jchw ];
+  };
+})

From 0ed30b0f6ea6069f331ec6b1dc21ce8c89d756b0 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Fri, 25 Apr 2025 16:43:48 +0200
Subject: [PATCH 101/144] mesa: expose built platforms as passthru

This is useful when overriding mesa to remove or add specific platforms to the existing set
---
 pkgs/development/libraries/mesa/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 255cda5a7423..f691f2d3bf8c 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -396,6 +396,12 @@ stdenv.mkDerivation {
   passthru = {
     inherit (libglvnd) driverLink;
     inherit llvmPackages;
+    inherit
+      eglPlatforms
+      galliumDrivers
+      vulkanDrivers
+      vulkanLayers
+      ;
 
     # for compatibility
     drivers = lib.warn "`mesa.drivers` is deprecated, use `mesa` instead" mesa;

From c56c5bc33e4228355c046186578dd06ad877393b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 14:24:51 +0000
Subject: [PATCH 102/144] beam26Packages.erlfmt: 1.6.1 -> 1.6.2

---
 pkgs/development/beam-modules/erlfmt/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/beam-modules/erlfmt/default.nix b/pkgs/development/beam-modules/erlfmt/default.nix
index 405aec021fc3..6483fdecddd6 100644
--- a/pkgs/development/beam-modules/erlfmt/default.nix
+++ b/pkgs/development/beam-modules/erlfmt/default.nix
@@ -1,19 +1,21 @@
 {
   fetchFromGitHub,
-  rebar3Relx,
   lib,
+  rebar3Relx,
 }:
 
 rebar3Relx rec {
   pname = "erlfmt";
-  version = "1.6.1";
+  version = "1.6.2";
   releaseType = "escript";
+
   src = fetchFromGitHub {
     owner = "WhatsApp";
     repo = "erlfmt";
-    sha256 = "sha256-O7+7dMgmnNd9hHuRcJqMAI0gmONz5EO3qSlUC3tufh0=";
-    rev = "v${version}";
+    hash = "sha256-tBgDCMPYXaAHODQ2KOH1kXmd4O31Os65ZinoU3Bmgdw=";
+    tag = "v${version}";
   };
+
   meta = with lib; {
     homepage = "https://github.com/WhatsApp/erlfmt";
     description = "Automated code formatter for Erlang";

From f42be71105e14f4fa55dbb922b59ebc2b8d39846 Mon Sep 17 00:00:00 2001
From: Arsenii Zorin <me@wrb.bz>
Date: Fri, 25 Apr 2025 18:10:05 +0300
Subject: [PATCH 103/144] pulumi-bin: 3.163.0 -> 3.165.0

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

diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
index a9d0eca38f03..8c1e62c5b927 100644
--- a/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,12 +1,12 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.163.0";
+  version = "3.165.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.163.0-linux-x64.tar.gz";
-        sha256 = "0lm93x7087khhh0n2clfna2vj3apq3yfld4s69rqbwp0hlx3qns3";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.165.0-linux-x64.tar.gz";
+        sha256 = "1dwcqw8l7jq66crs11rykj5w4pf209b1n5apgva6cfp9lshsv2pa";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-linux-amd64.tar.gz";
@@ -29,24 +29,24 @@
         sha256 = "0nd1nml0353g43jh2fxdf9kv0725vhgdpd0zcivjb0h6p7mxf4xj";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.77.0-linux-amd64.tar.gz";
-        sha256 = "14vlabr3q6q0l9bnhclg9b680qmgfdgnqh8shzmxklkvki74a72w";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.78.0-linux-amd64.tar.gz";
+        sha256 = "02bssmg2nxl3ai6inhb169dawmfzwas9pavcq959d8ms10616pfk";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.4.0-linux-amd64.tar.gz";
         sha256 = "0fbkbylll84disnz6lybba5c8br4k2v8i18xf6yqbgjw0rylff5r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.8.0-linux-amd64.tar.gz";
-        sha256 = "1jj8y9nwjwagaakxwpgviffk2d8mkcygf8dc3vmzz0ryy83jcd9w";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-linux-amd64.tar.gz";
+        sha256 = "0arg0vvwman2gx4fy9y320y055piyyyl62yjbxj3scw31wzysp5w";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.22.0-linux-amd64.tar.gz";
         sha256 = "08wgs1mr85jk11zj2g1pxr83jzfnsbk085n6bjik9zynbxildhpa";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.0.1-linux-amd64.tar.gz";
-        sha256 = "0jibbcffflz13dp3mfkrqipdfs4k27sk8bq4vfwfibmc2pmrcpsn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.1-linux-amd64.tar.gz";
+        sha256 = "0zvjag0khbls1a28l101qpxphbq7q2wj315iwbxrg7l13q93b5ja";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.4-linux-amd64.tar.gz";
@@ -89,16 +89,16 @@
         sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.22.0-linux-amd64.tar.gz";
-        sha256 = "0riqjjr2hrki0i9swf0k7njmpqrbwp5c7lpw8dif4g5ni6alwz8y";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.22.1-linux-amd64.tar.gz";
+        sha256 = "1wjqb8sbrdjqkb62pg4gcswblfdw26h28cbnlr7ibndm2ph52ijw";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.22.2-linux-amd64.tar.gz";
         sha256 = "05b6kc8c19jfgsddiak8d3xl5yf5hl9knvgqq3fa0av8c666nqsg";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.37.0-linux-amd64.tar.gz";
-        sha256 = "1kr1dkz51af55hfh126yzmxfw4zp58y3786zcyfadzm6myk2xqr8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.38.0-linux-amd64.tar.gz";
+        sha256 = "0q3rs7qvjs0grhb29a2ajgbdwzhflcjfg2wdball0vfwxhnv0flp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.9-linux-amd64.tar.gz";
@@ -117,16 +117,16 @@
         sha256 = "07s4xmsqjja79pzdh3vj3fq6q3yhnds7xp08x9yzc964c9kzndzs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.0-linux-amd64.tar.gz";
-        sha256 = "16scgz83rih511isyq7ycnm4gm94zvf6hgd86kic5s1q20lf86k9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.1-linux-amd64.tar.gz";
+        sha256 = "1j40r5kg1x600l2j4sa9r2ackb6xm8wp2lx32l8a902qq0vvnkzv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.2.0-linux-amd64.tar.gz";
-        sha256 = "08nhrfas1gqqlm9ysnv1znxps28npqp9cri1kvniw7s5cd5ncbj2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.3.0-linux-amd64.tar.gz";
+        sha256 = "1z9d3ng3aqz1gpd3l0akva7lfyq8l94xd4z4jg3r29w3m274xbz4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.1-linux-amd64.tar.gz";
-        sha256 = "1fki3f0idr516b47m381v2d55ym1bmh14axghfdgi04zb0qx72pv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.2-linux-amd64.tar.gz";
+        sha256 = "1idjcfl4n9i7idqp384i46yskdhs18vcdnm53vk0lx6a87409mma";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.7-linux-amd64.tar.gz";
@@ -137,16 +137,16 @@
         sha256 = "029m67yz8vmn09s5ll4xrr44nxqq38zw1hyhn7vhf813msgvs20a";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.1.1-linux-amd64.tar.gz";
-        sha256 = "0niix4i2lgihzldxy0f2pvdag92qk6cvshz3xvynjgdc7n8irhfm";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.0-linux-amd64.tar.gz";
+        sha256 = "04lwij6x37ly0lxvcv7nd5r9l54y6s5ajiyz6nkj4y8x8qdifsrx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.6.0-linux-amd64.tar.gz";
-        sha256 = "0z64m3fw592cclxa70jv6zhqw26sfi4mngff4bh3jk0m4chahb6a";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.7.0-linux-amd64.tar.gz";
+        sha256 = "0scixzq1f1blb1jmw9pz4sqqqqn2px3yihpsxgvm81vpz8p15cbd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.7-linux-amd64.tar.gz";
-        sha256 = "0gw11jdkm9c3ff9b6rg9k8h01zghb82gfz46mgq4wyrwc36h71h3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.0-linux-amd64.tar.gz";
+        sha256 = "0ypayx9gabrp4x08q9paqjysql5m9zhazkb2nsdzp5jkj2r3q9dx";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.2-linux-amd64.tar.gz";
@@ -163,8 +163,8 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.163.0-darwin-x64.tar.gz";
-        sha256 = "1ar64rlg1g7aq2yjgf8jr098brbr3s7azm2v20r0k2wxkz7h0pgj";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.165.0-darwin-x64.tar.gz";
+        sha256 = "1qj6z9j74z2bajql6gmxxldwcijpsx6fkzv7lb0dkfvbb9hlcn2h";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-darwin-amd64.tar.gz";
@@ -187,24 +187,24 @@
         sha256 = "0g7r104ink5yp6q1qx1856gldn5zxgn2vmx3xz0d4vs07hcv7n4p";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.77.0-darwin-amd64.tar.gz";
-        sha256 = "163lfz2p6vrcf1nhrlm72wsgfdvmm3mdprw0k6j5jgyawx8vhy0v";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.78.0-darwin-amd64.tar.gz";
+        sha256 = "0l0bfb54bmbc098vbd5fs6min63zxs9ynm24aa43703ncgg1b9an";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.4.0-darwin-amd64.tar.gz";
         sha256 = "0rj8xad7nw1vp20dpxaz0r4bg2fn44qci9pw2mh5cqi4v54v7v51";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.8.0-darwin-amd64.tar.gz";
-        sha256 = "13kkzl5b8n0i784hmpj83g4wmp5hd6jj2wqash2ly7ymdg4dr8bz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-darwin-amd64.tar.gz";
+        sha256 = "1y8k69ynnjkqr7vwcnv6vgirnlgixplnzzq87ywb592lh7vp9b94";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.22.0-darwin-amd64.tar.gz";
         sha256 = "13vpgslpamsgy0m99za5jg8zzcm7c2wgyw1ywxmb1wcmpwgbfamf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.0.1-darwin-amd64.tar.gz";
-        sha256 = "0iay5asm6hbmvryiw80gm7clbd6didhzbi0clf31p6dmx04xhw0i";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.1-darwin-amd64.tar.gz";
+        sha256 = "1wmg5k1k9k3pc7848s5nzhyxv9q3ivpggm54xvi3fygxvi5f7nv2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.4-darwin-amd64.tar.gz";
@@ -247,16 +247,16 @@
         sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.22.0-darwin-amd64.tar.gz";
-        sha256 = "1k40h7gihhb4fg2bhnd7qp58kpr5lrkasfw07xcwqvq90y0nxy9i";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.22.1-darwin-amd64.tar.gz";
+        sha256 = "1phv5jmcr31dj62qh1frv03dmihpymlgyjar21n7xjfrlxm2pygy";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.22.2-darwin-amd64.tar.gz";
         sha256 = "02frf0kvhj1q1hs0fxi2zm83sam1wlzasfhgd4f89vh50yf82ii6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.37.0-darwin-amd64.tar.gz";
-        sha256 = "0l7xlxc4mx4772sy6wf4fb2iihc92gd6ifvm1fipyq5f45bjpmvi";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.38.0-darwin-amd64.tar.gz";
+        sha256 = "03rly4qwkbv82vl251dnzvz4n9clbdn516yflx0j8ybph7z2kv29";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.9-darwin-amd64.tar.gz";
@@ -275,16 +275,16 @@
         sha256 = "17m6qcpkhavgprqbskad5ky3zs9230bpiadmz3y552z4yci4pmdk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.0-darwin-amd64.tar.gz";
-        sha256 = "0gkazxwkmb5317amaqb3h34ras7b2vxblaybz2llp47w4qnvq834";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.1-darwin-amd64.tar.gz";
+        sha256 = "0h8pmyfpvd5f8z7msnxhl5rrling0by0bciz09fi85axhas1b78b";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.2.0-darwin-amd64.tar.gz";
-        sha256 = "07iilz3q4wvpc2nzgg1mrsbfiby3ji6634n08kiazsq3cg619dzd";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.3.0-darwin-amd64.tar.gz";
+        sha256 = "11pj11zbdcsacxlkasc6n2wwz7qniirhy8kg53ir5s1crwpddf6p";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.1-darwin-amd64.tar.gz";
-        sha256 = "1i73p896axp7ir60zvcpm90nljv2wy46a5nchha44xa474vaani2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.2-darwin-amd64.tar.gz";
+        sha256 = "13cp596lav13ng9ivq93ij0ks90m5ia0x2sbff6qs00z9iwy0jbd";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.7-darwin-amd64.tar.gz";
@@ -295,16 +295,16 @@
         sha256 = "1z65rrlbl0qywrdmjpl995bqzkl2qmmxaxvjmyd5cq5d9zbhw0lk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.1.1-darwin-amd64.tar.gz";
-        sha256 = "0pfl6qqa7a1bq7m44sf9r6qfjf7hm9pngfwlcyargx6jq8mgv92c";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.0-darwin-amd64.tar.gz";
+        sha256 = "0mvnhpqv8v80lc79h7pdd5a8r60nhfg0znz7h1pj3rii2zx4c8fs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.6.0-darwin-amd64.tar.gz";
-        sha256 = "1cjx4nah8yharhhd5j46iglcafghmghq0n0wbkhclqqfac0hf2p6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.7.0-darwin-amd64.tar.gz";
+        sha256 = "14dzkpan4c52daj5vi1vz19bf28mkqrww3r6zc79y84ybpg4qrnx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.7-darwin-amd64.tar.gz";
-        sha256 = "02hlnpczzbs87c0abc5grl16a34y0ss0iivn1w1z2z44r4mhn4v6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.0-darwin-amd64.tar.gz";
+        sha256 = "1d86ljhylxswbhjzsd0678r0fsi4nzimviwdl0mafny2661801bg";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.2-darwin-amd64.tar.gz";
@@ -321,8 +321,8 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.163.0-linux-arm64.tar.gz";
-        sha256 = "0xac6q4p76pbvki4fcjngk7kcy69k08a0p25f1s5pqzs30lbl9iq";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.165.0-linux-arm64.tar.gz";
+        sha256 = "10awr96w493904xppcy783wj7zdqsh8267v2bsw78zhw7v442g8g";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-linux-arm64.tar.gz";
@@ -345,24 +345,24 @@
         sha256 = "1xhkqcis2innc8hrv2x9a2dapchjakjs8gzs8ipwab9lr89v2gwr";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.77.0-linux-arm64.tar.gz";
-        sha256 = "0r0hyc1rh89wayh58pcadlc6w7ihix99jn8d5h5n6ar1j3dk59n4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.78.0-linux-arm64.tar.gz";
+        sha256 = "0q7msk3x83sm953bpqpygncc4bpm96jflrlyz2pwzr1ygj14r111";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.4.0-linux-arm64.tar.gz";
         sha256 = "0lpg2ipkg3rbg3cwmhr3z47kx1158bfiv59ryyxganbdj2rz0frm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.8.0-linux-arm64.tar.gz";
-        sha256 = "1wb31n5hm43y8kfzdf4v0idiyzj9bbbr7v48fcyxhljxzbmhy5ny";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-linux-arm64.tar.gz";
+        sha256 = "0wwv7zs4pmnwdy3hzijhihi96jdjv4wdm4ky1wj8krwpbhw7kjl3";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.22.0-linux-arm64.tar.gz";
         sha256 = "0k45j0xrx7ijch3ppk182ij9f5zpk01nvljqwawyvs7ry86nw80z";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.0.1-linux-arm64.tar.gz";
-        sha256 = "02basnnzdymwi4k3qcycaq691hj78ypa70j7hkysy716ck3pl503";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.1-linux-arm64.tar.gz";
+        sha256 = "1587jypxhm8vdnijna7rfhvh61bqv5s858hfis12q8l7m2kznmnh";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.4-linux-arm64.tar.gz";
@@ -405,16 +405,16 @@
         sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.22.0-linux-arm64.tar.gz";
-        sha256 = "1m87drk1jdf9lnavfb6yq2mgai87p212yqx2rxn2dqgc88gn023d";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.22.1-linux-arm64.tar.gz";
+        sha256 = "1wqnf3qpwg4cmnn7kpqchzly4hm0zylq787nydmcpflsia35bvpd";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.22.2-linux-arm64.tar.gz";
         sha256 = "1wj80wf8z3491yhv7f5pca9chjyb53a0m118klhr4djdyp4ad7jr";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.37.0-linux-arm64.tar.gz";
-        sha256 = "0j46416kp5yra7gl4369m5bcqnqwr4qzgll0sp6qfbl9413mrndb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.38.0-linux-arm64.tar.gz";
+        sha256 = "05p6p134pl0dn9q322mksqvxk7md27jdigyp7sda9np6r52vghar";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.9-linux-arm64.tar.gz";
@@ -433,16 +433,16 @@
         sha256 = "0xhlgdh05i5la27d4440n87kfv4rv9aragqrijw3wyw0fd0zy50s";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.0-linux-arm64.tar.gz";
-        sha256 = "14y4jwzlxq0icjw7b3drfgv0kg2a9xl691r59388k9d193yh31n3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.1-linux-arm64.tar.gz";
+        sha256 = "1kr8df68hg23was5rsr07q7r6fs4dd5ndailj9vmysddvhwg2ypv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.2.0-linux-arm64.tar.gz";
-        sha256 = "0ii4c267fm8da2f2rqr00ps4v0l4dnc3cjww7z7529l2wm2x9j98";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.3.0-linux-arm64.tar.gz";
+        sha256 = "0kpvd7vvi8h28mlz4lr8p5p4ccpc4k7wmh669g969dxi53n54vmw";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.1-linux-arm64.tar.gz";
-        sha256 = "1s1fhasjjfp2vs211rla9qvn5w8n2y5banh7wr37r9x97smyglwg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.2-linux-arm64.tar.gz";
+        sha256 = "12p4rbb0mry725c8czfgq5xwg17c4vnwl7gins4p5l8mnaymld1v";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.7-linux-arm64.tar.gz";
@@ -453,16 +453,16 @@
         sha256 = "0cmb2m9j0l6xq6py0pkwai26yq96xsvk2j8jaz68jyk5z0692k44";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.1.1-linux-arm64.tar.gz";
-        sha256 = "1rm0ra4jjvksfjbcicm4ivwmrawzbi59ksdjy5g11vin8a369h26";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.0-linux-arm64.tar.gz";
+        sha256 = "1vnsiq70y0nc4dq49kymwqn4pjhd987417qdnciwd8q91aqkgyy9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.6.0-linux-arm64.tar.gz";
-        sha256 = "1fw9m6r7yqmkjp94zyvr56qxsavnadargknav74srrngnzi8q2pg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.7.0-linux-arm64.tar.gz";
+        sha256 = "18vwgvw3rq9lk6ad3ck18jf1lm272aid94hqwnib1lg1hy0ic74l";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.7-linux-arm64.tar.gz";
-        sha256 = "0mmr8mg5zd201bcvckybcbkgcr07y6mckwzzwcn72ks8rgygl4xb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.0-linux-arm64.tar.gz";
+        sha256 = "0x83njg9h1gy0vld2m6kacx3hzx9bwq7c80fx8vnaaqvra0803qp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.2-linux-arm64.tar.gz";
@@ -479,8 +479,8 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.163.0-darwin-arm64.tar.gz";
-        sha256 = "0b71pddjvhfcp62w0n6wbp3c6fmhvsi3ys5chzq0im92bgv2rx4j";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.165.0-darwin-arm64.tar.gz";
+        sha256 = "0z1hxpnxwkcl6slsk56dz22jwjvf7my21db0i35yzs2nq3mkf3x0";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-darwin-arm64.tar.gz";
@@ -503,24 +503,24 @@
         sha256 = "1j8hggv57gw3dcwqzr0l5cyk33c35f1zjma1hd6mxpq5hx2zzi05";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.77.0-darwin-arm64.tar.gz";
-        sha256 = "0b168h8abfxy1b2knb5vyiivm7dx2kqkbq2ankzzc0ww88ilnfny";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.78.0-darwin-arm64.tar.gz";
+        sha256 = "12jiym7yalpbr3d16lm9pigljgccyq4ld8c4ncr5wy0xsj2kv3d7";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.4.0-darwin-arm64.tar.gz";
         sha256 = "10k8rclckw6qhsksbsj8rnxr9dxgf4p9gvcqzcnpq6mv7687n7xi";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.8.0-darwin-arm64.tar.gz";
-        sha256 = "14g97yydvh9cssq5h08f6b1ks9nlq2p6jbb20yyphjdy1sxsr8ng";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-darwin-arm64.tar.gz";
+        sha256 = "0ivjp7sq86gyy38vmy3cmbl1b3zwzij5dxwh6ffp5jf6bazm76wr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.22.0-darwin-arm64.tar.gz";
         sha256 = "1vfhpisa1fyvsmh0crqr859ppmgs09yncsbchs1rlw6hb68sknqh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.0.1-darwin-arm64.tar.gz";
-        sha256 = "1kha3l0ysddk9v0m7gkblgf2qlxf0mdqk9v2x791xg7fsw6p8k9w";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.1-darwin-arm64.tar.gz";
+        sha256 = "11z4wkfn4vd3pcjgaxjf1wifss4dkvy3f0cb9fm5kkndyc4vx4wa";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.4-darwin-arm64.tar.gz";
@@ -563,16 +563,16 @@
         sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.22.0-darwin-arm64.tar.gz";
-        sha256 = "1w4h5k72kn91xgcpbv5x4d0jmhzn6siwzbashhsvxyghnvq9c86v";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.22.1-darwin-arm64.tar.gz";
+        sha256 = "0r4m89jyfamqhxczkr960h6b4cs1f14bwswhjsnpis3iynlylscp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.22.2-darwin-arm64.tar.gz";
         sha256 = "1dmv4rfiljhd02sm2qfd70z6i14wacmzhjxc23h3j62vj697aj3j";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.37.0-darwin-arm64.tar.gz";
-        sha256 = "08yl9mq6p2j404iafr573a590pw8yr9ij5hsn2aslbagfdfmyizg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.38.0-darwin-arm64.tar.gz";
+        sha256 = "0lzp3ddbdm6jicw4w2lhjwz34rl29qrzwdl8s41arqf02hdq3shc";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.9-darwin-arm64.tar.gz";
@@ -591,16 +591,16 @@
         sha256 = "0my26549lzvc4j7c3xmp6z82qj126x8sx9cj1rz8a7alawn1v5b0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.0-darwin-arm64.tar.gz";
-        sha256 = "1aqlwj0v0x2ipjvalzry8g4g5y28pm52q8mriirmimml0vavlib8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.1-darwin-arm64.tar.gz";
+        sha256 = "169ibni1kh0npn08zyazg1324qc79vpmy29pkblbhxm46ldzip60";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.2.0-darwin-arm64.tar.gz";
-        sha256 = "0gr69xk6cy5zl4hgq50gdqaccksnb3hg2glxfv3bvvvmzin7y6py";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.3.0-darwin-arm64.tar.gz";
+        sha256 = "0ccsgh89z0zbxxns4zc24l71ylkr536xcdyz4rglkzqhklrhgl89";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.1-darwin-arm64.tar.gz";
-        sha256 = "0zj1mpc5afgw99h1zlqrd9iz0bz0wwjghw6j8pq4x9wirx89c54p";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.2-darwin-arm64.tar.gz";
+        sha256 = "0yhbfafsv5p0zl274w8gaxsv1373f9xrzn2kxil8699jb9rwhl05";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.7-darwin-arm64.tar.gz";
@@ -611,16 +611,16 @@
         sha256 = "188gijh0pm2dgcfchs6c63dd88593vd4f3by2anvhs0jm0w3rk3m";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.1.1-darwin-arm64.tar.gz";
-        sha256 = "1vrird4pp4gxw9iivj2n4apd52l50j27mqaf7zbz3hg8wcl1ikv0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.0-darwin-arm64.tar.gz";
+        sha256 = "07xq8ws4pqp4762lm8z17c798xm4rw4xkybqj7c76a319xnjcx33";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.6.0-darwin-arm64.tar.gz";
-        sha256 = "1bdiq2m0gr3jamwaz9jlc4sx3x5g29pwk1l790830v1zqh2kx7x3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.7.0-darwin-arm64.tar.gz";
+        sha256 = "0i6s3wbnim9c3amasivdfbfq7k3bn95k3spkdjhgljq46vqi3584";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.7-darwin-arm64.tar.gz";
-        sha256 = "11i7hhj29vd2090nfj7j551xzqw1xnr2qxkgwlhwm9g9kqi1nh4f";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.0-darwin-arm64.tar.gz";
+        sha256 = "1m2fym3b2faqi21zbl2c48l6q1aysw1279qrjx0apaj1hvyw5l16";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.13.2-darwin-arm64.tar.gz";

From 3e9fc45a4685d171447f978cd1e80f8ecc4e75aa Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Apr 2025 17:21:02 +0200
Subject: [PATCH 104/144] rerun: 0.23.0 -> 0.23.1

Diff: https://github.com/rerun-io/rerun/compare/refs/tags/0.23.0...refs/tags/0.23.1

Changelog: https://github.com/rerun-io/rerun/blob/0.23.1/CHANGELOG.md
---
 pkgs/by-name/re/rerun/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 1f99ae9cae86..261464637d0d 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -34,13 +34,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rerun";
-  version = "0.23.0";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "rerun-io";
     repo = "rerun";
     tag = finalAttrs.version;
-    hash = "sha256-ZMvX/9kz+tEiQ01GO7B+/wdxxkFkuExR9jA2KROIbgw=";
+    hash = "sha256-P4PNGguBlHlVRlABNDZGxdAKL0NkoROrcR+7+q7Ln4Q=";
   };
 
   # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-2BMBfEunRRMX4++w0Fg9wTAeEmODtOTcruXCO9JKreo=";
+  cargoHash = "sha256-1DNrgptSeggyxS/JFaFinS2RqpKVJ8SoGgLtffaS9HU=";
 
   cargoBuildFlags = [ "--package rerun-cli" ];
   cargoTestFlags = [ "--package rerun-cli" ];

From ab1de1a2e7c28c790bdc3e12db2b8bbfa5850e7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 15:44:03 +0000
Subject: [PATCH 105/144] libmaddy-markdown: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/by-name/li/libmaddy-markdown/package.nix b/pkgs/by-name/li/libmaddy-markdown/package.nix
index 0905289e695c..a7ea48bdac7b 100644
--- a/pkgs/by-name/li/libmaddy-markdown/package.nix
+++ b/pkgs/by-name/li/libmaddy-markdown/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "libmaddy-markdown";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "progsource";
     repo = "maddy";
     tag = finalAttrs.version;
-    hash = "sha256-cc0RggNYn0wZpeCn5QU9C+sqv7CTJkiQVB3LSQ/3YQw=";
+    hash = "sha256-FlERT2A5bxvLElBcqHCFTORFRK04rJjvRYguqZ+foVo=";
   };
 
   dontBuild = true;

From c4e67f726c8c1a4313eed54cb747ac0c607b2299 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Apr 2025 18:04:16 +0200
Subject: [PATCH 106/144] python313Packages.meshtastic: 2.6.1 -> 2.6.2

Diff: https://github.com/meshtastic/python/compare/refs/tags/2.6.1...refs/tags/2.6.2

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

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index f49b212efea3..dd4e259f65f7 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -34,7 +34,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.6.1";
+  version = "2.6.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "python";
     tag = version;
-    hash = "sha256-FcvshADZVXIqq9dfNIozzhWT9h+3/b9BIOsveETVO74=";
+    hash = "sha256-v9Fr3J829x1KtzplzXF2yDYwra70xNcJfaHpyiNP4ME=";
   };
 
   pythonRelaxDeps = [

From 309770be2adb08bf31a36690c877f64ae98b3b48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 16:13:46 +0000
Subject: [PATCH 107/144] v2ray-domain-list-community: 20250415151718 ->
 20250422055726

---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index cb26889110e2..604c785d6050 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20250415151718";
+    version = "20250422055726";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-Q6/ZWwbsR8dFL6uBRFXKkuMGuWgH/VwHN3qxETbPq4k=";
+      hash = "sha256-mKnZOvFHzUNndbLDY9c9RCxtQQaELrHB4iHMvwucgzE=";
     };
     vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
     meta = with lib; {

From 9e50fecf6f71955d5ac4e46ca1239f459d1833ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 16:37:08 +0000
Subject: [PATCH 108/144] pkgsite: 0-unstable-2025-04-16 ->
 0-unstable-2025-04-24

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

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index e50a9be6bd0a..0daa8ae0fc98 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2025-04-16";
+  version = "0-unstable-2025-04-24";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "0a075a2cae6ac8ff829d0d7c7841d064d6833167";
-    hash = "sha256-kYmxR6ZzlHDBeAYFDlUN5EcgRDpB/S00Xx3N1MbKsIk=";
+    rev = "e863a039941fdd1a92fb694c3d9b3bb0ea0ba257";
+    hash = "sha256-wb451BDpKT404oMmyOXuZBGM7rWLiWJHTRTtphOgx9g=";
   };
 
   vendorHash = "sha256-JoPuNktN4OsdNJ0e8BRuuD0CKuWiFsAcLAS5h9rH/Z0=";

From 8d0f69e5e7117de21829d4b4f7343043bf5d904b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 16:47:13 +0000
Subject: [PATCH 109/144] python312Packages.simsimd: 6.4.1 -> 6.4.3

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

diff --git a/pkgs/development/python-modules/simsimd/default.nix b/pkgs/development/python-modules/simsimd/default.nix
index 9069f0f539a0..970edc6cdb5d 100644
--- a/pkgs/development/python-modules/simsimd/default.nix
+++ b/pkgs/development/python-modules/simsimd/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "simsimd";
-  version = "6.4.1";
+  version = "6.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "simsimd";
     tag = "v${version}";
-    hash = "sha256-4t3uCxQG0zSa2JLKE1d2G3OQLr+8E3ZDNnTf9LAYXsk=";
+    hash = "sha256-K8+52aMDu7fuqcr3jLO1NfvW4qNOmJgHmF/N+XraZyc=";
   };
 
   build-system = [

From b87799b31d9c1b9d142ee12545296fde365f714a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 18:15:22 +0000
Subject: [PATCH 110/144] zoekt: 3.7.2-2-unstable-2025-04-15 ->
 3.7.2-2-unstable-2025-04-22

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

diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index 61021c6d4fc8..e14233d067a3 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule {
   pname = "zoekt";
-  version = "3.7.2-2-unstable-2025-04-15";
+  version = "3.7.2-2-unstable-2025-04-22";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "zoekt";
-    rev = "0978c13fb6683be9908ee1a578360734e61cc8b5";
-    hash = "sha256-1Ris2GsZnHHrxvXxOCRSPvvk35YEhqDxNHkd7cjv0YY=";
+    rev = "45c1f08d3942c955f2ef0934518aafca5238df28";
+    hash = "sha256-Iy+5Of6Y4phATJrb3Hd8m9N9iDPkOA8Hgkyrir5x+Hg=";
   };
 
   vendorHash = "sha256-B45Q9G+p/idqqz45lLQQuDGLwAzhKuo9Ev+cISGbKUo=";

From 9e647ada5ea8d06e6ffe15dc547d53e6e049aef7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 25 Apr 2025 21:19:08 +0300
Subject: [PATCH 111/144] kdePackages.falkon: backport patch to fix crash on
 startup

As recommended upstream.
---
 pkgs/kde/gear/falkon/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/kde/gear/falkon/default.nix b/pkgs/kde/gear/falkon/default.nix
index daa26d9ce5e7..b41cbaa59a87 100644
--- a/pkgs/kde/gear/falkon/default.nix
+++ b/pkgs/kde/gear/falkon/default.nix
@@ -5,20 +5,32 @@
   qtwebengine,
   qttools,
   python3Packages,
+  fetchpatch,
 }:
 mkKdeDerivation {
   pname = "falkon";
 
+  # Fix crash on startup
+  # FIXME: remove in 25.04.1
+  patches = [
+    (fetchpatch {
+      url = "https://invent.kde.org/network/falkon/-/commit/31ba9472369256804400a2db36b3dca3b4be2d73.patch";
+      hash = "sha256-jLJjL4Bp03aZfM/OPXZzgL56T0C/2hHSzNERpbTitzw=";
+    })
+  ];
+
   extraNativeBuildInputs = [
     qttools
     qtwebchannel
     qtwebengine
   ];
+
   extraBuildInputs = [
     extra-cmake-modules
     qtwebchannel
     qtwebengine
     python3Packages.pyside6
   ];
+
   meta.mainProgram = "falkon";
 }

From 3efb43d4fdfa3b7467c8d795efe10e4d4a8d24b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 18:29:52 +0000
Subject: [PATCH 112/144] powershell: 7.5.0 -> 7.5.1

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

diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix
index 8d1366db9651..6845d30445ec 100644
--- a/pkgs/by-name/po/powershell/package.nix
+++ b/pkgs/by-name/po/powershell/package.nix
@@ -32,7 +32,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "powershell";
-  version = "7.5.0";
+  version = "7.5.1";
 
   src =
     passthru.sources.${stdenv.hostPlatform.system}
@@ -96,19 +96,19 @@ stdenv.mkDerivation rec {
     sources = {
       aarch64-darwin = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz";
-        hash = "sha256-EHv+NRyyMdIv+qwUpgJc/s7ONzW9ff8RZwWJ/V1+49U=";
+        hash = "sha256-0fAWzM5acQbjYJC/E65xtGEV8lZGWu4Hdgsm5gf00DM=";
       };
       aarch64-linux = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz";
-        hash = "sha256-o7ah0UiXl0rqcy2ClwyG3Rf/xXpfxPS/q/4t0nL/bEA=";
+        hash = "sha256-h5Y93+/2rHJmv/vgIbCK2u0mStSjq5Nqgg5tf0Wp7oo=";
       };
       x86_64-darwin = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz";
-        hash = "sha256-9LxQACnZggsVxn+IXGWrvuCqlE8wV+XZng+GWMYA/Zs=";
+        hash = "sha256-SwXo6jVSZhFKmm8/A0yosaKamLGhbKYL2OVLNf+horM=";
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz";
-        hash = "sha256-frsASKOACd5aWdYgoQ8z17pJIKziN5sQSmf6+3nihBs=";
+        hash = "sha256-u5tff4BgAHNU112pL8ZDDHe6B0z4G/ohVvG6Nz/0d+U=";
       };
     };
     tests.version = testers.testVersion {

From 23497883e2acbc46b6147d3a6c15877d3b098f28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 18:47:02 +0000
Subject: [PATCH 113/144] vcmi: 1.6.7 -> 1.6.8

---
 pkgs/games/vcmi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix
index f36b912b471f..c8bdfc4f51f9 100644
--- a/pkgs/games/vcmi/default.nix
+++ b/pkgs/games/vcmi/default.nix
@@ -29,14 +29,14 @@
 
 stdenv.mkDerivation rec {
   pname = "vcmi";
-  version = "1.6.7";
+  version = "1.6.8";
 
   src = fetchFromGitHub {
     owner = "vcmi";
     repo = "vcmi";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-ImfEKVyuvl8VAsaq34DBe+fiAxf11Mr0jWVI51EsSRs=";
+    hash = "sha256-k6tkylNXEzU+zzYoFWtx+AkoHQzAwbBxPB2DVevsryw=";
   };
 
   nativeBuildInputs = [

From 61a1403a3bb60c781e1f4336b9096e237298f2d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 18:53:29 +0000
Subject: [PATCH 114/144] texstudio: 4.8.6 -> 4.8.7

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

diff --git a/pkgs/by-name/te/texstudio/package.nix b/pkgs/by-name/te/texstudio/package.nix
index 8c87594998a0..919c98116894 100644
--- a/pkgs/by-name/te/texstudio/package.nix
+++ b/pkgs/by-name/te/texstudio/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "texstudio";
-  version = "4.8.6";
+  version = "4.8.7";
 
   src = fetchFromGitHub {
     owner = "texstudio-org";
     repo = "texstudio";
     rev = finalAttrs.version;
-    hash = "sha256-PvxzG4VPhCmwc/Kh5g85fV/Mc7ih08pt/zUNBgldZiI=";
+    hash = "sha256-/0f8SIzF5OnVYfxS6Cb7VbN+IMc4VzCxfA7p93iQJ/w=";
   };
 
   nativeBuildInputs = [

From db97bf05d82c8fc5b016218873a734d89d3aa827 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 19:28:12 +0000
Subject: [PATCH 115/144] snapcraft: 8.8.0 -> 8.8.1

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

diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index f6c624de9ae3..d4fad21c4c4e 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -13,7 +13,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snapcraft";
-  version = "8.8.0";
+  version = "8.8.1";
 
   pyproject = true;
 
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     owner = "canonical";
     repo = "snapcraft";
     tag = version;
-    hash = "sha256-54UOXEH3DxT1P/CRi09gEoq9si+x/1GHFuWRIyEvz3E=";
+    hash = "sha256-gn2roiwNLUFJsuen2qGPvl4DyE6gPUQibS1Cn7cj2L8=";
   };
 
   patches = [

From f72e25fcb27bd5ab3ef845dd9f39e64083d55ec7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 19:34:42 +0000
Subject: [PATCH 116/144] kubelogin: 0.2.7 -> 0.2.8

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

diff --git a/pkgs/by-name/ku/kubelogin/package.nix b/pkgs/by-name/ku/kubelogin/package.nix
index eb184bcb2cb1..231e15e7e1de 100644
--- a/pkgs/by-name/ku/kubelogin/package.nix
+++ b/pkgs/by-name/ku/kubelogin/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "kubelogin";
-  version = "0.2.7";
+  version = "0.2.8";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-upToPltob3P8EwDUbl9F3COGCxnz6NZNrZ/wxv5pBQU=";
+    sha256 = "sha256-aajo43ysA/ItOxFxZbw1i7VQpEm4aqfXFiMUTZt3QDk=";
   };
 
-  vendorHash = "sha256-d4zXjMr34DUXHNBe8jGhlQ/gdsaR2hGWxZEfUKXvKCQ=";
+  vendorHash = "sha256-fILOPZnSsEX9f1nWxC1jTN2wNGmlz15fFmeVvXMA25w=";
 
   ldflags = [
     "-X main.gitTag=v${version}"

From d8db09bc7a6bfe6ab6f1c754792f369c484df815 Mon Sep 17 00:00:00 2001
From: Vladyslav Pekker <agilesteel@gmail.com>
Date: Fri, 25 Apr 2025 16:56:58 -0300
Subject: [PATCH 117/144] scalafmt: 3.9.2 -> 3.9.4

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

diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix
index 5f495696480b..9b37dd15bf8e 100644
--- a/pkgs/by-name/sc/scalafmt/package.nix
+++ b/pkgs/by-name/sc/scalafmt/package.nix
@@ -9,7 +9,7 @@
 
 let
   baseName = "scalafmt";
-  version = "3.9.2";
+  version = "3.9.4";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -19,7 +19,7 @@ let
       cp $(< deps) $out/share/java/
     '';
     outputHashMode = "recursive";
-    outputHash = "sha256-IACG6fiunbLP5wLPMePpk0QQnDS18ale+Lppri4jBmU=";
+    outputHash = "sha256-F2906HrBEiCnv+7OfoFbLsIK1lJiE0cQCyjJ0EivSI0=";
   };
 in
 stdenv.mkDerivation {

From f4482d41cc32fea5c1645d6b0ca6d77debaca626 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 20:14:55 +0000
Subject: [PATCH 118/144] credhub-cli: 2.9.44 -> 2.9.45

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

diff --git a/pkgs/by-name/cr/credhub-cli/package.nix b/pkgs/by-name/cr/credhub-cli/package.nix
index 8a918197881f..083965598479 100644
--- a/pkgs/by-name/cr/credhub-cli/package.nix
+++ b/pkgs/by-name/cr/credhub-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "credhub-cli";
-  version = "2.9.44";
+  version = "2.9.45";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry-incubator";
     repo = "credhub-cli";
     rev = version;
-    sha256 = "sha256-5963iZ7fDNs+J96+GSoGcjKLCqu8u3obAWE9+9oEBGU=";
+    sha256 = "sha256-WOiUA2Bk6/ymV2wqPu4a4x0SL1TZXsZOTALta8ZMu6I=";
   };
 
   # these tests require network access that we're not going to give them

From 5e7c1b53590529ae770ce6538aba498c32459cb6 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 3 Apr 2025 13:26:01 -0700
Subject: [PATCH 119/144] dispad: drop

---
 pkgs/by-name/di/dispad/package.nix | 35 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/by-name/di/dispad/package.nix

diff --git a/pkgs/by-name/di/dispad/package.nix b/pkgs/by-name/di/dispad/package.nix
deleted file mode 100644
index c74e108ded06..000000000000
--- a/pkgs/by-name/di/dispad/package.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  libX11,
-  libXi,
-  libconfuse,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dispad";
-  version = "0.3.1";
-
-  src = fetchFromGitHub {
-    owner = "BlueDragonX";
-    repo = "dispad";
-    rev = "v${version}";
-    hash = "sha256-PtwvaNtnCm3Y+6vlxPDc21RyIA2v3vkMOHpoGFxNFng=";
-  };
-
-  buildInputs = [
-    libX11
-    libXi
-    libconfuse
-  ];
-
-  meta = with lib; {
-    description = "Small daemon for disabling trackpads while typing";
-    homepage = "https://github.com/BlueDragonX/dispad";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ zimbatm ];
-    platforms = platforms.linux;
-    mainProgram = "dispad";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3d57844709e6..ebad76789d55 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -509,6 +509,7 @@ mapAliases {
   dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14
   dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07
   diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25
+  dispad = throw "dispad has been remove because it doesn't compile and has been unmaintained since 2014"; # Added 2025-04-25
   dleyna-core = dleyna; # Added 2025-04-19
   dleyna-connector-dbus = dleyna; # Added 2025-04-19
   dleyna-renderer = dleyna; # Added 2025-04-19

From 4eb7ef7a9751ba2fd49c40007bd33b3073981c4a Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 25 Apr 2025 22:55:16 +0200
Subject: [PATCH 120/144] winbox4: 4.0beta19 -> 4.0beta20

Changelog: https://download.mikrotik.com/routeros/winbox/4.0beta20/CHANGELOG
---
 pkgs/by-name/wi/winbox4/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix
index cf6c823ef66f..660ad771f703 100644
--- a/pkgs/by-name/wi/winbox4/package.nix
+++ b/pkgs/by-name/wi/winbox4/package.nix
@@ -18,12 +18,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "winbox";
-  version = "4.0beta19";
+  version = "4.0beta20";
 
   src = fetchurl {
     name = "WinBox_Linux-${finalAttrs.version}.zip";
     url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/WinBox_Linux.zip";
-    hash = "sha256-+hDhQT09mKaO65TK0AF6+o/FdmgdlNm1qUSkWZybj9s=";
+    hash = "sha256-mU+z7yRYKXnGAXHB5LS5SVUgIzRlR9nV2FzXispntF0=";
   };
 
   sourceRoot = ".";

From 40e7077c0568e42f7442f7fb06cabf9ec101e880 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Apr 2025 23:01:09 +0200
Subject: [PATCH 121/144] jaq: 2.1.1 -> 2.2.0

Diff: https://github.com/01mf02/jaq/compare/refs/tags/v2.1.1...refs/tags/v2.2.0

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

diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix
index 7c52332d925f..3bbf58338bc9 100644
--- a/pkgs/by-name/ja/jaq/package.nix
+++ b/pkgs/by-name/ja/jaq/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jaq";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "01mf02";
     repo = "jaq";
     tag = "v${version}";
-    hash = "sha256-8RP895GXoQOgMAfkfHIxCm0R2lmG+W3/H+xjcqSc3JM=";
+    hash = "sha256-mVC2aggfcEpCtriuz/s4JL8mYkrlyAQLnaN5vyfcW3s=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-movx0ahUD20OvLPZiLfXwN5tEkytUk9Q3cOTV1SJcvw=";
+  cargoHash = "sha256-ZZLp3Vwq013MPxKy9gTZ1yMi2O0QcDPgFw5YnrYt90I=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 155a57de0c6819a7b7d1c98e5ffcbf297c00fdec Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 25 Apr 2025 21:07:52 +0000
Subject: [PATCH 122/144] incus-ui-canonical: 0.15.2 -> 0.15.3

https://github.com/zabbly/incus-ui-canonical/releases/tag/incus-0.15.3
---
 pkgs/by-name/in/incus-ui-canonical/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix
index a911e8b712a1..8df221577b6f 100644
--- a/pkgs/by-name/in/incus-ui-canonical/package.nix
+++ b/pkgs/by-name/in/incus-ui-canonical/package.nix
@@ -20,14 +20,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "incus-ui-canonical";
-  version = "0.15.2";
+  version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "zabbly";
     repo = "incus-ui-canonical";
     # only use tags prefixed by incus- they are the tested fork versions
     tag = "incus-${version}";
-    hash = "sha256-jcdjbrQsBshpSogPkDO2DHYIyWmxEOJbFFG25X2mni0=";
+    hash = "sha256-FsDdALcIXJFo0ScOA8YEzulefp8IfOSi2ZClrtcPo24=";
   };
 
   offlineCache = fetchYarnDeps {

From e83460cf60545859e8d2b227b99a74479649ec7a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Apr 2025 23:16:40 +0200
Subject: [PATCH 123/144] python312Packages.hf-xet: 1.0.4 -> 1.0.5

Diff: https://github.com/huggingface/xet-core/compare/refs/tags/v1.0.4...refs/tags/v1.0.5

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

diff --git a/pkgs/development/python-modules/hf-xet/default.nix b/pkgs/development/python-modules/hf-xet/default.nix
index ceb5bb874e83..ebdc9c7fc423 100644
--- a/pkgs/development/python-modules/hf-xet/default.nix
+++ b/pkgs/development/python-modules/hf-xet/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "hf-xet";
-  version = "1.0.4";
+  version = "1.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "xet-core";
     tag = "v${version}";
-    hash = "sha256-V1PeTgjVrJ4FquP/LkKnd8N41mca4zNPDP3M+dPbTyA=";
+    hash = "sha256-SBL2s5+hbB7G5Qzo/nF+PXp2zuce4HKWG2cgyY41G8I=";
   };
 
   sourceRoot = "${src.name}/hf_xet";

From 9ac1fb84a6be0cdd4433a7588bbaebdfd1e2f3ef Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Fri, 25 Apr 2025 17:30:50 -0400
Subject: [PATCH 124/144] anki-bin: 25.02 -> 25.02.4

changelog: https://github.com/ankitects/anki/releases/tag/25.02.4
---
 pkgs/games/anki/bin.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix
index 7ccafd81b6f9..8ed1a8e05f7e 100644
--- a/pkgs/games/anki/bin.nix
+++ b/pkgs/games/anki/bin.nix
@@ -15,22 +15,22 @@
 let
   pname = "anki-bin";
   # Update hashes for both Linux and Darwin!
-  version = "25.02";
+  version = "25.02.4";
 
   sources = {
     linux = fetchurl {
       url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst";
-      hash = "sha256-9g9ktEME4P8wQYv8i8TzIXThpsTi4QuJNTdGdA+YqNA=";
+      hash = "sha256-vMEmrPrqaasHYQI362mm3/dxCZ6gxan+rPjZrhECYEE=";
     };
 
     # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version
     darwin-x86_64 = fetchurl {
       url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg";
-      hash = "sha256-5soE9JZugwuEIUdzU+ki7PoXluvmG9bnlaV5EAmlIOs=";
+      hash = "sha256-2C4AEy18kP4l2uORqFz7pQvi4wmLqYFyKBJJM26DIzI=";
     };
     darwin-aarch64 = fetchurl {
       url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg";
-      hash = "sha256-4N6ukTOxJ2FprmtSxUCxmathKf5J6oXNCJyqLZ39ysk=";
+      hash = "sha256-5cwcoKxpbeGoBWM/462loI9hwUKg6iQX6VjswI8nA7U=";
     };
   };
 

From 53575f291f4ac8d3746755367f72514f9969b499 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 25 Apr 2025 17:49:42 +0200
Subject: [PATCH 125/144] harmonia: 2.0.1 -> 2.1.0

---
 pkgs/by-name/ha/harmonia/package.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ha/harmonia/package.nix b/pkgs/by-name/ha/harmonia/package.nix
index 3bb020bb09fb..0d296afd0c47 100644
--- a/pkgs/by-name/ha/harmonia/package.nix
+++ b/pkgs/by-name/ha/harmonia/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  libsodium,
   openssl,
   pkg-config,
   rustPlatform,
@@ -9,25 +8,24 @@
   nixosTests,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "harmonia";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "harmonia";
-    tag = "harmonia-v${version}";
-    hash = "sha256-tqkTzUdwnTfVuCrcFag7YKgGkiR9srR45e4v0XMXVCY=";
+    tag = "harmonia-v${finalAttrs.version}";
+    hash = "sha256-Ch7CBPwSKZxCmZwFunNCA8E74TcOWp9MLbhe3/glQ6w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3l+mRucDFc49Y96e2m5uixKvRSkrRaBWgJhPMIxuZvo=";
+  cargoHash = "sha256-7HZoXNL7nf6NUNnh6gzXsZ2o4eeEQL7/KDdIcbh7/jM=";
 
   doCheck = false;
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libsodium
     openssl
   ];
 
@@ -41,11 +39,11 @@ rustPlatform.buildRustPackage rec {
     tests = { inherit (nixosTests) harmonia; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Nix binary cache";
     homepage = "https://github.com/nix-community/harmonia";
-    license = licenses.mit;
-    maintainers = with maintainers; [ mic92 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mic92 ];
     mainProgram = "harmonia";
   };
-}
+})

From 1a0240b6b504c5103a2cdde86a3c91efbc0cef13 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 21 Apr 2025 20:09:50 -0700
Subject: [PATCH 126/144] mlv-app: modernize

---
 pkgs/applications/video/mlv-app/default.nix | 52 ++++++++++-----------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix
index cfdd4f61e905..a854a06ac587 100644
--- a/pkgs/applications/video/mlv-app/default.nix
+++ b/pkgs/applications/video/mlv-app/default.nix
@@ -1,23 +1,21 @@
 {
-  fetchFromGitHub,
   lib,
-  mkDerivation,
-  fetchpatch,
-  qmake,
-  qtbase,
-  qtmultimedia,
   stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  libsForQt5,
+  writableTmpDirAsHomeHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mlv-app";
   version = "1.15";
 
   src = fetchFromGitHub {
     owner = "ilia3101";
     repo = "MLV-App";
-    rev = "QTv${version}";
-    sha256 = "sha256-boYnIGDowV4yRxdE98U5ngeAwqi5HTRDFh5gVwW/kN8=";
+    rev = "QTv${finalAttrs.version}";
+    hash = "sha256-boYnIGDowV4yRxdE98U5ngeAwqi5HTRDFh5gVwW/kN8=";
   };
 
   patches = [
@@ -27,24 +25,20 @@ mkDerivation rec {
     })
   ];
 
-  installPhase = ''
-    runHook preInstall
-    install -Dm555 -t $out/bin                mlvapp
-    install -Dm444 -t $out/share/applications mlvapp.desktop
-    install -Dm444 -t $out/share/icons/hicolor/512x512/apps RetinaIMG/MLVAPP.png
-    runHook postInstall
-  '';
-
   qmakeFlags = [ "MLVApp.pro" ];
 
   preConfigure = ''
-    export HOME=$TMPDIR
     cd platform/qt/
   '';
 
+  nativeBuildInputs = [
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qmake
+    writableTmpDirAsHomeHook
+  ];
   buildInputs = [
-    qtmultimedia
-    qtbase
+    libsForQt5.qtmultimedia
+    libsForQt5.qtbase
   ];
 
   dontWrapQtApps = true;
@@ -53,16 +47,22 @@ mkDerivation rec {
     wrapQtApp "$out/bin/mlvapp"
   '';
 
-  nativeBuildInputs = [
-    qmake
-  ];
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 -t $out/bin                mlvapp
+    install -Dm444 -t $out/share/applications mlvapp.desktop
+    install -Dm444 -t $out/share/icons/hicolor/512x512/apps RetinaIMG/MLVAPP.png
+    runHook postInstall
+  '';
 
-  meta = with lib; {
+  meta = {
     description = "All in one MLV processing app that is pretty great";
     homepage = "https://mlv.app";
-    license = licenses.gpl3;
+    downloadPage = "https://github.com/ilia3101/MLV-App";
+    changelog = "https://github.com/ilia3101/MLV-App/releases/tag/QTv${finalAttrs.version}";
+    license = lib.licenses.gpl3;
     maintainers = [ ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "mlvapp";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6be7b7913055..dca6413946d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10549,7 +10549,7 @@ with pkgs;
 
   mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { };
 
-  mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { };
+  mlv-app = callPackage ../applications/video/mlv-app { };
 
   mpeg2dec = libmpeg2;
 

From fe06940d32b40fa659f031e50e52b3bf3bc2cf4c Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Tue, 22 Apr 2025 19:39:37 -0700
Subject: [PATCH 127/144] mlv-app: clarify gpl3 type

---
 pkgs/applications/video/mlv-app/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix
index a854a06ac587..609066e0927a 100644
--- a/pkgs/applications/video/mlv-app/default.nix
+++ b/pkgs/applications/video/mlv-app/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://mlv.app";
     downloadPage = "https://github.com/ilia3101/MLV-App";
     changelog = "https://github.com/ilia3101/MLV-App/releases/tag/QTv${finalAttrs.version}";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "mlvapp";

From d9264f796b0b1f43a3312c89d7869ddace60dde0 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Tue, 22 Apr 2025 19:40:23 -0700
Subject: [PATCH 128/144] mlv-app: move to by-name

---
 .../mlv-app/default.nix => by-name/ml/mlv-app/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/video/mlv-app/default.nix => by-name/ml/mlv-app/package.nix} (100%)

diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/by-name/ml/mlv-app/package.nix
similarity index 100%
rename from pkgs/applications/video/mlv-app/default.nix
rename to pkgs/by-name/ml/mlv-app/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dca6413946d1..03e8cceefac1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10549,8 +10549,6 @@ with pkgs;
 
   mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { };
 
-  mlv-app = callPackage ../applications/video/mlv-app { };
-
   mpeg2dec = libmpeg2;
 
   msoffcrypto-tool = with python3.pkgs; toPythonApplication msoffcrypto-tool;

From 8c62924fc60e38824e05df810be8188dee736a9f Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 24 Apr 2025 08:51:06 -0700
Subject: [PATCH 129/144] mlv-app: add missing ffmpeg dep

---
 pkgs/by-name/ml/mlv-app/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ml/mlv-app/package.nix b/pkgs/by-name/ml/mlv-app/package.nix
index 609066e0927a..390521b5fa92 100644
--- a/pkgs/by-name/ml/mlv-app/package.nix
+++ b/pkgs/by-name/ml/mlv-app/package.nix
@@ -5,6 +5,7 @@
   fetchpatch,
   libsForQt5,
   writableTmpDirAsHomeHook,
+  ffmpeg-headless,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,6 +26,11 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace platform/qt/MainWindow.cpp \
+      --replace-fail '"ffmpeg"' '"${lib.getExe ffmpeg-headless}"'
+  '';
+
   qmakeFlags = [ "MLVApp.pro" ];
 
   preConfigure = ''

From 6c7a54dfa41571b21ed32236d080307bc7078eb3 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 24 Apr 2025 18:34:33 -0700
Subject: [PATCH 130/144] mlv-app: add update script

---
 pkgs/by-name/ml/mlv-app/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ml/mlv-app/package.nix b/pkgs/by-name/ml/mlv-app/package.nix
index 390521b5fa92..9be0365f2bd9 100644
--- a/pkgs/by-name/ml/mlv-app/package.nix
+++ b/pkgs/by-name/ml/mlv-app/package.nix
@@ -6,6 +6,7 @@
   libsForQt5,
   writableTmpDirAsHomeHook,
   ffmpeg-headless,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -61,6 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  updateScript = nix-update-script { };
+
   meta = {
     description = "All in one MLV processing app that is pretty great";
     homepage = "https://mlv.app";

From f0f872db5c4b54d474f5ec0817f05f7d7a63bdc2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Apr 2025 22:58:47 +0200
Subject: [PATCH 131/144] python312Packages.pytorch-lightning: 2.5.1 ->
 2.5.1.post0

Diff: https://github.com/Lightning-AI/pytorch-lightning/compare/refs/tags/2.5.1...refs/tags/2.5.1.post0

Changelog: https://github.com/Lightning-AI/pytorch-lightning/releases/tag/2.5.1.post0
---
 pkgs/development/python-modules/pytorch-lightning/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix
index b9cde02359f8..62d8ca498643 100644
--- a/pkgs/development/python-modules/pytorch-lightning/default.nix
+++ b/pkgs/development/python-modules/pytorch-lightning/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "pytorch-lightning";
-  version = "2.5.1";
+  version = "2.5.1.post0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lightning-AI";
     repo = "pytorch-lightning";
     tag = version;
-    hash = "sha256-vGs+byt+/9tIMNYc2VmyN5vhj21ZFnaYsg4v2zeKzEM=";
+    hash = "sha256-Vp9RpoyqHiMw3BchmenXgfmmm95uIjuhkhyq1ZrBiiI=";
   };
 
   preConfigure = ''

From 18ae56dc7bc074d4fc45233c2b8c69c20de1044b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Apr 2025 23:50:49 +0200
Subject: [PATCH 132/144] python312Packages.finetuning-scheduler: relax
 setuptools

---
 .../python-modules/finetuning-scheduler/default.nix          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix
index 7ed20b6d9aa0..97fdf1ffce11 100644
--- a/pkgs/development/python-modules/finetuning-scheduler/default.nix
+++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix
@@ -37,6 +37,11 @@ buildPythonPackage rec {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools<77.0.0" "setuptools"
+  '';
+
   build-system = [ setuptools ];
 
   pythonRelaxDeps = [

From 46e033103cb5dde7a67ca4e4b1f51f0d6ea08fab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 23:26:06 +0000
Subject: [PATCH 133/144] rainfrog: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index 36338b43709f..bc0636c17b4d 100644
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@@ -9,7 +9,7 @@
   rainfrog,
 }:
 let
-  version = "0.3.0";
+  version = "0.3.1";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -19,11 +19,11 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     tag = "v${version}";
-    hash = "sha256-dBsL91BK/OkLimBUnqOQu/bBqxNIjnZY5oI0lwMkfDo=";
+    hash = "sha256-sUZnHlTxOz0j2KsWi/qaI5MYT0mkANn6deH54TS/JYw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-C5Wn/Qe+VSCFEma7IAmxGK2t2xugWOt2BaF7izsCU+I=";
+  cargoHash = "sha256-wgJWPlURS2DxcRMzDEAXa50nQswcjbe0zj2QgF0HZys=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;

From 821d78c8f9af5fd8d8b79133739d9703e1e14870 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 23:31:38 +0000
Subject: [PATCH 134/144] slackdump: 3.0.10 -> 3.1.1

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

diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix
index c24eaf61edde..7e951c177f4d 100644
--- a/pkgs/by-name/sl/slackdump/package.nix
+++ b/pkgs/by-name/sl/slackdump/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "slackdump";
-  version = "3.0.10";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "rusq";
     repo = "slackdump";
     tag = "v${version}";
-    hash = "sha256-+Q79DauC+hnUCxBa9muVsq03D9ph7lEB5pmU7ujv3Mo=";
+    hash = "sha256-DBIBOHoQIUp2WXj50w2ixhB9W8qBzdrBmNCKSuAJMGk=";
   };
 
   nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
@@ -32,7 +32,7 @@ buildGoModule rec {
       "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
     ];
 
-  vendorHash = "sha256-qtvUhxbkElMa6qrkicNrPn9Boh65sAH/vZn/FeO9o9A=";
+  vendorHash = "sha256-TEeYHT2jvU0ioMb3h/xjUg1fISsi5oHY5xKEcHwhC0Y=";
 
   __darwinAllowLocalNetworking = true;
 

From e0f73940d84424512f8427c48acae91e736c7980 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 25 Apr 2025 23:00:18 +0000
Subject: [PATCH 135/144] linux_testing: 6.15-rc2 -> 6.15-rc3

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index b584538eb42e..4ada28c6f965 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "6.15-rc2",
-        "hash": "sha256:0ldqjmafisf8dx5xhak9y7glwlrk07hppfpi27w2nb5845bqdwfz"
+        "version": "6.15-rc3",
+        "hash": "sha256:0pf83a8q4yxyz0wfnrwa14rdfcczll633qyn02n2pbqg7r5mxi61"
     },
     "6.1": {
         "version": "6.1.134",

From 6f193e7d54f9da5586bef689752a075bb3f3ebba Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 25 Apr 2025 23:00:20 +0000
Subject: [PATCH 136/144] linux_6_14: 6.14.3 -> 6.14.4

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 4ada28c6f965..e80200534c1d 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -32,7 +32,7 @@
         "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
     },
     "6.14": {
-        "version": "6.14.3",
-        "hash": "sha256:0ak5av0ykf8m65dmbihlcx9ahb1p8rgx6bm04acz0s15qcic7ili"
+        "version": "6.14.4",
+        "hash": "sha256:0fak7y9dr5rxzmi4m545kz7pyk2c91dkj4k7i2jgnl80ga6z4lll"
     }
 }

From 6d7dc217ac21c069dbef07660bc72f9f6abb5ed6 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 25 Apr 2025 23:00:22 +0000
Subject: [PATCH 137/144] linux_6_12: 6.12.24 -> 6.12.25

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index e80200534c1d..b8458b8f7466 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -24,8 +24,8 @@
         "hash": "sha256:1iks6msk4cajyy0khyhrwsdl123hr81n67xzdnhlgg6dvb1famw9"
     },
     "6.12": {
-        "version": "6.12.24",
-        "hash": "sha256:078c2gs7f4gzxhc1jr42bfwrfi4yq5f84l7r2bfn05crnp0l4cb4"
+        "version": "6.12.25",
+        "hash": "sha256:141visdf85iw011ncp77csmkahvn598lqvhi493a4g31dw7piby8"
     },
     "6.13": {
         "version": "6.13.12",

From 5b046b29b3efd38ff16189cd4e8ede2023fdc907 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 25 Apr 2025 23:00:24 +0000
Subject: [PATCH 138/144] linux_6_6: 6.6.87 -> 6.6.88

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index b8458b8f7466..d849867bc37b 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:11dy6zvxnripwr4lfg357wdl70kcg5ljs3wxhz2klqpas60gbjqb"
     },
     "6.6": {
-        "version": "6.6.87",
-        "hash": "sha256:1iks6msk4cajyy0khyhrwsdl123hr81n67xzdnhlgg6dvb1famw9"
+        "version": "6.6.88",
+        "hash": "sha256:0l0697dcfdjkl80c7x1nfvw3n6390nnbznlpfbg51sgp7sv8kpqr"
     },
     "6.12": {
         "version": "6.12.25",

From 0208d3b8257166f3a8a1afea81751c1ea85ec70c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 25 Apr 2025 23:00:27 +0000
Subject: [PATCH 139/144] linux_6_1: 6.1.134 -> 6.1.135

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index d849867bc37b..fab6f674d0cd 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:0pf83a8q4yxyz0wfnrwa14rdfcczll633qyn02n2pbqg7r5mxi61"
     },
     "6.1": {
-        "version": "6.1.134",
-        "hash": "sha256:08xx0w5gz7w5hqsnpckmizi1zpg38iwfchj20163ivnxf3fhriv0"
+        "version": "6.1.135",
+        "hash": "sha256:1fbyjprj65b1blb033lcy9y4bkh9jb7m06h6qph739wnzzhpmlg9"
     },
     "5.15": {
         "version": "5.15.180",

From 642d75ecdcf957b9db5b77e5619f84df6888037c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 23:54:24 +0000
Subject: [PATCH 140/144] mpls: 0.13.3 -> 0.14.0

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

diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix
index ff9a67cc6be2..6bad2eb54488 100644
--- a/pkgs/by-name/mp/mpls/package.nix
+++ b/pkgs/by-name/mp/mpls/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
   pname = "mpls";
-  version = "0.13.3";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "mhersson";
     repo = "mpls";
     tag = "v${version}";
-    hash = "sha256-sr0NZGQoaJw8LYJy13iNNos06KDHXNPbYSw3UAHi6eg=";
+    hash = "sha256-z3miAbL3qQHusWoofUp8kNNZjoGANhPjeIj39KPYyvc=";
   };
 
   vendorHash = "sha256-xILlYrwcnMWAPACeELwVKGUBIK9QbrUSR03xVmNXsnE=";

From d7db0976bb04116560e5fde685b4c844d0b7698d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Apr 2025 01:20:15 +0000
Subject: [PATCH 141/144] gatekeeper: 3.19.0 -> 3.19.1

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

diff --git a/pkgs/by-name/ga/gatekeeper/package.nix b/pkgs/by-name/ga/gatekeeper/package.nix
index 238fd9d5d86d..67bb6e36e22a 100644
--- a/pkgs/by-name/ga/gatekeeper/package.nix
+++ b/pkgs/by-name/ga/gatekeeper/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gatekeeper";
-  version = "3.19.0";
+  version = "3.19.1";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "gatekeeper";
     tag = "v${version}";
-    hash = "sha256-qxphyAAIacS0NY5nkmL8G4A4v/kJAXiH6ldjVeH7vY0=";
+    hash = "sha256-zU/OAiWc6H4YC5bnDFrqpfCT1HhDGCm+dkjriP2Wp3w=";
   };
 
   vendorHash = null;

From 58101daa57f4784905fc9e947a9a9d772b7a9b81 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sat, 26 Apr 2025 11:36:31 +0900
Subject: [PATCH 142/144] apprun-cli: 0.0.2 -> 0.3.2

Diff: https://github.com/fujiwara/apprun-cli/compare/v0.0.2...v0.3.2

Changelog: https://github.com/fujiwara/apprun-cli/blob/v0.3.2/CHANGELOG.md
---
 pkgs/by-name/ap/apprun-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/apprun-cli/package.nix b/pkgs/by-name/ap/apprun-cli/package.nix
index 1f2d7f5ced4e..1ae19d83a0c5 100644
--- a/pkgs/by-name/ap/apprun-cli/package.nix
+++ b/pkgs/by-name/ap/apprun-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "apprun-cli";
-  version = "0.0.2";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "fujiwara";
     repo = "apprun-cli";
     tag = "v${version}";
-    hash = "sha256-SvFShjAHjIKhz/YolgmFeaAxflh3FRPEZDx57+AtXeQ=";
+    hash = "sha256-k8ZFDWIuUjYqDIm7JdiqjeF2qaPX0SaOgqk4oud09Lc=";
   };
 
-  vendorHash = "sha256-pz97Eihc/6b2J+JuEZJQoqBkKtf1J5XbSFMQa1CJrRo=";
+  vendorHash = "sha256-WQRDkxL52RQmZn2aeE13pU4YGk8UjuZtS1lTNb53/hQ=";
 
   ldflags = [
     "-s"

From 040b39c5b5ec3feff1a89d2e390c7b4f477cb1da Mon Sep 17 00:00:00 2001
From: municorn <municorn@musicaloft.com>
Date: Fri, 25 Apr 2025 20:50:52 -0600
Subject: [PATCH 143/144] maintainers: update municorn

---
 maintainers/maintainer-list.nix    | 14 ++++++++------
 pkgs/applications/kde/palapeli.nix |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6f076a7d3e83..a867cf018761 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9383,12 +9383,6 @@
     name = "Martin Hardselius";
     keys = [ { fingerprint = "3F35 E4CA CBF4 2DE1 2E90  53E5 03A6 E6F7 8693 6619"; } ];
   };
-  harrisonthorne = {
-    email = "harrisonthorne@proton.me";
-    github = "muni-corn";
-    githubId = 33523827;
-    name = "Harrison Thorne";
-  };
   harryposner = {
     email = "nixpkgs@harryposner.com";
     github = "harryposner";
@@ -16417,6 +16411,14 @@
     githubId = 5047140;
     name = "Victor Collod";
   };
+  municorn = {
+    name = "municorn";
+    email = "municorn@musicaloft.com";
+    github = "muni-corn";
+    githubId = 33523827;
+    matrix = "@municorn:matrix.org";
+    keys = [ { fingerprint = "2686 7D83 CD74 CCEF 192F  052E 4B21 310A 52B1 5162"; } ];
+  };
   munksgaard = {
     name = "Philip Munksgaard";
     email = "philip@munksgaard.me";
diff --git a/pkgs/applications/kde/palapeli.nix b/pkgs/applications/kde/palapeli.nix
index 43c5134343a8..b6752063f539 100644
--- a/pkgs/applications/kde/palapeli.nix
+++ b/pkgs/applications/kde/palapeli.nix
@@ -26,6 +26,6 @@ mkDerivation {
     description = "Single-player jigsaw puzzle game";
     mainProgram = "palapeli";
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ harrisonthorne ];
+    maintainers = with lib.maintainers; [ municorn ];
   };
 }

From f98060925afd755f149340dbc0b55da10a0aa8d1 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 25 Apr 2025 18:27:01 +0000
Subject: [PATCH 144/144] incus: 6.11.0 -> 6.12.0

https://discuss.linuxcontainers.org/t/incus-6-12-has-been-released/23556
https://github.com/lxc/incus/releases/tag/v6.12.0
---
 pkgs/by-name/in/incus/1995.diff   | 93 +++++++++++++++++++++++++++++++
 pkgs/by-name/in/incus/package.nix | 11 ++--
 2 files changed, 100 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/in/incus/1995.diff

diff --git a/pkgs/by-name/in/incus/1995.diff b/pkgs/by-name/in/incus/1995.diff
new file mode 100644
index 000000000000..092bd149d856
--- /dev/null
+++ b/pkgs/by-name/in/incus/1995.diff
@@ -0,0 +1,93 @@
+diff --git a/internal/server/firewall/drivers/drivers_consts.go b/internal/server/firewall/drivers/drivers_consts.go
+index 2790e07a605..944bca5930e 100644
+--- a/internal/server/firewall/drivers/drivers_consts.go
++++ b/internal/server/firewall/drivers/drivers_consts.go
+@@ -1,8 +1,6 @@
+ package drivers
+ 
+ import (
+-	"encoding/json"
+-	"fmt"
+ 	"net"
+ )
+ 
+@@ -67,62 +65,12 @@ type NftListSetsOutput struct {
+ 
+ // NftListSetsEntry structure to read JSON output of nft set listing.
+ type NftListSetsEntry struct {
+-	Metainfo *NftMetainfo `json:"metainfo,omitempty"`
+-	Set      *NftSet      `json:"set,omitempty"`
+-}
+-
+-// NftMetainfo structure representing metainformation returned by nft.
+-type NftMetainfo struct {
+-	Version           string `json:"version"`
+-	ReleaseName       string `json:"release_name"`
+-	JSONSchemaVersion int    `json:"json_schema_version"`
++	Set *NftSet `json:"set,omitempty"`
+ }
+ 
+ // NftSet structure to parse the JSON of a set returned by nft -j list sets.
+ type NftSet struct {
+-	Family string    `json:"family"`
+-	Name   string    `json:"name"`
+-	Table  string    `json:"table"`
+-	Type   string    `json:"type"`
+-	Handle int       `json:"handle"`
+-	Flags  []string  `json:"flags"`
+-	Elem   ElemField `json:"elem"`
+-}
+-
+-// ElemField supports both string elements (IP, MAC) and dictionary-based CIDR elements.
+-// In order to parse it correctly a custom unsmarshalling is defined in drivers_nftables.go .
+-type ElemField struct {
+-	Addresses []string // Stores plain addresses and CIDR notations as strings.
+-}
+-
+-// UnmarshalJSON handles both plain strings and CIDR dictionaries inside `elem`.
+-func (e *ElemField) UnmarshalJSON(data []byte) error {
+-	var rawElems []any
+-	err := json.Unmarshal(data, &rawElems)
+-	if err != nil {
+-		return err
+-	}
+-
+-	for _, elem := range rawElems {
+-		switch v := elem.(type) {
+-		case string:
+-			// Plain address (IPv4, IPv6, or MAC).
+-			e.Addresses = append(e.Addresses, v)
+-		case map[string]any:
+-			// CIDR notation (prefix dictionary).
+-			prefix, ok := v["prefix"].(map[string]any)
+-			if ok {
+-				addr, addrOk := prefix["addr"].(string)
+-				lenFloat, lenOk := prefix["len"].(float64) // JSON numbers are float64 by default.
+-				if addrOk && lenOk {
+-					e.Addresses = append(e.Addresses, fmt.Sprintf("%s/%d", addr, int(lenFloat)))
+-				}
+-			}
+-
+-		default:
+-			return fmt.Errorf("Unsupported element type in NFTables set: %v", elem)
+-		}
+-	}
+-
+-	return nil
++	Family string `json:"family"`
++	Name   string `json:"name"`
++	Table  string `json:"table"`
+ }
+diff --git a/internal/server/firewall/drivers/drivers_nftables.go b/internal/server/firewall/drivers/drivers_nftables.go
+index fd9be2e2fbb..f803de9dff5 100644
+--- a/internal/server/firewall/drivers/drivers_nftables.go
++++ b/internal/server/firewall/drivers/drivers_nftables.go
+@@ -387,7 +387,7 @@ func (d Nftables) NetworkClear(networkName string, _ bool, _ []uint) error {
+ 		return fmt.Errorf("Failed clearing nftables rules for network %q: %w", networkName, err)
+ 	}
+ 
+-	err = d.RemoveIncusAddressSets("inet")
++	err = d.RemoveIncusAddressSets("bridge")
+ 	if err != nil {
+ 		return fmt.Errorf("Error in deletion of address sets: %w", err)
+ 	}
diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix
index c963f378a0e7..68044192d84f 100644
--- a/pkgs/by-name/in/incus/package.nix
+++ b/pkgs/by-name/in/incus/package.nix
@@ -1,8 +1,11 @@
 import ./generic.nix {
-  hash = "sha256-S6PTtgP4MFV+kiEgV8PBvek1SrVjLaCR9OJy/6jqJGE=";
-  version = "6.11.0";
-  vendorHash = "sha256-wKL+woCMjGJwCBG/JBhFbY4uc97/5K7OWPZRp0J+5DQ=";
-  patches = [ ];
+  hash = "sha256-hgZc30SRnmALTvuD32dNuO0r4pfpXXvN4CtJqn2fGuk=";
+  version = "6.12.0";
+  vendorHash = "sha256-/GwJG6kmjbiUUh0AWQ+IUbeK1kRcuWrwmNdTzH5LT38=";
+  patches = [
+    # fix nft, remove 6.13
+    ./1995.diff
+  ];
   nixUpdateExtraArgs = [
     "--override-filename=pkgs/by-name/in/incus/package.nix"
   ];