bump dwarf-therapist and dfhack versions; fix theme issue

3 files changed, 8 insertions, 11 deletions

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index ee2e442daa288..f1d4b1c3747cc 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -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 {
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 11964c627da22..a15acdc267f7b 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -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 ];
   };
 }
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 305f3cdb1fa38..d8270c6000a5c 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -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 ];