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/games/opentyrian | |
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/games/opentyrian')
-rw-r--r-- | pkgs/games/opentyrian/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index 5e2ecdbcc5c..cfae6a4bb3e 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchhg { url = "https://opentyrian.googlecode.com/hg/"; - tag = "13ef8ce47362"; + rev = "13ef8ce47362"; md5 = "95c8f9e7ff3d4207f1c692c7cec6c9b0"; }; |