Merge remote-tracking branch 'origin/master' into staging-next

2025-06-11 12:15:34 +03:00 · 2025-03-14 09:56:27 +03:00 · 2025-03-14 09:56:27 +03:00 · 7d36ee97e6
commit 7d36ee97e6
parent 82c256ba52 66f2fdecee
943 changed files with 9985 additions and 6920 deletions
--- a/ci/pinned-nixpkgs.json
+++ b/ci/pinned-nixpkgs.json
@ -1,4 +1,4 @@
 {
-  "rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
-  "sha256": "0px0lr7ad2zrws400507c9w5nnaffz9mp9hqssm64icdm6f6h0fz"
+  "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
+  "sha256": "0qg99zj0gb0pc6sjlkmwhk1c1xz14qxmk6gamgfmcxpsfdp5vn72"
 }
--- a/doc/packages/opengl.section.md
+++ b/doc/packages/opengl.section.md
@ -10,6 +10,6 @@ The NixOS desktop or other non-headless configurations are the primary target fo

 ## Nix on GNU/Linux {#nix-on-gnulinux}

-If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of `libglvnd` and `mesa.drivers` in `LD_LIBRARY_PATH`. For Mesa drivers, the Linux kernel version doesn't have to match nixpkgs.
+If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of `libglvnd` and `mesa` in `LD_LIBRARY_PATH`. For Mesa drivers, the Linux kernel version doesn't have to match nixpkgs.

 For proprietary video drivers, you might have luck with also adding the corresponding video driver package.
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -14310,6 +14310,12 @@
      }
    ];
  };
+  mahyarmirrashed = {
+    email = "mah.mirr@gmail.com";
+    github = "mahyarmirrashed";
+    githubId = 59240843;
+    name = "Mahyar Mirrashed";
+  };
  majesticmullet = {
    email = "hoccthomas@gmail.com.au";
    github = "MajesticMullet";
@ -17706,6 +17712,12 @@
    githubId = 34910574;
    keys = [ { fingerprint = "D055 8A23 3947 B7A0 F966  B07F 0B41 0348 9833 7273"; } ];
  };
+  Oops418 = {
+    email = "oooopsxxx@gmail.com";
+    github = "Oops418";
+    name = "Oops418";
+    githubId = 93655215;
+  };
  oosquare = {
    name = "Justin Chen";
    email = "oosquare@outlook.com";
@ -20489,6 +20501,12 @@
    githubId = 19699320;
    keys = [ { fingerprint = "FD5D F7A8 85BB 378A 0157  5356 B09C 4220 3566 9AF8"; } ];
  };
+  RossSmyth = {
+    name = "Ross Smyth";
+    matrix = "@rosssmyth:matrix.org";
+    github = "RossSmyth";
+    githubId = 18294397;
+  };
  rostan-t = {
    name = "Rostan Tabet";
    email = "rostan.tabet@gmail.com";
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -548,7 +548,10 @@ with lib.maintainers;
  };

  infisical = {
-    members = [ akhilmhdh ];
+    members = [
+      akhilmhdh
+      mahyarmirrashed
+    ];
    scope = "Maintain Infisical";
    shortName = "Infisical";
  };
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@ -18,6 +18,11 @@
 - LLVM has been updated from LLVM 16 (on Darwin) and LLVM 18 (on other platforms) to LLVM 19.
  This introduces some backwards‐incompatible changes; see the [upstream release notes](https://releases.llvm.org/) for details.

+- Emacs has been updated to 30.1.
+  This introduces some backwards‐incompatible changes; see the NEWS for details.
+  NEWS can been viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar.
+  It can also be browsed [online](https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30).
+
 - The default PHP version has been updated to 8.3.

 - The default Erlang OTP version has been updated to 27.
@ -445,6 +450,8 @@

 - `docker_24` has been removed, as it was EOL with vulnerabilities since June 08, 2024.

+- Emacs 28 and 29 have been removed.
+
 - `containerd` has been updated to v2, which contains breaking changes. See the [containerd
  2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more
  details.
--- a/nixos/modules/hardware/graphics.nix
+++ b/nixos/modules/hardware/graphics.nix
@ -120,7 +120,7 @@ in
          { "r" = {}; };
    };

-    hardware.graphics.package = lib.mkDefault pkgs.mesa.drivers;
-    hardware.graphics.package32 = lib.mkDefault pkgs.pkgsi686Linux.mesa.drivers;
+    hardware.graphics.package = lib.mkDefault pkgs.mesa;
+    hardware.graphics.package32 = lib.mkDefault pkgs.pkgsi686Linux.mesa;
  };
 }
--- a/nixos/modules/profiles/nix-builder-vm.nix
+++ b/nixos/modules/profiles/nix-builder-vm.nix
@ -127,8 +127,6 @@ in
    system.disableInstallerTools = true;

    nix.settings = {
-      auto-optimise-store = true;
-
      min-free = cfg.min-free;

      max-free = cfg.max-free;
--- a/nixos/modules/programs/bash/ls-colors.nix
+++ b/nixos/modules/programs/bash/ls-colors.nix
@ -13,11 +13,19 @@ in
    programs.bash.enableLsColors = lib.mkEnableOption "extra colors in directory listings" // {
      default = true;
    };
+    programs.bash.lsColorsFile = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = null;
+      example = lib.literalExpression "\${pkgs.dircolors-solarized}/ansi-dark";
+      description = "Alternative colorscheme for ls colors";
+    };
  };

  config = lib.mkIf enable {
    programs.bash.promptPluginInit = ''
-      eval "$(${pkgs.coreutils}/bin/dircolors -b)"
+      eval "$(${pkgs.coreutils}/bin/dircolors -b ${
+        lib.optionalString (config.programs.bash.lsColorsFile != null) config.programs.bash.lsColorsFile
+      })"
    '';
  };
 }
--- a/nixos/modules/services/desktops/pipewire/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire.nix
@ -372,10 +372,13 @@ in
    ) "${lv2Plugins}/lib/lv2";

    # Mask pw-pulse if it's not wanted
-    systemd.user.services.pipewire-pulse.enable = cfg.pulse.enable;
-    systemd.user.sockets.pipewire-pulse.enable = cfg.pulse.enable;
+    systemd.services.pipewire-pulse.enable = cfg.pulse.enable && cfg.systemWide;
+    systemd.sockets.pipewire-pulse.enable = cfg.pulse.enable && cfg.systemWide;
+    systemd.user.services.pipewire-pulse.enable = cfg.pulse.enable && !cfg.systemWide;
+    systemd.user.sockets.pipewire-pulse.enable = cfg.pulse.enable && !cfg.systemWide;

    systemd.sockets.pipewire.wantedBy = mkIf cfg.socketActivation [ "sockets.target" ];
+    systemd.sockets.pipewire-pulse.wantedBy = mkIf cfg.socketActivation [ "sockets.target" ];
    systemd.user.sockets.pipewire.wantedBy = mkIf cfg.socketActivation [ "sockets.target" ];
    systemd.user.sockets.pipewire-pulse.wantedBy = mkIf cfg.socketActivation [ "sockets.target" ];

--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@ -195,7 +195,7 @@ in {
          affect other virtualHosts running on your nginx instance, if any.
          Alternatively you can configure a reverse-proxy of your choice to serve these paths:

-          `/ -> $(nix-instantiate --eval '<nixpkgs>' -A mastodon.outPath)/public`
+          `/ -> ''${pkgs.mastodon}/public`

          `/ -> 127.0.0.1:{{ webPort }} `(If there was no file in the directory above.)

@ -324,6 +324,21 @@ in {
        type = lib.types.str;
      };

+      vapidPrivateKeyFile = lib.mkOption {
+        description = ''
+          Path to file containing the private key used for Web Push
+          Voluntary Application Server Identification.  A new keypair can
+          be generated by running:
+
+          `nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys`
+
+          If this file does not exist, it will be created with a new
+          private key.
+        '';
+        default = "/var/lib/mastodon/secrets/vapid-private-key";
+        type = lib.types.str;
+      };
+
      localDomain = lib.mkOption {
        description = "The domain serving your Mastodon instance.";
        example = "social.example.org";
@ -401,21 +416,6 @@ in {
        type = lib.types.str;
      };

-      vapidPrivateKeyFile = lib.mkOption {
-        description = ''
-          Path to file containing the private key used for Web Push
-          Voluntary Application Server Identification.  A new keypair can
-          be generated by running:
-
-          `nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys`
-
-          If this file does not exist, it will be created with a new
-          private key.
-        '';
-        default = "/var/lib/mastodon/secrets/vapid-private-key";
-        type = lib.types.str;
-      };
-
      trustedProxy = lib.mkOption {
        description = ''
          You need to set it to the IP from which your reverse proxy sends requests to Mastodon's web process,
@ -945,6 +945,7 @@ in {
      enable = true;
      hostname = lib.mkDefault "${cfg.localDomain}";
    };
+
    services.redis.servers.mastodon = lib.mkIf redisActuallyCreateLocally (lib.mkMerge [
      {
        enable = true;
@ -953,6 +954,7 @@ in {
        port = cfg.redis.port;
      })
    ]);
+
    services.postgresql = lib.mkIf databaseActuallyCreateLocally {
      enable = true;
      ensureUsers = [
--- a/pkgs/applications/audio/mopidy/local.nix
+++ b/pkgs/applications/audio/mopidy/local.nix
@ -3,7 +3,6 @@
  mopidy,
  python3Packages,
  fetchPypi,
-  fetchpatch,
 }:

 python3Packages.buildPythonApplication rec {
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@ -2,7 +2,6 @@
  stdenv,
  lib,
  fetchFromGitHub,
-  fetchpatch,
  cmake,
  wrapGAppsHook3,
  wrapQtAppsHook,
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@ -32,32 +32,6 @@ lib.makeScope pkgs.newScope (
        ;
    };

-    emacs28 = callPackage (self.sources.emacs28) inheritedArgs;
-
-    emacs28-gtk3 = self.emacs28.override {
-      withGTK3 = true;
-    };
-
-    emacs28-nox = pkgs.lowPrio (
-      self.emacs28.override {
-        noGui = true;
-      }
-    );
-
-    emacs29 = callPackage (self.sources.emacs29) inheritedArgs;
-
-    emacs29-gtk3 = self.emacs29.override {
-      withGTK3 = true;
-    };
-
-    emacs29-nox = self.emacs29.override {
-      noGui = true;
-    };
-
-    emacs29-pgtk = self.emacs29.override {
-      withPgtk = true;
-    };
-
    emacs30 = callPackage (self.sources.emacs30) inheritedArgs;

    emacs30-gtk3 = self.emacs30.override {
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@ -101,49 +101,6 @@ let
    };
 in
 {
-  emacs28 = import ./make-emacs.nix (mkArgs {
-    pname = "emacs";
-    version = "28.2";
-    variant = "mainline";
-    rev = "28.2";
-    hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
-    patches = fetchpatch: [
-      # CVE-2022-45939
-      (fetchpatch {
-        url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51";
-        hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs=";
-      })
-
-      # https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html
-      (fetchpatch {
-        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
-        hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs=";
-      })
-      (fetchpatch {
-        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
-        hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA=";
-      })
-      (fetchpatch {
-        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
-        hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek=";
-      })
-
-      # security fix from Emacs 29.4
-      (fetchpatch {
-        url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=c645e1d8205f0f0663ec4a2d27575b238c646c7c";
-        hash = "sha256-G+gGQx5w3KuWMotR1n/sYYL8WyAABYW3fUPeffMMs38=";
-      })
-    ];
-  });
-
-  emacs29 = import ./make-emacs.nix (mkArgs {
-    pname = "emacs";
-    version = "29.4";
-    variant = "mainline";
-    rev = "29.4";
-    hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s=";
-  });
-
  emacs30 = import ./make-emacs.nix (mkArgs {
    pname = "emacs";
    version = "30.1";
--- a/pkgs/applications/editors/jetbrains/plugins/plugins.json
+++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json
@ -49,7 +49,7 @@
      ],
      "builds": {
        "243.22562.218": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip",
-        "243.25659.59": "https://plugins.jetbrains.com/files/1347/681279/scala-intellij-bin-2024.3.38.zip"
+        "243.25659.59": "https://plugins.jetbrains.com/files/1347/696516/scala-intellij-bin-2024.3.42.zip"
      },
      "name": "scala"
    },
@ -1366,19 +1366,19 @@
        "webstorm"
      ],
      "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.22562.220": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.24978.546": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.24978.79": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.25659.34": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.25659.40": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.25659.41": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.25659.42": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.25659.43": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.25659.45": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.25659.52": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.25659.54": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip",
-        "243.25659.59": "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip"
+        "243.22562.218": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.22562.220": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.24978.546": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.24978.79": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.25659.34": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.25659.40": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.25659.41": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.25659.42": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.25659.43": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.25659.45": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.25659.52": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.25659.54": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip",
+        "243.25659.59": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip"
      },
      "name": "github-copilot"
    },
@ -1465,19 +1465,19 @@
        "webstorm"
      ],
      "builds": {
-        "243.22562.218": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.22562.220": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.24978.546": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.24978.79": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.25659.34": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.25659.40": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.25659.41": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.25659.42": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.25659.43": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.25659.45": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.25659.52": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.25659.54": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip",
-        "243.25659.59": "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip"
+        "243.22562.218": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.22562.220": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.24978.546": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.24978.79": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.25659.34": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.25659.40": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.25659.41": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.25659.42": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.25659.43": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.25659.45": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.25659.52": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.25659.54": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip",
+        "243.25659.59": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip"
      },
      "name": "codeglance-pro"
    },
@ -1711,9 +1711,9 @@
        "rust-rover"
      ],
      "builds": {
-        "243.25659.42": "https://plugins.jetbrains.com/files/22407/690878/intellij-rust-243.25659.54.zip",
-        "243.25659.54": "https://plugins.jetbrains.com/files/22407/690878/intellij-rust-243.25659.54.zip",
-        "243.25659.59": "https://plugins.jetbrains.com/files/22407/690878/intellij-rust-243.25659.54.zip"
+        "243.25659.42": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip",
+        "243.25659.54": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip",
+        "243.25659.59": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip"
      },
      "name": "rust"
    },
@ -1849,6 +1849,39 @@
      },
      "name": "mermaid-chart"
    },
+    "23806": {
+      "compatible": [
+        "clion",
+        "datagrip",
+        "goland",
+        "idea-community",
+        "idea-ultimate",
+        "mps",
+        "phpstorm",
+        "pycharm-community",
+        "pycharm-professional",
+        "rider",
+        "ruby-mine",
+        "rust-rover",
+        "webstorm"
+      ],
+      "builds": {
+        "243.22562.218": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.22562.220": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.24978.546": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.24978.79": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.25659.34": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.25659.40": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.25659.41": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.25659.42": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.25659.43": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.25659.45": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.25659.52": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.25659.54": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip",
+        "243.25659.59": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip"
+      },
+      "name": "oxocarbon"
+    },
    "23927": {
      "compatible": [
        "clion",
@ -1988,17 +2021,17 @@
    "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip": "sha256-VQqK0Cm9ddXN63KYIqimuGOh7EB9VvdlErp/VrWx8SA=",
    "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip": "sha256-eKwDE+PMtYhrGbDDZPS5cimssH+1xV4GF6RXXg/3urU=",
    "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip": "sha256-4I75KqXyFl73S63O+00usrg8QBcuBRBgfjRmCQMpNks=",
-    "https://plugins.jetbrains.com/files/1347/681279/scala-intellij-bin-2024.3.38.zip": "sha256-l1ZevtqN/70ii1jbXYYxkbH263UrL3YMVFnwFl+n5rE=",
+    "https://plugins.jetbrains.com/files/1347/696516/scala-intellij-bin-2024.3.42.zip": "sha256-IEh/wlpfCK+lpUD+xYpeCDwpEA8NVzfirpyf5MUgC7A=",
    "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip": "sha256-Tgu8CfDhO6KugfuLNhmxe89dMm+Qo3fmAg/8hwjUaoc=",
    "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
    "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar": "sha256-mB09zvUg1hLXl9lgW1NEU+DyVel1utZv6s+mFykckYY=",
    "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar": "sha256-2FlEaHf2rO6xgG3LnZIPt/XKgRGjpLSiEXCncfAf3bI=",
    "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip": "sha256-yKpWQZGxfsKwPVTJLHpF4KGJ5ANCd73uxHlfdFE4Qf4=",
    "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip": "sha256-W/oeD2vRxxyrjHuw+4hGcPEER6K1kzkDGRkxvEotOaw=",
-    "https://plugins.jetbrains.com/files/17718/688477/github-copilot-intellij-1.5.37-242.zip": "sha256-7dAi3KPTze2Kht0snxzuZreRm2gYrAnGVUyOjKMdMkA=",
+    "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip": "sha256-lq5JmR8gPsrZ9rT+byit98KZSzFsl4UppwYAaE9Kjiw=",
    "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
    "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip": "sha256-QOF3nAXOfYhNl3YUK1fc9z5H2uXTPm2X+6fVZ5QP8ZQ=",
-    "https://plugins.jetbrains.com/files/18824/671527/CodeGlancePro-1.9.6-signed.zip": "sha256-AEHZxuRMBEZlT3xTxBUbHEPjEJBOCLxdj1wEYBzlNdk=",
+    "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip": "sha256-8RjKjmadd1o/M+WTLtKPn354bbKgEht4nvWnMcRPN9w=",
    "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar": "sha256-8Ufa8YuGOG78KRSxo/GiwPFrd/3lwQhLWwAnB6igaGE=",
    "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip": "sha256-hoFfIid7lClHDiT+ZH3H+tFSvWYb1tSRZH1iif+kWrM=",
    "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip": "sha256-jGWRU0g120qYvvFiUFI10zvprTsemuIq3XmIjYxZGts=",
@ -2007,12 +2040,13 @@
    "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip": "sha256-2qDeC2Fxp4/IfiLPL1JDquJDCzONCp4m92Ht2fnCn/M=",
    "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip": "sha256-TEx5wg3Sf3rkhl6oj0hRrMdBJW9KMjZ/yNDgNYaeP28=",
    "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip": "sha256-jmfcGDtizib7wQW88sWuzG095nrT0KHyN98trxqISHE=",
-    "https://plugins.jetbrains.com/files/22407/690878/intellij-rust-243.25659.54.zip": "sha256-LqBhEiWCVaLRM2WsflLWX0N+i6Q8ZmHoHaJnJSEKbS0=",
+    "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip": "sha256-P5PmGUNOJJ5+Z1CYQM1ItwrS/JecBPOb9qU3kZK842w=",
    "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip": "sha256-Kf5kHd8tGVIClWcrin9zOFbQkZyOrwHpfMvdznPkNC0=",
    "https://plugins.jetbrains.com/files/22857/640903/vcs-gitlab-243.22562.53.zip": "sha256-lDStIaRy9ZtCXZxM2RRrz/5oZeL90aRVS63wC4XkJNw=",
    "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip": "sha256-VKGZLlL8ALjr6JEQtjhXiIxNrnTPXIoXMToJkJux2dw=",
    "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip": "sha256-qkwfEpC2f4vgVsesSiUvd6kK6XnG9DTN4gXUR+rLlK0=",
    "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip": "sha256-ssaSY1I6FopLBgVKHUyjBrqzxHLSuI/swtDfQWJ7gxU=",
+    "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip": "sha256-zF89Q1LE6xwBeDKv4FSQ6H6cbABjz74Z/qGwddRWp7M=",
    "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip": "sha256-S9XvXtNadkb5geuar40+y5cARMgWp+vJELj7hk3Y4EY=",
    "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip": "sha256-r5oFljG92OTPbXRXqbXDI4KD2dyMp2onKTWQcdftU2k=",
    "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip": "sha256-Uq5RdVQTyqRMsEwDZT6Kldv2alt0EVMCABEt/xQUHow=",
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -14321,6 +14321,19 @@ final: prev:
    meta.hydraPlatforms = [ ];
  };

+  treewalker-nvim = buildVimPlugin {
+    pname = "treewalker.nvim";
+    version = "2025-03-08";
+    src = fetchFromGitHub {
+      owner = "aaronik";
+      repo = "treewalker.nvim";
+      rev = "0bad88a449642fca1080930260482628b692841a";
+      sha256 = "088ksm6rvj4vabrisbpg2xngc11bbqihms57rz0dw22mbr7chy6q";
+    };
+    meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  tremor-vim = buildVimPlugin {
    pname = "tremor-vim";
    version = "2021-09-07";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -1098,6 +1098,7 @@ https://github.com/markonm/traces.vim/,,
 https://github.com/tjdevries/train.nvim/,,
 https://github.com/xiyaowong/transparent.nvim/,HEAD,
 https://github.com/Wansmer/treesj/,main,
+https://github.com/aaronik/treewalker.nvim/,HEAD,
 https://github.com/tremor-rs/tremor-vim/,,
 https://github.com/cappyzawa/trim.nvim/,,
 https://github.com/simonmclean/triptych.nvim/,HEAD,
--- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix
@ -5,8 +5,16 @@
  callPackage,
 }:
 let
-  version = "1.62.0";
-  rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; };
+  extVersion = "1.62.0";
+  rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { };
+
+  # Ensure the versions match
+  version =
+    if rescript-editor-analysis.version == extVersion then
+      rescript-editor-analysis.version
+    else
+      throw "analysis and extension versions must match";
+
  arch =
    if stdenv.hostPlatform.isLinux then
      "linux"
@ -16,13 +24,19 @@ let
      throw "Unsupported system: ${stdenv.system}";
  analysisDir = "server/analysis_binaries/${arch}";
 in
-vscode-utils.buildVscodeMarketplaceExtension rec {
+
+vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "rescript-vscode";
    publisher = "chenglou92";
    inherit version;
    hash = "sha256-yUAhysTM9FXo9ZAzrto+tnjnofIUEQAGBg3tjIainrY=";
  };
+
+  # For rescript-language-server
+  passthru.rescript-editor-analysis = rescript-editor-analysis;
+
+  strictDeps = true;
  postPatch = ''
    rm -r ${analysisDir}
    ln -s ${rescript-editor-analysis}/bin ${analysisDir}
@ -35,6 +49,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
      lib.maintainers.dlip
      lib.maintainers.jayesh-bhoot
    ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
    license = lib.licenses.mit;
  };
 }
--- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix
+++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix
@ -1,16 +1,14 @@
 {
  lib,
-  stdenv,
  fetchFromGitHub,
-  ocaml,
  ocamlPackages,
-  dune_3,
-  version,
 }:

-stdenv.mkDerivation {
-  pname = "rescript-editor-analysis";
-  inherit version;
+ocamlPackages.buildDunePackage rec {
+  pname = "analysis";
+  version = "1.62.0";
+
+  minimalOCamlVersion = "4.10";

  src = fetchFromGitHub {
    owner = "rescript-lang";
@ -19,20 +17,11 @@ stdenv.mkDerivation {
    hash = "sha256-v+qCVge57wvA97mtzbxAX9Fvi7ruo6ZyIC14O8uWl9Y=";
  };

+  strictDeps = true;
  nativeBuildInputs = [
-    ocaml
-    dune_3
    ocamlPackages.cppo
  ];

-  buildPhase = ''
-    dune build -p analysis
-  '';
-
-  installPhase = ''
-    install -D -m0555 _build/default/analysis/bin/main.exe $out/bin/rescript-editor-analysis.exe
-  '';
-
  meta = {
    description = "Analysis binary for the ReScript VSCode plugin";
    homepage = "https://github.com/rescript-lang/rescript-vscode";
@ -41,5 +30,6 @@ stdenv.mkDerivation {
      lib.maintainers.jayesh-bhoot
    ];
    license = lib.licenses.mit;
+    mainProgram = "rescript-editor-analysis";
  };
 }
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -3902,6 +3902,8 @@ let
        };
      };

+      oops418.nix-env-picker = callPackage ./oops418.nix-env-picker { };
+
      phind.phind = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "phind";
--- 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.2.0";
-    hash = "sha256-f573A/7s8jVfH1f3ZYZSTftrfBs6iyMWewhorX4Z0Nc=";
+    version = "2025.3.2025031001";
+    hash = "sha256-uYz0WgFqbLohCEmT8ewYgvlFrVLuZr9OAiKnrbNup7U=";
  };

  buildInputs = [ icu ];
--- a/pkgs/applications/editors/vscode/extensions/oops418.nix-env-picker/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/oops418.nix-env-picker/default.nix
@ -0,0 +1,17 @@
+{ lib, vscode-utils }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "nix-env-picker";
+    publisher = "io-github-oops418";
+    version = "0.0.4";
+    hash = "sha256-LGw7Pd72oVgMqhKPX1dV2EgluX0/4rvKVb7Fx2H6hOI=";
+  };
+  meta = {
+    description = "A Visual Studio Code extension for seamless switching between Nix shells and flakes.";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=io-github-oops418.nix-env-picker";
+    homepage = "https://github.com/Oops418/nix-env-picker";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.Oops418 ];
+  };
+}
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@ -36,22 +36,22 @@ let

  sha256 =
    {
-      x86_64-linux = "1gj210xvsmf6rnp1faphxm3hnlv7n8ni67x05izphmz5kabwzvgq";
-      x86_64-darwin = "10hp2z375awx1jmaqdvq68gfiy7zwws66qa8yskgh7z1jrw5l9pb";
-      aarch64-linux = "0dy6w7b4kxkgm63gzbkqxd2q32x70zj5vrn5v3if7v1ac19nqdyj";
-      aarch64-darwin = "13zywpy272wq7gb8ik2yllkymmp812rbf3pv841f8mxys5ilqs1x";
-      armv7l-linux = "160csj4avc8rj3h0z85lh4xfjv57qf9j5pnbnlkl0sz4ws8abr1w";
+      x86_64-linux = "0pmjpjjafq36dr5dlf64bbkr6p697d2yc1z7l876i0vnw10g6731";
+      x86_64-darwin = "1y32szp9asmchl64wfwz4jvhkr4441aykvy64qc8f4y51wxxxcnv";
+      aarch64-linux = "0zbgbhnlg7wcgz8v34rknvblmdrac0l7qy5qfp2rn7jcdrm5qa53";
+      aarch64-darwin = "00y6rz2cfz193n3svvsdknk6g38vg1w92yiqk5n14lyv2g8av2dc";
+      armv7l-linux = "19q4rip33ma7krwpymp396ip5kwd5g8hp2n6jqcmljv59lw10c9h";
    }
    .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
  # Please backport all compatible updates to the stable release.
  # This is important for the extension ecosystem.
-  version = "1.98.1";
+  version = "1.98.2";
  pname = "vscode" + lib.optionalString isInsiders "-insiders";

  # This is used for VS Code - Remote SSH test
-  rev = "2fc07b811f760549dab9be9d2bedd06c51dfcb9a";
+  rev = "ddc367ed5c8936efe395cffeec279b04ffd7db78";

  executableName = "code" + lib.optionalString isInsiders "-insiders";
  longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
    src = fetchurl {
      name = "vscode-server-${rev}.tar.gz";
      url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      sha256 = "1k72p73wn7vcxdhldr3c8mkfzfp9hxqng9f2iqcasnymkcs63fgm";
+      sha256 = "19dc6smiyi8qv79gr95wgx2fjzfjkrv4x3zfvdskms4bw1kn6xck";
    };
    stdenv = stdenvNoCC;
  };
--- a/pkgs/applications/graphics/hdrmerge/default.nix
+++ b/pkgs/applications/graphics/hdrmerge/default.nix
@ -1,7 +1,6 @@
 {
  lib,
  mkDerivation,
-  fetchpatch,
  fetchFromGitHub,
  cmake,
  qtbase,
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "gpxsee";
-  version = "13.36";
+  version = "13.37";

  src = fetchFromGitHub {
    owner = "tumic0";
    repo = "GPXSee";
-    rev = finalAttrs.version;
-    hash = "sha256-yPDbQfsclpDvLsKt1mLBXWs+lY9qDVWfVWF7/RQkFso=";
+    tag = finalAttrs.version;
+    hash = "sha256-QaYdhU8jmvgKqFKgJmVEmyxRX+zck0gT9AIorwpDi98=";
  };

  buildInputs =
--- a/pkgs/applications/misc/makehuman/default.nix
+++ b/pkgs/applications/misc/makehuman/default.nix
@ -1,7 +1,6 @@
 {
  stdenv,
  lib,
-  fetchpatch,
  fetchFromGitHub,
  python3,
  qtbase,
--- a/pkgs/applications/misc/osmscout-server/default.nix
+++ b/pkgs/applications/misc/osmscout-server/default.nix
@ -2,7 +2,6 @@
  lib,
  mkDerivation,
  fetchFromGitHub,
-  fetchpatch,
  pkg-config,
  qmake,
  qttools,
--- a/pkgs/applications/misc/survex/default.nix
+++ b/pkgs/applications/misc/survex/default.nix
@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchurl,
-  fetchpatch,
  Carbon,
  Cocoa,
  ffmpeg,
--- a/pkgs/applications/misc/sweethome3d/darwin.nix
+++ b/pkgs/applications/misc/sweethome3d/darwin.nix
@ -1,8 +1,6 @@
 {
  lib,
  stdenv,
-  fetchzip,
-  fetchurl,
  makeBinaryWrapper,
  zulu,
  ant,
--- a/pkgs/applications/misc/sweethome3d/linux.nix
+++ b/pkgs/applications/misc/sweethome3d/linux.nix
@ -1,7 +1,6 @@
 {
  lib,
  stdenv,
-  fetchzip,
  fetchurl,
  makeWrapper,
  makeDesktopItem,
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@ -786,7 +786,7 @@
    }
  },
  "ungoogled-chromium": {
-    "version": "134.0.6998.35",
+    "version": "134.0.6998.88",
    "deps": {
      "depot_tools": {
        "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
@ -797,16 +797,16 @@
        "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U="
      },
      "ungoogled-patches": {
-        "rev": "134.0.6998.35-1",
-        "hash": "sha256-gwU3fNDrBGql5NSzkf+TBsQKxmk6zhQnFJ1Es2sHgl8="
+        "rev": "134.0.6998.88-1",
+        "hash": "sha256-Mn7Cr2jCSh1yMw6racIPAbj0gX44xhonHMQLSz4La/E="
      },
      "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A="
    },
    "DEPS": {
      "src": {
        "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "ea6ef4c2ac15ae95d2cfd65682da62c093415099",
-        "hash": "sha256-Y/3V1cmna7nSJkS05SYsDxtPTz8bF7Q8fWYxVhVSy/g=",
+        "rev": "7e3d5c978c6d3a6eda25692cfac7f893a2b20dd0",
+        "hash": "sha256-4RRB7uYI3I7c1dSypU2gzF9TCA2MJ7yStKEvm6vfSnE=",
        "recompress": true
      },
      "src/third_party/clang-format/script": {
@ -1026,8 +1026,8 @@
      },
      "src/third_party/devtools-frontend/src": {
        "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "044764a564924c9aa0897ba8c50149acc7ddf364",
-        "hash": "sha256-T8BlvYNMF77BubiR4tMvW8iAhqS0ppPAESO48/mNX3w="
+        "rev": "65b3f414b81ffe4df49202af6fc75bc26a3cb109",
+        "hash": "sha256-rdBpJWdQ5VtFnIfbr/Vq1q1euSvkbY8iIqyuTMAS2KM="
      },
      "src/third_party/dom_distiller_js/dist": {
        "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@ -1566,8 +1566,8 @@
      },
      "src/v8": {
        "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "debba63b78f8791411bff379835982cb2e8cabfa",
-        "hash": "sha256-iOpnf4jq4bl0CJlHngJ1BV6b0VY1PigJIIjVXk4rqOE="
+        "rev": "a57459aad9ec3ed5f78d9ded700d52e31029efd2",
+        "hash": "sha256-IE1X6lfMyoXsN+7ebJ3RWXAgpR98AjituL3faQbNag0="
      }
    }
  }
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@ -1,11 +1,11 @@
 {
-  "packageVersion": "136.0-2",
+  "packageVersion": "136.0.1-1",
  "source": {
-    "rev": "136.0-2",
-    "hash": "sha256-X5DkaqqwZF4piRg/KPoV/SS1DtDG6AqR89UeWqFxZX0="
+    "rev": "136.0.1-1",
+    "hash": "sha256-IGvqZmrr5q7Q5ikrDFgFiQucD0eColka702LjADGngU="
  },
  "firefox": {
-    "version": "136.0",
-    "hash": "sha512-orfnToQEE4spT3s8Xx6urrjOhMmq0lN56Ox4WpaG9C3vn4wRnUvCdt03HRPXvrvksbCSr0FQCqjCssgnlxRFtA=="
+    "version": "136.0.1",
+    "hash": "sha512-5YM8z5d5bBW1FWNXQnYh0fLR1+5VtTJi85NerbmCKcdKNVu+L3KkFo7E4p3T+D9OrKmcUhXWG9CHR1Mx01IqvQ=="
  }
 }
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -534,13 +534,13 @@
    "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
  },
  "grafana": {
-    "hash": "sha256-XBw1B9gV0zCHfqiYOs6hQX+L50trZnUU+dAvEldY5RI=",
+    "hash": "sha256-A6rCZbnLSbPHn+QQ5wMlINRqT04tEvil2rHkdr5iBQw=",
    "homepage": "https://registry.terraform.io/providers/grafana/grafana",
    "owner": "grafana",
    "repo": "terraform-provider-grafana",
-    "rev": "v3.20.0",
+    "rev": "v3.22.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-3RMeRMjHGXg0OxgLLWDwimorlCjXZoaZfJ7L4yeG/ec="
+    "vendorHash": "sha256-GFH2w4bdqYWl0eFBo1r6YL1pA0l5QMwrXQ9BvK3DmEI="
  },
  "gridscale": {
    "hash": "sha256-YE7o8HwHUo6zI2umRv2lXY7voyg1fX5h1UitH89fBXc=",
@ -561,13 +561,13 @@
    "vendorHash": "sha256-qDyMoIfWE1m1+edu6Y7L9gfGVH+GdmVVjQQDet3nu1g="
  },
  "hcloud": {
-    "hash": "sha256-nkp4XTFRBSxqRAURL0O4H/l7oDF/OEXmew0MkmyQryc=",
+    "hash": "sha256-wst3+LIcybM3VZlAzbkacJtAjl08je4rdeIJz1632yM=",
    "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
    "owner": "hetznercloud",
    "repo": "terraform-provider-hcloud",
-    "rev": "v1.49.1",
+    "rev": "v1.50.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-TFH5tHOTRNPUMGYeYQ1ZbM6FjcojYnkB2NwnQOacTvg="
+    "vendorHash": "sha256-ealJRIeNapOteRsRzEN5FayhG629gJ+eAV2ohTwHWL0="
  },
  "helm": {
    "hash": "sha256-LCvsZNeGQb4wWIASnQxXbH/3YJJaUZS9nY8mHq6M4FM=",
@ -723,13 +723,13 @@
    "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA="
  },
  "kubernetes": {
-    "hash": "sha256-eSAgeN/ExP75Kbhb099t3vW0XQA2TXIhiyv1RUt4ziM=",
+    "hash": "sha256-4ghGJ3yf17PI498bqLFtKHnx7axNMaf4BHUPQqyjvVk=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
    "owner": "hashicorp",
    "repo": "terraform-provider-kubernetes",
-    "rev": "v2.35.1",
+    "rev": "v2.36.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-PfvIzUugDsnMKW7mSM2GyJZpXi3wJsEhYLKzlKq1U6A="
+    "vendorHash": "sha256-slDHNiH5CTfzzj1y2BOt8JuL2iBS1irSZBIiP/4QDLE="
  },
  "launchdarkly": {
    "hash": "sha256-ftpPH5EP67yLmE32Z99nnBuGeBNKck4Ca039GV6iReQ=",
@ -750,13 +750,13 @@
    "vendorHash": "sha256-Q9LdhokZol1jhSfQVIRvPe1XrE8nVvc22aWHt7wkcHY="
  },
  "linode": {
-    "hash": "sha256-n5gKZJ9xj0AAe6kcoDaJJflu5ZD3gY0hdEOHr5cyTJs=",
+    "hash": "sha256-9ZMTbzUXeFba8I1JONlBi+Fp+ulDqVhlHRwVM+TICJc=",
    "homepage": "https://registry.terraform.io/providers/linode/linode",
    "owner": "linode",
    "repo": "terraform-provider-linode",
-    "rev": "v2.34.1",
+    "rev": "v2.34.2",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-1oWa2O5KGUmcCDvLOcGrWv24eMQ12GQ5Y8sWGb4PeRE="
+    "vendorHash": "sha256-nvOVRJl02j4m7iIUo0p95ZFrIlUgxa5qiXyoQTQrXAM="
  },
  "linuxbox": {
    "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",
@ -831,13 +831,13 @@
    "vendorHash": "sha256-1nm2Y4T9/mCWMXMjXEzBz3w08AYHjQJeb9mYPQeWPs0="
  },
  "mongodbatlas": {
-    "hash": "sha256-v3WzVKqph1VoXfJPGo8jVgRrP1qD2+M5PsZPBdAdHgA=",
+    "hash": "sha256-nuamsevz6ME0WlnnWGFKkLiD5wrihq1EML68rvRiu7Q=",
    "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
    "owner": "mongodb",
    "repo": "terraform-provider-mongodbatlas",
-    "rev": "v1.28.0",
+    "rev": "v1.29.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-8odneg1s1HW42leGRTRpkiFDBhwINkh/t0+TWz5CZmI="
+    "vendorHash": "sha256-WMExn+d3G0zpATJ2LYaJ9R4SDpQbngQE2YW3p8x3Scc="
  },
  "namecheap": {
    "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
@ -858,13 +858,13 @@
    "vendorHash": null
  },
  "newrelic": {
-    "hash": "sha256-/PqP8Mny5FAMJTqMoo96hnVArCQ3s3iXfhr2lxlj03g=",
+    "hash": "sha256-BQt9ZJ88G0LlBJiExVe+Vje6ZOeLK6pjmWhh3FeeouI=",
    "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
    "owner": "newrelic",
    "repo": "terraform-provider-newrelic",
-    "rev": "v3.56.0",
+    "rev": "v3.57.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-njCzb0tMkR+yD4+TUM8aNzmIZMz+wwfb9o4hjM6YHrI="
+    "vendorHash": "sha256-0dqD4vKrVkUqOslsmUCUn//nNNDNzWZVgR/EBj/Y/x8="
  },
  "nomad": {
    "hash": "sha256-k61iQ9FQG3nscBp5CE/fFCbHpeLawbUAtGPM+IZtfVc=",
@ -876,11 +876,11 @@
    "vendorHash": "sha256-YmZvHzrEZVvXI8CIcjX40s+MHTThPeXNQ05cnqkNbbE="
  },
  "ns1": {
-    "hash": "sha256-AtBMsFlqWaAAMb/3z0uXTsOn5lbiB9pOzi8ulKJpntw=",
+    "hash": "sha256-llJmz8QWwoApmhWEXlQMlVvteXSlkZhXh7tCWuMMbrc=",
    "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
    "owner": "ns1-terraform",
    "repo": "terraform-provider-ns1",
-    "rev": "v2.5.2",
+    "rev": "v2.5.3",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-jZAwCXozHYReks6ZGjqkvIitWeg19AVGm3R9r20XsMM="
  },
@ -1075,13 +1075,13 @@
    "vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA="
  },
  "random": {
-    "hash": "sha256-usHBDTo7uYTH95PVR1aPFU6eBeatSpgmY9RDZhp+MIc=",
+    "hash": "sha256-bbqTCLPjL1EowsEIx9SiwKAUt11LYxOOtj3syW/7gjQ=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/random",
    "owner": "hashicorp",
    "repo": "terraform-provider-random",
-    "rev": "v3.6.3",
+    "rev": "v3.7.1",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-OEStyiPoGoqsSzdfwCeNOXufP2kbQJiRRBn0b/gRz6c="
+    "vendorHash": "sha256-ILdu9D/SQ39zDcvl13IMhN+aocbTZO5SI8n6wvdS9I8="
  },
  "remote": {
    "hash": "sha256-zuKtkJLTMsrGgk7OIY+K/HhEddgFuEfzK7DcwPnUX6k=",
@ -1092,6 +1092,15 @@
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-lkooWo0DbpL4zjNQ20TRw+hsHXWZP9u7u95n1WyzTQk="
  },
+  "rootly": {
+    "hash": "sha256-AMLBqOyyO3Wek6x5AjfeWQvpi/V3RSnqe6Qk1yidauY=",
+    "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
+    "owner": "rootlyhq",
+    "repo": "terraform-provider-rootly",
+    "rev": "v2.21.2",
+    "spdx": "MPL-2.0",
+    "vendorHash": "sha256-7fo6JV2y/eEo2kcx7SyV6WdVcgDrC+Cj6CH8KwAokcE="
+  },
  "rundeck": {
    "hash": "sha256-OyXIuQu0/NLPIZUzOdnTq2M5Qg6AwOdYG2WozWDmOoQ=",
    "homepage": "https://registry.terraform.io/providers/rundeck/rundeck",
@ -1129,13 +1138,13 @@
    "vendorHash": null
  },
  "selectel": {
-    "hash": "sha256-CVGMFepwfNKlqlAoFY2Uc8w3ZC6RbD9hOhsYnTFNmJM=",
+    "hash": "sha256-3FeJ1nJK5b+NB1+mySoKsGwB7kNX9NA9deSaPwMI0II=",
    "homepage": "https://registry.terraform.io/providers/selectel/selectel",
    "owner": "selectel",
    "repo": "terraform-provider-selectel",
-    "rev": "v6.1.1",
+    "rev": "v6.2.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-LRs2zI5L5qdWiM8VexQPkP8SjrO/sVEj/MOX+n4NKSc="
+    "vendorHash": "sha256-efBBVsQKtLr1m1O6dfEHXtp5d/V9LZ6buBouRAucyvE="
  },
  "sentry": {
    "hash": "sha256-2JfzteVripOz96bAtQXC32wi8dWUQw8bry0HllNRQRA=",
@ -1264,13 +1273,13 @@
    "vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s="
  },
  "tailscale": {
-    "hash": "sha256-b2ZzXvlzlE+zv3Ufu4M5mcuLhyDkBbMznyM7NbiXAQs=",
+    "hash": "sha256-I9t8HyLZmY98g/XjTy6JEryJ8ZOXfegnbymmxVwsy7Q=",
    "homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
    "owner": "tailscale",
    "repo": "terraform-provider-tailscale",
-    "rev": "v0.17.2",
+    "rev": "v0.18.0",
    "spdx": "MIT",
-    "vendorHash": "sha256-Q/fFd3ahIY1L2s8vE8KY/DtahS948qnoaFLQBQfyNH4="
+    "vendorHash": "sha256-bfcsqBusN311oncfCViG4aWy9rylvhrcjs/WUSbh4dI="
  },
  "talos": {
    "hash": "sha256-49woELLSpheuyGnXuwamZwsHdOfjwSB4v8/INzSrMRU=",
@ -1346,11 +1355,11 @@
    "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk="
  },
  "turbot": {
-    "hash": "sha256-UUiTJ7x3EX/l0hSoYQexjeU+z8U+p2yT8MNNRfQnUyA=",
+    "hash": "sha256-20uIfcoqvZsX+1kNnOslDlzRbDNWwTEw55ElU3yvB4I=",
    "homepage": "https://registry.terraform.io/providers/turbot/turbot",
    "owner": "turbot",
    "repo": "terraform-provider-turbot",
-    "rev": "v1.11.2",
+    "rev": "v1.12.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@ -46,14 +46,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "telegram-desktop-unwrapped";
-  version = "5.11.1";
+  version = "5.12.3";

  src = fetchFromGitHub {
    owner = "telegramdesktop";
    repo = "tdesktop";
    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-lhZ/RSHRr+yaOAec5GOM2mrU0dNQbUxd4g7w+oAF+ZY=";
+    hash = "sha256-foXIxFAE2a9AsHbqJKnqswW5EYSYu54DATKp//ixcVU=";
  };

  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@ -1,7 +1,6 @@
 {
  lib,
  stdenv,
-  fetchpatch,
  replaceVars,
  buildEnv,
  fetchFromGitHub,
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@ -1,6 +1,5 @@
 { lib, stdenv
 , fetchFromGitHub
-, fetchpatch
 , cmake
 # Remove gcc and python references
 , removeReferencesTo
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);

 stdenv.mkDerivation (finalAttrs: {
  pname = "R";
-  version = "4.4.2";
+  version = "4.4.3";

  src = let
    inherit (finalAttrs) pname version;
  in fetchurl {
    url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-FXjNYD6NhmtYdD5J2L+ZxWnoEHm2pgzzPN973/64F+w=";
+    sha256 = "sha256-DZPSJEQt6iU8KwhvCI220NPP2bWSzVSW6MshQ+kPyeg=";
  };

  outputs = [ "out" "tex" ];
--- a/pkgs/applications/science/misc/graphia/default.nix
+++ b/pkgs/applications/science/misc/graphia/default.nix
@ -3,7 +3,6 @@
 , cmake
 , git
 , fetchFromGitHub
-, fetchpatch
 , wrapQtAppsHook
 , qtbase
 , qtdeclarative
--- a/pkgs/applications/version-management/bcompare/default.nix
+++ b/pkgs/applications/version-management/bcompare/default.nix
@ -19,19 +19,19 @@

 let
  pname = "bcompare";
-  version = "4.4.6.27483";
+  version = "4.4.7.28397";

  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";

  srcs = {
    x86_64-linux = fetchurl {
      url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
-      sha256 = "sha256-1+f/AfyJ8Z80WR4cs1JDjTquTR1mGAUOd27vniSeA0k=";
+      sha256 = "sha256-4AWTSoYpVhGmBBxcwHXdg1CGd/04+8yL9pu+gHrsj6U";
    };

    x86_64-darwin = fetchurl {
      url = "https://www.scootersoftware.com/BCompareOSX-${version}.zip";
-      sha256 = "sha256-hUzJfUgfCuvB6ADHbsgmEXXgntm01hPnfSjwl7jI70c=";
+      sha256 = "sha256-qbpM6hJbv+APo+ed45k3GXrl1HnZRxD1uT2lvaN3oM4=";
    };

    aarch64-darwin = srcs.x86_64-darwin;
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, lib, stdenv, buildPackages
+{ fetchurl, lib, stdenv, buildPackages
 , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio
 , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
 , openssh, pcre2, bash
--- a/pkgs/by-name/ab/abiword/package.nix
+++ b/pkgs/by-name/ab/abiword/package.nix
@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitLab,
-  fetchpatch,
  autoreconfHook269,
  autoconf-archive,
  pkg-config,
--- a/pkgs/by-name/ac/accelergy/package.nix
+++ b/pkgs/by-name/ac/accelergy/package.nix
@ -4,7 +4,7 @@
  python3Packages,
 }:

-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
  pname = "accelergy";
  version = "unstable-2022-05-03";

--- a/pkgs/by-name/ac/acltoolkit/package.nix
+++ b/pkgs/by-name/ac/acltoolkit/package.nix
@ -4,7 +4,7 @@
  fetchFromGitHub,
 }:

-python3.pkgs.buildPythonPackage rec {
+python3.pkgs.buildPythonPackage {
  pname = "acltoolkit";
  version = "unstable-2023-02-03";
  format = "setuptools";
--- a/pkgs/by-name/ac/act/package.nix
+++ b/pkgs/by-name/ac/act/package.nix
@ -8,7 +8,7 @@
 }:

 let
-  version = "0.2.74";
+  version = "0.2.75";
 in
 buildGoModule {
  pname = "act";
@ -18,10 +18,10 @@ buildGoModule {
    owner = "nektos";
    repo = "act";
    tag = "v${version}";
-    hash = "sha256-UfETstrK8iAGbCn2BRjI8eRkFp/RGVYe0S1P8P8MUHg=";
+    hash = "sha256-YIhgS1kQ9EKoIaSp/zGVQmWXyYZranEQU9onQW3gD0k=";
  };

-  vendorHash = "sha256-NIXiXD1JCtvgTG7QPSMCjQfZSSEcdMUKdqureSWDB4k=";
+  vendorHash = "sha256-LKNajCwb33syv9KcNHKYIGTnAN8r7PkGilDB3HnKkY4=";

  doCheck = false;

--- a/pkgs/by-name/ad/ad-miner/package.nix
+++ b/pkgs/by-name/ad/ad-miner/package.nix
@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "ad-miner";
-  version = "1.8.0";
+  version = "1.8.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Mazars-Tech";
    repo = "AD_Miner";
    tag = "v${version}";
-    hash = "sha256-EXhNAp2gTdSyT7M/cf+MRXgSzI8gQyJzvm0oMPcbu/c=";
+    hash = "sha256-iI7jiENPYCIVJnIG/M4ft4dkR2Ja21gzR+ISeyZvUEo=";
  };

  # All requirements are pinned
@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
  meta = with lib; {
    description = "Active Directory audit tool that leverages cypher queries to crunch data from Bloodhound";
    homepage = "https://github.com/Mazars-Tech/AD_Miner";
-    changelog = "https://github.com/Mazars-Tech/AD_Miner/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/Mazars-Tech/AD_Miner/blob/${src.tag}/CHANGELOG.md";
    license = licenses.gpl3Only;
    maintainers = with maintainers; [ fab ];
    mainProgram = "AD-miner";
--- a/pkgs/by-name/ad/adcskiller/package.nix
+++ b/pkgs/by-name/ad/adcskiller/package.nix
@ -5,7 +5,7 @@
  coercer,
 }:

-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication {
  pname = "adcskiller";
  version = "0-unstable-2024-05-19";
  format = "other";
--- a/pkgs/by-name/ad/adept/package.nix
+++ b/pkgs/by-name/ad/adept/package.nix
@ -0,0 +1,35 @@
+{
+  lib,
+  autoconf,
+  automake,
+  stdenv,
+  fetchurl,
+  pkg-config,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "adept";
+  version = "2.1.1";
+
+  src = fetchurl {
+    url = "https://www.met.reading.ac.uk/clouds/adept/adept-${finalAttrs.version}.tar.gz";
+    hash = "sha256-DO8zToLfRSbTdhvdgxmmPnWCyWsvHMiDkXKQGLSCXEc=";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    pkg-config
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Combined array and automatic differentiation library in C++";
+    homepage = "https://www.met.reading.ac.uk/clouds/adept/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      athas
+    ];
+  };
+})
--- a/pkgs/by-name/ad/adslib/package.nix
+++ b/pkgs/by-name/ad/adslib/package.nix
@ -4,7 +4,7 @@
  fetchFromGitHub,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "adslib";
  version = "unstable-2020-08-28";

--- a/pkgs/by-name/ag/age/package.nix
+++ b/pkgs/by-name/ag/age/package.nix
@ -2,7 +2,6 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
-  fetchpatch,
  installShellFiles,
 }:

--- a/pkgs/by-name/ah/ahk_x11/package.nix
+++ b/pkgs/by-name/ah/ahk_x11/package.nix
@ -1,12 +1,8 @@
 {
  lib,
-  stdenv,
  fetchFromGitHub,
  crystal_1_11,
  copyDesktopItems,
-  linkFarm,
-  fetchgit,
-
  gtk3,
  libxkbcommon,
  xorg,
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@ -1,7 +1,6 @@
 {
  stdenv,
  fetchFromGitHub,
-  fetchzip,
  lib,
  cmake,
  nix-update-script,
--- a/pkgs/by-name/al/alephone-apotheosis-x/package.nix
+++ b/pkgs/by-name/al/alephone-apotheosis-x/package.nix
@ -4,7 +4,7 @@
  requireFile,
 }:

-alephone.makeWrapper rec {
+alephone.makeWrapper {
  pname = "apotheosis-x";
  version = "1.1";
  desktopName = "Marathon-Apotheosis-X";
--- a/pkgs/by-name/al/alephone-eternal/package.nix
+++ b/pkgs/by-name/al/alephone-eternal/package.nix
@ -1,6 +1,6 @@
 { alephone, fetchurl }:

-alephone.makeWrapper rec {
+alephone.makeWrapper {
  pname = "marathon-eternal";
  version = "1.2.1";
  desktopName = "Marathon-Eternal";
--- a/pkgs/by-name/al/alephone-evil/package.nix
+++ b/pkgs/by-name/al/alephone-evil/package.nix
@ -1,6 +1,6 @@
 { alephone, fetchurl }:

-alephone.makeWrapper rec {
+alephone.makeWrapper {
  pname = "marathon-evil";
  version = "0";
  desktopName = "Marathon-Evil";
--- a/pkgs/by-name/al/alephone-pathways-into-darkness/package.nix
+++ b/pkgs/by-name/al/alephone-pathways-into-darkness/package.nix
@ -1,6 +1,6 @@
 { alephone, fetchurl }:

-alephone.makeWrapper rec {
+alephone.makeWrapper {
  pname = "pathways-into-darkness";
  desktopName = "Pathways-Into-Darkness";
  version = "1.1.1";
--- a/pkgs/by-name/al/alephone-pheonix/package.nix
+++ b/pkgs/by-name/al/alephone-pheonix/package.nix
@ -1,6 +1,6 @@
 { alephone, fetchurl }:

-alephone.makeWrapper rec {
+alephone.makeWrapper {
  pname = "marathon-pheonix";
  desktopName = "Marathon-Pheonix";
  version = "1.3";
--- a/pkgs/by-name/al/alephone-red/package.nix
+++ b/pkgs/by-name/al/alephone-red/package.nix
@ -1,6 +1,6 @@
 { alephone, fetchurl }:

-alephone.makeWrapper rec {
+alephone.makeWrapper {
  pname = "marathon-red";
  version = "0";
  desktopName = "Marathon-Red";
--- a/pkgs/by-name/al/alephone-rubicon-x/package.nix
+++ b/pkgs/by-name/al/alephone-rubicon-x/package.nix
@ -1,6 +1,6 @@
 { alephone, fetchurl }:

-alephone.makeWrapper rec {
+alephone.makeWrapper {
  pname = "rubicon-x";
  version = "20150620";
  desktopName = "Marathon-Rubicon-X";
--- a/pkgs/by-name/al/alephone-yuge/package.nix
+++ b/pkgs/by-name/al/alephone-yuge/package.nix
@ -1,6 +1,6 @@
 { alephone, fetchurl }:

-alephone.makeWrapper rec {
+alephone.makeWrapper {
  pname = "yuge";
  version = "0";
  desktopName = "Marathon-Yuge";
--- a/pkgs/by-name/al/alephone/package.nix
+++ b/pkgs/by-name/al/alephone/package.nix
@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchurl,
-  fetchpatch2,
  alsa-lib,
  boost,
  curl,
--- a/pkgs/by-name/al/alliance/package.nix
+++ b/pkgs/by-name/al/alliance/package.nix
@ -14,7 +14,7 @@
  libtool,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "alliance";
  version = "unstable-2022-01-13";

--- a/pkgs/by-name/al/almanah/package.nix
+++ b/pkgs/by-name/al/almanah/package.nix
@ -2,7 +2,6 @@
  stdenv,
  lib,
  fetchurl,
-  fetchpatch,
  atk,
  cairo,
  desktop-file-utils,
--- a/pkgs/by-name/al/alps/package.nix
+++ b/pkgs/by-name/al/alps/package.nix
@ -6,7 +6,7 @@
  nixosTests,
 }:

-buildGoModule rec {
+buildGoModule {
  pname = "alps";
  version = "2022-10-18";

--- a/pkgs/by-name/al/alsa-lib/package.nix
+++ b/pkgs/by-name/al/alsa-lib/package.nix
@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchurl,
-  fetchpatch,
  alsa-topology-conf,
  alsa-ucm-conf,
  testers,
--- a/pkgs/by-name/al/alt-ergo/package.nix
+++ b/pkgs/by-name/al/alt-ergo/package.nix
@ -17,7 +17,7 @@ let
 in

 let
-  alt-ergo-lib = ocamlPackages.buildDunePackage rec {
+  alt-ergo-lib = ocamlPackages.buildDunePackage {
    pname = "alt-ergo-lib";
    inherit version src;
    buildInputs = with ocamlPackages; [ ppx_blob ];
--- a/pkgs/by-name/al/althttpd/package.nix
+++ b/pkgs/by-name/al/althttpd/package.nix
@ -5,7 +5,7 @@
  openssl,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "althttpd";
  version = "unstable-2023-08-12";

--- a/pkgs/by-name/al/alure2/package.nix
+++ b/pkgs/by-name/al/alure2/package.nix
@ -9,7 +9,7 @@
  libsndfile,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "alure2";
  version = "unstable-2020-02-06";

--- a/pkgs/by-name/am/ams/package.nix
+++ b/pkgs/by-name/am/ams/package.nix
@ -12,7 +12,7 @@
  autoreconfHook,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "ams";
  version = "unstable-2019-04-27";

--- a/pkgs/by-name/an/ananicy/package.nix
+++ b/pkgs/by-name/an/ananicy/package.nix
@ -10,7 +10,7 @@
  fetchpatch,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "ananicy";
  version = "unstable-2023-03-21";

--- a/pkgs/by-name/an/andagii/package.nix
+++ b/pkgs/by-name/an/andagii/package.nix
@ -4,7 +4,7 @@
  fetchzip,
 }:

-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
  pname = "andagii";
  version = "1.0.2";

--- a/pkgs/by-name/an/anuko-time-tracker/package.nix
+++ b/pkgs/by-name/an/anuko-time-tracker/package.nix
@ -6,7 +6,7 @@
  php,
 }:

-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
  pname = "anuko-time-tracker";
  version = "1.22.19.5806";

--- a/pkgs/by-name/an/anyk/package.nix
+++ b/pkgs/by-name/an/anyk/package.nix
@ -107,7 +107,7 @@ stdenv.mkDerivation {
  ];

  desktopItems = [
-    (makeDesktopItem rec {
+    (makeDesktopItem {
      desktopName = "ÁNYK";
      name = "anyk";
      exec = "anyk";
--- a/pkgs/by-name/an/anytone-emu/package.nix
+++ b/pkgs/by-name/an/anytone-emu/package.nix
@ -6,7 +6,7 @@
  udev,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
  pname = "anytone-emu";
  version = "unstable-2023-06-15";

--- a/pkgs/by-name/ap/apache-airflow/python-package.nix
+++ b/pkgs/by-name/ap/apache-airflow/python-package.nix
@ -89,7 +89,7 @@
 let
  version = "2.7.3";

-  airflow-src = fetchFromGitHub rec {
+  airflow-src = fetchFromGitHub {
    owner = "apache";
    repo = "airflow";
    rev = "refs/tags/${version}";
--- a/pkgs/by-name/ap/apftool-rs/package.nix
+++ b/pkgs/by-name/ap/apftool-rs/package.nix
@ -4,7 +4,7 @@
  rustPlatform,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
  pname = "apftool-rs";
  version = "0-unstable-2024-01-05";

--- a/pkgs/by-name/ap/apg/package.nix
+++ b/pkgs/by-name/ap/apg/package.nix
@ -5,7 +5,7 @@
  openssl,
  autoreconfHook,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "apg";
  version = "unstable-2015-01-29";

--- a/pkgs/by-name/ap/apple-cursor/package.nix
+++ b/pkgs/by-name/ap/apple-cursor/package.nix
@ -22,7 +22,7 @@ let
  ];
  version = "2.0.1";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "apple_cursor";
  inherit version;
  inherit srcs;
--- a/pkgs/by-name/ap/apt-cacher-ng/package.nix
+++ b/pkgs/by-name/ap/apt-cacher-ng/package.nix
@ -5,7 +5,6 @@
  cmake,
  doxygen,
  fetchurl,
-  fetchpatch,
  fuse,
  libevent,
  xz,
--- a/pkgs/by-name/ap/apt-dater/package.nix
+++ b/pkgs/by-name/ap/apt-dater/package.nix
@ -14,7 +14,7 @@
  screen,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "apt-dater";
  version = "1.0.4-unstable-2024-10-04";

--- a/pkgs/by-name/ar/arcan/wrapper.nix
+++ b/pkgs/by-name/ar/arcan/wrapper.nix
@ -6,7 +6,7 @@
  name ? "arcan-wrapped",
 }:

-symlinkJoin rec {
+symlinkJoin {
  inherit name;

  paths = appls ++ [ arcan ];
--- a/pkgs/by-name/ar/argo-workflows/package.nix
+++ b/pkgs/by-name/ar/argo-workflows/package.nix
@ -11,7 +11,7 @@ let
  # We build the CLI without the static server for simplicity, but the tool is still required for
  # compilation to succeed.
  # See: https://github.com/argoproj/argo/blob/d7690e32faf2ac5842468831daf1443283703c25/Makefile#L117
-  staticfiles = pkgsBuildBuild.buildGoModule rec {
+  staticfiles = pkgsBuildBuild.buildGoModule {
    name = "staticfiles";

    src = fetchFromGitHub {
--- a/pkgs/by-name/ar/arj/package.nix
+++ b/pkgs/by-name/ar/arj/package.nix
@ -3,7 +3,6 @@
  lib,
  fetchurl,
  fetchzip,
-  fetchpatch,
  autoreconfHook,
 }:

--- a/pkgs/by-name/ar/arkade/package.nix
+++ b/pkgs/by-name/ar/arkade/package.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "arkade";
-  version = "0.11.34";
+  version = "0.11.36";

  src = fetchFromGitHub {
    owner = "alexellis";
    repo = "arkade";
    rev = version;
-    hash = "sha256-cbSRNGQgH+dqBPK81JbrnvtxjCBeUXG3DpUYMagMBXI=";
+    hash = "sha256-u2dfpZd523W+QNznUmcVh8o4/o6Gmkk/teullmKTXm0=";
  };

  env.CGO_ENABLED = 0;
--- a/pkgs/by-name/ar/armbian-firmware/package.nix
+++ b/pkgs/by-name/ar/armbian-firmware/package.nix
@ -3,7 +3,7 @@
  lib,
  fetchFromGitHub,
 }:
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
  pname = "armbian-firmware";
  version = "unstable-2023-09-16";

--- a/pkgs/by-name/ar/arrow-glib/package.nix
+++ b/pkgs/by-name/ar/arrow-glib/package.nix
@ -10,7 +10,7 @@
  stdenv,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "arrow-glib";
  inherit (arrow-cpp) src version;
  sourceRoot = "${arrow-cpp.src.name}/c_glib";
--- a/pkgs/by-name/ar/artim-dark/package.nix
+++ b/pkgs/by-name/ar/artim-dark/package.nix
@ -4,7 +4,7 @@
  fetchFromGitHub,
 }:

-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
  pname = "artim-dark";
  version = "unstable-2021-12-29";

--- a/pkgs/by-name/as/asha-pipewire-sink/package.nix
+++ b/pkgs/by-name/as/asha-pipewire-sink/package.nix
@ -9,7 +9,7 @@
  glib,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "asha-pipewire-sink";
  version = "0-unstable-2024-10-22";

--- a/pkgs/by-name/as/asusctl/package.nix
+++ b/pkgs/by-name/as/asusctl/package.nix
@ -17,17 +17,17 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "asusctl";
-  version = "6.1.4";
+  version = "6.1.10";

  src = fetchFromGitLab {
    owner = "asus-linux";
    repo = "asusctl";
    rev = version;
-    hash = "sha256-t5wjfazKadpYEc29LJmnh3Zdc53wQQY2DYpj3ijZ534=";
+    hash = "sha256-KCGoaqqXWFApD464jbNcdGhd7DDxrpNcRg/ClM0GrJc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-1IwGjdx2BM6kA17mgYg5+pAr6UOiIuP6//05tcjmJBM=";
+  cargoHash = "sha256-c3uoQWdf4nG2SzLpB/T7AM/wrfxqVZcTVX1eRFZTGhQ=";

  postPatch = ''
    files="
--- a/pkgs/by-name/at/atinout/package.nix
+++ b/pkgs/by-name/at/atinout/package.nix
@ -6,7 +6,7 @@
  mount,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "atinout";
  version = "0.9.2-alpha";

--- a/pkgs/by-name/au/autospotting/package.nix
+++ b/pkgs/by-name/au/autospotting/package.nix
@ -4,7 +4,7 @@
  fetchFromGitHub,
 }:

-buildGoModule rec {
+buildGoModule {
  pname = "autospotting";
  version = "unstable-2023-07-03";

--- a/pkgs/by-name/av/avdump3/package.nix
+++ b/pkgs/by-name/av/avdump3/package.nix
@ -7,7 +7,7 @@
  runtimeShell,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "avdump3";
  version = "8293_stable";

--- a/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix
+++ b/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix
@ -7,7 +7,7 @@
  unstableGitUpdater,
  wayland,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
  pname = "aw-watcher-window-wayland";
  version = "0-unstable-2024-10-08";

--- a/pkgs/by-name/az/azure-cli/README.md
+++ b/pkgs/by-name/az/azure-cli/README.md
@ -56,7 +56,7 @@ The output should look something like this:
 Based on this, you can add an attribute to `extensions-manual.nix`:

 ```nix
-  azure-devops = mkAzExtension rec {
+  azure-devops = mkAzExtension {
    pname = "azure-devops";
    version = "1.0.0";
    url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl";
--- a/pkgs/by-name/ba/badlion-client/package.nix
+++ b/pkgs/by-name/ba/badlion-client/package.nix
@ -17,7 +17,7 @@ let

  appimageContents = appimageTools.extract { inherit pname version src; };
 in
-appimageTools.wrapType2 rec {
+appimageTools.wrapType2 {
  inherit pname version src;

  extraInstallCommands = ''
--- a/pkgs/by-name/ba/bash-my-aws/package.nix
+++ b/pkgs/by-name/ba/bash-my-aws/package.nix
@ -21,7 +21,7 @@ let
    (python3.withPackages (ps: [ ps.jmespath ]))
  ];
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "bash-my-aws";
  version = "0-unstable-2025-01-22";

--- a/pkgs/by-name/bc/bc-decaf/package.nix
+++ b/pkgs/by-name/bc/bc-decaf/package.nix
@ -6,7 +6,7 @@
  stdenv,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "bc-decaf";
  version = "unstable-2022-07-20";

--- a/pkgs/by-name/bc/bcachefs-tools/package.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/package.nix
@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
  pkg-config,
  libuuid,
  libsodium,
--- a/pkgs/by-name/bd/bdt/package.nix
+++ b/pkgs/by-name/bd/bdt/package.nix
@ -3,7 +3,7 @@
  rustPlatform,
  fetchFromGitHub,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
  pname = "bdt";
  version = "0.18.0";

--- a/pkgs/by-name/be/bee/package.nix
+++ b/pkgs/by-name/be/bee/package.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "bee";
-  version = "2.4.0";
+  version = "2.5.0";

  src = fetchFromGitHub {
    owner = "ethersphere";
    repo = "bee";
    rev = "v${version}";
-    hash = "sha256-03di/XgvUoc25b1jKxb64bAX21MTP/5M3kefUB+NbiY=";
+    hash = "sha256-44mjSeV8imatPpNkRSA5Uewunvkc5j6Eo+gKya+dqzE=";
  };

-  vendorHash = "sha256-kxfdreEGRY9NHxpGwgvdeYBg0m+itEhy7ih1JSD2E44=";
+  vendorHash = "sha256-1Hl0tT6ZI3otEdOQw9adipOGcSyZXLbSLC8s7YsFRZA=";

  subPackages = [ "cmd/bee" ];

--- a/pkgs/by-name/be/bento/package.nix
+++ b/pkgs/by-name/be/bento/package.nix
@ -8,17 +8,17 @@

 buildGoModule rec {
  pname = "bento";
-  version = "1.5.1";
+  version = "1.5.2";

  src = fetchFromGitHub {
    owner = "warpstreamlabs";
    repo = "bento";
    tag = "v${version}";
-    hash = "sha256-l+XQAcLIL37UBvV++0U3vlPZaz53K+/grRBOZqCcbPM=";
+    hash = "sha256-ufRC/xVuSnoN+dHeiQZ2k2T8mYxz576l1n+y3Y3TMEY=";
  };

  proxyVendor = true;
-  vendorHash = "sha256-lWg3wX+iS+RXH00kngNGGb7/93iAHiFzGjuyp+KSfco=";
+  vendorHash = "sha256-FRaT+TeH6+0RzvCwPd0e+2a6i85GTPARS2H49zYVwk4=";

  subPackages = [
    "cmd/bento"
--- a/Show more
+++ b/Show more