From 9abdf7235ff7765b0bfcaa740ae5b931dd84240e Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Wed, 29 Jan 2025 19:09:34 -0500
Subject: [PATCH 001/101] vscode-extensions.github.codespaces: 1.16.9 -> 1.17.3

changelog: https://marketplace.visualstudio.com/items/GitHub.codespaces/changelog
---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 17681f58ce00..c97f82916c7b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2087,8 +2087,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "codespaces";
-          version = "1.16.9";
-          hash = "sha256-Zj1dHz8uBHnRpjnD9tUr8OJILRq9Ty91ePiNq6/Vi7c=";
+          version = "1.17.3";
+          hash = "sha256-idJFYHJ4yeqpFZBX55Y0v1yfzgqyhS0MrC4yIto7i7w=";
         };
 
         meta = {

From 054ff11ba228836d9fd58e18e3382d7016d32d0b Mon Sep 17 00:00:00 2001
From: wenjin <hewenjin94@outlook.com>
Date: Tue, 4 Feb 2025 19:29:36 +0800
Subject: [PATCH 002/101] maintainers: add wenjinnn

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f3d03f99db7f..9db9a5ae42e3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24757,6 +24757,12 @@
     name = "Han Verstraete";
     keys = [ { fingerprint = "2145 955E 3F5E 0C95 3458  41B5 11F7 BAEA 8567 43FF"; } ];
   };
+  wenjinnn = {
+    name = "wenjin";
+    email = "hewenjin94@outlook.com";
+    github = "wenjinnn";
+    githubId = 30885216;
+  };
   wenngle = {
     name = "Zeke Stephens";
     email = "zekestephens@gmail.com";

From 087e1c9c05c4c67d4df650ca349b0decfcf3332e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2025 12:37:03 +0000
Subject: [PATCH 003/101] remotebox: 3.4 -> 3.5

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

diff --git a/pkgs/by-name/re/remotebox/package.nix b/pkgs/by-name/re/remotebox/package.nix
index 8919dd462463..e0408cf966ea 100644
--- a/pkgs/by-name/re/remotebox/package.nix
+++ b/pkgs/by-name/re/remotebox/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "remotebox";
-  version = "3.4";
+  version = "3.5";
 
   src = fetchurl {
     url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
-    sha256 = "sha256-oIWSli/pc+kqMkYqkeHr3fZshWUHx6ecqAZXf6fl2ik=";
+    sha256 = "sha256-dJCeiF2gYfpECLo9UtSuiAcvTHUQPX/NZE4vYX8v1F4=";
   };
 
   buildInputs = with perlPackages; [

From 3e929a82836569ca87af76bc9f2ef8459375d0a8 Mon Sep 17 00:00:00 2001
From: wenjin <hewenjin94@outlook.com>
Date: Sat, 1 Mar 2025 13:16:05 +0800
Subject: [PATCH 004/101] rofi-network-manager: init at 2024-09-03

---
 .../ro/rofi-network-manager/package.nix       | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 pkgs/by-name/ro/rofi-network-manager/package.nix

diff --git a/pkgs/by-name/ro/rofi-network-manager/package.nix b/pkgs/by-name/ro/rofi-network-manager/package.nix
new file mode 100644
index 000000000000..e8c05d2bd757
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-network-manager/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeWrapper,
+  networkmanager,
+  libnotify,
+  coreutils,
+  gnused,
+  gawk,
+}:
+
+let
+  wrapperPath = lib.makeBinPath [
+    coreutils
+    libnotify
+    gnused
+    gawk
+    networkmanager
+  ];
+
+in
+stdenv.mkDerivation {
+  pname = "rofi-network-manager";
+  version = "0-unstable-2024-09-03";
+
+  src = fetchFromGitHub {
+    owner = "meowrch";
+    repo = "rofi-network-manager";
+    rev = "90302dd1c0ea2d460a3455a208c10dff524469cd";
+    sha256 = "sha256-D8/Lh5a5rAUOhCXbjmL65PFzgmj3uu2mwCtxakHTefM=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm 0755 network-manager.sh $out/bin/rofi-network-manager
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/rofi-network-manager \
+      --prefix PATH : "${wrapperPath}"
+  '';
+
+  meta = {
+    description = "Manage wifi and ethernet with rofi";
+    homepage = "https://github.com/meowrch/rofi-network-manager";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ wenjinnn ];
+    mainProgram = "rofi-network-manager";
+    platforms = lib.platforms.linux;
+  };
+}

From 61e0966b1587444f68f587d096efdb5c791f428a Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sat, 1 Mar 2025 16:02:40 +0800
Subject: [PATCH 005/101] goldendict-ng: 24.09.1 -> 25.02.0

---
 pkgs/applications/misc/goldendict-ng/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix
index a0afd9824511..bd8c911eac89 100644
--- a/pkgs/applications/misc/goldendict-ng/default.nix
+++ b/pkgs/applications/misc/goldendict-ng/default.nix
@@ -24,20 +24,19 @@
   qtwayland,
   qt5compat,
   qtmultimedia,
-  qtspeech,
   wrapQtAppsHook,
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
   pname = "goldendict-ng";
-  version = "24.09.1";
+  version = "25.02.0";
 
   src = fetchFromGitHub {
     owner = "xiaoyifang";
     repo = "goldendict-ng";
-    rev = "v${finalAttrs.version}-Release.ca9dd133";
-    hash = "sha256-HvXC9fNLDZAEtXNjzFmaKz9Ih3n4Au69NPMuVeCiQPk=";
+    tag = "v25.02.0-Release.e895b18c";
+    hash = "sha256-k8pGzrSFbAUP7DG3lSAYBa5WeeSUbjZMvMqmxPqdT3E=";
   };
 
   nativeBuildInputs = [
@@ -96,4 +95,4 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     license = licenses.gpl3Plus;
   };
-})
+}

From ed0a92c735e658f8783cc83fe0beb37c42377ff4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 2 Mar 2025 17:10:13 +0000
Subject: [PATCH 006/101] desktopToDarwinBundle: use ARGB format
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Very belatedly, since we now only support macOS ≥ 11.3.

Co-authored-by: Karolis Stasaitis <contact@carlossless.io>
---
 pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
index 4fbef4baa512..6790754f740a 100644
--- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
+++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
@@ -115,15 +115,15 @@ convertIconTheme() {
     }
 
     # macOS does not correctly display 16x and 32x png icons on app bundles
-    # they need to be converted to rgb+mask (argb is supported only from macOS 11)
+    # they need to be converted to argb
     function convertIfUnsupportedIcon() {
         local -r in=$1
         local -r iconSize=$2
         local -r scale=$3
-        local -r out=${in%.png}.rgb
+        local -r out=${in%.png}.argb
 
         if [[ ($scale -eq 1) && ($iconSize -eq 32 || $iconSize -eq 16) ]]; then
-            echo "desktopToDarwinBundle: converting ${iconSize}x icon to rgb" >&2
+            echo "desktopToDarwinBundle: converting ${iconSize}x icon to argb" >&2
             icnsutil convert "$out" "$in"
             rm "$in"
         fi

From a396da7a08ca25580f826549efc8f165be649e9b Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 3 Mar 2025 05:25:51 +0800
Subject: [PATCH 007/101] termdown: 1.17.0 -> 1.18.0

---
 pkgs/applications/misc/termdown/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix
index aa20f51e3ae0..5e1ba20b4e82 100644
--- a/pkgs/applications/misc/termdown/default.nix
+++ b/pkgs/applications/misc/termdown/default.nix
@@ -10,27 +10,27 @@
 
 buildPythonApplication rec {
   pname = "termdown";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
-    rev = version;
-    sha256 = "1sd9z5n2a4ir35832wgxs68vwav7wxhq39b5h8pq934mp8sl3v2k";
-    repo = "termdown";
     owner = "trehn";
+    repo = "termdown";
+    tag = version;
+    hash = "sha256-Hnk/MOYdbOl14fI0EFbIq7Hmc7TyhcZWGEg2/jmNJ5Y=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     python-dateutil
     click
     pyfiglet
     setuptools
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Starts a countdown to or from TIMESPEC";
     mainProgram = "termdown";
     longDescription = "Countdown timer and stopwatch in your terminal";
     homepage = "https://github.com/trehn/termdown";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
   };
 }

From b10b8846883e20f78b1c9d72ca691dee1dbe7ecb Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sun, 2 Mar 2025 22:10:00 +0000
Subject: [PATCH 008/101] tailscale: move back to buildGoModule

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

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 1a07ba95d71e..ef69761a98e5 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -1,25 +1,30 @@
 {
   lib,
   stdenv,
-  buildGo123Module,
+
+  buildGoModule,
   fetchFromGitHub,
   fetchpatch,
+
   makeWrapper,
+  installShellFiles,
+  # runtime tooling - linux
   getent,
   iproute2,
   iptables,
-  lsof,
   shadow,
   procps,
+  # runtime tooling - darwin
+  lsof,
+
   nixosTests,
-  installShellFiles,
   tailscale-nginx-auth,
 }:
 
 let
   version = "1.80.2";
 in
-buildGo123Module {
+buildGoModule {
   pname = "tailscale";
   inherit version;
 
@@ -93,9 +98,9 @@ buildGo123Module {
       wrapProgram $out/bin/tailscaled \
         --prefix PATH : ${
           lib.makeBinPath [
+            getent
             iproute2
             iptables
-            getent
             shadow
           ]
         } \
@@ -116,13 +121,13 @@ buildGo123Module {
     inherit tailscale-nginx-auth;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tailscale.com";
     description = "Node agent for Tailscale, a mesh VPN built on WireGuard";
     changelog = "https://github.com/tailscale/tailscale/releases/tag/v${version}";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     mainProgram = "tailscale";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       mbaillie
       jk
       mfrw

From a0ec8cf1e4c363926e85d2c6aaed3b1fbd00152f Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sun, 2 Mar 2025 22:11:04 +0000
Subject: [PATCH 009/101] tailscale-nginx-auth: move back to buildGoModule

---
 pkgs/by-name/ta/tailscale-nginx-auth/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
index 5a5f8e354447..50d5d8e577e4 100644
--- a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
+++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
   stdenv,
-  buildGo123Module,
+  buildGoModule,
   tailscale,
 }:
 
-buildGo123Module {
+buildGoModule {
   pname = "tailscale-nginx-auth";
   inherit (tailscale) version src vendorHash;
 
@@ -27,11 +27,11 @@ buildGo123Module {
     install -D -m0444 -t $out/lib/systemd/system ./cmd/nginx-auth/tailscale.nginx-auth.socket
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tailscale.com";
     description = "Tool that allows users to use Tailscale Whois authentication with NGINX as a reverse proxy";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     mainProgram = "tailscale.nginx-auth";
-    maintainers = with maintainers; [ phaer ];
+    maintainers = with lib.maintainers; [ phaer ];
   };
 }

From 079c28fb814d4f6355e8a1e4a59c340d6eb3ca3e Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sun, 2 Mar 2025 22:12:08 +0000
Subject: [PATCH 010/101] tailscale: re-enable tests

---
 pkgs/by-name/ta/tailscale/package.nix | 60 ++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index ef69761a98e5..09543aff6e65 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -65,6 +65,12 @@ buildGoModule {
     "cmd/tsidp"
   ];
 
+  excludedPackages = [
+    # exlude integration tests which fail to work
+    # and require additional tooling
+    "tstest/integration"
+  ];
+
   ldflags = [
     "-w"
     "-s"
@@ -76,7 +82,59 @@ buildGoModule {
     "ts_include_cli"
   ];
 
-  doCheck = false;
+  # remove vendored tooling to ensure it's not used
+  # also avoids some unnecessary tests
+  preBuild = ''
+    rm -rf ./tool
+  '';
+
+  preCheck = ''
+    # feed in all tests for testing
+    # subPackages above limits what is built to just what we
+    # want but also limits the tests
+    unset subPackages
+
+    # several tests hang
+    rm tsnet/tsnet_test.go
+  '';
+
+  checkFlags =
+    let
+      skippedTests = [
+        # dislikes vendoring
+        "TestPackageDocs" # .
+        # tries to start tailscaled
+        "TestContainerBoot" # cmd/containerboot
+
+        # just part of a tool which generates yaml for k8s CRDs
+        # requires helm
+        "Test_generate" # cmd/k8s-operator/generate
+        # self reported potentially flakey test
+        "TestConnMemoryOverhead" # control/controlbase
+
+        # interacts with `/proc/net/route` and need a default route
+        "TestDefaultRouteInterface" # net/netmon
+        "TestRouteLinuxNetlink" # net/netmon
+        "TestGetRouteTable" # net/routetable
+
+        # remote udp call to 8.8.8.8
+        "TestDefaultInterfacePortable" # net/netutil
+
+        # launches an ssh server which works when provided openssh
+        # also requires executing commands but nixbld user has /noshell
+        "TestSSH" # ssh/tailssh
+        # wants users alice & ubuntu
+        "TestMultipleRecorders" # ssh/tailssh
+        "TestSSHAuthFlow" # ssh/tailssh
+        "TestSSHRecordingCancelsSessionsOnUploadFailure" # ssh/tailssh
+        "TestSSHRecordingNonInteractive" # ssh/tailssh
+
+        # test for a dev util which helps to fork golang.org/x/crypto/acme
+        # not necessary and fails to match
+        "TestSyncedToUpstream" # tempfork/acme
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
   postInstall =
     ''

From 40f691e0a53477d0e4f9865266ea28ec0b63b8a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Mar 2025 23:45:38 +0000
Subject: [PATCH 011/101] termius: 9.14.0 -> 9.15.2

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

diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix
index 52411f8d227b..28228fb72062 100644
--- a/pkgs/by-name/te/termius/package.nix
+++ b/pkgs/by-name/te/termius/package.nix
@@ -16,8 +16,8 @@
 
 stdenv.mkDerivation rec {
   pname = "termius";
-  version = "9.14.0";
-  revision = "214";
+  version = "9.15.2";
+  revision = "216";
 
   src = fetchurl {
     # find the latest version with
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     # and the sha512 with
     # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
     url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap";
-    hash = "sha512-jnQXsmKrdL7OldmzSzriD6U8lMgme0Ya9aA/OPuc74DkRM9SJkI09XaXz03pZLVDKlWByAN9f+j1P0s5fvbkdA==";
+    hash = "sha512-BbO/DMQOlUYm0Y7PLxgfRhRfWoZds8f6M2rizswlwF8x3EqT+A1ZoWYAbWJ0KSeU5o/ZTQoVD8VldqkS2AVoMw==";
   };
 
   desktopItem = makeDesktopItem {

From e6644282aeaacfeb3cb7e6620d084ae0fe8a3c8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Mar 2025 00:40:34 +0000
Subject: [PATCH 012/101] yoshimi: 2.3.3.2 -> 2.3.3.3

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

diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix
index 8b0744a2ad86..de8f26d88d50 100644
--- a/pkgs/by-name/yo/yoshimi/package.nix
+++ b/pkgs/by-name/yo/yoshimi/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yoshimi";
-  version = "2.3.3.2";
+  version = "2.3.3.3";
 
   src = fetchFromGitHub {
     owner = "Yoshimi";
     repo = pname;
     rev = version;
-    hash = "sha256-DfmNC78azqNVg0o4JumRytl6JqolweYbZTt1svjzwIo=";
+    hash = "sha256-i6kzVtg2ukob0QBr/hbxblm+eTkPIKbnGLpFdUl/zGQ=";
   };
 
   sourceRoot = "${src.name}/src";

From ce79cddc61465556f2f1993c8d44d79198596227 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 3 Mar 2025 02:42:57 +0100
Subject: [PATCH 013/101] python313Packages.aiodocker: fix build

fixes https://hydra.nixos.org/build/290688716
---
 pkgs/development/python-modules/aiodocker/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/aiodocker/default.nix b/pkgs/development/python-modules/aiodocker/default.nix
index 13f5134d3cec..43e0e409a015 100644
--- a/pkgs/development/python-modules/aiodocker/default.nix
+++ b/pkgs/development/python-modules/aiodocker/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   aiohttp,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -18,7 +19,10 @@ buildPythonPackage rec {
     sha256 = "RL5Ck4wsBZO88afmoojeFKbdIeCjDo/SwNqUcERH6Ls=";
   };
 
-  propagatedBuildInputs = [ aiohttp ];
+  propagatedBuildInputs = [
+    aiohttp
+    typing-extensions
+  ];
 
   # tests require docker daemon
   doCheck = false;

From b4d37d2e59f56f60868810dd8e46d40aa268900a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Mar 2025 06:37:39 +0000
Subject: [PATCH 014/101] flix: 0.57.1 -> 0.58.0

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

diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix
index 082564f802cc..416e886a3db0 100644
--- a/pkgs/by-name/fl/flix/package.nix
+++ b/pkgs/by-name/fl/flix/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "flix";
-  version = "0.57.1";
+  version = "0.58.0";
 
   src = fetchurl {
     url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
-    sha256 = "sha256-baUKhAC0M4nLbukxdWaxsToGGS1Zb+Oj9CTCqtwHE4o=";
+    sha256 = "sha256-nneE2qE7k89gg8aBscyRHRD5jpNmQxwdxQmKlX1w/KA=";
   };
 
   dontUnpack = true;

From b50dacf1f15e7f8abccf41f308fc7cae5b160eb6 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 3 Mar 2025 19:04:47 +0800
Subject: [PATCH 015/101] tpmmanager: 0.8.1 -> 0.9.0

---
 pkgs/applications/misc/tpmmanager/default.nix | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix
index 0e25349d2f33..2164b56642b8 100644
--- a/pkgs/applications/misc/tpmmanager/default.nix
+++ b/pkgs/applications/misc/tpmmanager/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   qtbase,
   qmake,
   wrapQtAppsHook,
@@ -10,28 +9,16 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.1";
   pname = "tpmmanager";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "Rohde-Schwarz";
     repo = "TPMManager";
-    rev = "v${version}";
-    sha256 = "sha256-UZYn4ssbvLpdB0DssT7MXqQZCu1KkLf/Bsb45Rvgm+E=";
+    tag = "v${version}";
+    hash = "sha256-FhdrUJQq4us6BT8CxgWqWiXnbl900204yjyS3nnQACU=";
   };
 
-  patches = [
-    # build with Qt5
-    (fetchpatch {
-      url = "https://github.com/Rohde-Schwarz/TPMManager/commit/f62c0f2de2097af9b504c80d6193818e6e4ca84f.patch";
-      sha256 = "sha256-gMhDNN2UkX2lJf/oJEzOkCvF6+EGdIj9xwtXb1rCeys=";
-    })
-    (fetchpatch {
-      url = "https://github.com/Rohde-Schwarz/TPMManager/commit/c287a841ac6b057ed35799949211866b9f533561.patch";
-      sha256 = "sha256-2ZyUml8Q9bKQLVZWr18AzLt8VYLICXH9VDeq6B5Xfto=";
-    })
-  ];
-
   nativeBuildInputs = [
     qmake
     wrapQtAppsHook
@@ -43,6 +30,8 @@ stdenv.mkDerivation rec {
   ];
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin
     install -Dpm755 -D bin/tpmmanager $out/bin/tpmmanager
 
@@ -56,6 +45,8 @@ stdenv.mkDerivation rec {
     Exec=$out/bin/tpmmanager
     Terminal=false
     EOF
+
+    runHook postInstall
   '';
 
   meta = {
@@ -64,6 +55,6 @@ stdenv.mkDerivation rec {
     mainProgram = "tpmmanager";
     license = lib.licenses.gpl2;
     maintainers = [ ];
-    platforms = with lib.platforms; linux;
+    platforms = lib.platforms.linux;
   };
 }

From 2bf982eeb3c4ac86ef97bf112e5da30af2142a8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Mar 2025 14:36:22 +0000
Subject: [PATCH 016/101] percona-server_8_0: 8.0.40-31 -> 8.0.41-32

---
 pkgs/servers/sql/percona-server/8_0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
index 45f5a5b99a69..d64e5c445b03 100644
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "percona-server";
-  version = "8.0.40-31";
+  version = "8.0.41-32";
 
   src = fetchurl {
     url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ExhnDY4XbCTfdAGfdI9fIz4nh/hl3T1B1heQq1p3LE4=";
+    hash = "sha256-3ua/8X0vzbBzjRNhmMjdz3Wfk7ECs67bPoCYBBNXywc=";
   };
 
   nativeBuildInputs = [

From 82ab779a54138fa8dca3dd8cd68117b6646e5817 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Mon, 24 Feb 2025 21:16:00 +0100
Subject: [PATCH 017/101] nixfmt-tree: init

Motivation: https://github.com/NixOS/nixfmt/issues/273
---
 pkgs/by-name/ni/nixfmt-tree/package.nix | 133 ++++++++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 pkgs/by-name/ni/nixfmt-tree/package.nix

diff --git a/pkgs/by-name/ni/nixfmt-tree/package.nix b/pkgs/by-name/ni/nixfmt-tree/package.nix
new file mode 100644
index 000000000000..d16d79c67460
--- /dev/null
+++ b/pkgs/by-name/ni/nixfmt-tree/package.nix
@@ -0,0 +1,133 @@
+{
+  lib,
+  runCommand,
+  buildEnv,
+  makeWrapper,
+  writers,
+  treefmt2,
+  nixfmt-rfc-style,
+  nixfmt-tree,
+
+  settings ? {
+    # The default is warn, which would be too annoying for people who just care about Nix
+    on-unmatched = "info";
+    # Assumes the user is using Git, fails if it's not
+    tree-root-file = ".git/index";
+
+    formatter.nixfmt = {
+      command = "nixfmt";
+      includes = [ "*.nix" ];
+    };
+  },
+  runtimePackages ? [
+    nixfmt-rfc-style
+  ],
+}:
+buildEnv {
+  name = "nixfmt-tree";
+
+  # Allows this derivation to be used as a shell providing both treefmt and nixfmt
+  paths = [ treefmt2 ] ++ runtimePackages;
+  pathsToLink = [ "/bin" ];
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  postBuild = ''
+    wrapProgram $out/bin/treefmt \
+      --prefix PATH : $out/bin \
+      --add-flags "--config-file ${writers.writeTOML "treefmt.toml" settings}"
+  '';
+
+  meta = {
+    mainProgram = "treefmt";
+    description = "Official Nix formatter zero-setup starter using treefmt";
+    longDescription = ''
+      A zero-setup [treefmt](https://treefmt.com/) starter to get started using the [official Nix formatter](https://github.com/NixOS/nixfmt).
+
+      - For `nix fmt` to format all Nix files, add this to the `flake.nix` outputs:
+
+        ```nix
+        formatter.''${system} = nixpkgs.legacyPackages.''${system}.nixfmt-tree;
+        ```
+
+      - The same can be done more efficiently with the `treefmt` command,
+        which you can get in `nix-shell`/`nix develop` by extending `mkShell` using
+
+        ```nix
+        mkShell {
+          packages = [ pkgs.nixfmt-tree ];
+        }
+        ```
+
+        You can then also use `treefmt` in a pre-commit/pre-push [Git hook](https://git-scm.com/docs/githooks)
+        and `nixfmt` with your editors format-on-save feature.
+
+      - To check formatting in CI, run the following in a checkout of your Git repository:
+        ```
+        treefmt --ci
+        ```
+
+      For more flexibility, you can customise this package using
+      ```nix
+      nixfmt-tree.override {
+        settings = { /* treefmt config */ };
+        runtimePackages = [ /* List any formatters here */ ];
+      }
+      ```
+
+      Alternatively you can switch to the more fully-featured [treefmt-nix](https://github.com/numtide/treefmt-nix).
+    '';
+    # All the code is in this file, so same license as Nixpkgs
+    license = lib.licenses.mit;
+    maintainers = lib.teams.formatter.members;
+    platforms = lib.platforms.all;
+  };
+
+  passthru.tests.simple = runCommand "nixfmt-tree-test-simple" { } ''
+    export XDG_CACHE_HOME=$(mktemp -d)
+    cat > unformatted.nix <<EOF
+    let to = "be formatted"; in to
+    EOF
+
+    cat > formatted.nix <<EOF
+    let
+      to = "be formatted";
+    in
+    to
+    EOF
+
+    mkdir -p repo
+    (
+      cd repo
+      mkdir .git dir
+      touch .git/index
+      cp ../unformatted.nix a.nix
+      cp ../unformatted.nix dir/b.nix
+
+      ${lib.getExe nixfmt-tree} dir
+      if [[ "$(<dir/b.nix)" != "$(<../formatted.nix)" ]]; then
+        echo "File dir/b.nix was not formatted properly after dir was requested to be formatted"
+        exit 1
+      elif [[ "$(<a.nix)" != "$(<../unformatted.nix)" ]]; then
+        echo "File a.nix was formatted when only dir was requested to be formatted"
+        exit 1
+      fi
+
+      (
+        cd dir
+        ${lib.getExe nixfmt-tree}
+      )
+
+      if [[ "$(<a.nix)" != "$(<../formatted.nix)" ]]; then
+        echo "File a.nix was not formatted properly after running treefmt without arguments in dir"
+        exit 1
+      fi
+    )
+
+    echo "Success!"
+
+    touch $out
+  '';
+}

From 70e0df67825cfe82659aee7fdbffaa4777c596b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Mar 2025 20:43:00 +0000
Subject: [PATCH 018/101] klog-rs: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix
index db26a02c5e8c..9c0e15bce9d4 100644
--- a/pkgs/by-name/kl/klog-rs/package.nix
+++ b/pkgs/by-name/kl/klog-rs/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "klog-rs";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "tobifroe";
     repo = "klog";
     rev = version;
-    hash = "sha256-AlXyCDjs5xFqM0TmaBGfzvYn/ZDWAgBzLV/mDPQHflI=";
+    hash = "sha256-t53HC5eBC587jyvJKxlG3B3Im7RM6bDcZfUO4npgGfM=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-A9QhOFsjEXljsugakJ0s7XdAPF447JIFaQGfDGDVp1E=";
+  cargoHash = "sha256-HmKMxI94j0cLLAjmUJQhymop9qiH71Rm8dnVVs2VDF8=";
   checkFlags = [
     # this integration test depends on a running kubernetes cluster
     "--skip=k8s::tests::test_get_pod_list"

From fb280d10feacd6846e896aff224c90cd52258c4d Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Mon, 3 Mar 2025 22:53:17 +0000
Subject: [PATCH 019/101] nix-heuristic-gc: init at 0.6.0

Fixes #386184.
---
 pkgs/by-name/ni/nix-heuristic-gc/package.nix | 53 ++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/ni/nix-heuristic-gc/package.nix

diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix
new file mode 100644
index 000000000000..2b16269ad9eb
--- /dev/null
+++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix
@@ -0,0 +1,53 @@
+# Heavily based on
+# https://github.com/risicle/nix-heuristic-gc/blob/0.6.0/default.nix
+{
+  lib,
+  fetchFromGitHub,
+  nix,
+  boost,
+  python3Packages,
+}:
+python3Packages.buildPythonPackage rec {
+  pname = "nix-heuristic-gc";
+  version = "0.6.0";
+  src = fetchFromGitHub {
+    owner = "risicle";
+    repo = "nix-heuristic-gc";
+    tag = "v${version}";
+    hash = "sha256-lph+rm8qXoA6h2dJTYeuj9HJAx6PnKZSdsKBElbBUbY=";
+  };
+
+  # NIX_SYSTEM suggested at
+  # https://github.com/NixOS/nixpkgs/issues/386184#issuecomment-2692433531
+  NIX_SYSTEM = nix.stdenv.hostPlatform.system;
+  NIX_CFLAGS_COMPILE = [ "-I${lib.getDev nix}/include/nix" ];
+
+  buildInputs = [
+    boost
+    nix
+    python3Packages.pybind11
+    python3Packages.setuptools
+  ];
+  propagatedBuildInputs = [
+    python3Packages.humanfriendly
+    python3Packages.rustworkx
+  ];
+  checkInputs = [ python3Packages.pytestCheckHook ];
+
+  preCheck = "mv nix_heuristic_gc .nix_heuristic_gc";
+
+  meta = {
+    mainProgram = "nix-heuristic-gc";
+    description = "Discerning garbage collection for Nix";
+    longDescription = ''
+      A more discerning cousin of `nix-collect-garbage`, mostly intended as a
+      testbed to allow experimentation with more advanced selection processes.
+    '';
+    homepage = "https://github.com/risicle/nix-heuristic-gc";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [
+      ris
+      me-and
+    ];
+  };
+}

From 0d65e960d6658f90eaeddc60e66f6099fcf3a64e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 3 Mar 2025 17:35:06 -0600
Subject: [PATCH 020/101] bochs: 2.8 -> 3.0

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

diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix
index 94c22670807b..d609ef99196b 100644
--- a/pkgs/by-name/bo/bochs/package.nix
+++ b/pkgs/by-name/bo/bochs/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bochs";
-  version = "2.8";
+  version = "3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/bochs/bochs/${finalAttrs.version}/bochs-${finalAttrs.version}.tar.gz";
-    hash = "sha256-qFsTr/fYQR96nzVrpsM7X13B+7EH61AYzCOmJjnaAFk=";
+    hash = "sha256-y29UK1HzWizJIGsqmA21YCt80bfPLk7U8Ras1VB3gao=";
   };
 
   nativeBuildInputs = [

From 2eea346955dd5350d0827a6c193d9cdc03efddbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 02:02:12 +0000
Subject: [PATCH 021/101] libmsquic: 2.4.7 -> 2.4.8

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

diff --git a/pkgs/by-name/li/libmsquic/package.nix b/pkgs/by-name/li/libmsquic/package.nix
index 965df2d62ad0..f8e38afd0b2f 100644
--- a/pkgs/by-name/li/libmsquic/package.nix
+++ b/pkgs/by-name/li/libmsquic/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmsquic";
-  version = "2.4.7";
+  version = "2.4.8";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "msquic";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WveyZ9rMevLTc5C4cgMFcnj0O6Hd+HcfU8ccD6VBgyU=";
+    hash = "sha256-cgLrTcoa77XuVsMBvOWw9oKoNtD1ihJM553YpZ+GzQQ=";
     fetchSubmodules = true;
   };
 

From bc4dbacd927c61469dbdea5961a500e455ded6b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 02:32:25 +0000
Subject: [PATCH 022/101] sigal: 2.4 -> 2.5

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

diff --git a/pkgs/by-name/si/sigal/package.nix b/pkgs/by-name/si/sigal/package.nix
index 594edec88205..a588678931c9 100644
--- a/pkgs/by-name/si/sigal/package.nix
+++ b/pkgs/by-name/si/sigal/package.nix
@@ -8,12 +8,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sigal";
-  version = "2.4";
+  version = "2.5";
   pyproject = true;
 
   src = fetchPypi {
     inherit version pname;
-    hash = "sha256-pDTaqtqfuk7tACkyaKClTJotuVcTKli5yx1wbEM93TM=";
+    hash = "sha256-IOAQ6lMudYH+Ukx27VKbPNKmQKBaX3j0p750nC5Y1Hg=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From e5c630d446841dd405401f2520feda4f8548b98a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 03:03:36 +0000
Subject: [PATCH 023/101] sbt: 1.10.7 -> 1.10.9

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 550075230be3..5b49be77b119 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sbt";
-  version = "1.10.7";
+  version = "1.10.9";
 
   src = fetchurl {
     url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
-    hash = "sha256-MsFSM8Y2wjPuJaLDGHkEnbcCHP73CAfBh1FcOblrD+Y=";
+    hash = "sha256-a3BLpJduUqkcTx+zmU1yXturCAfF/DrCnMVB18JSYzU=";
   };
 
   postPatch = ''

From 6b5592268233bd628ffd63bb640698e8a63f3605 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 03:03:38 +0000
Subject: [PATCH 024/101] sbt-with-scala-native: 1.10.7 -> 1.10.9

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 550075230be3..5b49be77b119 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sbt";
-  version = "1.10.7";
+  version = "1.10.9";
 
   src = fetchurl {
     url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
-    hash = "sha256-MsFSM8Y2wjPuJaLDGHkEnbcCHP73CAfBh1FcOblrD+Y=";
+    hash = "sha256-a3BLpJduUqkcTx+zmU1yXturCAfF/DrCnMVB18JSYzU=";
   };
 
   postPatch = ''

From 1492476b6ed61971b2cb94012a0532de036111c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 03:08:42 +0000
Subject: [PATCH 025/101] star-history: 1.0.26 -> 1.0.27

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

diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix
index 097e2bae31b6..ee2bee6d503e 100644
--- a/pkgs/by-name/st/star-history/package.nix
+++ b/pkgs/by-name/st/star-history/package.nix
@@ -10,15 +10,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "star-history";
-  version = "1.0.26";
+  version = "1.0.27";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-qwpUV+amv/n/lRcFYf/TgXoj3aHdg3kZJigEeA0fKBg=";
+    hash = "sha256-IpMhCI6XS6h7kHaohCdS0YAUUR6PeC9mbMRCiS3p29c=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Lzuzb0d1p5JGrz1cp+GuB7uoCIV+xJLNs6N22Gd8Nbs=";
+  cargoHash = "sha256-bu7YUwrLKHdDL+rxw++8mrWH2hBhEF4jNqZls/9F+aM=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 91e0792093b597bd07920f540a847d303124fb05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 03:35:19 +0000
Subject: [PATCH 026/101] awscli2: 2.24.7 -> 2.24.16

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

diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix
index 55100ad31274..b66e42437564 100644
--- a/pkgs/by-name/aw/awscli2/package.nix
+++ b/pkgs/by-name/aw/awscli2/package.nix
@@ -64,14 +64,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "awscli2";
-  version = "2.24.7"; # N.B: if you change this, check if overrides are still up-to-date
+  version = "2.24.16"; # N.B: if you change this, check if overrides are still up-to-date
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-cli";
     tag = version;
-    hash = "sha256-yTfTWLI12ASKb6zkXb37vARIOVBLxqFWvtEDOMjXges=";
+    hash = "sha256-WbCJ3sBCI5wC6QbxY1KKNpJ8hkK6yhonq7F2Gzxw8DA=";
   };
 
   postPatch = ''

From 9e6af31c9c64b222e129320efc75e95546352034 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 03:55:37 +0000
Subject: [PATCH 027/101] python312Packages.rich-argparse: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix
index fd30096010af..31e26c0b8d01 100644
--- a/pkgs/development/python-modules/rich-argparse/default.nix
+++ b/pkgs/development/python-modules/rich-argparse/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "rich-argparse";
-  version = "1.6.0";
+  version = "1.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "hamdanal";
     repo = "rich-argparse";
     tag = "v${version}";
-    hash = "sha256-ae++npgZ8jZazwARwlPw73uhpQ8IT+7OekNl2vfu4Z0=";
+    hash = "sha256-XuRQeE9JrF4ym2H1ky1yH0fENnsWbL90vboQzTo23w0=";
   };
 
   build-system = [ hatchling ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Format argparse help output using rich";
     homepage = "https://github.com/hamdanal/rich-argparse";
-    changelog = "https://github.com/hamdanal/rich-argparse/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/hamdanal/rich-argparse/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ graham33 ];
   };

From 0eb2a2086e5b3a996baf19251197f52602cee2a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 07:56:20 +0100
Subject: [PATCH 028/101] reptor: 0.26 -> 0.27

Diff: https://github.com/Syslifters/reptor/compare/refs/tags/0.26...0.27

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

diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix
index 88aafa1541a9..c1fbf0c5b36d 100644
--- a/pkgs/development/python-modules/reptor/default.nix
+++ b/pkgs/development/python-modules/reptor/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "reptor";
-  version = "0.26";
+  version = "0.27";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "Syslifters";
     repo = "reptor";
     tag = version;
-    hash = "sha256-o/nykMeRvyvlloDNJJb7fTUqiOYg7P4AsSUjS4qr3aI=";
+    hash = "sha256-aba2f+7I/Lo3Vr7u9VCDRXQ5BRbQpJlQCCnib+Wp9Vs=";
   };
 
   pythonRelaxDeps = true;

From 8cc3f022bf60fc27c48e868bcc3cb3205900714f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 07:56:53 +0100
Subject: [PATCH 029/101] vunnel: 0.30.0 -> 0.31.0

Diff: https://github.com/anchore/vunnel/compare/refs/tags/v0.30.0...v0.31.0

Changelog: https://github.com/anchore/vunnel/releases/tag/v0.31.0
---
 pkgs/by-name/vu/vunnel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index 43fcb0c90554..7291d49cfad4 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "vunnel";
-  version = "0.30.0";
+  version = "0.31.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "vunnel";
     tag = "v${version}";
-    hash = "sha256-sWZ0y4ueUcDlbHh55iplIy0mTJOObVqeUi4hMtefjqc=";
+    hash = "sha256-3o4ap8BElDxxg3pohzXz38AQlQbzOPeSc5/OYZg8VFM=";
   };
 
   pythonRelaxDeps = [

From 5831524024b84dc8ce0299dcdd32b9cc73ec2a8e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 07:57:27 +0100
Subject: [PATCH 030/101] ssh-mitm: 5.0.0 -> 5.0.1

Diff: https://github.com/ssh-mitm/ssh-mitm/compare/refs/tags/5.0.0...5.0.1

Changelog: https://github.com/ssh-mitm/ssh-mitm/blob/5.0.1/CHANGELOG.md
---
 pkgs/by-name/ss/ssh-mitm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ss/ssh-mitm/package.nix b/pkgs/by-name/ss/ssh-mitm/package.nix
index da03f6bb30dd..e81ccaea79f3 100644
--- a/pkgs/by-name/ss/ssh-mitm/package.nix
+++ b/pkgs/by-name/ss/ssh-mitm/package.nix
@@ -26,14 +26,14 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "ssh-mitm";
-  version = "5.0.0";
+  version = "5.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ssh-mitm";
     repo = "ssh-mitm";
     tag = version;
-    hash = "sha256-jRheKLAXbbMyxdtDSJ4QSN4PoUM2YoK7nmU5xqPq7DY=";
+    hash = "sha256-FmxVhYkPRZwS+zFwuId9nRGN832LRkgCNgDYb8Pg01U=";
   };
 
   build-system = [

From c6b95d92c7127519d9b7063ca0849edd32a78f07 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 08:14:46 +0100
Subject: [PATCH 031/101] python313Packages.dvc-ssh: 4.1.1 -> 4.2.1

Changelog: https://github.com/iterative/dvc-ssh/releases/tag/4.2.1
---
 .../python-modules/dvc-ssh/default.nix        | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/dvc-ssh/default.nix b/pkgs/development/python-modules/dvc-ssh/default.nix
index 3578e1b572eb..5e2206d91342 100644
--- a/pkgs/development/python-modules/dvc-ssh/default.nix
+++ b/pkgs/development/python-modules/dvc-ssh/default.nix
@@ -6,16 +6,20 @@
   fetchPypi,
   setuptools-scm,
   sshfs,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "dvc-ssh";
-  version = "4.1.1";
+  version = "4.2.1";
   pyproject = true;
 
+  disabled = pythonOlder "3.9";
+
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-lvC6oAXQR4u7s+11n6NgQExPc9yrq3JAmmXtuOw22tI=";
+    pname = "dvc_ssh";
+    inherit version;
+    hash = "sha256-ld6uaAIA+8lHK/TjKtrjtmGKj5847SBMYYvKKN+MkS4=";
   };
 
   pythonRemoveDeps = [
@@ -23,16 +27,18 @@ buildPythonPackage rec {
     "dvc"
   ];
 
-  nativeBuildInputs = [
-    setuptools-scm
-  ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     bcrypt
     dvc-objects
     sshfs
   ];
 
+  optional-dependencies = {
+    gssapi = [ sshfs ];
+  };
+
   # bcrypt is enabled for sshfs in nixpkgs
   postPatch = ''
     substituteInPlace setup.cfg --replace "sshfs[bcrypt]" "sshfs"
@@ -47,7 +53,7 @@ buildPythonPackage rec {
   # ];
 
   meta = with lib; {
-    description = "ssh plugin for dvc";
+    description = "SSH plugin for dvc";
     homepage = "https://pypi.org/project/dvc-ssh/${version}";
     changelog = "https://github.com/iterative/dvc-ssh/releases/tag/${version}";
     license = licenses.asl20;

From a9dfa72c0c9064fd2fb96e847b94a79596b7bb3b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 08:18:26 +0100
Subject: [PATCH 032/101] python312Packages.dvc: add ssh_gssapi

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

diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index 147d8c527daf..d2ff207e6af1 100644
--- a/pkgs/development/python-modules/dvc/default.nix
+++ b/pkgs/development/python-modules/dvc/default.nix
@@ -137,6 +137,7 @@ buildPythonPackage rec {
     hdfs = [ dvc-hdfs ];
     s3 = [ dvc-s3 ];
     ssh = [ dvc-ssh ];
+    ssh_gssapi = [ dvc-ssh ] ++ dvc-ssh.optional-dependencies.gssapi;
   };
 
   # Tests require access to real cloud services

From 32424042adb8e602276f2a819180d4150807d623 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 07:24:40 +0000
Subject: [PATCH 033/101] python312Packages.pyfibaro: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix
index b1918b5ed599..159e2500c8ae 100644
--- a/pkgs/development/python-modules/pyfibaro/default.nix
+++ b/pkgs/development/python-modules/pyfibaro/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyfibaro";
-  version = "0.8.1";
+  version = "0.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "rappenze";
     repo = "pyfibaro";
     tag = version;
-    hash = "sha256-M7ntlPK88er9Se3pPZEHjCDw3TIYtiruHdaCLB0ee8A=";
+    hash = "sha256-0mWqjiKPyXlnXDG+SP/RrV3aergTG9cEFKe3Zczr8IE=";
   };
 
   build-system = [ setuptools ];
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library to access FIBARO Home center";
     homepage = "https://github.com/rappenze/pyfibaro";
-    changelog = "https://github.com/rappenze/pyfibaro/releases/tag/${version}";
+    changelog = "https://github.com/rappenze/pyfibaro/releases/tag/${src.tag}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From c493d93f9eeaa176e89e7dc7f357ffa40ac92ffd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 08:25:28 +0100
Subject: [PATCH 034/101] python313Packages.dvc-webdav: init at 3.0.0

Webdav plugin for dvc

https://pypi.org/project/dvc-webdav/
---
 .../python-modules/dvc-webdav/default.nix     | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/dvc-webdav/default.nix

diff --git a/pkgs/development/python-modules/dvc-webdav/default.nix b/pkgs/development/python-modules/dvc-webdav/default.nix
new file mode 100644
index 000000000000..876904dc6b2e
--- /dev/null
+++ b/pkgs/development/python-modules/dvc-webdav/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  dvc-objects,
+  fetchPypi,
+  pythonOlder,
+  setuptools-scm,
+  setuptools,
+  webdav4,
+}:
+
+buildPythonPackage rec {
+  pname = "dvc-webdav";
+  version = "3.0.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Zefu8uvINBWo3b3LV5vyGaN5fGfnpi1FaMXILeK2pQg=";
+  };
+
+  # Prevent circular dependency
+  pythonRemoveDeps = [ "dvc" ];
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    dvc-objects
+    webdav4
+  ];
+
+  # Circular dependency
+  # pythonImportsCheck = [ "dvc_webdav" ];
+
+  meta = {
+    description = "Webdav plugin for dvc";
+    homepage = "https://pypi.org/project/dvc-webdav/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 755147a1865e..36d52a31f784 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4052,6 +4052,8 @@ self: super: with self; {
 
   dvc-task = callPackage ../development/python-modules/dvc-task {  };
 
+  dvc-webdav = callPackage ../development/python-modules/dvc-webdav {  };
+
   dvclive = callPackage ../development/python-modules/dvclive {  };
 
   dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };

From 8fa00eedbc163ccdceb99ff9209ae8962e50d7de Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 08:26:59 +0100
Subject: [PATCH 035/101] python312Packages.dvc: add webdav

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

diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index d2ff207e6af1..842a9253ae6c 100644
--- a/pkgs/development/python-modules/dvc/default.nix
+++ b/pkgs/development/python-modules/dvc/default.nix
@@ -17,6 +17,7 @@
   dvc-ssh,
   dvc-studio-client,
   dvc-task,
+  dvc-webdav,
   fetchFromGitHub,
   flatten-dict,
   flufl-lock,
@@ -138,6 +139,7 @@ buildPythonPackage rec {
     s3 = [ dvc-s3 ];
     ssh = [ dvc-ssh ];
     ssh_gssapi = [ dvc-ssh ] ++ dvc-ssh.optional-dependencies.gssapi;
+    webdav = [ dvc-webdav ];
   };
 
   # Tests require access to real cloud services

From 831f024b35893dbf3a56d10550710616b89be241 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 07:30:27 +0000
Subject: [PATCH 036/101] istioctl: 1.24.3 -> 1.25.0

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

diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix
index 4a8ab59fc285..327502f54029 100644
--- a/pkgs/by-name/is/istioctl/package.nix
+++ b/pkgs/by-name/is/istioctl/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.24.3";
+  version = "1.25.0";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    hash = "sha256-/ABy0zZF/+rxYkpS5H6EAXZVYZxt7I4SCjLtrtkacGw=";
+    hash = "sha256-dTV5yjQZG7RjfUmXGil6ad46HaZzUCwk27EdP+yYbRE=";
   };
-  vendorHash = "sha256-B4MxvOzKxsQJmc9dKQFt1CGi1PnElOt8H72H2JVaZUU=";
+  vendorHash = "sha256-KecRVqI00F/qoLkbi1CaKotyTnSp0K/u7xKPb45TYMY=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 71dc2f1520cefc23c3f36b44c76dacf717235b38 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 08:35:32 +0100
Subject: [PATCH 037/101] python312Packages.dvc-webhdfs: init at 3.1.0

Webhdfs plugin for dvc

https://pypi.org/project/dvc-webhdfs/
---
 .../python-modules/dvc-webhdfs/default.nix    | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/dvc-webhdfs/default.nix

diff --git a/pkgs/development/python-modules/dvc-webhdfs/default.nix b/pkgs/development/python-modules/dvc-webhdfs/default.nix
new file mode 100644
index 000000000000..dca09753e56b
--- /dev/null
+++ b/pkgs/development/python-modules/dvc-webhdfs/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildPythonPackage,
+  dvc-objects,
+  fetchPypi,
+  fsspec,
+  pythonOlder,
+  requests-kerberos,
+  setuptools-scm,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "dvc-webhdfs";
+  version = "3.1.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-bolIQ9Fc52agXGFt7anZvDYSSOk7+eozi5lublHqD+o=";
+  };
+
+  # Prevent circular dependency
+  pythonRemoveDeps = [ "dvc" ];
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    dvc-objects
+    fsspec
+  ];
+
+  optional-dependencies = {
+    kerberos = [ requests-kerberos ];
+  };
+
+  # Circular dependency
+  # pythonImportsCheck = [ "dvc_webhdfs" ];
+
+  meta = {
+    description = "Webhdfs plugin for dvc";
+    homepage = "https://pypi.org/project/dvc-webhdfs/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 36d52a31f784..e4eb7003f2c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4054,6 +4054,8 @@ self: super: with self; {
 
   dvc-webdav = callPackage ../development/python-modules/dvc-webdav {  };
 
+  dvc-webhdfs = callPackage ../development/python-modules/dvc-webhdfs {  };
+
   dvclive = callPackage ../development/python-modules/dvclive {  };
 
   dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };

From 071c6e6ccee5ee5b2fd490c5153877350342521c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 08:38:16 +0100
Subject: [PATCH 038/101] python312Packages.dvc: add webhdfs and
 webhdfs_kerberos

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

diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index 842a9253ae6c..8e7b1bc23e8c 100644
--- a/pkgs/development/python-modules/dvc/default.nix
+++ b/pkgs/development/python-modules/dvc/default.nix
@@ -18,6 +18,7 @@
   dvc-studio-client,
   dvc-task,
   dvc-webdav,
+  dvc-webhdfs,
   fetchFromGitHub,
   flatten-dict,
   flufl-lock,
@@ -140,6 +141,8 @@ buildPythonPackage rec {
     ssh = [ dvc-ssh ];
     ssh_gssapi = [ dvc-ssh ] ++ dvc-ssh.optional-dependencies.gssapi;
     webdav = [ dvc-webdav ];
+    webhdfs = [ dvc-webhdfs ];
+    webhdfs_kerberos = [ dvc-webhdfs ] ++ dvc-webhdfs.optional-dependencies.kerberos;
   };
 
   # Tests require access to real cloud services

From c9bb3ce592f907c1b3dad865ceba953fc4549524 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 08:43:41 +0100
Subject: [PATCH 039/101] python312Packages.dvc: adjust inputs

---
 .../python-modules/dvc/default.nix            | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index 8e7b1bc23e8c..3550d75ed5ba 100644
--- a/pkgs/development/python-modules/dvc/default.nix
+++ b/pkgs/development/python-modules/dvc/default.nix
@@ -1,9 +1,11 @@
 {
   lib,
-  appdirs,
+  attrs,
   buildPythonPackage,
+  celery,
   colorama,
   configobj,
+  dulwich,
   distro,
   dpath,
   dvc-azure,
@@ -22,6 +24,7 @@
   fetchFromGitHub,
   flatten-dict,
   flufl-lock,
+  fsspec,
   funcy,
   grandalf,
   gto,
@@ -29,7 +32,9 @@
   importlib-metadata,
   importlib-resources,
   iterative-telemetry,
+  kombu,
   networkx,
+  omegaconf,
   packaging,
   pathspec,
   platformdirs,
@@ -62,7 +67,7 @@ buildPythonPackage rec {
   version = "3.59.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "iterative";
@@ -87,11 +92,13 @@ buildPythonPackage rec {
 
   dependencies =
     [
-      appdirs
+      attrs
+      celery
       colorama
       configobj
       distro
       dpath
+      dulwich
       dvc-data
       dvc-http
       dvc-render
@@ -99,12 +106,15 @@ buildPythonPackage rec {
       dvc-task
       flatten-dict
       flufl-lock
+      fsspec
       funcy
       grandalf
       gto
       hydra-core
       iterative-telemetry
+      kombu
       networkx
+      omegaconf
       packaging
       pathspec
       platformdirs
@@ -128,9 +138,7 @@ buildPythonPackage rec {
     ++ lib.optionals enableGoogle optional-dependencies.gs
     ++ lib.optionals enableAWS optional-dependencies.s3
     ++ lib.optionals enableAzure optional-dependencies.azure
-    ++ lib.optionals enableSSH optional-dependencies.ssh
-    ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]
-    ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+    ++ lib.optionals enableSSH optional-dependencies.ssh;
 
   optional-dependencies = {
     azure = [ dvc-azure ];

From 9b8d290ab548d50ad04a6755bede1c0aec654c77 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 08:51:41 +0100
Subject: [PATCH 040/101] python312Packages.dvc-oss: init at 3.0.0

Alibaba OSS plugin for dvc

https://pypi.org/project/dvc-oss/
---
 .../python-modules/dvc-oss/default.nix        | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/dvc-oss/default.nix

diff --git a/pkgs/development/python-modules/dvc-oss/default.nix b/pkgs/development/python-modules/dvc-oss/default.nix
new file mode 100644
index 000000000000..e0f1eb220912
--- /dev/null
+++ b/pkgs/development/python-modules/dvc-oss/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  dvc-objects,
+  fetchPypi,
+  ossfs,
+  pythonOlder,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "dvc-oss";
+  version = "3.0.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-EEf3NAIvzSuW0ysGv24JIc0KZYEPf8HpsPrCmhR7apo=";
+  };
+
+  # Prevent circular dependency
+  pythonRemoveDeps = [ "dvc" ];
+
+  build-system = [ setuptools-scm ];
+
+  dependencies = [
+    dvc-objects
+    ossfs
+  ];
+
+  # Circular dependency
+  # pythonImportsCheck = [ "dvc_ssh" ];
+
+  meta = with lib; {
+    description = "Alibaba OSS plugin for dvc";
+    homepage = "https://pypi.org/project/dvc-oss/";
+    changelog = "https://github.com/iterative/dvc-oss/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4eb7003f2c6..573850bd7bfa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4042,6 +4042,8 @@ self: super: with self; {
 
   dvc-objects = callPackage ../development/python-modules/dvc-objects {  };
 
+  dvc-oss = callPackage ../development/python-modules/dvc-oss {  };
+
   dvc-render = callPackage ../development/python-modules/dvc-render {  };
 
   dvc-s3 = callPackage ../development/python-modules/dvc-s3 { };

From 13a5009ea8efb9ae29fbe212a85dc6215b17fae8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 08:53:27 +0100
Subject: [PATCH 041/101] python312Packages.dvc: add oss

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

diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index 3550d75ed5ba..aa8c21a0585e 100644
--- a/pkgs/development/python-modules/dvc/default.nix
+++ b/pkgs/development/python-modules/dvc/default.nix
@@ -14,6 +14,7 @@
   dvc-gs,
   dvc-hdfs,
   dvc-http,
+  dvc-oss,
   dvc-render,
   dvc-s3,
   dvc-ssh,
@@ -145,6 +146,7 @@ buildPythonPackage rec {
     gdrive = [ dvc-gdrive ];
     gs = [ dvc-gs ];
     hdfs = [ dvc-hdfs ];
+    oss = [ dvc-oss ];
     s3 = [ dvc-s3 ];
     ssh = [ dvc-ssh ];
     ssh_gssapi = [ dvc-ssh ] ++ dvc-ssh.optional-dependencies.gssapi;

From c4fd2ab9e61b75b7abe811c5232b28e0c7848734 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 09:14:12 +0100
Subject: [PATCH 042/101] python313Packages.zamg: add missing input

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

diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix
index f69c27f8f072..5ddb4f8606fc 100644
--- a/pkgs/development/python-modules/zamg/default.nix
+++ b/pkgs/development/python-modules/zamg/default.nix
@@ -2,6 +2,7 @@
   lib,
   aiohttp,
   aresponses,
+  async-timeout,
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
@@ -25,9 +26,14 @@ buildPythonPackage rec {
     hash = "sha256-j864+3c0GDDftdLqLDD0hizT54c0IgTjT77jOneXlq0=";
   };
 
+  pythonRelaxDeps = [ "async-timeout" ];
+
   build-system = [ poetry-core ];
 
-  dependencies = [ aiohttp ];
+  dependencies = [
+    aiohttp
+    async-timeout
+  ];
 
   nativeCheckInputs = [
     aresponses

From 4792f0ff5dba1d4158209ab8da6827d0a4a068cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 08:23:59 +0000
Subject: [PATCH 043/101] python312Packages.pygithub: 2.6.0 -> 2.6.1

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

diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix
index 1ac544477849..d70539558ac5 100644
--- a/pkgs/development/python-modules/pygithub/default.nix
+++ b/pkgs/development/python-modules/pygithub/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pygithub";
-  version = "2.6.0";
+  version = "2.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "PyGithub";
     repo = "PyGithub";
     tag = "v${version}";
-    hash = "sha256-/j90wLVZyOpukRAWO368+LxoKgnKTOs+gBc2SseNXRg=";
+    hash = "sha256-CfAgN5vxHbVyDSeP0KR1QFnL6gDQsd46Q0zosr0ALqM=";
   };
 
   build-system = [
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library to access the GitHub API v3";
     homepage = "https://github.com/PyGithub/PyGithub";
-    changelog = "https://github.com/PyGithub/PyGithub/raw/v${version}/doc/changes.rst";
+    changelog = "https://github.com/PyGithub/PyGithub/raw/${src.tag}/doc/changes.rst";
     license = licenses.lgpl3Plus;
     maintainers = [ ];
   };

From 5c328dc4f5408878a3edf2c5c1f768f7151a743e Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Tue, 4 Mar 2025 17:02:20 +0800
Subject: [PATCH 044/101] dissent: 0.0.31 -> 0.0.32

Diff: https://github.com/diamondburned/dissent/compare/v0.0.31...v0.0.32
Changelog: https://github.com/diamondburned/dissent/releases/tag/v0.0.32
---
 pkgs/by-name/di/dissent/package.nix | 32 ++++++++---------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix
index 0854e9bd20a4..fc5297d95afa 100644
--- a/pkgs/by-name/di/dissent/package.nix
+++ b/pkgs/by-name/di/dissent/package.nix
@@ -1,6 +1,5 @@
 {
   buildGoModule,
-  fetchFromGitLab,
   fetchFromGitHub,
   gobject-introspection,
   gst_all_1,
@@ -14,28 +13,15 @@
   wrapGAppsHook4,
 }:
 
-let
-  libspelling_2_1 = libspelling.overrideAttrs {
-    version = "0.2.1";
-
-    src = fetchFromGitLab {
-      domain = "gitlab.gnome.org";
-      owner = "GNOME";
-      repo = "libspelling";
-      rev = "refs/tags/0.2.1";
-      hash = "sha256-0OGcwPGWtYYf0XmvzXEaQgebBOW/6JWcDuF4MlQjCZQ=";
-    };
-  };
-in
 buildGoModule rec {
   pname = "dissent";
-  version = "0.0.31";
+  version = "0.0.32";
 
   src = fetchFromGitHub {
     owner = "diamondburned";
     repo = "dissent";
-    rev = "v${version}";
-    hash = "sha256-mI0rZ7w2a6fzELYRHgeekTWYDaQGcDYectRWUdOmlYc=";
+    tag = "v${version}";
+    hash = "sha256-6ZUJp4pW+rbV+2TJ9H69kThc5zzDFG5KjGRHVwFS76Q=";
   };
 
   nativeBuildInputs = [
@@ -56,7 +42,7 @@ buildGoModule rec {
     sound-theme-freedesktop
     # gotk4-spelling fails to build with libspelling >= 0.3.0
     # https://github.com/diamondburned/gotk4-spelling/issues/1
-    libspelling_2_1
+    libspelling
     gtksourceview5
   ];
 
@@ -70,17 +56,17 @@ buildGoModule rec {
     install -D -m 444 -t $out/share/dbus-1/services nix/so.libdb.dissent.service
   '';
 
-  vendorHash = "sha256-JISIS8k/veBAqZ0DlxVBrc+25IVM6BpY4eE5uxsjo+Y=";
+  vendorHash = "sha256-cA+rD7mbTYE+LqdLFFV8Li65wL2B5cUFwxWsMwNMRQg=";
 
-  meta = with lib; {
-    description = "A third-party Discord client designed for a smooth, native experience (formerly gtkcord4)";
+  meta = {
+    description = "Third-party Discord client designed for a smooth, native experience (formerly gtkcord4)";
     homepage = "https://github.com/diamondburned/dissent";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       cc0
     ];
     mainProgram = "dissent";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       hmenke
       urandom
       aleksana

From ca64e3b92ef63610bfacd96b60426ca60d19dec6 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 4 Mar 2025 08:44:58 +0100
Subject: [PATCH 045/101] kstars: downgrade eigen

fixes https://hydra.nixos.org/build/291193847
---
 .../science/astronomy/kstars/default.nix      | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix
index 205981c1b005..d21bdfe76b8d 100644
--- a/pkgs/applications/science/astronomy/kstars/default.nix
+++ b/pkgs/applications/science/astronomy/kstars/default.nix
@@ -3,6 +3,8 @@
   stdenv,
   extra-cmake-modules,
   fetchurl,
+  fetchFromGitLab,
+  fetchpatch,
   kconfig,
   kdoctools,
   kguiaddons,
@@ -35,6 +37,36 @@
   libxisf,
   curl,
 }:
+
+let
+  # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19'
+  # https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c
+  eigen' = eigen.overrideAttrs (old: rec {
+    version = "3.4.0";
+    src = fetchFromGitLab {
+      owner = "libeigen";
+      repo = "eigen";
+      rev = version;
+      hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw=";
+    };
+    patches = (old.patches or [ ]) ++ [
+      # Fixes e.g. onnxruntime on aarch64-darwin:
+      # https://hydra.nixos.org/build/248915128/nixlog/1,
+      # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392.
+      #
+      # The patch is from
+      # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699)
+      # which is two years old,
+      # but Eigen hasn't had a release in two years either:
+      # https://gitlab.com/libeigen/eigen/-/issues/2699.
+      (fetchpatch {
+        url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch";
+        hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0=";
+      })
+    ];
+  });
+in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "kstars";
   version = "3.7.4";
@@ -68,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     qtdatavis3d
     breeze-icons
     libsecret
-    eigen
+    eigen'
     zlib
     cfitsio
     indi-full

From 9923cd2a0ebb6718dcbd0a130e143abfd59aece9 Mon Sep 17 00:00:00 2001
From: Jonas <git@finkler.me>
Date: Tue, 4 Mar 2025 10:52:05 +0100
Subject: [PATCH 046/101] qscintilla: fix broken symlinks for qt6

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

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index cdc2ff5d80bc..cb2416bdcd51 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -34,9 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup =
     let
       libExt = stdenv.hostPlatform.extensions.sharedLibrary;
+      qtVersion = lib.versions.major qtbase.version;
     in
     ''
-      ln -s $out/lib/libqscintilla2_qt5${libExt} $out/lib/libqscintilla2${libExt}
+      ln -s $out/lib/libqscintilla2_qt${qtVersion}${libExt} $out/lib/libqscintilla2${libExt}
     '';
 
   dontWrapQtApps = true;

From 8cb376fc8d97f58c157a84320a876e487c0f6915 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 10:13:41 +0000
Subject: [PATCH 047/101] rasm: 2.3.4 -> 2.3.5

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

diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix
index 31551db83407..dc54feb8c222 100644
--- a/pkgs/by-name/ra/rasm/package.nix
+++ b/pkgs/by-name/ra/rasm/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rasm";
-  version = "2.3.4";
+  version = "2.3.5";
 
   src = fetchFromGitHub {
     owner = "EdouardBERGE";
     repo = "rasm";
     rev = "v${version}";
-    hash = "sha256-Yi4E8sgaQmUkQL7sxpbGDG6IPsL9RfMW2xXBCBhYXwg=";
+    hash = "sha256-gH1YGN8uM4K8JpkV2r7PilAcgv8leswaN+IOgMM0m74=";
   };
 
   # by default the EXEC variable contains `rasm.exe`

From 0aa3b417d2d888a9d0e9b70ee78e2f92e00aa90e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 11:27:33 +0100
Subject: [PATCH 048/101] python313Packages.pycfmodel: 1.0.0 -> 1.0.1

Diff: Skyscanner/pycfmodel@refs/tags/v1.0.0...v1.0.1

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

diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix
index 4abf2d44196e..4b024bf1b7fa 100644
--- a/pkgs/development/python-modules/pycfmodel/default.nix
+++ b/pkgs/development/python-modules/pycfmodel/default.nix
@@ -11,16 +11,16 @@
 
 buildPythonPackage rec {
   pname = "pycfmodel";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "Skyscanner";
     repo = "pycfmodel";
-    tag = version;
-    hash = "sha256-iCjOSwW6rdG3H4e/B/um+QioP45nOr9OcPAwXxZs3mU=";
+    tag = "v${version}";
+    hash = "sha256-TcSTJevWcr+fnQrYBkygPrMKhHb9QYAlmTkC6hlM2BE=";
   };
 
   pythonRelaxDeps = [ "pydantic" ];

From 4fafc85e26bb8e95c91f20c3e3a125fd281f07f2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 11:34:56 +0100
Subject: [PATCH 049/101] python312Packages.mypy-boto3-cognito-idp: 1.37.0 ->
 1.37.5

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7a84c4452c18..54c6d413e6b0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -314,8 +314,8 @@ rec {
       "sha256-MK11RuIgZfoy8vvZWHFEJjkSsJSzqKjXvm9GCjt3QH4=";
 
   mypy-boto3-cognito-idp =
-    buildMypyBoto3Package "cognito-idp" "1.37.0"
-      "sha256-I1twKtJqOUuHA+gkOzmRGr7GuDQ6GsYQeAGeX9ZVf8c=";
+    buildMypyBoto3Package "cognito-idp" "1.37.5"
+      "sha256-FAMF7HEM+StH7vkhPomIxh2GRSIhNxQaCZx0o6/EoYc=";
 
   mypy-boto3-cognito-sync =
     buildMypyBoto3Package "cognito-sync" "1.37.0"

From 052e3dbc35782c08756e38d935883fb3f79f28ce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 11:35:05 +0100
Subject: [PATCH 050/101] python312Packages.mypy-boto3-ec2: 1.37.2 -> 1.37.5

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 54c6d413e6b0..92e8ee88f700 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -446,8 +446,8 @@ rec {
       "sha256-wvOqjmqNMbCG7E1o+ZSOlWEwBdcCKjD/qVFlepZ51ec=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.37.2"
-      "sha256-vWMLnpS6zvwdzAEyiNH33SrKS57WH6sRHsTUxjLKISI=";
+    buildMypyBoto3Package "ec2" "1.37.5"
+      "sha256-0isaGfUCSEUl8CpbmwXHO5PWIHbl+/k9xVR+2mpJiUs=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.37.0"

From 5b3a0fec092768e253ed2c3a1eb4bd69b882b2ea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 11:35:48 +0100
Subject: [PATCH 051/101] python312Packages.mypy-boto3-rum: 1.37.0 -> 1.37.5

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 92e8ee88f700..5aafd1a2ba0c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1158,8 +1158,8 @@ rec {
       "sha256-/4XdwWIkx8VYxrUp7I8IDCPZ34cFudV+gp3xR4uS8jk=";
 
   mypy-boto3-rum =
-    buildMypyBoto3Package "rum" "1.37.0"
-      "sha256-fpotQHQ8Hksw/08bg9IMwyeh0ZdY+7lOpRypbSmn/j8=";
+    buildMypyBoto3Package "rum" "1.37.5"
+      "sha256-/cLHocPVefBea8g6oIRrSis6JOL7wFw+AEYyGNEOdx0=";
 
   mypy-boto3-s3 =
     buildMypyBoto3Package "s3" "1.37.0"

From 390069ef39497cb313ad1365cfb6fd8b125beaa2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 11:35:49 +0100
Subject: [PATCH 052/101] python312Packages.mypy-boto3-sagemaker: 1.37.3 ->
 1.37.5

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5aafd1a2ba0c..89e5e689d987 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1174,8 +1174,8 @@ rec {
       "sha256-c0vXkW5sR7JkdzvsS/rMFme9EwY1x5eZAbRWYKew0v4=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.37.3"
-      "sha256-9iExn7nmPWu1/Bk9gY39yYTMtpP1lnJM9cfPWwKEfl0=";
+    buildMypyBoto3Package "sagemaker" "1.37.5"
+      "sha256-CZmB3zmQwsWy85vzK891HXuRfmgNBg2YXEasihOrbUY=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.37.0"

From c956e68f619c79a3d52051a9da8cc4ca94de4efb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 11:36:02 +0100
Subject: [PATCH 053/101] python312Packages.mypy-boto3-transcribe: 1.37.0 ->
 1.37.5

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 89e5e689d987..ad6041dba785 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1366,8 +1366,8 @@ rec {
       "sha256-mGqJUJF826MADOYCDXwPNbk+x82zumHRb+cTazCEzAY=";
 
   mypy-boto3-transcribe =
-    buildMypyBoto3Package "transcribe" "1.37.0"
-      "sha256-oOjD14VrJrc7De48X2YAnPOC5BDKtouPj3ZBQmewqCI=";
+    buildMypyBoto3Package "transcribe" "1.37.5"
+      "sha256-UonLSCWk8CUYjVBkxwbwxnR+NdQnsFTx11dZXIesDv0=";
 
   mypy-boto3-transfer =
     buildMypyBoto3Package "transfer" "1.37.0"

From 727268c719e32638a339d4ab713f921109c3f715 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 11:36:10 +0100
Subject: [PATCH 054/101] python313Packages.boto3-stubs: 1.37.2 -> 1.37.5

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 377fbd67c56d..57eae487aeda 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.37.2";
+  version = "1.37.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-NskKT2L3TC1DN6g8yvcRKKsKyqGdTrFWNq0BBuA7uAE=";
+    hash = "sha256-EdOovc4OMFlRFBdi4vhh7ttTr347BN8Qr0TJztGWGIM=";
   };
 
   build-system = [ setuptools ];

From 26549c932027944b5433636a4442ee1c15ae6641 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 10:54:07 +0000
Subject: [PATCH 055/101] python312Packages.optree: 0.14.0 -> 0.14.1

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

diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix
index 1a31894090c7..f6ef3fd6b63f 100644
--- a/pkgs/development/python-modules/optree/default.nix
+++ b/pkgs/development/python-modules/optree/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "optree";
-  version = "0.14.0";
+  version = "0.14.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "metaopt";
     repo = "optree";
     tag = "v${version}";
-    hash = "sha256-etFWoUmD4MoXrR3caIxEtLLSkcSngCOtUh/M/2SA958=";
+    hash = "sha256-5PIe/mXPNohwM0oNT/zSPmNUycjXuujtIFCki5t7V1I=";
   };
 
   dontUseCmakeConfigure = true;

From c5cd965e341bb5d09ad0a75004c11ee40fb8ff3f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Mar 2025 11:11:02 +0100
Subject: [PATCH 056/101] python312Packages.skytemple-ssb-emulator: 1.8.0 ->
 1.8.1

Diff:
https://github.com/SkyTemple/skytemple-ssb-emulator/compare/1.8.0...1.8.1

https://github.com/SkyTemple/desmume-rs/pull/38
---
 .../skytemple-ssb-emulator/Cargo.lock         | 829 ------------------
 .../skytemple-ssb-emulator/default.nix        |  81 +-
 2 files changed, 50 insertions(+), 860 deletions(-)
 delete mode 100644 pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock

diff --git a/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock b/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock
deleted file mode 100644
index f1e46028962e..000000000000
--- a/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock
+++ /dev/null
@@ -1,829 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "arc-swap"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
-
-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
-
-[[package]]
-name = "cc"
-version = "1.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-
-[[package]]
-name = "desmume-rs"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95166a679be6515156852dfd35dd5b086929b1a82104a0fdc68c7e3c3dcccd05"
-dependencies = [
- "desmume-sys",
- "thiserror",
-]
-
-[[package]]
-name = "desmume-sys"
-version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8414d5cfbc53315f1956069a67d34e2a1c4c05d420e669504a4dfc4e5ba278e3"
-dependencies = [
- "glob",
- "libc",
- "pkg-config",
- "tempfile",
-]
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "encoding"
-version = "0.2.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
-dependencies = [
- "encoding-index-japanese",
- "encoding-index-korean",
- "encoding-index-simpchinese",
- "encoding-index-singlebyte",
- "encoding-index-tradchinese",
-]
-
-[[package]]
-name = "encoding-index-japanese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-korean"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-simpchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-singlebyte"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-tradchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding_index_tests"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
-
-[[package]]
-name = "errno"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-[[package]]
-name = "gettext-rs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364"
-dependencies = [
- "gettext-sys",
- "locale_config",
-]
-
-[[package]]
-name = "gettext-sys"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d"
-dependencies = [
- "cc",
- "temp-dir",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "indoc"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
-
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "locale_config"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
-dependencies = [
- "lazy_static",
- "objc",
- "objc-foundation",
- "regex",
- "winapi",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num-derive"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.71",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "packed_struct"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36b29691432cc9eff8b282278473b63df73bea49bc3ec5e67f31a3ae9c3ec190"
-dependencies = [
- "bitvec",
- "packed_struct_codegen",
- "serde",
-]
-
-[[package]]
-name = "packed_struct_codegen"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cd6706dfe50d53e0f6aa09e12c034c44faacd23e966ae5a209e8bdb8f179f98"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "portable-atomic"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "pyo3"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433"
-dependencies = [
- "cfg-if",
- "indoc",
- "libc",
- "memoffset",
- "once_cell",
- "portable-atomic",
- "pyo3-build-config",
- "pyo3-ffi",
- "pyo3-macros",
- "unindent",
-]
-
-[[package]]
-name = "pyo3-build-config"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8"
-dependencies = [
- "once_cell",
- "target-lexicon",
-]
-
-[[package]]
-name = "pyo3-ffi"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6"
-dependencies = [
- "libc",
- "pyo3-build-config",
-]
-
-[[package]]
-name = "pyo3-log"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ac84e6eec1159bc2a575c9ae6723baa6ee9d45873e9bebad1e3ad7e8d28a443"
-dependencies = [
- "arc-swap",
- "log",
- "pyo3",
-]
-
-[[package]]
-name = "pyo3-macros"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206"
-dependencies = [
- "proc-macro2",
- "pyo3-macros-backend",
- "quote",
- "syn 2.0.71",
-]
-
-[[package]]
-name = "pyo3-macros-backend"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372"
-dependencies = [
- "heck",
- "proc-macro2",
- "pyo3-build-config",
- "quote",
- "syn 2.0.71",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "regex"
-version = "1.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-dependencies = [
- "bitflags",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "serde"
-version = "1.0.204"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.204"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.71",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.120"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "skytemple_rust"
-version = "1.8.1"
-source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.8.1#889e3e9e4f9fe82b350c0e36368a28d82727fbe9"
-dependencies = [
- "bytes",
- "encoding",
- "gettext-rs",
- "itertools",
- "log",
- "num-derive",
- "num-traits",
- "packed_struct",
- "paste",
- "pyo3",
- "pyo3-log",
- "skytemple_rust_macros",
- "thiserror",
-]
-
-[[package]]
-name = "skytemple_rust_macros"
-version = "1.4.0"
-source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.8.1#889e3e9e4f9fe82b350c0e36368a28d82727fbe9"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "skytemple_ssb_emulator"
-version = "1.8.0"
-dependencies = [
- "byteorder",
- "crossbeam-channel",
- "desmume-rs",
- "lazy_static",
- "log",
- "pyo3",
- "pyo3-log",
- "serde_json",
- "skytemple_rust",
- "sprintf",
-]
-
-[[package]]
-name = "sprintf"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39b60413e681681e22dfe3966674082c075c5f6ed73c3900b95dd19eb9e0181d"
-dependencies = [
- "thiserror",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.71"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
-
-[[package]]
-name = "temp-dir"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231"
-
-[[package]]
-name = "tempfile"
-version = "3.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
-dependencies = [
- "cfg-if",
- "fastrand",
- "rustix",
- "windows-sys",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.71",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unindent"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
diff --git a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix
index 8b5f71030667..b931b00550b4 100644
--- a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix
+++ b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix
@@ -1,75 +1,94 @@
 {
-  alsa-lib,
-  buildPythonPackage,
-  cargo,
-  fetchFromGitHub,
-  glib,
   lib,
-  libpcap,
+  buildPythonPackage,
+  fetchFromGitHub,
+  rustPlatform,
+
+  # build-system
   meson,
+  setuptools,
+  setuptools-rust,
+
+  # buildInputs
+  SDL2,
+  alsa-lib,
+  glib,
+  libpcap,
+  soundtouch,
+  zlib,
+
+  # nativeBuildInputs
+  cargo,
   ninja,
   openal,
   pkg-config,
-  range-typed-integers,
   rustc,
-  rustPlatform,
-  SDL2,
-  setuptools,
-  setuptools-rust,
-  soundtouch,
-  zlib,
+
+  # dependencies
+  range-typed-integers,
 }:
 buildPythonPackage rec {
   pname = "skytemple-ssb-emulator";
-  version = "1.8.0";
+  version = "1.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
-    repo = pname;
-    rev = version;
-    hash = "sha256-9xD9Q/oYsi9tuxTOJ6ItLbWkqAjG78uzXYZXOiITDEA=";
+    repo = "skytemple-ssb-emulator";
+    tag = version;
+    hash = "sha256-WDTSW0Vg0oL9+2J5/nIx6sd/ZWqsiDu1trpzuXNw0Kg=";
   };
 
-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "skytemple_rust-1.8.1" = "sha256-KtMqgUOlyF02msQRouE4NpvCHqahY+aRiRV9P32ASqg=";
-    };
+  # Otherwise, fails with:
+  # [-Wimplicit-function-declaration] and [-Wint-conversion] errors
+  # https://github.com/SkyTemple/desmume-rs/pull/38
+  postPatch = ''
+    substituteInPlace "$cargoDepsCopy"/desmume-sys-*/build.rs \
+      --replace-fail \
+        '.arg("-Dbuildtype=release")' \
+        '.arg("-Dbuildtype=release").arg("-Dc_std=gnu11").arg("-Dcpp_std=gnu++14")'
+  '';
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src pname;
+    hash = "sha256-Fgc0gFzDrdcV73HU39cqyw74nln4EKHokz86V8k8TAI=";
   };
 
+  build-system = [
+    meson
+    setuptools
+    setuptools-rust
+  ];
+
   buildInputs = [
+    SDL2
     alsa-lib
     glib
     libpcap
-    SDL2
     soundtouch
     zlib
   ];
 
   nativeBuildInputs = [
     cargo
-    meson
     ninja
     openal
     pkg-config
-    rustc
     rustPlatform.cargoSetupHook
-    setuptools
-    setuptools-rust
+    rustc
   ];
 
-  propagatedBuildInputs = [ range-typed-integers ];
+  dependencies = [ range-typed-integers ];
 
   hardeningDisable = [ "format" ];
 
   doCheck = false; # there are no tests
   pythonImportsCheck = [ "skytemple_ssb_emulator" ];
 
-  meta = with lib; {
+  meta = {
     description = "SkyTemple Script Engine Debugger Emulator Backend";
     homepage = "https://github.com/SkyTemple/skytemple-ssb-emulator";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ marius851000 ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ marius851000 ];
   };
 }

From 333122915b411280b1dda3eb655946ba596ccbf9 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 4 Mar 2025 12:35:02 +0100
Subject: [PATCH 057/101] grafana-alloy: fix updateScript selecting the wrong
 tag

https://github.com/grafana/alloy has tags not just for the binary
releases of grafana-alloy itself, but also for their helm-chart and
their oci build-image.

By adding --version-regex to nix-update, we filter out those unwanted
tags that would otherwise make the update script fail.
---
 pkgs/by-name/gr/grafana-alloy/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index 37334cc5c58d..e4ace211d204 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -127,7 +127,12 @@ buildGoModule rec {
         package = grafana-alloy;
       };
     };
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "v(.+)"
+      ];
+    };
     # alias for nix-update to be able to find and update this attribute
     offlineCache = yarnOfflineCache;
   };

From f5167764fc185b5b9ea65d9ab3970797b9582ba1 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 4 Mar 2025 19:41:52 +0800
Subject: [PATCH 058/101] tradingview: 2.9.3 -> 2.9.6

---
 pkgs/by-name/tr/tradingview/package.nix | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix
index 36ae8ca5d739..11fb0e6cd3a1 100644
--- a/pkgs/by-name/tr/tradingview/package.nix
+++ b/pkgs/by-name/tr/tradingview/package.nix
@@ -23,12 +23,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tradingview";
-  version = "2.9.3";
-  revision = "60";
+  version = "2.9.6";
+  revision = "63";
 
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap";
-    hash = "sha256-Oa3YfmXDiqKxEMJloTu6ihJ6LKoz2XwQ0su1KrlSaYo=";
+    hash = "sha256-WmeGtR/rOzlgTpa1JZKskxre2ONtzppYsA/yhDhv5TI=";
   };
 
   nativeBuildInputs = [
@@ -59,7 +59,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   unpackPhase = ''
     runHook preUnpack
+
     unsquashfs $src
+
     runHook postUnpack
   '';
 
@@ -71,24 +73,28 @@ stdenv.mkDerivation (finalAttrs: {
     rm -rf $out/share/tradingview/meta
 
     install -Dm444 squashfs-root/meta/gui/tradingview.desktop -t $out/share/applications
-    substituteInPlace $out/share/applications/tradingview.desktop --replace \$\{SNAP}/meta/gui/icon.png tradingview
+    substituteInPlace $out/share/applications/tradingview.desktop \
+      --replace-fail \$\{SNAP}/meta/gui/icon.png tradingview
 
     mkdir $out/share/icons
     cp squashfs-root/meta/gui/icon.png $out/share/icons/tradingview.png
 
     mkdir $out/bin
-    makeBinaryWrapper $out/share/tradingview/tradingview $out/bin/tradingview --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}
+    makeBinaryWrapper $out/share/tradingview/tradingview $out/bin/tradingview \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  passthru.updateScript = ./update.sh;
+
+  meta = {
     description = "Charting platform for traders and investors";
     homepage = "https://www.tradingview.com/desktop/";
     changelog = "https://www.tradingview.com/support/solutions/43000673888/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ prominentretail ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ prominentretail ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "tradingview";
   };

From 4422dc0c6270bdc569f1aa3aef750edc3ab11c4c Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 4 Mar 2025 12:41:49 +0100
Subject: [PATCH 059/101] grafana-alloy: 1.6.1 -> 1.7.1

https://github.com/grafana/alloy/releases/tag/v1.7.0
https://github.com/grafana/alloy/releases/tag/v1.7.1

diff: https://github.com/grafana/alloy/compare/v1.6.1...v1.7.1
---
 pkgs/by-name/gr/grafana-alloy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index e4ace211d204..92286c91e699 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -17,17 +17,17 @@
 
 buildGoModule rec {
   pname = "grafana-alloy";
-  version = "1.6.1";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "alloy";
     tag = "v${version}";
-    hash = "sha256-7NcSe+6MqS5Bxu64qaJKKxSsQYYEqeGGRgDpcag8t1I=";
+    hash = "sha256-t1YDYQ+0RKHYaL/oE9XGjV7/g28rHO9avL6/CTfMHeE=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-DmSyEgEIJEMOOfOQxDZUGT81Iw6QO0gOhSkXSilL16g=";
+  vendorHash = "sha256-d9uWbZ+5YSnB3yqL/YZ0ld+8soO3oGb8gttzj3Q7MXs=";
 
   nativeBuildInputs = [
     fixup-yarn-lock

From c1f0ad5b9566f482996ac375301d15157ea3498b Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Tue, 4 Mar 2025 12:47:17 +0100
Subject: [PATCH 060/101] python312Packages.deal: 4.24.4 -> 4.24.5

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

diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix
index 4b383419f301..adb9759e92d6 100644
--- a/pkgs/development/python-modules/deal/default.nix
+++ b/pkgs/development/python-modules/deal/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "deal";
-  version = "4.24.4";
+  version = "4.24.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "life4";
     repo = "deal";
     tag = version;
-    hash = "sha256-4orpoYfPGSvquhg9w63uUe8QbBa2RUpxaEJ9uy28+fU=";
+    hash = "sha256-oSvLi+9JYnwilJa63MuGb2iir2Mjr3UewzpPLCtOVzs=";
   };
 
   build-system = [ flit-core ];

From 30e85bdff4e757ff95bd507d53f8e8e5eca4438b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Mar 2025 13:29:51 +0100
Subject: [PATCH 061/101] python312Packages.mmengine: 0.10.6 -> 0.10.7

Diff: https://github.com/open-mmlab/mmengine/compare/refs/tags/v0.10.6...v0.10.7

Changelog: https://github.com/open-mmlab/mmengine/releases/tag/v0.10.7
---
 .../python-modules/mmengine/default.nix       | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix
index 57c56f688f5b..8a247f5979c6 100644
--- a/pkgs/development/python-modules/mmengine/default.nix
+++ b/pkgs/development/python-modules/mmengine/default.nix
@@ -16,7 +16,7 @@
   termcolor,
   yapf,
 
-  # checks
+  # tests
   bitsandbytes,
   coverage,
   dvclive,
@@ -26,18 +26,19 @@
   parameterized,
   pytestCheckHook,
   transformers,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "mmengine";
-  version = "0.10.6";
+  version = "0.10.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "open-mmlab";
     repo = "mmengine";
     tag = "v${version}";
-    hash = "sha256-J9p+JCtNoBlBvvv4p57/DHUIifYs/jdo+pK+paD+iXI=";
+    hash = "sha256-hQnwenuxHQwl+DwQXbIfsKlJkmcRvcHV1roK7q2X1KA=";
   };
 
   build-system = [ setuptools ];
@@ -53,6 +54,8 @@ buildPythonPackage rec {
     yapf
   ];
 
+  pythonImportsCheck = [ "mmengine" ];
+
   nativeCheckInputs = [
     bitsandbytes
     coverage
@@ -63,49 +66,43 @@ buildPythonPackage rec {
     parameterized
     pytestCheckHook
     transformers
+    writableTmpDirAsHomeHook
   ];
 
   preCheck =
-    ''
-      export HOME=$(mktemp -d)
-    ''
     # Otherwise, the backprop hangs forever. More precisely, this exact line:
     # https://github.com/open-mmlab/mmengine/blob/02f80e8bdd38f6713e04a872304861b02157905a/tests/test_runner/test_activation_checkpointing.py#L46
     # Solution suggested in https://github.com/pytorch/pytorch/issues/91547#issuecomment-1370011188
-    + ''
+    ''
       export MKL_NUM_THREADS=1
     '';
 
-  pythonImportsCheck = [ "mmengine" ];
+  pytestFlagsArray = [
+    # Require unpackaged aim
+    "--deselect tests/test_visualizer/test_vis_backend.py::TestAimVisBackend"
 
-  disabledTestPaths = [
-    # AttributeError
-    "tests/test_fileio/test_backends/test_petrel_backend.py"
-    # Freezes forever?
-    "tests/test_runner/test_activation_checkpointing.py"
-    # missing dependencies
-    "tests/test_visualizer/test_vis_backend.py"
+    # Cannot find SSL certificate
+    # _pygit2.GitError: OpenSSL error: failed to load certificates: error:00000000:lib(0)::reason(0)
+    "--deselect tests/test_visualizer/test_vis_backend.py::TestDVCLiveVisBackend"
+
+    # AttributeError: type object 'MagicMock' has no attribute ...
+    "--deselect tests/test_fileio/test_backends/test_petrel_backend.py::TestPetrelBackend"
   ];
 
   disabledTests = [
-    # Tests are disabled due to sandbox
+    # Require network access
     "test_fileclient"
     "test_http_backend"
     "test_misc"
+
     # RuntimeError
     "test_dump"
     "test_deepcopy"
     "test_copy"
     "test_lazy_import"
-    # AssertionError
+
+    # AssertionError: os is not <module 'os' (frozen)>
     "test_lazy_module"
-    # Require unpackaged aim
-    "test_experiment"
-    "test_add_config"
-    "test_add_image"
-    "test_add_scalar"
-    "test_add_scalars"
-    "test_close"
   ];
 
   meta = {

From eb555bb4ad911d3624c62b8bba1475a2f72d8669 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Mar 2025 15:25:06 +0100
Subject: [PATCH 062/101] python313Packages.torch-geometric: disable tests
 failing on python 3.13

---
 .../torch-geometric/default.nix               | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/torch-geometric/default.nix b/pkgs/development/python-modules/torch-geometric/default.nix
index 3c8d06334daa..b497c2d6a816 100644
--- a/pkgs/development/python-modules/torch-geometric/default.nix
+++ b/pkgs/development/python-modules/torch-geometric/default.nix
@@ -57,6 +57,8 @@
 
   # tests
   pytestCheckHook,
+  writableTmpDirAsHomeHook,
+  pythonAtLeast,
 }:
 
 buildPythonPackage rec {
@@ -148,20 +150,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   disabledTests =
     [
-      # TODO: try to re-enable when triton will have been updated to 3.0
-      # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised:
-      # LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler'
-      "test_compile_hetero_conv_graph_breaks"
-      "test_compile_multi_aggr_sage_conv"
-
       # RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL.
       # PyTorch built with MKL has better support for addmm with sparse CPU tensors.
       "test_asap"
@@ -174,6 +167,21 @@ buildPythonPackage rec {
       # This test uses `torch.jit` which might not be working on darwin:
       # RuntimeError: required keyword attribute 'value' has the wrong type
       "test_traceable_my_conv_with_self_loops"
+    ]
+    ++ lib.optionals (pythonAtLeast "3.13") [
+      # RuntimeError: Dynamo is not supported on Python 3.13+
+      "test_compile"
+
+      # RuntimeError: Python 3.13+ not yet supported for torch.compile
+      "test_compile_graph_breaks"
+      "test_compile_multi_aggr_sage_conv"
+      "test_compile_hetero_conv_graph_breaks"
+
+      # AttributeError: module 'typing' has no attribute 'io'. Did you mean: 'IO'?
+      "test_packaging"
+
+      # RuntimeError: Boolean value of Tensor with more than one value is ambiguous
+      "test_feature_store"
     ];
 
   meta = {

From 5cdf27419298b23166d956881855a187effea86a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Mar 2025 17:09:30 +0100
Subject: [PATCH 063/101] python312Packages.shiny: 1.2.1 -> 1.3.0

Diff: https://github.com/posit-dev/py-shiny/compare/refs/tags/v1.2.1...v1.3.0

Changelog: https://github.com/posit-dev/py-shiny/blob/v1.3.0/CHANGELOG.md
---
 .../python-modules/shiny/default.nix          | 51 +++++++++----------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/shiny/default.nix b/pkgs/development/python-modules/shiny/default.nix
index 2319e727d095..8c0809a2da3e 100644
--- a/pkgs/development/python-modules/shiny/default.nix
+++ b/pkgs/development/python-modules/shiny/default.nix
@@ -2,10 +2,12 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
+
+  # build-system
   setuptools,
   setuptools-scm,
 
+  # dependencies
   appdirs,
   asgiref,
   click,
@@ -26,42 +28,35 @@
   watchfiles,
   websockets,
 
+  # tests
   anthropic,
   cacert,
   google-generativeai,
   langchain-core,
   ollama,
   openai,
-  pytestCheckHook,
-  pytest-asyncio,
-  pytest-playwright,
-  pytest-xdist,
-  pytest-timeout,
-  pytest-rerunfailures,
   pandas,
   polars,
+  pytest-asyncio,
+  pytest-playwright,
+  pytest-rerunfailures,
+  pytest-timeout,
+  pytest-xdist,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "shiny";
-  version = "1.2.1";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "py-shiny";
     tag = "v${version}";
-    hash = "sha256-8bo2RHuIP7X7EaOlHd+2m4XU287owchAwiqPnpjKFjI=";
+    hash = "sha256-YCPHjelGPYYo23Vzxy5+8Kn9fVlSZy1Qva7zp93+nzg=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-narwhals-test.patch";
-      url = "https://github.com/posit-dev/py-shiny/commit/184a9ebd81ff730439513f343576a68f8c1f6eb9.patch";
-      hash = "sha256-DsGnuHQXODzGwpe8ZUHeXGzRFxxduwxCRk82RJaYZg0=";
-    })
-  ];
-
   build-system = [
     setuptools
     setuptools-scm
@@ -104,30 +99,32 @@ buildPythonPackage rec {
     langchain-core
     ollama
     openai
-    pytestCheckHook
-    pytest-asyncio
-    pytest-playwright
-    pytest-xdist
-    pytest-timeout
-    pytest-rerunfailures
     pandas
     polars
+    pytest-asyncio
+    pytest-playwright
+    pytest-rerunfailures
+    pytest-timeout
+    pytest-xdist
+    pytestCheckHook
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
   disabledTests = [
+    # Requires unpackaged brand-yml
+    "test_theme_from_brand_base_case_compiles"
     # ValueError: A tokenizer is required to impose `token_limits` on messages
     "test_chat_message_trimming"
-    # https://github.com/posit-dev/py-shiny/pull/1791
-    "test_as_ollama_message"
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
-    changelog = "https://github.com/posit-dev/py-shiny/blob/${src.tag}/CHANGELOG.md";
     description = "Build fast, beautiful web applications in Python";
-    license = lib.licenses.mit;
     homepage = "https://shiny.posit.co/py";
+    changelog = "https://github.com/posit-dev/py-shiny/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sigmanificient ];
   };
 }

From c5c6c1830640f5273b9b4e780bfc51c7860be15d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Mar 2025 17:48:24 +0100
Subject: [PATCH 064/101] python312Packages.lightning-utilities: 0.12.0 ->
 0.13.0

Diff: https://github.com/Lightning-AI/utilities/compare/refs/tags/v0.12.0...v0.13.0

Changelog: https://github.com/Lightning-AI/utilities/releases/tag/v0.13.0
---
 .../python-modules/lightning-utilities/default.nix   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix
index f0a14e85611e..771179f8e392 100644
--- a/pkgs/development/python-modules/lightning-utilities/default.nix
+++ b/pkgs/development/python-modules/lightning-utilities/default.nix
@@ -13,19 +13,19 @@
 
   # tests
   pytest-timeout,
-  pytest7CheckHook,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "lightning-utilities";
-  version = "0.12.0";
+  version = "0.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lightning-AI";
     repo = "utilities";
     tag = "v${version}";
-    hash = "sha256-Uu5VhrETDOYnTwjSSKkJx08yjt7cpgP2fmkpRyDepaI=";
+    hash = "sha256-LFrBr8fumGp4KY7mNtMEMrE9vX1lyNoQKf+xxRymzTE=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytest-timeout
-    pytest7CheckHook
+    pytestCheckHook
   ];
 
   disabledTests = [
@@ -53,12 +53,10 @@ buildPythonPackage rec {
     "lightning_utilities.core.imports.RequirementCache"
     "lightning_utilities.core.imports.compare_version"
     "lightning_utilities.core.imports.get_dependency_min_version_spec"
+
     # weird doctests fail on imports, but providing the dependency
     # fails another test
     "lightning_utilities.core.imports.ModuleAvailableCache"
-    "lightning_utilities.core.imports.requires"
-    # Failed: DID NOT RAISE <class 'AssertionError'>
-    "test_no_warning_call"
   ];
 
   disabledTestPaths = [

From f69df6fd850770a7e0265dc2ea1073d90429af74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 17:40:17 +0000
Subject: [PATCH 065/101] renderdoc: 1.36 -> 1.37

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

diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix
index c2cbc5db66ad..f4b20fb253c9 100644
--- a/pkgs/by-name/re/renderdoc/package.nix
+++ b/pkgs/by-name/re/renderdoc/package.nix
@@ -32,13 +32,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "renderdoc";
-  version = "1.36";
+  version = "1.37";
 
   src = fetchFromGitHub {
     owner = "baldurk";
     repo = "renderdoc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-a7jUWjNrpy3FnLRccljV7obAlnQwyMJrAaGf9iZa0UY=";
+    hash = "sha256-udi3v5DyJ9aDBsfTv+T9VTa7SyhNAyuNB3LF5G8vZVg=";
   };
 
   outputs = [

From e1a870dbedf26e358f70530bcbd53a2761bdb41f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 3 Mar 2025 23:17:00 +0100
Subject: [PATCH 066/101] firefox-unwrapped: 135.0.1 -> 136.0

https://www.mozilla.org/en-US/firefox/136.0/releasenotes/
https://www.mozilla.org/security/advisories/mfsa2025-14

Fixes: CVE-2025-1930, CVE-2025-1931, CVE-2025-1933, CVE-2025-1934,
       CVE-2025-1942, CVE-2025-1935, CVE-2025-1936, CVE-2025-1937,
       CVE-2025-1938, CVE-2025-1943
---
 .../networking/browsers/firefox/common.nix    | 11 ++++----
 .../firefox/no-buildconfig-ffx136.patch       | 26 +++++++++++++++++++
 .../browsers/firefox/packages/firefox.nix     |  4 +--
 3 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx136.patch

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 999a90133257..7d822e6efdf6 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -68,7 +68,6 @@ in
 , gnum4
 , gtk3
 , icu73
-, icu74
 , libGL
 , libGLU
 , libevent
@@ -254,7 +253,8 @@ buildStdenv.mkDerivation {
   patches = lib.optionals (lib.versionAtLeast version "111" && lib.versionOlder version "133") [ ./env_var_for_system_dir-ff111.patch ]
   ++ lib.optionals (lib.versionAtLeast version "133") [ ./env_var_for_system_dir-ff133.patch ]
   ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]
-  ++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]
+  ++ lib.optionals (lib.versionAtLeast version "121" && lib.versionOlder version "136") [ ./no-buildconfig-ffx121.patch ]
+  ++ lib.optionals (lib.versionAtLeast version "136") [ ./no-buildconfig-ffx136.patch ]
   ++ lib.optionals (lib.versionOlder version "128.2" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [
     (fetchpatch {
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1912663
@@ -448,7 +448,8 @@ buildStdenv.mkDerivation {
     # MacOS builds use bundled versions of libraries: https://bugzilla.mozilla.org/show_bug.cgi?id=1776255
     "--enable-system-pixman"
     "--with-system-ffi"
-    "--with-system-icu"
+    # Firefox 136 fails to link with our icu76.1
+    (lib.optionalString (lib.versionOlder version "136") "--with-system-icu")
     "--with-system-jpeg"
     "--with-system-libevent"
     "--with-system-libvpx"
@@ -532,9 +533,7 @@ buildStdenv.mkDerivation {
     ++ lib.optional  sndioSupport sndio
     ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
   ))
-  # icu74 fails to build on 127 and older
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1862601
-  ++ [ (if (lib.versionAtLeast version "134") then icu74 else icu73) ]
+  ++ lib.optionals (lib.versionOlder version "136") [ icu73 ]
   ++ lib.optional  gssSupport libkrb5
   ++ lib.optional  jemallocSupport jemalloc
   ++ extraBuildInputs;
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx136.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx136.patch
new file mode 100644
index 000000000000..69972b5518bb
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx136.patch
@@ -0,0 +1,26 @@
+diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
+index 16888323d7..b96450a247 100644
+--- a/docshell/base/nsAboutRedirector.cpp
++++ b/docshell/base/nsAboutRedirector.cpp
+@@ -90,9 +90,6 @@ static const RedirEntry kRedirMap[] = {
+     {"addons", "chrome://mozapps/content/extensions/aboutaddons.html",
+      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
+ #endif
+-    {"buildconfig", "chrome://global/content/buildconfig.html",
+-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+-         nsIAboutModule::IS_SECURE_CHROME_UI},
+     {"checkerboard", "chrome://global/content/aboutCheckerboard.html",
+      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+          nsIAboutModule::ALLOW_SCRIPT},
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index eb6c179b60..57568668b1 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -40,7 +40,6 @@ toolkit.jar:
+    content/global/aboutUrlClassifier.js
+    content/global/aboutUrlClassifier.xhtml
+    content/global/aboutUrlClassifier.css
+-*   content/global/buildconfig.html
+    content/global/buildconfig.css
+    content/global/contentAreaUtils.js
+    content/global/datepicker.xhtml
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index 7349c2bd1587..87c1bc67abd3 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "135.0.1";
+  version = "136.0";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "9ff7c2ab6bc1660e339cdcd7745f8bdac5be25d3a79b9f0393385935270d7ef488599856bc38c22ae0b067389fa71a6999703b74804a6e0ea8265eb99788cea9";
+    sha512 = "a2b7e74e8404138b294f7b3c5f1eaeaeb8ce84c9aad25379e8ec785a9686f42def9f8c119d4bc276dd371d13d7bebbe4b1b092af41500aa8c2b2c827971445b4";
   };
 
   meta = {

From 8645a5b39b3bb32e8291ab669ae6ae19bd2c5e6a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 3 Mar 2025 23:17:32 +0100
Subject: [PATCH 067/101] firefox-bin-unwrapped: 135.0.1 -> 136.0

https://www.mozilla.org/en-US/firefox/136.0/releasenotes/
https://www.mozilla.org/security/advisories/mfsa2025-14

Fixes: CVE-2025-1930, CVE-2025-1931, CVE-2025-1933, CVE-2025-1934,
       CVE-2025-1942, CVE-2025-1935, CVE-2025-1936, CVE-2025-1937,
       CVE-2025-1938, CVE-2025-1943
---
 .../browsers/firefox-bin/release_sources.nix  | 826 +++++++++---------
 1 file changed, 413 insertions(+), 413 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 2d36767588fa..650f3891e070 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,1241 +1,1241 @@
 {
-  version = "135.0.1";
+  version = "136.0";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ach/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ach/firefox-136.0.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "85f54d601a54340e8f2ea32d10fd90b74540eb235e5947c83b786e49e4a3dbe9";
+      sha256 = "b15d3d158ceb1c30aa3ed1ae53419e020d0c5d8043386ea88dd2d6082463c002";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/af/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/af/firefox-136.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "e10153197ee408118aa303bda76d0e97b0c4a62b85b39076739adef247848de9";
+      sha256 = "8b5dce40400b8bb87bcd32758718b824680d183a5d59c85ef14bdea8929e5413";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/an/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/an/firefox-136.0.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "d7f063a5dd361c0000b387482919604767d615cbd3532cdff31fdc15b698f0f4";
+      sha256 = "b79f252a63fed01858f9364473c44d8073fd7d932a9c223c540bee5c299ed912";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ar/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ar/firefox-136.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "7b93dcb47d37d19d46203627aee494ace37b1e1629a79314a1c1aa0a008c2521";
+      sha256 = "b8bdf544fb7a5e6b609818ad160f8e29bc6cd7f299aa9c150fd23fa32f2e30e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ast/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ast/firefox-136.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "8d114c39a8d24ac91da7354476ba1e8c99c9573567fe300aa556b26d9dd020d5";
+      sha256 = "d15f45039332ab553b9c2499eab0581a0d5609508299c39e4532a70321299fe3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/az/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/az/firefox-136.0.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "9f9791f7f85d1a87a2c3dab83bbd9d95640cc077737127b948a5aea77293edf6";
+      sha256 = "35027ce4948b821b94cdb6edb52dfb8dfafd0905bf3b8471a98287767cd136d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/be/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/be/firefox-136.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "4f9298489d5fcd9ff3426d1ea7be509747262e49a1967c7ae12891266065a5b0";
+      sha256 = "cde28a512fd506abe3b40ed547d404437b6991ed55487bb1a7357921e045ddba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/bg/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/bg/firefox-136.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "b8499ea04a2db8bdd75b5936e371c2015884fd5dbf6989bffcf9db2cb0100370";
+      sha256 = "d7e21bd14455525ee1817ffcd96c3751e8073850cc389f5251ab7237c5342bfe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/bn/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/bn/firefox-136.0.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "2b3e1c660fa829676b0e9969589e0dbf1d5cf633f1df18dd60bb8eb0f550b1bd";
+      sha256 = "f661f20fbfed9fc354901e3849457fe53e2668b85b7365a36574f5b630489a36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/br/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/br/firefox-136.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "14cb1e8a9941c94768bb87152719e89bfd9beab394317c8790139bd440d84234";
+      sha256 = "f935148146a2954e1e7dad54c0790be523af9c4fb126c42bb5877d0994b60df2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/bs/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/bs/firefox-136.0.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "31bcbf6c483156208faa629fcbc8f9bc158795aca261531f670c7a6da8510d4d";
+      sha256 = "e584de078948b46afb7e04fe5c021b564b8deab31957eb9ae2810e1f4e77c3ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ca-valencia/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ca-valencia/firefox-136.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "45bb5481a4d145c89d863a55130ec12ec066ba4449478822f4d8af60b2db678b";
+      sha256 = "a8cc1a8012102286919995b0e33cb49d479d5ab43108ad30872e4c961652d568";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ca/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ca/firefox-136.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "d760dc6e37eb091b4e03a18843e6ed2c49e055d2be4eae15b8b0f56508e03294";
+      sha256 = "86c73a79a22bafbbe6dd7b19c3f77c69705cdc5b3acc138b415e6cf07e989979";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/cak/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/cak/firefox-136.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "6026da8bac996273b82c8e06d8797f3537c0a5c84fcaa92c9e13ff0f40563180";
+      sha256 = "71aec201f5c41fb72d00d2c94d601a15d320817cdc936cac92eca0b18d229b24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/cs/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/cs/firefox-136.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "f686b0f9902b61fea029d3839c0285639e1ba71eb5ef6d6133b6b468d7273381";
+      sha256 = "0482fe0298aa60c5dca222a959595d1d96621bd82a75eb1f51a064dfab1784e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/cy/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/cy/firefox-136.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "e799431f1a5df2ed9b1c570c2cf605ddab3593c9c0443b0229b006aaac548217";
+      sha256 = "a7ed50818db530aa0fa1ff3f7793239ccdb038904f143570c39b23fa25184c8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/da/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/da/firefox-136.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "2d98f25400b2bb6336ab3d142dda68e1487e34f5c213e25b5fcf27857d7354ba";
+      sha256 = "790db27f382096228f6536ecdb9dbaf4cf628178002d6b17f48bda846c308c24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/de/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/de/firefox-136.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "66d8c8e64ff9d207798e778306dec390d99ccf701357d079f98a231266bd8224";
+      sha256 = "61f354191174e987b827681651dd15c27b37abaf884591faf30810bf6f1ff6a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/dsb/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/dsb/firefox-136.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "821e3ff15d1f164f26b59ff48153fd980dde556ab37746e9357259020cd74d91";
+      sha256 = "54532e97bb41bb660310533aff9c52ec8c662aca85fa4f55c4661b96348690d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/el/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/el/firefox-136.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "f3c29ea42946d8183cd835ac3810c785acadb8c88a64988837d91a7dfd8b55d1";
+      sha256 = "4d9b6e72230f3616c0a11cec4af0f8316b7dfeb0d39efa6d3c467d3e6b91d3bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/en-CA/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/en-CA/firefox-136.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "8ded99749c418c8cac6ff852c6fdd7e1d674c3ebf4152bbf187528b6e648608a";
+      sha256 = "6a82492385caa448a7cec49a2cae34bfb0541b95b144a0e26bd8eb2b774c5766";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/en-GB/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/en-GB/firefox-136.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "4a66152c914635f4fecbec370a3775ecc87f2f50c7eb17d52b9ea95e472652ce";
+      sha256 = "efc6b4bddfe47edb6cc4535bbd3333b3251182249dfa09b9fea2bc7360307489";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/en-US/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/en-US/firefox-136.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "4f76c45196cd4d7cacbdc9038d80757cc9bbe387dd43e2b81bd8a7748d630ee8";
+      sha256 = "5222f51caacfccaf0f0cf795117f0ad37422fe9d413ef18f2c171e1622b9455a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/eo/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/eo/firefox-136.0.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "d0dfb267fe91da8ae11e31c3df62e5789f2652d88cb5b5d7b0320814ad00b9c3";
+      sha256 = "cb58eddc94762a0125615b08e6592f88ccc7aafa918c84d06777e73398ec5faf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/es-AR/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/es-AR/firefox-136.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "587c6a1837db53eaf365e675c5b1790ccb00c0ffbe5a48dd0e6ea71a2a501dd6";
+      sha256 = "a341133cf1c958d57b7f93660e839db02b7b6371f30e6caa71b4282215d95f4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/es-CL/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/es-CL/firefox-136.0.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "99abb3aecd6d1064e5073635a691b7eacc72d5304a1793f0c23120eea2593fba";
+      sha256 = "004b6b643e40c178afca9683c72cb2f5e0984ba5a618fe8951904e34149b0a66";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/es-ES/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/es-ES/firefox-136.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "0ba144c3d86c93dbe3131ce8cc400ecbef1fe2ddbf652bea91fa9234039a65bf";
+      sha256 = "eeeaab196889f34a50242c1c139edffcfe2ee1344aa3a65efc229d63c4aea2b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/es-MX/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/es-MX/firefox-136.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "e1fa322eea3e8c8680424544e23938b5a2f53188687ce42da57b8f51d7f48de3";
+      sha256 = "cb47b40782ee2407f92950cd2f6d669e96be536c96606e11a611a7c5947e7931";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/et/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/et/firefox-136.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "1c40069708c67ad9f6b69e30c4c90eacc2c55c4803f9bdd6e2ab87c88d4c0490";
+      sha256 = "640b0df3b2cf3b97a4a318f717e8f231f4006ad6ab5d02d165f1397e5734c245";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/eu/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/eu/firefox-136.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "641ceee7d60d3afeb49781bb82c2b0f599dee7342d837eaa47d39a1830dbfa22";
+      sha256 = "57f24c141a609de904dbe16c7423340dc054e47d142f97bb63441742356c3cdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/fa/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/fa/firefox-136.0.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "3fde1e08a577f2fe2c5d4f9accab679cb2c00a68410c904628a88ffb3eb6deae";
+      sha256 = "9d21f32afa3137f128403b860d189e006f9d10587538cd81a7574c7a6a87a9c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ff/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ff/firefox-136.0.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "e304b6019ca397f76adf8798b648142e46452cc99ce133571b35455b80d8ddda";
+      sha256 = "6765004fde25111263bb356666593d48eec5acc5458c05185b28b6a207f933f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/fi/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/fi/firefox-136.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "3f67277f06a45ac65459f43b0cb9a4366a6963b62985cdbd68dba3ef9ba1756b";
+      sha256 = "941193f427a6ed3f0b9cf603ae88b10fde68b920b5e86e7593890ab8af4666e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/fr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/fr/firefox-136.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "132cff32e22ace6b88411ff5af29281c07908363bf2fc951aeee1fb7224af9d0";
+      sha256 = "e15bb37a0e4eca51b3959ac5e8016f6d83e16d356928ee5fb1285ccfc4c844f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/fur/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/fur/firefox-136.0.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "d00fed3e2125981c1aee361192128f6fbb513f38fd8df43725b9f9d0167e5633";
+      sha256 = "4df59c4005738e33f9e629b3ea6793d423275ddb011c7423ebe181a1e35b8597";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/fy-NL/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/fy-NL/firefox-136.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "91e032552cecca42eabe114f61eef772ed4ff1b5a6f3aab8a2878b4e19349939";
+      sha256 = "cf4d03d35346bb4e7bf49099dee920fbd208e54e1dcffcc5afdb852490da6393";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ga-IE/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ga-IE/firefox-136.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "f2f74d2cc1058f872863523d5f92af386373b1f0cecbe7f63cca223f26ddc241";
+      sha256 = "b10ab4f91d789fb99bfb91ae7b2756d83618e042b8964261bcf894c9ebfa9481";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/gd/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/gd/firefox-136.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "6f5e31d2f351feb3e1e7a5959ed7a4152627b15d0e7ac5145618290c02a01a7b";
+      sha256 = "57ed057072f63e3084174bc1dbf5cb526cdc08120537e294c98a2dbffa9ebe45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/gl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/gl/firefox-136.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "3cfa4db7dd654d02caeb4f94d9a384c28b3966326d5874fdc5e7cba82d5ec95c";
+      sha256 = "b442d8e5235586327f488b9a27e01c23c53e52fee4ed2273b14d92bb90f827f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/gn/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/gn/firefox-136.0.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "dff5fd3ec38a386a12f0c22ad48b9839eb374576caa458449e6238f609517dc5";
+      sha256 = "bd07522d7f0337640e77d5dc89ae392c736fe8607ab1490cb0c097ec916a846d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/gu-IN/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/gu-IN/firefox-136.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "a40f2abd3af7f02e538397a263f87eb5e4fcd9e111a715b60ae2bc49c97f406c";
+      sha256 = "755ce6839edc507578b57bae03f393491c6fc49a17ab6e10746bfdc678bca7f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/he/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/he/firefox-136.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "32bd9eb3e13731084245257224c5224a7faa01cfccecbf34f293e3ea8e487435";
+      sha256 = "ff10766f06414ffe9b5c8eb8c1a674887a128c09059e660eeb8140ed8404d3a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/hi-IN/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/hi-IN/firefox-136.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "98851d1ec53e8181afc99809a346530ba85982109d81f05379fccac40d792abe";
+      sha256 = "ff135c05637306b138c84f3757d9006801f0091f50187f2f33318ee939bad64a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/hr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/hr/firefox-136.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "be37998e147f5a49bbd9fea5c8d978a9720bca3f48941e0b9611c24aa97d859d";
+      sha256 = "5798d5f33877fe764130a5518d8b3ac31358b34e66a94172b99deb075cd7c528";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/hsb/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/hsb/firefox-136.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "acc2fc5c8b535732df36b29b66ac9e6e57aaef836fa81584ddca50282166de14";
+      sha256 = "4cc2b54239248a790e3ee9b23adae92543d239984a182e9497f6c8172e17be76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/hu/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/hu/firefox-136.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "b8db7bd380a88798f3940f9aba34be6415d8a55964ec93d25edc66aa857985a6";
+      sha256 = "14c80b4a5f19056f53fac0b65c2d33ff41cae6acc0b5ba12812147aa68955cae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/hy-AM/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/hy-AM/firefox-136.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "1f05f5a57f4456685ecd91407a934af22b2d4c747b6c6e3bb7ea5fd12bdd185f";
+      sha256 = "7322059762b6bfedfe7ce49c2aaee1c813da98d8aa6ca458222f2fca4d19babe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ia/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ia/firefox-136.0.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "7e6ee73ffe85a5c0a271918ecc9adfb50022b5e09a653443fd617ab47e860637";
+      sha256 = "89ae4e060475c24bbeb650226f2e5d8828b502580bb0d193f4245e88d189c80c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/id/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/id/firefox-136.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "065f5bf64bba19939f8b841e5f49eac1cdf9b9f7cfbf26bc005b77ad30bc746d";
+      sha256 = "96be79fb8140f8f0f239ff9480e4bd67904a3e2ad426e2f0e843868213b4353b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/is/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/is/firefox-136.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "412e812053077448faaf7592361692e8bcaaeb4328d51289892fbf7bd517aae3";
+      sha256 = "97e53c0a714b858f6868db7e249df9443f6a1bead37a2c9a50009ccac8d691de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/it/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/it/firefox-136.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "acfbc59a9da22ffc60c39adc6c0410cdc514a810fbfa9d7d246a6d689fcd25d6";
+      sha256 = "d2dcecc364fa116d5c5f3fab734cdf43acb6934963fd65b092f737ca4ed0f630";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ja/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ja/firefox-136.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "3e321738351d2642898a5b99c6e54eb4ebf0e3f2a12d8d440ffe34d3dc1b030d";
+      sha256 = "22bf332ca6e751d38c44218d6ba7d87e08af0911a428052d69fe98026d7e53c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ka/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ka/firefox-136.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "987fec6c9d62316473a1e86a33c1550e8c3ef43d1984f8bb678aba0b03b6b72b";
+      sha256 = "fce144001716c858158159c676ce8233fdebe825740f1c38777b417b951b96ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/kab/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/kab/firefox-136.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "f8b39495eaf6b5d9236e633cbd70df081a4f2cd330d6a41d92c18902f27aee5a";
+      sha256 = "82451783ebf5c079baf5e200ff9f693ff080cda7c72c34b6ddde7ebfb191b12b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/kk/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/kk/firefox-136.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "04758df2c976f3545b9528c91c8f83ea8998354c3dc663250014970f1c6b69a7";
+      sha256 = "bd447d3fa32b945b7c020f2bc9bf7bfc75fecfb3424b9f3b90fc28e244985d9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/km/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/km/firefox-136.0.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "d7fe56786823bdbb27f9777891a82564d4279155c17ff10ea74dab2ce5c427e0";
+      sha256 = "db73f34d3616d9f9038bb653f4e3c9fd504211e97bec1110ab12f31914b33dee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/kn/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/kn/firefox-136.0.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "bade2e71b45a2f1e2fa1c8870ec2f5e52bd28f7a3a13998938200ab4b0900a3b";
+      sha256 = "8ac9dc16dff94bb0ac4c6bf23139adfd931b7599e78cac73b0bab75c0bcd6b56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ko/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ko/firefox-136.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "40743fd1c0c064a44ed81d5acd57f78994a6cb01ebcddf8e5e2876d4654a46ad";
+      sha256 = "6692641847e7b0598bf38ee0b0ed61767b943df13333abccc1aa812951ed54ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/lij/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/lij/firefox-136.0.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "be26468c3ae7d798abbdea470e1b3295ae93efd563c34358c0984366125091ab";
+      sha256 = "3a1f1b7bd6549294e0333bfd41c02478b6eba09d691071abb9ce8b1f186b7a39";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/lt/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/lt/firefox-136.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "67ec58587fdede39ae054baffecfa9e7dcce5c5ea9811f97d1ba1de74c8f2a53";
+      sha256 = "f94133a2988c4ed1fd9273a3a1f582a9aaf6c1e5b4d90b394a3fa70c24bca3c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/lv/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/lv/firefox-136.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "ce14f1ae6041fa1d790fc60196756169316d714d38b17563e50ff390887cdfec";
+      sha256 = "23c2a51f6371ba30c9e54de5eacaadf818a6e012e9d9cf2fe6172d5de4942242";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/mk/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/mk/firefox-136.0.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "a06f5d0a075b8cb79e69c5e21dd4fa43bcd0b82680b56a39ebf215af15efe398";
+      sha256 = "81e700a2257b0496414ba811515ed832b07eaf7c6c766793d35015a7a6f8aaf0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/mr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/mr/firefox-136.0.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "5c5ee80edd4d7854d9474474971a48d724a1c93c0cac60d62fd93687aa159eb1";
+      sha256 = "f052dd75a1697441e4c3b395a3e57c238bc7c860c3a46de2e7bc1848b6bd3192";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ms/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ms/firefox-136.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "bd3fb4ebd6ed6833cefeb147736a1eadee824a457053854a2ba5a16eac8273bc";
+      sha256 = "6d3560e432ffc8c677175c6780a36c91ea9bccc06fe52953f190b2b9bcce94de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/my/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/my/firefox-136.0.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "25cb3e2e364899be8c708411f591f8ae51e95af9f9ef726e7d1b58835ab33880";
+      sha256 = "0b1481e923188ebae7cec90bda2166c3798e4d0f1a714e828b362ddc85098b0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/nb-NO/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/nb-NO/firefox-136.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "0265a2be242623af393a43effa41ce35d4f7a7970a963c0d7fab406d1634d944";
+      sha256 = "f62492e978a320f32488d85f581963b858dc6897cca51949cb2453d94af7425f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ne-NP/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ne-NP/firefox-136.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "d0cb102fe9d54bee0a4b1db719afbdecb63dc4ef4447bfba6100ee5a96232fbd";
+      sha256 = "56db95460e0ee07fad875802b7aabb31038915779a780d7d231c0e48f59021f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/nl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/nl/firefox-136.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "aafedbe22664d2bc7c0638670c505bc4f8953d187fd3f879218c1131d3278b86";
+      sha256 = "43fd74b72b5f580be29bd332d6b3a429d339dd7e291cfca57eced20d3c4e9230";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/nn-NO/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/nn-NO/firefox-136.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "129627b922147601fe04d6f2419fcc0174f81943b0da660bd95fa6fb236fdc1c";
+      sha256 = "65676255bba5819b07d59de8b22f402a8b1dab0d252f7c34d5c1dbc92c2c368c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/oc/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/oc/firefox-136.0.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "8d392514cd05614334b931d04e6b6b8bbd58f0f43fab5dae9efdbba8ce30a001";
+      sha256 = "93da9cc423cd623512cc92d7cd39d58497a9dd3a17968fc67e705d201c6b1426";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/pa-IN/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/pa-IN/firefox-136.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "ec27efc20302616ffb4ecdf936a9eb7a1d4ce886b67f3a8fb66f4820a8246b76";
+      sha256 = "eacb82901e9b4c4550ae92a239d8bf2cf559954d55e3f6bbc434f73fa291eceb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/pl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/pl/firefox-136.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "7ac5b2a539050a06ec9a1940a923976222bd635dc07acc8a9a4e379c50d918ec";
+      sha256 = "a8eed53ebf6d52f3c98bd684a7c54dc0940bedca73059d4d6d1b25e33166279e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/pt-BR/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/pt-BR/firefox-136.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "6c81b880332d86f273a142986310de26a18a77597ace7c35e4d63923d39db070";
+      sha256 = "3c16a2c1c3548a2d6a4c491afbd32698c8a949dd17901075caa7cbb3bd76ae86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/pt-PT/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/pt-PT/firefox-136.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "25cae3090f199ad7c4233463a4fe33aea7dcd2dedbaf699264eb7529eedbc4cb";
+      sha256 = "19e570e239cb1b6f0f02074b321397e7a89382605104c8bc15df3ddc803f3aef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/rm/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/rm/firefox-136.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "7c6c2602081870a8a6a37bf994da60d875decb48a5a8bc1d2dfe153224d9fd5e";
+      sha256 = "a3dbeba1a1cc3f2daf680e30d2bea8250f659f9149d61255fbb9691da37699a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ro/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ro/firefox-136.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "20bdf9c4c37ddf25f515064b0746a4a31f71b59e0b4a510f2dadbe71699a4234";
+      sha256 = "933f358726234ec7648d5e6d7c7051eb68c8f0c6ad3e63db4484f8aff4ab74eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ru/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ru/firefox-136.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "34a498efc44115d13aed6a494725e8c201da5b3e2c920a34bee7fc9da627a02c";
+      sha256 = "8516fb85d4b5365b1b1841418276602a73d20305e01b819ccbf217dce1189301";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sat/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/sat/firefox-136.0.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "512c0ff90882875da0d8025942788dad94008a55a0e7e54fe6aa0a0ef4ce34cd";
+      sha256 = "1e025fed6e03d4f7ffe4b95ef003d014f025acbc759195df7748b33c7ba7f1cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sc/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/sc/firefox-136.0.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "d31bf478b2fd3cc24b0bdefac89d1a78b1216f9ca7878bc7edc71a858d643e45";
+      sha256 = "3bca71b225c52e1114564df9f0ac6dec75cc47b1c87de6f660e84b0dfaa27b37";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sco/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/sco/firefox-136.0.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "a7fb73f110385a112b74077b08b0ecf28a294fcaedec516339d5bdf3784f6200";
+      sha256 = "448cc36231f5d3f38db1ddad75f14056328ea720f19427edc97d518fa63db333";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/si/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/si/firefox-136.0.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "cd4f6385ce73b65f4492310a9be81ef356c915047ecb6030c048de49c32f017c";
+      sha256 = "71609876033c6ac3040994f694c83d6806b3333625a66513697a3047cfecc8c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sk/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/sk/firefox-136.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "4ef13cc54f9065949238fa8bbc556c04d33fb2a72407d853e303a8b7652ea1f6";
+      sha256 = "5384b9e6967038caadcdfbf8c8fb1f4f845dd8462113702222e9e0e6a4da4277";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/skr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/skr/firefox-136.0.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "d51cd2574035a26ee977e050ebded2407fd82a4b8b1d8ef523aff6db06c3a4eb";
+      sha256 = "21917691d77ebd815fc713b44912424d8a7d5b19cca3ebd93086db1d55602b53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/sl/firefox-136.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "4da326890042c183d7a929d5b85661e8c7e4913ff69d16615c01ca603324a55e";
+      sha256 = "9a302036985d0a5320635d5cb0326e5949c28191ed7c2fae742da813af3520d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/son/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/son/firefox-136.0.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "4864312286399cb2b4d03785fb686133078d60c191eb2d13a8378b7ecc6e78de";
+      sha256 = "f0f3c8cc68cce40c72c59e61d90b09ade1c012bd9074599b5c1b94d76fa5d9be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sq/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/sq/firefox-136.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "218f269f88a1d6289ecdab29a11395647fe693e4144d767eb46305f5736359af";
+      sha256 = "a8f071be7a061be6b0fa8c8b82322e1164bd2e4f5d3929f31f45ad695677743d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/sr/firefox-136.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "a84d53bebe11310254c65455358daa0d0c40280575c9fbf6e0a4c0b578a6cda3";
+      sha256 = "661e98bc6a28fea90671e55e8af3854790b11b2e443dfce739b0c2d41ced0ebc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sv-SE/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/sv-SE/firefox-136.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "46ff0638dff2df105f760852d3cb258f67ce7b70b3ec6092a7112f15ffc9553c";
+      sha256 = "99731b8cdedaab984e4bb29c51e12ef50825a34129eb10090264fb350a89e0b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/szl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/szl/firefox-136.0.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "da2bc83da355292b4914cf1766426ca6aa623f4a329fd6f16b0252708a8f1986";
+      sha256 = "6a8487a64d101e6ded104b472eafc4411827fae28c990a387f74e19b330bff01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ta/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ta/firefox-136.0.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "731dd9e89351143c923e99b71d8b18cd09cdcba01ef8781037826bcaff52c35d";
+      sha256 = "f72720040861bdf925044a75544a7d9ea8caa69c6d2aeecfb07f21b7f213a463";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/te/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/te/firefox-136.0.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "71d10251232991cfe2f2a7f37016ed93bb6ed1cb009732c05e72371e8d716495";
+      sha256 = "9c2a975548cccc5245f0b65a0c0a71454c4a790d94c36838f2a66bab442461a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/tg/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/tg/firefox-136.0.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "bcf402aaa8bdeeb48ab7d21a6ea5eef55ed97fa04c96e3931c0df063ce36719f";
+      sha256 = "7442cde792032a617abea549fbf5d1835a52ca0099fd894a4c85959ef18d7840";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/th/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/th/firefox-136.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "c726adabe33ce9c9ef83ad2c3511cb5b3b14cfac740704b477f79d20db47faba";
+      sha256 = "24fb5e08ec008bd9f41d906ae9ca5d659ce270c566f19e81566f3899d787e8a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/tl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/tl/firefox-136.0.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "2603148fd61af0bc103564de6df46ac5813fc98f6408e2916ccdc1234fb3bade";
+      sha256 = "db4b826e9a2aa6083de672157a62d16f3c7c7181b41b0a9fab41bca1bd8c7334";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/tr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/tr/firefox-136.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "25678b5287864fc27a9eeb53b0fcc7cbd1ca5ac319e7a666659a549cf73d8d07";
+      sha256 = "b269e2cfbac1f58b3ef2526f224e1d54c5dd667e3ab167491026935baa495a65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/trs/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/trs/firefox-136.0.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "7a7e0a7d6288add3a287bca63c4c8eeabbe909105774f26b5df19bf593f8abcc";
+      sha256 = "41c38d4655da7c47833dc7d05dbd14a9b90642a264d3c30e6281d17c8fb4b586";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/uk/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/uk/firefox-136.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "9ce9461aa559bb9572f71aab42d96a0dc42181b80cc5baa09c4ead7907e77c74";
+      sha256 = "0fe8e8ce66b85a1f915be9ffd5a187c30525ac169ab705a6aff29d4ffc0ab2e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ur/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/ur/firefox-136.0.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "225cb95d842660b83f45ad2c6bf78500bc72ee47d774e22db51e43d5bbc09e8f";
+      sha256 = "0cc13615cc256ebd4d992b6b8a50fd7af69bb10511226146d5628656c3c24bfe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/uz/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/uz/firefox-136.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "ffffa772a552421e82c79472ea641a4255725947e1be14221fff4e8bbebf9c54";
+      sha256 = "743ae0e69c0bb866e32076797e7ad0a73246480b91255a9bb836a4e209ff9c36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/vi/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/vi/firefox-136.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "1fb27749f090584cf06f731d871c8317b0bcc5a85391a85b1bd2c9caddde5848";
+      sha256 = "655236781f9e4dceb165cd55df6a99d5f0a0e248ee57532ef8515ad01c10a839";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/xh/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/xh/firefox-136.0.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "47c7365321aa796f5a1bfb960a59e329fdcbcc8cd98c05736cbb3fcc3aa9cdf0";
+      sha256 = "36a4ab91f101f4eacd45a96154c885f65ff0ac057a9daf4b0ce72e71b6acfbb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/zh-CN/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/zh-CN/firefox-136.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "3f192e56a3636945878d1c61b208cf37b3ba2761a9a0def06c2bf57f8e5e6868";
+      sha256 = "34802a495305869f8899b645ef23e93a2ec834c6ef6ac4d7d8ca008d4cd628e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/zh-TW/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/zh-TW/firefox-136.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "1a1bce8af641af3dfa42e3cd97fc092d4f122bc4cf8cf48bf600235b388a6c46";
+      sha256 = "f4ef8e63724bf8d7d2608f9c8bd52c6903f19034a4fac1503f93b0c7a2f5681c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ach/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ach/firefox-136.0.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "c82cd11cbeab8500505a974944bbe72f5c1a7812a385ed83f50d6c06c37b72c2";
+      sha256 = "3e4cac3a1e4401143ee4abd2b7a8876101ffd2631124c6b5ad17f08ed98b24f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/af/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/af/firefox-136.0.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "63a0ad22cf777230cb88b33998afa52851e510454e03bda5f9af3f08179eb303";
+      sha256 = "61f8f5a2a187b7dbedf0fc8364252601c42d822e886cc19ac87256af76fb6b31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/an/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/an/firefox-136.0.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "6e4561401df01b7a4b8a997270603171a781151cd31a4003677e076933de99c9";
+      sha256 = "ec87fbe4395d646158c26cff6a6b5ceed3cafae613290887bd0dae28240cee8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ar/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ar/firefox-136.0.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "c7b7e1cff64f22436e13ee69344bc7c4d762c02f26afd69935b9c66c536b0b89";
+      sha256 = "d594ba0a21f51fc0edef6564748d2d50fdf08125b612d8f2ba6101e4ed8868b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ast/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ast/firefox-136.0.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "8fb6ee84c5bfa8c1a3843780f71672a47b5ba4f0f5de31e09946baf32f04e94e";
+      sha256 = "30a01d6dcde1ad68fb9ae4523b9c709d46d0c475938b976cfc48af4d374c7306";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/az/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/az/firefox-136.0.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "5b04b6afb8e278df645dfeafcdccf35b0d822b2af3f8b85d0834b4bbcd1d22dc";
+      sha256 = "39fbbaa8af5e000bafe33ea2e30c4d7c0e2d083833e70fdb661191b5b364021c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/be/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/be/firefox-136.0.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "bfbf9a3ba109af1659c4569515bda7ae8becae2d52c89b20515c13552f02d679";
+      sha256 = "e45063ffbb17e61bc56ce354c08f2ee7aa24b1ad7bcd49dd1eef8ccfd3d74d01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/bg/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/bg/firefox-136.0.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "3268b534952c38b6d62badaca6a5feafc3be9fd895381233887e984dc70242a2";
+      sha256 = "1e53579ab2a49eacff250afc7b8884148b3f9e3de4210af97e3a85e4798224be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/bn/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/bn/firefox-136.0.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "d70488e1e19a4b4a5d78ed76d810471597279596f87fa2a791f99b5d4980ba58";
+      sha256 = "bd3d06645d9710bb3ca03243b7fefc7074bf7150c7c199edbe86a39b54cb907c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/br/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/br/firefox-136.0.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "ce36b6e4eeb9fe08f1ac8fa9ae3e39de455a84351a07f94190c1107138d2b42f";
+      sha256 = "6f6f7edc391a35655bddb378f8c0cd1ec8e62f864fed217677fc3effc38f737b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/bs/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/bs/firefox-136.0.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "3a4b8f3a5cb0b12223e1b9effcccfa9080db3df224cc9fe4bacfdca7929286ef";
+      sha256 = "23046fdb7eef48f0380e0fcaf869e09afa45cde385ae417bf5154c2c8816ebc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ca-valencia/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ca-valencia/firefox-136.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "cfcaa98614b10f801eefbb577b649485e35609c5e5873ba7252431c322cf8ca2";
+      sha256 = "809eb3de2d1d0a8ab88083553bc50391898e33cdfb1fb337e8983062558dd694";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ca/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ca/firefox-136.0.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "0fc1404dc7fc6fe900065c3139efa8a5b564b2e31c43b14f3f12abbd9782b934";
+      sha256 = "7117fc9d07b07b24ef8d4771a212ddd929bd3a3fcdfdbd2e0ec28a9bf977cac8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/cak/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/cak/firefox-136.0.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "20516b513a9ed010c149b224f6571b1f58bc10659174a2b35f0895ac25066cbd";
+      sha256 = "3825bec6617a7a8deb533574a2e17d0f4ea7aae385d8b762c75722b6de1713d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/cs/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/cs/firefox-136.0.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "50f2c076ad1fed32095b2df46fff544055876129f97dd0148b68105a400efcf8";
+      sha256 = "dff3d2a041100d4a778e1863104d539335e941a94758b2312c28197ca9a14c90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/cy/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/cy/firefox-136.0.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "e5ec5267bc359ea1b6d0558ca11e4759475694291e85b5e2284b26c0cb95b207";
+      sha256 = "04f6e09197a34cd173513f038ded117c9522afcddefe2fa0a1402624a45dec7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/da/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/da/firefox-136.0.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "b94cd629ed241c78631af1999de1c428a628baa88d4efed600472f55c4f91d68";
+      sha256 = "5668e28734e82f988d02005c2bae6fb27913ace13a4ec985b70c1f20e776fae8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/de/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/de/firefox-136.0.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "2e534968130b9ae7ea8c47f66b29ba9f97c0f4017404760fe7e2a8a0ff8af4e7";
+      sha256 = "fe84c156862aa18bea062d9f6e407aa402ec471569e4f4bb65f5bd84ec077db9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/dsb/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/dsb/firefox-136.0.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "2afe07c907d965a26d6a165dd5ffd6b799d40208618233c4394a503c0e5693d2";
+      sha256 = "f93785d3ce8fec50bb99f163424bbe0b826a910f43d7c36180f12399ae936097";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/el/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/el/firefox-136.0.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "a08417db97449e9f51c21b23f81a6627e860d5c2610f3f43064f40021864a91b";
+      sha256 = "c715b5411c45832484edd5098302363d47c08a0644dd757366abc4851481f5ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/en-CA/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/en-CA/firefox-136.0.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "bc263b9f5a082f49e59c8f8432a89f29e2b241ce32236b95dc3efca653789acc";
+      sha256 = "3e9824f7c04e70e7b304952e7b4b485dc13d6a8f02273da05cd1994ae16bcf0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/en-GB/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/en-GB/firefox-136.0.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "eb8b857d57327915f5e7ba3b10170dcfbc90c76e317893fc435d4001c71615c2";
+      sha256 = "e0b674aa4b831732fae7b67359a480b46bf2f754befba02509c3bcdddd18919c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/en-US/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/en-US/firefox-136.0.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "067f19bd0eee8892418a1f56160322187c3f4ac081a7ae796dc32774921a56ba";
+      sha256 = "9a387467a5da1e9a05312fc4e43069eaf50924c3c7657af8f38121b18f31cf5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/eo/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/eo/firefox-136.0.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "211c205fd397da7979438e432240c53f2bbc0e9832a2dcbd7301c594b7924e46";
+      sha256 = "1b7acbaf458076721cd95afa2589ea78b8506f76950b0a9646a1ebe4aea9a784";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/es-AR/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/es-AR/firefox-136.0.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "dc5aa614418fd37b61c4a469156d85f9f37c27eccb8e570caa0448d1a2bf18b1";
+      sha256 = "cf02180d2d8db640d3496735da0fc2844000259ae7b1e65d0d0589bfafa4db6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/es-CL/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/es-CL/firefox-136.0.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "912a7cc7d8d94cc4494542d48870456f7920a4f3bc3153a6e9f96d7ae33b998b";
+      sha256 = "90566123e51d4ccb6fc8fcb4d5ae6cf3bf302bbd50ed22b8c2ce51868cbd4296";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/es-ES/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/es-ES/firefox-136.0.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "129be627e784c79f5cab7864fc9bce8f36fdbdad6eabb5d319438334149045a3";
+      sha256 = "a686222d0fa78d568f1631946468dde9c580108f0453b01a20b9cc21e5d27ae2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/es-MX/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/es-MX/firefox-136.0.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "95fcf3ddb9e19e402760a2065a50907e6d6bc7114ff0f40b62c6f240fd7ffc1b";
+      sha256 = "949be9223592ce5ca0d01b1e975eaa2ed2818276a7b65e045e1dcbc1036c7e1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/et/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/et/firefox-136.0.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "13685d04f661d5de4b47fff13c278b0d753941beff73f738bed6742e3bab740f";
+      sha256 = "ceda792622d72e5942b68e3c8da75d94d8f73cb60a35c10397363413b3e9a96c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/eu/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/eu/firefox-136.0.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "3b576d42d83bb25daf60b6ebaeb51ed90c0c6ba02bb303704eed99c5d9311277";
+      sha256 = "e9fd19c6dcb018722a6cb66b39a3aa776eb6870bc2e35649881cc50690b5954e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/fa/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/fa/firefox-136.0.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "af54fc246326c125b22f26f825a5354afc31a027a326cfddef2614f3016d6958";
+      sha256 = "b52326dd13a792948b669a26f7fd7db80a447d481e330def69d66e867963cd46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ff/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ff/firefox-136.0.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "b2baef68a972000a2efcd11cda6af5b3279ab1b80116f9bb44beb61532e132f8";
+      sha256 = "6dc07d581a9292ed0f6da5b3580421c7cf5d71a4e266959e1ea57085be608212";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/fi/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/fi/firefox-136.0.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "c1004e13cfcd6894503a6e13fad8dd97c8ebedfa69f52f9d003abde50f88c073";
+      sha256 = "3ff24fcb1fc97c91aade74914520a811a598ec849be07e606d743e02bed0c40f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/fr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/fr/firefox-136.0.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "ffa6a20adf5f77f5fd7ab38da6b886d7de4d940357c44e4fee161538b385d594";
+      sha256 = "6e8ba45ababaa7cbf70e9a3b67c0a479570e856d53546cd409b38849ff9e21ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/fur/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/fur/firefox-136.0.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "e5409602ca444c8b8ec3de997ee56f981bf398f27fb383429d5fb5d51a12d5c1";
+      sha256 = "862f8f060ff605ae4d164c2a56d4b242ce84c181437e4c2fe36c314828b0bade";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/fy-NL/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/fy-NL/firefox-136.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "6965b6d0a81784a1b434edc47433216bc723fbf998f694543a16f80967c777e1";
+      sha256 = "60de836b4ad3dabcdd6a9d58f09957fad64a10a2c2cb0b64cb2a3a59c34254ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ga-IE/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ga-IE/firefox-136.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "b76b639a3f4b84cbd27b10946f744f9ebe77b51259043c322709a4221d81554a";
+      sha256 = "c0aa76fd1e9f31e7088cc7c4d262b2d5038083c233e1e13e842e8a7b9d37a707";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/gd/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/gd/firefox-136.0.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "e28e684bf152f76c7878f05fa796299349640239479e7edaaa1e136f4023dc18";
+      sha256 = "0b08c420e844c3b652b5ec3c278c607def41b513a73b8b80921e02eaa6eac7a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/gl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/gl/firefox-136.0.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "8d28ed21f02efd61288323226275d91445b7fa524f3079b73e9cc67573993386";
+      sha256 = "fac969416598741e03fb725f48062f54d595099d101909d7b9fe63aa37932c0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/gn/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/gn/firefox-136.0.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "84ac348eee05dd7688c80c24c14facf01227cc315f0a704076dfc75a8b860eed";
+      sha256 = "982d43c992bf6dcb820fa91f35126beb1144798c86028c1530d371927cf09ad4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/gu-IN/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/gu-IN/firefox-136.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "c8a8ca67e03f1576a45cbd683fda752382acd72471db2ef9cc37c435cb918feb";
+      sha256 = "829fdafd57430131602777f9ec9f26b9b83f9b469b85f9a6b183d3452fc61ec1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/he/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/he/firefox-136.0.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "fb6e174f3a0262546ad9e4b5f083504fb2b0dc8e97f6bbdf8fd028e77519d961";
+      sha256 = "f3e26085bacb2a5e81d4b361605d25b4b9bd400cd3fbf5d6601cf0e4e264ed00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/hi-IN/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/hi-IN/firefox-136.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "d615c947f4d005ff5f5c735dc51851a6cc581c673db92b6298188f0c2982e05a";
+      sha256 = "efae19dd73ff7b251ea93b61b23aeb0cb88d73637bc319560ed6eb57b2d274df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/hr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/hr/firefox-136.0.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "63ddf1729af345a5f695b8e253e347e8a232a77b6e2a949f87770bf769b7162b";
+      sha256 = "e33de9eac58acdbc3f2888e41b2fe98d1932963860ad33270eb4a60898f6462f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/hsb/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/hsb/firefox-136.0.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "60be97a59f23fe68f22e62e1fe9c95b723ae144f6c92dcf505f29985eb770af8";
+      sha256 = "c154bcaa3ab9543d64a191e231fc9738217b513a9dc26b8bfb31105b5569191d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/hu/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/hu/firefox-136.0.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "cf878262e5ac4668b03e53ba9ea8d06caddf5ae6062ed482c3ff53a4b42d5ab0";
+      sha256 = "06641b862904cc2587f8e71841b1813e8f83fc21d822f3dba1363aa5ea40ff58";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/hy-AM/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/hy-AM/firefox-136.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "81916fa78ef8924cfbeeafd1544bd7f004394b0be9319a38cc9bf9daf2be0537";
+      sha256 = "f27fad94b9803b4c0241da85d75948a071e0fe80165cc87c7b492e3180565523";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ia/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ia/firefox-136.0.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "3c1fe474d0a6cea2bf7cf21800ab47e0079326e3eda3a1951d4d266b0c38a5cd";
+      sha256 = "93d101da04751df0d40e0f3810bf67986523720c15bcc18a0a605da2da971443";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/id/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/id/firefox-136.0.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "f06ee4c1d2f087278152810a47c0d22d2d95f56782a12e149281c281e490444d";
+      sha256 = "a393731d0b3c23b4af378a7d5a4cebb478b17f885877eef60a21a73d2c80a6b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/is/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/is/firefox-136.0.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "2c191208103635c58040f0a5fb29a8a4f71c28fc86ddf39ca0510885abda08af";
+      sha256 = "96893934c71388251c3fcc00d54acbdbe40c62805112b3a058af8008b8c4b5e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/it/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/it/firefox-136.0.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "0af746d1574f0ed4bd0ff0f6fe8297d8f30bf60ccaddc9bbd76989428f83cba0";
+      sha256 = "32b82e1ce3fc2a0b97ce3d819440b17450fa75fd1acb65413ea35a2fdbd52abf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ja/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ja/firefox-136.0.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "97650d3343a76441c61c89de9a4b1166472a1e8d9daf4cf80b09e7892448aec3";
+      sha256 = "58910cbd1b6cedfa72c38e0ba81ec9530c99e736f3c6802fd063953a1b8f39ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ka/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ka/firefox-136.0.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "8340484f793a2a957c742139663206621322739288d62ee32ebd8f531afcda89";
+      sha256 = "833bc46e16bc83181dba53f62a507e0208d903620da3273c87e175aabff6ce55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/kab/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/kab/firefox-136.0.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "3bdca715f792492e1f154f6282e875680507858da33dec14ef6fd81556eeb71b";
+      sha256 = "678dc3f449c349f48b5be0ced1dd222eebb615c2284831e12ca43f74829003c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/kk/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/kk/firefox-136.0.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "e12f286e5da6cce0d6a12aa17d08f34371164acc6ca8a3aae9ed28df3ae4e2b8";
+      sha256 = "fbea11381a693b85b9e82130b7a67438997afbaf46f95ef27eda9a0d001289fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/km/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/km/firefox-136.0.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "13911d8099e669e5ceb77c089f8606e2556dd86beb32ae86a8d48d8d7f196b6a";
+      sha256 = "1157fa82ecc25b4dc8cc8cf405a510169da372bbccde19bdc2aeeafb48e7b6af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/kn/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/kn/firefox-136.0.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "dbc0696f90bace3fef21cfc7c816554ef500bbe123637467751b2572e28efce3";
+      sha256 = "73c34e495fd2cb87a80bec91bde978638498755078b4c488a7e42f1ac7b1d9fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ko/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ko/firefox-136.0.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "41a044fd8c2108137d07955e0fb8558d48d4c1e8eb28056b1f113d3c8866e124";
+      sha256 = "22b0d9befe6b4a2c8e3032ce48b91b1e119ddedcacb90d83c7dc8af87d1e9329";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/lij/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/lij/firefox-136.0.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "041982f1e4523807dce5c7f6b92b01c362255725b204974f7a42561a169e722d";
+      sha256 = "8d0273600905979d707d52f4083b069c7518caefde6a7b7a9213445bdc33e138";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/lt/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/lt/firefox-136.0.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "5b9298fd6a0278d88876e2577233f37f0c109fa1523c296ebf495cbf65e14f61";
+      sha256 = "9ec15b2ea1f4dd138ada898cab8b8d5eb20245fab33bf2bb72135e7a8ddbc5d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/lv/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/lv/firefox-136.0.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "8b22d827132e87a32541d40c0fbaa9eb44b0033f558644ef9406216731b4426f";
+      sha256 = "e687f403b85e780c6bc8e0deb9a0d5658db5219c8c69b854b195f582047efbab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/mk/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/mk/firefox-136.0.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "aed9daec2f23cf8d8a166e190e0c80e0701040fb57fa304de3c3c29ca3bf6933";
+      sha256 = "976665fa8ad8493c673671e493d71c38964598d17f16913b297b6eab10442ac6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/mr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/mr/firefox-136.0.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "f06cc784521054bb1ae02b3d99b6820055f6f3a7af9f7ef72fce63dd9d55e488";
+      sha256 = "e1617f24166256dfdf545ad806793357805b09ea4a41200d9901690373ab7314";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ms/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ms/firefox-136.0.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "16ed16efc1f850be47360ccfede38a43becc051e4417fea5c9ba4e42c69a9994";
+      sha256 = "1c66328870e48cb2917f57f0555910865a2011392c80e45eb4be956d49096399";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/my/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/my/firefox-136.0.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "1d27debaec3228fae7e56dc021df9f3985b45c1ddbd53a9f24ffcd84c833bf85";
+      sha256 = "fa70c26c86e337d2470ed8fb8ae0c4d53df4a6a412edec58412fb3f784b34951";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/nb-NO/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/nb-NO/firefox-136.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "62f259043d06b3468c94eb8088bdb1ad85c491bb37e7b6d4df9b2a3a5e941e8a";
+      sha256 = "9de3b87a20152f5f1a61d0deb49c3b0328be3e5541b62bcdff55391165dfd5f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ne-NP/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ne-NP/firefox-136.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "6a2b77fdfc2560d089a3181353782b68c99441819e964ddbd4a0724e36bf35fd";
+      sha256 = "4fef58f3bb9d65e52078a7d9b058b6646063ad8b42f1f62bc9d70e22e07cca12";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/nl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/nl/firefox-136.0.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "a41cee355f500aca74fc45d01d82f671a7be30bc535dd66dd4aa656944d5c2f7";
+      sha256 = "c487ed53f135ca711a5f11f8cc3006454bfd7fff0191ff16887366c6b1ddc70e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/nn-NO/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/nn-NO/firefox-136.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "e23dcd1a632ae9523a0c404beedfad11027d921d033a8eb877d7a23562c8b0b2";
+      sha256 = "721bd5206a0c9143e0a956f70a317c7ca2c0efcf43c3cd8dcb6f182a1341975a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/oc/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/oc/firefox-136.0.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "d3f4e32079423d0ff4a17b3f65dd071a9343ead3ba70ecf2220779d58894212a";
+      sha256 = "6995744622944bea5a19a210349aac585d39326ec275054f50188732b7a73d36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/pa-IN/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/pa-IN/firefox-136.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "ee0195d6c81d2444927a712b54e17ca610b327e93dc351721dbe92211e52830c";
+      sha256 = "1c89822452373a0d1b6c87239becbe035aa70a1c43eac8ecce708446fe08be0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/pl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/pl/firefox-136.0.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "f760ae4af63044878bd30ca81e990368fb940240bddfb3970e3e365d6eeb7a0e";
+      sha256 = "7fe762f1ca1bd14f921b055ebad4708c7a9099f58a40dc31d98b6bd8baced384";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/pt-BR/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/pt-BR/firefox-136.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "7d5640b25e19264d7eb65b0a1d0d42f94cd3f23d2522dfbaa1dd6ef1cd11272f";
+      sha256 = "78796d45e8247dd8d393b9cc3b3a3658174308be154b6f59ae36401da139bca0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/pt-PT/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/pt-PT/firefox-136.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "5438be4a31c069bb24165a291997353eec760e1f6d293a738bddb04269309101";
+      sha256 = "0006adfd091c449de51d481b8f849d450ed5bb3e595966e0de19631918191be7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/rm/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/rm/firefox-136.0.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "1f6bcaa34fc64e2df6e02327bb6908e6fc175709645a20354df3f5e10dd94689";
+      sha256 = "5bfbf82d83e5238226f8c22af59e4a9556227ff21c9314060f7e2aad9ca7cd3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ro/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ro/firefox-136.0.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "0d5f3918bdb99590fbfc9ba120161af625e2111f1c646dcc6e45562d45edf76d";
+      sha256 = "90e0e2a61165dad0de18017599a16981871d3598333dc7d8d4b3f698e58fffa0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ru/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ru/firefox-136.0.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "bc5712bdab6eae0ec4ad0f2ff2a2534baf0014f51b3c07279350a630d2b1aecc";
+      sha256 = "e0c13b929bc3964371f90bef5c678b8716cfa15fa48930da036f71262adde209";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sat/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/sat/firefox-136.0.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "618408e39eb1f7b0ea6ab20f74666d35e4a7dcab839b61588671191421e1a2ee";
+      sha256 = "505f64e5d09af9c66aa2afbf766bdf27089b5579331231c3fd74757ab2b3a45c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sc/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/sc/firefox-136.0.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "dbc95d8d5529e59642efd27637eb18ce89a56b40bdb7d6c9df4433e5718460c7";
+      sha256 = "57dc00e2eb6e177c65829138681133bbd4dad390696f24363e20f2058e225984";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sco/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/sco/firefox-136.0.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "026d409e7e86646e558204a9d6cd410d854925116a06e289a2a42dd908fb10a6";
+      sha256 = "3b6cfafe0ccef212ba29772de7400bccc6683d9211eccbd42413ea31ad5e4c6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/si/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/si/firefox-136.0.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "202838316171552b6da2ef6b333c1d73941ccddb617cb103a40baa74552b067c";
+      sha256 = "fef402e51c8685526c646be9e02ab152991bc9957203033e924eae7bd89faff4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sk/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/sk/firefox-136.0.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "f8966944f387e89bde5dc93b2d86b41922f778beb6fd17879831cfa738c812f6";
+      sha256 = "4d3578e67bfa78ca7a693c1b53d7ab7ce8558a88be1f3b787c7fd33c7edd8bf7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/skr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/skr/firefox-136.0.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "827176c3fcb0355d77364117e2b19c2d495e9aebdd86a4647fdff5a303d4a9ae";
+      sha256 = "4b22054981c330b2e74c306b802fc7bd1dc4bfcb95a6201759c86ba186bf12be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/sl/firefox-136.0.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "f727a0d7a7b78aa48ff95fe5139c39769b6595fd4d5d371e185dfb40130099b5";
+      sha256 = "2656e6e0db975504baec537d014acbecb9757dccc44eaf12da8bc1cecb71f546";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/son/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/son/firefox-136.0.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "c783330aadb74922bf02d9c0b45ea42066d9b4668979e91ef6006d32ce139fc6";
+      sha256 = "f384768cc33d6f590e527043c72166e4fa03f04fcae67360b30902a8c7ec70f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sq/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/sq/firefox-136.0.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "1ebb5a0f44aa0a850930a7936aad40b43af0d702a68e9c91b63c40bfd6be24b7";
+      sha256 = "2b84d721975ceb1d28afca9893ede28c8f3def13c12ce8ce1da5ad860678f48c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/sr/firefox-136.0.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "b0a53e48e940177ff013cb1d737e8ab9a3b36b7971aaad3d2977a49e2b3391f8";
+      sha256 = "021b84ac34cf7e9004fd2ed8d3f79da84f510ddc12668236b504327bdde7ee79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sv-SE/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/sv-SE/firefox-136.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "a878c834a3434ece1071e35ac7b641fec839caeb7944be935701d0f1a8827fab";
+      sha256 = "aa4cb9a60b0ac3538ce40fce75515a4a1ddbbbbe3a8a0d9e186423dfab963021";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/szl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/szl/firefox-136.0.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "225bb44e577cebfb5c00cca92d0bb727f1927e001800ed58436f05056b3f306e";
+      sha256 = "a9bb17c0129733c03ae47ae3d58640df95bd5776674b2e329ac8ef12bc8238c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ta/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ta/firefox-136.0.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "d42227878cf9a9145ca25a2c8843f681c6fa8a04624ce9833d1e0f5bea9957d2";
+      sha256 = "d2e97e82452f835179064b2d4b64ccc57fae85344d453315766aa1e957d832c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/te/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/te/firefox-136.0.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "6c0e77f5bb0f63f87c7cb614119948823e3e18f4185691e9868e5fe9f0d23af6";
+      sha256 = "e30498879a5e2a252d92c2d65924955648182abdb72de6124e248079811df075";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/tg/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/tg/firefox-136.0.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "f52a5f70015e490fa1ed675f00cbfd07144baea736b72fab945f5419d02ce2b6";
+      sha256 = "63c929a610a0d726a589e0f0583ec6bd702a2c08a601b8473bfa648edd6fe8b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/th/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/th/firefox-136.0.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "8ff6b30726c51c7226256f4373266c54865d597617511c17ac544a302bff2768";
+      sha256 = "d9634e66410fd0f5f4e423a80c7bde22e717c43c92e91a47974b1d9e0c3d522d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/tl/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/tl/firefox-136.0.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "7f2cb41dee4c348e319f1532249bef98b115219e86abdfb144f0e102d7eadb65";
+      sha256 = "29a5a9771d40ba6410c469782fb72c3491a945fa5f25e6b56045adaa2b986637";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/tr/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/tr/firefox-136.0.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "bc15cf950bfddaf704d70eeedbddf710c7a53a4d0791e79d260a6a518fcbcad9";
+      sha256 = "faa976c14599104e1ecf5ced9b6df4ce40ba0376c261996945f2b4a21df320c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/trs/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/trs/firefox-136.0.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "ca2511c660fb97be8da00e8ad5b06d7e188b64b71f8d1ed1881d1150e1ff2a30";
+      sha256 = "d67a3721aaf23a2a1d0d752c0d108c723c7535f58148cea88fb1e301d8ca6d4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/uk/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/uk/firefox-136.0.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "e7dae85ef3bdf6b8b82bb79a38764106ac7077283e7fd39aa663ca424b9ed9ba";
+      sha256 = "5eca03078ddd751cf241b890e7f727e27569aedc752d2a6cef0f1e9abaa47cc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ur/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/ur/firefox-136.0.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "83c97adb1e15085a39e470f07b53f06a2db7d98a4daf7439d41484f063ce6445";
+      sha256 = "07a3f10c13d6375b3e203d85bb5843b9a42d4ab0ad0eb2b73f7a5691d4d63e32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/uz/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/uz/firefox-136.0.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "ad03d75ac68688f7aba2a801017639e3510e46fd42b12f602b8aa66482d21bc4";
+      sha256 = "d726b160135bf3b3b64d45151f79586552013f1cc2a7eb7c39bcce56d39945fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/vi/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/vi/firefox-136.0.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "04d36020a4601df78adf1c18634765aed3e574fc709751eafa811e6a473738b3";
+      sha256 = "dd04f64b4c8a7ce042f6a122f4601cbb79c3025ea19b1e11fe191978147e5ad1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/xh/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/xh/firefox-136.0.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "eca2beedc5ed43f9928c7fc83186f4beafa6b48e870f467dd06d1f9412383fa0";
+      sha256 = "1dec8f74da0bca5b06660c7b36bba9e5f7b9c353efc9e622efc08fca4788d0a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/zh-CN/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/zh-CN/firefox-136.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "80d155ac20cbbf3960fa4a9f108fa0ca6bc97ec5eeb64f684757019c9bb05ac2";
+      sha256 = "2a61e5664eda59d2608c6312deba5fce8462f39601a198c65c157d6bcdbfd750";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/zh-TW/firefox-135.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-i686/zh-TW/firefox-136.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "ad7a84f4151bac75ff3d4e720fb2af7f329c115c510d6aa4cdc2f7fbf2ec3bcf";
+      sha256 = "8a03c4b584fbd52aa0e62864c622d38d6a89b4e1e5c01a8a392514511094c86b";
     }
   ];
 }

From ef01b05b9eb6c3dcc167670bb483aa79ecd6ca61 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 3 Mar 2025 23:17:57 +0100
Subject: [PATCH 068/101] firefox-esr-128-unwrapped: 128.7.0esr -> 128.8.0esr

https://www.mozilla.org/en-US/firefox/128.8.0/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2025-16/

Fixes: CVE-2024-43097, CVE-2025-1930, CVE-2025-1931, CVE-2025-1932,
       CVE-2025-1933, CVE-2025-1934, CVE-2025-1935, CVE-2025-1936,
       CVE-2025-1937, CVE-2025-1938
---
 .../networking/browsers/firefox/packages/firefox-esr-128.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
index 9d066ed8bbc0..cc17aa42aedc 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
@@ -9,11 +9,11 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "128.7.0esr";
+  version = "128.8.0esr";
   applicationName = "Firefox ESR";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "26f9661b395b85a44b42bd72ef1ad976c614216c68f6c2dd834d0ac8b84b9c9f398b8ac550a47396995d96e6bb5fa9a50064d7f2f526bddd45aed5039ef131b8";
+    sha512 = "7c0ef22bc14d4fa248cbae14d629174c9c967f891f4525f609760595f5a108aedf7dd804d1b63b97ec268613fa98378f4742a9b6ab562454351cf21175fdb802";
   };
 
   meta = {

From 7398b0d38ddc7afab69c3abd09fbfb6b1fd36664 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 17:51:18 +0000
Subject: [PATCH 069/101] photofield: 0.17.1 -> 0.18.0

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

diff --git a/pkgs/by-name/ph/photofield/package.nix b/pkgs/by-name/ph/photofield/package.nix
index fbafa8a010ce..89e6f736a75f 100644
--- a/pkgs/by-name/ph/photofield/package.nix
+++ b/pkgs/by-name/ph/photofield/package.nix
@@ -12,13 +12,13 @@
 }:
 
 let
-  version = "0.17.1";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "SmilyOrg";
     repo = "photofield";
     tag = "v${version}";
-    hash = "sha256-leCXj8vETlrU1fwTqLcjcCGvhWWC1ESjpNDWSytAq4s=";
+    hash = "sha256-ZPEkvh+wVudDz7h+5V8I90myyi4ksTU5B5ffI7DrCL0=";
   };
 
   webui = buildNpmPackage {
@@ -40,7 +40,7 @@ buildGo122Module {
   pname = "photofield";
   inherit version src;
 
-  vendorHash = "sha256-eN9syG9/QUA8yut3LaeIb+xlaNUvRAFspyqcCHv6oSA=";
+  vendorHash = "sha256-m0RJgwDO+IcMCbtq2WZixMzZWtglHM6wpoPKOEU0CCw=";
 
   preBuild = ''
     cp -r ${webui}/share/photofield-ui ui/dist

From 07bcf3e909f5db0dcef5bd31885aab3fdeae1d7b Mon Sep 17 00:00:00 2001
From: InfinityGhost <infinity@opentabletdriver.net>
Date: Tue, 4 Mar 2025 13:01:11 -0500
Subject: [PATCH 070/101] pkgs-lib.formats.xml: Fix withHeader parameter

---
 pkgs/pkgs-lib/formats.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index f01ea4fe44fa..b77903a7580b 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -620,7 +620,7 @@ rec {
                   import xmltodict
 
                   with open(os.environ["valuePath"], "r") as f:
-                      print(xmltodict.unparse(json.load(f), full_document=${toString withHeader}, pretty=True, indent=" " * 2))
+                      print(xmltodict.unparse(json.load(f), full_document=${if withHeader then "True" else "False"}, pretty=True, indent=" " * 2))
                 '';
                 passAsFile = [
                   "value"

From 9a18fdb009f23e3d547a9a2a33f4ca83a5886233 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Tue, 4 Mar 2025 10:31:52 -0800
Subject: [PATCH 071/101] signalbackup-tools: 20250303-2 -> 20250304-1

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250303-2...20250304-1
---
 pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 0cb2e1b63136..f57ad2c53a3c 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20250303-2";
+  version = "20250304-1";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-sBhkD68SC5puovPe8XyiBFWYAt/ADddVyKm4thB9dtw=";
+    hash = "sha256-rm3mzQTQCMBia7xexo+fC4sD+ufevbltSA46GsgQAXs=";
   };
 
   nativeBuildInputs = [

From 27a33c4fe1c47f7605dc6dd7df911779c0a4e414 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Tue, 4 Mar 2025 19:38:20 +0100
Subject: [PATCH 072/101] ente-desktop: fix tray icon (#387042)

* ente-desktop: fix tray icon

* Update pkgs/by-name/en/ente-desktop/package.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

---------

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/by-name/en/ente-desktop/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix
index c74c04eef2d5..94d99835dd02 100644
--- a/pkgs/by-name/en/ente-desktop/package.nix
+++ b/pkgs/by-name/en/ente-desktop/package.nix
@@ -63,7 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Path to vips (otherwise it looks within the electron derivation)
   postPatch = ''
-    substituteInPlace src/main/services/image.ts --replace-fail "process.resourcesPath" "\"$out/share/ente-desktop/resources\""
+    substituteInPlace src/main/services/image.ts src/main.ts \
+      --replace-fail "process.resourcesPath" '"$out/share/ente-desktop/resources"'
   '';
 
   postConfigure = ''

From c2fd31d740d2077076554c312a0d9003a1153e88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 19:09:11 +0000
Subject: [PATCH 073/101] fingerprintx: 1.1.14 -> 1.1.15

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

diff --git a/pkgs/by-name/fi/fingerprintx/package.nix b/pkgs/by-name/fi/fingerprintx/package.nix
index 0b20a8ad6c2f..fac358d9d74d 100644
--- a/pkgs/by-name/fi/fingerprintx/package.nix
+++ b/pkgs/by-name/fi/fingerprintx/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "fingerprintx";
-  version = "1.1.14";
+  version = "1.1.15";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "fingerprintx";
     tag = "v${version}";
-    hash = "sha256-o0u6UOrdzORnTgfOlc0kSQ5diDtNHjjbwfuyvPoHHKs=";
+    hash = "sha256-kbSP/nSdCrcEYVvLVawjZ2RDvTGv5JsHEIXXcPLA1ng=";
   };
 
-  vendorHash = "sha256-TMy6FwAFlo+ARvm+RiRqly0xIk4lBCXuZrtdnNSMSxw=";
+  vendorHash = "sha256-1KSNvK2ylqWjfhxMY+NQFoDahPgqGb12nA4oGqqoFIA=";
 
   ldflags = [
     "-s"

From d37a6a671f9314e043c6f7c2dcbf88ba21d7b76f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 19:17:58 +0000
Subject: [PATCH 074/101] go-passbolt-cli: 0.3.1 -> 0.3.2

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

diff --git a/pkgs/by-name/go/go-passbolt-cli/package.nix b/pkgs/by-name/go/go-passbolt-cli/package.nix
index fcf19ff37cda..d2c4341d90cb 100644
--- a/pkgs/by-name/go/go-passbolt-cli/package.nix
+++ b/pkgs/by-name/go/go-passbolt-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "go-passbolt-cli";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "passbolt";
     repo = "go-passbolt-cli";
     rev = "v${version}";
-    hash = "sha256-I+niNUowKTFDMa7yOnRToMFPzO/CbnjXHJr5nAhhHcg=";
+    hash = "sha256-BtMPOmp9dbi/HoNigEeGWIYXRh1/gorV8ycrtWw9I8s=";
   };
 
-  vendorHash = "sha256-XRHGq3Qeq7VWHzw5WWVv4x5orQu740lttGVreiu7qP4=";
+  vendorHash = "sha256-wGSrhW7OsSjHlSKLkOf2AYIxU1m2lM1WGUsy16qxBwA=";
 
   ldflags = [
     "-X=main.version=${version}"

From afc2613411fb255b89d80d152c7c0090c1873748 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 3 Mar 2025 20:02:48 +0100
Subject: [PATCH 075/101] bs-manager: set ELECTRON_FORCE_IS_PACKAGED

This is needed so that the app thinks it's in a packaged state, even if
using the source builds of electron. Once electron-bin gets
restructured, even using that will need this env var to be set.
---
 pkgs/by-name/bs/bs-manager/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/bs/bs-manager/package.nix b/pkgs/by-name/bs/bs-manager/package.nix
index bedf992d0b23..207934fe86c9 100644
--- a/pkgs/by-name/bs/bs-manager/package.nix
+++ b/pkgs/by-name/bs/bs-manager/package.nix
@@ -65,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir -p $out/bin
     makeWrapper ${lib.getExe electron} $out/bin/bs-manager \
+      --set-default ELECTRON_FORCE_IS_PACKAGED 1 \
       --add-flags $out/opt/BSManager/resources \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
       --inherit-argv0

From 8cfff8cba9ce0faf859a256f2b0dd503ad7fa1de Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 3 Mar 2025 20:00:31 +0100
Subject: [PATCH 076/101] electron-bin: don't wrap inside libexec

This change helps bring electron-bin to a similar structure as the
source builds of electron.
The primary motivation of this change was to ensure that the `electron`
binary inside `libexec/electron` is an actual binary and not a wrapper.
This way `electron-fuses` will not complain about not being able to
find the necessary sentinel strings inside the binary.
---
 .../tools/electron/binary/generic.nix         | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index 792ad818a20c..df92207ec0b2 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -151,31 +151,26 @@ let
     dontBuild = true;
 
     installPhase = ''
-      mkdir -p $out/libexec/electron $out/bin
+      mkdir -p $out/libexec/electron
       unzip -d $out/libexec/electron $src
-      ln -s $out/libexec/electron/electron $out/bin
       chmod u-x $out/libexec/electron/*.so*
     '';
 
-    # We use null here to not cause unnecessary rebuilds.
-    dontWrapGApps = if needsAarch64PageSizeFix then true else null;
-    preFixup =
-      if needsAarch64PageSizeFix then
-        ''
-          wrapProgram "$out/libexec/electron/chrome_crashpad_handler" "''${gappsWrapperArgs[@]}"
-          wrapProgram "$out/libexec/electron/chrome-sandbox" "''${gappsWrapperArgs[@]}"
-          wrapProgram "$out/libexec/electron/electron" "''${gappsWrapperArgs[@]}" \
-            --add-flags "--js-flags=--no-decommit-pooled-pages"
-        ''
-      else
-        null;
+    # We don't want to wrap the contents of $out/libexec automatically
+    dontWrapGApps = true;
+
+    preFixup = ''
+      makeWrapper "$out/libexec/electron/electron" $out/bin/electron \
+        "''${gappsWrapperArgs[@]}" \
+        ${lib.optionalString needsAarch64PageSizeFix "--add-flags '--js-flags=--no-decommit-pooled-pages'"}
+    '';
 
     postFixup = ''
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "${electronLibPath}:$out/libexec/electron" \
-        $out/libexec/electron/.electron-wrapped \
-        $out/libexec/electron/.chrome_crashpad_handler-wrapped
+        $out/libexec/electron/electron \
+        $out/libexec/electron/chrome_crashpad_handler
 
       # patch libANGLE
       patchelf \

From 43b4c23be4a2bcaa1ba06e179762d55c4cecfa96 Mon Sep 17 00:00:00 2001
From: Elliot Cameron <nixpkgs-commits@deshaw.com>
Date: Mon, 3 Mar 2025 16:47:59 -0500
Subject: [PATCH 077/101] qt5.qtwebengine: fix missing GN dependency

This missing dependency does not result in a build failure
in every case. Without the dependency, there is a race
condition in the build system that is only exposed when
the build can utilize more cores.

See https://bugs.gentoo.org/933368 for context.
---
 .../qtwebengine-fix_build_pdf_extension_util.patch    | 11 +++++++++++
 .../libraries/qt-5/modules/qtwebengine.nix            |  4 ++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/modules/qtwebengine-fix_build_pdf_extension_util.patch

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine-fix_build_pdf_extension_util.patch b/pkgs/development/libraries/qt-5/modules/qtwebengine-fix_build_pdf_extension_util.patch
new file mode 100644
index 000000000000..f31c4a070925
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine-fix_build_pdf_extension_util.patch
@@ -0,0 +1,11 @@
+# From https://933368.bugs.gentoo.org/attachment.cgi?id=896907
+--- ./src/3rdparty/chromium/qtwebengine/browser/pdf/BUILD.gn.orig	2024-07-03 13:49:13.812285886 +0100
++++ ./src/3rdparty/chromium/qtwebengine/browser/pdf/BUILD.gn	2024-07-03 13:51:45.789966941 +0100
+@@ -6,6 +6,7 @@ source_set("pdf") {
+   ]
+ 
+   deps = [
++    "//chrome/app:generated_resources",
+     "//content/public/browser",
+   ]
+ }
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 48b343435d38..40a7cace954a 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -157,6 +157,10 @@ qtModule (
         stripLen = 1;
         extraPrefix = "src/3rdparty/";
       })
+
+      # Fix race condition exposed by missing dependency
+      # https://bugs.gentoo.org/933368
+      ./qtwebengine-fix_build_pdf_extension_util.patch
     ];
 
     postPatch =

From 2866687c1941f649becf1a19b25fd1d20f8dd687 Mon Sep 17 00:00:00 2001
From: AwesomeQubic <ThatQubicWah@protonmail.com>
Date: Sat, 1 Mar 2025 20:13:40 +0100
Subject: [PATCH 078/101] maintainers: added qubic

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 400e9ece849b..53b02c7a7c5e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19269,6 +19269,12 @@
     githubId = 22085373;
     name = "Luis Hebendanz";
   };
+  qubic = {
+    name = "qubic";
+    email = "ThatQubicFox@protonmail.com";
+    github = "AwesomeQubic";
+    githubId = 77882752;
+  };
   qubitnano = {
     name = "qubitnano";
     email = "qubitnano@protonmail.com";

From 932c76111ec08b523c40208765279f795b87d837 Mon Sep 17 00:00:00 2001
From: AwesomeQubic <ThatQubicWah@protonmail.com>
Date: Tue, 4 Mar 2025 17:31:23 +0100
Subject: [PATCH 079/101] cargo-clean-recursive: init at 1.0.0

---
 .../ca/cargo-clean-recursive/package.nix      | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/ca/cargo-clean-recursive/package.nix

diff --git a/pkgs/by-name/ca/cargo-clean-recursive/package.nix b/pkgs/by-name/ca/cargo-clean-recursive/package.nix
new file mode 100644
index 000000000000..355e29db73c0
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-clean-recursive/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  cargo,
+  makeWrapper,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cargo-clean-recursive";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "IgaguriMK";
+    repo = "cargo-clean-recursive";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-H/t9FW7zxS+58lrvay/lmb0xFgpeJQ1dCIm0oSEtflA=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-PcUKvVm9pKyw4sxJo9m6UJhsVURdlAwp1so199DAQBI=";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/cargo-clean-recursive \
+      --prefix PATH : ${lib.makeBinPath [ cargo ]}
+  '';
+
+  meta = {
+    description = "Cleans all projects under specified directory.";
+    mainProgram = "cargo-clean-recursive";
+    homepage = "https://github.com/IgaguriMK/cargo-clean-recursive";
+    license = with lib.licenses; [
+      asl20 # or
+      mit
+    ];
+    maintainers = with lib.maintainers; [ qubic ];
+  };
+})

From aa8fe453981f38a286025e2c780ce15c5c0810a4 Mon Sep 17 00:00:00 2001
From: Philip Wilk <p.wilk@student.reading.ac.uk>
Date: Tue, 4 Mar 2025 19:48:06 +0000
Subject: [PATCH 080/101] hddfancontrol: 1.5.1->2.0.1

---
 .../manual/release-notes/rl-2505.section.md   |  2 +
 pkgs/by-name/hd/hddfancontrol/package.nix     | 59 +++++++++++++------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index f6578de089f2..5bd7048757b8 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -528,6 +528,8 @@
 
 - `services.avahi.ipv6` now defaults to true.
 
+- hddfancontrol has been updated to major release 2. See the [migration guide](https://github.com/desbma/hddfancontrol/tree/master?tab=readme-ov-file#migrating-from-v1x), as there are breaking changes.
+
 - The Home Assistant module has new options {option}`services.home-assistant.blueprints.automation`, `services.home-assistant.blueprints.script`, and {option}`services.home-assistant.blueprints.template` that allow for the declarative installation of [blueprints](https://www.home-assistant.io/docs/blueprint/) into the appropriate configuration directories.
 
 - For matrix homeserver Synapse we are now following the upstream recommendation to enable jemalloc as the memory allocator by default.
diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix
index 1f6770731f0f..7d9677acc9db 100644
--- a/pkgs/by-name/hd/hddfancontrol/package.nix
+++ b/pkgs/by-name/hd/hddfancontrol/package.nix
@@ -1,45 +1,68 @@
 {
   lib,
-  python3Packages,
+  rustPlatform,
   fetchFromGitHub,
   hddtemp,
   hdparm,
   smartmontools,
   nixosTests,
+  makeWrapper,
+  installShellFiles,
 }:
-
-python3Packages.buildPythonPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hddfancontrol";
-  version = "1.5.1";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "desbma";
-    repo = pname;
-    rev = version;
-    sha256 = "0b2grf98qnikayn18xll01dkm5pjpcjxdffgx1nyw9s0gqig8dg0";
+    repo = "hddfancontrol";
+    tag = finalAttrs.version;
+    hash = "sha256-QckNS1IT2GorCYRgVX5B0VY5Rf5U6pHa1uSqzz8ctgE=";
   };
 
-  propagatedBuildInputs = [
-    python3Packages.python-daemon
-    hddtemp
-    hdparm
-    smartmontools
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-drOWc00zqkR2sep1aoAe3urZeA31zM0sUUGW6oDojOM=";
+
+  nativeBuildInputs = [
+    makeWrapper
+    installShellFiles
   ];
 
+  postBuild = ''
+    mkdir -p target/man
+    cargo run --features gen-man-pages -- target/man
+  '';
+
   postInstall = ''
     mkdir -p $out/etc/systemd/system
     substitute systemd/hddfancontrol.service $out/etc/systemd/system/hddfancontrol.service \
-        --replace /usr/bin/hddfancontrol $out/bin/hddfancontrol
+      --replace-fail /usr/bin/hddfancontrol $out/bin/hddfancontrol
     sed -i -e '/EnvironmentFile=.*/d' $out/etc/systemd/system/hddfancontrol.service
+
+    cd target/man
+    installManPage hddfancontrol-daemon.1 hddfancontrol-pwm-test.1 hddfancontrol.1
   '';
 
-  passthru.tests = { inherit (nixosTests) hddfancontrol; };
+  postFixup = ''
+    wrapProgram $out/bin/hddfancontrol \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          hddtemp
+          hdparm
+          smartmontools
+        ]
+      }
+  '';
 
-  meta = with lib; {
+  meta = {
     description = "Dynamically control fan speed according to hard drive temperature on Linux";
+    changelog = "https://github.com/desbma/hddfancontrol/releases/tag/${finalAttrs.version}";
     homepage = "https://github.com/desbma/hddfancontrol";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ benley ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      benley
+      philipwilk
+    ];
     mainProgram = "hddfancontrol";
   };
-}
+})

From aa6af5dff355b1a8e0d3ff46eacadd0a88e7f305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 4 Mar 2025 20:38:56 +0100
Subject: [PATCH 081/101] vscode-extensions.eamodio.gitlens: 16.0.5 -> 16.3.2

Changelog: https://github.com/gitkraken/vscode-gitlens/blob/96f7001f818529cb4bdbf5252878685c91b511c5/CHANGELOG.md#1632---2025-02-21
---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index a1c7bd90843a..baf5c18c0e50 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1593,8 +1593,8 @@ let
           # semver scheme, contrary to preview versions which are listed on
           # the VSCode Marketplace and use a calver scheme. We should avoid
           # using preview versions, because they expire after two weeks.
-          version = "16.0.5";
-          hash = "sha256-9xvArjUXxgofGuEg+XcrI5cX32gd9CvPZxWlj4eKavo=";
+          version = "16.3.2";
+          hash = "sha256-+TYE2kwgSTYtg8V8M7VSxpxsm6agj8sFun79wIMT5gs=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";

From 2c0585fc38143e50e06d345bd2262b640b8a477f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 4 Mar 2025 20:46:27 +0100
Subject: [PATCH 082/101] 
 vscode-extensions.llvm-vs-code-extensions.vscode-clangd: 0.1.24 -> 0.1.33

Changelog: https://github.com/clangd/vscode-clangd/blob/master/CHANGELOG.md#version-0133-november-21-2024
---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index baf5c18c0e50..7f72651b25a4 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3029,8 +3029,8 @@ let
         mktplcRef = {
           name = "vscode-clangd";
           publisher = "llvm-vs-code-extensions";
-          version = "0.1.24";
-          hash = "sha256-yOpsYjjwHRXxbiHDPgrtswUtgbQAo+3RgN2s6UYe9mg=";
+          version = "0.1.33";
+          hash = "sha256-NAQ7qT99vudcb/R55pKY3M5H6sV32aB4P8IWZKVQJas=";
         };
         meta = {
           description = "C/C++ completion, navigation, and insights";

From 5d81e7cc681b8e3cb9cbbd6dbd4039bc2140e41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 4 Mar 2025 19:33:22 +0100
Subject: [PATCH 083/101] vscode-extensions.asciidoctor.asciidoctor-vscode:
 2.8.9 -> 3.4.2

About the postPatch snippet: The 'asciidoctor' program is no longer used
for previews, instead the extension uses
https://docs.asciidoctor.org/asciidoctor.js (which is bundled with the
extension). See upstream:
https://github.com/asciidoctor/asciidoctor-vscode/issues/443
("Remove Asciidoctor CLI option for preview rendering").
---
 .../commands-abspath.patch                      | 13 +++++++++++++
 .../asciidoctor.asciidoctor-vscode/default.nix  | 17 +++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch

diff --git a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch
new file mode 100644
index 000000000000..fc3b7fd177eb
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch
@@ -0,0 +1,13 @@
+diff --git a/package.json b/package.json
+index 7ab70e8..2ebe541 100644
+--- a/package.json
++++ b/package.json
+@@ -437,7 +437,7 @@
+ 					},
+ 					"asciidoc.asciidoctorpdf_command": {
+ 						"type": "string",
+-						"default": "asciidoctor-pdf",
++						"default": "@ASCIIDOCTOR_PDF_BIN@",
+ 						"markdownDescription": "%asciidoc.asciidoctorpdf_command.desc%",
+ 						"markdownDeprecationMessage": "%asciidoc.asciidoctorpdf_command.deprecationMessage%",
+ 						"scope": "resource"
diff --git a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix
index 7ab6bb7ce0c6..3f7dabf2e256 100644
--- a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix
@@ -8,17 +8,18 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "asciidoctor-vscode";
     publisher = "asciidoctor";
-    version = "2.8.9";
-    sha256 = "1xkxx5i3nhd0dzqhhdmx0li5jifsgfhv0p5h7xwsscz3gzgsdcyb";
+    version = "3.4.2";
+    hash = "sha256-HG3y7999xeE1erQZCnBgUPj/aC0Kwyn20PEZR9gKrxY=";
   };
 
+  patches = [
+    ./commands-abspath.patch
+  ];
+
   postPatch = ''
-    substituteInPlace dist/src/text-parser.js \
-      --replace "get('asciidoctor_command', 'asciidoctor')" \
-                "get('asciidoctor_command', '${asciidoctor}/bin/asciidoctor')"
-    substituteInPlace dist/src/commands/exportAsPDF.js \
-      --replace "get('asciidoctorpdf_command', 'asciidoctor-pdf')" \
-                "get('asciidoctorpdf_command', '${asciidoctor}/bin/asciidoctor-pdf')"
+    substituteInPlace package.json \
+        --replace-fail "@ASCIIDOCTOR_PDF_BIN@" \
+                       "${asciidoctor}/bin/asciidoctor-pdf"
   '';
 
   meta = {

From ed11e43e3db3dadfe7d99f81dcfb551344abd358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 4 Mar 2025 19:08:27 +0100
Subject: [PATCH 084/101] vscode-extensions.vscodevim.vim: 1.26.1 -> 1.29.0

Changelog: https://github.com/VSCodeVim/Vim/blob/a0407b77027b9f50f8374cebd73b978942e90f77/CHANGELOG.md#v1290-2024-12-04
---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 7f72651b25a4..adf4b2d80e0e 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5332,8 +5332,8 @@ let
         mktplcRef = {
           name = "vim";
           publisher = "vscodevim";
-          version = "1.26.1";
-          hash = "sha256-zshuABicdkT52Nqj1L2RrfMziBRgO+R15fM32SCnyXI=";
+          version = "1.29.0";
+          hash = "sha256-J3V8SZJZ2LSL8QfdoOtHI1ZDmGDVerTRYP4NZU17SeQ=";
         };
         meta = {
           license = lib.licenses.mit;

From fe274fe5cda9cd3e1b277dbc766a9da2dc578a7c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 16:48:12 +0000
Subject: [PATCH 085/101] adguardhome: 0.107.56 -> 0.107.57

---
 pkgs/servers/adguardhome/bins.nix    | 28 ++++++++++++++--------------
 pkgs/servers/adguardhome/default.nix |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix
index a1ed882b2b1f..3e16e58c2204 100644
--- a/pkgs/servers/adguardhome/bins.nix
+++ b/pkgs/servers/adguardhome/bins.nix
@@ -1,31 +1,31 @@
 { fetchurl, fetchzip }:
 {
 x86_64-darwin = fetchzip {
-  sha256 = "sha256-uviTmopXz7OYVr4H2M/dFOMw0vD5P+3t5CChSL2HyrE=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_amd64.zip";
+  sha256 = "sha256-wNDPmB/RyTc3ZZWx7glhDx3aeWFrvcsiNv7hvsnWWu4=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_darwin_amd64.zip";
 };
 aarch64-darwin = fetchzip {
-  sha256 = "sha256-P9n6H8YmttcZE5E/7nw/Bc+Gzb4nHbs3L/2pgdqUyFw=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_arm64.zip";
+  sha256 = "sha256-gm9QHJFrCbKyEK6RsSKCeIQY2eYJIXO1n4vAkA3yatY=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_darwin_arm64.zip";
 };
 i686-linux = fetchurl {
-  sha256 = "sha256-JPhx1Hqu5o3K4bBulStedLZexCtZhgZNgzvGTqUn3XY=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_386.tar.gz";
+  sha256 = "sha256-2TVrjG4C4uLsBUJoya4YxiOlTJlcmzPG6lUWcCj/PYE=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_386.tar.gz";
 };
 x86_64-linux = fetchurl {
-  sha256 = "sha256-BEqPo3jeLukMnykO+6GNZ93bplDCOcV33BOHleQLWDI=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_amd64.tar.gz";
+  sha256 = "sha256-E2bzQIYsRpijlJnjD+V3lh5a1nauD5aMVoI/9tHfrRM=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_amd64.tar.gz";
 };
 aarch64-linux = fetchurl {
-  sha256 = "sha256-JxitRduWdp4uJCcoR7FA26prDIc68CzsFOviehxDRxI=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_arm64.tar.gz";
+  sha256 = "sha256-0yedCjUkpye2Rly87a5Qdyfy8/kgrEOrHKpbZ0YhruM=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_arm64.tar.gz";
 };
 armv6l-linux = fetchurl {
-  sha256 = "sha256-TdBDGSny3xWRrMG5MamrN26E/fOf7V9jHvxxbK+7BPU=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv6.tar.gz";
+  sha256 = "sha256-RhPXB3G9iDmijTCsljXedJxqLr8Zna5IzU18KITU0m0=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_armv6.tar.gz";
 };
 armv7l-linux = fetchurl {
-  sha256 = "sha256-mrBsebAKSelAMcuurAUiZdPKr2AGi9lnk1Dhz+PAm/0=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv7.tar.gz";
+  sha256 = "sha256-tAtuMWgy+HMUIMbKLQZOMVO7z65UuPIZnHpJr1IYpJw=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_armv7.tar.gz";
 };
 }
diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index d5fcb49a85ff..1790e88e4a35 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -13,7 +13,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "adguardhome";
-  version = "0.107.56";
+  version = "0.107.57";
   src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
 
   installPhase = ''

From 17ce56fbf034491cf0c542f1cff84d4745d19a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 4 Mar 2025 21:00:00 +0100
Subject: [PATCH 086/101] vscode-extensions.ms-python.python: 2025.1.2025021102
 -> 2025.1.2025022501

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

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
index aeddb79a2792..4c481fc43e24 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
@@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "2025.1.2025021102";
-    hash = "sha256-qXQrBEKzZthZu1fdnRJXjryyHjpcxJA4c5LrhOI3deM=";
+    version = "2025.1.2025022501";
+    hash = "sha256-hPVT86Uvok4BAKbbB6FhjWxQoEY/TWVKCliEn/+QNWY=";
   };
 
   buildInputs = [ icu ];

From 654972b7328bb2ca6c20d12baec4c715da865394 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Tue, 4 Mar 2025 21:03:12 +0100
Subject: [PATCH 087/101] teams: Update Nix formatting team

As per https://discourse.nixos.org/t/formatting-team-meeting-2024-11-26/56643
and https://discourse.nixos.org/t/formatting-team-meeting-2025-03-04/61161
---
 maintainers/team-list.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 0e010b356d59..dddc736d2bee 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -378,13 +378,14 @@ with lib.maintainers;
       piegames
       infinisil
       das_j
-      tomberek
       _0x4A6F
+      MattSturgeon
+      jfly
       # Not in the maintainer list
       # Sereja313
     ];
-    scope = "Tentative Nix formatter team to be established in https://github.com/NixOS/rfcs/pull/166";
-    shortName = "Nix formatter team";
+    scope = "Nix formatting team: https://nixos.org/community/teams/formatting/";
+    shortName = "Nix formatting team";
   };
 
   freedesktop = {

From 6a791193b65a25c232f88ed408869d585d95d053 Mon Sep 17 00:00:00 2001
From: Philip Wilk <p.wilk@student.reading.ac.uk>
Date: Tue, 4 Mar 2025 20:12:26 +0000
Subject: [PATCH 088/101] nixos/hddfancontrol: support v2 argument format

---
 .../services/hardware/hddfancontrol.nix       | 54 ++++++++++++-------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/hardware/hddfancontrol.nix b/nixos/modules/services/hardware/hddfancontrol.nix
index 8705109dd035..942425d63f7e 100644
--- a/nixos/modules/services/hardware/hddfancontrol.nix
+++ b/nixos/modules/services/hardware/hddfancontrol.nix
@@ -7,16 +7,24 @@
 
 let
   cfg = config.services.hddfancontrol;
-  types = lib.types;
 in
 
 {
-  options = {
+  meta.maintainers = with lib.maintainers; [ philipwilk ];
 
+  imports = [
+    (lib.mkRemovedOptionModule [
+      "services"
+      "hddfancontrol"
+      "smartctl"
+    ] "Smartctl is now automatically used when necessary, which makes this option redundant")
+  ];
+
+  options = {
     services.hddfancontrol.enable = lib.mkEnableOption "hddfancontrol daemon";
 
     services.hddfancontrol.disks = lib.mkOption {
-      type = with types; listOf path;
+      type = lib.types.listOf lib.types.path;
       default = [ ];
       description = ''
         Drive(s) to get temperature from
@@ -25,32 +33,37 @@ in
     };
 
     services.hddfancontrol.pwmPaths = lib.mkOption {
-      type = with types; listOf path;
+      type = lib.types.listOf lib.types.path;
       default = [ ];
       description = ''
-        PWM filepath(s) to control fan speed (under /sys)
+        PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values
       '';
-      example = [ "/sys/class/hwmon/hwmon2/pwm1" ];
+      example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ];
     };
 
-    services.hddfancontrol.smartctl = lib.mkOption {
-      type = types.bool;
-      default = false;
+    services.hddfancontrol.logVerbosity = lib.mkOption {
+      type = lib.types.enum [
+        "TRACE"
+        "DEBUG"
+        "INFO"
+        "WARN"
+        "ERROR"
+      ];
+      default = "INFO";
       description = ''
-        Probe temperature using smartctl instead of hddtemp or hdparm
+        Verbosity of the log level
       '';
     };
 
     services.hddfancontrol.extraArgs = lib.mkOption {
-      type = with types; listOf str;
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       description = ''
         Extra commandline arguments for hddfancontrol
       '';
       example = [
-        "--pwm-start-value=32"
-        "--pwm-stop-value=0"
-        "--spin-down-time=900"
+        "--min-fan-speed-prct=10"
+        "--interval=1min"
       ];
     };
   };
@@ -62,19 +75,22 @@ in
         cfg.disks
         [ "-p" ]
         cfg.pwmPaths
-        (lib.optional cfg.smartctl "--smartctl")
         cfg.extraArgs
       ];
     in
     {
       systemd.packages = [ pkgs.hddfancontrol ];
 
+      hardware.sensor.hddtemp = {
+        enable = true;
+        drives = cfg.disks;
+      };
+
       systemd.services.hddfancontrol = {
         wantedBy = [ "multi-user.target" ];
-        environment.HDDFANCONTROL_ARGS = lib.escapeShellArgs args;
-        serviceConfig = {
-          # Hardening
-          PrivateNetwork = true;
+        environment = {
+          HDDFANCONTROL_LOG_LEVEL = cfg.logVerbosity;
+          HDDFANCONTROL_DAEMON_ARGS = lib.escapeShellArgs args;
         };
       };
     }

From 45782a83b73a3617b695968323d1737a1ac59f47 Mon Sep 17 00:00:00 2001
From: Philip Wilk <p.wilk@student.reading.ac.uk>
Date: Tue, 4 Mar 2025 20:12:30 +0000
Subject: [PATCH 089/101] nixosTests.hddfancontrol: remove

Version 2 of hddfancontrol now fetches disk info - namely model - from the passed disks immediately, which /dev/vda does not have.
This is a fatal error that exits the daemon, so the test is no longer possible.
---
 nixos/tests/all-tests.nix     |  1 -
 nixos/tests/hddfancontrol.nix | 51 -----------------------------------
 2 files changed, 52 deletions(-)
 delete mode 100644 nixos/tests/hddfancontrol.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a9b33559d1c7..39cf9a070bf2 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -482,7 +482,6 @@ in {
   hbase_2_5 = handleTest ./hbase.nix { package=pkgs.hbase_2_5; };
   hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; };
   hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; };
-  hddfancontrol = handleTest ./hddfancontrol.nix {};
   hedgedoc = handleTest ./hedgedoc.nix {};
   herbstluftwm = handleTest ./herbstluftwm.nix {};
   homebox = handleTest ./homebox.nix {};
diff --git a/nixos/tests/hddfancontrol.nix b/nixos/tests/hddfancontrol.nix
deleted file mode 100644
index 159ffacab42e..000000000000
--- a/nixos/tests/hddfancontrol.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "hddfancontrol";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ benley ];
-    };
-
-    nodes.machine =
-      { ... }:
-      {
-        imports = [ ../modules/profiles/minimal.nix ];
-
-        services.hddfancontrol.enable = true;
-        services.hddfancontrol.disks = [ "/dev/vda" ];
-        services.hddfancontrol.pwmPaths = [ "/test/hwmon1/pwm1" ];
-        services.hddfancontrol.extraArgs = [
-          "--pwm-start-value=32"
-          "--pwm-stop-value=0"
-        ];
-
-        systemd.services.hddfancontrol_fixtures = {
-          description = "Install test fixtures for hddfancontrol";
-          serviceConfig = {
-            Type = "oneshot";
-          };
-          script = ''
-            mkdir -p /test/hwmon1
-            echo 255 > /test/hwmon1/pwm1
-            echo 2 > /test/hwmon1/pwm1_enable
-          '';
-          wantedBy = [ "hddfancontrol.service" ];
-          before = [ "hddfancontrol.service" ];
-        };
-
-        systemd.services.hddfancontrol.serviceConfig.ReadWritePaths = "/test";
-      };
-
-    # hddfancontrol.service will fail to start because qemu /dev/vda doesn't have
-    # any thermal interfaces, but it should ensure that fans appear to be running
-    # before it aborts.
-    testScript = ''
-      start_all()
-      machine.wait_for_unit("multi-user.target")
-      machine.succeed("journalctl -eu hddfancontrol.service|grep 'Setting fan speed'")
-      machine.shutdown()
-
-    '';
-
-  }
-)

From 172e551c5ae7dd4259d6bc745dc88fbeefd0b0a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 4 Mar 2025 21:12:48 +0100
Subject: [PATCH 090/101] 
 vscode-extensions.streetsidesoftware.code-spell-checker: 4.0.21 -> 4.0.41

Changelog: https://github.com/streetsidesoftware/vscode-spell-checker/blob/main/CHANGELOG.md#4041-2025-03-02
---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index adf4b2d80e0e..17a04822a252 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4615,8 +4615,8 @@ let
         mktplcRef = {
           name = "code-spell-checker";
           publisher = "streetsidesoftware";
-          version = "4.0.21";
-          hash = "sha256-AcZAhmJeAD4nGDhBXieUxldzNZhTPCOg6W44Sc7W4H0=";
+          version = "4.0.41";
+          hash = "sha256-M/uqzU64nqSdRtxxQ1H+pg0YdkqYXEHlxmXrVcn/UqA=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";

From 79d2e9ac71954e2c6fb29ddec7b026170ca15273 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 16:08:14 +0000
Subject: [PATCH 091/101] upcloud-cli: 3.14.0 -> 3.15.0

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

diff --git a/pkgs/by-name/up/upcloud-cli/package.nix b/pkgs/by-name/up/upcloud-cli/package.nix
index 19f3c8028463..307fc2f981eb 100644
--- a/pkgs/by-name/up/upcloud-cli/package.nix
+++ b/pkgs/by-name/up/upcloud-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "upcloud-cli";
-  version = "3.14.0";
+  version = "3.15.0";
 
   src = fetchFromGitHub {
     owner = "UpCloudLtd";
     repo = "upcloud-cli";
     tag = "v${version}";
-    hash = "sha256-zKPoJFfgqi6ZIeZKJy7YeYuqHWVPH0LXvWpOYCEM7dE=";
+    hash = "sha256-bluq5rrfsd8xmKeqtNDqsZnhEAVZ4VqY/eYvOzXFKv4=";
   };
 
-  vendorHash = "sha256-76bLk4zten9SGXbt/M8VKPSylCwQqclyscSVQQaAtbA=";
+  vendorHash = "sha256-J0hLDQzyLYa8Nao0pR2eRkuJ5gP2VM9z+2n694YDYgI=";
 
   ldflags = [
     "-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${version}"

From 5c22fc7391ce30f87e9aa2671f13b427e691c69c Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:08:16 -0500
Subject: [PATCH 092/101] fish-lsp: 1.0.8-1 -> 1.0.8-4

Co-authored-by: Pol Dellaiera <pol.dellaiera@protonmail.com>
---
 pkgs/by-name/fi/fish-lsp/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix
index 4d49b1f33685..1fd36a8edffb 100644
--- a/pkgs/by-name/fi/fish-lsp/package.nix
+++ b/pkgs/by-name/fi/fish-lsp/package.nix
@@ -15,18 +15,18 @@
 }:
 stdenv.mkDerivation rec {
   pname = "fish-lsp";
-  version = "1.0.8-1";
+  version = "1.0.8-4";
 
   src = fetchFromGitHub {
     owner = "ndonfris";
     repo = "fish-lsp";
     tag = "v${version}";
-    hash = "sha256-u125EZXQEouVbmJuoW3KNDNqLB5cS/TzblXraClcw6Q=";
+    hash = "sha256-rtogxbcnmOEFT1v7aK+pzt9Z4B2O4rFwH3pTNVLTxiA=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = src + "/yarn.lock";
-    hash = "sha256-hHw7DbeqaCapqx4dK5Y3sPut94ist9JOU8g9dd6gBdo=";
+    hash = "sha256-83QhVDG/zyMbHJbV48m84eimXejLKdeVrdk1uZjI8bk=";
   };
 
   nativeBuildInputs = [
@@ -45,6 +45,11 @@ stdenv.mkDerivation rec {
     yarn --offline compile
   '';
 
+  # We do it in postPatch, since it needs to be fixed before buildPhase
+  postPatch = ''
+    patchShebangs bin/fish-lsp
+  '';
+
   installPhase = ''
     runHook preInstall
 

From 9b617fcc72effb78b42278845a4c3a7957495a7e Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sun, 9 Jun 2024 16:52:09 -0700
Subject: [PATCH 093/101] firefox-bin: add linux-aarch64 to mozillaPlatforms

---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index b0cfe44bf131..e98668a2c983 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -32,6 +32,7 @@ let
   mozillaPlatforms = {
     i686-linux = "linux-i686";
     x86_64-linux = "linux-x86_64";
+    aarch64-linux = "linux-aarch64";
   };
 
   arch = mozillaPlatforms.${stdenv.hostPlatform.system};

From e5aa62a44bbcdae925d75c9f60e724528aab3048 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 4 Mar 2025 12:14:06 -0800
Subject: [PATCH 094/101] firefox-bin: update.nix: also update linux-aarch64
 now

---
 pkgs/applications/networking/browsers/firefox-bin/update.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index c64a49f270e1..471719e98278 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -67,7 +67,7 @@ writeScript "update-${pname}" ''
     version = "$version";
     sources = [
   EOF
-  for arch in linux-x86_64 linux-i686; do
+  for arch in linux-x86_64 linux-i686 linux-aarch64; do
     # retriving a list of all tarballs for each arch
     #  - only select tarballs for current arch
     #  - only select tarballs for current version

From 092bc3e66ff2b6db4f94bd7bc6d88486346291f1 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 4 Mar 2025 13:03:04 -0800
Subject: [PATCH 095/101] firefox-bin: release_sources: add linux-aarch64

---
 .../browsers/firefox-bin/release_sources.nix  | 618 ++++++++++++++++++
 1 file changed, 618 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 650f3891e070..f6df0234c1c1 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1237,5 +1237,623 @@
       arch = "linux-i686";
       sha256 = "8a03c4b584fbd52aa0e62864c622d38d6a89b4e1e5c01a8a392514511094c86b";
     }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ach/firefox-136.0.tar.xz";
+      locale = "ach";
+      arch = "linux-aarch64";
+      sha256 = "732f8d230b872926f024acde348fbf06f1d51fe574b2fb1c57be3b135fe44d34";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/af/firefox-136.0.tar.xz";
+      locale = "af";
+      arch = "linux-aarch64";
+      sha256 = "551cc4b1d59527ae40fd33d5e602dd0959a85a55f064fce18cedb539d3d4a680";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/an/firefox-136.0.tar.xz";
+      locale = "an";
+      arch = "linux-aarch64";
+      sha256 = "9a05e04d3e335f8d8e021f3913f7b3483de4d3129c076de95b1c080369bf2567";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ar/firefox-136.0.tar.xz";
+      locale = "ar";
+      arch = "linux-aarch64";
+      sha256 = "61cc0b93464a6252df21eb56196dcb5c0c16c227d37b572fed8f9eb6717be1f8";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ast/firefox-136.0.tar.xz";
+      locale = "ast";
+      arch = "linux-aarch64";
+      sha256 = "757ce97ec352c30adbabf2f2d661d15c01accd6cd471da4e8e6507abfe34ae39";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/az/firefox-136.0.tar.xz";
+      locale = "az";
+      arch = "linux-aarch64";
+      sha256 = "d1b8b49aa10eacc2dc621ceec77e70e63225bf1fd48e6235228ae56840e32856";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/be/firefox-136.0.tar.xz";
+      locale = "be";
+      arch = "linux-aarch64";
+      sha256 = "b5dbfd44960e9a339fc3039592d174d2c3e89efd0557bc362cf1c36a1b8278b3";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/bg/firefox-136.0.tar.xz";
+      locale = "bg";
+      arch = "linux-aarch64";
+      sha256 = "486d0a0f46e7781f53623b6a9329499502a85af8cd0d94ff42c1c2156fcd4b7b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/bn/firefox-136.0.tar.xz";
+      locale = "bn";
+      arch = "linux-aarch64";
+      sha256 = "9d75c2766ab843dc7473ba25c936e5c1ae1295f7e0d13301373163bad3116fcd";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/br/firefox-136.0.tar.xz";
+      locale = "br";
+      arch = "linux-aarch64";
+      sha256 = "6e167e3738307204a8d5c1ef58a940a11b9164290e80257f89b2624b822015cf";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/bs/firefox-136.0.tar.xz";
+      locale = "bs";
+      arch = "linux-aarch64";
+      sha256 = "6e04c529ed9157f995246e0ff78b0f66ca35d238a07dd4183bf088957805c74d";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ca-valencia/firefox-136.0.tar.xz";
+      locale = "ca-valencia";
+      arch = "linux-aarch64";
+      sha256 = "2a22e0ae33fbdf9165d684aa06a49d61ade340a7ad9f66789d61a2ab4e73d487";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ca/firefox-136.0.tar.xz";
+      locale = "ca";
+      arch = "linux-aarch64";
+      sha256 = "20335f3849ced1cf918e478a5fb072d0820c011e8a7e7e500698c58e02732a50";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/cak/firefox-136.0.tar.xz";
+      locale = "cak";
+      arch = "linux-aarch64";
+      sha256 = "042f5c78d3c3e47cfee66c5ac720f4e1e845f5a90f9d42041c3324a96ffbc845";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/cs/firefox-136.0.tar.xz";
+      locale = "cs";
+      arch = "linux-aarch64";
+      sha256 = "a9b2a6edbfe6cc746dc646b6a1f6ae0cebce82bfbeedb7c23c7260c02aae6d6b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/cy/firefox-136.0.tar.xz";
+      locale = "cy";
+      arch = "linux-aarch64";
+      sha256 = "c5e38f2c0abb2be9e55ac6da44cfdbbc8bf8139412a46212e17ae5e67f1ae1d5";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/da/firefox-136.0.tar.xz";
+      locale = "da";
+      arch = "linux-aarch64";
+      sha256 = "274b5e9edd5d8e33dc409608089ad131620b9e9efd1154f7c6d2d2e44d3e7c74";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/de/firefox-136.0.tar.xz";
+      locale = "de";
+      arch = "linux-aarch64";
+      sha256 = "516520ba84654aab1490dd8c594b1475a1bedacf37a3ec662044296e558b961b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/dsb/firefox-136.0.tar.xz";
+      locale = "dsb";
+      arch = "linux-aarch64";
+      sha256 = "364eba77c54bda0c368125fdae117ec84724c0d71a4f902192461788603c43b6";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/el/firefox-136.0.tar.xz";
+      locale = "el";
+      arch = "linux-aarch64";
+      sha256 = "240bb2d34b74f7c859c0784d40811dc58e26605dcb91cab2b2dc8d35793534d8";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/en-CA/firefox-136.0.tar.xz";
+      locale = "en-CA";
+      arch = "linux-aarch64";
+      sha256 = "312b174e9c48ee5e41de37c590bb2284b19fe27e604da2fd25df2c4cb9c4799f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/en-GB/firefox-136.0.tar.xz";
+      locale = "en-GB";
+      arch = "linux-aarch64";
+      sha256 = "2cd2ca0537c6efb478c21f4969cef8abb97586c4b1e6a6274c6304850fe053e4";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/en-US/firefox-136.0.tar.xz";
+      locale = "en-US";
+      arch = "linux-aarch64";
+      sha256 = "bef7a1f0c2c6afda65f1c1edbe3e13fdd935c336b162430c7d3513922740800a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/eo/firefox-136.0.tar.xz";
+      locale = "eo";
+      arch = "linux-aarch64";
+      sha256 = "dde06d90369e5cdbb4adcb9daaad0d0a8e11b40ae67e4a0d19ea1b333fc29e46";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/es-AR/firefox-136.0.tar.xz";
+      locale = "es-AR";
+      arch = "linux-aarch64";
+      sha256 = "b6763bcbbddb4dddb95fb6d08dd5d86af332c670cbddf05d100e62e783b5dec7";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/es-CL/firefox-136.0.tar.xz";
+      locale = "es-CL";
+      arch = "linux-aarch64";
+      sha256 = "b863b140c25f017de886df96234ad68973c2857b2e77708f81cec3eebc42fb73";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/es-ES/firefox-136.0.tar.xz";
+      locale = "es-ES";
+      arch = "linux-aarch64";
+      sha256 = "685ca88f96ed7172e65cc605df964d38c70a4525308039ced175038da829b1f7";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/es-MX/firefox-136.0.tar.xz";
+      locale = "es-MX";
+      arch = "linux-aarch64";
+      sha256 = "93c2237c130ee1b0625ac3fe6f5ea1dc715d6940da289e3c126df7f9f8796f2b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/et/firefox-136.0.tar.xz";
+      locale = "et";
+      arch = "linux-aarch64";
+      sha256 = "6579533a714f6dcf245435a1a55d6a28ba2cf834ed5fdbabab2ad37a7cd65c03";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/eu/firefox-136.0.tar.xz";
+      locale = "eu";
+      arch = "linux-aarch64";
+      sha256 = "3e4e83a5581f23b112cf40ca99d012e839bc834ce670558295f6399c8ad8f8b7";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/fa/firefox-136.0.tar.xz";
+      locale = "fa";
+      arch = "linux-aarch64";
+      sha256 = "9b6080be09e7403955365dfbd2151b6bed7e07d5dfe91809975b3c0295bde8bf";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ff/firefox-136.0.tar.xz";
+      locale = "ff";
+      arch = "linux-aarch64";
+      sha256 = "74dff69e00fe6dd499eb305585f0664b0f5e78c6d59f709f827c24bb8b5c22b3";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/fi/firefox-136.0.tar.xz";
+      locale = "fi";
+      arch = "linux-aarch64";
+      sha256 = "3190fb1b015831ce9a36d9ae4e4c15cdbae74f20179d944b9492caaf340f130b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/fr/firefox-136.0.tar.xz";
+      locale = "fr";
+      arch = "linux-aarch64";
+      sha256 = "53462fef95111d984fb0acb8f6c6e378cabf473682e79b262bfc63893a3c42f6";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/fur/firefox-136.0.tar.xz";
+      locale = "fur";
+      arch = "linux-aarch64";
+      sha256 = "d430fb7a428164453ad95a6238c4a9556b65e80309ae386bb1eceed67aef43a6";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/fy-NL/firefox-136.0.tar.xz";
+      locale = "fy-NL";
+      arch = "linux-aarch64";
+      sha256 = "a885d23709bb0b5a5d7070ff0928c12054cc948a323d3049f3d5b00a9e5894a1";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ga-IE/firefox-136.0.tar.xz";
+      locale = "ga-IE";
+      arch = "linux-aarch64";
+      sha256 = "74fafb7e4e97a4a515e6274d7cd9889116546d4592741f2b4ecb0c37590bf46b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/gd/firefox-136.0.tar.xz";
+      locale = "gd";
+      arch = "linux-aarch64";
+      sha256 = "6fa0dc1f91e929d4e39d8deeafaa8e2196278922eb34c6371ca53cf881cdb3a2";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/gl/firefox-136.0.tar.xz";
+      locale = "gl";
+      arch = "linux-aarch64";
+      sha256 = "2ae3cbe596694572ab258d92e79b869fbf311e239401db65e13785e4414bbcb3";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/gn/firefox-136.0.tar.xz";
+      locale = "gn";
+      arch = "linux-aarch64";
+      sha256 = "c73ce9897b23f35570162040575f561ba2244304b65c6ce97c498c456ab87484";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/gu-IN/firefox-136.0.tar.xz";
+      locale = "gu-IN";
+      arch = "linux-aarch64";
+      sha256 = "db8b27df2286c3015094d9b83bcfd735eee55b69bd23dc9034d57e5293e1b89e";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/he/firefox-136.0.tar.xz";
+      locale = "he";
+      arch = "linux-aarch64";
+      sha256 = "8f4ef5584df7fc79bb7904b65f282421810831efa87efd14dce0f4684c5d3028";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/hi-IN/firefox-136.0.tar.xz";
+      locale = "hi-IN";
+      arch = "linux-aarch64";
+      sha256 = "f140c94eaceb8e71858815d9672d54d851327faf04094f7b3d0b4a29764ec8b9";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/hr/firefox-136.0.tar.xz";
+      locale = "hr";
+      arch = "linux-aarch64";
+      sha256 = "933a801f8e32a22ae7ac683be4c0b28fa44aef1a99f1fed027a5db9fd68fa05b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/hsb/firefox-136.0.tar.xz";
+      locale = "hsb";
+      arch = "linux-aarch64";
+      sha256 = "4c18243c6b5efaafef1e64d14e5075461e00cf6f9ce98c07d297942e3be9cf39";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/hu/firefox-136.0.tar.xz";
+      locale = "hu";
+      arch = "linux-aarch64";
+      sha256 = "53560b5313af3a244eccb744ac610c7aec66d7b3b5027345f2a444a7c7424116";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/hy-AM/firefox-136.0.tar.xz";
+      locale = "hy-AM";
+      arch = "linux-aarch64";
+      sha256 = "4185918431336072f2047a0271ff6621cfa23718088858591db2a43a47ca7af1";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ia/firefox-136.0.tar.xz";
+      locale = "ia";
+      arch = "linux-aarch64";
+      sha256 = "9d5ed6cd8aabf63b7d5ba2103de35958094a41030c32cb515874cd8bed093947";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/id/firefox-136.0.tar.xz";
+      locale = "id";
+      arch = "linux-aarch64";
+      sha256 = "760c67ce99506d6fcb050ff355472c131ba93d31bf18d640b184bc9755ec48a2";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/is/firefox-136.0.tar.xz";
+      locale = "is";
+      arch = "linux-aarch64";
+      sha256 = "41b44a3cb4a6edbf3ec956e7db82ecda7b1626a3a72047ade50250d85d37fcc1";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/it/firefox-136.0.tar.xz";
+      locale = "it";
+      arch = "linux-aarch64";
+      sha256 = "864ef006c252b8923b6d9e391f9872f5b5eac511263004f9a1292115ba4d99ec";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ja/firefox-136.0.tar.xz";
+      locale = "ja";
+      arch = "linux-aarch64";
+      sha256 = "87676e4d6daebb73d88a289dcb41396c78241d398a524a0d3375a48e2877515f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ka/firefox-136.0.tar.xz";
+      locale = "ka";
+      arch = "linux-aarch64";
+      sha256 = "76d52a94d7fed7eb450dfeb5dea0b2ac4b0f2f056683cb217ced2e6128ac5e11";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/kab/firefox-136.0.tar.xz";
+      locale = "kab";
+      arch = "linux-aarch64";
+      sha256 = "a32c3d2e22ef152574b451ee27bc87988b34ab1309ae64e79c1a8deabc9d335b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/kk/firefox-136.0.tar.xz";
+      locale = "kk";
+      arch = "linux-aarch64";
+      sha256 = "365a53d3aeffbd93c12a3e05c9b5f795aa19e390c83850341fd961f4045469a3";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/km/firefox-136.0.tar.xz";
+      locale = "km";
+      arch = "linux-aarch64";
+      sha256 = "7e49182399e0f3f04a38062bc8c91037596888582b1660492960f1d7939bda0f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/kn/firefox-136.0.tar.xz";
+      locale = "kn";
+      arch = "linux-aarch64";
+      sha256 = "8fbd2f44850e8f2c0c1e03c641f378dfc3b542b8f13ad024df820e1e99660f1a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ko/firefox-136.0.tar.xz";
+      locale = "ko";
+      arch = "linux-aarch64";
+      sha256 = "4bb116f87c991345661a51c587bdbaaf93b07555c385493b9d26cd9980c77c04";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/lij/firefox-136.0.tar.xz";
+      locale = "lij";
+      arch = "linux-aarch64";
+      sha256 = "2fc303d8e2fc3d927e62b1ae07b3b465994580ce8e11031c24473f0d301a69f8";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/lt/firefox-136.0.tar.xz";
+      locale = "lt";
+      arch = "linux-aarch64";
+      sha256 = "4e0e04293b0d9812114ae48fecbbfde3124209a869ef5ea154daa6710374f0cb";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/lv/firefox-136.0.tar.xz";
+      locale = "lv";
+      arch = "linux-aarch64";
+      sha256 = "cc9f76ac99c1acda10837673c2bed932705a7f5be58f2f1143ceefbdcaab7b1d";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/mk/firefox-136.0.tar.xz";
+      locale = "mk";
+      arch = "linux-aarch64";
+      sha256 = "58ae47dac0d5c43a3d39934e9c75abdc11937697a8bdd601dbd863cff2c485b0";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/mr/firefox-136.0.tar.xz";
+      locale = "mr";
+      arch = "linux-aarch64";
+      sha256 = "e87600cb5c0d3c722d8b9ee120c7c53c243f94a458efff077428eb589a768096";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ms/firefox-136.0.tar.xz";
+      locale = "ms";
+      arch = "linux-aarch64";
+      sha256 = "f11fa1c296cd948e54236955bb7bc0e9b805864f1edaffd95c00a6556243e17d";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/my/firefox-136.0.tar.xz";
+      locale = "my";
+      arch = "linux-aarch64";
+      sha256 = "2fdcd1dca28aaded714d83420daf71871d9249d4e42b13ade8c526a52935e16f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/nb-NO/firefox-136.0.tar.xz";
+      locale = "nb-NO";
+      arch = "linux-aarch64";
+      sha256 = "a44de52fcea222c76e6987cb0e451dc513c49c848dce1738a74ac732d3e427cb";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ne-NP/firefox-136.0.tar.xz";
+      locale = "ne-NP";
+      arch = "linux-aarch64";
+      sha256 = "ff89ab77e49e4aef4295adfd028eee73cf56a88cc1c093a0dc87ca0d74b18d29";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/nl/firefox-136.0.tar.xz";
+      locale = "nl";
+      arch = "linux-aarch64";
+      sha256 = "8720a40152fa84176a9170cf1b00adc751ee9173804f44499fe1f1a399e05062";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/nn-NO/firefox-136.0.tar.xz";
+      locale = "nn-NO";
+      arch = "linux-aarch64";
+      sha256 = "98f1f3921e507943b0cda6cc59c871ad352e8e117b97a44c5142548308a6959d";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/oc/firefox-136.0.tar.xz";
+      locale = "oc";
+      arch = "linux-aarch64";
+      sha256 = "0c3ef495991a02d6ad758ed11111fb4f7040fb054f9d5846e85198f0e4c54250";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/pa-IN/firefox-136.0.tar.xz";
+      locale = "pa-IN";
+      arch = "linux-aarch64";
+      sha256 = "9ff39714897bc3c8602ce0648b43de48b4ffdd79f0fb8b9e5d4012f45daf7804";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/pl/firefox-136.0.tar.xz";
+      locale = "pl";
+      arch = "linux-aarch64";
+      sha256 = "6765f848e2fe7b71cb55613471787bae2db465131b6fa2dd54993ca9760d0831";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/pt-BR/firefox-136.0.tar.xz";
+      locale = "pt-BR";
+      arch = "linux-aarch64";
+      sha256 = "0c81f362602890f229d58734574f62b2e3b9559d30abb357891f46eab0e387ba";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/pt-PT/firefox-136.0.tar.xz";
+      locale = "pt-PT";
+      arch = "linux-aarch64";
+      sha256 = "b8773e96e12cbddd5258585eba672393d21e57c11b9eaf47c000cb17349d0a7a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/rm/firefox-136.0.tar.xz";
+      locale = "rm";
+      arch = "linux-aarch64";
+      sha256 = "b53b680f7cab81fa90d9813cc0abb1c6724a9e62ae0c41c59c62bc89eb21dac1";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ro/firefox-136.0.tar.xz";
+      locale = "ro";
+      arch = "linux-aarch64";
+      sha256 = "49504cf7973f6c39421db647422bd88e767615ab04dae627ae46bc3224f8a76b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ru/firefox-136.0.tar.xz";
+      locale = "ru";
+      arch = "linux-aarch64";
+      sha256 = "e43b55fe84e8de53b4f78a80cadd2ffef62aca8ca0204dad75888e7749a1b168";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/sat/firefox-136.0.tar.xz";
+      locale = "sat";
+      arch = "linux-aarch64";
+      sha256 = "88254e560c0f0920e799a833eec8ee4a0da8aba9b49665c4ac9acdb69581a304";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/sc/firefox-136.0.tar.xz";
+      locale = "sc";
+      arch = "linux-aarch64";
+      sha256 = "1ad405683528ac30d4ee024ebcc4f072516640feabec0858d20ca6c76690ef52";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/sco/firefox-136.0.tar.xz";
+      locale = "sco";
+      arch = "linux-aarch64";
+      sha256 = "30a73e7db6c80701e32cd8064b72d963ff42d126a426f6fbf08e23fe78a4a35d";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/si/firefox-136.0.tar.xz";
+      locale = "si";
+      arch = "linux-aarch64";
+      sha256 = "17f8d0d3adcb2063cfdef5ad84ef0dc9a89049133ec5135aefa94f2593636dfd";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/sk/firefox-136.0.tar.xz";
+      locale = "sk";
+      arch = "linux-aarch64";
+      sha256 = "0abe6ff2b2ec77b8bd493e0d52dce08ca02550edb20d4f03276784a89a1083ed";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/skr/firefox-136.0.tar.xz";
+      locale = "skr";
+      arch = "linux-aarch64";
+      sha256 = "546c3091b4722c4f8660f41bc48521f1ac29468bb7bb6d58f8ad995fd00e8875";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/sl/firefox-136.0.tar.xz";
+      locale = "sl";
+      arch = "linux-aarch64";
+      sha256 = "fbe459d60077d1f706ef2b29ef8f11eae5a59c1a08c523f2fe22f4d0bf3a65d2";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/son/firefox-136.0.tar.xz";
+      locale = "son";
+      arch = "linux-aarch64";
+      sha256 = "86633f9723cb587a39f222dd6240f780277495bd5db35df609cb0d7452748f0b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/sq/firefox-136.0.tar.xz";
+      locale = "sq";
+      arch = "linux-aarch64";
+      sha256 = "6e6f364ea09818e7e59cd38de51095b8321eca10f082969d76899636e6443a70";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/sr/firefox-136.0.tar.xz";
+      locale = "sr";
+      arch = "linux-aarch64";
+      sha256 = "c67bf5a0afa7f71bca4babdb97362612e9ab120b52a597c51d637402207710e1";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/sv-SE/firefox-136.0.tar.xz";
+      locale = "sv-SE";
+      arch = "linux-aarch64";
+      sha256 = "ffba5e5676ca69e9a57f817569744d56eadee5a873079a9626774727de28f733";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/szl/firefox-136.0.tar.xz";
+      locale = "szl";
+      arch = "linux-aarch64";
+      sha256 = "b5069a484aab9d2c0fe1be00d4fa9736c8ef559fad0d2cc03cbfce367d9ae3d4";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ta/firefox-136.0.tar.xz";
+      locale = "ta";
+      arch = "linux-aarch64";
+      sha256 = "fdc9ee5264ec6fefea93ddaf3ccb70936a31a1426cd8b87abd34c1175ad70819";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/te/firefox-136.0.tar.xz";
+      locale = "te";
+      arch = "linux-aarch64";
+      sha256 = "1aacbe4044994404dfe547efa9dc1e1e4ccbe5463ae741cf3124e651dc2f757b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/tg/firefox-136.0.tar.xz";
+      locale = "tg";
+      arch = "linux-aarch64";
+      sha256 = "1932ae65eaaeea6f4ef0d4d313682240e823b43b53f1d55cec0c1ff61d165ef0";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/th/firefox-136.0.tar.xz";
+      locale = "th";
+      arch = "linux-aarch64";
+      sha256 = "e11753ac53df7d35672ef60c1d46464885395e446f6d69f7c848bbe391eb5331";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/tl/firefox-136.0.tar.xz";
+      locale = "tl";
+      arch = "linux-aarch64";
+      sha256 = "6151b11ffd9e64301ccff0a402a3bb5b18ee8abae9435cd73088c96ef1d12d6c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/tr/firefox-136.0.tar.xz";
+      locale = "tr";
+      arch = "linux-aarch64";
+      sha256 = "f8703820cdd1634f635d38cf7f8f6eeb1c7286c02ea729d4dcc8caa9724adc22";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/trs/firefox-136.0.tar.xz";
+      locale = "trs";
+      arch = "linux-aarch64";
+      sha256 = "8e32d6426cf2184da7a288c86f02f4b880415ee2315abdfb6ec25b86aa755979";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/uk/firefox-136.0.tar.xz";
+      locale = "uk";
+      arch = "linux-aarch64";
+      sha256 = "b2156ae09b88546483ae8ff7b7de9e5ab2a7b3e8741e90874b9c96b69a2419b4";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/ur/firefox-136.0.tar.xz";
+      locale = "ur";
+      arch = "linux-aarch64";
+      sha256 = "e30c60bdbe172877c7c9746315d0840a92b4d8556a604ccade293458778eae8d";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/uz/firefox-136.0.tar.xz";
+      locale = "uz";
+      arch = "linux-aarch64";
+      sha256 = "577febf27f3a6895c28003fa9e10843b2ff2c1eb184d4bc766932955345d9275";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/vi/firefox-136.0.tar.xz";
+      locale = "vi";
+      arch = "linux-aarch64";
+      sha256 = "21728339d01d18d47a01a7c15b77653590182cc861246410cf6ac5df47be6df1";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/xh/firefox-136.0.tar.xz";
+      locale = "xh";
+      arch = "linux-aarch64";
+      sha256 = "d1ac3c23a53a991e7326655ea012c6c490d3de17c61923d45d16f219b35ae769";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/zh-CN/firefox-136.0.tar.xz";
+      locale = "zh-CN";
+      arch = "linux-aarch64";
+      sha256 = "dfee8ab1f4f392d2f3258ed35728cd63f7124609bf533e88fed9bfa67ed9c425";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/136.0/linux-aarch64/zh-TW/firefox-136.0.tar.xz";
+      locale = "zh-TW";
+      arch = "linux-aarch64";
+      sha256 = "7743dc89ad4111e9a854398905aa65dabdec4a47ab281c52472b8e39b2c1922c";
+    }
   ];
 }

From ee164ade862f2ff264f72fcf57b7a3acd9a8f69f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 21:15:46 +0000
Subject: [PATCH 096/101] saunafs: 4.7.0 -> 4.8.0

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

diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix
index d9fe7402f42b..451c513c331d 100644
--- a/pkgs/by-name/sa/saunafs/package.nix
+++ b/pkgs/by-name/sa/saunafs/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "saunafs";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "leil-io";
     repo = "saunafs";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6WXSnItbydH3Lk04l0Iph14EKzL/Pl5vriWdhHxTF6I=";
+    hash = "sha256-Tu2AAKUHmj3x9tI+8vuel+nHluQXZM5v3WT2FgTlRSs=";
   };
 
   patches = [

From 599808056ec5e6d4ab419c9bc70a954a4eb1fefa Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 4 Mar 2025 21:29:08 +0000
Subject: [PATCH 097/101] tailscale: 1.80.2 -> 1.80.3

Diff: https://github.com/tailscale/tailscale/compare/v1.80.2...v1.80.3

Changelog: https://github.com/tailscale/tailscale/releases/tag/v1.80.3
---
 pkgs/by-name/ta/tailscale/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 09543aff6e65..8598867513ec 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -22,7 +22,7 @@
 }:
 
 let
-  version = "1.80.2";
+  version = "1.80.3";
 in
 buildGoModule {
   pname = "tailscale";
@@ -37,7 +37,7 @@ buildGoModule {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    hash = "sha256-5HGY9hVSnzqmAdXNJdQ+ZvsK/PmyZ94201UHlHclQE8=";
+    hash = "sha256-UOz2EAUlYZx2XBzw8hADO0ti9bgwz19MTg60rSefSB8=";
   };
 
   patches = [

From 4063f1e23d12eefa693e58b4558bd9c29870eed5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 21:31:42 +0000
Subject: [PATCH 098/101] vscode-extensions.ms-toolsai.jupyter: 2025.1.0 ->
 2025.2.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
index 6619a7724ee9..dd70a4e1527d 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "jupyter";
     publisher = "ms-toolsai";
-    version = "2025.1.0";
-    hash = "sha256-xZMk7eNnmWviqpUvl9hXcoKL3Uwii0ZJz6DCCI9UM2k=";
+    version = "2025.2.0";
+    hash = "sha256-YMvu8aEumV3VTdNZKiLK+5jmTL9y5tcMxrEBwEMcTI4=";
   };
 
   nativeBuildInputs = [

From 3b33c51443fcfcf5479c9e36d69f1e430bfd00bb Mon Sep 17 00:00:00 2001
From: "Matthieu C." <886074+teto@users.noreply.github.com>
Date: Tue, 4 Mar 2025 22:09:34 +0100
Subject: [PATCH 099/101] vimPlugins.mini-test: build from lua package

I needed the lua package to run the tests for grug-far-nvim
---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../editors/vim/plugins/generated.nix         | 13 -----------
 .../editors/vim/plugins/overrides.nix         |  1 +
 .../lua-modules/generated-packages.nix        | 22 +++++++++++++++++++
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index a040226217d0..5beef16bf14b 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -116,6 +116,7 @@ markdown,,,,,,
 mediator_lua,,,,,,
 middleclass,,,,,,
 mimetypes,,,,,,
+mini.test,,,,,,
 moonscript,https://raw.githubusercontent.com/leafo/moonscript/master/moonscript-dev-1.rockspec,,,,,arobyn
 mpack,,,,,,
 neorg,,,,,,GaetanLepage
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 48928ca4a2bc..417ac9211472 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -7975,19 +7975,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  mini-test = buildVimPlugin {
-    pname = "mini.test";
-    version = "2025-02-24";
-    src = fetchFromGitHub {
-      owner = "echasnovski";
-      repo = "mini.test";
-      rev = "82ae4d87a23faa27e7e4119d4a5cf5897cbf1b70";
-      sha256 = "0n3n7j8lkxp6mc0wf80ysnwxfw29zjqyfs3ghjl518xbsvjbgcz6";
-    };
-    meta.homepage = "https://github.com/echasnovski/mini.test/";
-    meta.hydraPlatforms = [ ];
-  };
-
   mini-trailspace = buildVimPlugin {
     pname = "mini.trailspace";
     version = "2025-01-31";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index fb4a71f48152..469e148715fe 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -4035,6 +4035,7 @@ in
       "lzextras"
       "lzn-auto-require"
       "middleclass"
+      "mini-test"
       "neorg"
       "neotest"
       "nui-nvim"
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index b70be1a3837e..c1d1958b0b59 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -2772,6 +2772,28 @@ buildLuarocksPackage {
   };
 }) {};
 
+mini-test = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
+buildLuarocksPackage {
+  pname = "mini.test";
+  version = "0.15.0-1";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/mini.test-0.15.0-1.rockspec";
+    sha256 = "1shfgfcjy3ab3a1mn79w4sw3nf6mf8fmdph6h7bxn5nhyhzbfxvk";
+  }).outPath;
+  src = fetchzip {
+    url    = "https://github.com/echasnovski/mini.test/archive/v0.15.0.zip";
+    sha256 = "02zslska1g4ixy51slbvlxbjzcys0spc4wh200q8mwv4ipiignrn";
+  };
+
+  disabled = luaOlder "5.1";
+
+  meta = {
+    homepage = "https://github.com/echasnovski/mini.test";
+    description = "Test neovim plugins. Part of the mini.nvim suite.";
+    license.fullName = "MIT";
+  };
+}) {};
+
 moonscript = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, lpeg, luaOlder, luafilesystem }:
 buildLuarocksPackage {
   pname = "moonscript";

From b6044982352ea07f05907febbb63beefda2bd41a Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Tue, 4 Mar 2025 23:05:47 +0100
Subject: [PATCH 100/101] domoticz: fix build on GCC 14, Boost 1.87

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

diff --git a/pkgs/by-name/do/domoticz/package.nix b/pkgs/by-name/do/domoticz/package.nix
index ac98513ac698..03cab2432666 100644
--- a/pkgs/by-name/do/domoticz/package.nix
+++ b/pkgs/by-name/do/domoticz/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   makeWrapper,
   cmake,
   python3,
@@ -17,6 +18,7 @@
   git,
   libusb-compat-0_1,
   cereal,
+  minizip,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,9 +30,16 @@ stdenv.mkDerivation rec {
     repo = pname;
     rev = version;
     hash = "sha256-D8U1kK3m1zT83YvZ42hGSU9PzBfS1VGr2mxUYbM2vNQ=";
-    fetchSubmodules = true;
   };
 
+  patches = [
+    # Boost 1.87 compatibility, remove once upgraded to 2025.1
+    (fetchpatch {
+      url = "https://github.com/domoticz/domoticz/commit/5d0db89bbd120ed5dc05b4ff8c136f14a42f0cd3.patch";
+      hash = "sha256-FPe83yJKJEgnY3kABy9CTRe1CBh42dPG1ZWCUE5PO8E=";
+    })
+  ];
+
   buildInputs = [
     openssl
     python3
@@ -44,6 +53,7 @@ stdenv.mkDerivation rec {
     git
     libusb-compat-0_1
     cereal
+    minizip
   ];
 
   nativeBuildInputs = [
@@ -60,7 +70,7 @@ stdenv.mkDerivation rec {
     "-DUSE_BUILTIN_ZLIB=false"
     "-DUSE_OPENSSL_STATIC=false"
     "-DUSE_STATIC_BOOST=false"
-    "-DUSE_BUILTIN_MINIZIP=true"
+    "-DUSE_BUILTIN_MINIZIP=false"
   ];
 
   installPhase = ''

From fe92c2a63a461232b11aa7ec04098958a156c459 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Tue, 4 Mar 2025 23:12:44 +0100
Subject: [PATCH 101/101] domoticz: modernize derivation

---
 pkgs/by-name/do/domoticz/package.nix | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/do/domoticz/package.nix b/pkgs/by-name/do/domoticz/package.nix
index 03cab2432666..e9e10aae3263 100644
--- a/pkgs/by-name/do/domoticz/package.nix
+++ b/pkgs/by-name/do/domoticz/package.nix
@@ -19,16 +19,17 @@
   libusb-compat-0_1,
   cereal,
   minizip,
+  versionCheckHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "domoticz";
   version = "2024.7";
 
   src = fetchFromGitHub {
     owner = "domoticz";
-    repo = pname;
-    rev = version;
+    repo = "domoticz";
+    tag = finalAttrs.version;
     hash = "sha256-D8U1kK3m1zT83YvZ42hGSU9PzBfS1VGr2mxUYbM2vNQ=";
   };
 
@@ -85,19 +86,24 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/domoticz --set LD_LIBRARY_PATH ${python3}/lib;
   '';
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  meta = {
     description = "Home automation system";
     longDescription = ''
       Domoticz is a home automation system that lets you monitor and configure
       various devices like: lights, switches, various sensors/meters like
       temperature, rain, wind, UV, electra, gas, water and much more
     '';
-    maintainers = with maintainers; [ edcragg ];
+    maintainers = with lib.maintainers; [ edcragg ];
     homepage = "https://www.domoticz.com/";
-    changelog = "https://github.com/domoticz/domoticz/blob/${version}/History.txt";
-    license = licenses.gpl3Plus;
-    platforms = platforms.all;
+    changelog = "https://github.com/domoticz/domoticz/blob/${finalAttrs.version}/History.txt";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin
     mainProgram = "domoticz";
   };
-}
+})