dwarf-fortress-packages.dfhack: 20160118 -> 2016-03-03

This commit is contained in:
Nikolay Amiantov 2016-03-03 15:33:13 +03:00
parent 5b4de73b8f
commit d8ed77d96d

View File

@ -5,28 +5,36 @@
}: }:
let let
rev = "f61ff9147e00f3c379ac0458e79eb556a5de1b68"; rev = "5e2fc5662115499c10bfcd8a6105a1efe4de081c";
dfVersion = "0.42.05"; xmlRev = "f371e293002f8f6d1e4704cc5869ca07ccf6c4d5";
dfVersion = "0.42.06";
fakegit = writeScriptBin "git" '' fakegit = writeScriptBin "git" ''
#! ${stdenv.shell} #! ${stdenv.shell}
if [ "$*" = "describe --tags --long" ]; then if [ "$*" = "describe --tags --long" ]; then
echo "${dfVersion}-unknown" echo "${dfVersion}-unknown"
elif [ "$*" = "rev-parse HEAD" ]; then elif [ "$*" = "rev-parse HEAD" ]; then
if [ "$(dirname "$(pwd)")" = "xml" ]; then
echo "${xmlRev}"
else
echo "${rev}" echo "${rev}"
fi
elif [ "$*" = "rev-parse HEAD:library/xml" ]; then
echo "${xmlRev}"
else else
exit 1 exit 1
fi fi
''; '';
in stdenv.mkDerivation { in stdenv.mkDerivation rec {
name = "dfhack-20160118"; name = "dfhack-${version}";
version = "2016-03-03";
# Beware of submodules # Beware of submodules
src = fetchgit { src = fetchgit {
url = "https://github.com/DFHack/dfhack"; url = "https://github.com/DFHack/dfhack";
inherit rev; inherit rev;
sha256 = "1ah3cplp4mb9pq7rm1cmn8klfjxw3y2xfzy7734i81b3iwiwlpi4"; sha256 = "143zkx6hqpqxjhjd1bllg2kfia215x63zifkhgzycg49kw4wkxi5";
}; };
patches = [ ./use-system-libraries.patch ]; patches = [ ./use-system-libraries.patch ];