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.

+43 -43
+1 -1
pkgs/applications/editors/vim/configurable.nix
··· 21 21 # latest release 22 22 args.fetchhg { 23 23 url = "https://vim.googlecode.com/hg/"; 24 - tag = "v7-4-316"; 24 + rev = "v7-4-316"; 25 25 sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx"; 26 26 }; 27 27
+1 -1
pkgs/applications/editors/vim/default.nix
··· 7 7 8 8 src = fetchhg { 9 9 url = "https://vim.googlecode.com/hg/"; 10 - tag = "v7-4-316"; 10 + rev = "v7-4-316"; 11 11 sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx"; 12 12 }; 13 13
+1 -1
pkgs/applications/graphics/photivo/default.nix
··· 6 6 7 7 src = fetchhg { 8 8 url = "http://code.google.com/p/photivo/"; 9 - tag = "d687864489da"; 9 + rev = "d687864489da"; 10 10 sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h"; 11 11 }; 12 12
+1 -1
pkgs/applications/misc/ocropus/default.nix
··· 40 40 41 41 src = fetchhg { 42 42 url = "https://code.google.com/p/ocropus.ocropy"; 43 - tag = "a6e0fbd820ce"; 43 + rev = "a6e0fbd820ce"; 44 44 sha256 = "1s0v0gd6psfjp6lghwl2dj49h18mgf2n2z8hqzw8430nzhglnlvr"; 45 45 }; 46 46
+2 -2
pkgs/applications/science/electronics/kicad/default.nix
··· 5 5 6 6 src = fetchbzr { 7 7 url = "https://code.launchpad.net/~kicad-stable-committers/kicad/stable"; 8 - revision = 4024; 8 + rev = 4024; 9 9 sha256 = "1sv1l2zpbn6439ccz50p05hvqg6j551aqra551wck9h3929ghly5"; 10 10 }; 11 11 12 12 srcLibrary = fetchbzr { 13 13 url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library"; 14 - revision = 293; 14 + rev = 293; 15 15 sha256 = "1wn9a4nhqyjzzfkq6xm7ag8n5n10xy7gkq6i7yry7wxini7pzv1i"; 16 16 }; 17 17
+1 -1
pkgs/applications/science/logic/abc/default.nix
··· 6 6 7 7 src = fetchhg { 8 8 url = "https://bitbucket.org/alanmi/abc"; 9 - tag = "03e221443d71e49e56cbc37f1907ee3b0ff3e7c9"; 9 + rev = "03e221443d71e49e56cbc37f1907ee3b0ff3e7c9"; 10 10 sha256 = "0ahrqg718y7xpv939f6x8w1kqh7wsja4pw8hca7j67j0qjdgb4lm"; 11 11 }; 12 12
+1 -1
pkgs/applications/science/math/glsurf/default.nix
··· 9 9 10 10 src = fetchdarcs { 11 11 url = "http://lama.univ-savoie.fr/~raffalli/GlSurf"; 12 - tag = "3.3"; 12 + rev = "3.3"; 13 13 sha256 = ""; md5=""; 14 14 }; 15 15
+1 -1
pkgs/applications/window-managers/tabbed/default.nix
··· 5 5 6 6 src = fetchhg { 7 7 url = http://hg.suckless.org/tabbed; 8 - tag = "d7542a6f6dc5"; 8 + rev = "d7542a6f6dc5"; 9 9 sha256 = "1963jsazfmh5k7923c1mfwppz1xbh48z16j0sa64fiscq22as2gj"; 10 10 }; 11 11
+2 -2
pkgs/build-support/fetchbzr/builder.sh
··· 1 1 source "$stdenv/setup" 2 2 3 - header "exporting \`$url' (revision $revision) into \`$out'" 3 + header "exporting \`$url' (revision $rev) into \`$out'" 4 4 5 5 # Perform a lightweight checkout so that we don't end up importing 6 6 # all the repository's history. 7 - bzr -Ossl.cert_reqs=none export -r "$revision" --format=dir "$out" "$url" 7 + bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" 8 8 9 9 stopNest
+2 -2
pkgs/build-support/fetchbzr/default.nix
··· 1 1 { stdenv, bazaar }: 2 - { url, revision, sha256 }: 2 + { url, rev, sha256 }: 3 3 4 4 stdenv.mkDerivation { 5 5 name = "bzr-export"; ··· 11 11 outputHashMode = "recursive"; 12 12 outputHash = sha256; 13 13 14 - inherit url revision; 14 + inherit url rev; 15 15 }
+3 -3
pkgs/build-support/fetchdarcs/builder.sh
··· 2 2 3 3 tagtext="" 4 4 tagflags="" 5 - if test -n "$tag"; then 6 - tagtext="(tag $tag) " 7 - tagflags="--tag=$tag" 5 + if test -n "$rev"; then 6 + tagtext="(tag $rev) " 7 + tagflags="--tag=$rev" 8 8 elif test -n "$context"; then 9 9 tagtext="(context) " 10 10 tagflags="--context=$context"
+2 -2
pkgs/build-support/fetchdarcs/default.nix
··· 1 - {stdenv, darcs, nix}: {url, tag ? null, context ? null, md5 ? "", sha256 ? ""}: 1 + {stdenv, darcs, nix}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: 2 2 3 3 stdenv.mkDerivation { 4 4 name = "fetchdarcs"; ··· 9 9 outputHashMode = "recursive"; 10 10 outputHash = if sha256 == "" then md5 else sha256; 11 11 12 - inherit url tag context; 12 + inherit url rev context; 13 13 }
+2 -2
pkgs/build-support/fetchhg/builder.sh
··· 1 1 source $stdenv/setup 2 - header "getting $url${tag:+ ($tag)} into $out" 2 + header "getting $url${rev:+ ($rev)} into $out" 3 3 4 4 hg clone --insecure "$url" hg-clone 5 5 6 - hg archive -q -y ${tag:+-r "$tag"} --cwd hg-clone $out 6 + hg archive -q -y ${rev:+-r "$rev"} --cwd hg-clone $out 7 7 rm -f $out/.hg_archival.txt 8 8 9 9 stopNest
+2 -2
pkgs/build-support/fetchhg/default.nix
··· 1 - {stdenv, mercurial, nix}: {name ? null, url, tag ? null, md5 ? null, sha256 ? null}: 1 + {stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null}: 2 2 3 3 # TODO: statically check if mercurial as the https support if the url starts woth https. 4 4 stdenv.mkDerivation { ··· 13 13 outputHashMode = "recursive"; 14 14 outputHash = if md5 != null then md5 else sha256; 15 15 16 - inherit url tag; 16 + inherit url rev; 17 17 preferLocalBuild = true; 18 18 }
+1 -1
pkgs/development/lisp-modules/lisp-packages.nix
··· 37 37 src = pkgs.fetchdarcs { 38 38 url = "http://common-lisp.net/project/iterate/darcs/iterate"; 39 39 sha256 = "0m3q0s7h5s8varwx584m2akgdslj14df7kg4w1bj1fbgzsag5m1w"; 40 - tag=version; 40 + rev = version; 41 41 }; 42 42 overrides = x: { 43 43 configurePhase="buildPhase(){ true; }";
+8 -8
pkgs/development/tools/packer/deps.nix
··· 15 15 root = "code.google.com/p/go.crypto"; 16 16 src = fetchhg { 17 17 url = "http://code.google.com/p/go.crypto"; 18 - tag = "199"; 18 + rev = "199"; 19 19 sha256 = "0ibrpc6kknzl6a2g2fkxn03mvrd635lcnvf4a9rk1dfrpjbpcixh"; 20 20 }; 21 21 } ··· 23 23 root = "code.google.com/p/goauth2"; 24 24 src = fetchhg { 25 25 url = "http://code.google.com/p/goauth2"; 26 - tag = "67"; 26 + rev = "67"; 27 27 sha256 = "053vajj8hd9869by7z9qfgzn84h6avpcjvyxcyw5jml8dsln4bah"; 28 28 }; 29 29 } ··· 31 31 root = "code.google.com/p/google-api-go-client"; 32 32 src = fetchhg { 33 33 url = "http://code.google.com/p/google-api-go-client"; 34 - tag = "111"; 34 + rev = "111"; 35 35 sha256 = "1ib8i1c2mb86lkrr5w7bgwb70gkqmp860wa3h1j8080gxdx3yy16"; 36 36 }; 37 37 } ··· 39 39 root = "code.google.com/p/gosshold"; 40 40 src = fetchhg { 41 41 url = "http://code.google.com/p/gosshold"; 42 - tag = "2"; 42 + rev = "2"; 43 43 sha256 = "1ljl8pcxxfz5rv89b2ajd31gxxzifl57kzpksvdhyjdxh98gkvg8"; 44 44 }; 45 45 } ··· 65 65 root = "launchpad.net/tomb"; 66 66 src = fetchbzr { 67 67 url = "https://launchpad.net/tomb"; 68 - revision = "17"; 68 + rev = "17"; 69 69 sha256 = "1cjw0sr9hald1darq6n8akfpkzcgrk3mcq59hga3ibf2lrg35ha0"; 70 70 }; 71 71 } ··· 82 82 root = "code.google.com/p/goprotobuf"; 83 83 src = fetchhg { 84 84 url = "http://code.google.com/p/goprotobuf"; 85 - tag = "246"; 85 + rev = "246"; 86 86 sha256 = "0k4wcv1dnkwcp0gdrajj6kr25f1lg4lgpbi0h5v9l9n7sdwzplf4"; 87 87 }; 88 88 } ··· 135 135 root = "launchpad.net/gocheck"; 136 136 src = fetchbzr { 137 137 url = "https://launchpad.net/gocheck"; 138 - revision = "87"; 138 + rev = "87"; 139 139 sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; 140 140 }; 141 141 } ··· 278 278 root = "launchpad.net/mgo"; 279 279 src = fetchbzr { 280 280 url = "https://launchpad.net/mgo"; 281 - revision = "2"; 281 + rev = "2"; 282 282 sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; 283 283 }; 284 284 }
+1 -1
pkgs/games/dwarf-therapist/default.nix
··· 6 6 7 7 src = fetchhg { 8 8 url = "https://code.google.com/r/splintermind-attributes/"; 9 - tag = rev; 9 + inherit rev; 10 10 sha256 = "0a9m967q6p2q3plrl6qysg1xrdmg65jzil6awjh2wr3g10x2x15z"; 11 11 }; 12 12
+1 -1
pkgs/games/opentyrian/default.nix
··· 6 6 7 7 src = fetchhg { 8 8 url = "https://opentyrian.googlecode.com/hg/"; 9 - tag = "13ef8ce47362"; 9 + rev = "13ef8ce47362"; 10 10 md5 = "95c8f9e7ff3d4207f1c692c7cec6c9b0"; 11 11 }; 12 12
+1 -1
pkgs/servers/nsq/deps.nix
··· 6 6 root = "code.google.com/p/snappy-go"; 7 7 src = fetchhg { 8 8 url = "http://code.google.com/p/snappy-go"; 9 - tag = "14"; 9 + rev = "14"; 10 10 sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7"; 11 11 }; 12 12 }
+4 -4
pkgs/servers/serfdom/deps.nix
··· 6 6 root = "code.google.com/p/go.net"; 7 7 src = fetchhg { 8 8 url = "http://code.google.com/p/go.net"; 9 - tag = "134"; 9 + rev = "134"; 10 10 sha256 = "1jycpgrfwgkfac60zjbx6babcz7sgyn9xgy6cr3l811j6k8r2pbv"; 11 11 }; 12 12 } ··· 14 14 root = "code.google.com/p/go.text"; 15 15 src = fetchhg { 16 16 url = "http://code.google.com/p/go.text"; 17 - tag = "85"; 17 + rev = "85"; 18 18 sha256 = "1x8h6vq9g5gbi7iiwla6dkaaqqf7wmkdm4szj7wvzlsijf2x8dwr"; 19 19 }; 20 20 } ··· 157 157 root = "launchpad.net/gocheck"; 158 158 src = fetchbzr { 159 159 url = "https://launchpad.net/gocheck"; 160 - revision = "87"; 160 + rev = "87"; 161 161 sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; 162 162 }; 163 163 } ··· 165 165 root = "launchpad.net/mgo"; 166 166 src = fetchbzr { 167 167 url = "https://launchpad.net/mgo"; 168 - revision = "2"; 168 + rev = "2"; 169 169 sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; 170 170 }; 171 171 }
+3 -3
pkgs/tools/misc/ngrok/default.nix
··· 30 30 url = "https://launchpad.net/goyaml"; 31 31 sha256 = "03is37cgw62cha316xrs5h7q97im46ry5qldkfvbhimjq3ww0swj"; 32 32 # Branch: "branch:lp:goyaml" 33 - revision = 47; 33 + rev = 47; 34 34 }; 35 35 log4go = fetchhg { 36 36 url = "https://code.google.com/p/log4go/"; 37 - tag = "c3294304d93f"; 37 + rev = "c3294304d93f"; 38 38 sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p"; 39 39 }; 40 40 osext = fetchhg { 41 41 url = "https://bitbucket.org/kardianos/osext"; 42 - tag = "364fb57"; 42 + rev = "364fb57"; 43 43 sha256 = "1w9x2zj716agfd5x5497ajb9nz3ljar74768vjidsyly143vzjws"; 44 44 }; 45 45 in stdenv.mkDerivation rec {
+1 -1
pkgs/tools/security/meo/default.nix
··· 5 5 6 6 src = fetchhg { 7 7 url = http://oss.stamfest.net/hg/meo; 8 - tag = "b48e5f16cff8"; 8 + rev = "b48e5f16cff8"; 9 9 sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq"; 10 10 }; 11 11
+1 -1
pkgs/tools/system/storebrowse/default.nix
··· 14 14 # This source has license BSD 15 15 srcGoSqlite = fetchhg { 16 16 url = "https://code.google.com/p/gosqlite/"; 17 - tag = "5baefb109e18"; 17 + rev = "5baefb109e18"; 18 18 sha256 = "0mqfnx06jj15cs8pq9msny2z18x99hgk6mchnaxpg343nzdiz4zk"; 19 19 }; 20 20