diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-03-03 15:33:13 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-03-04 14:42:38 +0300 |
| commit | d8ed77d96d630dce02bc3703790b942c495ffd41 (patch) | |
| tree | 8beae5affee06a91d3f9d8ce48e4f54dfdeef56c /pkgs/games | |
| parent | 5b4de73b8faade520c8dff4bd6733e1730a80be4 (diff) | |
| download | nixlib-d8ed77d96d630dce02bc3703790b942c495ffd41.tar nixlib-d8ed77d96d630dce02bc3703790b942c495ffd41.tar.gz nixlib-d8ed77d96d630dce02bc3703790b942c495ffd41.tar.bz2 nixlib-d8ed77d96d630dce02bc3703790b942c495ffd41.tar.lz nixlib-d8ed77d96d630dce02bc3703790b942c495ffd41.tar.xz nixlib-d8ed77d96d630dce02bc3703790b942c495ffd41.tar.zst nixlib-d8ed77d96d630dce02bc3703790b942c495ffd41.zip | |
dwarf-fortress-packages.dfhack: 20160118 -> 2016-03-03
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/dwarf-fortress/dfhack/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 92b9d57da421..aaed6b8fd2dc 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -5,28 +5,36 @@ }: let - rev = "f61ff9147e00f3c379ac0458e79eb556a5de1b68"; - dfVersion = "0.42.05"; + rev = "5e2fc5662115499c10bfcd8a6105a1efe4de081c"; + xmlRev = "f371e293002f8f6d1e4704cc5869ca07ccf6c4d5"; + dfVersion = "0.42.06"; fakegit = writeScriptBin "git" '' #! ${stdenv.shell} if [ "$*" = "describe --tags --long" ]; then echo "${dfVersion}-unknown" elif [ "$*" = "rev-parse HEAD" ]; then - echo "${rev}" + if [ "$(dirname "$(pwd)")" = "xml" ]; then + echo "${xmlRev}" + else + echo "${rev}" + fi + elif [ "$*" = "rev-parse HEAD:library/xml" ]; then + echo "${xmlRev}" else exit 1 fi ''; -in stdenv.mkDerivation { - name = "dfhack-20160118"; +in stdenv.mkDerivation rec { + name = "dfhack-${version}"; + version = "2016-03-03"; # Beware of submodules src = fetchgit { url = "https://github.com/DFHack/dfhack"; inherit rev; - sha256 = "1ah3cplp4mb9pq7rm1cmn8klfjxw3y2xfzy7734i81b3iwiwlpi4"; + sha256 = "143zkx6hqpqxjhjd1bllg2kfia215x63zifkhgzycg49kw4wkxi5"; }; patches = [ ./use-system-libraries.patch ]; |