Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 72f784bf716a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d732374eac10
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 3, 2020

  1. openttd: 1.9.3 -> 1.10.0

    @prusnak
    prusnak committed Apr 3, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: A0E01EF44C27BF00
    Learn about vigilant mode
    Copy the full SHA
    f1e0844 View commit details

Commits on Apr 4, 2020

  1. Merge pull request #84207 from prusnak/openttd 

    openttd: 1.9.3 -> 1.10.0
    @bhipple
    bhipple authored Apr 4, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: A0E01EF44C27BF00
    Learn about vigilant mode
    Copy the full SHA
    d732374 View commit details
Showing with 12 additions and 12 deletions.
  1. +12 −12 pkgs/games/openttd/default.nix
24 changes: 12 additions & 12 deletions pkgs/games/openttd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,17 +6,17 @@

let
opengfx = fetchzip {
url = "https://binaries.openttd.org/extra/opengfx/0.5.5/opengfx-0.5.5-all.zip";
sha256 = "065l0g5nawcd6fkfbsfgviwgq9610y7gxzkpmd19i423d0lrq6d8";
url = "https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip";
sha256 = "1zg871j6kv7r0aqwca68d9kdf3smclgzan8hj76vj4fyfkykh173";
};

opensfx = fetchzip {
url = "https://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-0.2.3-all.zip";
url = "https://cdn.openttd.org/opensfx-releases/0.2.3/opensfx-0.2.3-all.zip";
sha256 = "1bb167kszdd6dqbcdjrxxwab6b7y7jilhzi3qijdhprpm5gf1lp3";
};

openmsx = fetchzip {
url = "https://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-0.3.1-all.zip";
url = "https://cdn.openttd.org/openmsx-releases/0.3.1/openmsx-0.3.1-all.zip";
sha256 = "0qnmfzz0v8vxrrvxnm7szphrlrlvhkwn3y92b4iy0b4b6yam0yd4";
};

@@ -29,11 +29,11 @@ let
in
stdenv.mkDerivation rec {
pname = "openttd";
version = "1.9.3";
version = "1.10.0";

src = fetchurl {
url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
sha256 = "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r";
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
sha256 = "0lz2y2rjc23k0d97y65cqhy2splw9cmrbvhgz0iqps8xkan1m8hv";
};

nativeBuildInputs = [ pkgconfig makeWrapper ];
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
''}
'';

meta = {
meta = with stdenv.lib; {
description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"'';
longDescription = ''
OpenTTD is a transportation economics simulator. In single player mode,
@@ -86,9 +86,9 @@ stdenv.mkDerivation rec {
- play cooperatively controlling the same business
- observe as spectators
'';
homepage = https://www.openttd.org/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny fpletz ];
homepage = "https://www.openttd.org/";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ jcumming the-kenny fpletz ];
};
}