Author: simons
Date: Tue Jul 12 14:24:01 2011
New Revision: 27740
URL: https://svn.nixos.org/websvn/nix/?rev=27740&sc=1
Log:
boost: updated to version 1.47.0
Packages that don't build with the latest libraries can use 'boost144', which
is the version we had before.
Added:
nixpkgs/trunk/pkgs/development/libraries/boost/1.44.nix
- copied, changed from r27730,
nixpkgs/trunk/pkgs/development/libraries/boost/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/boost/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/boost/1.44.nix
(from r27730, nixpkgs/trunk/pkgs/development/libraries/boost/default.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/development/libraries/boost/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/boost/default.nix Tue Jul 12
13:54:29 2011 (r27739)
+++ nixpkgs/trunk/pkgs/development/libraries/boost/default.nix Tue Jul 12
14:24:01 2011 (r27740)
@@ -33,7 +33,7 @@
in
stdenv.mkDerivation {
- name = "boost-1.44.0";
+ name = "boost-1.47.0";
meta = {
homepage = "http://boost.org/";;
@@ -44,8 +44,8 @@
};
src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_44_0.tar.bz2";
- sha256 = "1nvq36mvzr1fr85q0jh86rk3bk65s1y55jgqgzfg3lcpkl12ihs5";
+ url = "mirror://sourceforge/boost/boost_1_47_0.tar.bz2";
+ sha256 =
"815a5d9faac4dbd523fbcf3fe1065e443c0bbf43427c44aa423422c6ec4c2e31";
};
enableParallelBuilding = true;
@@ -55,20 +55,10 @@
configureScript = "./bootstrap.sh";
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
- buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include
-sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant}
threading=${threading} link=${link} ${cflags} install";
+ buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include
-sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant}
threading=${threading} link=${link} ${cflags} install";
installPhase = ":";
- patches = [
- # Patch to get rid of following error, experienced by some packages like
encfs, bitcoin:
- # terminate called after throwing an instance of 'std::runtime_error'
- # what(): locale::facet::_S_create_c_locale name not valid
- (fetchurl {
- url =
https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch
;
- sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d";
- })
- ];
-
crossAttrs = rec {
buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
# all buildInputs set previously fell into propagatedBuildInputs, as
usual, so we have to
@@ -84,7 +74,7 @@
cat << EOF > user-config.jam
using gcc : cross : $crossConfig-g++ ;
EOF
- ./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include
-sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout}
--user-config=user-config.jam toolset=gcc-cross variant=${variant}
threading=${threading} link=${link} ${cflags} --without-python install
+ ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include
-sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout}
--user-config=user-config.jam toolset=gcc-cross variant=${variant}
threading=${threading} link=${link} ${cflags} --without-python install
'';
};
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jul 12 13:54:29
2011 (r27739)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jul 12 14:24:01
2011 (r27740)
@@ -2923,6 +2923,7 @@
boost = callPackage ../development/libraries/boost { };
boost142 = callPackage ../development/libraries/boost/1.42.nix { };
+ boost144 = callPackage ../development/libraries/boost/1.44.nix { };
boost146 = callPackage ../development/libraries/boost/1.46.nix { };
# A Boost build with all library variants enabled. Very large (about 250
MB).
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
