diff options
author | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2014-06-28 20:33:28 +0200 |
---|---|---|
committer | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2014-06-28 21:06:10 +0200 |
commit | e10001042d6fc2b4246f51b5fa1625b8bf7e8df3 (patch) | |
tree | f01e3e8ab58fb4474dc16df523257def2d05771f /pkgs/build-support/fetchdarcs | |
parent | 9b7dbcc83e2b8c8fcb37bc204bba83311e17eca0 (diff) |
fetchbzr, fetchdarcs, fetchhg: use `rev` attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's easier to write scripts that support all of them.
Diffstat (limited to 'pkgs/build-support/fetchdarcs')
-rw-r--r-- | pkgs/build-support/fetchdarcs/builder.sh | 6 | ||||
-rw-r--r-- | pkgs/build-support/fetchdarcs/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index efff5ff5ebf97..301deb98307ff 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -2,9 +2,9 @@ source $stdenv/setup tagtext="" tagflags="" -if test -n "$tag"; then - tagtext="(tag $tag) " - tagflags="--tag=$tag" +if test -n "$rev"; then + tagtext="(tag $rev) " + tagflags="--tag=$rev" elif test -n "$context"; then tagtext="(context) " tagflags="--context=$context" diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 63e4ecde88a54..3c2e0524eea5c 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,4 +1,4 @@ -{stdenv, darcs, nix}: {url, tag ? null, context ? null, md5 ? "", sha256 ? ""}: +{stdenv, darcs, nix}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: stdenv.mkDerivation { name = "fetchdarcs"; @@ -9,5 +9,5 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = if sha256 == "" then md5 else sha256; - inherit url tag context; + inherit url rev context; } |