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/text | |
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/text')
-rw-r--r-- | pkgs/tools/text/amber/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/coloursum/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/diffr/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/mdbook/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/mdcat/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/ripgrep-all/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/ripgrep/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/ruplacer/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/sd/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/staccato/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/xsv/default.nix | 3 |
11 files changed, 33 insertions, 0 deletions
diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 935b6a60729..95ffc592bfe 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 5cac5a9f90e..27e349c9d93 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 c032d2e8b36..d93ffa9d090 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 b21523ce863..6f9f8577501 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 6b19251acf8..7a97a110381 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 df54724d384..62549ba9577 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 963ef99c68a..0c72467c00b 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 7fdde0b3a69..d868f9e2529 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 3b4a6edba0f..889dde46dea 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 a68d2266b43..cbd53c89823 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 cf44782432c..b81b7b10982 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; |