diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-05 08:33:39 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-05 08:33:39 +0200 |
commit | 866c5aa090d8f4c7f6e1b983531b7b8be4d354ac (patch) | |
tree | 0e4eb93b126a8d8fe60413b0fa20176d2791add6 /pkgs/games | |
parent | 95419ade3e8bbe9b0bcfc7d7e6f25c23d5a0b21b (diff) | |
parent | f601ab37c2fb7e5f65989a92df383bcd6942567a (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/minecraft-server/default.nix | 17 | ||||
-rw-r--r-- | pkgs/games/openttd/default.nix | 24 | ||||
-rw-r--r-- | pkgs/games/scummvm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/scummvm/games.nix | 30 | ||||
-rw-r--r-- | pkgs/games/steam/runtime-generated.nix | 72 |
5 files changed, 106 insertions, 39 deletions
diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 4751660af3add..956fbdf3aae39 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; version = "1.15.2"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar"; + url = + "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar"; sha256 = "12kynrpxgcdg8x12wcvwkxka0fxgm5siqg8qq0nnmv0443f8dkw0"; }; @@ -16,7 +17,7 @@ stdenv.mkDerivation { cat > $out/bin/minecraft-server << EOF #!/bin/sh - exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui + exec ${jre_headless}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui EOF chmod +x $out/bin/minecraft-server @@ -24,11 +25,11 @@ stdenv.mkDerivation { phases = "installPhase"; - meta = { + meta = with stdenv.lib; { description = "Minecraft Server"; - homepage = "https://minecraft.net"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice tomberek costrouc]; + homepage = "https://minecraft.net"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice tomberek costrouc ]; }; } diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 704ef3c327e9c..b0f70775bfdd3 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -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 ]; }; } diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 80fa840cc69b5..fe6a7f7cac263 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; - homepage = https://www.scummvm.org/; + homepage = "https://www.scummvm.org/"; license = licenses.gpl2; maintainers = [ maintainers.peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix index a96250e7acb6d..3cfb87a090a6d 100644 --- a/pkgs/games/scummvm/games.nix +++ b/pkgs/games/scummvm/games.nix @@ -74,6 +74,21 @@ in { files = [ "sky.*" ]; }; + broken-sword-25 = generic rec { + plong = "Broken Sword 2.5"; + pshort = "sword25"; + pcode = "sword25"; + description = "A fan game of the Broken Sword series"; + version = "1.0"; + src = fetchurl { + url = "mirror://sourceforge/scummvm/${pshort}-v${version}.zip"; + sha256 = "0ivj1vflfpih5bs5a902mab88s4d77fwm3ya3fk7pammzc8gjqzz"; + }; + sourceRoot = "."; + docs = [ "README" "license-original.txt" ]; + files = [ "data.b25c" ]; + }; + drascula-the-vampire-strikes-back = generic rec { plong = "Drascula: The Vampire Strikes Back"; pshort = "drascula"; @@ -95,6 +110,21 @@ in { files = [ "Packet.001" ]; }; + dreamweb = generic rec { + plong = "Dreamweb"; + pshort = "dreamweb"; + pcode = "dreamweb"; + description = "2D point-and-click cyberpunk top-down adventure game"; + version = "1.1"; + src = fetchurl { + url = "mirror://sourceforge/scummvm/${pshort}-cd-uk-${version}.zip"; + sha256 = "0hh1p3rd7s0ckvri14lc6wdry9vv0vn4h4744v2n4zg63j8i6vsa"; + }; + sourceRoot = "."; + docs = [ "license.txt" ]; + files = [ "DREAMWEB.*" "SPEECH" "track01.flac" ]; + }; + flight-of-the-amazon-queen = generic rec { plong = "Flight of the Amazon Queen"; pshort = "fotaq"; diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 3ed030c0094d9..36f16b6155ba9 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -1444,9 +1444,9 @@ }; } rec { - name = "libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_amd64"; - sha256 = "e70dbce3db8d74df853dd10265d37c8b4b4f7336043f79ae480be3d6922c206c"; - url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_amd64.deb"; + name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64"; + sha256 = "99b0d38e6a2240dbea57c3ebee18de7013ee5d346c82bc82243c18e66bc50ae4"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; @@ -1975,18 +1975,36 @@ }; } rec { - name = "vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_amd64"; - sha256 = "01420d08d0c99d4f70d350af91ac127635e6a75a88200350a4691b8440a7926c"; - url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_amd64.deb"; + name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; + sha256 = "b5c0c3fd9f5329f2aff54ce73f9281e3e61156556e1ee50c697b37f2144b1531"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-tools.deb"; + }; + } + rec { + name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; + sha256 = "33b03b9413ec308f5ee5b8699e9f9ad939b501b602eea185fdcaa69863deb70c"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-tools-multiarch.deb"; + }; + } + rec { + name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all"; + sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "vulkan-utils.deb"; }; } rec { - name = "vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_amd64"; - sha256 = "ea9fbf565059fc5106a2a13bd56e5a37f2d641655304fd0d4b0d3989b69a8046"; - url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_amd64.deb"; + name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; + sha256 = "a1e9387bb5cb7effb23c5994dd2724614cfed7a447ec9c449ee4effcab58fd4c"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "vulkan-utils-multiarch.deb"; @@ -3480,9 +3498,9 @@ }; } rec { - name = "libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_i386"; - sha256 = "4e06285406434cc1184884438a15e6dd11f1d9aa2e1d6c95d2138fbe0f61a172"; - url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_i386.deb"; + name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386"; + sha256 = "ac161149e1106247de706788a7ea29dbe5e3c17c2b8aedf97ec892b311abbb75"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; @@ -4011,18 +4029,36 @@ }; } rec { - name = "vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_i386"; - sha256 = "2deda8ceeaef31ec4103e614282e554f360db2a7f51e2e868918845cb1187c75"; - url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_i386.deb"; + name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; + sha256 = "6a8576cc6fadc4d18c97b100dc24bad1906f6f56cab024997787355025695df4"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-tools.deb"; + }; + } + rec { + name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; + sha256 = "fae0430f540c71bd8f6ab3099f8aa132d2eda858b66facf3d8a586ab38cffde6"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-tools-multiarch.deb"; + }; + } + rec { + name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all"; + sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "vulkan-utils.deb"; }; } rec { - name = "vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_i386"; - sha256 = "13be3dd08ade9e67e7a3b870ee0787c2a96d6c2f99b3173c5439f643d52be220"; - url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_i386.deb"; + name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; + sha256 = "f81b81ef14f11662d2d5e5a7f688c2ef4f9ad9625ec5e59de91aab3f1ad45406"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "vulkan-utils-multiarch.deb"; |