public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-01-28 10:46:13 +01:00
parent 778f317820 e328078fe0
commit dce0ca29d9
745 changed files with 15146 additions and 15353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/crispy-doom/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "crispy-doom";
version = "5.6.3";
version = "5.6.4";
src = fetchFromGitHub {
owner = "fabiangreffrath";
repo = pname;
rev = "${pname}-${version}";
sha256 = "0f319979wqfgm4pvsa6y5clg30p55l441kmrr8db0p5smyv3x2s4";
sha256 = "1ls4v2kpb7vi7xji5yqbmyc5lfkz497h1vvj9w86wkrw8k59hlg2";
};
postPatch = ''

10
pkgs/games/empty-epsilon/default.nix
View File

@@ -2,9 +2,9 @@
let
major = "2019";
minor = "11";
patch = "01";
major = "2020";
minor = "01";
patch = "15";
version = "${major}.${minor}.${patch}";
@@ -16,7 +16,7 @@ let
owner = "daid";
repo = "SeriousProton";
rev = "EE-${version}";
sha256 = "1sc1z9n99jspa8jnk0pwdzynnadvcmb3pxl5cndw3z90xjwpzivw";
sha256 = "0isiy18dv22cpv7wdbvqss2afha719a7i76bvw4cs14vfsdx9s8w";
};
nativeBuildInputs = [ cmake ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
owner = "daid";
repo = "EmptyEpsilon";
rev = "EE-${version}";
sha256 = "09jizc6h7jbsp8bzv05pvb5z24zadjzjx1slj5317axsb170v81p";
sha256 = "0jklfap9jd9ynhvwzr9q4icvx5yb4sqm457vcar4jads4pwsd0xk";
};
nativeBuildInputs = [ cmake ];

6
pkgs/games/mindustry/default.nix
View File

@@ -19,14 +19,14 @@ let
# Note: when raising the version, ensure that all SNAPSHOT versions in
# build.gradle are replaced by a fixed version
# (the current one at the time of release) (see postPatch).
version = "102";
version = "103";
buildVersion = makeBuildVersion version;
src = fetchFromGitHub {
owner = "Anuken";
repo = "Mindustry";
rev = "v${version}";
sha256 = "0g4zy2zlynv6f427pq1ngnl0zpr6nnih10wd2l8vl9bxwzjygwdr";
sha256 = "0s9pzmnq2v3glbmb6kqifar62wi44z4sg14dnayyj0fjkx6sh05s";
};
desktopItem = makeDesktopItem {
@@ -65,7 +65,7 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1sscxrr32f2agwz34pm491xqkz7m4bwdc1p3g64kcnl3p6rg7r7k";
outputHash = "16k058fw9yk89adx8j1708ynfri5yizmmvh49prls9slw4hipffb";
};
in stdenv.mkDerivation rec {

6
pkgs/games/minecraft-server/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, jre }:
stdenv.mkDerivation {
pname = "minecraft-server";
version = "1.14.4";
version = "1.15.2";
src = fetchurl {
url = "https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar";
sha256 = "0aapiwgx9bmnwgmrra9459qfl9bw8q50sja4lhhr64kf7amyvkay";
url = "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar";
sha256 = "12kynrpxgcdg8x12wcvwkxka0fxgm5siqg8qq0nnmv0443f8dkw0";
};
preferLocalBuild = true;

7
pkgs/games/minecraft/default.nix
View File

@@ -84,11 +84,11 @@ in
stdenv.mkDerivation rec {
pname = "minecraft-launcher";
version = "2.1.9618";
version = "2.1.11314";
src = fetchurl {
url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
sha256 = "1wk7414i9n6yvhhc0g3cpqjs4ryklmdp2pxgvfdg9zibjdx0avvy";
sha256 = "1wd3zh91zamlpgnqlk7sq3xja2g5qz34amy4v8yhdxkhj79plwhg";
};
icon = fetchurl {
@@ -112,7 +112,8 @@ in
makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \
--prefix LD_LIBRARY_PATH : ${envLibPath} \
--prefix PATH : ${stdenv.lib.makeBinPath [ jre ]}
--prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \
--run "cd /tmp" # Do not create `GPUCache` in current directory
'';
preFixup = ''

31
pkgs/games/nudoku/default.nix Normal file
View File

@@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext, ncurses }:
stdenv.mkDerivation rec {
pname = "nudoku";
version = "2.0.0";
src = fetchFromGitHub {
owner = "jubalh";
repo = pname;
rev = version;
sha256 = "0rj8ajni7gssj0qbf1jn51699sadxwsr6ca2718w74psv7acda8h";
};
# Allow gettext 0.20
postPatch = ''
substituteInPlace configure.ac --replace 0.19 0.20
'';
nativeBuildInputs = [ autoreconfHook pkgconfig gettext ];
buildInputs = [ ncurses ];
configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-nls";
meta = with stdenv.lib; {
description = "An ncurses based sudoku game";
homepage = "http://jubalh.github.io/nudoku/";
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
};
}

38
pkgs/games/pentobi/default.nix Normal file
View File

@@ -0,0 +1,38 @@
{ stdenv, appstream, fetchurl, cmake, gettext, libxslt, librsvg, itstool
, qtbase, qtquickcontrols2, qtsvg, qttools, qtwebview, docbook_xsl
, wrapQtAppsHook
}:
with stdenv.lib;
stdenv.mkDerivation rec {
version = "17.3";
pname = "pentobi";
src = fetchurl {
url = "mirror://sourceforge/pentobi/${pname}-${version}.tar.xz";
sha256 = "00c495i4vrji9hs7v8xr9gm8yqs97bfk2wzsayhps11hmbqzllx9";
};
nativeBuildInputs = [ cmake docbook_xsl wrapQtAppsHook ];
buildInputs = [ appstream qtbase qtsvg qtquickcontrols2 qttools qtwebview itstool librsvg ];
patchPhase = ''
substituteInPlace pentobi_thumbnailer/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/"
substituteInPlace pentobi/unix/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/"
substituteInPlace pentobi/docbook/CMakeLists.txt --replace "/html" "/share/xml/docbook-xsl/html"
'';
cmakeFlags = [
"-DCMAKE_VERBOSE_MAKEFILE=1"
"-DDOCBOOKXSL_DIR=${docbook_xsl}"
"-DMETAINFO_ITS=${appstream}/share/gettext/its/metainfo.its"
];
meta = {
description = "A computer opponent for the board game Blokus";
homepage = https://pentobi.sourceforge.io;
license = licenses.gpl3;
maintainers = [ maintainers.genesis ];
platforms = platforms.linux;
};
}

4
pkgs/games/quakespasm/vulkan.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "vkquake";
version = "1.03.0";
version = "1.04.1";
src = fetchFromGitHub {
owner = "Novum";
repo = "vkQuake";
rev = version;
sha256 = "1x2lx1fvr2p91clbx2jcc29j5yyh0xwq9fh0lyxhyadf5a710fn0";
sha256 = "1ry861pk3z02hy7i0yi3xwmd1zma802qzcnlm09w6pslayd9rwbf";
};
sourceRoot = "source/Quake";

4
pkgs/games/snake4/default.nix
View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "snake4-1.0.14";
src = fetchurl {
url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
url = "https://shh.thathost.com/pub-unix/files/${name}.tar.gz";
sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9";
};
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A game starring a fruit-eating snake";
homepage = http://shh.thathost.com/pub-unix/html/snake4.html;
homepage = https://shh.thathost.com/pub-unix/html/snake4.html;
license = licenses.artistic1;
platforms = platforms.linux;
};

2
pkgs/games/spring/springlobby.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
homepage = http://springlobby.info/;
homepage = https://springlobby.info/;
repositories.git = git://github.com/springlobby/springlobby.git;
description = "Cross-platform lobby client for the Spring RTS project";
license = licenses.gpl2;

2
pkgs/games/steam/chrootenv.nix
View File

@@ -75,7 +75,7 @@ in buildFHSUserEnv rec {
xorg.libX11
xorg.libXfixes
libGL
pkgsi686Linux.libva
libva
# Not formally in runtime but needed by some games
at-spi2-atk

2
pkgs/games/stepmania/default.nix
View File

@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
homepage = http://www.stepmania.com/;
homepage = https://www.stepmania.com/;
description = "Free dance and rhythm game for Windows, Mac, and Linux";
platforms = platforms.linux;
license = licenses.mit; # expat version

4
pkgs/games/stockfish/default.nix
View File

@@ -4,7 +4,7 @@ let arch = if stdenv.isx86_64 then "x86-64" else
if stdenv.isi686 then "x86-32" else
"unknown";
version = "10";
version = "11";
in
stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz";
sha256 = "1lrxqq8fw1wrw5b45r4s3ddd51yr85a2k8a9i1wjvyd6v9vm7761";
sha256 = "16di83s79gf9kzdhcal5y0q9d59544gd5xqf1k8bwrqvc36628l0";
};
postUnpack = "sourceRoot+=/src";

2
pkgs/games/tdm/default.nix
View File

@@ -20,7 +20,7 @@ let
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z";
url = "https://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z";
sha256 = "17wdpip8zvm2njz0xrf7xcxl73hnsc6i83zj18kn8rnjkpy50dd6";
};
nativeBuildInputs = [

31
pkgs/games/teeworlds/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchFromGitHub, stdenv, bam, pkgconfig, python, alsaLib
{ fetchFromGitHub, stdenv, cmake, pkgconfig, python, alsaLib
, libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack
}:
@@ -21,35 +21,12 @@ stdenv.mkDerivation rec {
'#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"'
'';
nativeBuildInputs = [ bam pkgconfig ];
configurePhase = ''
runHook preConfigure
bam config
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
bam conf=release
runHook postBuild
'';
installPhase = ''
mkdir -p $out/bin $out/share/teeworlds
cp build/x86_64/release/teeworlds{,_srv} $out/bin
cp -r build/x86_64/release/data $out/share/teeworlds
'';
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
python alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack
];
postInstall = ''
mkdir -p $out/share/doc/teeworlds
cp -v *.txt $out/share/doc/teeworlds/
'';
meta = {
description = "Retro multiplayer shooter game";
@@ -60,9 +37,9 @@ stdenv.mkDerivation rec {
Flag. You can even design your own maps!
'';
homepage = https://teeworlds.com/;
homepage = "https://teeworlds.com/";
license = "BSD-style, see `license.txt'";
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = ["x86_64-linux" "i686-linux"];
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/games/zandronum/default.nix
View File

@@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
homepage = http://zandronum.com/;
homepage = https://zandronum.com/;
description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
maintainers = with maintainers; [ lassulus MP2E ];
license = licenses.unfreeRedistributable;