diff options
-rw-r--r-- | pkgs/development/libraries/boost/1.82.nix | 14 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/boost-build/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
5 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/development/libraries/boost/1.82.nix b/pkgs/development/libraries/boost/1.82.nix new file mode 100644 index 0000000000000..193d07ef7562f --- /dev/null +++ b/pkgs/development/libraries/boost/1.82.nix @@ -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"; + }; +}) diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index b0e310973cff6..b9b2c8ff7e6b9 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -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; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 4268af7ee0bb6..2b7047026137d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -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 = diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index cc15d9a67ccc4..6b485b80ea1c0 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -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 = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 739980d280974..44ef610b00e72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |