Revert switching hello to fetchipfs, re: #18296

NixOS · Nov 13, 2017 · bd8cd3e · bd8cd3e
1 parent 06fd652
commit bd8cd3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git 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
@@ -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