JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert switching hello to fetchipfs, re: #18296

Browse Source
This commit is contained in:
Michael Raskin 2017-11-13 17:45:09 +01:00
parent 06fd65226e
commit bd8cd3eaed
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/misc/hello/default.nix
View File

@ -1,12 +1,11 @@
{ stdenv, fetchipfs, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hello-2.10"; name = "hello-2.10";
src = fetchipfs { src = fetchurl {
url = "https://ftp.gnu.org/gnu/hello/hello-2.10.tar.gz"; url = "mirror://gnu/hello/${name}.tar.gz";
ipfs = "QmWyj65ak3wd8kG2EvPCXKd6Tij15m4SwJz6g2yG2rQ7w8"; sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
sha256 = "1im1gglfm4k10bh4mdaqzmx3lm3kivnsmxrvl6vyvmfqqzljq75l";
}; };
doCheck = true; doCheck = true;
@ -22,9 +21,4 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.eelco ]; maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
passthru.srcTarball = fetchurl {
inherit (src) url;
sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
};
} }

2
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -216,7 +216,7 @@ rec {
$CXX -v -o $out/bin/bar bar.cc $CXX -v -o $out/bin/bar bar.cc
$out/bin/bar $out/bin/bar
tar xvf ${hello.srcTarball} tar xvf ${hello.src}
cd hello-* cd hello-*
./configure --prefix=$out ./configure --prefix=$out
make make