From dfc4744afd82b2d26a8df71b05ffacf05230af50 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 6 Jun 2018 18:07:42 -0400 Subject: [PATCH] =?UTF-8?q?dwarf-fortress:=2044.09=20=E2=86=92=2044.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/games/dwarf-fortress/dfhack/default.nix | 18 +++++++-------- .../dfhack/fix-stonesense.patch | 23 ------------------- .../dwarf-therapist/default.nix | 4 ++-- pkgs/games/dwarf-fortress/game.nix | 8 +++---- pkgs/games/dwarf-fortress/soundsense.nix | 2 +- pkgs/games/dwarf-fortress/unfuck.nix | 4 ++-- 6 files changed, 17 insertions(+), 42 deletions(-) delete mode 100644 pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 641676489ed9..a77f50a51711 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,13 +1,11 @@ -{ stdenv, lib, fetchgit, cmake, writeScriptBin, callPackage +{ stdenv, hostPlatform, lib, fetchFromGitHub, cmake, writeScriptBin, callPackage , perl, XMLLibXML, XMLLibXSLT, zlib , enableStoneSense ? false, allegro5, libGLU_combined }: let - dfVersion = "0.44.09"; + dfVersion = "0.44.10"; version = "${dfVersion}-r1"; - rev = "refs/tags/${version}"; - sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9"; # revision of library/xml submodule xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5"; @@ -25,7 +23,7 @@ let if [ "$(dirname "$(pwd)")" = "xml" ]; then echo "${xmlRev}" else - echo "${rev}" + echo "refs/tags/${version}" fi elif [ "$*" = "rev-parse HEAD:library/xml" ]; then echo "${xmlRev}" @@ -38,13 +36,13 @@ in stdenv.mkDerivation rec { name = "dfhack-${version}"; # Beware of submodules - src = fetchgit { - url = "https://github.com/DFHack/dfhack"; - inherit rev sha256; + src = fetchFromGitHub { + owner = "DFHack"; + repo = "dfhack"; + sha256 = "0srgymyd57hk9iffhi2i0ra5vzw2vzlpzn4042yb90vqpmvz2zrj"; + rev = version; }; - patches = [ ./fix-stonesense.patch ]; - nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib ] diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch deleted file mode 100644 index da860cd55624..000000000000 --- a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001 -From: Herwig Hochleitner -Date: Sun, 1 Oct 2017 18:01:43 +0200 -Subject: [PATCH] include - -this fixes `GLhandleARB` not being defined ---- - plugins/stonesense/common.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h -index eb36691..ef45389 100644 ---- a/plugins/stonesense/common.h -+++ b/plugins/stonesense/common.h -@@ -31,6 +31,8 @@ using namespace df::enums; - #include - #include - -+#include -+ - // allegro leaks X headers, undef some of it here: - #undef TileShape - #undef None \ No newline at end of file diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 29cc2dc62857..6d96f98aec94 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.3.1"; + version = "40.0.0"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "0vb0dg1r833gaa4jzlrxf9acn41az3xjs9alx7r9lkqwvkjyrdy2"; + sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9"; }; outputs = [ "out" "layouts" ]; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 79eb6e191329..477ba33b77c6 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -9,7 +9,7 @@ with lib; let baseVersion = "44"; - patchVersion = "09"; + patchVersion = "10"; dfVersion = "0.${baseVersion}.${patchVersion}"; libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ]; @@ -21,15 +21,15 @@ let srcs = { "x86_64-linux" = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2"; - sha256 = "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy"; + sha256 = "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2"; }; "i686-linux" = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2"; - sha256 = "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8"; + sha256 = "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n"; }; "x86_64-darwin" = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2"; - sha256 = "01dss8g9lmi8majp6lxcfw166ydz4himkz6am5pi29gixaf4vfqs"; + sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g"; }; }; diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index 67c86f7f745c..f09ac8435482 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.09"; + dfVersion = "0.44.10"; inherit soundPack; name = "soundsense-${version}"; src = fetchzip { diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index fc42c05f0701..d816ba461b11 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.09"; in +let dfVersion = "0.44.10"; in stdenv.mkDerivation { name = "dwarf_fortress_unfuck-${dfVersion}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; rev = dfVersion; - sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b"; + sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"; }; cmakeFlags = [