From 915c4836e118052d9e474dfc5e52fb8d8acebf41 Mon Sep 17 00:00:00 2001 From: chordtoll Date: Sat, 21 Mar 2026 16:19:31 -0700 Subject: [PATCH] shark: fix after boost upgrade --- pkgs/by-name/sh/shark/boost-1.89.patch | 13 +++++++++++++ pkgs/by-name/sh/shark/package.nix | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/sh/shark/boost-1.89.patch diff --git a/pkgs/by-name/sh/shark/boost-1.89.patch b/pkgs/by-name/sh/shark/boost-1.89.patch new file mode 100644 index 000000000000..f3449efdbf62 --- /dev/null +++ b/pkgs/by-name/sh/shark/boost-1.89.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 830f0baf..a9048f14 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -147,7 +147,7 @@ endif() + find_package( + Boost 1.48.0 REQUIRED COMPONENTS + serialization +- filesystem system ++ filesystem + ) + + if(NOT Boost_FOUND) diff --git a/pkgs/by-name/sh/shark/package.nix b/pkgs/by-name/sh/shark/package.nix index 354cfb85b646..bd639880067e 100644 --- a/pkgs/by-name/sh/shark/package.nix +++ b/pkgs/by-name/sh/shark/package.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/tree/develop/SuperBuild/patches/SHARK?ref_type=heads # patch of hdf5 seems to be not needed based on latest master branch of shark as HDF5 has been removed # c.f https://github.com/Shark-ML/Shark/commit/221c1f2e8abfffadbf3c5ef7cf324bc6dc9b4315 - patches = [ ./shark-2-ext-num-literals-all.diff ]; + patches = [ + ./shark-2-ext-num-literals-all.diff + ./boost-1.89.patch + ]; # Remove explicitly setting C++11, because boost::math headers need C++14 since Boost187. postPatch = ''