aboutsummaryrefslogtreecommitdiff
path: root/corepkgs
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2005-04-07 14:01:51 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2005-04-07 14:01:51 +0000
commitc815aff21b668f5fe7bbd04086a988df51281840 (patch)
tree8532d7fab1ab916c99d9034cfa2167b73726aba4 /corepkgs
parent57d023a184bdc2f30cd7052c157e43ba1bca8288 (diff)
* `nix-store --add-fixed' to preload the outputs of fixed-output
derivations. This is mostly to simplify the implementation of nix-prefetch-{url, svn}, which now work properly in setuid installations. * Enforce valid store names in `nix-store --add / --add-fixed'.
Diffstat (limited to 'corepkgs')
-rw-r--r--corepkgs/fetchurl/builder.sh.in8
1 files changed, 1 insertions, 7 deletions
diff --git a/corepkgs/fetchurl/builder.sh.in b/corepkgs/fetchurl/builder.sh.in
index 92b874652..02abb18b4 100644
--- a/corepkgs/fetchurl/builder.sh.in
+++ b/corepkgs/fetchurl/builder.sh.in
@@ -2,10 +2,4 @@
echo "downloading $url into $out"
-prefetch=@storedir@/nix-prefetch-url-$outputHash
-if test -f "$prefetch"; then
- echo "using prefetched $prefetch";
- @coreutils@/mv $prefetch $out
-else
- @curl@ --fail --location --max-redirs 20 "$url" > "$out"
-fi
+@curl@ --fail --location --max-redirs 20 "$url" > "$out"