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

* Write the list of mirrors to a file that we can reuse between

Browse Source 
fetchurl instantiations, instead of passing the mirrors to fetchurl
  instantiations via environment variables.  This makes the resulting
  store derivations (.drv files) much smaller, which in turn makes
  nix-env/nix-instantiate faster (4.8 -> 4.2 seconds on nix-env -qa
  --out-path).

svn path=/nixpkgs/trunk/; revision=12695
This commit is contained in:
Eelco Dolstra 2008-08-22 15:53:21 +00:00
parent 4457e49a90
commit eebb241519
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/fetchurl/builder.sh
View File

@ -1,5 +1,7 @@
source $stdenv/setup
source $mirrorsFile
if test -n "$showURLs"; then
header "downloading file $name with $outputHashAlgo hash $outputHash..."
fi

44
pkgs/build-support/fetchurl/default.nix
View File

@ -3,6 +3,30 @@
{stdenv, curl}: # Note that `curl' may be `null', in case of the native stdenv.
let
mirrors = import ./mirrors.nix;
# Write the list of mirrors to a file that we can reuse between
# fetchurl instantiations, instead of passing the mirrors to
# fetchurl instantiations via environment variables. This makes the
# resulting store derivations (.drv files) much smaller, which in
# turn makes nix-env/nix-instantiate faster.
mirrorsFile =
stdenv.mkDerivation ({
name = "mirrors-list";
builder = ./write-mirror-list.sh;
} // mirrors);
# Names of the master sites that are mirrored (i.e., "sourceforge",
# "gnu", etc.).
sites =
if builtins ? attrNames
then builtins.attrNames mirrors
else [] /* backwards compatibility */;
in
{ # URL to fetch.
url ? ""
@ -36,23 +60,16 @@ let
urls_ = if urls != [] then urls else [url];
mirrors = import ./mirrors.nix;
# Names of the master sites that are mirrored (i.e., "sourceforge",
# "gnu", etc.).
sites =
if builtins ? attrNames
then builtins.attrNames mirrors
else [] /* backwards compatibility */;
in
stdenv.mkDerivation ({
stdenv.mkDerivation {
name =
if showURLs then "urls"
else if name != "" then name
else baseNameOf (toString (builtins.head urls_));
builder = ./builder.sh;
buildInputs = [curl];
urls = urls_;
@ -82,10 +99,5 @@ stdenv.mkDerivation ({
"NIX_HASHED_MIRRORS"
] ++ (map (site: "NIX_MIRRORS_${site}") sites);
inherit showURLs;
inherit showURLs mirrorsFile;
}
# Pass the mirror locations to the builder.
// mirrors
)

4
pkgs/build-support/fetchurl/write-mirror-list.sh Normal file
View File

@ -0,0 +1,4 @@
source $stdenv/setup
# !!! this is kinda hacky.
set | grep '^[a-zA-Z]\+=.*://' > $out