Merge pull request #227057 from afh/update-boost

boost182: init at 1.82.0
This commit is contained in:
Weijia Wang 2023-04-25 12:47:34 +03:00 committed by GitHub
commit e95b025cc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 2 deletions

View File

@ -0,0 +1,14 @@
{ callPackage, fetchurl, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.82.0";
src = fetchurl {
urls = [
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
"https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_82_0.html
sha256 = "a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6";
};
})

View File

@ -32,4 +32,5 @@ in {
boost179 = makeBoost ./1.79.nix;
boost180 = makeBoost ./1.80.nix;
boost181 = makeBoost ./1.81.nix;
boost182 = makeBoost ./1.82.nix;
}

View File

@ -158,7 +158,7 @@ stdenv.mkDerivation {
platforms = platforms.unix ++ platforms.windows;
badPlatforms = optional (versionOlder version "1.59") "aarch64-linux"
++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"
++ optionals (versionOlder version "1.73") lib.platforms.riscv;
++ optionals (versionOlder version "1.73") platforms.riscv;
maintainers = with maintainers; [ hjones2199 ];
broken =

View File

@ -39,6 +39,8 @@ stdenv.mkDerivation {
postPatch = ''
substituteInPlace src/build-system.jam \
--replace "default-toolset = darwin" "default-toolset = clang-darwin"
'' + lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.82") ''
patchShebangs --build src/engine/build.sh
'';
nativeBuildInputs = [

View File

@ -19511,11 +19511,12 @@ with pkgs;
boost179
boost180
boost181
boost182
;
boost16x = boost169;
boost17x = boost179;
boost18x = boost181;
boost18x = boost182;
boost = boost17x;
boost_process = callPackage ../development/libraries/boost-process { };