public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump dwarf-therapist and dfhack versions; fix theme issue

Browse Source
This commit is contained in:
Morgan Jones 2018-06-30 09:08:56 +00:00
parent 24f4711705
commit 9a2898c6d1
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/games/dwarf-fortress/default.nix
View File

@ -18,10 +18,7 @@ let
else null; else null;
dwarf-fortress = callPackage ./wrapper { dwarf-fortress = callPackage ./wrapper {
themes = { inherit themes;
"phoebus" = phoebus-theme;
"cla" = cla-theme;
};
}; };
dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist { dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {

10
pkgs/games/dwarf-fortress/dfhack/default.nix
View File

@ -5,11 +5,11 @@
}: }:
let let
dfVersion = "0.44.10"; dfVersion = "0.44.11";
version = "${dfVersion}-r1"; version = "${dfVersion}-alpha1";
# revision of library/xml submodule # revision of library/xml submodule
xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5"; xmlRev = "853bd161270f50b21fe4b751de339458f78f56d6";
arch = arch =
if stdenv.system == "x86_64-linux" then "64" if stdenv.system == "x86_64-linux" then "64"
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DFHack"; owner = "DFHack";
repo = "dfhack"; repo = "dfhack";
sha256 = "15hz90lfg7asgm4bqa2yi2lkwzrljphb42q6616sriwzs66xia6h"; sha256 = "16ypcl9378xxnq7ngzh93pmx2haf2i32xgxs2p1q4bvvafdxvirz";
rev = version; rev = version;
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -72,6 +72,6 @@ in stdenv.mkDerivation rec {
homepage = https://github.com/DFHack/dfhack/; homepage = https://github.com/DFHack/dfhack/;
license = licenses.zlib; license = licenses.zlib;
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ robbinch a1russell abbradar ]; maintainers = with maintainers; [ robbinch a1russell abbradar numinit ];
}; };
} }

4
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dwarf-therapist-original-${version}"; name = "dwarf-therapist-original-${version}";
version = "40.0.0"; version = "40.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Dwarf-Therapist"; owner = "Dwarf-Therapist";
repo = "Dwarf-Therapist"; repo = "Dwarf-Therapist";
rev = "v${version}"; rev = "v${version}";
sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9"; sha256 = "1aklwic5npgkp8rkrvz2q9idkipsm1h26mgd8q03135nzl1ld9q3";
}; };
buildInputs = [ qtbase qtdeclarative ]; buildInputs = [ qtbase qtdeclarative ];