maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Get rid of fetchurl, we don't need it anymore.

Browse source
This commit is contained in:
Eelco Dolstra 2005-04-07 14:35:44 +00:00
parent 10c429c757
commit 7d876f8fa7
6 changed files with 9 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
corepkgs/Makefile.am
View file

@ -1 +1 @@
SUBDIRS = fetchurl nar buildenv channels SUBDIRS = nar buildenv channels

11
corepkgs/fetchurl/Makefile.am
View file

@ -1,11 +0,0 @@
all-local: builder.sh
install-exec-local:
$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs
$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/fetchurl
$(INSTALL_DATA) default.nix $(DESTDIR)$(datadir)/nix/corepkgs/fetchurl
$(INSTALL_PROGRAM) builder.sh $(DESTDIR)$(datadir)/nix/corepkgs/fetchurl
include ../../substitute.mk
EXTRA_DIST = default.nix builder.sh.in

5
corepkgs/fetchurl/builder.sh.in
View file

@ -1,5 +0,0 @@
#! @shell@ -e
echo "downloading $url into $out"
@curl@ --fail --location --max-redirs 20 "$url" > "$out"

23
corepkgs/fetchurl/default.nix
View file

@ -1,23 +0,0 @@
# Argh, this thing is duplicated (more-or-less) in Nixpkgs. Need to
# find a way to combine them.
{system, url, outputHash ? "", outputHashAlgo ? "", md5 ? "", sha1 ? "", sha256 ? ""}:
assert (outputHash != "" && outputHashAlgo != "")
|| md5 != "" || sha1 != "" || sha256 != "";
derivation {
name = baseNameOf (toString url);
builder = ./builder.sh;
# Compatibility with Nix <= 0.7.
id = md5;
# New-style output content requirements.
outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
outputHash = if outputHash != "" then outputHash else
if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
inherit system url;
}

16
scripts/nix-channel.in
View file

@ -81,17 +81,14 @@ sub update {
# expressions. # expressions.
my $nixExpr = "["; my $nixExpr = "[";
foreach my $url (@channels) { foreach my $url (@channels) {
my $fullURL = "$url/nixexprs.tar.bz2"; my $fullURL = "$url/nixexprs.tar.bz2";
my $hash = `@bindir@/nix-prefetch-url '$fullURL' 2> /dev/null` $ENV{"PRINT_PATH"} = 1;
or die "cannot fetch `$fullURL'"; my ($hash, $path) = `@bindir@/nix-prefetch-url '$fullURL' 2> /dev/null`;
chomp $hash; die "cannot fetch `$fullURL'" if $? != 0;
# !!! escaping chomp $path;
$nixExpr .= "((import @datadir@/nix/corepkgs/fetchurl) " . $nixExpr .= $path . " ";
"{url = $fullURL; md5 = \"$hash\"; system = \"@system@\";}) "
} }
$nixExpr .= "]"; $nixExpr .= "]";
$nixExpr = $nixExpr =
@ -134,6 +131,9 @@ EOF
} }
usageError if scalar @ARGV == 0;
while (scalar @ARGV) { while (scalar @ARGV) {
my $arg = shift @ARGV; my $arg = shift @ARGV;

1
tests/init.sh
View file

@ -41,7 +41,6 @@ cp -pr $TOP/corepkgs $NIX_DATA_DIR/nix/
# (and likely to fail). # (and likely to fail).
for i in \ for i in \
$NIX_DATA_DIR/nix/corepkgs/nar/nar.sh \ $NIX_DATA_DIR/nix/corepkgs/nar/nar.sh \
$NIX_DATA_DIR/nix/corepkgs/fetchurl/builder.sh \
$NIX_BIN_DIR/nix/download-using-manifests.pl \ $NIX_BIN_DIR/nix/download-using-manifests.pl \
$NIX_BIN_DIR/nix-prefetch-url \ $NIX_BIN_DIR/nix-prefetch-url \
$NIX_BIN_DIR/nix-collect-garbage \ $NIX_BIN_DIR/nix-collect-garbage \