git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #142061 from SFrijters/openttd-12.0

openttd: 1.11.2 -> 12.0, openttd-jgrpp: 0.41.0 -> 0.43.1

commite04173c0177bad1130048038e97b1d199271f9f9 authormaxine [they] <35892750+maxeaubrey@users.noreply.github.com> dateTue 19 Oct 2021, 18:47 (5 years ago) parent70285d4507d0ea
2 files changed+10−10
pkgs/games/openttd/default.nix+8−8 pkgs/games/openttd/jgrpp.nix+2−2
pkgs/games/openttd/default.nix+8−8
@@ -6,18 +6,18 @@
66
77let
88 opengfx = fetchzip {
9− url = "https://cdn.openttd.org/opengfx-releases/0.6.1/opengfx-0.6.1-all.zip";
10− sha256 = "sha256-DeeIlLcmPeMZ0ju9DwXUInnQp2rWu60besDVto4+lDQ=";
9+ url = "https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip";
10+ sha256 = "sha256-daJ/Qwg/okpmLQkXcCjruIiP8GEwyyp02YWcGQepxzs=";
1111 };
1212
1313 opensfx = fetchzip {
14− url = "https://cdn.openttd.org/opensfx-releases/1.0.1/opensfx-1.0.1-all.zip";
15− sha256 = "sha256-U1PIKbMZHRJ0Z9Cp2RqqCMhD1xRyudoNHAYIZyotxVk=";
14+ url = "https://cdn.openttd.org/opensfx-releases/1.0.2/opensfx-1.0.2-all.zip";
15+ sha256 = "sha256-yRCb49/k8uUUAe9VzUG0LQaBDFP7n9QdrLSJDIthdbA=";
1616 };
1717
1818 openmsx = fetchzip {
19− url = "https://cdn.openttd.org/openmsx-releases/0.4.0/openmsx-0.4.0-all.zip";
20− sha256 = "sha256-Ok6W+iqi4SP7cD4HUQERrAysvVibnN7Q4/tkugffDgQ=";
19+ url = "https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip";
20+ sha256 = "sha256-Cgrg2m+uTODFg39mKgX+hE8atV7v5bVyZd716vSZB8M=";
2121 };
2222
2323 playmidi = writeScriptBin "playmidi" ''
@@ -29,11 +29,11 @@ let
2929in
3030stdenv.mkDerivation rec {
3131 pname = "openttd";
32− version = "1.11.2";
32+ version = "12.0";
3333
3434 src = fetchurl {
3535 url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
36− sha256 = "sha256-D7qTWiqBX0/ozW3C4q4z9ydpU4cxIo+EimOzpulILm0=";
36+ sha256 = "sha256-u6D9OADfA3AlnmQtJR82LHwAtHii41Mfa6f4TBwrMtw=";
3737 };
3838
3939 nativeBuildInputs = [ cmake makeWrapper ];
pkgs/games/openttd/jgrpp.nix+2−2
@@ -2,12 +2,12 @@
22
33openttd.overrideAttrs (oldAttrs: rec {
44 pname = "openttd-jgrpp";
5− version = "0.41.0";
5+ version = "0.43.1";
66
77 src = fetchFromGitHub rec {
88 owner = "JGRennison";
99 repo = "OpenTTD-patches";
1010 rev = "jgrpp-${version}";
11− sha256 = "sha256-DrtxqXyeqA+X4iLTvTSPFDKDoLCyVd458+nJWc+9MF4=";
11+ sha256 = "sha256-nCZ3UN2BdpDGbW0CKX/ijxlA3cQ7FPflajQ5TBM1Hdk=";
1212 };
1313})