Merge pull request #309456 from numinit/dwarf-fortress-50.13
dwarf-fortress: 50.12 -> 50.13
This commit is contained in:
commit
1694b1700b
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texliveBasic, perlPackages, jdk8, jre8 }:
|
{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, perlPackages, jdk8, jre8 }:
|
||||||
|
|
||||||
# To whomever it may concern:
|
# To whomever it may concern:
|
||||||
#
|
#
|
||||||
|
@ -49,7 +49,7 @@ let
|
||||||
# The latest Dwarf Fortress version. Maintainers: when a new version comes
|
# The latest Dwarf Fortress version. Maintainers: when a new version comes
|
||||||
# out, ensure that (unfuck|dfhack|twbt) are all up to date before changing
|
# out, ensure that (unfuck|dfhack|twbt) are all up to date before changing
|
||||||
# this. Note that unfuck and twbt are not required for 50.
|
# this. Note that unfuck and twbt are not required for 50.
|
||||||
latestVersion = "50.12";
|
latestVersion = "50.13";
|
||||||
|
|
||||||
# Converts a version to a package name.
|
# Converts a version to a package name.
|
||||||
versionToName = version: "dwarf-fortress_${replaceStrings ["."] ["_"] version}";
|
versionToName = version: "dwarf-fortress_${replaceStrings ["."] ["_"] version}";
|
||||||
|
@ -79,9 +79,7 @@ let
|
||||||
|
|
||||||
dwarf-therapist = libsForQt5.callPackage ./dwarf-therapist/wrapper.nix {
|
dwarf-therapist = libsForQt5.callPackage ./dwarf-therapist/wrapper.nix {
|
||||||
inherit dwarf-fortress;
|
inherit dwarf-fortress;
|
||||||
dwarf-therapist = (libsForQt5.callPackage ./dwarf-therapist {
|
dwarf-therapist = (libsForQt5.callPackage ./dwarf-therapist {}).override (optionalAttrs (!isAtLeast50) {
|
||||||
texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]);
|
|
||||||
}).override (optionalAttrs (!isAtLeast50) {
|
|
||||||
# 41.2.5 is the last version to support Dwarf Fortress 0.47.
|
# 41.2.5 is the last version to support Dwarf Fortress 0.47.
|
||||||
version = "41.2.5";
|
version = "41.2.5";
|
||||||
hash = "sha256-xfYBtnO1n6OcliVt07GsQ9alDJIfWdVhtuyWwuvXSZs=";
|
hash = "sha256-xfYBtnO1n6OcliVt07GsQ9alDJIfWdVhtuyWwuvXSZs=";
|
||||||
|
|
|
@ -89,6 +89,11 @@ let
|
||||||
hash = "sha256-2mO8DpNmZRCV7IRY0arf3SMvlO4Pxs61Kxfh3q3k3HU=";
|
hash = "sha256-2mO8DpNmZRCV7IRY0arf3SMvlO4Pxs61Kxfh3q3k3HU=";
|
||||||
xmlRev = "980b1af13acc31660dce632f913c968f52e2b275";
|
xmlRev = "980b1af13acc31660dce632f913c968f52e2b275";
|
||||||
};
|
};
|
||||||
|
"50.13" = {
|
||||||
|
dfHackRelease = "50.13-r1.1";
|
||||||
|
hash = "sha256-FiXanXflszTr4ogz+EoDAUxzE2U9ODeZIJJ1u6Xm4Mo=";
|
||||||
|
xmlRev = "3507715fd07340de5a6c47064220f6e17343e5d5";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
release =
|
release =
|
||||||
|
|
|
@ -4,10 +4,9 @@
|
||||||
, qtbase
|
, qtbase
|
||||||
, qtdeclarative
|
, qtdeclarative
|
||||||
, cmake
|
, cmake
|
||||||
, texlive
|
|
||||||
, ninja
|
, ninja
|
||||||
, version ? "42.1.5"
|
, version ? "42.1.6"
|
||||||
, hash ? "sha256-aUakfUjnIZWNDhCkG3A6u7BaaCG8kPMV/Fu2S73CoDg="
|
, hash ? "sha256-VjCXT4sl3HsFILrqTc3JJSeRedZaOXUbf4KvSzTo0uc="
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||||
inherit hash;
|
inherit hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ texlive cmake ninja ];
|
nativeBuildInputs = [ cmake ninja ];
|
||||||
buildInputs = [ qtbase qtdeclarative ];
|
buildInputs = [ qtbase qtdeclarative ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
|
@ -144,5 +144,8 @@
|
||||||
},
|
},
|
||||||
"50.12": {
|
"50.12": {
|
||||||
"linux": "070014fzwszfgjyxjyij0k0hadah6s62lpi91ykp3vs220azya1m"
|
"linux": "070014fzwszfgjyxjyij0k0hadah6s62lpi91ykp3vs220azya1m"
|
||||||
|
},
|
||||||
|
"50.13": {
|
||||||
|
"linux": "19wzgsdgv0vq7v2dxhypr9hayky3nm3lbra1kk9vn8ri96jdkfkw"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user