Skip to content

Commit

Permalink
treewide: change fetchCargoTarball default to opt-out
Browse files Browse the repository at this point in the history
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 NixOS#79975 for details.
  • Loading branch information
bhipple authored and jonringer committed Feb 14, 2020
1 parent e57fdf5 commit eb11fea
Show file tree
Hide file tree
Showing 212 changed files with 632 additions and 1 deletion.
3 changes: 3 additions & 0 deletions pkgs/applications/accessibility/contrast/default.nix
Expand Up @@ -30,6 +30,9 @@ rustPlatform.buildRustPackage rec {
sha256 = "0rm705zrk9rfv31pwbqxrswi5v6vhnghxa8dgxjmcrh00l8dm6j9";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "06vgc89d93fhjcyy9d1v6lf8kr34pl5bbpwbv2jpfahpj9y84bgj";

nativeBuildInputs = [
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/audio/gnome-podcasts/default.nix
Expand Up @@ -32,6 +32,9 @@ rustPlatform.buildRustPackage rec {
sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "1h0n8zclb8a1b1ri83viiwwzlj3anm38m4cp38aqyf6q40qga35q";

nativeBuildInputs = [
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/audio/ncspot/default.nix
Expand Up @@ -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}" ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/audio/spotify-tui/default.nix
Expand Up @@ -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 ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/audio/spotifyd/default.nix
Expand Up @@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec {
sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "0kl8xl2qhzf8wb25ajw59frgym62lkg7p72d8z0xmkqjjcg2nyib";

cargoBuildFlags = [
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/blockchains/ethabi.nix
Expand Up @@ -13,6 +13,9 @@ buildRustPackage rec {
sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "0zkdai31jf8f5syklaxq43ydjvp5xclr8pd6y1q6vkwjz6z49hzm";

cargoBuildFlags = ["--features cli"];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/blockchains/parity/parity.nix
Expand Up @@ -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";
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/blockchains/polkadot/default.nix
Expand Up @@ -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 ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/blockchains/zcash/librustzcash/default.nix
Expand Up @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
sha256 = "0md0pp3k97iv7kfjpfkg14pjanhrql4vafa8ggbxpkajv1j4xldv";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "166v8cxlpfslbs5gljbh7wp0lxqakayw47ikxm9r9a39n7j36mq1";

installPhase = ''
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/editors/amp/default.nix
Expand Up @@ -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 ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/editors/neovim/gnvim/default.nix
Expand Up @@ -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 ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/gis/whitebox-tools/default.nix
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/graphics/rx/default.nix
Expand Up @@ -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 ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/misc/alacritty/default.nix
Expand Up @@ -62,6 +62,9 @@ in buildRustPackage rec {
sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "1kc9n10kb4j87x337pzl6wpi0qj5ib2mqmrjag2yld3138dag71n";

nativeBuildInputs = [
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/misc/pastel/default.nix
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/misc/pueue/default.nix
Expand Up @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {

nativeBuildInputs = [ installShellFiles ];

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "1y33n0dmrssv35l0apfq1mchyh92cfbzjarh0m8zb2nxwhvk7paw";

postInstall = ''
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/misc/rsclock/default.nix
Expand Up @@ -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; {
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/misc/taizen/default.nix
Expand Up @@ -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; {
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/misc/todiff/default.nix
Expand Up @@ -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";
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/misc/zola/default.nix
Expand Up @@ -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 ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/networking/cluster/click/default.nix
Expand Up @@ -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 ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/networking/cluster/habitat/default.nix
Expand Up @@ -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 ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/networking/dyndns/cfdyndns/default.nix
Expand Up @@ -12,6 +12,9 @@ buildRustPackage rec {
sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "1d7jpffkw2m2v37bfdqsl9sqwsl19cgglpa00lwy4ih09kzbc2n9";

buildInputs = [ makeWrapper openssl ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/networking/feedreaders/newsboat/default.nix
Expand Up @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
sha256 = "1bg2qjkzdawn4fnn0w7jhw1dk6191w8axnqra43z21pinfyim6da";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "0q0iqd8y9rph8pwild5i2kv00h217a166c88hxpmbrigq9w960lp";

postPatch = ''
Expand Down
Expand Up @@ -35,6 +35,9 @@ rustPlatform.buildRustPackage rec {
sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "1n9n4d057cz44sh1iy2hb2adplhnrhvr8drnp0v2h8yw73a5shvv";

nativeBuildInputs = [
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/networking/irc/tiny/default.nix
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/networking/p2p/synapse-bt/default.nix
Expand Up @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
sha256 = "01npv3zwia5d534zdwisd9xfng507adv4qkljf8z0zm0khqqn71a";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "0m4jigz6la3mf4yq217849ilcncb7d97mqyw2qicff4rbscdgf6h";

nativeBuildInputs = [ pkgconfig ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/science/logic/elan/default.nix
Expand Up @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/science/misc/rink/default.nix
Expand Up @@ -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 ];
Expand Down
Expand Up @@ -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; {
Expand Down
Expand Up @@ -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; {
Expand Down
Expand Up @@ -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; {
Expand Down
Expand Up @@ -26,6 +26,9 @@ buildRustPackage rec {
sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "10852131aizfw9j1yl4gz180h4gd8y5ymx3wmf5v9cmqiqxy8bgy";

nativeBuildInputs = [
Expand Down
Expand Up @@ -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 ];
Expand Down
Expand Up @@ -13,6 +13,9 @@ buildRustPackage rec {
sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "1ccipxifnm38315qigaq28hlzam2wr8q2p2dbcq96kar6pq377vf";

nativeBuildInputs = [ pkgconfig ];
Expand Down
Expand Up @@ -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 ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/version-management/git-backup/default.nix
Expand Up @@ -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 ];
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/version-management/pijul/default.nix
Expand Up @@ -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; {
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/version-management/sit/default.nix
Expand Up @@ -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; {
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/virtualization/cntr/default.nix
Expand Up @@ -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; {
Expand Down

0 comments on commit eb11fea

Please sign in to comment.