dwarf-fortress: 0.44.02 -> 0.44.03

This commit is contained in:
Herwig Hochleitner 2017-12-30 14:49:16 +01:00
parent d7000b03cd
commit c36ebca240
7 changed files with 17 additions and 17 deletions

View File

@ -4,13 +4,13 @@
}: }:
let let
dfVersion = "0.44.02"; dfVersion = "0.44.03";
version = "${dfVersion}-alpha1"; version = "${dfVersion}-beta1";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "1cdp2jwhxl54ym92jm58xyrz942ajp6idl31qrmzcqzawp2fl620"; sha256 = "1gyaq6krm0cvccyw7rdy6afh9vy983dl86d0wnpr25dl3jky27xw";
# revision of library/xml submodule # revision of library/xml submodule
xmlRev = "e2e256066cc4a5c427172d9d27db25b7823e4e86"; xmlRev = "7e23a328fd81e3d6db794c0c18b8b2e7bd235649";
arch = arch =
if stdenv.system == "x86_64-linux" then "64" if stdenv.system == "x86_64-linux" then "64"

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dwarf-therapist-original-${version}"; name = "dwarf-therapist-original-${version}";
version = "39.0.0"; version = "39.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Dwarf-Therapist"; owner = "Dwarf-Therapist";
repo = "Dwarf-Therapist"; repo = "Dwarf-Therapist";
rev = "8ae293a6b45333bbf30644d11d1987651e53a307"; rev = "v${version}";
sha256 = "0p1127agr2a97gp5chgdkaa0wf02hqgx82yid1cvqpyj8amal6yg"; sha256 = "0j5pldc184xv1mhdrhsmp23g58cy9a2bba27djigkh2sd5rksgji";
}; };
outputs = [ "out" "layouts" ]; outputs = [ "out" "layouts" ];

View File

@ -4,7 +4,7 @@
let let
baseVersion = "44"; baseVersion = "44";
patchVersion = "02"; patchVersion = "03";
dfVersion = "0.${baseVersion}.${patchVersion}"; dfVersion = "0.${baseVersion}.${patchVersion}";
libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ]; libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];
platform = platform =
@ -12,8 +12,8 @@ let
else if stdenv.system == "i686-linux" then "linux32" else if stdenv.system == "i686-linux" then "linux32"
else throw "Unsupported platform"; else throw "Unsupported platform";
sha256 = sha256 =
if stdenv.system == "x86_64-linux" then "1w2b6sxjxb5cvmv15fxmzfkxvby4kdcf4kj4w35687filyg0skah" if stdenv.system == "x86_64-linux" then "0bgrkwcdghwch96krqdwq8lcjwr6svw0xl53d2jysyszfy7nfl88"
else if stdenv.system == "i686-linux" then "1yqzkgyl1adwysqskc2v4wlp1nkgxc7w6m37nwllghgwfzaiqwnh" else if stdenv.system == "i686-linux" then "1mvnbkjvm68z2q7h81jrh70qy9458b1spv0m3nlc680fm19hpz40"
else throw "Unsupported platform"; else throw "Unsupported platform";
in in

View File

@ -12,7 +12,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2016-1_196"; version = "2016-1_196";
dfVersion = "0.44.02"; dfVersion = "0.44.03";
inherit soundPack; inherit soundPack;
name = "soundsense-${version}"; name = "soundsense-${version}";
src = fetchzip { src = fetchzip {

View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
cp -r data raw $out cp -r data raw $out
''; '';
passthru.dfVersion = "0.44.02"; passthru.dfVersion = "0.44.03";
preferLocalBuild = true; preferLocalBuild = true;

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "phoebus-theme-${version}"; name = "phoebus-theme-${version}";
version = "44.02a"; version = "44.03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DFgraphics"; owner = "DFgraphics";
repo = "Phoebus"; repo = "Phoebus";
rev = version; rev = version;
sha256 = "10qd8fbn75fvhkyxqljn4w52kbhfp9xh1ybanjzc57bz79sdzvfp"; sha256 = "0jpklikg2bf315m45kdkhd1n1plzb4jwzsg631gqfm9dwnrcs4w3";
}; };
installPhase = '' installPhase = ''
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
cp -r data raw $out cp -r data raw $out
''; '';
passthru.dfVersion = "0.44.02"; passthru.dfVersion = "0.44.03";
preferLocalBuild = true; preferLocalBuild = true;

View File

@ -3,7 +3,7 @@
, ncurses, glib, gtk2, libsndfile, zlib , ncurses, glib, gtk2, libsndfile, zlib
}: }:
let dfVersion = "0.44.02"; in let dfVersion = "0.44.03"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "dwarf_fortress_unfuck-${dfVersion}"; name = "dwarf_fortress_unfuck-${dfVersion}";
@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "svenstaro"; owner = "svenstaro";
repo = "dwarf_fortress_unfuck"; repo = "dwarf_fortress_unfuck";
rev = dfVersion; rev = dfVersion;
sha256 = "0gfchfqrzx0h59mdv01hik8q2a2yx170q578agfck0nv39yhi6i5"; sha256 = "0rd8d2ilhhks9kdi9j73bpyf8j56fhmmsj21yzdc0a4v2hzyxn2w";
}; };
cmakeFlags = [ cmakeFlags = [