summary refs log tree commit diff
path: root/pkgs/build-support/fetchbzr
diff options
context:
space:
mode:
authorBenno Fünfstück <benno.fuenfstueck@gmail.com>2014-06-28 20:33:28 +0200
committerBenno Fünfstück <benno.fuenfstueck@gmail.com>2014-06-28 21:06:10 +0200
commite10001042d6fc2b4246f51b5fa1625b8bf7e8df3 (patch)
treef01e3e8ab58fb4474dc16df523257def2d05771f /pkgs/build-support/fetchbzr
parent9b7dbcc83e2b8c8fcb37bc204bba83311e17eca0 (diff)
downloadnixpkgs-e10001042d6fc2b4246f51b5fa1625b8bf7e8df3.tar
nixpkgs-e10001042d6fc2b4246f51b5fa1625b8bf7e8df3.tar.gz
nixpkgs-e10001042d6fc2b4246f51b5fa1625b8bf7e8df3.tar.bz2
nixpkgs-e10001042d6fc2b4246f51b5fa1625b8bf7e8df3.tar.lz
nixpkgs-e10001042d6fc2b4246f51b5fa1625b8bf7e8df3.tar.xz
nixpkgs-e10001042d6fc2b4246f51b5fa1625b8bf7e8df3.tar.zst
nixpkgs-e10001042d6fc2b4246f51b5fa1625b8bf7e8df3.zip
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/fetchbzr')
-rw-r--r--pkgs/build-support/fetchbzr/builder.sh4
-rw-r--r--pkgs/build-support/fetchbzr/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh
index 17567fdadd2..af1257d3688 100644
--- a/pkgs/build-support/fetchbzr/builder.sh
+++ b/pkgs/build-support/fetchbzr/builder.sh
@@ -1,9 +1,9 @@
 source "$stdenv/setup"
 
-header "exporting \`$url' (revision $revision) into \`$out'"
+header "exporting \`$url' (revision $rev) into \`$out'"
 
 # Perform a lightweight checkout so that we don't end up importing
 # all the repository's history.
-bzr -Ossl.cert_reqs=none export -r "$revision" --format=dir "$out" "$url"
+bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url"
 
 stopNest
diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/build-support/fetchbzr/default.nix
index 721250beeb3..dd2c0363187 100644
--- a/pkgs/build-support/fetchbzr/default.nix
+++ b/pkgs/build-support/fetchbzr/default.nix
@@ -1,5 +1,5 @@
 { stdenv, bazaar }: 
-{ url, revision, sha256 }:
+{ url, rev, sha256 }:
 
 stdenv.mkDerivation {
   name = "bzr-export";
@@ -11,5 +11,5 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = sha256;
   
-  inherit url revision;
+  inherit url rev;
 }