From 24f471170532fd7a5043ec6e2f47abf950cd752c Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 25 Jun 2018 08:21:57 +0000 Subject: [PATCH] dwarf-fortress: 0.44.10 -> 0.44.11 Update everything but dfhack and dwarf-therapist, which have not been updated yet. --- maintainers/maintainer-list.nix | 5 +++++ pkgs/games/dwarf-fortress/game.nix | 10 +++++----- pkgs/games/dwarf-fortress/soundsense.nix | 2 +- pkgs/games/dwarf-fortress/unfuck.nix | 4 ++-- pkgs/games/dwarf-fortress/wrapper/default.nix | 10 ++++++++-- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 16bd5795b24..25321cfb81b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2854,6 +2854,11 @@ github = "nthorne"; name = "Niklas Thörne"; }; + numinit = { + email = "me@numin.it"; + github = "numinit"; + name = "Morgan Jones"; + }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 477ba33b77c..0812ffde066 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 = "10"; + patchVersion = "11"; 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 = "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2"; + sha256 = "1qizfkxl2k6pn70is4vz94q4k55bc3pm13b2r6yqi6lw1cnna4sf"; }; "i686-linux" = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2"; - sha256 = "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n"; + sha256 = "11m39lfyrsxlw1g7f269q7fzwichg06l21fxhqzgvlvmzmxsf8q5"; }; "x86_64-darwin" = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2"; - sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g"; + sha256 = "1cxckszjh5fi9czywr1kl5kj9zxzaszhqdal5gd8ww0ihcbl7fcd"; }; }; @@ -88,6 +88,6 @@ stdenv.mkDerivation { inherit homepage; license = licenses.unfreeRedistributable; platforms = attrNames srcs; - maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ]; + maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit ]; }; } diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index f09ac843548..0a501bc3c05 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.10"; + dfVersion = "0.44.11"; inherit soundPack; name = "soundsense-${version}"; src = fetchzip { diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index d816ba461b1..2aa69d7623f 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.10"; in +let dfVersion = "0.44.11"; in stdenv.mkDerivation { name = "dwarf_fortress_unfuck-${dfVersion}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; rev = dfVersion; - sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"; + sha256 = "0kkk8md2xq8l0c4m9hkg66qqjad3xi4jbb5z2ginhqixxpfbz8rf"; }; cmakeFlags = [ diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index e82cc2be680..e6e17533d21 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll +{ stdenv, lib, buildEnv, dwarf-fortress-original, dwarf-fortress-unfuck, substituteAll , enableDFHack ? false, dfhack , enableSoundSense ? false, soundSense, jdk , enableStoneSense ? false @@ -11,6 +11,8 @@ let inherit enableStoneSense; }; + dfVersion = dwarf-fortress-original.dfVersion; + ptheme = if builtins.isString theme then builtins.getAttr theme themes @@ -41,7 +43,11 @@ in stdenv.mkDerivation rec { name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}"; - compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress-original.dfVersion); true) pkgs; + compatible = lib.all (x: x.dfVersion == dwarf-fortress-original.dfVersion) [ + dwarf-fortress-original + dwarf-fortress-unfuck + dfhack + ]; dfInit = substituteAll { name = "dwarf-fortress-init";