Added Idris and updated fetchdarcs.

svn path=/nixpkgs/trunk/; revision=15595

2 files changed, 9 insertions, 10 deletions

diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh
index 7214eda42668..a211de42da49 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 b8dde18aa3e5..63e4ecde88a5 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;
 }