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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-07-13 15:11:31 -07:00
parent d253b3d875 7e3c95a0b8
commit 333f145d76
178 changed files with 2917 additions and 1932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gdal/default.nix
View File

@@ -3,12 +3,12 @@
, libpng }:
composableDerivation.composableDerivation {} (fixed: rec {
version = "1.11.2";
version = "2.0.0";
name = "gdal-${version}";
src = fetchurl {
url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
sha256 = "53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6";
};
buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];

59
pkgs/development/libraries/gdal/gdal-1_11_2.nix Normal file
View File

@@ -0,0 +1,59 @@
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
, libpng }:
composableDerivation.composableDerivation {} (fixed: rec {
version = "1.11.2";
name = "gdal-${version}";
src = fetchurl {
url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
};
buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
patches = [
# This ensures that the python package is installed into gdal's prefix,
# rather than trying to install into python's prefix.
./python.patch
];
# Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
# Unset CC and CXX as they confuse libtool.
preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
configureFlags = [
"--with-jpeg=${libjpeg}"
"--with-libtiff=${libtiff}" # optional (without largetiff support)
"--with-libpng=${libpng}" # optional
"--with-libz=${zlib}" # optional
"--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${mysql.lib}/bin/mysql_config"
"--with-geotiff=${libgeotiff}"
"--with-python" # optional
"--with-static-proj4=${proj}" # optional
"--with-geos=${geos}/bin/geos-config"# optional
];
# Prevent this:
#
# Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/
# /nix/store/pbi1lgank10fy0xpjckbdpgacqw34dsz-python-2.7.9/bin/python -E -c pass
# TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files
# error: bad install directory or PYTHONPATH
preBuild = ''
pythonInstallDir=$out/lib/${python.libPrefix}/site-packages
mkdir -p $pythonInstallDir
export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir
'';
meta = {
description = "Translator library for raster geospatial data formats";
homepage = http://www.gdal.org/;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
};
})

4
pkgs/development/libraries/libressl/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libressl-${version}";
version = "2.1.6";
version = "2.2.1";
src = fetchurl {
url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
sha256 = "1a2k6sby6a1d0hf4hns6d13cvyck2i0figbkf1q0301vggcnv0jg";
sha256 = "0bapzvxrg09p4hlzdhsvk0ljc3gsjj4ixjpf09dn0fzwmd81fcsg";
};
enableParallelBuilding = true;

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

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "libspatialite-4.2.0";
src = fetchurl {
url = "http://www.gaia-gis.it/gaia-sins/${name}.tar.gz";
url = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz";
sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz";
};

34
pkgs/development/libraries/libunistring/default.nix
View File

@@ -1,24 +1,24 @@
{ fetchurl, stdenv, libiconv }:
stdenv.mkDerivation (rec {
name = "libunistring-0.9.3";
stdenv.mkDerivation rec {
name = "libunistring-0.9.6";
src = fetchurl {
url = "mirror://gnu/libunistring/${name}.tar.gz";
sha256 = "18q620269xzpw39dwvr9zpilnl2dkw5z5kz3mxaadnpv4k3kw3b1";
sha256 = "0ixxmgpgh2v8ifm6hbwsjxl023myk3dfnj7wnvmqjivza31fw9cn";
};
patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ];
propagatedBuildInputs =
stdenv.lib.optional ((! (stdenv ? glibc))
|| (stdenv ? cross &&
stdenv.cross.config == "i686-pc-mingw32"))
libiconv;
propagatedBuildInputs = [ libiconv ];
configureFlags = [
"--with-libiconv-prefix=${libiconv}"
];
# XXX: There are test failures on non-GNU systems, see
# http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html .
doCheck = (stdenv ? glibc);
doCheck = stdenv ? glibc;
meta = {
homepage = http://www.gnu.org/software/libunistring/;
@@ -52,19 +52,3 @@ stdenv.mkDerivation (rec {
platforms = stdenv.lib.platforms.all;
};
}
//
# On Cygwin Libtool is unable to find `libiconv.dll' if there's no explicit
# `-L/path/to/libiconv' argument on the linker's command line; and since it
# can't find the dll, it will only create a static library.
(if (stdenv ? glibc)
then {}
else { configureFlags = "--with-libiconv-prefix=${libiconv}"; })
//
# Don't run the native `strip' when cross-compiling.
(if (stdenv ? cross)
then { dontStrip = true; }
else { }))

5
pkgs/development/libraries/libxcomp/default.nix
View File

@@ -1,15 +1,16 @@
{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }:
let version = "3.5.0.31"; in
let version = "3.5.0.32"; in
stdenv.mkDerivation {
name = "libxcomp-${version}";
src = fetchurl {
sha256 = "1hi3xrjzr37zs72djw3k7gj6mn2bsihfw1iysl8l0i85jl6sdfkd";
sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
};
meta = with stdenv.lib; {
inherit version;
description = "NX compression library";
homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
license = licenses.gpl2;

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

@@ -1,6 +1,6 @@
x@{builderDefsPackage
, cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng
, coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa
, coin3d, jasper, gdal_1_11_2, xproto, libX11, libXmu, freeglut, mesa
, doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2
, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
, qt4, poppler, librsvg, gtk

20
pkgs/development/libraries/shhmsg/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "shhmsg-1.4.2";
src = fetchurl {
url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8";
};
installFlags = "INSTBASEDIR=$(out)";
meta = with stdenv.lib; {
description = "A library for displaying messages";
homepage = http://shh.thathost.com/pub-unix/;
license = licenses.artistic1;
platforms = platforms.linux;
};
}

19
pkgs/development/libraries/shhopt/default.nix Normal file
View File

@@ -0,0 +1,19 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "shhopt-1.1.7";
src = fetchurl {
url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds";
};
installFlags = "INSTBASEDIR=$(out)";
meta = with stdenv.lib; {
description = "A library for parsing command line options";
homepage = http://shh.thathost.com/pub-unix/;
license = licenses.artistic1;
platforms = platforms.linux;
};
}

4
pkgs/development/libraries/v8/3.16.14.nix
View File

@@ -8,12 +8,12 @@ in
stdenv.mkDerivation rec {
name = "v8-${version}";
version = "3.16.14";
version = "3.16.14.11";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
+ "${name}.tar.bz2";
sha256 = "073f33zcb7205jp9g5ha5d7j2hfa98zs0jql572nb552z0xw3rkz";
sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj";
};
configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''

35
pkgs/development/libraries/vigra/default.nix
View File

@@ -1,28 +1,31 @@
{ stdenv, fetchurl, cmake, libtiff, libpng, libjpeg, doxygen, python,
fftw, fftwSinglePrec, hdf5, boost, numpy }:
{ stdenv, fetchurl, boost, cmake, doxygen, fftw, fftwSinglePrec, hdf5, ilmbase
, libjpeg, libpng, libtiff, numpy, openexr, python }:
stdenv.mkDerivation rec {
name = "vigra-1.9.0";
name = "vigra-${version}";
version = "1.10.0";
src = fetchurl {
urls = [
"${meta.homepage}/${name}-src.tar.gz"
"${meta.homepage}-old-versions/${name}-src.tar.gz"
];
sha256 = "00fg64da6dj9k42d90dz6y7x91xw1xqppcla14im74m4afswrgcg";
url = "https://github.com/ukoethe/vigra/archive/Version-${stdenv.lib.replaceChars ["."] ["-"] version}.tar.gz";
sha256 = "1y3yii8wnyz68n0mzcmjylwd6jchqa3l913v39l2zsd2rv5nyvs0";
};
buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost
numpy hdf5 ];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng
libtiff numpy openexr python ];
preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\"";
cmakeFlags = stdenv.lib.optionals (stdenv.system == "x86_64-linux")
[ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
meta = {
cmakeFlags = [ "-DWITH_OPENEXR=1" ]
++ stdenv.lib.optionals (stdenv.system == "x86_64-linux")
[ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
meta = with stdenv.lib; {
description = "Novel computer vision C++ library with customizable algorithms and data structures";
homepage = http://hci.iwr.uni-heidelberg.de/vigra;
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
license = licenses.mit;
maintainers = [ maintainers.viric ];
platforms = platforms.linux;
};
}

4
pkgs/development/libraries/wvstreams/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, dbus, zlib, openssl, readline, perl }:
{ stdenv, gcc46, fetchurl, qt4, dbus, zlib, openssl, readline, perl }:
stdenv.mkDerivation {
name = "wvstreams-4.6.1";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cc')
'';
buildInputs = [ qt4 dbus zlib openssl readline perl ];
buildInputs = [ gcc46 qt4 dbus zlib openssl readline perl ];
meta = {
description = "Network programming library in C++";