alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

dwarf-fortess: make 0.44.12 the default version

Browse source 
all necessary support packages seem to have caught up

cc  @matthewbauer @Baughn @volth
This commit is contained in:
Herwig Hochleitner 2018-08-16 23:58:22 +02:00
parent d127b54a29
commit da9da8defd
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/games/dwarf-fortress/default.nix
View file

@ -33,7 +33,7 @@ let
self = rec { self = rec {
df-hashes = builtins.fromJSON (builtins.readFile ./game.json); df-hashes = builtins.fromJSON (builtins.readFile ./game.json);
dwarf-fortress = df-games.dwarf-fortress_0_44_11; dwarf-fortress = df-games.dwarf-fortress_0_44_12;
dwarf-fortress-full = callPackage ./lazy-pack.nix { }; dwarf-fortress-full = callPackage ./lazy-pack.nix { };

8
pkgs/games/dwarf-fortress/dfhack/default.nix
View file

@ -6,11 +6,11 @@
}: }:
let let
dfVersion = "0.44.11"; dfVersion = "0.44.12";
version = "${dfVersion}-alpha1"; version = "${dfVersion}-r1";
# revision of library/xml submodule # revision of library/xml submodule
xmlRev = "853bd161270f50b21fe4b751de339458f78f56d6"; xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094";
arch = arch =
if stdenv.system == "x86_64-linux" then "64" if stdenv.system == "x86_64-linux" then "64"
@ -41,7 +41,7 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DFHack"; owner = "DFHack";
repo = "dfhack"; repo = "dfhack";
sha256 = "1vzrpdw0pn18calayf9dwqpyg37cb7wkzkvskxjx9nak5ilxzywm"; sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy";
rev = version; rev = version;
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dwarf-therapist-${version}"; name = "dwarf-therapist-${version}";
version = "40.1.0"; version = "41.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Dwarf-Therapist"; owner = "Dwarf-Therapist";
repo = "Dwarf-Therapist"; repo = "Dwarf-Therapist";
rev = "v${version}"; rev = "v${version}";
sha256 = "1aklwic5npgkp8rkrvz2q9idkipsm1h26mgd8q03135nzl1ld9q3"; sha256 = "0cvnk1dkszh7q7viv3i1v3ifzv1w0xyz69mifa1cbvbi47z2dh0d";
}; };
buildInputs = [ qtbase qtdeclarative ]; buildInputs = [ qtbase qtdeclarative ];

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.11"; dfVersion = "0.44.12";
inherit soundPack; inherit soundPack;
name = "soundsense-${version}"; name = "soundsense-${version}";
src = fetchzip { src = fetchzip {

6
pkgs/games/dwarf-fortress/twbt/default.nix
View file

@ -3,12 +3,12 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
name = "twbt-${version}"; name = "twbt-${version}";
version = "6.49"; version = "6.54";
dfVersion = "0.44.11"; dfVersion = "0.44.12";
src = fetchurl { src = fetchurl {
url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip"; url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip";
sha256 = "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz"; sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh";
}; };
sourceRoot = "."; sourceRoot = ".";

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.11"; in let dfVersion = "0.44.12"; 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 = "0kkk8md2xq8l0c4m9hkg66qqjad3xi4jbb5z2ginhqixxpfbz8rf"; sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz";
}; };
cmakeFlags = [ cmakeFlags = [