From eb11feaa0b7971687d8004896df4f9618cf1dafe Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 13 Feb 2020 21:00:26 -0500 Subject: [PATCH] treewide: change fetchCargoTarball default to opt-out Changes the default fetcher in the Rust Platform to be the newer `fetchCargoTarball`, and changes every application using the current default to instead opt out. This commit does not change any hashes or cause any rebuilds. Once integrated, we will start deleting the opt-outs and recomputing hashes. See #79975 for details. --- pkgs/applications/accessibility/contrast/default.nix | 3 +++ pkgs/applications/audio/gnome-podcasts/default.nix | 3 +++ pkgs/applications/audio/ncspot/default.nix | 3 +++ pkgs/applications/audio/spotify-tui/default.nix | 3 +++ pkgs/applications/audio/spotifyd/default.nix | 3 +++ pkgs/applications/blockchains/ethabi.nix | 3 +++ pkgs/applications/blockchains/parity/parity.nix | 3 +++ pkgs/applications/blockchains/polkadot/default.nix | 3 +++ pkgs/applications/blockchains/zcash/librustzcash/default.nix | 3 +++ pkgs/applications/editors/amp/default.nix | 3 +++ pkgs/applications/editors/neovim/gnvim/default.nix | 3 +++ pkgs/applications/gis/whitebox-tools/default.nix | 3 +++ pkgs/applications/graphics/rx/default.nix | 3 +++ pkgs/applications/misc/alacritty/default.nix | 3 +++ pkgs/applications/misc/pastel/default.nix | 3 +++ pkgs/applications/misc/pueue/default.nix | 3 +++ pkgs/applications/misc/rsclock/default.nix | 3 +++ pkgs/applications/misc/taizen/default.nix | 3 +++ pkgs/applications/misc/todiff/default.nix | 3 +++ pkgs/applications/misc/zola/default.nix | 3 +++ pkgs/applications/networking/cluster/click/default.nix | 3 +++ pkgs/applications/networking/cluster/habitat/default.nix | 3 +++ pkgs/applications/networking/dyndns/cfdyndns/default.nix | 3 +++ pkgs/applications/networking/feedreaders/newsboat/default.nix | 3 +++ .../networking/instant-messengers/fractal/default.nix | 3 +++ pkgs/applications/networking/irc/tiny/default.nix | 3 +++ pkgs/applications/networking/p2p/synapse-bt/default.nix | 3 +++ pkgs/applications/science/logic/elan/default.nix | 3 +++ pkgs/applications/science/misc/rink/default.nix | 3 +++ .../version-management/git-and-tools/delta/default.nix | 3 +++ .../version-management/git-and-tools/git-absorb/default.nix | 3 +++ .../git-and-tools/git-codeowners/default.nix | 3 +++ .../version-management/git-and-tools/git-dit/default.nix | 3 +++ .../version-management/git-and-tools/git-gone/default.nix | 3 +++ .../version-management/git-and-tools/git-ignore/default.nix | 3 +++ .../git-and-tools/git-interactive-rebase-tool/default.nix | 3 +++ pkgs/applications/version-management/git-backup/default.nix | 3 +++ pkgs/applications/version-management/pijul/default.nix | 3 +++ pkgs/applications/version-management/sit/default.nix | 3 +++ pkgs/applications/virtualization/cntr/default.nix | 3 +++ pkgs/applications/virtualization/crosvm/default.nix | 3 +++ pkgs/applications/virtualization/railcar/default.nix | 3 +++ pkgs/applications/window-managers/dwm/dwm-status.nix | 3 +++ pkgs/applications/window-managers/i3/status-rust.nix | 3 +++ pkgs/applications/window-managers/i3/wmfocus.nix | 3 +++ pkgs/applications/window-managers/leftwm/default.nix | 3 +++ pkgs/applications/window-managers/wtftw/default.nix | 3 +++ pkgs/build-support/rust/default.nix | 2 +- pkgs/development/compilers/gleam/default.nix | 3 +++ pkgs/development/interpreters/evcxr/default.nix | 3 +++ pkgs/development/interpreters/wasm-gc/default.nix | 3 +++ pkgs/development/interpreters/wasmer/default.nix | 3 +++ pkgs/development/interpreters/wasmtime/default.nix | 3 +++ pkgs/development/misc/loc/default.nix | 3 +++ pkgs/development/tools/analysis/bingrep/default.nix | 3 +++ pkgs/development/tools/analysis/panopticon/default.nix | 3 +++ pkgs/development/tools/async/default.nix | 3 +++ pkgs/development/tools/cargo-flamegraph/default.nix | 3 +++ pkgs/development/tools/cargo-web/default.nix | 3 +++ pkgs/development/tools/chit/default.nix | 3 +++ pkgs/development/tools/clog-cli/default.nix | 3 +++ pkgs/development/tools/cloudflare-wrangler/default.nix | 3 +++ pkgs/development/tools/diesel-cli/default.nix | 3 +++ pkgs/development/tools/geckodriver/default.nix | 3 +++ pkgs/development/tools/gir/default.nix | 3 +++ pkgs/development/tools/git-series/default.nix | 3 +++ pkgs/development/tools/just/default.nix | 3 +++ pkgs/development/tools/misc/hydra-cli/default.nix | 3 +++ pkgs/development/tools/misc/sccache/default.nix | 3 +++ pkgs/development/tools/misc/texlab/default.nix | 3 +++ pkgs/development/tools/misc/tokei/default.nix | 3 +++ pkgs/development/tools/misc/wishbone-tool/default.nix | 3 +++ pkgs/development/tools/parinfer-rust/default.nix | 3 +++ pkgs/development/tools/parsing/tree-sitter/default.nix | 3 +++ pkgs/development/tools/pax-rs/default.nix | 3 +++ pkgs/development/tools/rnix-lsp/default.nix | 3 +++ pkgs/development/tools/rq/default.nix | 3 +++ pkgs/development/tools/rust/bindgen/default.nix | 3 +++ pkgs/development/tools/rust/cargo-asm/default.nix | 3 +++ pkgs/development/tools/rust/cargo-bloat/default.nix | 3 +++ pkgs/development/tools/rust/cargo-crev/default.nix | 3 +++ pkgs/development/tools/rust/cargo-expand/default.nix | 3 +++ pkgs/development/tools/rust/cargo-fuzz/default.nix | 3 +++ pkgs/development/tools/rust/cargo-geiger/default.nix | 3 +++ pkgs/development/tools/rust/cargo-generate/default.nix | 3 +++ pkgs/development/tools/rust/cargo-inspect/default.nix | 3 +++ pkgs/development/tools/rust/cargo-make/default.nix | 3 +++ pkgs/development/tools/rust/cargo-raze/default.nix | 3 +++ pkgs/development/tools/rust/cargo-sweep/default.nix | 3 +++ pkgs/development/tools/rust/cargo-udeps/default.nix | 3 +++ pkgs/development/tools/rust/cargo-watch/default.nix | 3 +++ pkgs/development/tools/rust/cargo-xbuild/default.nix | 3 +++ pkgs/development/tools/rust/cbindgen/default.nix | 3 +++ pkgs/development/tools/rust/maturin/default.nix | 3 +++ pkgs/development/tools/rust/racer/default.nix | 3 +++ pkgs/development/tools/rust/racerd/default.nix | 3 +++ pkgs/development/tools/rust/rainicorn/default.nix | 3 +++ pkgs/development/tools/rust/rustup/default.nix | 3 +++ pkgs/development/tools/rust/svd2rust/default.nix | 3 +++ pkgs/development/tools/scaff/default.nix | 3 +++ pkgs/development/tools/wasm-bindgen-cli/default.nix | 3 +++ pkgs/development/tools/wasm-pack/default.nix | 3 +++ pkgs/games/eidolon/default.nix | 3 +++ pkgs/games/ja2-stracciatella/default.nix | 1 + pkgs/games/system-syzygy/default.nix | 3 +++ pkgs/misc/uq/default.nix | 3 +++ pkgs/misc/vim-plugins/overrides.nix | 3 +++ pkgs/servers/monitoring/prometheus/wireguard-exporter.nix | 3 +++ pkgs/servers/routinator/default.nix | 3 +++ pkgs/servers/unpfs/default.nix | 3 +++ pkgs/servers/webmetro/default.nix | 3 +++ pkgs/shells/ion/default.nix | 3 +++ pkgs/shells/nushell/default.nix | 3 +++ pkgs/tools/X11/xidlehook/default.nix | 3 +++ pkgs/tools/admin/intecture/agent.nix | 3 +++ pkgs/tools/admin/intecture/auth.nix | 3 +++ pkgs/tools/admin/intecture/cli.nix | 3 +++ pkgs/tools/admin/procs/default.nix | 3 +++ pkgs/tools/backup/rdedup/default.nix | 3 +++ pkgs/tools/filesystems/btrfs-dedupe/default.nix | 3 +++ pkgs/tools/graphics/gifski/default.nix | 3 +++ pkgs/tools/graphics/oxipng/default.nix | 3 +++ pkgs/tools/graphics/shotgun/default.nix | 3 +++ pkgs/tools/graphics/svgbob/default.nix | 3 +++ pkgs/tools/graphics/svgcleaner/default.nix | 3 +++ pkgs/tools/graphics/viu/default.nix | 3 +++ pkgs/tools/misc/bat/default.nix | 3 +++ pkgs/tools/misc/diskus/default.nix | 3 +++ pkgs/tools/misc/dua/default.nix | 3 +++ pkgs/tools/misc/dust/default.nix | 3 +++ pkgs/tools/misc/eva/default.nix | 3 +++ pkgs/tools/misc/exa/default.nix | 3 +++ pkgs/tools/misc/fd/default.nix | 3 +++ pkgs/tools/misc/ffsend/default.nix | 3 +++ pkgs/tools/misc/fselect/default.nix | 3 +++ pkgs/tools/misc/heatseeker/default.nix | 3 +++ pkgs/tools/misc/hexyl/default.nix | 3 +++ pkgs/tools/misc/hyperfine/default.nix | 3 +++ pkgs/tools/misc/journaldriver/default.nix | 3 +++ pkgs/tools/misc/kak-lsp/default.nix | 3 +++ pkgs/tools/misc/licensor/default.nix | 3 +++ pkgs/tools/misc/loop/default.nix | 3 +++ pkgs/tools/misc/lorri/default.nix | 3 +++ pkgs/tools/misc/lsd/default.nix | 3 +++ pkgs/tools/misc/mcfly/default.nix | 3 +++ pkgs/tools/misc/miniserve/default.nix | 3 +++ pkgs/tools/misc/onefetch/default.nix | 3 +++ pkgs/tools/misc/parallel-rust/default.nix | 3 +++ pkgs/tools/misc/pazi/default.nix | 3 +++ pkgs/tools/misc/powerline-rs/default.nix | 3 +++ pkgs/tools/misc/shadowenv/default.nix | 3 +++ pkgs/tools/misc/shell-hist/default.nix | 3 +++ pkgs/tools/misc/silicon/default.nix | 3 +++ pkgs/tools/misc/skim/default.nix | 3 +++ pkgs/tools/misc/starship/default.nix | 3 +++ pkgs/tools/misc/tealdeer/default.nix | 3 +++ pkgs/tools/misc/tensorman/default.nix | 3 +++ pkgs/tools/misc/termplay/default.nix | 3 +++ pkgs/tools/misc/topgrade/default.nix | 3 +++ pkgs/tools/misc/uutils-coreutils/default.nix | 3 +++ pkgs/tools/misc/vdirsyncer/default.nix | 3 +++ pkgs/tools/misc/vector/default.nix | 3 +++ pkgs/tools/misc/vivid/default.nix | 3 +++ pkgs/tools/misc/void/default.nix | 3 +++ pkgs/tools/misc/watchexec/default.nix | 3 +++ pkgs/tools/misc/websocat/default.nix | 3 +++ pkgs/tools/misc/xprite-editor/default.nix | 3 +++ pkgs/tools/misc/xv/default.nix | 3 +++ pkgs/tools/networking/bandwhich/default.nix | 3 +++ pkgs/tools/networking/boringtun/default.nix | 3 +++ pkgs/tools/networking/bukubrow/default.nix | 3 +++ pkgs/tools/networking/findomain/default.nix | 3 +++ pkgs/tools/networking/gnirehtet/default.nix | 3 +++ pkgs/tools/networking/httplz/default.nix | 3 +++ pkgs/tools/networking/shadowsocks-rust/default.nix | 3 +++ pkgs/tools/networking/tdns-cli/default.nix | 3 +++ pkgs/tools/networking/tox-node/default.nix | 3 +++ pkgs/tools/nix/nixdoc/default.nix | 3 +++ pkgs/tools/nix/nixpkgs-fmt/default.nix | 3 +++ pkgs/tools/package-management/cargo-about/default.nix | 3 +++ pkgs/tools/package-management/cargo-audit/default.nix | 3 +++ pkgs/tools/package-management/cargo-deb/default.nix | 3 +++ pkgs/tools/package-management/cargo-deps/default.nix | 3 +++ pkgs/tools/package-management/cargo-edit/default.nix | 3 +++ pkgs/tools/package-management/cargo-graph/default.nix | 3 +++ pkgs/tools/package-management/cargo-license/default.nix | 3 +++ pkgs/tools/package-management/cargo-outdated/default.nix | 3 +++ pkgs/tools/package-management/cargo-release/default.nix | 3 +++ pkgs/tools/package-management/cargo-tree/default.nix | 3 +++ pkgs/tools/package-management/emplace/default.nix | 3 +++ pkgs/tools/package-management/nix-index/default.nix | 3 +++ pkgs/tools/security/b3sum/default.nix | 3 +++ pkgs/tools/security/bitwarden_rs/default.nix | 3 +++ pkgs/tools/security/jwt-cli/default.nix | 3 +++ pkgs/tools/security/rage/default.nix | 3 +++ pkgs/tools/security/ripasso/cursive.nix | 3 +++ pkgs/tools/security/sequoia/default.nix | 3 +++ pkgs/tools/system/mq-cli/default.nix | 3 +++ pkgs/tools/system/ytop/default.nix | 3 +++ pkgs/tools/text/amber/default.nix | 3 +++ pkgs/tools/text/coloursum/default.nix | 3 +++ pkgs/tools/text/diffr/default.nix | 3 +++ pkgs/tools/text/mdbook/default.nix | 3 +++ pkgs/tools/text/mdcat/default.nix | 3 +++ pkgs/tools/text/ripgrep-all/default.nix | 3 +++ pkgs/tools/text/ripgrep/default.nix | 3 +++ pkgs/tools/text/ruplacer/default.nix | 3 +++ pkgs/tools/text/sd/default.nix | 3 +++ pkgs/tools/text/staccato/default.nix | 3 +++ pkgs/tools/text/xsv/default.nix | 3 +++ pkgs/tools/typesetting/tectonic/default.nix | 3 +++ pkgs/tools/video/rav1e/default.nix | 3 +++ 212 files changed, 632 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 3e03cf2da730..ebd0a7a44a6c 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -30,6 +30,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0rm705zrk9rfv31pwbqxrswi5v6vhnghxa8dgxjmcrh00l8dm6j9"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "06vgc89d93fhjcyy9d1v6lf8kr34pl5bbpwbv2jpfahpj9y84bgj"; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 7a44ebe67694..c28754e471a9 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -32,6 +32,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1h0n8zclb8a1b1ri83viiwwzlj3anm38m4cp38aqyf6q40qga35q"; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 5bf091adbdf9..1f9ee8ae334f 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec { sha256 = "10jp2yh8jlvdwh297658q9fi3i62vwsbd9fbwjsir7s1c9bgdy8k"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1gw8wvms1ry2shvm3c79wp5nkpc39409af4qfm5hd4wgz2grh8d2"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index fc630e78078f..e4d6c6c42ffe 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0gp7xb63icraqg7f0j91q474acph3ligzak2k8qqr9cqbgg509f4"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1364z9jz3mnba3pii5h7imqlwlvbp146pcd5q8w61lsmdr2iyha2"; nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 30cedfa8bb8f..bc410a39319b 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec { sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0kl8xl2qhzf8wb25ajw59frgym62lkg7p72d8z0xmkqjjcg2nyib"; cargoBuildFlags = [ diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix index 5bc81a6daf66..9949b5414bae 100644 --- a/pkgs/applications/blockchains/ethabi.nix +++ b/pkgs/applications/blockchains/ethabi.nix @@ -13,6 +13,9 @@ buildRustPackage rec { sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0zkdai31jf8f5syklaxq43ydjvp5xclr8pd6y1q6vkwjz6z49hzm"; cargoBuildFlags = ["--features cli"]; diff --git a/pkgs/applications/blockchains/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix index 7f28d97bf81a..6937d6efb099 100644 --- a/pkgs/applications/blockchains/parity/parity.nix +++ b/pkgs/applications/blockchains/parity/parity.nix @@ -17,6 +17,9 @@ rustPlatform.buildRustPackage { pname = "parity"; inherit version; inherit cargoSha256; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + src = fetchFromGitHub { owner = "paritytech"; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index b50b14258ccc..cf83be9b50dc 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -16,6 +16,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0gc3w0cwdyk8f7cgpp9sfawczk3n6wd7q0nhfvk87sry71b8vvwq"; buildInputs = [ pkgconfig openssl openssl.dev ]; diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 31703f8fb2a5..5032594468e7 100644 --- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0md0pp3k97iv7kfjpfkg14pjanhrql4vafa8ggbxpkajv1j4xldv"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "166v8cxlpfslbs5gljbh7wp0lxqakayw47ikxm9r9a39n7j36mq1"; installPhase = '' diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 6db7cbed25bd..e4248e32447c 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0jhxyl27nwp7rp0lc3kic69g8x55d0azrwlwwhz3z74icqa8f03j"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0rk5c8knx8swqzmj7wd18hq2h5ndkzvcbq4lzggpavkk01a8hlb1"; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index 764d7004940d..a9b2abd0cb3b 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "00r5jf5qdw02vcv3522qqrnwj14mip0l58prcncbvyg4pxlm2rb2"; buildInputs = [ gtk webkitgtk ]; diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 84d7f3ddb499..1ee1d3376db3 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1y3vk8bzsaisx7wrncjxcqdh355f2wk4n59vq5qgj37fph2zpy7f"; # failures: structures::polyline::test::test_polyline_split diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index 3093fa107d6b..51d03831e32b 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -16,6 +16,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1n5s7v2z13550gkqz7w6dw62jdy60wdi8w1lfa23609b4yhg4w94"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "173jfjvdag97f6jvfg366hjk9v3cz301cbzpcahy51rbf1cip1w1"; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 7d4f0614d8bc..34d2b510a03a 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -62,6 +62,9 @@ in buildRustPackage rec { sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1kc9n10kb4j87x337pzl6wpi0qj5ib2mqmrjag2yld3138dag71n"; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 8499ad0880c0..426c5162500d 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1pfhwqj9kxm9p0mpdw7qyvivgby2bmah05kavf0a5zhzvq4v4sg0"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 762d1d6d15cb..e283a5381e76 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1y33n0dmrssv35l0apfq1mchyh92cfbzjarh0m8zb2nxwhvk7paw"; postInstall = '' diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index 137ec920f750..a66f4c9a2cf0 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "03mhlp5hi3nlybb9dkwf1gxgsg056mjq2zsxnb5qh8pdxw7fmdxk"; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index 8d58c8887481..1eb4123a4cc0 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0h8ybhb17pqhhfjcmq1l70kp8g1yyq38228lcf86byk3r2ar2rkg"; meta = with lib; { diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 93f233a4f925..d4321e3b88e3 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0xn5p71qk0ahd2drklja16xwv7zw0797kkzpiv563kffzvd1p8id"; checkPhase = "cargo test --features=integration_tests"; diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 178be4911693..be00070d2a50 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "03rwf5l1l3ap03qi0xqcxsbyvpg3cqmr50j8ql6c5v55xl0ki9w8"; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index f4d6fce3545e..dd5deff294a0 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -13,6 +13,9 @@ buildRustPackage rec { sha256 = "18mpzvvww2g6y2d3m8wcfajzdshagihn59k03xvcknd5d8zxagl3"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0298x7wkr4j1l5flmv5vhl1ay8icvh4dlhsh4xi8fd3p8jl9jpqv"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 9bf801ee93d7..31184bd68ff5 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -14,6 +14,9 @@ buildRustPackage rec { sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9p0"; buildInputs = [ libsodium libarchive openssl ]; diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index 640421bef8f5..e5b3e1d52f43 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -12,6 +12,9 @@ buildRustPackage rec { sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1d7jpffkw2m2v37bfdqsl9sqwsl19cgglpa00lwy4ih09kzbc2n9"; buildInputs = [ makeWrapper openssl ]; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index e01e4c4fc44f..f567dabf5a66 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1bg2qjkzdawn4fnn0w7jhw1dk6191w8axnqra43z21pinfyim6da"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0q0iqd8y9rph8pwild5i2kv00h217a166c88hxpmbrigq9w960lp"; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 052a626531b4..9e052c101ad3 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -35,6 +35,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1n9n4d057cz44sh1iy2hb2adplhnrhvr8drnp0v2h8yw73a5shvv"; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 7967bdcc9c4e..4fbbbfd140fb 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -19,6 +19,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1m57xsrc7lzkrm8k1wh3yx3in5bhd0qjzygxdwr8lvigpsiy5caa"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1vj6whnx8gd5r66zric9163ddlqc4al4azj0dvhv5sq0r33871kv"; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index f3c7f8ccf18a..51ab54b10f92 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "01npv3zwia5d534zdwisd9xfng507adv4qkljf8z0zm0khqqn71a"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0m4jigz6la3mf4yq217849ilcncb7d97mqyw2qicff4rbscdgf6h"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index e9ef16b2392b..2ac7c208a5f1 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -4,6 +4,9 @@ rustPlatform.buildRustPackage rec { pname = "elan"; version = "0.7.5"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0q0xlvyyf88dbz43r7kk9v8rrp6hj0nl5i2i9mg6ibk2gphgdv6v"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index dad1d245b10a..4c759308a5c6 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0q2g1hkqyzq9lsas4fhsbpk3jn5hikchh6i1jf9c08ca2xm136c2"; buildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index df2ca22132e4..36ce0a484b3e 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "01jiqizg1ywvrrwhqzfqzbaqrzyfaqm66sixas0mpyzmd6cdwmh6"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1zmk70hccrxn1gdr1bksnvh6sa2h4518s0ni8k2ihxi4ld1ch5p2"; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 169315d1e2ef..f07e05e23e2e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1khplyglavsidh13nnq9y5rxd5w89ail08wgzn29a5m03zir1yfd"; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix index 418cf2e5866f..635393b1deb0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix @@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1k5gxbjv4a8l5y9rm0n4vwzlwp4hk1rb59v0wvcirmj0p7hpw9x9"; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 77fc04281153..571125ee1134 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -26,6 +26,9 @@ buildRustPackage rec { sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "10852131aizfw9j1yl4gz180h4gd8y5ymx3wmf5v9cmqiqxy8bgy"; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 618526843870..54f7e935ea33 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1s3v5p6qgz74sh34gvajf453fsgl13sds4v8hz8c6ivipz4hpby2"; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 99be85e09b1e..e50efb5c6b7d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -13,6 +13,9 @@ buildRustPackage rec { sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1ccipxifnm38315qigaq28hlzam2wr8q2p2dbcq96kar6pq377vf"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 7635a96eca5e..1e343cdb1800 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "002kr52vlpv1rhnxki29xflpmgk6bszrw0dsxcc34kyal0593ajk"; buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix index 9d05fb830313..51ae994b43bb 100644 --- a/pkgs/applications/version-management/git-backup/default.nix +++ b/pkgs/applications/version-management/git-backup/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0h31j8clvk4gkw4mgva9p0ypf26zhf7f0y564fdmzyw6rsz9wzcj"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1vfyhfdy5ks9zs9sy61ck9459w86hn9v6jqcar7rib82bclzr1mx"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 32222c12c7cc..c2df8c971b0e 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -45,6 +45,9 @@ in rustPlatform.buildRustPackage rec { doCheck = false; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k"; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index a225c23ceebc..0a1f4c72da6f 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec { export HOME=$(mktemp -d) ''; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0kijx7s7zh6yisrsjz213h9x5jx43ixr44vy5rb3wwbn9dgsr528"; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 698f6df0673a..c5bbab39643f 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx"; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 5035b65f9818..091ea0fa1c54 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -53,6 +53,9 @@ in ./default-seccomp-policy-dir.diff ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1d7y07wkliy5qnlyx5zj6ni39avhs3s48sqgvwxm5g5zrahg2a85"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix index bce254061421..8dd3c270b23d 100644 --- a/pkgs/applications/virtualization/railcar/default.nix +++ b/pkgs/applications/virtualization/railcar/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1k4y37x783fsd8li17k56vlx5ziwmrz167a0w5mcb9sgyd2kc19a"; buildInputs = [ libseccomp ]; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index ecd792f74e78..9507ada40114 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz"; postInstall = lib.optionalString (bins != []) '' diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 208764c0adcb..1899be9a038a 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0va6ny1v7lk30hhx4i5qyk9fwg3apy2nmh6kbmxhcf0rs5449ikg"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "099hn0pm9ppply3m3dwns3f5p43rdag2d3niaj8jyc1mnavviwjv"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index b0012c587f6a..677108e2163c 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0jx0h2zyghs3bp4sg8f3vk5rkyprz2dqfqs0v72vmkp3cvgzxbvs"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1xmc28ns59jcmnv17102s2084baxqdvi0ibbyqwb108385qnixzf"; nativeBuildInputs = [ python3 pkgconfig ]; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 29e33bca9143..25a219c2be42 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -23,6 +23,9 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" ''; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0mpvfix7bvc84vanha474l4gaq97ac1zy5l77z83m9jg0246yxd6"; # patch wrong version in Cargo.lock diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix index 36ca00b776bb..febe16dd349f 100644 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -9,6 +9,9 @@ rustPlatform.buildRustPackage { sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "18lb24k71sndklbwwhbv8jglj2d4y9mdk07l60wsvn5m2jbnpckk"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index ac0a8d3ae464..da4d69e1c9ed 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -17,7 +17,7 @@ # Please set to true on any Rust package updates. Once all packages set this # to true, we will delete and make it the default. For details, see the Rust # section on the manual and ./README.md. -, legacyCargoFetcher ? true +, legacyCargoFetcher ? false , buildType ? "release" , meta ? {} , target ? null diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index beef0ce03d91..0af8a6cd42dd 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0zfdsnrnxplvi4f92l7sqdp5yk5p738ra64m41izlcilkwj1j3vp"; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 168b012efcc1..6aa7897c95b8 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0vkcis06gwsqfwvrl8xcf74mfcs6j77b9fhcz5rrh77mwl7ixsdc"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "04wffj2y9pqyk0x3y6ghp06pggmxnk2h245iabqq0mpwx36fd8b6"; nativeBuildInputs = [ pkgconfig makeWrapper cmake ]; diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix index 44ac11be5400..585a90c505bb 100644 --- a/pkgs/development/interpreters/wasm-gc/default.nix +++ b/pkgs/development/interpreters/wasm-gc/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "073dnn80sl4adh7vi6q9sx2vkmy27gxy7ysxz17iz12p7pfcagm2"; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 7c270e5fb447..5fb60fd9bdb6 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -18,6 +18,9 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1yp7kandh5hh8hkzlmqpj05vwgr5v4nil8blf3scbppg865qk3rq"; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index c978f023936b..08d583c54b43 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "08b3rbnl7qwyfbwaqcb7z84sh0h94v18v6557hrf0dlil414v54i"; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 557d6f176097..78a89baeafbb 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -13,6 +13,9 @@ buildRustPackage rec { sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "06iqzpg5jz1xd2amajvlf7yaz9kr3q2ipbhx71whvv9mwplmxmbi"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index 2367e197f849..b2d3a46e621a 100644 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1xig3lrw0jdaxibzirqnm50l8nj4si9pa9w0jypmyhf1lr6yzd0g"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1fsp1ycfswrzldwnjw5cdwi809fd37pwshvrpf7sp0wmzx2bqhgm"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 250002a16b76..87512355b851 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -24,6 +24,9 @@ rustPlatform.buildRustPackage rec { git ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1fsxd7yzb38h1d52yyz7kj1v0riycjydb1b1bn1zkhgwm5sm2kbs"; doCheck = false; diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix index 1b06d8e1adcc..65c1a0fa78d0 100644 --- a/pkgs/development/tools/async/default.nix +++ b/pkgs/development/tools/async/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "19ypflbayi5l0mb8yw7w0a4bq9a3w8nl9jsxapp9m3xggzmsvrxx"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1qf52xsd15rj8y9w65zyab7akvzry76k1d4gxvxlz7ph3sl7jl3y"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix index 9d25d7cf3542..836e3adebe30 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/cargo-flamegraph/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1avjq36wnm0gd5zkkv1c8hj8j51ah1prlifadjhpaf788rsng9w1"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1kmxpzgv24hf66gzyapxy48gzwqi0p0jvzv829sfdlp00qgj1kp4"; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index 7ed75d3f6e69..7e84baba0dda 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1cbyy9rc33f69hbs0ff00v0v3p92f3lqq8ma5aqid5dm6d8l2dx5"; nativeBuildInputs = [ openssl perl pkgconfig ]; diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index e939ddb1334e..965f12002354 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -15,6 +15,9 @@ buildRustPackage rec { sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0k6z69a09ps55w2rdgnf92yscw6rlbcpb4q9yf3rsav15pgpqvw8"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ]; diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 12289cbb68aa..696a0264767c 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -13,6 +13,9 @@ buildRustPackage rec { sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1i1aq7bwkx8sqrlpxq24ldh908j72lwi2r3sg9zaz5p8xq1xgq6p"; meta = { diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix index efca438ada36..372de27ec59a 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1agl1cg34iklvniygrkq8dqsampvg17d3nsm0dcr6c3n5rj09gbi"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0c2g6yghwqjy21yfdcri4v9aqizd06ww3zx2snns51gnqqk8r57k"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 0fdd026d875f..d2888dc616a6 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -37,6 +37,9 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ]; cargoPatches = [ ./cargo-lock.patch ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0xlcskddhy7xsiwj54gmn1xlgkfxb4dwrys7rbamfz1h8aa6ixjx"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 9f0de971d1bd..1120d5dc68da 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage { }); cargoPatches = [ ./cargo-lock.patch ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "07w5lmvm5w6id0qikcs968n0c69bb6fav63l66bskxcjva67d6dy"; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index b8dbda2a1f82..90acfce1ecb1 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1kn5kgdma9j6dwpmv6jmydak7ajlgdkw9sfkh3q7h8c2a8yikvxr"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1ybd9h2f13fxmnkzbacd39rcyzjcjd2ra52y8kncg1s0dc0m8rjb"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 0a7c9e7ebe13..e94f1f1e14ac 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -15,6 +15,9 @@ buildRustPackage rec { sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "16qjbvppc01yxk8x9jk7gs8jaag5nkfl30j3lyv3dc27vv9mckjv"; cargoPatches = [ diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 7628bd9558ac..20f854619467 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0a4bml9nxvyh110a60l4lc11yr2ds5r8d3iplslccrkq1ka96av9"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0dbgjc21q0zaadsjvq3s6y6f4dmsybxb6g2sg8w2d3phkm9j921z"; checkInputs = [ coreutils bash dash ]; diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 79ef81d09e1c..796fcbafd69b 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "11y82np52f7lgfzhzs24kkawcfzzc6070x4rj5d6iv5csf6c03ny"; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 16a3f9557d28..fd3c8ec1ec8f 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec { rev = version; sha256 = "1yd3rfp032crwlmfn2p3z12f67q7bxm78fhvdlc7azm2a4hkif4k"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1bkglgrasyjyzjj9mwm32d3g3mg5yv74jj3zl7jf20dlq3rg3fh6"; cargoBuildFlags = [ "--features=all" ]; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 748ec8e2b68b..d98a4018867f 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec { sha256 = "12zfcvbihirh38xxzc8fbx293m4vsrhq6kh0qnhnhlrx75m09l9i"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "11labj3zf7ahbly1ylwliqhxzydbxz9w8z991575daj7a2nbw1q0"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 96eb98bbbeff..5db4ec125c09 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0wndjb4rvj8548wz0svwgnk94qlg5w2fv75fn2jgriq6fh6v43yg"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1lpa4xfh3bcm51amwxvkzpvmi4b2c4q5qwxxigcbzw76l7rqp2w9"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix index 6b2c944f7016..10de4a8157a6 100644 --- a/pkgs/development/tools/misc/wishbone-tool/default.nix +++ b/pkgs/development/tools/misc/wishbone-tool/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage { pname = "wishbone-tool"; inherit version; src = "${src}/wishbone-tool"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0pj8kf6s1c666p4kc6q1hlvaqm0lm9aqnsx5r034g1y8sxnnyri2"; buildInputs = [ libusb ]; diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index 0d7c806d2f46..47e7ab254817 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1k2kr1zlxx3w3kwb634kngzx8vl5iif1yr6zk2xh46gjwqb3223l"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0i5wy15w985nxwl4b6rzb06hchzjwph6ygzjkkmigm9diw9jcycn"; buildInputs = [ llvmPackages.libclang llvmPackages.clang ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 989107a2fbef..2ef86070fccd 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -80,6 +80,9 @@ in rustPlatform.buildRustPackage { }; inherit cargoSha256; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + meta = { homepage = "https://github.com/tree-sitter/tree-sitter"; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index f1bda9997ac6..f2fff99d1532 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -36,5 +36,8 @@ buildRustPackage rec { cp ${cargo-lock} $out/Cargo.lock ''; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "132a9vnlyp78zxiw5xrazadvx0scs7h2vbm5wz612dmh436mwnxg"; } diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix index 37a1955ce8b2..0cb402425046 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/rnix-lsp/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0fy620c34kxl27sd62x9mj0555bcdmnmbsxavmyiwb497z1m9wnn"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1wm5m7b6zr6wg1k59rmqis1zp9i2990p7y0ml852hxv34an7pp5d"; meta = with lib; { diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 78a8c7470df2..7394d7a645a6 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0z971fpyj4v5hjp6q4yxgxv069h9idkpkcixb14gxi7kpiswprvz"; buildInputs = [ llvmPackages.clang-unwrapped v8 ]; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 29f6fe5bd42d..db1ad9f0ea9d 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0zxqryqks9in9q7az0lrw8fq9wnc5p4yf6b1fxnzy2j6qhlw2c5c"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1wy5xdkf9ql2l9qavi0fh7hwjvly108f4l2m1k947412fyjwr7x7"; libclang = llvmPackages.libclang.lib; #for substituteAll diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 17103bae50a6..af9f2fa82ffc 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1k9mc29y4487ssf5whvr8xig7j4jh0rpcrhclp6siw8xamygijdm"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index 61d2c327d9bb..7e1dffc59760 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0h535fnmwm1ix08a3ifasppqcm7z4fiwf6kn32vhqqpn7x9vvl53"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1jc1lx0yk8galkyc4a67d39ywsfrgc2sjjsz08p47gpz7228d64w"; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 60d0c3504c87..03e052043314 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1v7m2yy54jm5mkg9n3wnba1j5ldw6mvk2sgbngx1q240wnc9vbnk"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "09kcvrhklbzjjyqikj9c53w24qy3f6v5hb16ib4fq1s2ia77rgl2"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index cec7a509dc12..5a4e6bb60521 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "043adbvc1slswwygibgghfl2ryry3ja1x3zjz39qqv63f81pd5id"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1dasyyy2nkr4i5nhlzlwij3b972h2a43j94kvlbc9kvnnb44aymn"; buildInputs = [ llvmPackages.libclang ] diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index c5b45b92c812..c61c7306b8c3 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0qy4xb7bxyw2x2ya7zmbkz48wxb69jcnvvj7021f1kyc6wdwcxs7"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1d42cmpg1yn1ql9isx26kxsxzf5rg6qw6j948skc5p054r0c9n3f"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 4437f6fb5a08..59e4402627cf 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0kvmjahyx5dcjhry2hkvcshi0lbgipfj0as74a3h3bllfvdfkkg0"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0aykhhxk416p237safmqh5dhwjgrhvgc6zikkmxi9rq567ypp914"; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index c49739165aa1..3fed52a2fafe 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "07hklya22ixklb44f3qp6yyh5d03a7rjcn0g76icqr36hvcjyjjh"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1rsk9j1ij53dz4gakxwdppgmv12lmyj0ihh9qypdbgskvyq3a2j9"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index 79b1214de659..ccd9fd3e4879 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1pxvcf991w0jfxdissvwal5slrx7vpk3rqkzwk4hxfv0mjiqxsg5"; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 34bcb42a4790..a622a822cfa1 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -24,6 +24,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "02bx8nz8kkr0l8m1b8nfc9576qx9is6s72x4ji3bzwimy76jvx3j"; # Some tests fail because they need network access. diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 142edbdaf113..48579e431064 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "source/impl"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "06rl7v0f1lgj9ii07fcnaxmhn28ckr03cpf5b93q8ripm5qh7my9"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 8707cd593fda..0b51b5b4f508 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0zwdrh4z5x79qs8cwmwh3phzy4brw0ggv2qyf6pylv99vha5acyf"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "09n0s275iskvg0n3gxbl47qfw00wfpvxyrf2iakkznyxjgbaxh4l"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index d05b7dd92218..54008300c512 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1wh8w5p9rb9cqgpmclaywfsz3ckfi9mw38hhg31w7hkgjmqalyj9"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0vb2qr03qv66mmxgs1d5fvs63cdfxaldlg7pilhmdzha1kgy7ib0"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 55721df22d7f..d0b20ffe3b25 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0l1aalb8ans7scljrza7akhi821jbpqgn6sa8kgd8sys83r93fkj"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0dlbln8nsvmrc9p99bl6yni57fravicias9gbv88fg7az904ilzz"; buildInputs = lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 11ee7b584df4..1877ac6e1223 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1haq8gv4k6qgihyjplf76589d2hbb1720g6yvwk88aksjxmqj4jm"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "011r5n68ay94dvfm37xpd9s8x086l6qsll74iw98hcvw3inxp1ws"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 0cb2eb602069..b97c9af088fd 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1x21g66gri6z9bnnfn7zmnf2lwdf5ing76pcmw0ilx4nzpvfhkg0"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "13fb8cdg6r0g5jb3vaznvv5aaywrnsl2yp00h4k8028vl8jwwr79"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 98a2b0b7e0bd..cb8d13b47d91 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -14,6 +14,9 @@ in rustPlatform.buildRustPackage rec { sha256 = "1siqd8k6grlbj9n1a75jq8px1pzvzpr2ph689g53rjngf1k44zqk"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "18678qzrzj044aj5nvyjn5hvby0i0x23gx26nhcf1nqcjn3fr32l"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 6dcaba237ae9..8839464e9f66 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0svvdkfqpk2rw0wxyrhkxy553k55lg7jxc0ly4w1195iwv14ad3y"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1qxg9r6wpv811fh2l889jm0ya96gsra00kqpyxh41fb7myvl2a4i"; buildInputs = [ makeWrapper ] diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 9457a08556af..c9b89abb0b07 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -17,6 +17,9 @@ buildRustPackage rec { doCheck = false; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "07130587drrdkrk7aqb8pl8i3p485qr6xh1m86630ydlnb9z6s6i"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix index 8a87bf5cf4df..94ee2a773f26 100644 --- a/pkgs/development/tools/rust/rainicorn/default.nix +++ b/pkgs/development/tools/rust/rainicorn/default.nix @@ -13,6 +13,9 @@ buildRustPackage rec { sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "07zsj12g4ff0cdb9pwz302vxvajr8g6nl3bpz4vdyi84csfvmahz"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index ffae05f1c744..b9a417e3b665 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0d7l3j8js16zgdx37kykavr343v65vchldz88j38jjyc43pcm2pg"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0kn3sq99sgsh8msignyb4vjllv0wf1crqaw7sqp3ggmlkrdq35sd"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 32cc66f76e92..fa457477b581 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -14,6 +14,9 @@ buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "03rfb8swxbcc9qm4mhxz5nm4b1gw7g7389wrdc91abxl4mw733ac"; # doc tests fail due to missing dependency diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix index d2f3733fbc5c..034376d337ce 100644 --- a/pkgs/development/tools/scaff/default.nix +++ b/pkgs/development/tools/scaff/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1s5v50205l2h33pccyafrjv3a6lpb62inhm8z81hkvx53bqifvd7"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "17rnzwlgrpr6isbajaccxa83msvvskxyqrc4cirgjmc7aqa0ilbh"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index e949da2cf7e8..9e83aae8a05c 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1kkvgqvn08pv0654b7s40vs92myzfiv965561mwfzhj8fx8f1y18"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index d8bdd3a4f72c..e91a08303947 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -18,6 +18,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1rqyfg6ajxxyfx87ar25nf5ck9hd0p12qgv98dicniqag8l4rvsr"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "095gk6lcck5864wjhrkhgnkxn9pzcg82xk5p94br7lmf15y9gc7j"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index ab3d9647dc85..f6bc271ec02b 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1887fjkk641cn6dpmyc5r3r2li61yw1nvfb0f2dp3169gycka15h"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index fa0720e51fd9..a08ce593012c 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -22,6 +22,7 @@ let name = "libstracciatella-${version}"; inherit version; src = libstracciatellaSrc; + legacyCargoFetcher = true; cargoSha256 = "0a1pc8wyvgmna0a5cbpv3mh0h4nzjxlm887ymcq00cy1ciq5nmj4"; doCheck = false; }; diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/games/system-syzygy/default.nix index ee47bd545066..34eb5315e749 100644 --- a/pkgs/games/system-syzygy/default.nix +++ b/pkgs/games/system-syzygy/default.nix @@ -23,6 +23,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ SDL2 ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "03724z33dqxbbrzpvz172qh45qrgnyb801algjdcm32v8xsx81qg"; postInstall = '' diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index 9dcfae41ea82..3f3ba291dd74 100755 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix @@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1s22v2wz5h3l5l447zl54bhdk6avkk2ycrbbpxcx1442lllbss4w"; meta = with lib; { diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 334df8e405ec..c115f9b1cd62 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -64,6 +64,9 @@ self: super: { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1w8g7pxwnjqp9zi47h4lz2mcg5daldsk5z72h8cjj750wng8a82c"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 7b92fc98e287..15802510da3c 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "18khym7ygj29w98zf6i1l5c2pz84zla2z34l5jnh595xvwfl94pc"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1bi9nr1dhyv322pq6fjrhs12h3wdak53mvwkbyim1hmrp62vky4m"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 7d91dc91a93e..906ee07f3556 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1hbqvjv9h1aghpyrl03w5f4j8gjy6n9lx83rmpsh5p7yd9ahwmf9"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "08lizhag7aqz3a59gaapsymn7sf9c6im1aw64n0r9a5advhwdh18"; meta = with stdenv.lib; { diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix index df6cfb70438f..dc228c25915d 100644 --- a/pkgs/servers/unpfs/default.nix +++ b/pkgs/servers/unpfs/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/example/unpfs"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1d33nwj3i333a6ji3r3037mgg553lc3wsawm0pz13kbvhjf336i8"; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index fc9876e10c25..4bf329fa5db1 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "03ncwj9bn21590phcnqyclclcird7rikbhxbwhg8i9i0nad81aaa"; meta = with stdenv.lib; { diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index 2010f34ef7e6..5886fdb5574d 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -13,6 +13,9 @@ buildRustPackage rec { sha256 = "0i0acl5nw254mw8dbfmb4792rr71is98a5wg32yylfnlrk7zlf8z"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1hs01b1rhbpafxlhw661k907rznqhcgyng85njkb99bg4lxwxaap"; meta = with stdenv.lib; { diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 00a27d1d7e37..6ed0857ec64d 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -24,6 +24,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0p1aykhkz5rixj6x0rskg77q31xw11mirvjhzp7n4nmbx3rfkagc"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0143mm9cdswd1azpzzpbfc5x7dy3ryywvq44mwkd6h1027n5idap"; nativeBuildInputs = [ pkg-config ] diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 67c6a594db75..49ebe825053c 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -16,6 +16,9 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0jdkcxvlw7s8pz1ka3d2w97356a2axvlwfgyh2dz7nmfzpjx64x0"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index f0945d7d778b..5f0e63341154 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -14,6 +14,9 @@ buildRustPackage rec { sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "093ipd8lg2ngnln55x5j40g2n8f3y8aysgz9rjn95a4npxrg4yxw"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index a3208bddabe9..4807cd89aac3 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -14,6 +14,9 @@ buildRustPackage rec { sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1rnhhb4mpf1j7c7a2pz4741hzbf2s2wb0bm25j049n64j49j3jq8"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index 90d65a3f2951..e5aa379e9c32 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -14,6 +14,9 @@ buildRustPackage rec { sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0dhrx6njfbd8w27ifk13g6s3ick579bhc4ijf54rfb9g6n8abafx"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 3b1e471a61ab..51ff06817cb8 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1dvwn991widribk563jn3461f1913bpga0yyfr5mnf4p4p8s59j6"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "11wv02nn6gp32zzcd6kmsh6ky0dzyk1qqhb5vxvmq2nxhxjlddwv"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index 29204417b224..bf4b2eb5351d 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "19j1xscchnckqq1nddx9nr9wxxv124ab40l4mdalqbkli4zd748j"; patches = [ diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix index e2538387d450..40a58e4227f3 100644 --- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix +++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix @@ -12,6 +12,9 @@ buildRustPackage rec { sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1sz3fswb76rnk7x4kpl1rnj2yxbhpx6q8kv8xxiqdr7qyphpi98r"; buildInputs = [ lzo zlib ]; diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index f5076801326c..d5656db29a7e 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0dl5725imb2a2s0fskdqlnh2207ryyi2v5gz37cr5mf6khz898p2"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0wngsd0pmmxlwzxmyp8pvphh1ijs5s9k1mkkv688xpc4b8w0z10j"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 0bbd7c21aa6e..1998ac67713c 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1cx026g1gdvk4qmnrbsmg46y2lizx0wqny25hhdjnh9pwzjc77mh"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1213mg7xhv9ymgm0xqdai5wgammz9n07whw2d42m83208k94zss3"; # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index 1ab47dfce2de..f5dba34202e4 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec { sha256 = "tJnF1X+NI1hP0J/n3rGy8TD/yIveqRPVlJvJvn0C7Do="; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "TL2WehcCwygLMVVrBHOX1HgVtDhgVsIgUeiadEjCj1o="; meta = with lib; { diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index 24736b8f0fff..68640d45bb21 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/svgbob_cli"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0mnq1s809f394x83gjv9zljr07c94k48zkrwxs6ibi19shgmrnnd"; # Test tries to build outdated examples diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 50aeae78fce8..e3cb3334b583 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1jpnqsln37kkxz98vj7gly3c2170v6zamd876nc9nfl9vns41s0f"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0kzrklw5nrzgvrfzq1mlnri06s19p4f3w38v39247baz2xd6j1n2"; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index 5de5b7e5be57..2ad33b8eef92 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0p4ibvv0qrflqdc2bi9rjn7yhn01ncxrpqpxmh8cbq67rbvm7jnx"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1h9dm2hhld2079dnx4x5nzkn3ivk6g5ijhv49jxnc200mx4mr1s5"; meta = with lib; { diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 6f5dc209b964..666fbd16a883 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0d7h0kn41w6wm4w63vjy2i7r19jkansfvfjn7vgh2gqh5m60kal2"; nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index 7b1e5ed6c0af..e83d13249d2f 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "07wsl1vw2aimgmrlri03pfcxv13klqxyvmmsbzgnq9sc9qzzy8gp"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 5ac8a661c9ac..3e5f12da0c39 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "08zgi2yiynb20l1f9rhly4a7zgqnr7lq3cr5vkmh1jnfs6z27dv6"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0hd46h4wwh81hnida0in3142884y8n6ygk7qm09i5wj52g73bivv"; meta = with lib; { diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index caa8451585e7..c0aa9180aedb 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1qbh9vgdh0xmh4c78fm0rd1sgb01n656p3cr4my7ymsy81ypx9y7"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "07ynz6y1z3rz84662d4rfl2sw1sx46a3k48z8dckr0b3fqs2zj6a"; doCheck = false; diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index bf43d11e5666..c720361b9cd1 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -4,6 +4,9 @@ rustPlatform.buildRustPackage rec { pname = "eva"; version = "0.2.7"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0n3xvlmp4l925nbz8lx6dr9yrrfh6z7b9z8wd6sli3a1dq26d6bg"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 0edd8a1b318f..cfb2c57f7c93 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -8,6 +8,9 @@ buildRustPackage rec { pname = "exa"; version = "0.9.0"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1hgjp23rjd90wyf0nq6d5akjxdfjlaps54dv23zgwjvkhw24fidf"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 76661c77f7be..f012aa120eb8 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "108p1p9bxhg4qzwfs6wqcakcvlpqw3w498jkz1vhmg6jp1mbmgdr"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0ylanxcb1vrhvm9h3lvq8nh28362wi5hjy0pqdv5lh40pphcknnz"; preFixup = '' diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index bb10bfe2ec76..6637f2d2a4ae 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -25,6 +25,9 @@ buildRustPackage rec { sha256 = "0yqigqh5vldzmp7wc1mxi5a4bxzm81xycx5h0ghak74vbjibps49"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1wwdnm6a5g4gpd1f89qii8v4f6mcfc1bif1v6mdlcbrpwax5skh4"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 0685ecf2440a..5c2e5e3da2d4 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1zccl60l557lhaaqb33myys4vp3jsnjqh3dxb22i46bff28s1w6c"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1496zjrkwj5bv08k575m064x0hfk0gpci0dmxvvspj6jf8f8bfm6"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index bf6740d7ee4a..d7944e55d325 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -13,6 +13,9 @@ buildRustPackage rec { sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0m3sxbz1iii31s30cnv1970i1mwfhl6gm19k8wv0n7zji30ayx07"; # some tests require a tty, this variable turns them off for Travis CI, diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index c00e47433c1a..b3cc549e018b 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1n2q5a6697bxvl0askywhad2x560cajv456gxihdqqmmyq2vf63h"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1wcpbqlglf9r0xhfjmyym8bnd4pgrsf9lrmb14hn1ml5zlshpd7p"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 9a27c4df7721..1dab11ec27e0 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0jx2lqhayp14c51dfvgmqrmmadyvxf0p4dsn770ndqpzv66rh6zb"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0sqmqfig40ragjx3jvwrng6hqz8l1zbmxzq470lk66x0gy4gziag"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index 56a1dc75a455..be199f7eb0af 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -3,6 +3,9 @@ rustPlatform.buildRustPackage rec { pname = "journaldriver"; version = "1.1.0"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0wmr0r54ar7gvhvhv76a49ap74lx8hl79bf73vc4f4xlj7hj303g"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index e3551b8f404f..55a3cf409eb1 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1b9v417g0z9q1sqgnms5vy740xggg4fcz0fdwbc4hfvfj6jkyaad"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0kzrrphlilnyl79yfmlvd6an8iyi8zcs0inwiq74z383lnbdpk7q"; buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix index 0913b9afbf5e..246684c6638b 100644 --- a/pkgs/tools/misc/licensor/default.nix +++ b/pkgs/tools/misc/licensor/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0zr8hcq7crmhrdhwcclc0nap68wvg5kqn5l93ha0vn9xgjy8z11p"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "042dplm0cdxkv73m5qlkc61h0x9fpzxn2b0c8gjx2hwvigcia139"; meta = with lib; { diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index ef7a3e3ada40..e3d8d15922d6 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -10,6 +10,9 @@ rustPlatform.buildRustPackage { sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "19x8n39yaa924naldw6fv7mq9qb500arkhwj9jz2fsbhz5nz607r"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index bbf71dec4d39..c4175f77d055 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -31,6 +31,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1kdpzbn3353yk7i65hll480fcy16wdvppdr6xgfh06x88xhim4mp"; doCheck = false; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 9b7ff7fd600a..ae3b57238506 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0fh5rz6slyjzz03bpjcl9gplk36vm7qcc0i0gvhsikwvw0cf3hym"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0377jbjkrrjss3w8xmjsjjynycpdk19grp20hffxschg4ryvniin"; preFixup = '' diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 7d85e709f73a..ee3d622a47a7 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec { install -Dm644 -t $out/share/mcfly mcfly.bash ''; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1bf65kagvhsi6lg8187ihi5j45hkq9d8v6j7rzmmfhngdzvcfr69"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 09640b30be90..0231d4df9239 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "06cxkkf3sf84prba65dymr1hg7mwizmsax0dlljh0lcmvlcpzi08"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "046xxxqcf1sdsi9dlilsn0nk36gyca20ck1a70ihj1k9kl7yj8sn"; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index e51a00dc7bd0..9c5ffc260ffb 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1sgpai3gx3w7w3ilmbnmzgdxdim6klkfiqaqxmffpyap6qgksfqs"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1phv06zf47bv5cmhypivljfiynrblha0kj13c5al9l0hd1xx749h"; buildInputs = with stdenv; diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix index c77ca56655ab..b4f939da3c96 100644 --- a/pkgs/tools/misc/parallel-rust/default.nix +++ b/pkgs/tools/misc/parallel-rust/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0ssawp06fidsppvfzk0balf4fink2vym9688r7k7x7pb2z7cvyqc"; patches = [ ./fix_cargo_lock_version.patch ]; diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index d3df890385f8..89ffdde2974e 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0nqcp54nwv4ic5jc3cgg15rh8dgkixfgkwb5q47rv8ding4cd0j5"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 309ccf8070b6..10844fc30c25 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0rqlxxl58dpfvm2idhi0vzinraf4bgiapmawiih9wxs599fnhm3y"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1vdx5nwj4qmkb3rdgnchd9xixc5pmhvskvn6dmqgm91s41p2al1p"; nativeBuildInputs = [ pkgconfig file perl cmake curl ]; diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index faa4220200cc..670d8c193825 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1s59ra99wcyyqz8gzly4qmcq5rh22c50c75cdi2kyajm7ghgryy9"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0s4p4mpz1p5v9hr4flxlzqvc1b3zbqr3nxp1nxjw39ng9g3hplpg"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/shell-hist/default.nix b/pkgs/tools/misc/shell-hist/default.nix index b44cbf100e8a..19f69655bbf9 100644 --- a/pkgs/tools/misc/shell-hist/default.nix +++ b/pkgs/tools/misc/shell-hist/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage { sha256 = "0kc128xnnp1d56if70vfv0w3qnwhljhbnvzwwb7hfm3x2m0vqrqf"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1nqnkzwqk879qy1261g1gds668xz6islhzq7chzhilaqpmvf6039"; meta = with lib; { diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index e25b6cfa2dfa..3bf8916f47c2 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -25,6 +25,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0j211qrkwgll7rm15dk4fcazmxkcqk2zah0qg2s3y0k7cx65bcxy"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "11b9i1aa36wc7mg2lsvmkiisl23mjkg02xcvlb7zdangwzbv13sq"; buildInputs = [ llvmPackages.libclang expat freetype ] diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 0c8e2da36df1..550db58895d0 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "vim" ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1dl530ac8i4wdw7lziskl7rhh3ak9ykcws3kpy64808kxg3b1jnz"; patchPhase = '' diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 1009b101d997..0c0820837f50 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -19,6 +19,9 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "05q527bd5q6a7kd03hwic4bynyc4sipyvi0bf2g2jqxzcsmswyyk"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index 547cb2d10759..1666d22626b0 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1v9wq4k7k4lmdz6xy6kabchjpbx9lds20yh6va87shypdh9iva29"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0y1y74fgxcv8a3cmyf30p6gg12r79ln7inir8scj88wbmwgkbxsp"; buildInputs = [ openssl cacert curl ] diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index 97912b3c5fa1..88d437e56af6 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ pkgconfig openssl ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1gh5w6zzrvjk60bqaf355fagijy723rvmqjh4laksd96pmzdfwn9"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix index dd045f1cfac4..7e5b0e7d7361 100644 --- a/pkgs/tools/misc/termplay/default.nix +++ b/pkgs/tools/misc/termplay/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = ["--features" "bin"]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "15i7qid91awlk74n823im1n6isqanf4vlcal90n1w9izyddzs9j0"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 5f992e017a9f..191d66a6de80 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0g9pb4f5skigyahv8kpx7wkvv625lvgnbqz6iq7j7wgixxf4nl1i"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1y85hl7xl60vsj3ivm6pyd6bvk39wqg25bqxfx00r9myha94iqmd"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 5aa9f8c34a47..6309cbc19612 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -14,6 +14,9 @@ rustPlatform.buildRustPackage { # too many impure/platform-dependent tests doCheck = false; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0qnpx2xhckb45q8cgn0xh31dg5k73hqp5mz5zg3micmg7as4b621"; makeFlags = diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 328c343ba702..2f8bb36990b7 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec { name = "${name}-native"; inherit src; sourceRoot = "source/rust"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y"; buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index f2fef36f8422..cdc3a90f3726 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -19,6 +19,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1bqp1ms8y91mpcmxlc8kyncigxq7spxq1ygy6gviz35zq1cqkwnr"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "01hynn8ccpwqrirr1bczqc7q7pqkzfjks2v6q4f32xbm50b31fky"; buildInputs = [ openssl pkgconfig protobuf rdkafka ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index a3df78abd25a..2f665f199587 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec { substituteInPlace src/main.rs --replace /usr/share $out/share ''; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "04xx26ngz7hx7bv5g01q9h6dqa96xkx0xm3jb0qk6c3hp6500zpn"; postInstall = '' diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index ec19ae5bd18e..7e570d21f7ae 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec { # The tests are long-running and not that useful doCheck = false; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "03g7155jpg8k1ymk95m8rlhlszkxyq0rv32966n4gk5yziijvk4k"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 9729f110bb74..26fc7107d41e 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "03s9nsss4895x4lp90y65jajavk8c2nj1jjnmx0vbbwl210ghlv1"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "07whi9w51ddh8s7v06c3k6n5q9gfx74rdkhgfysi180y2rgnbanj"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index f682bb3d2eba..003932551efd 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = [ "--features=ssl" ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "163kwpahrbb9v88kjkrc0jx2np3c068pspr8rqrm9cb8jyl2njrr"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix index e2615bef6ce1..af2fdc5e1995 100644 --- a/pkgs/tools/misc/xprite-editor/default.nix +++ b/pkgs/tools/misc/xprite-editor/default.nix @@ -29,6 +29,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config python3 ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0cd58888l7pjmghin31ha780yhs2pz67b10jysyasdw0a88m0dwy"; cargoBuildFlags = [ "--bin" "xprite-native" ]; diff --git a/pkgs/tools/misc/xv/default.nix b/pkgs/tools/misc/xv/default.nix index 8d8c2fa55b28..bbf966d1c1f3 100644 --- a/pkgs/tools/misc/xv/default.nix +++ b/pkgs/tools/misc/xv/default.nix @@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0x2yd21sr4wik3z22rknkx1fgb64j119ynjls919za8gd83zk81g"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0m69pcmnx3c3q7lgvbhxc8dl6lavv5ch4r6wg2bhdmapcmb4p7jq"; buildInputs = lib.optionals useNcurses [ ncurses ] diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 4203e0c5c823..39024ff462f9 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1c4lndrr7xndgp60zcdjqpciwibm9sjwwrd3921fyz4jg44g76zy"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1sa81570cvvpqgdcpnb08b0q4c6ap8a2wxfp2z336jzbv0zgv8a6"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index dfb13f2168b4..60a9469bced4 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1mijy51hd8c4as9g4ivpfxismc9m5m3nhibfvclh3wrlcmp1ha9c"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1gvmshwg9b486933vfgkg2r8nn6w6dyz42hqjy74p785fcg0v5hs"; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index e83e72cbfb44..eeb69417dc7f 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -18,6 +18,9 @@ in rustPlatform.buildRustPackage rec { sha256 = "1a3gqxj6d1shv3w0v9m8x2xr0bvcynchy778yqalxkc3x4vr0nbn"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "06nh99cvg3y4f98fs0j5bkidzq6fg46wk47z5jfzz5lf72ha54lk"; buildInputs = [ sqlite ]; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 3eb037d50a11..b7dd84fd43c0 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -18,6 +18,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1hqvs6h6cfimg0y6hggnmc0mlddajwmh3h36n160n6imq0lfixka"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0brkza04b38hcjjmqz4bkd8gj0n0mrh0p7427007f5xlnhj7hrn4"; nativeBuildInputs = [ installShellFiles perl ]; diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 06faa0640257..913d1c1a52b4 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -25,6 +25,9 @@ rustPlatform.buildRustPackage { sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl"; }; sourceRoot = "source/relay-rust"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1l1cirhmfkpa466vksynlhwggsfiahws7cpsxydrc414l415l283"; patchFlags = [ "-p2" ]; diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 55630d7814c2..c394f216e0f7 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1ajxfvj1pv6yq84zgrh7vjzghpb2y8qd5r09gzwdvww5rbj920fq"; postInstall = '' diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 2416ef23c8a3..d746d1f42b53 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0w7ysha46ml3j1i1knvll4pmqg291z8a2ypcy650m61dhrvkh2ng"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "18nlvqa9ha4vs9xb60hivhgcsqr69zsigfmqyig48slvwgqkbwda"; buildInputs = [ openssl libsodium ] diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 473ee8ace345..4ad924ee5b55 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0h41ws3jcxb90mhnznckfkfv0mpx6ykga7087bipbaw2fqhr7izd"; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index f47ccab45ea4..3b94c61a7131 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -31,6 +31,9 @@ buildRustPackage rec { doCheck = false; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1nv0630yb8k857n7km4bbgf41j747xdxv7xnc6a9746qpggmdbkh"; meta = with stdenv.lib; { diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 13b7ffd2af71..4f64750892a0 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1hy8w73fir4wnqx7zfvfqh7s24w95x9nkw55kmizvrwf0glw9m4n"; meta = with stdenv.lib; { diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index 946710b1fdde..eac8d1293d2a 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1iylldgyvrcarfigpbhicg6j6qyipfiqn7gybza7qajfzyprjqfa"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "04my7dlp76dxs1ydy2sbbca8sp3n62wzdxyc4afcmrg8anb0ghaf"; meta = with lib; { diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index 5d741e25fb9d..bee0ee7d3d88 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0bsay1vqi5b3z7qjwbkwx3ikmpjzc0kswbajm50xmcwlg8jrn420"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1mqicibpa9sxac8v2kk8vfvxcis2wkdkklia2pbspc0pz3h0c8if"; meta = with lib; { diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 1a60675080d8..2d9bb71c5694 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1977ykablfi4mc6j2iil0bxc6diy07vi5hm56xmqj3n37ziavf1m"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0zbnsq0cif0yppn8ygxhcsrshkbf1c801f8waqqb2d1rjsrhb93y"; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix index 1af8be3da44c..6672e31e3020 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0j64dcczxdr9zdch4a241d5adgipzz8sgbw00min9k3p8hbljd9n"; meta = with lib; { diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix index 8a43fb3cf11b..b5dafc544fbb 100644 --- a/pkgs/tools/package-management/cargo-deps/default.nix +++ b/pkgs/tools/package-management/cargo-deps/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "16181p7ghvy9mqippg1xi2cw7yxvicis8v6n39wly5qw05i57aw2"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1a9svdw1cgk6s7gqpsq3r25wxa2gr2xddqkc1cjk7hf6sk327cpv"; meta = with lib; { diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 25c9711c1a59..77753dc33492 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "16gpljbzk6cibry9ssnl22xbcsx2cr57mrs3x3n6cfmldbp6bhbr"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1cjpbfgbqzlfs5hck2j3d2v719fwandpnc7bdk4243j7j0k1ng9q"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/tools/package-management/cargo-graph/default.nix index 2fe89ccfa986..1f0b11ad9786 100644 --- a/pkgs/tools/package-management/cargo-graph/default.nix +++ b/pkgs/tools/package-management/cargo-graph/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0myg26cssmbakz53dl61lswsbaqnjqlbc30c2571pq8f7gvz2qv5"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1k4byg77s1iqhry96pl57mbsvd32sbnvf60dlbd62pvan39rispg"; meta = with lib; { diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix index f697c57d3e8c..e91f099da851 100644 --- a/pkgs/tools/package-management/cargo-license/default.nix +++ b/pkgs/tools/package-management/cargo-license/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./add-Cargo.lock.patch ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0ksxvbrx8d8d09i167mdrhz5m46nbr6l0vyn7xpdanmha31xiaz9"; meta = with lib; { diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 7d684d943b90..667a1a21a2d4 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1ywmrvkwwwwh99l4j8vc4cyk8qjd0jx8hn68yr2h31ya1bzcqbd1"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 3e3ba47be056..1e5d1fe3512a 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1w9w43i5br94vg5m4idabh67p4ffsx2lmc2g0ak2k961vl46wr0q"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "075fvvd4c8f3kz6i6ny835h6jpa3c1v3miwfwwrdyy49a85lzjyj"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix index 37d546adb9df..141ec8fd48a4 100644 --- a/pkgs/tools/package-management/cargo-tree/default.nix +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0wv5zgyx18fypdb4pmgzxvr2gb9w8vgv6aqir3dxhcvcgf2j5c3n"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "16r7zzkf87v67spahaprc25agwh6d3i0kg73vx8a6w7hgqlk0zwa"; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index bb361fd97c3a..6b39ed9d1c4e 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1y77cla6bgy8pjb21cawx7cb69hhri4r7gyjkhnjyiixkh945mwj"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "119llsc8m7qda2cjnd45ndml148z8074f76xygkz6fp3m1c2z3pw"; meta = with lib; { diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index b3a16633c1d9..f41dd715fcf4 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "06idjb5h5fahqklyxnss2zffrvvfbcw0hjh1mcrf1872s4x78ags"; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl curl ] diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index 4056c3b5b1b5..db5524ce365b 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/b3sum"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0qw7sr817lmj9xicc03cj1k49lwjwc1whllc7sj2g4c0nl2vndir"; verifyCargoDeps = false; diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 1b262581eb23..517de33fa88e 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -25,6 +25,9 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1v6n4aqhd5pyvvhlzhpmq7ykclfxw82wn2bg7n49b53d9p72jwq6"; cargoBuildFlags = [ featuresFlag ]; diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 4b9fefd18c36..06284c52f988 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1q6dqh8z6mhiksjrhi602cvq31jgc18pfbwf6mlm9gi1grpgm5dl"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0k3fla0zz2r66y5fvmbcdhjd2jq8md2sxgcjb3x8sipzqfv8bwi2"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index f9d648f04b10..088dfc6c5a1a 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1lfp9vyrk8880j7p5i73zja9dglvl1lvvh7286rwd1a9gbcj6grb"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "09dg43vba8hwivng2h70qmpxnijad171mf02vwjw0gqxk83ql28v"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index da850c6d9daa..f0e9cb8959dc 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -12,6 +12,9 @@ buildRustPackage rec { sha256 = "164da20j727p8l7hh37j2r8pai9sj402nhswvg0nrlgj53nr6083"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1vyhdbia7khh0ixim00knai5d270jl5a5crqik1qaz7bkwc02bsp"; cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 355cc77ec34b..1301a01e8c6d 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -18,6 +18,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1p17y6vsya8daglvl6yal3759x44dc062ah5vyra0k7dk82cc4pq"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1hbwx2d9j5ddqlvskqxk951g59nsyk5y5l7f9yg2cyqhkzfil7nr"; nativeBuildInputs = [ diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix index 930bf8382c64..f685259429d2 100644 --- a/pkgs/tools/system/mq-cli/default.nix +++ b/pkgs/tools/system/mq-cli/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "03ab6jbcgmbgg9hn7ihk8814sjwdmrr9p4xlll6nfdad4a7gq3yn"; meta = with lib; { diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix index b1677dadf9d3..8732bf88ad7a 100644 --- a/pkgs/tools/system/ytop/default.nix +++ b/pkgs/tools/system/ytop/default.nix @@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "11pcchwahcwdvmfwfs6j2zg23grlw538wfs90mvqy2mpccj7d3ys"; verifyCargoDeps = true; diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 935b6a607298..95ffc592bfe1 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0k70rk19hwdlhhqm91x12xcb8r09kzpijs0xwhplrwdh86qfxymx"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0hh3sgcdcp0llgf3i3dysrr3vry3fv3fzzf44ad1953d5mnyhvap"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index 5cac5a9f90e5..27e349c9d934 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1piz0l7qdcvjzfykm6rzqc8s1daxp3cj3923v9cmm41bc2v0p5q0"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "091flc5ymx0y43ld6bdmig5cy479b90bkmwv3yaysi5kpr28skvh"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index c032d2e8b361..d93ffa9d090e 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1fpcyl4kc4djfl6a2jlj56xqra42334vygz8n7614zgjpyxz3zx2"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1dddb3a547qnpm1vvrgffb3v9m8sh19hmhy0fg6xjqpm032lqx3v"; nativeBuildInputs = []; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index b21523ce863a..6f9f8577501e 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0gcrv54iswphzxxkmak1c7pmmpakiri6jk50j4bxrsplwjr76f7n"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "00grlxjz61vxinr18f28ga6610yjxcq48lr75wmyc5wq317j12fn"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 6b19251acf8e..7a97a110381b 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1kc434pa72n9xll2r4ddmd9xdwv3ls36cwsmdry392j41zmics51"; checkInputs = [ ansi2html ]; diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index df54724d3847..62549ba9577c 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0fxvnd8qflzvqz2181njdhpbr4wdvd1jc6lcw38c3pknk9h3ymq9"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1jcwipsb7sl65ky78cypl4qvjvxvv4sjlwcg1pirgmqikcyiiy2l"; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 963ef99c68a1..0c72467c00b2 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "17ldqr3asrdcsh4l29m3b5r37r5d0b3npq1lrgjmxb6vlx6a36qh"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index 7fdde0b3a694..d868f9e2529d 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0yj753d9wsnp4s5a71ph241jym5rfz3161a1v3qxfc4w23v86j1q"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1lzw4x40j25khf68x5srj8i05c11ls5y7km206vxn19vsy9ah4k9"; buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 3b4a6edba0ff..889dde46dead 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1vxljmd1vh245yhv095i3l44pk915zr2pix4v9r8pz2fynp2nnmj"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1shqphbpn3ib28hnyib7mh1i5q56nshj864jm209s8qggbp96wp1"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix index a68d2266b431..cbd53c898233 100644 --- a/pkgs/tools/text/staccato/default.nix +++ b/pkgs/tools/text/staccato/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1zbd1gx0ik2r7bavcid776j37g6rzd3f6cs94kq1qar4gyf1gqjm"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0h1822hba6lpv14y6hgn8qgh7p812b3kkf592ggr6yjlhqfh37n7"; meta = { diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index cf44782432c4..b81b7b109821 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1xlbszr9ccv924ww45lnc0qqb7nxj2cnc41480xbpvsdqsdrgbhs"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index c78e60996bb2..b6d8cb67c110 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0dycv135bkpf71iwlwh8rwwvn287d605nl7v8mjxlrsayiivdmn9"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0bkgh73kqcdv3j9hr3m13wrdhls3zrk7aii9shzbzl6rnp2ry1az"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 99a3e5ee6188..9d4f7b514a35 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -25,6 +25,9 @@ rustPlatform.buildRustPackage rec { ''; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "185jnmyirfhrv8bxvmwizf3lvq49sjj1696g3gflph31d8bfpb0c"; nativeBuildInputs = [ nasm ];