From dc16b7cbb66e5962d422585a6d5c6d920e8032ab Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 23 Nov 2014 02:34:10 -0800 Subject: [PATCH 1/2] boost: Make 1.57 the default --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa759062910..979fbd866e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4879,7 +4879,7 @@ let boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost156 = callPackage ../development/libraries/boost/1.56.nix { }; boost157 = callPackage ../development/libraries/boost/1.57.nix { }; - boost = boost156; + boost = boost157; boost_process = callPackage ../development/libraries/boost-process { }; From 0f711225d41b56fa42c3bdc83078030917cea2e4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 23 Nov 2014 13:36:09 -0800 Subject: [PATCH 2/2] boost: Pin packages to 1.56 --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 979fbd866e3..24a299714f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -842,7 +842,9 @@ let cksfv = callPackage ../tools/networking/cksfv { }; - clementine = callPackage ../applications/audio/clementine { }; + clementine = callPackage ../applications/audio/clementine { + boost = boost156; + }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -7680,6 +7682,7 @@ let mariadb = callPackage ../servers/sql/mariadb {}; mongodb = callPackage ../servers/nosql/mongodb { + boost = boost156; sasl = cyrus_sasl; }; @@ -9642,6 +9645,7 @@ let }; freecad = callPackage ../applications/graphics/freecad { + boost = boost156; opencascade = opencascade_6_5; inherit (pythonPackages) matplotlib pycollada; }; @@ -10502,6 +10506,7 @@ let pythonmagick = callPackage ../applications/graphics/PythonMagick { }; qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { + boost = boost156; libtorrentRasterbar = libtorrentRasterbar_0_16; };