From 6866bcc14cc21ccc31d77d4f8d20ff6e360e1fb0 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 22 Dec 2025 10:35:51 +0300 Subject: [PATCH] boost186: nixfmt --- pkgs/development/libraries/boost/generic.nix | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index fb874e401b3b..216f5807ea7d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -218,16 +218,19 @@ stdenv.mkDerivation { ++ 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 { - name = "boost-numpy-2-compatibility.patch"; - url = "https://github.com/boostorg/python/commit/0474de0f6cc9c6e7230aeb7164af2f7e4ccf74bf.patch"; - stripLen = 1; - extraPrefix = "libs/python/"; - hash = "sha256-0IHK55JSujYcwEVOuLkwOa/iPEkdAKQlwVWR42p/X2U="; - }) - ) + ++ + lib.optional (lib.versionAtLeast version "1.86" && lib.versionOlder version "1.87") + # Backport fix for NumPy 2 support. + ( + fetchpatch { + name = "boost-numpy-2-compatibility.patch"; + url = "https://github.com/boostorg/python/commit/0474de0f6cc9c6e7230aeb7164af2f7e4ccf74bf.patch"; + stripLen = 1; + extraPrefix = "libs/python/"; + hash = "sha256-0IHK55JSujYcwEVOuLkwOa/iPEkdAKQlwVWR42p/X2U="; + } + ) + ++ lib.optionals (version == "1.87.0") [ # Fix operator<< for shared_ptr and intrusive_ptr # https://github.com/boostorg/smart_ptr/issues/115