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

Merge branch 'staging'

Browse Source
This commit is contained in:
Vladimír Čunát
2016-08-10 22:09:38 +02:00
parent f191b65820 6f5c6fb6a1
commit 947abb08ac
30 changed files with 180 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/hhvm/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl
[ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl
libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
@@ -29,8 +29,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false; # occasional build problems;
dontUseCmakeBuildDir = true;
NIX_LDFLAGS = "-lpam -L${pam}/lib";
MYSQL_INCLUDE_DIR="${mariadb}/include/mysql";
MYSQL_DIR=mariadb;
# work around broken build system
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";

8
pkgs/development/compilers/urweb/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, file, openssl, mlton
{ stdenv, lib, fetchurl, file, openssl, mlton
, mysql, postgresql, sqlite
}:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "08km96hli5yp754nsxxjzih2la0m89j5wc2cq12rkas43nqqgr65";
};
buildInputs = [ openssl mlton mysql postgresql sqlite ];
buildInputs = [ openssl mlton mysql.client postgresql sqlite ];
prePatch = ''
sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
preConfigure = ''
export PGHEADER="${postgresql}/include/libpq-fe.h";
export MSHEADER="${mysql.lib}/include/mysql/mysql.h";
export MSHEADER="${lib.getDev mysql.client}/include/mysql/mysql.h";
export SQHEADER="${sqlite.dev}/include/sqlite3.h";
export CCARGS="-I$out/include \
-L${mysql.lib}/lib/mysql \
-L${lib.getLib mysql.client}/lib/mysql \
-L${postgresql.lib}/lib \
-L${sqlite.out}/lib";
'';

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

@@ -7,11 +7,11 @@
else stdenv.mkDerivation)
(rec {
name = "guile-2.0.11";
name = "guile-2.0.12";
src = fetchurl {
url = "mirror://gnu/guile/${name}.tar.xz";
sha256 = "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f";
sha256 = "1sdpjq0jf1h65w29q0zprj4x6kdp5jskkvbnlwphy9lvdxrqg0fy";
};
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];

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

@@ -107,7 +107,7 @@ let
};
mysql = {
configureFlags = ["--with-mysql=${mysql.lib}"];
configureFlags = ["--with-mysql"];
buildInputs = [ mysql.lib ];
};

22
pkgs/development/libraries/fftw/default.nix
View File

@@ -1,24 +1,34 @@
{ fetchurl, stdenv, lib, precision ? "double" }:
{ fetchFromGitHub , stdenv, lib, ocaml, perl, indent, transfig, ghostscript, texinfo, libtool, gettext, automake, autoconf, precision ? "double" }:
with lib;
assert elem precision [ "single" "double" "long-double" "quad-precision" ];
let version = "3.3.4"; in
let version = "3.3.5-rc1"; in
stdenv.mkDerivation rec {
name = "fftw-${precision}-${version}";
src = fetchurl {
url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g";
src = fetchFromGitHub {
owner = "FFTW";
repo = "fftw3";
rev = "fftw-${version}";
sha256 = "1gc57xvdqbapq30ylj3fxwkv61la4kzyf7ji0q0xqjwpji2ynqi4";
};
nativeBuildInputs = [ ocaml perl indent transfig ghostscript texinfo libtool gettext automake autoconf ];
# remove the ./configure lines, so we can use nix's configureFlags
patchPhase = "sed -e '27,29d' -i bootstrap.sh";
preConfigurePhases = "./bootstrap.sh";
outputs = [ "dev" "out" "doc" ]; # it's dev-doc only
outputBin = "dev"; # fftw-wisdom
configureFlags =
[ "--enable-shared" "--disable-static"
[ "--enable-maintainer-mode"
"--enable-shared" "--disable-static"
"--enable-threads"
]
++ optional (precision != "double") "--enable-${precision}"

4
pkgs/development/libraries/gtk+/3.x.nix
View File

@@ -13,7 +13,7 @@ with stdenv.lib;
let
ver_maj = "3.20";
ver_min = "6";
ver_min = "8";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2";
sha256 = "9841bd9b4d23c045c474b10fdde9da958af904b63783701e796391d55d4396f3";
};
outputs = [ "dev" "out" ];

2
pkgs/development/libraries/libdbi-drivers/default.nix
View File

@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
"--with-dbi-libdir=${libdbi}/lib"
] ++ optionals (libmysql != null) [
"--with-mysql"
"--with-mysql-incdir=${libmysql}/include/mysql"
"--with-mysql-libdir=${libmysql}/lib/mysql"
] ++ optionals (postgresql != null) [
"--with-pgsql"
"--with-pgsql_incdir=${postgresql}/include"

7
pkgs/development/libraries/libva/default.nix
View File

@@ -19,10 +19,9 @@ stdenv.mkDerivation rec {
++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
# TODO: share libs between minimal and !minimal - perhaps just symlink them
configureFlags = lib.optionals (!minimal) [
"--with-drivers-path=${mesa_noglu.driverLink}/lib/dri"
"--enable-glx"
];
configureFlags =
[ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++
lib.optionals (!minimal) [ "--enable-glx" ];
installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];

2
pkgs/development/libraries/mesa/default.nix
View File

@@ -144,8 +144,6 @@ stdenv.mkDerivation {
'' + /* set the default search path for DRI drivers; used e.g. by X server */ ''
substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
'' + /* move vdpau drivers to $drivers/lib, so they are found */ ''
mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau
'';
#ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM */

6
pkgs/development/libraries/mesa/symlink-drivers.patch
View File

@@ -11,7 +11,7 @@ diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/dri/Makefile.am mesa-11.1.
install-data-hook:
for i in $(TARGET_DRIVERS); do \
- ln -f $(DESTDIR)$(dridir)/gallium_dri.so \
+ ln -sf $(DESTDIR)$(dridir)/gallium_dri.so \
+ ln -srf $(DESTDIR)$(dridir)/gallium_dri.so \
$(DESTDIR)$(dridir)/$${i}_dri.so; \
done; \
- $(RM) $(DESTDIR)$(dridir)/gallium_dri.*
@@ -36,7 +36,7 @@ diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/vdpau/Makefile.am mesa-11.
k=libvdpau_$${i}.$(LIB_EXT); \
l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \
- ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
+ ln -sf $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
+ ln -srf $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
$${dest_dir}/$${l}; \
ln -sf $${l} \
$${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
@@ -62,7 +62,7 @@ diff -ru -x '*~' mesa-11.1.4-orig/src/mesa/drivers/dri/Makefile.am mesa-11.1.4/s
install-data-hook:
for i in $(MEGADRIVERS); do \
- ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
+ ln -sf $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
+ ln -srf $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
$(DESTDIR)$(dridir)/$$i; \
done;
- $(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.*

9
pkgs/development/libraries/opendbx/default.nix
View File

@@ -1,5 +1,8 @@
{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
let
inherit (stdenv.lib) getDev getLib;
in
stdenv.mkDerivation rec {
name = "opendbx-1.4.6";
@@ -9,10 +12,10 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
export CPPFLAGS="-I${mysql.lib}/include/mysql"
export LDFLAGS="-L${mysql.lib}/lib/mysql"
export CPPFLAGS="-I${getDev mysql.client}/include/mysql"
export LDFLAGS="-L${getLib mysql.client}/lib/mysql -L${getLib postgresql}/lib"
configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
'';
buildInputs = [ readline mysql.lib postgresql sqlite ];
buildInputs = [ readline mysql.client postgresql sqlite ];
}

2
pkgs/development/libraries/qt-3/default.nix
View File

@@ -47,7 +47,7 @@ stdenv.mkDerivation {
-I${randrproto}/include" else "-no-xrandr"}
${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"}
${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""}
${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""}
${if mysqlSupport then "-qt-sql-mysql -L${stdenv.lib.getLib mysql.client}/lib/mysql -I${mysql.client}/include/mysql" else ""}
${if xftSupport then "-xft
-L${libXft.out}/lib -I${libXft.dev}/include
-L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include

2
pkgs/development/libraries/unixODBCDrivers/default.nix
View File

@@ -37,7 +37,7 @@
};
nativeBuildInputs = [ cmake ];
buildInputs = [ unixODBC mariadb ];
buildInputs = [ unixODBC mariadb.lib ];
cmakeFlags = [
"-DMARIADB_INCLUDE_DIR=${mariadb.lib}/include/mysql"

6
pkgs/development/lisp-modules/lisp-packages.nix
View File

@@ -192,7 +192,7 @@ let lispPackages = rec {
version = "git-20150514";
description = "Common Lisp SQL Interface library";
deps = [uffi];
buildInputs = [pkgs.mysql.lib pkgs.zlib];
buildInputs = [pkgs.mysql.client pkgs.zlib];
# Source type: git
src = pkgs.fetchgit {
url =
@@ -204,8 +204,8 @@ let lispPackages = rec {
};
overrides = x:{
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.lib}/include/mysql"
export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.lib}/lib/mysql"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${stdenv.lib.getDev pkgs.mysql.client}/include/mysql"
export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.lib.getLib pkgs.mysql.client}/lib/mysql"
'';
};
};

8
pkgs/development/ocaml-modules/mysql/default.nix
View File

@@ -23,15 +23,11 @@ stdenv.mkDerivation {
"--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql"
];
buildInputs = [ocaml findlib mysql.lib camlp4 ];
buildInputs = [ocaml findlib camlp4 ];
createFindlibDestdir = true;
propagatedBuildInputs = [ mysql.lib ];
preConfigure = ''
export LDFLAGS="-L${mysql.lib}/lib/mysql"
'';
propagatedBuildInputs = [ mysql.client ];
buildPhase = ''
make

2
pkgs/development/pure-modules/glpk/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
substituteInPlace configure \
--replace /usr/include/mysql ${libmysql}/include/mysql
--replace /usr/include/mysql ${lib.getDev libmysql}/include/mysql
'';
configureFlags = [ "--enable-dl"
"--enable-odbc"

8
pkgs/development/tools/build-managers/cmake/default.nix
View File

@@ -10,8 +10,8 @@ assert wantPS -> (ps != null);
let
os = stdenv.lib.optionalString;
majorVersion = "3.4";
minorVersion = "3";
majorVersion = "3.6";
minorVersion = "0";
version = "${majorVersion}.${minorVersion}";
in
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
sha256 = "1yl0z422gr7zfc638chifv343vx0ig5gasvrh7nzf7b15488qgxp";
sha256 = "0w3n2i02jpbgai4dxsigm1c1i1qb5v70wyxckzwrxvs0ri0fs1gx";
};
patches =
@@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
--subst-var-by glibc_bin ${getBin glibc} \
--subst-var-by glibc_dev ${getDev glibc} \
--subst-var-by glibc_lib ${getLib glibc}
substituteInPlace Modules/FindCxxTest.cmake \
--replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
'';
configureFlags =
[ "--docdir=share/doc/${name}"