diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
| commit | 06fc1ec34dbae8bba4673475e64a8241026089f6 (patch) | |
| tree | 3e70796a291acc704ef5382f5af4866cab64e537 /pkgs/build-support/fetchdarcs/default.nix | |
| parent | 89f8af55f11b01e68cbfc6d10537413140261721 (diff) | |
| parent | ce623950ada9e1ef721760f05b9e3a14604fd764 (diff) | |
| download | nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.gz nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.bz2 nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.lz nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.xz nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.zst nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/servers/serfdom/default.nix
Diffstat (limited to 'pkgs/build-support/fetchdarcs/default.nix')
| -rw-r--r-- | pkgs/build-support/fetchdarcs/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 63e4ecde88a..3c2e0524eea 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; } |