diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:50:21 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:50:21 +0200 |
| commit | 6c8aed6391a5e9f69cb59792aed58c5f33650275 (patch) | |
| tree | 29bdc77cfbcf01a583c7600f9df3426abe5f1e6d /pkgs/games | |
| parent | a0c34f54cc61dc20ae1ec91766b9efad102f5b36 (diff) | |
| parent | 8b57a7573c04cc02b86228bc263afe16bc3fe748 (diff) | |
| download | nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.gz nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.bz2 nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.lz nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.xz nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.zst nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/liquidwar/5.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/simutrans/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/spring/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/tintin/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/wesnoth/default.nix | 4 |
5 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index a4bd39f9998..5c42b8ecaab 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; license = licenses.gpl2Plus; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index d8ab792bb62..1004a6ad26f 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -164,6 +164,7 @@ let license = with licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ kkallio vcunat phile314 ]; platforms = with platforms; linux; # TODO: ++ darwin; + broken = true; }; }; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 9bfd917d1aa..e98148cbc83 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index eb4299a4092..9d62f720dd5 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pcre }: stdenv.mkDerivation rec { - name = "tintin-2.01.8"; + name = "tintin-2.01.90"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "056g82yi784mf4gbrida9fxqmz347m2l9vad2ksv2fhl7g553y2s"; + sha256 = "0v4khry5fmsp5w370v00ici5c8ryxak4mkaz9h4xfl1jk4mfygkb"; }; buildInputs = [ zlib pcre ]; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 64231b9c39c..e0f90d84b11 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.7"; + version = "1.14.9"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0j2yvkcggj5k0r2cqk8ndnj77m37a00srfd9qg7pdpqffbinqpj7"; + sha256 = "1mhdrlflxxyknf54lwdbvs7fazlc1scf7z6vxxa3j746fks533ga"; }; nativeBuildInputs = [ cmake pkgconfig ]; |