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

Merge pull request #56479 from dtzWill/feature/upgrade-default-boost

Browse Source 
boost: update default 1.67 -> 1.69
This commit is contained in:
Frederik Rietdijk 2019-11-12 14:48:45 +01:00 committed by GitHub
commit 35a537df2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4003,9 +4003,7 @@ in
i2p = callPackage ../tools/networking/i2p {}; i2p = callPackage ../tools/networking/i2p {};
i2pd = callPackage ../tools/networking/i2pd { i2pd = callPackage ../tools/networking/i2pd { };
boost = boost165;
};
i-score = libsForQt5.callPackage ../applications/audio/i-score { }; i-score = libsForQt5.callPackage ../applications/audio/i-score { };
@ -4610,9 +4608,7 @@ in
file-rename = callPackage ../tools/filesystems/file-rename { }; file-rename = callPackage ../tools/filesystems/file-rename { };
kea = callPackage ../tools/networking/kea { kea = callPackage ../tools/networking/kea { };
boost = boost165;
};
ispell = callPackage ../tools/text/ispell {}; ispell = callPackage ../tools/text/ispell {};
@ -10693,7 +10689,7 @@ in
boost167 = callPackage ../development/libraries/boost/1.67.nix { }; boost167 = callPackage ../development/libraries/boost/1.67.nix { };
boost168 = callPackage ../development/libraries/boost/1.68.nix { }; boost168 = callPackage ../development/libraries/boost/1.68.nix { };
boost169 = callPackage ../development/libraries/boost/1.69.nix { }; boost169 = callPackage ../development/libraries/boost/1.69.nix { };
boost16x = boost167; boost16x = boost169;
boost170 = callPackage ../development/libraries/boost/1.70.nix { }; boost170 = callPackage ../development/libraries/boost/1.70.nix { };
boost17x = boost170; boost17x = boost170;
boost = boost16x; boost = boost16x;
@ -15497,9 +15493,7 @@ in
libtool = darwin.cctools; libtool = darwin.cctools;
}; };
rippled = callPackage ../servers/rippled { rippled = callPackage ../servers/rippled { };
boost = boost167;
};
rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix {
boost = boost167.override { boost = boost167.override {
@ -19465,7 +19459,7 @@ in
k3d = callPackage ../applications/graphics/k3d { k3d = callPackage ../applications/graphics/k3d {
inherit (pkgs.gnome2) gtkglext; inherit (pkgs.gnome2) gtkglext;
stdenv = gcc6Stdenv; stdenv = gcc6Stdenv;
boost = boost166.override { enablePython = true; }; boost = boost.override { enablePython = true; };
}; };
k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; k9copy = libsForQt5.callPackage ../applications/video/k9copy {};