diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2020-02-13 21:00:26 -0500 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-02-13 22:41:37 -0800 |
commit | eb11feaa0b7971687d8004896df4f9618cf1dafe (patch) | |
tree | c6d1d220560348e964f533afbf3074776d092c51 /pkgs/tools/misc | |
parent | e57fdf508a3b3c5492c266c5fff1b93ac2ea8557 (diff) | |
download | nixpkgs-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar nixpkgs-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar.gz nixpkgs-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar.bz2 nixpkgs-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar.lz nixpkgs-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar.xz nixpkgs-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar.zst nixpkgs-eb11feaa0b7971687d8004896df4f9618cf1dafe.zip |
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.
Diffstat (limited to 'pkgs/tools/misc')
42 files changed, 126 insertions, 0 deletions
diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 6f5dc209b96..666fbd16a88 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 7b1e5ed6c0a..e83d13249d2 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 5ac8a661c9a..3e5f12da0c3 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 caa8451585e..c0aa9180aed 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 bf43d11e566..c720361b9cd 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 0edd8a1b318..cfb2c57f7c9 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 76661c77f7b..f012aa120eb 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 bb10bfe2ec7..6637f2d2a4a 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 0685ecf2440..5c2e5e3da2d 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 bf6740d7ee4..d7944e55d32 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 c00e47433c1..b3cc549e018 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 9a27c4df772..1dab11ec27e 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 56a1dc75a45..be199f7eb0a 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 e3551b8f404..55a3cf409eb 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 0913b9afbf5..246684c6638 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 ef7a3e3ada4..e3d8d15922d 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 bbf71dec4d3..c4175f77d05 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 9b7ff7fd600..ae3b5723850 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 7d85e709f73..ee3d622a47a 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 09640b30be9..0231d4df923 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 e51a00dc7bd..9c5ffc260ff 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 c77ca56655a..b4f939da3c9 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 d3df890385f..89ffdde2974 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 309ccf8070b..10844fc30c2 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 faa4220200c..670d8c19382 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 b44cbf100e8..19f69655bbf 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 e25b6cfa2df..3bf8916f47c 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 0c8e2da36df..550db58895d 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 1009b101d99..0c0820837f5 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 547cb2d1075..1666d22626b 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 97912b3c5fa..88d437e56af 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 dd045f1cfac..7e5b0e7d736 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 5f992e017a9..191d66a6de8 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 5aa9f8c34a4..6309cbc1961 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 328c343ba70..2f8bb36990b 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 f2fef36f842..cdc3a90f372 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 a3df78abd25..2f665f19958 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 ec19ae5bd18..7e570d21f7a 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 9729f110bb7..26fc7107d41 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 f682bb3d2eb..003932551ef 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 e2615bef6ce..af2fdc5e199 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 8d8c2fa55b2..bbf966d1c1f 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 ] |