Merge pull request #145328 from SFrijters/openttd-12.1

openttd: 12.0 -> 12.1, openttd-jgrpp: 0.43.1 -> 0.44.0
This commit is contained in:
Dmitry Kalinkin 2021-11-10 16:20:31 -05:00 committed by GitHub
commit d4554c23a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -11,8 +11,8 @@ let
};
opensfx = fetchzip {
url = "https://cdn.openttd.org/opensfx-releases/1.0.2/opensfx-1.0.2-all.zip";
sha256 = "sha256-yRCb49/k8uUUAe9VzUG0LQaBDFP7n9QdrLSJDIthdbA=";
url = "https://cdn.openttd.org/opensfx-releases/1.0.3/opensfx-1.0.3-all.zip";
sha256 = "sha256-QmfXizrRTu/fUcVOY7tCndv4t4BVW+fb0yUi8LgSYzM=";
};
openmsx = fetchzip {
@ -29,11 +29,11 @@ let
in
stdenv.mkDerivation rec {
pname = "openttd";
version = "12.0";
version = "12.1";
src = fetchurl {
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
sha256 = "sha256-u6D9OADfA3AlnmQtJR82LHwAtHii41Mfa6f4TBwrMtw=";
sha256 = "sha256-JYv1uZgwEIkLoQUYtQa8SrgPfAjM7FlJfpulWkqj5+M=";
};
nativeBuildInputs = [ cmake makeWrapper ];

View File

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