diff --git a/pkgs/development/libraries/boost/1.88.nix b/pkgs/development/libraries/boost/1.88.nix new file mode 100644 index 000000000000..d261ba812166 --- /dev/null +++ b/pkgs/development/libraries/boost/1.88.nix @@ -0,0 +1,19 @@ +{ callPackage, fetchurl, ... }@args: + +callPackage ./generic.nix ( + args + // rec { + version = "1.88.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_88_0.html + sha256 = "46d9d2c06637b219270877c9e16155cbd015b6dc84349af064c088e9b5b12f7b"; + }; + } +) diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index 6df574055e92..02fa12706ccf 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -29,4 +29,5 @@ in boost183 = makeBoost ./1.83.nix; boost186 = makeBoost ./1.86.nix; boost187 = makeBoost ./1.87.nix; + boost188 = makeBoost ./1.88.nix; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index f5530b1545d6..d9051e6290b4 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -168,8 +168,10 @@ stdenv.mkDerivation { patches = patches - ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-no-system-python.patch - ++ [ ./cmake-paths-173.patch ] + ++ lib.optional ( + lib.versionOlder version "1.88" && stdenv.hostPlatform.isDarwin + ) ./darwin-no-system-python.patch + ++ lib.optional (lib.versionOlder version "1.88") ./cmake-paths-173.patch ++ lib.optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; relative = "include"; @@ -212,7 +214,10 @@ stdenv.mkDerivation { extraPrefix = "libs/python/"; }) ] - ++ lib.optional (lib.versionAtLeast version "1.81" && stdenv.cc.isClang) ./fix-clang-target.patch + + ++ lib.optional ( + lib.versionAtLeast version "1.81" && lib.versionOlder version "1.88" && stdenv.cc.isClang + ) ./fix-clang-target.patch ++ lib.optional (lib.versionAtLeast version "1.86" && lib.versionOlder version "1.87") [ # Backport fix for NumPy 2 support. (fetchpatch { @@ -223,7 +228,7 @@ stdenv.mkDerivation { hash = "sha256-0IHK55JSujYcwEVOuLkwOa/iPEkdAKQlwVWR42p/X2U="; }) ] - ++ lib.optional (lib.versionAtLeast version "1.87") [ + ++ lib.optional (version == "1.87.0") [ # Fix operator<< for shared_ptr and intrusive_ptr # https://github.com/boostorg/smart_ptr/issues/115 (fetchpatch { @@ -301,7 +306,7 @@ stdenv.mkDerivation { # Fix compilation to 32-bit ARM with clang in downstream packages # https://github.com/ned14/outcome/pull/308 # https://github.com/boostorg/json/pull/1064 - postPatch = lib.optionalString (lib.versionAtLeast version "1.87") '' + postPatch = lib.optionalString (version == "1.87.0") '' substituteInPlace \ boost/outcome/outcome_gdb.h \ boost/outcome/experimental/status-code/status_code.hpp \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 786bf3f50164..20b63e41d2b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9023,6 +9023,7 @@ with pkgs; boost183 boost186 boost187 + boost188 ; boost = boost187;