Unverified Commit c0266447 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #214827 from SFrijters/openttd-13 

openttd: 12.2 -> 13.0; openttd-jgrpp: 0.47.1 -> 0.50.3
parents f961dba4 a1abd931

pkgs/games/openttd/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ let 
in

stdenv.mkDerivation rec {

  pname = "openttd";

  version = "12.2";

  version = "13.0";



  src = fetchurl {

    url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";

    hash = "sha256-gVCPDek6DCZLIW71agX4OB//e/+m0BASGiFJC02s6Vw=";

    hash = "sha256-M5344OCCcIfIOv54+O/GpzsKPYqVCgtTE3zm6KrXq2c=";

  };



  nativeBuildInputs = [ cmake makeWrapper ];
@@ -83,6 +83,7 @@ stdenv.mkDerivation rec { 
        - observe as spectators

    '';

    homepage = "https://www.openttd.org/";

    changelog = "https://cdn.openttd.org/openttd-releases/${version}/changelog.txt";

    license = licenses.gpl2;

    platforms = platforms.linux;

    maintainers = with maintainers; [ jcumming fpletz ];

pkgs/games/openttd/jgrpp.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


openttd.overrideAttrs (oldAttrs: rec {

  pname = "openttd-jgrpp";

  version = "0.47.1";

  version = "0.50.3";



  src = fetchFromGitHub rec {

    owner = "JGRennison";

    repo = "OpenTTD-patches";

    rev = "jgrpp-${version}";

    hash = "sha256-AMd2KXy/ODByeV9CkEd51KbE/+fZ8Us3WzsWCnn7nh0=";

    hash = "sha256-VJ8Qd4wiFbX/aY8pEWlh9wEjML0c7P8yrOC1fiQD7ts=";

  };



  buildInputs = oldAttrs.buildInputs ++ [ zstd ];