public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dwarf-fortress: 0.44.10 -> 0.44.11 

Update everything but dfhack and dwarf-therapist, which
have not been updated yet.
This commit is contained in:
Morgan Jones 2018-06-25 08:21:57 +00:00
parent 060a98e9f4
commit 24f4711705
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -2854,6 +2854,11 @@
github = "nthorne"; github = "nthorne";
name = "Niklas Thörne"; name = "Niklas Thörne";
}; };
numinit = {
email = "me@numin.it";
github = "numinit";
name = "Morgan Jones";
};
nyanloutre = { nyanloutre = {
email = "paul@nyanlout.re"; email = "paul@nyanlout.re";
github = "nyanloutre"; github = "nyanloutre";

10
pkgs/games/dwarf-fortress/game.nix
View File

@ -9,7 +9,7 @@ with lib;
let let
baseVersion = "44"; baseVersion = "44";
patchVersion = "10"; patchVersion = "11";
dfVersion = "0.${baseVersion}.${patchVersion}"; dfVersion = "0.${baseVersion}.${patchVersion}";
libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ]; libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
@ -21,15 +21,15 @@ let
srcs = { srcs = {
"x86_64-linux" = fetchurl { "x86_64-linux" = fetchurl {
url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2"; url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2";
sha256 = "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2"; sha256 = "1qizfkxl2k6pn70is4vz94q4k55bc3pm13b2r6yqi6lw1cnna4sf";
}; };
"i686-linux" = fetchurl { "i686-linux" = fetchurl {
url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2"; url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2";
sha256 = "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n"; sha256 = "11m39lfyrsxlw1g7f269q7fzwichg06l21fxhqzgvlvmzmxsf8q5";
}; };
"x86_64-darwin" = fetchurl { "x86_64-darwin" = fetchurl {
url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2"; url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g"; sha256 = "1cxckszjh5fi9czywr1kl5kj9zxzaszhqdal5gd8ww0ihcbl7fcd";
}; };
}; };
@ -88,6 +88,6 @@ stdenv.mkDerivation {
inherit homepage; inherit homepage;
license = licenses.unfreeRedistributable; license = licenses.unfreeRedistributable;
platforms = attrNames srcs; platforms = attrNames srcs;
maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ]; maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit ];
}; };
} }

2
pkgs/games/dwarf-fortress/soundsense.nix
View File

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

4
pkgs/games/dwarf-fortress/unfuck.nix
View File

@ -3,7 +3,7 @@
, ncurses, glib, gtk2, libsndfile, zlib , ncurses, glib, gtk2, libsndfile, zlib
}: }:
let dfVersion = "0.44.10"; in let dfVersion = "0.44.11"; 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 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"; sha256 = "0kkk8md2xq8l0c4m9hkg66qqjad3xi4jbb5z2ginhqixxpfbz8rf";
}; };
cmakeFlags = [ cmakeFlags = [

10
pkgs/games/dwarf-fortress/wrapper/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll { stdenv, lib, buildEnv, dwarf-fortress-original, dwarf-fortress-unfuck, substituteAll
, enableDFHack ? false, dfhack , enableDFHack ? false, dfhack
, enableSoundSense ? false, soundSense, jdk , enableSoundSense ? false, soundSense, jdk
, enableStoneSense ? false , enableStoneSense ? false
@ -11,6 +11,8 @@ let
inherit enableStoneSense; inherit enableStoneSense;
}; };
dfVersion = dwarf-fortress-original.dfVersion;
ptheme = ptheme =
if builtins.isString theme if builtins.isString theme
then builtins.getAttr theme themes then builtins.getAttr theme themes
@ -41,7 +43,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}"; 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 { dfInit = substituteAll {
name = "dwarf-fortress-init"; name = "dwarf-fortress-init";