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

Merge pull request #4085 from wkennington/master.boost

Browse Source 
Boost Updates
This commit is contained in:
Peter Simons 2014-09-22 13:53:34 +02:00
commit e81b9f4bd8
76 changed files with 460 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/guitarix/default.nix
View File

@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
avahi boost eigen fftw gettext glib glibmm gtk gtkmm intltool jack2 avahi boost boost.lib eigen fftw gettext glib glibmm gtk gtkmm intltool
ladspaH librdf libsndfile lilv lv2 pkgconfig python serd sord sratom jack2 ladspaH librdf libsndfile lilv lv2 pkgconfig python serd sord sratom
]; ];
configurePhase = "python waf configure --prefix=$out"; configurePhase = "python waf configure --prefix=$out";

2
pkgs/applications/audio/ingen/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python boost boost.lib ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python
raul serd sord sratom suil raul serd sord sratom suil
]; ];

2
pkgs/applications/audio/pamixer/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "03r0sbfj85wp6yxa87pjg69ivmk0mxxa2nykr8gf2c607igmb034"; sha256 = "03r0sbfj85wp6yxa87pjg69ivmk0mxxa2nykr8gf2c607igmb034";
}; };
buildInputs = [ pulseaudio boost ]; buildInputs = [ pulseaudio boost boost.lib ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin

6
pkgs/applications/audio/yoshimi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
, jack2, libsndfile, mesa, minixml, pkgconfig, zlib , jack2, libsndfile, mesa, minixml, pkgconfig, zlib, xorg
}: }:
assert stdenv ? glibc; assert stdenv ? glibc;
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa alsaLib boost boost.lib cairo fftwSinglePrec fltk jack2 libsndfile mesa
minixml zlib minixml zlib xorg.libpthreadstubs
]; ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];

2
pkgs/applications/graphics/freecad/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
zlib python swig gfortran soqt libf2c makeWrapper matplotlib boost.lib zlib python swig gfortran soqt libf2c makeWrapper matplotlib
pycollada pyside pysideShiboken pycollada pyside pysideShiboken
]; ];

4
pkgs/applications/graphics/k3d/default.nix
View File

@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext boost boost.lib doxygen cairomm pkgconfig imagemagick libjpeg libtiff
intltool perl gettext intltool perl
gtkmm glibmm gtkglext pangox_compat libXmu gtkmm glibmm gtkglext pangox_compat libXmu
]; ];

2
pkgs/applications/graphics/luminance-hdr/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
buildInputs = [ qt5 boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; buildInputs = [ qt5 boost boost.lib exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];

3
pkgs/applications/graphics/openimageio/default.nix
View File

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip boost boost.lib cmake ilmbase libjpeg libpng libtiff opencolorio openexr
unzip
]; ];
cmakeFlags = [ cmakeFlags = [

3
pkgs/applications/graphics/openscad/default.nix
View File

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib pkgconfig qt4 bison flex eigen boost boost.lib mesa glew opencsg cgal mpfr gmp glib
pkgconfig
]; ];
configurePhase = '' configurePhase = ''

2
pkgs/applications/graphics/rapcad/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7"; sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7";
}; };
buildInputs = [qt4 cgal boost gmp mpfr flex bison dxflib]; buildInputs = [qt4 cgal boost boost.lib gmp mpfr flex bison dxflib];
configurePhase = '' configurePhase = ''
qmake; qmake;

4
pkgs/applications/graphics/synfigstudio/default.nix
View File

@ -26,11 +26,11 @@ let
patches = [ ./synfig-cstring.patch ]; patches = [ ./synfig-cstring.patch ];
buildInputs = [ buildInputs = [
ETL boost cairo gettext glibmm libsigcxx libtool libxmlxx pango ETL boost boost.lib cairo gettext glibmm libsigcxx libtool libxmlxx pango
pkgconfig pkgconfig
]; ];
configureFlags = [ "--with-boost-libdir=${boost}/lib" ]; configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/applications/misc/blender/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ SDL boost cmake ffmpeg gettext glew ilmbase libXi [ SDL boost boost.lib cmake ffmpeg gettext glew ilmbase libXi
libjpeg libpng libsamplerate libsndfile libtiff mesa openal libjpeg libpng libsamplerate libsndfile libtiff mesa openal
opencolorio openexr openimageio /* openjpeg */ python zlib fftw opencolorio openexr openimageio /* openjpeg */ python zlib fftw
] ]

2
pkgs/applications/misc/freicoin/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# I think that openssl and zlib are required, but come through other # I think that openssl and zlib are required, but come through other
# packages # packages
buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ]; buildInputs = [ db boost boost.lib gmp mpfr miniupnpc qt4 unzip ];
configurePhase = "qmake"; configurePhase = "qmake";

4
pkgs/applications/misc/gnuradio/default.nix
View File

@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
cmake pkgconfig git boost cppunit fftw python swig2 orc lxml qt4 qwt cmake pkgconfig git boost boost.lib cppunit fftw python swig2 orc lxml qt4
alsaLib SDL libusb1 uhd gsl makeWrapper qwt alsaLib SDL libusb1 uhd gsl makeWrapper
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

2
pkgs/applications/misc/monero/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0bbhqjjzh922aymjqrnl2hd3r8x6p7x5aa5jidv3l4d77drhlgzy"; sha256 = "0bbhqjjzh922aymjqrnl2hd3r8x6p7x5aa5jidv3l4d77drhlgzy";
}; };
buildInputs = [ cmake boost ]; buildInputs = [ cmake boost boost.lib ];
# these tests take a long time and don't # these tests take a long time and don't
# always complete in the build environment # always complete in the build environment

2
pkgs/applications/misc/namecoin/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# Don't build with miniupnpc due to namecoin using a different verison that # Don't build with miniupnpc due to namecoin using a different verison that
# ships with NixOS and it is API incompatible. # ships with NixOS and it is API incompatible.
buildInputs = [ db4 boost openssl unzip ]; buildInputs = [ db4 boost boost.lib openssl unzip ];
patchPhase = '' patchPhase = ''
sed -e 's/-Wl,-Bstatic//g' -e 's/-l gthread-2.0//g' -e 's/-l z//g' -i src/Makefile sed -e 's/-Wl,-Bstatic//g' -e 's/-l gthread-2.0//g' -e 's/-l z//g' -i src/Makefile

2
pkgs/applications/misc/namecoin/qt.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
# Don't build with miniupnpc due to namecoin using a different verison that # Don't build with miniupnpc due to namecoin using a different verison that
# ships with NixOS and it is API incompatible. # ships with NixOS and it is API incompatible.
buildInputs = [ db4 boost openssl unzip qt4 ]; buildInputs = [ db4 boost boost.lib openssl unzip qt4 ];
configurePhase = '' configurePhase = ''
qmake USE_UPNP=- qmake USE_UPNP=-

2
pkgs/applications/misc/twmn/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3"; sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3";
}; };
buildInputs = [ qt4 pkgconfig boost ]; buildInputs = [ qt4 pkgconfig boost boost.lib ];
propagatedBuildInputs = [ dbus ]; propagatedBuildInputs = [ dbus ];
configurePhase = "qmake"; configurePhase = "qmake";

9
pkgs/applications/networking/instant-messengers/ekiga/default.nix
View File

@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
perl perlXMLParser evolution_data_server gnome_doc_utils avahi perl perlXMLParser evolution_data_server gnome_doc_utils avahi
libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite
gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic
hicolor_icon_theme gnome3.gnome_icon_theme boost autoreconfHook hicolor_icon_theme gnome3.gnome_icon_theme boost boost.lib
pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr
libXrandr randrproto which libxslt libtasn1 gmp nettle makeWrapper ]; nss zlib libsecret libXrandr randrproto which libxslt libtasn1
gmp nettle makeWrapper ];
preAutoreconf = '' preAutoreconf = ''
substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 "" substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 ""
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-ldap-dir=${openldap}" "--with-ldap-dir=${openldap}"
"--with-libsasl2-dir=${cyrus_sasl}" "--with-libsasl2-dir=${cyrus_sasl}"
"--with-boost-libdir=${boost}/lib" "--with-boost-libdir=${boost.lib}/lib"
"--disable-gconf" "--disable-gconf"
]; ];

2
pkgs/applications/networking/instant-messengers/twinkle/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
configureFlags = "--with-extra-includes=${libjpeg}/include"; configureFlags = "--with-extra-includes=${libjpeg}/include";
buildInputs = buildInputs =
[ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile [ pkgconfig autoreconfHook commoncpp2 openssl boost boost.lib libsndfile
libxml2 libjpeg readline qt3 perl file libxml2 libjpeg readline qt3 perl file
# optional ? : # optional ? :
alsaLib speex alsaLib speex

2
pkgs/applications/networking/linssid/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
}; };
buildInputs = [ qt5 pkgconfig boost ]; buildInputs = [ qt5 pkgconfig boost boost.lib ];
postPatch = '' postPatch = ''
sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro

2
pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf"; sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf";
}; };
buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ]; buildInputs = [ cmake pkgconfig qt4 boost boost.lib bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ];
cmakeFlags = '' cmakeFlags = ''
-DUSE_ASPELL=ON -DUSE_ASPELL=ON

2
pkgs/applications/office/ledger/3.0.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation {
sha256 = "1yr4i8gpby67j4vl7xk109dwb14z8a424nwgva8rbms8115w4ps5"; sha256 = "1yr4i8gpby67j4vl7xk109dwb14z8a424nwgva8rbms8115w4ps5";
}; };
buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ]; buildInputs = [ cmake boost boost.lib gmp mpfr libedit python texinfo gnused ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/applications/office/scribus/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
, libart_lgpl, qt4, python, cups, fontconfig, libjpeg , libart_lgpl, qt4, python, cups, fontconfig, libjpeg
, zlib, libpng, xorg, cairo, podofo, aspell, boostHeaders, cmake }: , zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "scribus-1.4.3"; name = "scribus-1.4.3";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
[ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4 [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4
python cups fontconfig python cups fontconfig
libjpeg zlib libpng podofo aspell cairo libjpeg zlib libpng podofo aspell cairo
boostHeaders # for internal 2geom library boost # for internal 2geom library
libXaw libXext libX11 libXtst libXi libXinerama libXaw libXext libX11 libXtst libXi libXinerama
libpthreadstubs libXau libXdmcp libpthreadstubs libXau libXdmcp
]; ];

2
pkgs/applications/science/electronics/pulseview/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy"; sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy";
}; };
buildInputs = [ pkgconfig cmake glib qt4 boost libsigrok buildInputs = [ pkgconfig cmake glib qt4 boost boost.lib libsigrok
libsigrokdecode libserialport libzip udev libusb1 libftdi libsigrokdecode libserialport libzip udev libusb1 libftdi
]; ];

2
pkgs/applications/science/logic/stp/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
rev = "3aa11620a823d617fc033d26aedae91853d18635"; rev = "3aa11620a823d617fc033d26aedae91853d18635";
sha256 = "832520787f57f63cf47364d080f30ad10d6d6e00f166790c19b125be3d6dd45c"; sha256 = "832520787f57f63cf47364d080f30ad10d6d6e00f166790c19b125be3d6dd45c";
}; };
buildInputs = [ cmake boost bison flex perl zlib ]; buildInputs = [ cmake boost boost.lib bison flex perl zlib ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
patchPhase = '' patchPhase = ''
sed -e 's,^export(PACKAGE.*,,' -i CMakeLists.txt sed -e 's,^export(PACKAGE.*,,' -i CMakeLists.txt

5
pkgs/applications/version-management/gource/default.nix
View File

@ -12,10 +12,11 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost glm glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa
boost boost.lib glm
]; ];
configureFlags = "--with-boost-libdir=${boost}/lib"; configureFlags = "--with-boost-libdir=${boost.lib}/lib";
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions

4
pkgs/applications/video/aegisub/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool ]; nativeBuildInputs = [ intltool ];
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost ] [ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost boost.lib ]
++ optional spellChecking hunspell ++ optional spellChecking hunspell
++ optional automationSupport lua ++ optional automationSupport lua
++ optional openalSupport openal ++ optional openalSupport openal
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm -lGL"; NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm -lGL";
configureFlags = "--with-boost-libdir=${boost}/lib/"; configureFlags = "--with-boost-libdir=${boost.lib}/lib/";
postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub"; postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";

2
pkgs/applications/video/gnash/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
gst_ffmpeg speex libtool gst_ffmpeg speex libtool
libogg libxml2 libjpeg mesa libpng libungif boost freetype agg libogg libxml2 libjpeg mesa libpng libungif boost boost.lib freetype agg
dbus curl pkgconfig glib gtk gtkglext pangox_compat dbus curl pkgconfig glib gtk gtkglext pangox_compat
xulrunner xulrunner
makeWrapper makeWrapper

4
pkgs/applications/video/omxplayer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, raspberrypifw, pcre, boostHeaders, freetype, zlib }: { stdenv, fetchurl, raspberrypifw, pcre, boost, freetype, zlib }:
let let
ffmpeg = stdenv.mkDerivation rec { ffmpeg = stdenv.mkDerivation rec {
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
cp omxplayer.bin $out/bin cp omxplayer.bin $out/bin
''; '';
buildInputs = [ raspberrypifw ffmpeg pcre boostHeaders freetype zlib ]; buildInputs = [ raspberrypifw ffmpeg pcre boost freetype zlib ];
meta = { meta = {
homepage = https://github.com/huceke/omxplayer; homepage = https://github.com/huceke/omxplayer;

2
pkgs/desktops/kde-4.12/kde-workspace.nix
View File

@ -20,7 +20,7 @@ kde {
xorg.libxkbfile xorg.libXcomposite xorg.libXtst xorg.libxkbfile xorg.libXcomposite xorg.libXtst
xorg.libXdamage xorg.libXdamage
python boost qjson lm_sensors gpsd libraw1394 pciutils udev python boost boost.lib qjson lm_sensors gpsd libraw1394 pciutils udev
akonadi pam libusb1 libqalculate kdepimlibs prison akonadi pam libusb1 libqalculate kdepimlibs prison
kactivities kactivities
]; ];

2
pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
View File

@ -9,7 +9,7 @@ kde {
buildInputs = [ buildInputs = [
python kdepimlibs shared_desktop_ontologies python kdepimlibs shared_desktop_ontologies
boost polkit_qt_1 boost boost.lib polkit_qt_1
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

2
pkgs/desktops/kde-4.12/kdeedu/kig.nix
View File

@ -1,6 +1,6 @@
{ kde, kdelibs, boost, python}: { kde, kdelibs, boost, python}:
kde { kde {
buildInputs = [ kdelibs boost python ]; buildInputs = [ kdelibs boost boost.lib python ];
cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1"; cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1";
meta = { meta = {

6
pkgs/desktops/kde-4.12/kdeedu/rocs.nix
View File

@ -1,7 +1,9 @@
{ kde, kdelibs, boost, grantlee }: { kde, kdelibs, boost, grantlee }:
let
boostpkg = boost.override { enableExceptions = true; };
in
kde { kde {
buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ]; buildInputs = [ kdelibs boostpkg boostpkg.lib grantlee ];
NIX_CFLAGS_COMPILE = "-fexceptions"; NIX_CFLAGS_COMPILE = "-fexceptions";

2
pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
View File

@ -1,7 +1,7 @@
{ kde, kdelibs, boost }: { kde, kdelibs, boost }:
kde { kde {
buildInputs = [ kdelibs boost ]; buildInputs = [ kdelibs boost boost.lib ];
meta = { meta = {
description = "Strigi analyzers for various network protocols"; description = "Strigi analyzers for various network protocols";

2
pkgs/desktops/kde-4.12/kdenetwork/kget.nix
View File

@ -8,7 +8,7 @@ kde {
buildInputs = buildInputs =
[ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2 [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2
libmms kde_baseapps kde_workspace boost ]; libmms kde_baseapps kde_workspace boost boost.lib ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

2
pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
View File

@ -10,7 +10,7 @@ kde {
buildInputs = [ buildInputs = [
kdelibs qca2 mediastreamer libgadu jsoncpp kdelibs qca2 mediastreamer libgadu jsoncpp
kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib
libidn libxslt boost libidn libxslt boost boost.lib
ortp srtp libv4l ortp srtp libv4l
]; ];

2
pkgs/desktops/kde-4.12/kdepim-runtime.nix
View File

@ -5,7 +5,7 @@ kde {
# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml # TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml
buildInputs = [ buildInputs = [
kdepimlibs akonadi boost shared_desktop_ontologies kdepimlibs akonadi boost boost.lib shared_desktop_ontologies
libxslt libxslt
]; ];

4
pkgs/desktops/kde-4.12/kdeplasma-addons.nix
View File

@ -9,8 +9,8 @@ kde {
KDEDIRS=marble; KDEDIRS=marble;
buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth buildInputs = [ kdelibs boost boost.lib kde_workspace kdepimlibs attica qjson
eigen qca2 libXtst qimageblitz libqalculate qoauth eigen qca2 libXtst qimageblitz libqalculate
shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
]; ];

2
pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
View File

@ -1,7 +1,7 @@
{ kde, kdelibs, libxml2, libxslt, boost }: { kde, kdelibs, libxml2, libxslt, boost }:
kde { kde {
buildInputs = [ kdelibs libxml2 libxslt boost ]; buildInputs = [ kdelibs libxml2 libxslt boost boost.lib ];
meta = { meta = {
description = "Umbrello UML modeller"; description = "Umbrello UML modeller";

2
pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
View File

@ -2,7 +2,7 @@
kde { kde {
buildInputs = [ kdelibs kdepimlibs boost ]; buildInputs = [ kdelibs kdepimlibs boost boost.lib ];
meta = { meta = {
description = "Simple KDE GUI for GPG"; description = "Simple KDE GUI for GPG";

2
pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
View File

@ -4,7 +4,7 @@ kde {
# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old # todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
buildInputs = [ kdelibs kdepimlibs htmlTidy boost ]; buildInputs = [ kdelibs kdepimlibs htmlTidy boost boost.lib ];
meta = { meta = {
description = "A KDE link checker"; description = "A KDE link checker";

2
pkgs/desktops/kde-4.12/support/akonadi/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc"; sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc";
}; };
buildInputs = [ qt4 soprano libxslt boost sqlite ]; buildInputs = [ qt4 soprano libxslt boost boost.lib sqlite ];
nativeBuildInputs = [ cmake automoc4 shared_mime_info ]; nativeBuildInputs = [ cmake automoc4 shared_mime_info ];

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

@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ cmake pkgconfig boost libunwind mariadb libmemcached pcre libevent gd curl [ cmake pkgconfig boost boost.lib libunwind mariadb libmemcached pcre
libxml2 icu flex bison openssl zlib php expat libcap oniguruma libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
libdwarf libmcrypt tbb gperftools bzip2 openldap readline oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml
]; ];

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

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1s0ylyrx74vgw6vsg6xxk4b07jrxh8pqcmxcbkx46v01nczv3ixj"; sha256 = "1s0ylyrx74vgw6vsg6xxk4b07jrxh8pqcmxcbkx46v01nczv3ixj";
}; };
buildInputs = [ cmake boost gmp mpfr ]; buildInputs = [ cmake boost boost.lib gmp mpfr ];
doCheck = false; doCheck = false;

99
pkgs/development/libraries/boost/1.55.nix
View File

@ -1,99 +0,0 @@
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
, toolset ? null
, enableRelease ? true
, enableDebug ? false
, enableSingleThreaded ? false
, enableMultiThreaded ? true
, enableShared ? true
, enableStatic ? false
, enablePIC ? false
, enableExceptions ? false
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
}:
let
variant = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableRelease "release" ++
stdenv.lib.optional enableDebug "debug");
threading = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableSingleThreaded "single" ++
stdenv.lib.optional enableMultiThreaded "multi");
link = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableShared "shared" ++
stdenv.lib.optional enableStatic "static");
# To avoid library name collisions
layout = if taggedLayout then "tagged" else "system";
cflags = if enablePIC && enableExceptions then
"cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
else if enablePIC then
"cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
else if enableExceptions then
"cflags=-fexceptions"
else
"";
withToolset = stdenv.lib.optionalString (toolset != null) " --with-toolset=${toolset}";
in
stdenv.mkDerivation {
name = "boost-1.55.0";
meta = {
homepage = "http://boost.org/";
description = "Collection of C++ libraries";
license = "boost-license";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2";
sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z";
};
enableParallelBuilding = true;
buildInputs =
[ icu expat zlib bzip2 python ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
configureScript = "./bootstrap.sh";
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python" + withToolset;
buildPhase = "${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY; "}./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}";
# normal install does not install bjam, this is a separate step
installPhase = ''
cd tools/build/v2
sh bootstrap.sh${withToolset}
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}
rm $out/bin/bjam
ln -s $out/bin/b2 $out/bin/bjam
rm -rf $out/share/boost-build/example
'';
crossAttrs = rec {
buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
# override them.
propagatedBuildInputs = buildInputs;
# We want to substitute the contents of configureFlags, removing thus the
# usual --build and --host added on cross building.
preConfigure = ''
export configureFlags="--prefix=$out --without-icu"
'';
buildPhase = ''
set -x
cat << EOF > user-config.jam
using gcc : cross : $crossConfig-g++ ;
EOF
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
'';
};
}

146
pkgs/development/libraries/boost/1.56.nix Normal file
View File

@ -0,0 +1,146 @@
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
, toolset ? null
, enableRelease ? true
, enableDebug ? false
, enableSingleThreaded ? false
, enableMultiThreaded ? true
, enableShared ? true
, enableStatic ? false
, enablePIC ? false
, enableExceptions ? false
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
}:
# We must build at least one type of libraries
assert !enableShared -> enableStatic;
with stdenv.lib;
let
variant = concatStringsSep ","
(optional enableRelease "release" ++
optional enableDebug "debug");
threading = concatStringsSep ","
(optional enableSingleThreaded "single" ++
optional enableMultiThreaded "multi");
link = concatStringsSep ","
(optional enableShared "shared" ++
optional enableStatic "static");
runtime-link = if enableShared then "shared" else "static";
# To avoid library name collisions
layout = if taggedLayout then "tagged" else "system";
cflags = if enablePIC && enableExceptions then
"cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
else if enablePIC then
"cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
else if enableExceptions then
"cflags=-fexceptions"
else
"";
withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}";
genericB2Flags = [
"--prefix=$out"
"--libdir=$lib/lib"
"-j$NIX_BUILD_CORES"
"--layout=${layout}"
"variant=${variant}"
"threading=${threading}"
"runtime-link=${runtime-link}"
"link=${link}"
"${cflags}"
] ++ optional (variant == "release") "debug-symbols=off";
nativeB2Flags = [
"-sEXPAT_INCLUDE=${expat}/include"
"-sEXPAT_LIBPATH=${expat}/lib"
] ++ optional (toolset != null) "toolset=${toolset}";
nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags);
crossB2Flags = [
"-sEXPAT_INCLUDE=${expat.crossDrv}/include"
"-sEXPAT_LIBPATH=${expat.crossDrv}/lib"
"--user-config=user-config.jam"
"toolset=gcc-cross"
"--without-python"
];
crossB2Args = concatMapStringsSep " " (genericB2Flags ++ crossB2Flags);
builder = b2Args: ''
./b2 ${b2Args}
'';
installer = b2Args: ''
# boostbook is needed by some applications
mkdir -p $out/share/boostbook
cp -a tools/boostbook/{xsl,dtd} $out/share/boostbook/
# Let boost install everything else
./b2 ${b2Args} install
'';
commonConfigureFlags = [
"--libdir=$(lib)/lib"
];
in
stdenv.mkDerivation {
name = "boost-1.56.0";
meta = {
homepage = "http://boost.org/";
description = "Collection of C++ libraries";
license = "boost-license";
platforms = platforms.unix;
maintainers = with maintainers; [ simons wkennington ];
};
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_56_0.tar.bz2";
sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
};
enableParallelBuilding = true;
buildInputs = [ icu expat zlib bzip2 python ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
configureScript = "./bootstrap.sh";
configureFlags = commonConfigureFlags ++ [
"--with-icu=${icu}"
"--with-python=${python}/bin/python"
] ++ optional (toolset != null) "--with-toolset=${toolset}";
buildPhase = ''
${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY"}
'' + builder nativeB2Args;
installPhase = installer nativeB2Args;
outputs = [ "out" "lib" ];
crossAttrs = rec {
buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
# override them.
propagatedBuildInputs = buildInputs;
# We want to substitute the contents of configureFlags, removing thus the
# usual --build and --host added on cross building.
preConfigure = ''
export configureFlags="--prefix=$out --without-icu ${concatStringsSep " " commonConfigureFlags}"
set -x
cat << EOF > user-config.jam
using gcc : cross : $crossConfig-g++ ;
EOF
'';
buildPhase = builder crossB2Args;
installPhase = installer crossB2Args;
};
}

30
pkgs/development/libraries/boost/header-only-wrapper.nix
View File

@ -1,30 +0,0 @@
{ stdenv, fetchurl, boost }:
let
version = stdenv.lib.removePrefix "boost-" boost.name;
pkgid = stdenv.lib.replaceChars ["-" "."] ["_" "_"] boost.name;
in
stdenv.mkDerivation {
name = "boost-headers-${version}";
src = boost.src;
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/include
tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost
'';
preferLocalBuild = true;
meta = {
homepage = "http://boost.org/";
description = "Boost C++ Library Collection";
license = "boost-license";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ];
};
}

3
pkgs/development/libraries/botan/default.nix
View File

@ -9,7 +9,8 @@ let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = [ boost.lib ]
++ map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); (builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec { sourceInfo = rec {
baseName="botan"; baseName="botan";

3
pkgs/development/libraries/botan/unstable.nix
View File

@ -9,7 +9,8 @@ let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = [ boost.lib ]
++ map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); (builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec { sourceInfo = rec {
baseName="botan"; baseName="botan";

10
pkgs/development/libraries/cpp-netlib/default.nix
View File

@ -12,17 +12,17 @@ stdenv.mkDerivation rec {
md5 = "0765cf203f451394df98e6ddf7bf2541"; md5 = "0765cf203f451394df98e6ddf7bf2541";
}; };
buildInputs = [ cmake boost openssl ]; buildInputs = [ cmake boost boost.lib openssl ];
cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=RELEASE" ]; cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=RELEASE" ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
description = "A collection of open-source libraries for high level network programming"; description = "A collection of open-source libraries for high level network programming";
homepage = http://cpp-netlib.org; homepage = http://cpp-netlib.org;
license = stdenv.lib.licenses.boost; license = licenses.boost;
maintainers = [ stdenv.lib.maintainers.shlevy ]; maintainers = with maintainers; [ shlevy ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }

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

@ -1,18 +1,19 @@
{ stdenv, fetchurl, expat, zlib, boost }: { stdenv, fetchurl, expat, zlib, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "exempi-2.2.1"; name = "exempi-2.2.2";
src = fetchurl { src = fetchurl {
url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2"; url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2";
sha256 = "00d6gycl0wcyd3c71y0jp033a64z203rq0p0y07aig0s0j0477kc"; sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf";
}; };
configureFlags = [ "--with-boost=${boost}" ]; configureFlags = [ "--with-boost=${boost}" ];
buildInputs = [ expat zlib boost ]; buildInputs = [ expat zlib boost boost.lib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://libopenraw.freedesktop.org/wiki/Exempi/;
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.bsd3; license = licenses.bsd3;
}; };

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

@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
postInstall = "ln -s . $out/include/fastcgi"; postInstall = "ln -s . $out/include/fastcgi";
meta = { meta = with stdenv.lib; {
description = "FastCGI is a language independent, scalable, open extension to CG"; description = "FastCGI is a language independent, scalable, open extension to CG";
homepage = http://www.fastcgi.com/; homepage = http://www.fastcgi.com/;
license = "FastCGI see LICENSE.TERMS"; license = "FastCGI see LICENSE.TERMS";
platforms = platforms.all;
maintainers = with maintainers; [ wkennington ];
}; };
} }

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, groff }: { stdenv, fetchurl, ncurses, groff }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libedit-20130712-3.1"; name = "libedit-20140620-3.1";
src = fetchurl { src = fetchurl {
url = "http://www.thrysoee.dk/editline/${name}.tar.gz"; url = "http://www.thrysoee.dk/editline/${name}.tar.gz";
sha256 = "0dwav34041sariyl00nr106xmn123bnxir4qpn5y47vgssfim6sx"; sha256 = "1wnapwcpl4yq8p95j898jl0hsr39if28qzm5a7zwkbplihm9nax2";
}; };
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@ -15,10 +15,7 @@ stdenv.mkDerivation rec {
sed -i s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc sed -i s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
''; '';
# taken from gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libedit/files/ configureFlags = [ "--enable-widec" ];
patches = [ ./freebsd.patch ./freebsd_weak_ref.patch ];
configureFlags = "--enable-widec";
propagatedBuildInputs = [ ncurses ]; propagatedBuildInputs = [ ncurses ];

4
pkgs/development/libraries/libtorrent-rasterbar/default.nix
View File

@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "1a3yxwjs4qb0rwx6cfpvar0a8jmavb6ik580b27md08jhvq80if7"; sha256 = "1a3yxwjs4qb0rwx6cfpvar0a8jmavb6ik580b27md08jhvq80if7";
}; };
buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ]; buildInputs = [ boost boost.lib pkgconfig openssl zlib python libiconvOrNull geoip ];
configureFlags = [ configureFlags = [
"--with-boost=${boost}/include/boost" "--with-boost=${boost}/include/boost"
"--with-boost-libdir=${boost}/lib" "--with-boost-libdir=${boost.lib}/lib"
"--enable-python-binding" "--enable-python-binding"
"--with-libgeoip=system" "--with-libgeoip=system"
"--with-libiconv=yes" "--with-libiconv=yes"

18
pkgs/development/libraries/libyaml-cpp/0.3.x.nix
View File

@ -1,18 +0,0 @@
{stdenv, fetchurl, cmake, boostHeaders}:
stdenv.mkDerivation {
name = "libyaml-cpp-0.3.0";
src = fetchurl {
url = http://yaml-cpp.googlecode.com/files/yaml-cpp-0.3.0.tar.gz;
sha256 = "10kv25zgq96ybxc6c19lzpax1xi5lpxrdqa9x52nffsql6skil1c";
};
buildInputs = [ cmake boostHeaders ];
meta = {
homepage = http://code.google.com/p/yaml-cpp/;
description = "A YAML parser and emitter for C++";
license = stdenv.lib.licenses.mit;
};
}

10
pkgs/development/libraries/libyaml-cpp/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, boostHeaders}: { stdenv, fetchurl, cmake, boost }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libyaml-cpp-0.5.1"; name = "libyaml-cpp-0.5.1";
@ -8,11 +8,13 @@ stdenv.mkDerivation {
sha256 = "01kg0h8ksp162kdhyzn67vnlxpj5zjbks84sh50pv61xni990z1y"; sha256 = "01kg0h8ksp162kdhyzn67vnlxpj5zjbks84sh50pv61xni990z1y";
}; };
buildInputs = [ cmake boostHeaders ]; buildInputs = [ cmake boost ];
meta = { meta = with stdenv.lib; {
homepage = http://code.google.com/p/yaml-cpp/; homepage = http://code.google.com/p/yaml-cpp/;
description = "A YAML parser and emitter for C++"; description = "A YAML parser and emitter for C++";
license = stdenv.lib.licenses.mit; license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ wkennington ];
}; };
} }

44
pkgs/development/tools/boost-build/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "boost-build-2.0-m12";
src = fetchurl {
url = "mirror://sourceforge/boost/${name}.tar.bz2";
sha256 = "10sbbkx2752r4i1yshyp47nw29lyi1p34sy6hj7ivvnddiliayca";
};
patchPhase = ''
grep -r '/usr/share/boost-build' \
| awk '{split($0,a,":"); print a[1];}' \
| xargs sed -i "s,/usr/share/boost-build,$out/share/boost-build,"
'';
buildPhase = ''
cd jam_src
./build.sh
'';
installPhase = ''
# Install Bjam
mkdir -p $out/bin
cd "$(ls | grep bin)"
cp -a bjam $out/bin
# Bjam is B2
ln -s bjam $out/bin/b2
# Install the shared files (don't include jam_src)
cd ../..
rm -rf jam_src
mkdir -p $out/share
cp -a . $out/share/boost-build
'';
meta = with stdenv.lib; {
homepage = http://www.boost.org/boost-build2/;
license = "boost-license";
platforms = platforms.unix;
maintainers = with maintainers; [ wkennington ];
};
}

12
pkgs/games/asc/default.nix
View File

@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-fpermissive"; # I'm too lazy to catch all gcc47-related problems NIX_CFLAGS_COMPILE = "-fpermissive"; # I'm too lazy to catch all gcc47-related problems
buildInputs = [ buildInputs = [
SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat freetype SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost boost.lib expat
libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng
]; ];
meta = { meta = with stdenv.lib; {
description = "Turn based strategy game"; description = "Turn based strategy game";
longDescription = '' longDescription = ''
@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
homepage = http://www.asc-hq.org/; homepage = http://www.asc-hq.org/;
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with maintainers; [ viric ];
platforms = with stdenv.lib.platforms; linux; platforms = with platforms; linux;
}; };
} }

3
pkgs/games/globulation/default.nix
View File

@ -8,7 +8,8 @@ let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = [ boost.lib ]
++ map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); (builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec { sourceInfo = rec {
baseName="glob2"; baseName="glob2";

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, mesa, zlib, openssl, libyamlcpp, boostHeaders {stdenv, fetchurl, cmake, mesa, zlib, openssl, libyamlcpp, boost
, SDL, SDL_image, SDL_mixer, SDL_gfx }: , SDL, SDL_image, SDL_mixer, SDL_gfx }:
let version = "1.0.0"; in let version = "1.0.0"; in
@ -10,7 +10,7 @@ stdenv.mkDerivation {
name = "openxcom-${version}.tar.gz"; name = "openxcom-${version}.tar.gz";
}; };
buildInputs = [ cmake mesa zlib openssl libyamlcpp boostHeaders buildInputs = [ cmake mesa zlib openssl libyamlcpp boost
SDL SDL_image SDL_mixer SDL_gfx ]; SDL SDL_image SDL_mixer SDL_gfx ];
meta = { meta = {

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

@ -1,7 +1,7 @@
{stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig
, mesa}: , mesa}:
let let
buildInputs = [scons SDL SDL_image boost libpng SDL_mixer pkgconfig mesa]; buildInputs = [scons SDL SDL_image boost boost.lib libpng SDL_mixer pkgconfig mesa];
s = # Generated upstream information s = # Generated upstream information
rec { rec {
baseName="pingus"; baseName="pingus";

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

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
"-DPREFER_STATIC_LIBS:BOOL=OFF"]; "-DPREFER_STATIC_LIBS:BOOL=OFF"];
buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL buildInputs = [ cmake lzma boost boost.lib libdevil zlib p7zip openal libvorbis freetype SDL
xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper
docbook_xsl_ns systemd ] docbook_xsl_ns systemd ]
++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI jdk

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

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11 cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar
libnotify gtk doxygen makeWrapper boost boost.lib libpng libX11 libnotify gtk doxygen makeWrapper
]; ];
prePatch = '' prePatch = ''

5
pkgs/games/wesnoth/default.nix
View File

@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa"; sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa";
}; };
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib
cmake freetype libpng pkgconfig lua dbus fontconfig libtool ]; boost boost.lib fribidi cmake freetype libpng pkgconfig lua
dbus fontconfig libtool ];
cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030 cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030

2
pkgs/servers/amqp/qpid-cpp/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1c03yi19d5h5h78h37add9csmy0mzvvmvn7zkcalwszabdhsb5yk"; sha256 = "1c03yi19d5h5h78h37add9csmy0mzvvmvn7zkcalwszabdhsb5yk";
}; };
buildInputs = [ cmake python boost libuuid ruby ]; buildInputs = [ cmake python boost boost.lib libuuid ruby ];
# the subdir managementgen wants to install python stuff in ${python} and # the subdir managementgen wants to install python stuff in ${python} and
# the installation tries to create some folders in /var # the installation tries to create some folders in /var

4
pkgs/servers/http/mini-httpd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boostHeaders }: { stdenv, fetchurl, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mini-httpd-1.4"; name = "mini-httpd-1.4";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1i46klkx2ca1cgmlilajkx8gf7b7d7c2sj58llxfllh184pb6cpd"; sha256 = "1i46klkx2ca1cgmlilajkx8gf7b7d7c2sj58llxfllh184pb6cpd";
}; };
buildInputs = [ boostHeaders ]; buildInputs = [ boost ];
enableParallelBuilding = true; enableParallelBuilding = true;

35
pkgs/servers/nosql/mongodb/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, scons, boost, gperftools, pcre, snappy }: { stdenv, fetchurl, scons, boost, gperftools, pcre, snappy
, libyamlcpp, sasl, openssl, libpcap }:
with stdenv.lib; with stdenv.lib;
@ -7,12 +8,20 @@ let version = "2.6.4";
"pcre" "pcre"
"boost" "boost"
"snappy" "snappy"
# "v8" -- mongo still bundles 3.12 and does not work with 3.15+
# "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs) # "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs)
# "yaml" -- it seems nixpkgs' yamlcpp (0.5.1) is problematic for mongo "yaml"
# "v8"
] ++ optionals (!stdenv.isDarwin) [ "tcmalloc" ]; ] ++ optionals (!stdenv.isDarwin) [ "tcmalloc" ];
system-lib-args = concatStringsSep " " buildInputs = [
(map (lib: "--use-system-${lib}") system-libraries); sasl boost boost.lib gperftools pcre snappy
libyamlcpp sasl openssl libpcap
];
other-args = concatStringsSep " " ([
"--ssl"
"--use-sasl-client"
"--extrapath=${concatStringsSep "," buildInputs}"
] ++ map (lib: "--use-system-${lib}") system-libraries);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "mongodb-${version}"; name = "mongodb-${version}";
@ -22,20 +31,28 @@ in stdenv.mkDerivation rec {
sha256 = "1h4rrgcb95234ryjma3fjg50qsm1bnxjx5ib0c3p9nzmc2ji2m07"; sha256 = "1h4rrgcb95234ryjma3fjg50qsm1bnxjx5ib0c3p9nzmc2ji2m07";
}; };
nativeBuildInputs = [ scons boost gperftools pcre snappy ]; nativeBuildInputs = [ scons ];
inherit buildInputs;
postPatch = '' postPatch = ''
# fix yaml-cpp detection
sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct
# bug #482576
sed -i -e "/-Werror/d" src/third_party/v8/SConscript
# fix environment variable reading
substituteInPlace SConstruct \ substituteInPlace SConstruct \
--replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR"
''; '';
buildPhase = '' buildPhase = ''
scons all --release ${system-lib-args} scons all --release ${other-args}
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/lib mkdir -p $out/lib
scons install --release --prefix=$out ${system-lib-args} scons install --release --prefix=$out ${other-args}
''; '';
meta = { meta = {
@ -43,7 +60,7 @@ in stdenv.mkDerivation rec {
homepage = http://www.mongodb.org; homepage = http://www.mongodb.org;
license = licenses.agpl3; license = licenses.agpl3;
maintainers = with maintainers; [ bluescreen303 offline ]; maintainers = with maintainers; [ bluescreen303 offline wkennington ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

8
pkgs/servers/nosql/rethinkdb/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, python, m4 }: { stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, curl, python, m4 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rethinkdb-1.12.4"; name = "rethinkdb-1.14.1";
src = fetchurl { src = fetchurl {
url = "http://download.rethinkdb.com/dist/${name}.tgz"; url = "http://download.rethinkdb.com/dist/${name}.tgz";
sha256 = "1dq2vbgms016ic2hifclm1m58i4804khkn0lnvz47rkm7i0564if"; sha256 = "0brsbb289hcsmipma4rsgrkqpqagwff2y6w46dvb25n95id65hx8";
}; };
preConfigure = '' preConfigure = ''
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = "--lib-path ${gperftools}/lib"; configureFlags = "--lib-path ${gperftools}/lib";
buildInputs = [ protobuf zlib boost ]; buildInputs = [ protobuf boost boost.lib zlib curl ];
nativeBuildInputs = [ which m4 python ]; nativeBuildInputs = [ which m4 python ];

6
pkgs/servers/rippled/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, scons, pkgconfig, openssl, protobuf, boost155, zlib}: { stdenv, fetchurl, scons, pkgconfig, openssl, protobuf, boost, zlib}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rippled-${version}"; name = "rippled-${version}";
@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
patches = [ ./scons-env.patch ]; patches = [ ./scons-env.patch ];
buildInputs = [ scons pkgconfig openssl protobuf boost155 zlib ]; buildInputs = [ scons pkgconfig openssl protobuf boost zlib ];
RIPPLED_BOOST_HOME = boost155.out; RIPPLED_BOOST_HOME = boost.out;
RIPPLED_ZLIB_HOME = zlib.out; RIPPLED_ZLIB_HOME = zlib.out;
buildPhase = "scons build/rippled"; buildPhase = "scons build/rippled";

42
pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch Normal file
View File

@ -0,0 +1,42 @@
From 2507ab33236f0da12899fbcdd36535f7c7b68a06 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 20 Sep 2014 22:52:31 -0700
Subject: [PATCH] Cleanup boost optionals
---
src/osd/ECBackend.cc | 2 +-
src/osd/ReplicatedPG.cc | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index a87b5b4..c386900 100644
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -81,7 +81,7 @@ ostream &operator<<(ostream &lhs, const ECBackend::read_result_t &rhs)
lhs << "read_result_t(r=" << rhs.r
<< ", errors=" << rhs.errors;
if (rhs.attrs) {
- lhs << ", attrs=" << rhs.attrs;
+ lhs << ", attrs=" << rhs.attrs.get();
} else {
lhs << ", noattrs";
}
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 5e5510d..79e8616 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5259,7 +5259,10 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx)
for (list<OpContext::NotifyAck>::iterator p = ctx->notify_acks.begin();
p != ctx->notify_acks.end();
++p) {
- dout(10) << "notify_ack " << make_pair(p->watch_cookie, p->notify_id) << dendl;
+ if (p->watch_cookie)
+ dout(10) << "notify_ack " << make_pair(p->watch_cookie.get(), p->notify_id) << dendl;
+ else
+ dout(10) << "notify_ack " << make_pair("NULL", p->notify_id) << dendl;
for (map<pair<uint64_t, entity_name_t>, WatchRef>::iterator i =
ctx->obc->watchers.begin();
i != ctx->obc->watchers.end();
--
2.1.0

25
pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch Normal file
View File

@ -0,0 +1,25 @@
From 34c27f66210570adf5aba624d7da3c0382d5493f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 21 Sep 2014 12:19:30 -0700
Subject: [PATCH] Makefile-env: Don't force /sbin
---
src/Makefile-env.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index f2ab655..bf8876e 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -27,7 +27,7 @@ bin_DEBUGPROGRAMS =
ceph_sbindir = $(sbindir)
# certain things go straight into /sbin, though!
-su_sbindir = /sbin
+su_sbindir = $(sbindir)
# C/C++ tests to build will be appended to this
check_PROGRAMS =
--
2.1.0

62
pkgs/tools/filesystems/ceph/default.nix
View File

@ -1,37 +1,55 @@
{stdenv, fetchgit, libatomic_ops, autoconf, automake, boost, btrfsProgs, cryptopp, curl, expat, { stdenv, fetchgit, autoconf, automake, makeWrapper, pkgconfig, libtool, which
fcgi, fuse, gperftools, keyutils, leveldb, libaio, libedit, libtool, , boost, btrfsProgs, cryptopp, curl, expat, fcgi, fuse, gperftools, keyutils
libuuid, linuxHeaders, openssl, pkgconfig, python, snappy, which, xfsprogs, xz}: , leveldb, libaio, libatomic_ops, libedit, libuuid, linuxHeaders, openssl
, python, snappy, udev, xfsprogs, xz
}:
let
wrapArgs = "--prefix PYTHONPATH : \"$(toPythonPath $out)\""
+ " --prefix PATH : \"$out/bin\""
+ " --prefix LD_LIBRARY_PATH : \"$out/lib\"";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName="ceph"; name="ceph-${version}";
version="0.79"; version="0.85";
name="${baseName}-${version}";
src = fetchgit {
url = "git://github.com/ceph/ceph.git";
rev = "refs/tags/v0.85";
sha256 = "0g98cgrs3gfsc8azg3k0n61bgna2w906qm69j4qbjkb61l83ld1z";
};
patches = [
./0001-Cleanup-boost-optionals.patch # Remove in 0.86
./0001-Makefile-env-Don-t-force-sbin.patch
];
nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
buildInputs = [ buildInputs = [
fuse linuxHeaders pkgconfig libatomic_ops autoconf automake boost btrfsProgs cryptopp expat boost boost.lib btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils
fcgi fuse gperftools keyutils leveldb libaio libedit libtool libuuid openssl pkgconfig libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python
python snappy which xfsprogs.lib xz snappy udev xfsprogs.lib xz
]; ];
preConfigure = '' preConfigure = ''
./autogen.sh ./autogen.sh
''; '';
installFlags = "DESTDIR=\${out}"; configureFlags = [ "--exec_prefix=$(out)" ];
postInstall = ''
wrapProgram $out/bin/ceph ${wrapArgs}
wrapProgram $out/bin/ceph-brag ${wrapArgs}
wrapProgram $out/bin/ceph-rest-api ${wrapArgs}
'';
enableParallelBuilding = true; enableParallelBuilding = true;
src = fetchgit {
url = "https://github.com/ceph/ceph";
rev = "4c2d73a5095f527c3a2168deb5fa54b3c8991a6e";
sha256 = "0850m817wqqmw2qdnwm5jvbdgifzlc7kcd05jv526pdvmq1x92rf";
};
meta = { meta = with stdenv.lib; {
inherit version; homepage = http://ceph.com/;
description = "Distributed storage system"; description = "Distributed storage system";
maintainers = [ license = licenses.lgpl21;
stdenv.lib.maintainers.ak maintainers = with maintainers; [ ak wkennington ];
]; platforms = with platforms; linux;
platforms = with stdenv.lib.platforms;
linux;
}; };
} }

2
pkgs/tools/filesystems/grive/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "f2b978cc93a2d16262c7b78c62019b2a58044eaef4ca95feaa74dfd4dfcbfa36"; sha256 = "f2b978cc93a2d16262c7b78c62019b2a58044eaef4ca95feaa74dfd4dfcbfa36";
}; };
buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost]; buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost boost.lib];
# work around new binutils headers, see # work around new binutils headers, see
# http://stackoverflow.com/questions/11748035/binutils-bfd-h-wants-config-h-now # http://stackoverflow.com/questions/11748035/binutils-bfd-h-wants-config-h-now

2
pkgs/tools/security/meo/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildFlags = "QMAKE=qmake"; buildFlags = "QMAKE=qmake";
buildInputs = [ openssl pcre qt4 boost pkcs11helper ]; buildInputs = [ openssl pcre qt4 boost boost.lib pkcs11helper ];
preConfigure = '' preConfigure = ''
sed -i s,-mt$,, meo-gui/meo-gui.pro sed -i s,-mt$,, meo-gui/meo-gui.pro

19
pkgs/top-level/all-packages.nix
View File

@ -599,6 +599,8 @@ let
boomerang = callPackage ../development/tools/boomerang { }; boomerang = callPackage ../development/tools/boomerang { };
boost-build = callPackage ../development/tools/boost-build { };
bootchart = callPackage ../tools/system/bootchart { }; bootchart = callPackage ../tools/system/bootchart { };
bro = callPackage ../applications/networking/ids/bro { }; bro = callPackage ../applications/networking/ids/bro { };
@ -1614,7 +1616,6 @@ let
monit = callPackage ../tools/system/monit { }; monit = callPackage ../tools/system/monit { };
mosh = callPackage ../tools/networking/mosh { mosh = callPackage ../tools/networking/mosh {
boost = boostHeaders;
inherit (perlPackages) IOTty; inherit (perlPackages) IOTty;
}; };
@ -4576,10 +4577,8 @@ let
boost144 = callPackage ../development/libraries/boost/1.44.nix { }; boost144 = callPackage ../development/libraries/boost/1.44.nix { };
boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { };
boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost156 = callPackage ../development/libraries/boost/1.56.nix { };
boost = boost155; boost = boost156;
boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { };
botan = callPackage ../development/libraries/botan { }; botan = callPackage ../development/libraries/botan { };
botanUnstable = callPackage ../development/libraries/botan/unstable.nix { }; botanUnstable = callPackage ../development/libraries/botan/unstable.nix { };
@ -4684,9 +4683,7 @@ let
cppunit = callPackage ../development/libraries/cppunit { }; cppunit = callPackage ../development/libraries/cppunit { };
cppnetlib = callPackage ../development/libraries/cppnetlib { cppnetlib = callPackage ../development/libraries/cppnetlib { };
boost = boostHeaders;
};
cracklib = callPackage ../development/libraries/cracklib { }; cracklib = callPackage ../development/libraries/cracklib { };
@ -5895,7 +5892,6 @@ let
libyaml = callPackage ../development/libraries/libyaml { }; libyaml = callPackage ../development/libraries/libyaml { };
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
libyamlcpp03 = callPackage ../development/libraries/libyaml-cpp/0.3.x.nix { };
libyubikey = callPackage ../development/libraries/libyubikey {}; libyubikey = callPackage ../development/libraries/libyubikey {};
@ -7195,7 +7191,9 @@ let
mariadb = callPackage ../servers/sql/mariadb {}; mariadb = callPackage ../servers/sql/mariadb {};
mongodb = callPackage ../servers/nosql/mongodb { }; mongodb = callPackage ../servers/nosql/mongodb {
sasl = cyrus_sasl;
};
riak = callPackage ../servers/nosql/riak/1.3.1.nix { }; riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
@ -9454,7 +9452,6 @@ let
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2 gnome_vfs; inherit (gnome) GConf ORBit2 gnome_vfs;
zip = zip.override { enableNLS = false; }; zip = zip.override { enableNLS = false; };
boost = boost155;
jdk = openjdk; jdk = openjdk;
fontsConf = makeFontsConf { fontsConf = makeFontsConf {
fontDirectories = [ fontDirectories = [