cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #138309 from hjones2199/boostup

Browse source 
[staging] boost: default to boost 1.77 and refactor
This commit is contained in:
Peter Simons 2021-11-27 12:14:05 +01:00 committed by GitHub
commit 84f26a482a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 56 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/boost/1.55.nix
View file

@ -1,12 +1,12 @@
{ callPackage, fetchurl, ... } @ args: { callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // rec {
version = "1.55.0"; version = "1.55.0";
patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ]; patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ];
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2"; url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z"; sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z";
}; };
}) })

4
pkgs/development/libraries/boost/1.59.nix
View file

@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args: { callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // rec {
version = "1.59.0"; version = "1.59.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2"; url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"; sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj";
}; };
}) })

4
pkgs/development/libraries/boost/1.60.nix
View file

@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args: { callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // rec {
version = "1.60.0"; version = "1.60.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_60_0.tar.bz2"; url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
sha256 = "0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8"; sha256 = "0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8";
}; };

4
pkgs/development/libraries/boost/1.65.nix
View file

@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args: { callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // rec {
version = "1.65.1"; version = "1.65.1";
src = fetchurl { 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 from http://www.boost.org/users/history/version_1_65_1.html
sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
}; };

4
pkgs/development/libraries/boost/1.66.nix
View file

@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args: { callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // rec {
version = "1.66.0"; version = "1.66.0";
src = fetchurl { 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 from http://www.boost.org/users/history/version_1_66_0.html
sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
}; };

4
pkgs/development/libraries/boost/1.68.nix
View file

@ -1,10 +1,10 @@
{ callPackage, fetchurl, fetchpatch, ... } @ args: { callPackage, fetchurl, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // rec {
version = "1.68.0"; version = "1.68.0";
src = fetchurl { 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 from http://www.boost.org/users/history/version_1_68_0.html
sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7"; sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7";
}; };

4
pkgs/development/libraries/boost/1.69.nix
View file

@ -1,10 +1,10 @@
{ callPackage, fetchurl, fetchpatch, ... } @ args: { callPackage, fetchurl, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // rec {
version = "1.69.0"; version = "1.69.0";
src = fetchurl { 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 from http://www.boost.org/users/history/version_1_69_0.html
sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";
}; };

4
pkgs/development/libraries/boost/1.70.nix
View file

@ -1,10 +1,10 @@
{ callPackage, fetchurl, fetchpatch, ... } @ args: { callPackage, fetchurl, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // rec {
version = "1.70.0"; version = "1.70.0";
src = fetchurl { 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 from http://www.boost.org/users/history/version_1_70_0.html
sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778"; sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778";
}; };

5
pkgs/development/libraries/boost/1.72.nix
View file

@ -4,10 +4,9 @@ callPackage ./generic.nix (args // rec {
version = "1.72.0"; version = "1.72.0";
src = fetchurl { src = fetchurl {
#url = "mirror://sourceforge/boost/boost_1_72_0.tar.bz2";
urls = [ urls = [
"mirror://sourceforge/boost/boost_1_72_0.tar.bz2" "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.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 from http://www.boost.org/users/history/version_1_72_0.html
sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"; sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722";

5
pkgs/development/libraries/boost/1.73.nix
View file

@ -4,10 +4,9 @@ callPackage ./generic.nix (args // rec {
version = "1.73.0"; version = "1.73.0";
src = fetchurl { src = fetchurl {
#url = "mirror://sourceforge/boost/boost_1_73_0.tar.bz2";
urls = [ urls = [
"mirror://sourceforge/boost/boost_1_73_0.tar.bz2" "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.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 from http://www.boost.org/users/history/version_1_73_0.html
sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402"; sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402";

4
pkgs/development/libraries/boost/1.74.nix
View file

@ -5,8 +5,8 @@ callPackage ./generic.nix (args // rec {
src = fetchurl { src = fetchurl {
urls = [ urls = [
"mirror://sourceforge/boost/boost_1_74_0.tar.bz2" "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.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 from http://www.boost.org/users/history/version_1_74_0.html
sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1"; sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1";

4
pkgs/development/libraries/boost/1.75.nix
View file

@ -5,8 +5,8 @@ callPackage ./generic.nix (args // rec {
src = fetchurl { src = fetchurl {
urls = [ urls = [
"mirror://sourceforge/boost/boost_1_75_0.tar.bz2" "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.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 from http://www.boost.org/users/history/version_1_75_0.html
sha256 = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb"; sha256 = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb";

15
pkgs/development/libraries/boost/1.77.nix Normal file
View file

@ -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
pkgs/development/libraries/boost/default.nix
View file

@ -44,4 +44,5 @@ in {
boost173 = makeBoost ./1.73.nix; boost173 = makeBoost ./1.73.nix;
boost174 = makeBoost ./1.74.nix; boost174 = makeBoost ./1.74.nix;
boost175 = makeBoost ./1.75.nix; boost175 = makeBoost ./1.75.nix;
boost177 = makeBoost ./1.77.nix;
} }

12
pkgs/development/tools/boost-build/darwin-default-toolset.patch
View file

@ -1,12 +0,0 @@
diff --git a/src/build-system.jam b/src/build-system.jam
index 60425c54..c6842217 100644
--- a/src/build-system.jam
+++ b/src/build-system.jam
@@ -644,7 +644,7 @@ local rule should-clean-project ( project )
}
else if [ os.name ] = MACOSX
{
- default-toolset = darwin ;
+ default-toolset = clang-darwin ;
}
}

9
pkgs/development/tools/boost-build/default.nix
View file

@ -33,10 +33,11 @@ stdenv.mkDerivation {
sourceRoot="$sourceRoot/tools/build" sourceRoot="$sourceRoot/tools/build"
''; '';
patches = [ # Upstream defaults to gcc on darwin, but we use clang.
# Upstream defaults to gcc on darwin, but we use clang. postPatch = ''
./darwin-default-toolset.patch substituteInPlace src/build-system.jam \
]; --replace "default-toolset = darwin" "default-toolset = clang-darwin"
'';
nativeBuildInputs = [ nativeBuildInputs = [
bison bison

38
pkgs/top-level/all-packages.nix
View file

@ -4867,9 +4867,7 @@ with pkgs;
vorta = libsForQt5.callPackage ../applications/backup/vorta { }; vorta = libsForQt5.callPackage ../applications/backup/vorta { };
vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { };
boost = boost17x;
};
utahfs = callPackage ../applications/networking/utahfs { }; utahfs = callPackage ../applications/networking/utahfs { };
@ -15458,9 +15456,7 @@ with pkgs;
uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { };
uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { }; uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { };
uhd = callPackage ../applications/radio/uhd { uhd = callPackage ../applications/radio/uhd { };
boost = boost17x;
};
uisp = callPackage ../development/embedded/uisp { }; uisp = callPackage ../development/embedded/uisp { };
@ -15786,12 +15782,13 @@ with pkgs;
boost173 boost173
boost174 boost174
boost175 boost175
boost177
; ;
boost15x = boost159; boost15x = boost159;
boost16x = boost169; boost16x = boost169;
boost17x = boost175; boost17x = boost177;
boost = boost16x; boost = boost17x;
boost_process = callPackage ../development/libraries/boost-process { }; boost_process = callPackage ../development/libraries/boost-process { };
@ -21497,14 +21494,10 @@ with pkgs;
libtool = darwin.cctools; libtool = darwin.cctools;
}; };
# Fails to compile with boost >= 1.72 # Fails to compile with boost <= 1.72
rippled = callPackage ../servers/rippled { rippled = callPackage ../servers/rippled { };
boost = boost17x;
};
rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { };
boost = boost17x;
};
roon-bridge = callPackage ../servers/roon-bridge { }; roon-bridge = callPackage ../servers/roon-bridge { };
@ -25052,7 +25045,6 @@ with pkgs;
unwrapped = callPackage ../applications/radio/gnuradio { unwrapped = callPackage ../applications/radio/gnuradio {
inherit (darwin.apple_sdk.frameworks) CoreAudio; inherit (darwin.apple_sdk.frameworks) CoreAudio;
python = python3; python = python3;
boost = boost17x;
}; };
}; };
gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs;
@ -25085,7 +25077,6 @@ with pkgs;
unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix {
inherit (darwin.apple_sdk.frameworks) CoreAudio; inherit (darwin.apple_sdk.frameworks) CoreAudio;
python = python3; python = python3;
boost = boost17x;
}; };
}; };
gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs;
@ -27816,9 +27807,7 @@ with pkgs;
qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };
qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
boost = boost17x;
};
qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { }; qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { };
@ -29758,16 +29747,11 @@ with pkgs;
monero = callPackage ../applications/blockchains/monero { monero = callPackage ../applications/blockchains/monero {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
boost = boost17x;
}; };
oxen = callPackage ../applications/blockchains/oxen { oxen = callPackage ../applications/blockchains/oxen { };
boost = boost17x;
};
monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { };
boost = boost17x;
};
masari = callPackage ../applications/blockchains/masari { boost = boost165; }; masari = callPackage ../applications/blockchains/masari { boost = boost165; };