bump dwarf-therapist and dfhack versions; fix theme issue
This commit is contained in:
parent
24f4711705
commit
9a2898c6d1
|
@ -18,10 +18,7 @@ let
|
|||
else null;
|
||||
|
||||
dwarf-fortress = callPackage ./wrapper {
|
||||
themes = {
|
||||
"phoebus" = phoebus-theme;
|
||||
"cla" = cla-theme;
|
||||
};
|
||||
inherit themes;
|
||||
};
|
||||
|
||||
dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
}:
|
||||
|
||||
let
|
||||
dfVersion = "0.44.10";
|
||||
version = "${dfVersion}-r1";
|
||||
dfVersion = "0.44.11";
|
||||
version = "${dfVersion}-alpha1";
|
||||
|
||||
# revision of library/xml submodule
|
||||
xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5";
|
||||
xmlRev = "853bd161270f50b21fe4b751de339458f78f56d6";
|
||||
|
||||
arch =
|
||||
if stdenv.system == "x86_64-linux" then "64"
|
||||
|
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "DFHack";
|
||||
repo = "dfhack";
|
||||
sha256 = "15hz90lfg7asgm4bqa2yi2lkwzrljphb42q6616sriwzs66xia6h";
|
||||
sha256 = "16ypcl9378xxnq7ngzh93pmx2haf2i32xgxs2p1q4bvvafdxvirz";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
@ -72,6 +72,6 @@ in stdenv.mkDerivation rec {
|
|||
homepage = https://github.com/DFHack/dfhack/;
|
||||
license = licenses.zlib;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with maintainers; [ robbinch a1russell abbradar ];
|
||||
maintainers = with maintainers; [ robbinch a1russell abbradar numinit ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dwarf-therapist-original-${version}";
|
||||
version = "40.0.0";
|
||||
version = "40.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dwarf-Therapist";
|
||||
repo = "Dwarf-Therapist";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9";
|
||||
sha256 = "1aklwic5npgkp8rkrvz2q9idkipsm1h26mgd8q03135nzl1ld9q3";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtdeclarative ];
|
||||
|
|
Loading…
Reference in a new issue