tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
dwarf-fortress: 0.44.03 -> 0.44.05
Herwig Hochleitner
8 years ago
8924e84d
6cc8541e
+18
-18
7 changed files
expand all
collapse all
unified
split
pkgs
games
dwarf-fortress
dfhack
default.nix
dwarf-therapist
default.nix
game.nix
soundsense.nix
themes
cla.nix
phoebus.nix
unfuck.nix
+4
-4
pkgs/games/dwarf-fortress/dfhack/default.nix
···
4
4
}:
5
5
6
6
let
7
7
-
dfVersion = "0.44.03";
8
8
-
version = "${dfVersion}-beta1";
7
7
+
dfVersion = "0.44.05";
8
8
+
version = "${dfVersion}-alpha1";
9
9
rev = "refs/tags/${version}";
10
10
-
sha256 = "1gyaq6krm0cvccyw7rdy6afh9vy983dl86d0wnpr25dl3jky27xw";
10
10
+
sha256 = "1hr3qsx7rd36syw7dfp4lh8kpmz1pvva757za2yn34hj1jm4nh52";
11
11
12
12
# revision of library/xml submodule
13
13
-
xmlRev = "7e23a328fd81e3d6db794c0c18b8b2e7bd235649";
13
13
+
xmlRev = "3a9f401d196ee8ebc53edb9e15a13bfcb0879b4e";
14
14
15
15
arch =
16
16
if stdenv.system == "x86_64-linux" then "64"
+2
-2
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "dwarf-therapist-original-${version}";
5
5
-
version = "39.1.2";
5
5
+
version = "39.2.0";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "Dwarf-Therapist";
9
9
repo = "Dwarf-Therapist";
10
10
rev = "v${version}";
11
11
-
sha256 = "0j5pldc184xv1mhdrhsmp23g58cy9a2bba27djigkh2sd5rksgji";
11
11
+
sha256 = "1ddy9b9ly1231pnjs43gj7pvc77wjvs4j2rlympal81vyabaphmy";
12
12
};
13
13
14
14
outputs = [ "out" "layouts" ];
+3
-3
pkgs/games/dwarf-fortress/game.nix
···
4
4
5
5
let
6
6
baseVersion = "44";
7
7
-
patchVersion = "03";
7
7
+
patchVersion = "05";
8
8
dfVersion = "0.${baseVersion}.${patchVersion}";
9
9
libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];
10
10
platform =
···
12
12
else if stdenv.system == "i686-linux" then "linux32"
13
13
else throw "Unsupported platform";
14
14
sha256 =
15
15
-
if stdenv.system == "x86_64-linux" then "0bgrkwcdghwch96krqdwq8lcjwr6svw0xl53d2jysyszfy7nfl88"
16
16
-
else if stdenv.system == "i686-linux" then "1mvnbkjvm68z2q7h81jrh70qy9458b1spv0m3nlc680fm19hpz40"
15
15
+
if stdenv.system == "x86_64-linux" then "18bjyhjp5458bfbizm8vq4s00pqpfs097qp6pv76m84kgbc4ghg3"
16
16
+
else if stdenv.system == "i686-linux" then "1b9i4kf4c8s6bhqwn8jx100mg7fqp8nmswrai5w8dsma01py4amr"
17
17
else throw "Unsupported platform";
18
18
19
19
in
+1
-1
pkgs/games/dwarf-fortress/soundsense.nix
···
12
12
13
13
stdenv.mkDerivation rec {
14
14
version = "2016-1_196";
15
15
-
dfVersion = "0.44.03";
15
15
+
dfVersion = "0.44.05";
16
16
inherit soundPack;
17
17
name = "soundsense-${version}";
18
18
src = fetchzip {
+3
-3
pkgs/games/dwarf-fortress/themes/cla.nix
···
5
5
6
6
stdenv.mkDerivation rec {
7
7
name = "cla-theme-${version}";
8
8
-
version = "44.01-v24";
8
8
+
version = "44.xx-v25";
9
9
10
10
src = fetchFromGitHub {
11
11
owner = "DFgraphics";
12
12
repo = "CLA";
13
13
rev = version;
14
14
-
sha256 = "1lyazrls2vr8z58vfk5nvaffyv048j5xkr4wjvp6vrqxxvrxyrfd";
14
14
+
sha256 = "1h8nwa939qzqklbi8vwsq9p2brvv7sc0pbzzrdjnb221lr9p58zk";
15
15
};
16
16
17
17
installPhase = ''
···
19
19
cp -r data raw $out
20
20
'';
21
21
22
22
-
passthru.dfVersion = "0.44.03";
22
22
+
passthru.dfVersion = "0.44.05";
23
23
24
24
preferLocalBuild = true;
25
25
+3
-3
pkgs/games/dwarf-fortress/themes/phoebus.nix
···
5
5
6
6
stdenv.mkDerivation rec {
7
7
name = "phoebus-theme-${version}";
8
8
-
version = "44.03";
8
8
+
version = "44.05";
9
9
10
10
src = fetchFromGitHub {
11
11
owner = "DFgraphics";
12
12
repo = "Phoebus";
13
13
rev = version;
14
14
-
sha256 = "0jpklikg2bf315m45kdkhd1n1plzb4jwzsg631gqfm9dwnrcs4w3";
14
14
+
sha256 = "06mhr6dpbvwp9dxn70kyr6dwyql2k6x5zba2zf6awjah7idys0xr";
15
15
};
16
16
17
17
installPhase = ''
···
19
19
cp -r data raw $out
20
20
'';
21
21
22
22
-
passthru.dfVersion = "0.44.03";
22
22
+
passthru.dfVersion = "0.44.05";
23
23
24
24
preferLocalBuild = true;
25
25
+2
-2
pkgs/games/dwarf-fortress/unfuck.nix
···
3
3
, ncurses, glib, gtk2, libsndfile, zlib
4
4
}:
5
5
6
6
-
let dfVersion = "0.44.03"; in
6
6
+
let dfVersion = "0.44.05"; in
7
7
8
8
stdenv.mkDerivation {
9
9
name = "dwarf_fortress_unfuck-${dfVersion}";
···
12
12
owner = "svenstaro";
13
13
repo = "dwarf_fortress_unfuck";
14
14
rev = dfVersion;
15
15
-
sha256 = "0rd8d2ilhhks9kdi9j73bpyf8j56fhmmsj21yzdc0a4v2hzyxn2w";
15
15
+
sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b";
16
16
};
17
17
18
18
cmakeFlags = [