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

Merge branch 'master' into staging

Browse Source 
Hydra: ?compare=1415011
This commit is contained in:
Vladimír Čunát
2017-12-01 09:18:58 +01:00
parent da3679c160 6d0fbb9dc4
commit 9f8c3f77ea
54 changed files with 1459 additions and 1369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/compilers/chez/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchgit, coreutils, ncurses, libX11 }:
{ stdenv, fetchgit, coreutils, cctools, ncurses, libiconv, libX11 }:
stdenv.mkDerivation rec {
name = "chez-scheme-${version}";
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
enableParallelBuilding = true;
buildInputs = [ ncurses libX11 ];
nativeBuildInputs = [ coreutils ] ++ stdenv.lib.optional stdenv.isDarwin cctools;
buildInputs = [ ncurses libiconv libX11 ];
/* We patch out a very annoying 'feature' in ./configure, which
** tries to use 'git' to update submodules.
@@ -27,11 +28,14 @@ stdenv.mkDerivation rec {
--replace "git submodule init && git submodule update || exit 1" "true"
substituteInPlace ./workarea \
--replace "/bin/ln" "${coreutils}/bin/ln" \
--replace "/bin/cp" "${coreutils}/bin/cp"
--replace "/bin/ln" ln \
--replace "/bin/cp" cp
substituteInPlace ./makefiles/installsh \
--replace "/usr/bin/true" "${coreutils}/bin/true"
substituteInPlace zlib/configure \
--replace "/usr/bin/libtool" libtool
'';
/* Don't use configureFlags, since that just implicitly appends
@@ -42,11 +46,13 @@ stdenv.mkDerivation rec {
./configure --threads --installprefix=$out --installman=$out/share/man
'';
enableParallelBuilding = true;
meta = {
description = "A powerful and incredibly fast R6RS Scheme compiler";
homepage = "http://www.scheme.com";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
};
}

1
pkgs/development/compilers/julia/0.5.nix
View File

@@ -160,7 +160,6 @@ stdenv.mkDerivation rec {
# Julia's tests require read/write access to $HOME
preCheck = ''
export HOME="$NIX_BUILD_TOP"
set
'';
preBuild = ''

1
pkgs/development/compilers/julia/0.6.nix
View File

@@ -163,7 +163,6 @@ stdenv.mkDerivation rec {
# Julia's tests require read/write access to $HOME
preCheck = ''
export HOME="$NIX_BUILD_TOP"
set
'';
preBuild = ''

16
pkgs/development/libraries/libminc/default.nix
View File

@@ -1,12 +1,14 @@
{ stdenv, fetchurl, cmake, zlib, netcdf, hdf5 }:
{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, hdf5 }:
stdenv.mkDerivation rec {
_name = "libminc";
name = "${_name}-2.3.00";
name = "${pname}-2.3.00";
pname = "libminc";
src = fetchurl {
url = "https://github.com/BIC-MNI/${_name}/archive/${_name}-2-3-00.tar.gz";
sha256 = "04ngqx4wkssxs9qqcgq2bvfs1cldcycmpcx587wy3b3m6lwf004c";
src = fetchFromGitHub {
owner = "BIC-MNI";
repo = pname;
rev = builtins.replaceStrings [ "." ] [ "-" ] name;
sha256 = "1gv1rq1q1brhglll2256cm6sns77ph6fvgbzk3ihkzq46y07yi9s";
};
nativeBuildInputs = [ cmake ];
@@ -18,6 +20,8 @@ stdenv.mkDerivation rec {
checkPhase = "ctest";
doCheck = true;
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://github.com/BIC-MNI/libminc;
description = "Medical imaging library based on HDF5";

10
pkgs/development/libraries/nettle/3.3.nix Normal file
View File

@@ -0,0 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.3";
src = fetchurl {
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526";
};
})

7
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@@ -126,16 +126,11 @@ stdenv.mkDerivation rec {
sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf
'';
postConfigure = ''
echo "applying patch ${./parallel-build.patch}"
patch -p1 < ${./parallel-build.patch}
'';
prefixKey = "-prefix ";
configureFlags =
''
-v -no-separate-debug-info -release -no-fast -confirm-license -opensource
-v -no-separate-debug-info -release -fast -confirm-license -opensource
-${if stdenv.isFreeBSD then "no-" else ""}opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
-qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked

6
pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch
View File

@@ -1,6 +0,0 @@
--- a/tools/designer/src/lib/Makefile
+++ b/tools/designer/src/lib/Makefile
@@ -7167,2 +7167,3 @@ compiler_moc_header_clean:
.uic/release-shared/ui_qtgradientviewdialog.h \
+ .uic/release-shared/ui_qtgradientview.h \
../../../shared/qtgradienteditor/qtgradientviewdialog.h

1
pkgs/development/libraries/wiredtiger/default.nix
View File

@@ -71,5 +71,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = intersectLists platforms.unix platforms.x86_64;
maintainers = with maintainers; [ wkennington ];
broken = true; # Broken by f689a6d1c6796c4a4f116ffec6c4624379e04bc9.
};
}

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

@@ -1,5 +1,11 @@
{ stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
, gnutls, nettle }:
, gnutls, nettle_3_3 }:
# These overrides are just temporary, until ocamlnet supports nettle-3.4.
let gnutls_orig = gnutls; in
let gnutls = gnutls_orig.override { nettle = nettle_3_3; };
nettle = nettle_3_3;
in
let version = "4.1.4"; in

5
pkgs/development/ocaml-modules/re/default.nix
View File

@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild ounit ];
configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
configurePhase = "ocaml setup.ml -configure --prefix $out"
+ stdenv.lib.optionalString doCheck " --enable-tests";
buildPhase = "ocaml setup.ml -build";
doCheck = true;
doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06";
checkPhase = "ocaml setup.ml -test";
installPhase = "ocaml setup.ml -install";

2
pkgs/development/python-modules/ws4py/default.nix
View File

@@ -15,7 +15,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ asyncio cherrypy gevent tornado ];
checkPhase = ''
pytest test
pytest -k 'not test_timeout_when_no_registered_fds and not test_mainloop_can_be_stopped_when_no_websocket_were_registered'
'';
meta = with stdenv.lib; {

7
pkgs/development/r-modules/default.nix
View File

@@ -279,7 +279,6 @@ let
ncdf4 = [ pkgs.netcdf ];
nloptr = [ pkgs.nlopt ];
odbc = [ pkgs.unixODBC ];
openssl = [ pkgs.openssl pkgs.openssl.dev ];
outbreaker = [ pkgs.gsl_1 ];
pander = [ pkgs.pandoc pkgs.which ];
pbdMPI = [ pkgs.openmpi ];
@@ -837,10 +836,8 @@ let
});
openssl = old.openssl.overrideDerivation (attrs: {
OPENSSL_INCLUDES = "${pkgs.openssl.dev}/include";
preConfigure = ''
sed -i.bak 's|^\( *PKG_LIBS_VERSIONED=\).*$|\1$PKG_LIBS|' configure
'';
PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";
PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto";
});
Rserve = old.Rserve.overrideDerivation (attrs: {

5
pkgs/development/tools/rtags/default.nix
View File

@@ -2,19 +2,18 @@
stdenv.mkDerivation rec {
name = "rtags-${version}";
version = "2.15";
version = "2.16";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ llvmPackages.llvm openssl emacs ]
++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]
++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
src = fetchgit {
rev = "refs/tags/v${version}";
fetchSubmodules = true;
url = "https://github.com/andersbakken/rtags.git";
sha256 = "12nnyav2q1ddkz9wm0aclhn7r74xj4ibrb0x05k7mcf694bg79c0";
sha256 = "15qmwkajw2zzfnw9hnv08p0asa6prg88nvqlxmv56c0dyhldjpkm";
# unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation
postFetch = ''