diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-11-13 17:45:09 +0100 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2017-11-13 17:45:16 +0100 |
| commit | bd8cd3eaed7f2d8da1af1eed62f2ea2966ed3e29 (patch) | |
| tree | 0c2b4c5cfc2674af06869205e1d5c366ee878f1f | |
| parent | 06fd65226e73816e730c1916edd49a6c4618f11b (diff) | |
Revert switching hello to fetchipfs, re: #18296
| -rw-r--r-- | pkgs/applications/misc/hello/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index c542fbde56eb..8a31c591b29b 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchipfs, fetchurl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "hello-2.10"; - src = fetchipfs { - url = "https://ftp.gnu.org/gnu/hello/hello-2.10.tar.gz"; - ipfs = "QmWyj65ak3wd8kG2EvPCXKd6Tij15m4SwJz6g2yG2rQ7w8"; - sha256 = "1im1gglfm4k10bh4mdaqzmx3lm3kivnsmxrvl6vyvmfqqzljq75l"; + src = fetchurl { + url = "mirror://gnu/hello/${name}.tar.gz"; + sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; }; doCheck = true; @@ -22,9 +21,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; - - passthru.srcTarball = fetchurl { - inherit (src) url; - sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; - }; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 008daf8d5224..c8cddf248ab9 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -216,7 +216,7 @@ rec { $CXX -v -o $out/bin/bar bar.cc $out/bin/bar - tar xvf ${hello.srcTarball} + tar xvf ${hello.src} cd hello-* ./configure --prefix=$out make |