Skip to content

Commit

Permalink
bootstrap tools test: fixup after d71833e
Browse files Browse the repository at this point in the history
  • Loading branch information
vcunat committed Nov 11, 2017
1 parent 462b5e0 commit f6655ba
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion pkgs/applications/misc/hello/default.nix
@@ -1,4 +1,4 @@
{ stdenv, fetchipfs }:
{ stdenv, fetchipfs, fetchurl }:

stdenv.mkDerivation rec {
name = "hello-2.10";
Expand All @@ -22,4 +22,9 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all;
};

passthru.srcTarball = fetchurl {
inherit (src) url;
sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
};
}
2 changes: 1 addition & 1 deletion pkgs/stdenv/linux/make-bootstrap-tools.nix
Expand Up @@ -216,7 +216,7 @@ rec {
$CXX -v -o $out/bin/bar bar.cc
$out/bin/bar
tar xvf ${hello.src}
tar xvf ${hello.srcTarball}
cd hello-*
./configure --prefix=$out
make
Expand Down

3 comments on commit f6655ba

@matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented on f6655ba Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, this seems like an issue in fetchipfs.... Is there a way we can get fetchipfs to just give us a tarball like fetchurl? I hate to have to put .srcTarball everywhere now when people want to switch to ipfs. Maybe we should rollback hello to just use fetchurl?

Anyway this also needs to be done in darwin: see #31577

@vcunat
Copy link
Member Author

@vcunat vcunat commented on f6655ba Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I forgot Darwin. IPFS can store any file, but (I think) it was decided to store an uncompressed one, probably to benefit from deduplication on updates. Well, hello is a demo so nothing really matters there.

Anyway, as shown on tests around https://github.com/NixIPFS, IPFS isn't really suitable yet for distributing large amounts of data (e.g. what our binary cache does). Unfortunately.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on f6655ba Nov 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, reverted now.

Please sign in to comment.