From 557163a1ddbda6c3c71be1fab1318d3413be5bd1 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sun, 3 Sep 2023 22:48:15 +0800 Subject: boost183: init at 1.83.0 --- pkgs/development/libraries/boost/1.83.nix | 14 ++++++++++++++ pkgs/development/libraries/boost/default.nix | 1 + pkgs/development/libraries/boost/generic.nix | 7 +++++++ 3 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.83.nix (limited to 'pkgs/development/libraries/boost') diff --git a/pkgs/development/libraries/boost/1.83.nix b/pkgs/development/libraries/boost/1.83.nix new file mode 100644 index 0000000000000..df5c5a5bbd31c --- /dev/null +++ b/pkgs/development/libraries/boost/1.83.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.83.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_83_0.html + sha256 = "6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e"; + }; +}) diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index 7a8902bc395dd..7f6422515ace2 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -23,4 +23,5 @@ in { boost180 = makeBoost ./1.80.nix; boost181 = makeBoost ./1.81.nix; boost182 = makeBoost ./1.82.nix; + boost183 = makeBoost ./1.83.nix; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 5de26ef5ce2b9..3a4c0e17ba936 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -113,6 +113,13 @@ stdenv.mkDerivation { relative = "include"; sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; }) + # Fixes ABI detection + ++ lib.optional (version == "1.83.0") (fetchpatch { + url = "https://github.com/boostorg/context/commit/6fa6d5c50d120e69b2d8a1c0d2256ee933e94b3b.patch"; + stripLen = 1; + extraPrefix = "libs/context/"; + sha256 = "sha256-bCfLL7bD1Rn4Ie/P3X+nIcgTkbXdCX6FW7B9lHsmVW8="; + }) # This fixes another issue regarding ill-formed constant expressions, which is a default error # in clang 16 and will be a hard error in clang 17. ++ lib.optional (lib.versionOlder version "1.80") (fetchpatch { -- cgit 1.4.1