Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[staging] boost: default to boost 1.77 and refactor #138309

Merged
merged 3 commits into from
Nov 27, 2021
Merged

[staging] boost: default to boost 1.77 and refactor #138309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e34bfb
boost: generalize version numbers
hjones2199 Apr 22, 2021
eca5088
boost: default to boost 1.77
hjones2199 Sep 17, 2021
b772490
boost-build: make darwin patch work across all versions
hjones2199 Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/libraries/boost/1.55.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ callPackage, fetchurl, ... } @ args:

callPackage ./generic.nix (args // {
callPackage ./generic.nix (args // rec {
version = "1.55.0";

patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ];

src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2";
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z";
};
})
4 changes: 2 additions & 2 deletions pkgs/development/libraries/boost/1.59.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:

callPackage ./generic.nix (args // {
callPackage ./generic.nix (args // rec {
version = "1.59.0";

src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2";
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj";
};
})
4 changes: 2 additions & 2 deletions pkgs/development/libraries/boost/1.60.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:

callPackage ./generic.nix (args // {
callPackage ./generic.nix (args // rec {
version = "1.60.0";

src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_60_0.tar.bz2";
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
sha256 = "0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8";
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/boost/1.65.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:

callPackage ./generic.nix (args // {
callPackage ./generic.nix (args // rec {
version = "1.65.1";

src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_65_1.tar.bz2";
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_65_1.html
sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
};
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/boost/1.66.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:

callPackage ./generic.nix (args // {
callPackage ./generic.nix (args // rec {
version = "1.66.0";

src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_66_0.tar.bz2";
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_66_0.html
sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
};
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/boost/1.68.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, fetchpatch, ... } @ args:

callPackage ./generic.nix (args // {
callPackage ./generic.nix (args // rec {
version = "1.68.0";

src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_68_0.tar.bz2";
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_68_0.html
sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7";
};
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/boost/1.69.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, fetchpatch, ... } @ args:

callPackage ./generic.nix (args // {
callPackage ./generic.nix (args // rec {
version = "1.69.0";

src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_69_0.tar.bz2";
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_69_0.html
sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";
};
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/boost/1.70.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, fetchpatch, ... } @ args:

callPackage ./generic.nix (args // {
callPackage ./generic.nix (args // rec {
version = "1.70.0";

src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_70_0.tar.bz2";
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_70_0.html
sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778";
};
Expand Down
5 changes: 2 additions & 3 deletions pkgs/development/libraries/boost/1.72.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ callPackage ./generic.nix (args // rec {
version = "1.72.0";

src = fetchurl {
#url = "mirror://sourceforge/boost/boost_1_72_0.tar.bz2";
urls = [
"mirror://sourceforge/boost/boost_1_72_0.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2"
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_72_0.html
sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722";
Expand Down
5 changes: 2 additions & 3 deletions pkgs/development/libraries/boost/1.73.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ callPackage ./generic.nix (args // rec {
version = "1.73.0";

src = fetchurl {
#url = "mirror://sourceforge/boost/boost_1_73_0.tar.bz2";
urls = [
"mirror://sourceforge/boost/boost_1_73_0.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2"
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_73_0.html
sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/boost/1.74.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ callPackage ./generic.nix (args // rec {

src = fetchurl {
urls = [
"mirror://sourceforge/boost/boost_1_74_0.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2"
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_74_0.html
sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/boost/1.75.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ callPackage ./generic.nix (args // rec {

src = fetchurl {
urls = [
"mirror://sourceforge/boost/boost_1_75_0.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2"
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_75_0.html
sha256 = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb";
Expand Down
15 changes: 15 additions & 0 deletions pkgs/development/libraries/boost/1.77.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{ callPackage, fetchurl, fetchpatch, ... } @ args:

callPackage ./generic.nix (args // rec {
version = "1.77.0";

src = fetchurl {
urls = [
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_77_0.html
sha256 = "sha256-/J+F/AMOIzFCkIJBr3qEbmBjCqc4jeml+vsfOiaECFQ=";
};
})

1 change: 1 addition & 0 deletions pkgs/development/libraries/boost/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ in {
boost173 = makeBoost ./1.73.nix;
boost174 = makeBoost ./1.74.nix;
boost175 = makeBoost ./1.75.nix;
boost177 = makeBoost ./1.77.nix;
}
12 changes: 0 additions & 12 deletions pkgs/development/tools/boost-build/darwin-default-toolset.patch
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions pkgs/development/tools/boost-build/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ stdenv.mkDerivation {
sourceRoot="$sourceRoot/tools/build"
'';

patches = [
# Upstream defaults to gcc on darwin, but we use clang.
./darwin-default-toolset.patch
];
# Upstream defaults to gcc on darwin, but we use clang.
postPatch = ''
substituteInPlace src/build-system.jam \
--replace "default-toolset = darwin" "default-toolset = clang-darwin"
'';

nativeBuildInputs = [
bison
Expand Down
38 changes: 11 additions & 27 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4595,9 +4595,7 @@ with pkgs;

vorta = libsForQt5.callPackage ../applications/backup/vorta { };

vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit {
boost = boost17x;
};
vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { };

utahfs = callPackage ../applications/networking/utahfs { };

Expand Down Expand Up @@ -14814,9 +14812,7 @@ with pkgs;
uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { };

uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { };
uhd = callPackage ../applications/radio/uhd {
boost = boost17x;
};
uhd = callPackage ../applications/radio/uhd { };

uisp = callPackage ../development/embedded/uisp { };

Expand Down Expand Up @@ -15129,12 +15125,13 @@ with pkgs;
boost173
boost174
boost175
boost177
;

boost15x = boost159;
boost16x = boost169;
boost17x = boost175;
boost = boost16x;
boost17x = boost177;
boost = boost17x;

boost_process = callPackage ../development/libraries/boost-process { };

Expand Down Expand Up @@ -20718,14 +20715,10 @@ with pkgs;
libtool = darwin.cctools;
};

# Fails to compile with boost >= 1.72
rippled = callPackage ../servers/rippled {
boost = boost17x;
};
# Fails to compile with boost <= 1.72
rippled = callPackage ../servers/rippled { };

rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix {
boost = boost17x;
};
rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { };

roon-bridge = callPackage ../servers/roon-bridge { };

Expand Down Expand Up @@ -24147,7 +24140,6 @@ with pkgs;
unwrapped = callPackage ../applications/radio/gnuradio {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
python = python3;
boost = boost17x;
};
};
gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs;
Expand Down Expand Up @@ -24177,7 +24169,6 @@ with pkgs;
unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
python = python3;
boost = boost17x;
};
};
gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs;
Expand Down Expand Up @@ -26814,9 +26805,7 @@ with pkgs;

qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };

qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview {
boost = boost17x;
};
qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };

qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { };

Expand Down Expand Up @@ -28801,16 +28790,11 @@ with pkgs;

monero = callPackage ../applications/blockchains/monero {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
boost = boost17x;
};

oxen = callPackage ../applications/blockchains/oxen {
boost = boost17x;
};
oxen = callPackage ../applications/blockchains/oxen { };

monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
boost = boost17x;
};
monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { };

masari = callPackage ../applications/blockchains/masari { boost = boost165; };

Expand Down