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

Merge pull request #11878 from lancelotsix/update_boost

Browse Source 
pkgs.boost: 1.59 -> 1.60
This commit is contained in:
Peter Simons 2016-03-17 19:45:44 +01:00
commit 73f53ddf9c
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/boost/1.60.nix Normal file
View File

@ -0,0 +1,11 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.60.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_60_0.tar.bz2";
sha256 = "0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8";
};
})

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

@ -1099,7 +1099,7 @@ let
cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
libceph = ceph.lib; libceph = ceph.lib;
ceph = callPackage ../tools/filesystems/ceph { }; ceph = callPackage ../tools/filesystems/ceph { boost = boost159; };
ceph-dev = ceph; ceph-dev = ceph;
#ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { }); #ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
@ -5182,7 +5182,7 @@ let
scala_2_11 = callPackage ../development/compilers/scala { }; scala_2_11 = callPackage ../development/compilers/scala { };
scala = scala_2_11; scala = scala_2_11;
sdcc = callPackage ../development/compilers/sdcc { }; sdcc = callPackage ../development/compilers/sdcc { boost = boost159; };
smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
smlnj = if stdenv.isDarwin smlnj = if stdenv.isDarwin
@ -6478,7 +6478,8 @@ let
boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost155 = callPackage ../development/libraries/boost/1.55.nix { };
boost159 = callPackage ../development/libraries/boost/1.59.nix { }; boost159 = callPackage ../development/libraries/boost/1.59.nix { };
boost = boost159; boost160 = callPackage ../development/libraries/boost/1.60.nix { };
boost = boost160;
boost_process = callPackage ../development/libraries/boost-process { }; boost_process = callPackage ../development/libraries/boost-process { };
@ -9795,6 +9796,7 @@ let
mariadb = callPackage ../servers/sql/mariadb { mariadb = callPackage ../servers/sql/mariadb {
inherit (darwin) cctools; inherit (darwin) cctools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
boost = boost159;
}; };
mongodb = callPackage ../servers/nosql/mongodb { mongodb = callPackage ../servers/nosql/mongodb {
@ -13555,7 +13557,7 @@ let
demo = false; demo = false;
}; };
rapcad = qt5.callPackage ../applications/graphics/rapcad {}; rapcad = qt5.callPackage ../applications/graphics/rapcad { boost = boost159; };
rapidsvn = callPackage ../applications/version-management/rapidsvn { }; rapidsvn = callPackage ../applications/version-management/rapidsvn { };

2
pkgs/top-level/python-packages.nix
View File

@ -9121,7 +9121,7 @@ in modules // {
# py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067 # py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067
graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet" graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet"
else callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; else callPackage ../development/python-modules/graph-tool/2.x.x.nix { boost = pkgs.boost159; };
grappelli_safe = buildPythonPackage rec { grappelli_safe = buildPythonPackage rec {
version = "0.3.13"; version = "0.3.13";