diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index ff2c471e137d..71938874057a 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -4,13 +4,13 @@ }: let - dfVersion = "0.44.03"; - version = "${dfVersion}-beta1"; + dfVersion = "0.44.05"; + version = "${dfVersion}-alpha1"; rev = "refs/tags/${version}"; - sha256 = "1gyaq6krm0cvccyw7rdy6afh9vy983dl86d0wnpr25dl3jky27xw"; + sha256 = "1hr3qsx7rd36syw7dfp4lh8kpmz1pvva757za2yn34hj1jm4nh52"; # revision of library/xml submodule - xmlRev = "7e23a328fd81e3d6db794c0c18b8b2e7bd235649"; + xmlRev = "3a9f401d196ee8ebc53edb9e15a13bfcb0879b4e"; arch = if stdenv.system == "x86_64-linux" then "64" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index affb364b26f2..20f7502f27dd 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 = "39.1.2"; + version = "39.2.0"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "0j5pldc184xv1mhdrhsmp23g58cy9a2bba27djigkh2sd5rksgji"; + sha256 = "1ddy9b9ly1231pnjs43gj7pvc77wjvs4j2rlympal81vyabaphmy"; }; outputs = [ "out" "layouts" ]; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 4c8712fd40ec..8a85578172a9 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -4,7 +4,7 @@ let baseVersion = "44"; - patchVersion = "03"; + patchVersion = "05"; dfVersion = "0.${baseVersion}.${patchVersion}"; libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ]; platform = @@ -12,8 +12,8 @@ let else if stdenv.system == "i686-linux" then "linux32" else throw "Unsupported platform"; sha256 = - if stdenv.system == "x86_64-linux" then "0bgrkwcdghwch96krqdwq8lcjwr6svw0xl53d2jysyszfy7nfl88" - else if stdenv.system == "i686-linux" then "1mvnbkjvm68z2q7h81jrh70qy9458b1spv0m3nlc680fm19hpz40" + if stdenv.system == "x86_64-linux" then "18bjyhjp5458bfbizm8vq4s00pqpfs097qp6pv76m84kgbc4ghg3" + else if stdenv.system == "i686-linux" then "1b9i4kf4c8s6bhqwn8jx100mg7fqp8nmswrai5w8dsma01py4amr" else throw "Unsupported platform"; in diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index 8e1742663c77..def3a09a4ba6 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "2016-1_196"; - dfVersion = "0.44.03"; + dfVersion = "0.44.05"; inherit soundPack; name = "soundsense-${version}"; src = fetchzip { diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix index 90e67eb41952..7c3eb0b63e3d 100644 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cla-theme-${version}"; - version = "44.01-v24"; + version = "44.xx-v25"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "CLA"; rev = version; - sha256 = "1lyazrls2vr8z58vfk5nvaffyv048j5xkr4wjvp6vrqxxvrxyrfd"; + sha256 = "1h8nwa939qzqklbi8vwsq9p2brvv7sc0pbzzrdjnb221lr9p58zk"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.44.03"; + passthru.dfVersion = "0.44.05"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index 97d2c2b20ef4..d94902719204 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "phoebus-theme-${version}"; - version = "44.03"; + version = "44.05"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "Phoebus"; rev = version; - sha256 = "0jpklikg2bf315m45kdkhd1n1plzb4jwzsg631gqfm9dwnrcs4w3"; + sha256 = "06mhr6dpbvwp9dxn70kyr6dwyql2k6x5zba2zf6awjah7idys0xr"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.44.03"; + passthru.dfVersion = "0.44.05"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 1831b2b60620..8d7a5a0d1a9d 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -3,7 +3,7 @@ , ncurses, glib, gtk2, libsndfile, zlib }: -let dfVersion = "0.44.03"; in +let dfVersion = "0.44.05"; in stdenv.mkDerivation { name = "dwarf_fortress_unfuck-${dfVersion}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; rev = dfVersion; - sha256 = "0rd8d2ilhhks9kdi9j73bpyf8j56fhmmsj21yzdc0a4v2hzyxn2w"; + sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b"; }; cmakeFlags = [