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/package-management | |
parent | e57fdf508a3b3c5492c266c5fff1b93ac2ea8557 (diff) | |
download | nixlib-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar nixlib-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar.gz nixlib-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar.bz2 nixlib-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar.lz nixlib-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar.xz nixlib-eb11feaa0b7971687d8004896df4f9618cf1dafe.tar.zst nixlib-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/package-management')
12 files changed, 36 insertions, 0 deletions
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 ] |