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

Merge pull request #142061 from SFrijters/openttd-12.0

Browse Source 
openttd: 1.11.2 -> 12.0, openttd-jgrpp: 0.41.0 -> 0.43.1
This commit is contained in:
maxine [they] 2021-10-19 18:47:10 +02:00 committed by GitHub
commit e04173c017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/games/openttd/default.nix
View File

@ -6,18 +6,18 @@
let
opengfx = fetchzip {
url = "https://cdn.openttd.org/opengfx-releases/0.6.1/opengfx-0.6.1-all.zip";
sha256 = "sha256-DeeIlLcmPeMZ0ju9DwXUInnQp2rWu60besDVto4+lDQ=";
url = "https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip";
sha256 = "sha256-daJ/Qwg/okpmLQkXcCjruIiP8GEwyyp02YWcGQepxzs=";
};
opensfx = fetchzip {
url = "https://cdn.openttd.org/opensfx-releases/1.0.1/opensfx-1.0.1-all.zip";
sha256 = "sha256-U1PIKbMZHRJ0Z9Cp2RqqCMhD1xRyudoNHAYIZyotxVk=";
url = "https://cdn.openttd.org/opensfx-releases/1.0.2/opensfx-1.0.2-all.zip";
sha256 = "sha256-yRCb49/k8uUUAe9VzUG0LQaBDFP7n9QdrLSJDIthdbA=";
};
openmsx = fetchzip {
url = "https://cdn.openttd.org/openmsx-releases/0.4.0/openmsx-0.4.0-all.zip";
sha256 = "sha256-Ok6W+iqi4SP7cD4HUQERrAysvVibnN7Q4/tkugffDgQ=";
url = "https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip";
sha256 = "sha256-Cgrg2m+uTODFg39mKgX+hE8atV7v5bVyZd716vSZB8M=";
};
playmidi = writeScriptBin "playmidi" ''
@ -29,11 +29,11 @@ let
in
stdenv.mkDerivation rec {
pname = "openttd";
version = "1.11.2";
version = "12.0";
src = fetchurl {
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
sha256 = "sha256-D7qTWiqBX0/ozW3C4q4z9ydpU4cxIo+EimOzpulILm0=";
sha256 = "sha256-u6D9OADfA3AlnmQtJR82LHwAtHii41Mfa6f4TBwrMtw=";
};
nativeBuildInputs = [ cmake makeWrapper ];

4
pkgs/games/openttd/jgrpp.nix
View File

@ -2,12 +2,12 @@
openttd.overrideAttrs (oldAttrs: rec {
pname = "openttd-jgrpp";
version = "0.41.0";
version = "0.43.1";
src = fetchFromGitHub rec {
owner = "JGRennison";
repo = "OpenTTD-patches";
rev = "jgrpp-${version}";
sha256 = "sha256-DrtxqXyeqA+X4iLTvTSPFDKDoLCyVd458+nJWc+9MF4=";
sha256 = "sha256-nCZ3UN2BdpDGbW0CKX/ijxlA3cQ7FPflajQ5TBM1Hdk=";
};
})