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

Merge branch 'master' into staging

Browse Source 
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
This commit is contained in:
Jan Malakhovski
2018-03-10 14:41:34 +00:00
parent 4eec6bc9c9 ddddca5c2f
commit 7079e744d4
927 changed files with 18154 additions and 12101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@@ -2,7 +2,7 @@
, libxml2, libxslt, ncurses, openssl, perl, autoreconfHook
, openjdk ? null # javacSupport
, unixODBC ? null # odbcSupport
, mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
, libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
}:
{ baseName ? "erlang"
@@ -17,7 +17,7 @@
, enableKernelPoll ? true
, javacSupport ? false, javacPackages ? [ openjdk ]
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
, wxSupport ? true, wxPackages ? [ mesa wxGTK xorg.libX11 ]
, wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ]
, preUnpack ? "", postUnpack ? ""
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""
@@ -31,7 +31,7 @@
assert wxSupport -> (if stdenv.isDarwin
then wxmac != null
else mesa != null && wxGTK != null && xorg != null);
else libGLU_combined != null && wxGTK != null && xorg != null);
assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk != null;

4
pkgs/development/interpreters/groovy/default.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
version = "2.4.12";
version = "2.4.14";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
sha256 = "1dm7m221pqbgh3lp1q1nvv6qc0fpja3cgsd0mx3ghahcfsfa3fck";
sha256 = "0an5ddfajg8jwdi1zdkpcz1g8ij1iyp0xh7zck2bl84j3pi4dj7r";
};
buildInputs = [ unzip makeWrapper ];

10
pkgs/development/interpreters/hy/default.nix
View File

@@ -2,15 +2,21 @@
pythonPackages.buildPythonApplication rec {
name = "hy-${version}";
version = "0.13.1";
version = "0.14.0";
src = fetchurl {
url = "mirror://pypi/h/hy/${name}.tar.gz";
sha256 = "1fjip998k336r26i1gpri18syvfjg7z46wng1n58dmc238wm53sx";
sha256 = "0cbdh1q0zm00p4h7i44kir4qhw0p6sid78xf6llrx2p21llsnv98";
};
propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ];
# The build generates a .json parser file in the home directory under .cache.
# This is needed to get it to not try and open files in /homeless-shelter
preConfigure = ''
export HOME=$TMP
'';
meta = {
description = "A LISP dialect embedded in Python";
homepage = http://hylang.org/;

4
pkgs/development/interpreters/io/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
ncurses, freetype, mesa, libpng, libtiff, libjpeg, readline, libsndfile,
ncurses, freetype, libGLU_combined, libpng, libtiff, libjpeg, readline, libsndfile,
libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
buildInputs = [
zlib sqlite gmp libffi cairo ncurses freetype
mesa libpng libtiff libjpeg readline libsndfile libxml2
libGLU_combined libpng libtiff libjpeg readline libsndfile libxml2
freeglut libsamplerate pcre libevent libedit yajl
pkgconfig glfw openssl libpthreadstubs libXdmcp
libmemcached python3

4
pkgs/development/interpreters/love/0.10.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, mesa, openal, luajit,
{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123
SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123
libvorbis libogg libtheora autoconf which libtool automake
];

4
pkgs/development/interpreters/love/0.7.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
, SDL, mesa, openal, lua
, SDL, libGLU_combined, openal, lua
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
SDL mesa openal lua
SDL libGLU_combined openal lua
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
];

4
pkgs/development/interpreters/love/0.8.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
, SDL, mesa, openal, lua
, SDL, libGLU_combined, openal, lua
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
SDL mesa openal lua
SDL libGLU_combined openal lua
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
];

4
pkgs/development/interpreters/love/0.9.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
, SDL2, mesa, openal, luajit
, SDL2, libGLU_combined, openal, luajit
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
SDL2 mesa openal luajit
SDL2 libGLU_combined openal luajit
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
];

4
pkgs/development/interpreters/lush/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, mesa, SDL
{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, libGLU_combined, SDL
, blas, libbfd, intltool, gettext, zlib, libSM}:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
libX11 libSM xproto indent readline gsl freeglut mesa SDL blas libbfd
libX11 libSM xproto indent readline gsl freeglut libGLU_combined SDL blas libbfd
intltool gettext zlib
];

4
pkgs/development/interpreters/octave/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk
, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGLU_combined, fltk
, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp
, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optional (jdk != null) jdk)
++ (stdenv.lib.optional (gnuplot != null) gnuplot)
++ (stdenv.lib.optional (python != null) python)
++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ])
++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGLU_combined libX11 ])
;
# makeinfo is required by Octave at runtime to display help

10
pkgs/development/interpreters/php/default.nix
View File

@@ -319,7 +319,7 @@ let
description = "An HTML-embedded scripting language";
homepage = http://www.php.net/;
license = licenses.php301;
maintainers = with maintainers; [ globin ];
maintainers = with maintainers; [ globin etu ];
platforms = platforms.all;
outputsToInstall = [ "out" "dev" ];
};
@@ -338,8 +338,8 @@ let
in {
php56 = generic {
version = "5.6.33";
sha256 = "1k1ip1slk89hkp57qiqp8k2m5yrg9lx5rja542g87k8xfslrdxh7";
version = "5.6.34";
sha256 = "1kgjgkabhrm8ksmh6j3m59vm85n401mcn7inh03hnjzfijflk7z1";
};
php70 = generic {
@@ -348,8 +348,8 @@ in {
};
php71 = generic {
version = "7.1.14";
sha256 = "1x41qmq66r0ff0573ln34d3qbzwg5z20nagsn1b6frfpkq9zvck3";
version = "7.1.15";
sha256 = "1gfw3ab9pvv034l9xk7ry23xsdz9vcwksrvmzkjmsj79713sa5z1";
};
php72 = generic {

6
pkgs/development/interpreters/renpy/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL2
, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
, libpng, ffmpeg, freetype, glew, libGLU_combined, fribidi, zlib
, glib
}:
@@ -26,13 +26,13 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
python cython wrapPython
SDL2 libpng ffmpeg freetype glew mesa fribidi zlib pygame_sdl2 glib
SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib
];
pythonPath = [ pygame_sdl2 ];
RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib
SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib
]);
buildPhase = ''