diff --git a/pkgs/development/libraries/boost/1.36.0.nix b/pkgs/development/libraries/boost/1.36.0.nix deleted file mode 100644 index 14b7dd8da339..000000000000 --- a/pkgs/development/libraries/boost/1.36.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, icu, expat, zlib, bzip2, python}: - -stdenv.mkDerivation { - name = "boost-1.36.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_36_0.tar.bz2"; - sha256 = "1vydzfvzg0fkzixkr2jikvcc0zbh5qgw98hr6nhj0z12ppxhqjls"; - }; - - buildInputs = [icu expat zlib bzip2 python]; - - preBuild = '' - makeFlagsArray=(BJAM_CONFIG="-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=release threading=multi link=shared") - ''; - - configureFlags = "--with-icu=${icu} --with-python=${python}"; -} diff --git a/pkgs/development/libraries/boost/1.38.0.nix b/pkgs/development/libraries/boost/1.38.0.nix deleted file mode 100644 index 739291a0574e..000000000000 --- a/pkgs/development/libraries/boost/1.38.0.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -}: - -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"); - -in - -stdenv.mkDerivation { - name = "boost-1.38.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_38_0.tar.bz2"; - sha256 = "0rk044s4m7l4sma6anml34vxcd9w0fzcy1cy7csbzynjyida9qry"; - }; - - patches = [ ./classr.patch ]; - - buildInputs = [icu expat zlib bzip2 python]; - - preBuild = '' - makeFlagsArray=(BJAM_CONFIG="-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=${variant} threading=${threading} link=${link}") - ''; - - configureFlags = "--with-icu=${icu} --with-python=${python}"; -} diff --git a/pkgs/development/libraries/boost/1.42.0.nix b/pkgs/development/libraries/boost/1.42.0.nix deleted file mode 100644 index 4f71e7347a91..000000000000 --- a/pkgs/development/libraries/boost/1.42.0.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -}: - -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 - finalLayout = if ((enableRelease && enableDebug) || - (enableSingleThreaded && enableMultiThreaded) || - (enableShared && enableStatic)) then - "tagged" else "system"; - - cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; - -in - -stdenv.mkDerivation { - name = "boost-1.42.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_42_0.tar.bz2"; - sha256 = "02g6m6f7m11ig93p5sx7sfq75c15y9kn2pa3csn1bkjhs9dvj7jb"; - }; - - buildInputs = [icu expat zlib bzip2 python]; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - - buildPhase = "./bjam -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; - - installPhase = ":"; -} diff --git a/pkgs/development/libraries/boost/classr.patch b/pkgs/development/libraries/boost/classr.patch deleted file mode 100644 index fbe383086968..000000000000 --- a/pkgs/development/libraries/boost/classr.patch +++ /dev/null @@ -1,15 +0,0 @@ -Taken from http://wiki.freebsd.org/BoostPortingProject ---- boost1.38/boost/function/function_template.hpp.orig 2008-10-16 17:21:50.000000000 +0400 -+++ boost1.38_2/boost/function/function_template.hpp 2009-03-25 04:12:15.000000000 +0300 -@@ -950,10 +950,10 @@ - f.vtable->manager(f.functor, this->functor, - boost::detail::function::move_functor_tag); - f.vtable = 0; --#if !defined(BOOST_NO_EXCEPTIONS) - } else { - clear(); - } -+#if !defined(BOOST_NO_EXCEPTIONS) - } catch (...) { - vtable = 0; - throw; diff --git a/pkgs/development/libraries/boost/1.43.0.nix b/pkgs/development/libraries/boost/default.nix similarity index 100% rename from pkgs/development/libraries/boost/1.43.0.nix rename to pkgs/development/libraries/boost/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4949b3d8656f..54d8f94c01e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3498,7 +3498,7 @@ let inherit fetchurl stdenv lib pkgconfig; }; - boost = makeOverridable (import ../development/libraries/boost/1.43.0.nix) { + boost = makeOverridable (import ../development/libraries/boost) { inherit fetchurl stdenv icu expat zlib bzip2 python; };