Merge staging-next-25.05 into staging-25.05

2026-01-11 10:22:54 +08:00 · 2025-08-10 00:23:48 +00:00
parent 7bdd4dc322 67d00effc0
commit c841a2abf2
2110 changed files with 368 additions and 6385 deletions
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -23,6 +23,7 @@ jobs:
    name: Backport Pull Request
    if: vars.NIXPKGS_CI_APP_ID && github.event.pull_request.merged == true && (github.event.action != 'labeled' || startsWith(github.event.label.name, 'backport'))
    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 3
    steps:
      # Use a GitHub App to create the PR so that CI gets triggered
      # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,6 +43,7 @@ jobs:
            desc: shell
    name: '${{ matrix.system }}: ${{ matrix.desc }}'
    runs-on: ${{ matrix.runner }}
+    timeout-minutes: 60
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -38,6 +38,7 @@ jobs:
    permissions:
      pull-requests: write
    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 3
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -49,6 +49,7 @@ jobs:
  check:
    name: Check
    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 5
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
@@ -106,6 +107,7 @@ jobs:
  request:
    name: Request
    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 5
    steps:
      - uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31

--- a/.github/workflows/dismissed-review.yml
+++ b/.github/workflows/dismissed-review.yml
@@ -25,6 +25,7 @@ jobs:
  minimize:
    name: Minimize as resolved
    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 2
    steps:
      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -31,6 +31,7 @@ jobs:
    name: Trigger jobs
    runs-on: ubuntu-24.04
    if: github.event.changes.base.ref.from && github.event.changes.base.ref.from != github.event.pull_request.base.ref
+    timeout-minutes: 2
    steps:
      # Use a GitHub App to create the PR so that CI gets triggered
      # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -31,12 +31,18 @@ jobs:
    name: ${{ matrix.system }}
    outputs:
      targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
+    timeout-minutes: 15
    steps:
-      # We'd rather fail than run slow eval on swap.
-      # Failing allows us to adjust the chunkSize to remain fast.
-      - name: Disable swap
+      # This is not supposed to be used and just acts as a fallback.
+      # Without swap, when Eval runs OOM, it will fail badly with a
+      # job that is sometimes not interruptible anymore.
+      # If Eval starts swapping, decrease chunkSize to keep it fast.
+      - name: Enable swap
        run: |
-          sudo swapoff -a
+          sudo fallocate -l 10G /swap
+          sudo chmod 600 /swap
+          sudo mkswap /swap
+          sudo swapon /swap

      - name: Check out the PR at the test merge commit
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -150,6 +156,7 @@ jobs:
    if: needs.eval.outputs.targetRunId
    permissions:
      statuses: write
+    timeout-minutes: 5
    steps:
      - name: Download output paths and eval stats for all systems
        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
@@ -232,6 +239,7 @@ jobs:
  misc:
    if: ${{ github.event_name != 'push' }}
    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 10
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,6 +19,7 @@ defaults:
 jobs:
  treefmt:
    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 10
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
@@ -51,6 +52,7 @@ jobs:

  parse:
    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 10
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
@@ -72,7 +74,6 @@ jobs:

  nixpkgs-vet:
    runs-on: ubuntu-24.04-arm
-    # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long.
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -19,6 +19,7 @@ defaults:
 jobs:
  merge:
    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 5
    steps:
      # Use a GitHub App to create the PR so that CI gets triggered
      # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -27,6 +27,7 @@ defaults:
 jobs:
  request:
    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 20
    steps:
      - name: Check out the PR at the base commit
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -122,7 +122,8 @@ let
 in
 runCommand "compare"
  {
-    nativeBuildInputs = [
+    # Don't depend on -dev outputs to reduce closure size for CI.
+    nativeBuildInputs = map lib.getBin [
      jq
      (python3.withPackages (
        ps: with ps; [
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -14,10 +14,9 @@
  runCommand,
  writeShellScript,
  symlinkJoin,
-  time,
-  procps,
-  nix,
+  busybox,
  jq,
+  nix,
 }:

 let
@@ -48,9 +47,10 @@ let
    runCommand "attrpaths-superset.json"
      {
        src = nixpkgs;
-        nativeBuildInputs = [
+        # Don't depend on -dev outputs to reduce closure size for CI.
+        nativeBuildInputs = map lib.getBin [
+          busybox
          nix
-          time
        ];
      }
      ''
@@ -72,11 +72,11 @@ let
      # The system to evaluate.
      # Note that this is intentionally not called `system`,
      # because `--argstr system` would only be passed to the ci/default.nix file!
-      evalSystem,
+      evalSystem ? builtins.currentSystem,
      # The path to the `paths.json` file from `attrpathsSuperset`
      attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json",
      # The number of attributes per chunk, see ./README.md for more info.
-      chunkSize,
+      chunkSize ? 5000,
      checkMeta ? true,

      # Don't try to eval packages marked as broken.
@@ -131,11 +131,11 @@ let
    in
    runCommand "nixpkgs-eval-${evalSystem}"
      {
-        nativeBuildInputs = [
-          nix
-          time
-          procps
+        # Don't depend on -dev outputs to reduce closure size for CI.
+        nativeBuildInputs = map lib.getBin [
+          busybox
          jq
+          nix
        ];
        env = {
          inherit evalSystem chunkSize;
@@ -160,14 +160,14 @@ let
        # Record and print stats on free memory and swap in the background
        (
          while true; do
-            availMemory=$(free -b | grep Mem | awk '{print $7}')
-            freeSwap=$(free -b | grep Swap | awk '{print $4}')
-            echo "Available memory: $(( availMemory / 1024 / 1024 )) MiB, free swap: $(( freeSwap / 1024 / 1024 )) MiB"
+            availMemory=$(free -m | grep Mem | awk '{print $7}')
+            freeSwap=$(free -m | grep Swap | awk '{print $4}')
+            echo "Available memory: $(( availMemory )) MiB, free swap: $(( freeSwap )) MiB"

            if [[ ! -f "$out/${evalSystem}/min-avail-memory" ]] || (( availMemory < $(<$out/${evalSystem}/min-avail-memory) )); then
              echo "$availMemory" > $out/${evalSystem}/min-avail-memory
            fi
-            if [[ ! -f $out/${evalSystem}/min-free-swap ]] || (( availMemory < $(<$out/${evalSystem}/min-free-swap) )); then
+            if [[ ! -f $out/${evalSystem}/min-free-swap ]] || (( freeSwap < $(<$out/${evalSystem}/min-free-swap) )); then
              echo "$freeSwap" > $out/${evalSystem}/min-free-swap
            fi
            sleep 4
@@ -206,7 +206,8 @@ let
    }:
    runCommand "combined-eval"
      {
-        nativeBuildInputs = [
+        # Don't depend on -dev outputs to reduce closure size for CI.
+        nativeBuildInputs = map lib.getBin [
          jq
        ];
      }
--- a/nixos/modules/hardware/sensor/iio.nix
+++ b/nixos/modules/hardware/sensor/iio.nix
@@ -19,6 +19,8 @@
        type = lib.types.bool;
        default = false;
      };
+
+      package = lib.mkPackageOption pkgs "iio-sensor-proxy" { };
    };
  };

@@ -28,10 +30,10 @@

    boot.initrd.availableKernelModules = [ "hid-sensor-hub" ];

-    environment.systemPackages = with pkgs; [ iio-sensor-proxy ];
+    environment.systemPackages = [ config.hardware.sensor.iio.package ];

-    services.dbus.packages = with pkgs; [ iio-sensor-proxy ];
-    services.udev.packages = with pkgs; [ iio-sensor-proxy ];
-    systemd.packages = with pkgs; [ iio-sensor-proxy ];
+    services.dbus.packages = [ config.hardware.sensor.iio.package ];
+    services.udev.packages = [ config.hardware.sensor.iio.package ];
+    systemd.packages = [ config.hardware.sensor.iio.package ];
  };
 }
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@@ -32,7 +32,6 @@ let
    "@obsolete"
    "@privileged"
    "@setuid"
-    "@spawn"
  ];

  cfgService = {
--- a/nixos/modules/services/web-servers/garage.nix
+++ b/nixos/modules/services/web-servers/garage.nix
@@ -147,6 +147,8 @@ in
          NoNewPrivileges = true;
          EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile;
          ReadWritePaths = lib.filter (x: !(isDefault x)) (lib.flatten [ paths ]);
+          # Upstream recommendation https://garagehq.deuxfleurs.fr/documentation/cookbook/systemd/
+          LimitNOFILE = 42000;
        };
      environment = {
        RUST_LOG = lib.mkDefault "garage=${cfg.logLevel}";
--- a/nixos/tests/firefly-iii.nix
+++ b/nixos/tests/firefly-iii.nix
@@ -6,7 +6,10 @@ let
 in
 {
  name = "firefly-iii";
-  meta.maintainers = [ lib.maintainers.savyajha ];
+  meta = {
+    maintainers = [ lib.maintainers.savyajha ];
+    platforms = lib.platforms.linux;
+  };

  nodes.fireflySqlite =
    { config, ... }:
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
@@ -32,12 +32,12 @@

 stdenv.mkDerivation rec {
  pname = "bitwig-studio-unwrapped";
-  version = "5.3.8";
+  version = "5.3.11";

  src = fetchurl {
    name = "bitwig-studio-${version}.deb";
    url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
-    hash = "sha256-ccDgNsKskEsaL3G5ISZUMckvFosMALFzEzOM9D4/Xgo=";
+    hash = "sha256-8u8ljljHKGV6m2421vxYSiDTb1iyNLgP3DlLIEKuzXo=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-dGQDRb7fgIkXelZKa+PdodIs9DxbgEMlVGJjK/hU3Mo=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-SqvJSHkyd1IicT6c4pE96dBJNNodULhpyG14HRGVWCk=";

  nativeBuildInputs = [
--- a/pkgs/applications/blockchains/teos/default.nix
+++ b/pkgs/applications/blockchains/teos/default.nix
@@ -30,7 +30,6 @@ in
    pname = "teos";
    inherit version src;

-    useFetchCargoVendor = true;
    cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M=";

    buildAndTestSubdir = "teos";
@@ -53,7 +52,6 @@ in
    pname = "teos-watchtower-plugin";
    inherit version src;

-    useFetchCargoVendor = true;
    cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M=";

    buildAndTestSubdir = "watchtower-plugin";
--- a/pkgs/applications/display-managers/greetd/default.nix
+++ b/pkgs/applications/display-managers/greetd/default.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-JwTLZawY9+M09IDbMPoNUcNrnW1C2OVlEVn1n7ol6dY=";

  nativeBuildInputs = [
--- a/pkgs/applications/display-managers/greetd/regreet.nix
+++ b/pkgs/applications/display-managers/greetd/regreet.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-f8Xvno5QqmWz4SUiFYDvs8lFU1ZaqQ8gpTaVzWxW4T8=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-abCQ3RsnZ/a1DbjQFOiA7Xs7bbqSJxwNps8yV6Q4FIw=";

  buildFeatures = [ "gtk4_8" ];
--- a/pkgs/applications/display-managers/greetd/tuigreet.nix
+++ b/pkgs/applications/display-managers/greetd/tuigreet.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-w6ZOqpwogKoN4oqqI1gFqY8xAnfvhEBVaL8/6JXpKXs=";

  nativeBuildInputs = [
--- a/pkgs/applications/display-managers/greetd/wlgreet.nix
+++ b/pkgs/applications/display-managers/greetd/wlgreet.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-TQTHFBOTxtSuzrAG4cjZ9oirl80xc0rPdYeLJ0t39DQ=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-ITo9qvcT5aOybWLV7kn9BZbux6uxx1RwRGWCGQYdZ2I=";

  nativeBuildInputs = [ autoPatchelfHook ];
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage {
    hash = "sha256-DiqC7z1AQbXsSXc77AGRilWi3HfEg0YoHrXu54O3Clo=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-ygFXKniCCOyXndPOTKoRbd4W1OR2CSA2jr7yxpwkw28=";

  checkFlags = [
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
@@ -21,7 +21,6 @@ let
      hash = "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=";
    };

-    useFetchCargoVendor = true;
    cargoHash = "sha256-Tua3ZFfSyWVYXU9mPLWXE6ejGlXowTNe3nvZBaicmSQ=";

    sourceRoot = "${src.name}/core";
--- a/pkgs/applications/editors/jetbrains/source/build.nix
+++ b/pkgs/applications/editors/jetbrains/source/build.nix
@@ -134,7 +134,7 @@ let
    version = buildNumber;
    inherit src;
    sourceRoot = "${src.name}/native/restarter";
-    useFetchCargoVendor = true;
+
    cargoHash = restarterHash;

    # Allow static linking
--- a/pkgs/applications/editors/kakoune/plugins/overrides.nix
+++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix
@@ -172,7 +172,6 @@ self: super: {
      git
    ];

-    useFetchCargoVendor = true;
    cargoHash = "sha256-cgUBa0rgfJFnosCgD20G1rlOl/nyXJ9bA9SSf4BuqAs=";

    postInstall = ''
--- a/pkgs/applications/editors/neovim/gnvim/default.nix
+++ b/pkgs/applications/editors/neovim/gnvim/default.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-VyyHlyMW/9zYECobQwngFARQYqcoXmopyCHUwHolXfo=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-+i4fFiuNmc2+aFyOW2FxRZXINN1XF0nDJVsFYnIHI24=";

  nativeBuildInputs = [
--- a/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix
@@ -17,7 +17,6 @@ let
    pname = "LanguageClient-neovim-bin";
    inherit version src;

-    useFetchCargoVendor = true;
    cargoHash = "sha256-1tfeowqvjEjMXIfrhr388YhlZrk3ns+Y/2odQnkLw7k=";
  };
 in
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -23,7 +23,6 @@ let
    pname = "avante-nvim-lib";
    inherit version src;

-    useFetchCargoVendor = true;
    cargoHash = "sha256-pmnMoNdaIR0i+4kwW3cf01vDQo39QakTCEG9AXA86ck=";

    nativeBuildInputs = [
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
@@ -19,7 +19,6 @@ let
    inherit version src;
    pname = "blink-fuzzy-lib";

-    useFetchCargoVendor = true;
    cargoHash = "sha256-IDoDugtNWQovfSstbVMkKHLBXKa06lxRWmywu4zyS3M=";

    nativeBuildInputs = [ gitMinimal ];
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
@@ -21,7 +21,6 @@ let
    pname = "blink-pairs";
    inherit version src;

-    useFetchCargoVendor = true;
    cargoHash = "sha256-vkybRuym1yibaw943Gs9luYLdYEp4tgvA8e4maATiTY=";

    nativeBuildInputs = [
--- a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix
@@ -22,7 +22,6 @@ let

    sourceRoot = "${src.name}/generator";

-    useFetchCargoVendor = true;
    cargoHash = "sha256-tg4BO4tPzHhJTowL7RiAuBo4i440FehpGmnz9stTxfI=";

    nativeBuildInputs = [
--- a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix
@@ -25,7 +25,6 @@ let
        --replace-fail "2.0.0-beta.30" "${version}"
    '';

-    useFetchCargoVendor = true;
    cargoHash = "sha256-hKt9d2u/tlD7bgo49O8oHDLljRvad9dEpGdFt+LH6Ec=";

    # cord depends on nightly features
--- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix
@@ -20,7 +20,6 @@ let
    inherit version src;
    sourceRoot = "${src.name}/spectre_oxi";

-    useFetchCargoVendor = true;
    cargoHash = "sha256-0szVL45QRo3AuBMf+WQ0QF0CS1B9HWPxfF6l6TJtv6Q=";

    preCheck = ''
--- a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix
@@ -21,7 +21,6 @@ let
    pname = "sg-nvim-rust";
    inherit version src;

-    useFetchCargoVendor = true;
    cargoHash = "sha256-yY/5w2ztmTKJAYDxBJND8itCOwRNi1negiFq3PyFaSM=";

    nativeBuildInputs = [ pkg-config ];
--- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix
@@ -29,7 +29,6 @@ let
    pname = "sniprun-bin";
    inherit version src;

-    useFetchCargoVendor = true;
    cargoHash = "sha256-cu7wn75rQcwPLjFl4v05kVMsiCD0mAlIBt49mvIaPPU=";

    nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix
@@ -33,7 +33,6 @@ let
    pname = "maple";
    inherit version src meta;

-    useFetchCargoVendor = true;
    cargoHash = "sha256-FEeSwa8KmIyfhWAU9Dpric6uB2e0yK+Tig/k2zwq2Rg=";

    nativeBuildInputs = [
--- a/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix
@@ -17,7 +17,7 @@ let
  vim-markdown-composer-bin = rustPlatform.buildRustPackage {
    pname = "vim-markdown-composer-bin";
    inherit src version;
-    useFetchCargoVendor = true;
+
    cargoHash = "sha256-xzlEIaDEYDbxJ6YqzF+lSHcB9O+brClw026YI1YeNUc=";
    # tests require network access
    doCheck = false;
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage {
  pname = "${pname}-adapter";
  inherit version src;

-  useFetchCargoVendor = true;
  cargoHash = "sha256-Nh4YesgWa1JR8tLfrIRps9TBdsAfilXu6G2/kB08co8=";

  # Environment variables, based on <https://github.com/vadimcn/codelldb/blob/master/cargo_config.unix.toml>
--- a/pkgs/applications/misc/pagefind/default.nix
+++ b/pkgs/applications/misc/pagefind/default.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-NIEiXwuy8zuUDxPsD4Hiq3x4cOG3VM+slfNIBSJU2Mk=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-e1JSK8RnBPGcAmgxJZ7DaYhMMaUqO412S9YvaqXll3E=";

  env.npmDeps_web_js = fetchNpmDeps {
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
  pname = "firefox-beta";
  binaryName = pname;
-  version = "142.0b3";
+  version = "142.0b8";
  applicationName = "Firefox Beta";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "707781fcc59798c0ecbf11532eac41f4f134f24b1d670234cf674e433525ca83fe4fff75874d1a16d2be2039959731e71a5aa56e727d2b46e5bc40f63277b188";
+    sha512 = "048325c583dc3c6716be3fcb9d793448ab6e2b18b7b5f7d6aafa76cbc9e790489f7cd59644ded4b7e7929e19021e04b21e5d11c298057bb60fe018a791494ce8";
  };

  meta = {
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
  pname = "firefox-devedition";
  binaryName = pname;
-  version = "142.0b3";
+  version = "142.0b8";
  applicationName = "Firefox Developer Edition";
  requireSigning = false;
  branding = "browser/branding/aurora";
  src = fetchurl {
    url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "5752c77307e59ad188385bb7bbb440e01a256f437088e051d1bc74e0ccdbde4ddf68c97fdcf0401c03636293753c5e8f7132352aed5f5e9e537c96eaf8784f21";
+    sha512 = "a5a89cdbfe3e05e6d329011476d571625094546e0eb2bea4f4ce426fd8d6ce23ce51ce19fd0a4d44ea7cb134d3f6c1510dcc1403d6aab5981862845a250c9dae";
  };

  # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
--- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-1bE2idLPok6YmB1qyTDQmBg+uzc6/Sza75dSN7QpEcI=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-QAjANg8os3RID0Lrl7qGEvxT/1i8UBwVfK0G4PHwrXA=";

  doInstallCheck = true;
--- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
@@ -15,15 +15,15 @@ let
    ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
  hash =
    {
-      amd64-linux_hash = "sha256-e5O8cvQqvymHQiu7kY1AhKfoVOsDLYK8hDX+PKgZPFs=";
-      arm64-linux_hash = "sha256-UskXFGxAFOrAK8bIXRHSwN0G1lakGyuRGXTYYRFKHaw=";
+      amd64-linux_hash = "sha256-84W40++U+5/kTI84vGEqAVb93TCgFPduBkhMQG0yDRo=";
+      arm64-linux_hash = "sha256-lOQW559aXXBIDuindVj8YBB8pzNAJPoTSJ70y1YnZQ4=";
    }
    ."${arch}-linux_hash";
 in
 mkFranzDerivation rec {
  pname = "ferdium";
  name = "Ferdium";
-  version = "7.0.1";
+  version = "7.1.0";
  src = fetchurl {
    url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb";
    inherit hash;
--- a/pkgs/applications/networking/mullvad/mullvad.nix
+++ b/pkgs/applications/networking/mullvad/mullvad.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-IpGTqi0gSE2yXXou5fp+CryHfIKx0n3y/V4K2+ZO3k8=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-EJ8yk11H1QB+7CGjJYY5BjBAFTDK4d02/DJOQTVGFho=";

  checkFlags = [
--- a/pkgs/applications/office/activitywatch/default.nix
+++ b/pkgs/applications/office/activitywatch/default.nix
@@ -187,7 +187,6 @@ rec {

    src = "${sources}/aw-server-rust";

-    useFetchCargoVendor = true;
    cargoHash = "sha256-E89E/LWBPHtb6vX94swodmE+UrWMrzQnm8AO5GeyuoA=";

    patches = [
--- a/pkgs/applications/system/coolercontrol/coolercontrold.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
  inherit version src;
  sourceRoot = "${src.name}/coolercontrold";

-  useFetchCargoVendor = true;
  cargoHash = "sha256-ZyYyQcaYd3VZ7FL0Hki33JO3LscPfBT5gl+nw2cXvUs=";

  buildInputs = [ libdrm ];
--- a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-4Ar4ChSl226BVFyAnqpWDLxsZF63bxl++sWD+6aENW8=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-e0FDa72vzRb5AMVmtkvAkiQ5GUXsq0LekqF+wDYDsr8=";

  nativeBuildInputs = [
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -366,13 +366,13 @@ rec {
  # Get revisions from
  # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
  docker_25 = callPackage dockerGen rec {
-    version = "25.0.11";
+    version = "25.0.12";
    # Upstream forgot to tag release
    # https://github.com/docker/cli/issues/5789
    cliRev = "43987fca488a535d810c429f75743d8c7b63bf4f";
    cliHash = "sha256-OwufdfuUPbPtgqfPeiKrQVkOOacU2g4ommHb770gV40=";
    mobyRev = "v${version}";
-    mobyHash = "sha256-vHHi0/sX9fm83gyUjDpRYTGV9h18IVia1oSmj4n31nc=";
+    mobyHash = "sha256-EBOdbFP6UBK1uhXi1IzcPxYihHikuzzwMvv2NHsksYk=";
    runcRev = "v1.2.5";
    runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4=";
    containerdRev = "v1.7.27";
@@ -410,11 +410,11 @@ rec {
  };

  docker_28 = callPackage dockerGen rec {
-    version = "28.3.2";
+    version = "28.3.3";
    cliRev = "v${version}";
-    cliHash = "sha256-LsV9roOPw0LccvBUeF3bY014OwG6QpnVsLf+dqKyvsg=";
+    cliHash = "sha256-+nYpd9VGzzMPcBUfGM7V9MkrslYHDSUlE0vhTqDGc1s=";
    mobyRev = "v${version}";
-    mobyHash = "sha256-YfdnCAc9NgLTuvxLHGhTPdWqXz9VSVsQsfzLD3YER3g=";
+    mobyHash = "sha256-3SWjoF4sXVuYxnENq5n6ZzPJx6BQXnyP8VXTQaaUSFA=";
    runcRev = "v1.2.6";
    runcHash = "sha256-XMN+YKdQOQeOLLwvdrC6Si2iAIyyHD5RgZbrOHrQE/g=";
    containerdRev = "v1.7.27";
--- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
+++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-iLYmPBJH7I6EJ8VTUbR0+lZaebvbZlRv2KglbjKX76Q=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-iqsU4t8Zz9UTtAu+a6kqwnPZ6qdGAriQ7hcU58KDQ8M=";

  # lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO'
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
    xorg.libX11
  ];

-  useFetchCargoVendor = true;
  cargoHash = "sha256-G31p8iVRUODD4hUssXaOqEOUTW+C+GZMy/L/tgumDtA=";

  postInstall = lib.optionalString (bins != [ ]) ''
--- a/pkgs/applications/window-managers/i3/auto-layout.nix
+++ b/pkgs/applications/window-managers/i3/auto-layout.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-oKpcYhD9QNW+8gFVybDEnz58cZ+2Bf4bwYuflXiJ1jc=";

  # Currently no tests are implemented, so we avoid building the package twice
--- a/pkgs/applications/window-managers/i3/cycle-focus.nix
+++ b/pkgs/applications/window-managers/i3/cycle-focus.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
    hash = "sha256-caZKvxOqoYgPs+Zjltj8K0/ospjkLnA4kh0rsTjeU3Y=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-6d3a9iaXKakbs7g/649nO39bh4Ka8jcBI/yJImTqoZs=";

  meta = with lib; {
--- a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
+++ b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-no5fJ5nlwyS/PVi9J5Ek3c3Rp7A3MflpReo9kwJrj6U=";

  # Currently no tests are implemented, so we avoid building the package twice
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-xJm4MsEU0OVX401WvKllg3zUwgCvjLxlAQzXE/oD1J0=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-EFFmH9aG7DvSA5rsAuszc1B8kcLdruSk3Hhp4V9t9Gk=";

  nativeBuildInputs = [
--- a/pkgs/applications/window-managers/i3/wmfocus.nix
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-94MgE2j8HaS8IyzHEDtoqTls2A8xD96v2iAFx9XfMcw=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-tYzJS/ApjGuvNnGuBEVr54AGcEmDhG9HtirZvtmNslY=";

  nativeBuildInputs = [
--- a/pkgs/applications/window-managers/i3/workstyle.nix
+++ b/pkgs/applications/window-managers/i3/workstyle.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage {
    sha256 = "sha256-yhnt7edhgVy/cZ6FpF6AZWPoeMeEKTXP+87no2KeIYU=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-es8kS1w71TuQ1pKb4/wXtpukWEBqUJUA+GX3uXOYbtU=";

  doCheck = false; # No tests
--- a/pkgs/applications/window-managers/i3/wsr.nix
+++ b/pkgs/applications/window-managers/i3/wsr.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-RTJ+up3mt6KuMkTBCXDUmztxwEQCeyAjuhhOUrdIfTo=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-7WS+8EGGl8sJ3TeT7IM+u1AiD0teJ2AITb++zK/keXs=";

  nativeBuildInputs = [ python3 ];
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -73,7 +73,11 @@ lib.extendMkDerivation {
    }@args:

    assert lib.assertMsg useFetchCargoVendor
-      "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05";
+      "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it";
+
+    assert lib.warnIf (args ? useFetchCargoVendor)
+      "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it"
+      true;

    lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") {
      RUSTFLAGS = "-C split-debuginfo=packed " + (args.RUSTFLAGS or "");
--- a/pkgs/by-name/aa/aaa/package.nix
+++ b/pkgs/by-name/aa/aaa/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
    rev = "v${version}";
    sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw=";
  };
-  useFetchCargoVendor = true;
+
  cargoHash = "sha256-CHX+Ugy4ND36cpxNEFpnqid6ALHMPXmfXi+D4aktPRk=";

  meta = with lib; {
--- a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
+++ b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-U9i5L3s4oQOIqlECSaKkHxS2Vzr6SY4tIUpvl3+oSl0=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-LiNnTNpluQkomQhIOsAnUbbBftTgqgNdpT8heCrBayg=";

  meta = with lib; {
--- a/pkgs/by-name/aa/aardvark-dns/package.nix
+++ b/pkgs/by-name/aa/aardvark-dns/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-mWaB1E/n/N2Tb5bqrMJX2XfPvZBCG+dxar3kGCHgv0I=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-t9qfPz4Jy1RueiDEY2fB3Y1uty0i/Wf0ElsR+nSVF5g=";

  passthru.tests = { inherit (nixosTests) podman; };
--- a/pkgs/by-name/ab/ab-av1/package.nix
+++ b/pkgs/by-name/ab/ab-av1/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-FqyY4HUOrpSsqR5XO96+IXnT7w8C1gGfia0YH1d/nkg=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-nadMsYt1RaZbqArSEiz/kAz/HuTS0E3bsn94D9UmAME=";

  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/by-name/ab/aba/package.nix
+++ b/pkgs/by-name/ab/aba/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
    hash = "sha256-2zVQNchL4DFh2v2/kwupJTBSmXiKqlxzUMrP9TbfCMs=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-U1f68DY+yV6Uxwk1Re0eSNCFWYrYKCN08hJAYcp4ksE=";

  nativeBuildInputs = [
--- a/pkgs/by-name/ac/action-validator/package.nix
+++ b/pkgs/by-name/ac/action-validator/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage {
    fetchSubmodules = true;
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-FuJ5NzeZhfN312wK5Q1DgIXUAN6hqxu/1BhGqasbdS8=";

  passthru.updateScript = unstableGitUpdater {
--- a/pkgs/by-name/ad/ad/package.nix
+++ b/pkgs/by-name/ad/ad/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "0rd4krklpnvaimzblqx2ckab6lk4apkmvnqr618gnx8i5f4nyl6m";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256:12g3fcym8184py66fgwahpb9q05dm9r9rbhh4l50yd62gkmifc93";

  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/by-name/ad/adguardian/package.nix
+++ b/pkgs/by-name/ad/adguardian/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-WxrSmCwLnXXs5g/hN3xWE66P5n0RD/L9MJpf5N2iNtY=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-yPDysaslL/7N60eZ/hqZl5ZXIsof/pvlgHYfW1mIWtI=";

  meta = with lib; {
--- a/pkgs/by-name/ad/adrs/package.nix
+++ b/pkgs/by-name/ad/adrs/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-C9Kg7xY3Q0xsd2DlUcc3OM+/hyzmwz55oi6Ul3K7zkM=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-Ep1Y2PDNesaDzEc2JNoKZjFSay1utZiNR5eQYhdqiUU=";

  meta = {
--- a/pkgs/by-name/ae/aerogramme/package.nix
+++ b/pkgs/by-name/ae/aerogramme/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
    ./0001-update-time-rs.patch
  ];

-  useFetchCargoVendor = true;
  cargoHash = "sha256-GPj8qhfKgfAadQD9DJafN4ec8L6oY62PS/w/ljkPHpw=";

  # disable network tests as Nix sandbox breaks them
--- a/pkgs/by-name/af/afterburn/package.nix
+++ b/pkgs/by-name/af/afterburn/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-j2eQUro0Rx1axBAaZDNICRrkygb4JAyxVAER/5BXXLY=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-xA5hp7a4DFMh8Xrh2ft94s6aNjORKtyCuNy4GgJbSsw=";

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/by-name/ag/agate/package.nix
+++ b/pkgs/by-name/ag/agate/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-3IVl11eG9gSriOddgzgF0FecdldBxEOE/UXlFDKGyic=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-pVxXUFuHyQ7YBJ6cBv3wPK5aZOs2QIhKf9awwY/y1hw=";

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/by-name/ag/age-plugin-ledger/package.nix
+++ b/pkgs/by-name/ag/age-plugin-ledger/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-g5GbWXhaGEafiM3qkGlRXHcOzPZl2pbDWEBPg4gQWcg=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-zR7gJNIqno50bQo0kondCxEC0ZgssqXNqACF6fnLDrc=";

  nativeBuildInputs = [
--- a/pkgs/by-name/ag/age-plugin-yubikey/package.nix
+++ b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-vfemYGQnn3IzG7Y6iVKHZlYN+55/+A+N/GMG3TLs1h0=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-CVbRKKX2A0MrHgjkjKAXhX80db1fimFlNxusvseUnxQ=";

  nativeBuildInputs = [
--- a/pkgs/by-name/ag/agenix-cli/package.nix
+++ b/pkgs/by-name/ag/agenix-cli/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-0+QVY1sDhGF4hAN6m2FdKZgm9V1cuGGjY4aitRBnvKg=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-xpA9BTA7EK3Pw8EJOjIq1ulBAcX4yNhc4kqhxsoCbv0=";

  passthru.updateScript = nix-update-script { };
--- a/pkgs/by-name/ai/aichat/package.nix
+++ b/pkgs/by-name/ai/aichat/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-5fXZfRrHBAtjUa1VzzsdoFvXQSPQ8YUNJ7yhZlp58tM=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-YK2mps9DUs4HNFmYHtZHTJREuImlQ24y64ykGr8ovTs=";

  nativeBuildInputs = [
--- a/pkgs/by-name/ai/aiken/package.nix
+++ b/pkgs/by-name/ai/aiken/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-bEsBLihMqYHJa5913Q434xKVufxTrcaxwcANPV9u37U=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-Ob4UuBLD6HFbghv4E2XMj+xVeUSFtc9qPUNuUDgZeQA=";

  buildInputs = [ openssl ];
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
  # Remove duplicate entries from cargo lock
  cargoPatches = [ ./cargo-lock.patch ];

-  useFetchCargoVendor = true;
  cargoHash = "sha256-3v/pgm6BjPvQToSmZ2PrUWTrgffjifB3Xmp1liWCUck=";

  useNextest = true;
--- a/pkgs/by-name/ai/airgorah/package.nix
+++ b/pkgs/by-name/ai/airgorah/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-cIb40TKkk3gfy4dTP8WyZqQkRGj5nItaQ3NSfexCUOA=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-3Les/A9fBBjU6NSVVEyXCbjrNSdaEgCl5pZ36ceRDQg=";

  nativeBuildInputs = [
--- a/pkgs/by-name/ai/airshipper/package.nix
+++ b/pkgs/by-name/ai/airshipper/package.nix
@@ -68,7 +68,6 @@ rustPlatform.buildRustPackage {
    hash = "sha256-MHwyXCAqdBzdJlYzSeUXr6bJdTVHcjJ/kGcuAsZCCW8=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-TkeB939zV5VvqICFqJd/7uX+ydXyEQOJ3sYQbHbZhP0=";

  buildInputs = [
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-uXwefUV1NAKqwwPIWj4Slkx0c5b+RfLR3caTb42fc4M=";

  nativeBuildInputs = [
--- a/pkgs/by-name/al/alcom/package.nix
+++ b/pkgs/by-name/al/alcom/package.nix
@@ -77,7 +77,6 @@ rustPlatform.buildRustPackage {
  ++ dotnetSdk.packages
  ++ dotnetBuild.nugetDeps;

-  useFetchCargoVendor = true;
  cargoHash = "sha256-Ph6QZW21JYQJgrUecN+MklWuY51iKC2glPEdgxw+3r8=";
  buildAndTestSubdir = subdir;

--- a/pkgs/by-name/al/alejandra/package.nix
+++ b/pkgs/by-name/al/alejandra/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-Oi1n2ncF4/AWeY6X55o2FddIRICokbciqFYK64XorYk=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-IX4xp8llB7USpS/SSQ9L8+17hQk5nkXFP8NgFKVLqKU=";

  passthru.tests = {
--- a/pkgs/by-name/al/alexandria/package.nix
+++ b/pkgs/by-name/al/alexandria/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec {
  cargoRoot = "src-tauri";
  buildAndTestSubdir = "src-tauri";

-  useFetchCargoVendor = true;
  cargoHash = "sha256-VX/G4dF9DhlGfifp4xf9xkXli7BHFtKY2+HaMHqqPiA=";

  env = {
--- a/pkgs/by-name/al/alfis/package.nix
+++ b/pkgs/by-name/al/alfis/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-ettStNktSDZnYNN/IWqTB1Ou1g1QEGFabS4EatnDLaE=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-xe0YQCKnDV6M6IKWgljsuJ5ZevkdpxZDnNHAHKJyUec=";

  nativeBuildInputs = [
--- a/pkgs/by-name/al/alioth/package.nix
+++ b/pkgs/by-name/al/alioth/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
  # Checks use `debug_assert_eq!`
  checkType = "debug";

-  useFetchCargoVendor = true;
  cargoHash = "sha256-x2Abw/RVKpPx0EWyF3w0kywtd23A+NSNaHRVZ4oB1jI=";

  separateDebugInfo = true;
--- a/pkgs/by-name/al/alistral/package.nix
+++ b/pkgs/by-name/al/alistral/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
      --replace-fail 'rust-version = "1.85.0"' ""
  '';

-  useFetchCargoVendor = true;
  cargoHash = "sha256-lq+0R5g4MwVm8ESjKpz+aymjpqcaAE856XnBtYXYs8A=";

  env.RUSTC_BOOTSTRAP = 1;
--- a/pkgs/by-name/al/alvr/package.nix
+++ b/pkgs/by-name/al/alvr/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-h7/fuuolxbNkjUbqXZ7NTb1AEaDMFaGv/S05faO2HIc=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-A0ADPMhsREH1C/xpSxW4W2u4ziDrKRrQyY5kBDn//gQ=";

  patches = [
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -16,8 +16,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
    hash = "sha256-oY2hDOsws2WVQPKEFhGNPHITo26p/UZ5XzvRX7DoMyc=";
  };

-  useFetchCargoVendor = true;
-
  cargoHash = "sha256-xriK88OY6W1cOZVgiUPBIuItVHwEyFNq5Ywh367K6CU=";

  cargoBuildFlags = [
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
    ./fix_gnused_detection.patch
  ];

-  useFetchCargoVendor = true;
  cargoHash = "sha256-e5+L7Qgd6hyqT1Pb9X7bVtRr+xm428Z5J4hhsYNnGtU=";

  preConfigure = ''
--- a/pkgs/by-name/am/amber-secret/package.nix
+++ b/pkgs/by-name/am/amber-secret/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-Gwj0rnbKWifja5NJwskcrFpPoK15HjSQHXolGbgV784=";

  meta = {
--- a/pkgs/by-name/am/amber/package.nix
+++ b/pkgs/by-name/am/amber/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-UFuWD3phcKuayQITd85Sou4ygDBMzjrR39vWrlseYJQ=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
--- a/pkgs/by-name/am/amdgpu_top/package.nix
+++ b/pkgs/by-name/am/amdgpu_top/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-OvxrcVjngIW/fVIPX1XhbGImAeDifoLzlaZpXUYS9FA=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-na6pghbJ7Ek+rdbX4qJt2kv7C3AAqpgU/nYHaT9CQdo=";

  buildInputs = [
--- a/pkgs/by-name/am/amp/package.nix
+++ b/pkgs/by-name/am/amp/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {

  cargoPatches = [ ./update_time_crate.patch ];

-  useFetchCargoVendor = true;
  cargoHash = "sha256-4lYywaPTfoOHEYHy+h7HfWn+OaDdk166tQ8ZFx9XZK0=";

  nativeBuildInputs = [
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation {
  pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2025-03-19";
+  version = "0-unstable-2025-08-06";

  src = fetchFromGitHub {
    owner = "CachyOS";
    repo = "ananicy-rules";
-    rev = "99693d533a238c19915057f9cd5e541e6dbf57d9";
-    hash = "sha256-dTGfOw2Cj4q3AiQswcyl9bWUw1qInyqap43r4j+qS1Y=";
+    rev = "80576999c92af3eb88ea2008d4a18d29393ed579";
+    hash = "sha256-SdxOgm7purRxIU16RFuSgUzKIgi+7gJ2hJuCDVCjd54=";
  };

  dontConfigure = true;
--- a/pkgs/by-name/an/anchor/package.nix
+++ b/pkgs/by-name/an/anchor/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
    fetchSubmodules = true;
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-fjhLA+utQdgR75wg+/N4VwASW6+YBHglRPj14sPHmGA=";

  checkFlags = [
--- a/pkgs/by-name/an/andcli/package.nix
+++ b/pkgs/by-name/an/andcli/package.nix
@@ -6,7 +6,7 @@

 buildGoModule (finalAttrs: {
  pname = "andcli";
-  version = "2.2.0";
+  version = "2.3.0";

  subPackages = [ "cmd/andcli" ];

@@ -14,10 +14,10 @@ buildGoModule (finalAttrs: {
    owner = "tjblackheart";
    repo = "andcli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-wAatlCckSpa/BE4UVR/L6SkVmNyW2/cl//JOy62EaLc=";
+    hash = "sha256-umV0oJ4sySnZzrIpRuTP/fT8a9nhkC1shVEfVVRpEyI=";
  };

-  vendorHash = "sha256-/rmx9g7OfsZXr3zb1UfR1qLxdV2/ELzc/wXn0fJRzbE=";
+  vendorHash = "sha256-lzmkNxQUqktnl2Rpjgoa2yvAuGiMtVGNhiuF40how4o=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/an/anewer/package.nix
+++ b/pkgs/by-name/an/anewer/package.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-ojgm5LTOOhnGS7tUD1UUktviivp68u0c06gIJNhEO1E=";

  meta = with lib; {
--- a/pkgs/by-name/an/angle-grinder/package.nix
+++ b/pkgs/by-name/an/angle-grinder/package.nix
@@ -16,7 +16,6 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-1SZho04qJcNi84ZkDmxoVkLx9VJX04QINZQ6ZEoCq+c=";
  };

-  useFetchCargoVendor = true;
  cargoHash = "sha256-B7JFwFzE8ZvbTjCUZ6IEtjavPGkx3Nb9FMSPbNFqiuU=";

  passthru = {
--- a/pkgs/by-name/an/angryoxide/package.nix
+++ b/pkgs/by-name/an/angryoxide/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
    ln -s ${libwifi} libs/libwifi
  '';

-  useFetchCargoVendor = true;
  cargoHash = "sha256-mry4l0a7DZOWkrChU40OVRCBjKwI39cyZtvEBA5tro0=";

  nativeBuildInputs = [
--- a/Show More
+++ b/Show More