diff options
author | Andres Löh <mail@andres-loeh.de> | 2009-05-13 19:02:23 +0000 |
---|---|---|
committer | Andres Löh <mail@andres-loeh.de> | 2009-05-13 19:02:23 +0000 |
commit | 677f91a6d10bea31767a084c17cbb2a2ee738a7e (patch) | |
tree | 6e54e47ee50aaa2a11b324c9d2119f8d487b9d32 /pkgs/build-support | |
parent | 1ffa8f0c171e5424bc4a9395dac3550a2023eb6e (diff) | |
download | nixpkgs-677f91a6d10bea31767a084c17cbb2a2ee738a7e.tar nixpkgs-677f91a6d10bea31767a084c17cbb2a2ee738a7e.tar.gz nixpkgs-677f91a6d10bea31767a084c17cbb2a2ee738a7e.tar.bz2 nixpkgs-677f91a6d10bea31767a084c17cbb2a2ee738a7e.tar.lz nixpkgs-677f91a6d10bea31767a084c17cbb2a2ee738a7e.tar.xz nixpkgs-677f91a6d10bea31767a084c17cbb2a2ee738a7e.tar.zst nixpkgs-677f91a6d10bea31767a084c17cbb2a2ee738a7e.zip |
Added Idris and updated fetchdarcs.
svn path=/nixpkgs/trunk/; revision=15595
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/fetchdarcs/builder.sh | 5 | ||||
-rw-r--r-- | pkgs/build-support/fetchdarcs/default.nix | 14 |
2 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index 7214eda4266..a211de42da4 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -5,11 +5,14 @@ tagflags="" if test -n "$tag"; then tagtext="(tag $tag) " tagflags="--tag=$tag" +elif test -n "$context"; then + tagtext="(context) " + tagflags="--context=$context" fi header "getting $url $partial ${tagtext} into $out" -darcs get --no-pristine-tree $partial $tagflags "$url" "$out" +darcs get --lazy --ephemeral $tagflags "$url" "$out" # remove metadata, because it can change rm -rf "$out/_darcs" diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index b8dde18aa3e..63e4ecde88a 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,17 +1,13 @@ -{stdenv, darcs, nix}: {url, tag ? null, md5, partial ? true}: +{stdenv, darcs, nix}: {url, tag ? null, context ? null, md5 ? "", sha256 ? ""}: stdenv.mkDerivation { name = "fetchdarcs"; builder = ./builder.sh; - buildInputs = [darcs nix]; - partial = if partial then "--partial" else ""; + buildInputs = [darcs]; - # Nix <= 0.7 compatibility. - id = md5; - - outputHashAlgo = "md5"; + outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = md5; + outputHash = if sha256 == "" then md5 else sha256; - inherit url tag; + inherit url tag context; } |