From d29cee773c09b770ad04e625f30b24f604cf7829 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 7 Dec 2017 00:53:24 +0100 Subject: [PATCH] dwarf-fortress: 0.43.05 -> 0.44.02 dwarf-therapist: 37.0.0-Hello71 -> 39.0.0 dfhack: 0.43.05-r1 -> 0.44.02-alpha1 cla-theme: 43.05-v23 -> 44.01-v24 phoebus-theme: 43.05c -> 44.02a There is a new maintained repository for dwarf-therapist: http://www.bay12forums.com/smf/index.php?topic=168411 dfhack is still in alpha, so make backups, if you use it. cc @the-kenny @abbradar --- pkgs/games/dwarf-fortress/dfhack/default.nix | 8 ++++---- .../dwarf-fortress/dwarf-therapist/default.nix | 14 ++++++-------- .../dwarf-fortress/dwarf-therapist/wrapper.nix | 6 ++++-- pkgs/games/dwarf-fortress/game.nix | 8 ++++---- pkgs/games/dwarf-fortress/soundsense.nix | 2 +- pkgs/games/dwarf-fortress/themes/cla.nix | 6 +++--- pkgs/games/dwarf-fortress/themes/phoebus.nix | 6 +++--- pkgs/games/dwarf-fortress/unfuck.nix | 10 ++++++---- pkgs/games/dwarf-fortress/wrapper/default.nix | 4 ++-- 9 files changed, 33 insertions(+), 31 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index dbb3e7c32e25..698d2924bfec 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -4,13 +4,13 @@ }: let - dfVersion = "0.43.05"; - version = "${dfVersion}-r2"; + dfVersion = "0.44.02"; + version = "${dfVersion}-alpha1"; rev = "refs/tags/${version}"; - sha256 = "18zbxri5rch750m431pdmlk4xi7nc14iif3i7glxrgy2h5nfaw5c"; + sha256 = "1cdp2jwhxl54ym92jm58xyrz942ajp6idl31qrmzcqzawp2fl620"; # revision of library/xml submodule - xmlRev = "3322beb2e7f4b28ff8e573e9bec738c77026b8e9"; + xmlRev = "e2e256066cc4a5c427172d9d27db25b7823e4e86"; 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 e7ef9a02eb70..c330471f430c 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "37.0.0-Hello71"; + version = "39.0.0"; src = fetchFromGitHub { - ## We use `Hello71`'s fork for 43.05 support - # owner = "splintermind"; - owner = "Hello71"; + owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; - rev = "42ccaa71f6077ebdd41543255a360c3470812b97"; - sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz"; + rev = "8ae293a6b45333bbf30644d11d1987651e53a307"; + sha256 = "0p1127agr2a97gp5chgdkaa0wf02hqgx82yid1cvqpyj8amal6yg"; }; outputs = [ "out" "layouts" ]; @@ -33,9 +31,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; - maintainers = with maintainers; [ the-kenny abbradar ]; + maintainers = with maintainers; [ the-kenny abbradar bendlas ]; license = licenses.mit; platforms = platforms.linux; - homepage = https://github.com/splintermind/Dwarf-Therapist; + homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist; }; } diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 3a1a52d44cdb..6debf0bb0b2b 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,9 +1,11 @@ -{ symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }: +{ stdenv, symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }: let df = dwarf-fortress-original; dt = dwarf-therapist-original; - inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini"; + platformSlug = if stdenv.targetPlatform.is32bit then + "linux32" else "linux64"; + inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}_${platformSlug}.ini"; dfHashFile = "${df}/hash.md5"; in symlinkJoin { diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 740125bf4426..54666e86cc14 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -3,8 +3,8 @@ }: let - baseVersion = "43"; - patchVersion = "05"; + baseVersion = "44"; + patchVersion = "02"; 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 "1r0b96yrdf24m9476k5x7rmp3faxr0kfwwdf35agpvlb1qbi6v45" - else if stdenv.system == "i686-linux" then "16l1lydpkbnl3zhz4i2snmjk7pps8vmw3zv0bjgr8dncbsrycd03" + if stdenv.system == "x86_64-linux" then "1w2b6sxjxb5cvmv15fxmzfkxvby4kdcf4kj4w35687filyg0skah" + else if stdenv.system == "i686-linux" then "1yqzkgyl1adwysqskc2v4wlp1nkgxc7w6m37nwllghgwfzaiqwnh" else throw "Unsupported platform"; in diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index c87f42d58c0f..17448d87f407 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.43.05"; + dfVersion = "0.44.02"; 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 7d1f26e9aabc..78ebd4307272 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 = "43.05-v23"; + version = "44.01-v24"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "CLA"; rev = version; - sha256 = "1i74lyz7mpfrvh5g7rajxldhw7zddc2kp8f6bgfr3hl5l8ym5ci9"; + sha256 = "1lyazrls2vr8z58vfk5nvaffyv048j5xkr4wjvp6vrqxxvrxyrfd"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.43.05"; + passthru.dfVersion = "0.44.02"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index 07bbde9f1480..57881686eaa9 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 = "43.05c"; + version = "44.02a"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "Phoebus"; rev = version; - sha256 = "0wiz9rd5ypibgh8854h5n2xwksfxylaziyjpbp3p1rkm3r7kr4fd"; + sha256 = "10qd8fbn75fvhkyxqljn4w52kbhfp9xh1ybanjzc57bz79sdzvfp"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.43.05"; + passthru.dfVersion = "0.44.02"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 105da5a5731b..3b0df3ce28cf 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -3,14 +3,16 @@ , ncurses, glib, gtk2, libsndfile, zlib }: +let dfVersion = "0.44.02"; in + stdenv.mkDerivation { - name = "dwarf_fortress_unfuck-2016-07-13"; + name = "dwarf_fortress_unfuck-${dfVersion}"; src = fetchFromGitHub { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; - rev = "d6a4ee67e7b41bec1caa87548640643db35a6080"; - sha256 = "17p7jzmwd5z54wn6bxmic0i8y8mma3q359zcy3r9x2mp2wv1yd7p"; + rev = dfVersion; + sha256 = "0gfchfqrzx0h59mdv01hik8q2a2yx170q578agfck0nv39yhi6i5"; }; cmakeFlags = [ @@ -33,7 +35,7 @@ stdenv.mkDerivation { # Breaks dfhack because of inlining. hardeningDisable = [ "fortify" ]; - passthru.dfVersion = "0.43.05"; + passthru = { inherit dfVersion; }; meta = with stdenv.lib; { description = "Unfucked multimedia layer for Dwarf Fortress"; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 05e851db6f85..3d904d006e46 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -38,11 +38,11 @@ let }; in -assert lib.all (x: x.dfVersion == dwarf-fortress-original.dfVersion) pkgs; - stdenv.mkDerivation rec { name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}"; + compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress-original.dfVersion); true) pkgs; + dfInit = substituteAll { name = "dwarf-fortress-init"; src = ./dwarf-fortress-init.in;