From 93bb428f31f404320f4284539bcdf51ebb60e4a9 Mon Sep 17 00:00:00 2001 From: DamitusThyYeetus123 <108782125+DamitusThyYeetus123@users.noreply.github.com> Date: Sun, 14 Apr 2024 15:56:39 +1000 Subject: [PATCH 1/2] openttd: 13.4 -> 14.0 openttd: switch fetchurl to fetchzip openttd: remove fetchurl from input args (cherry picked from commit f81ed653e1740288151e7a85e729978a40da72ac) --- pkgs/games/openttd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 69a2c75fa463..5fd6f26b6655 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, cmake, pkg-config +{ lib, stdenv, fetchzip, cmake, pkg-config , SDL2, libpng, zlib, xz, freetype, fontconfig , nlohmann_json, curl, icu, harfbuzz, expat, glib, pcre2 , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true @@ -32,11 +32,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "13.4"; + version = "14.0"; - src = fetchurl { + src = fetchzip { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - hash = "sha256-Kh3roBv+WOIYiHn0UMP6TzgZJxq0m/NI3WZUXwQNFG8="; + hash = "sha256-7wOyP2h5qHNFjdmHf/62W+cAb6C+UEBPswPx48p3AjU="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; From d9b49b174746f9314bc7c99b2264286387668790 Mon Sep 17 00:00:00 2001 From: DamitusThyYeetus123 <108782125+DamitusThyYeetus123@users.noreply.github.com> Date: Fri, 10 May 2024 15:08:19 +1000 Subject: [PATCH 2/2] openttd: 14.0 -> 14.1 (cherry picked from commit 09864485c5076426c9235b679396d7c39bc8d981) --- pkgs/games/openttd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 5fd6f26b6655..268cead62dc4 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -32,11 +32,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "14.0"; + version = "14.1"; src = fetchzip { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - hash = "sha256-7wOyP2h5qHNFjdmHf/62W+cAb6C+UEBPswPx48p3AjU="; + hash = "sha256-YT4IE/rJ9pnpeMWKbOra6AbSUwW19RwOKlXkxwoMeKY="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper ];