NixOS · Mic92 · Mar 24, 2025 · Mar 24, 2025 · Mar 24, 2025 · Mar 24, 2025
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -29,7 +29,6 @@
 , openvdb
 , pcre
 , qhull
-, tbb_2021_11
 , wxGTK32
 , xorg
 , libbgcode
@@ -65,7 +64,6 @@ let
       hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
     };
   });
-  openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_11; };
   wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override;
   opencascade-override' = if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;
 in
@@ -123,10 +121,9 @@ stdenv.mkDerivation (finalAttrs: {
     nanosvg-fltk
     nlopt
     opencascade-override'
-    openvdb_tbb_2021_8
+    openvdb
     pcre
     qhull
-    tbb_2021_11
     wxGTK-override'
     xorg.libX11
     libbgcode

diff --git a/pkgs/by-name/au/autotier/package.nix b/pkgs/by-name/au/autotier/package.nix
@@ -8,7 +8,7 @@
   boost,
   fuse3,
   lib45d,
-  tbb_2021_11,
+  tbb,
   liburing,
   installShellFiles,
 }:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     fuse3
     lib45d
-    tbb_2021_11
+    tbb
     liburing
   ];
 

diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -34,7 +34,7 @@
   opencv,
   pcre,
   systemd,
-  tbb_2021_11,
+  tbb,
   webkitgtk_4_0,
   wxGTK31,
   xorg,
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
     opencascade-occt_7_6
     openvdb
     pcre
-    tbb_2021_11
+    tbb
     webkitgtk_4_0
     wxGTK'
     xorg.libX11

diff --git a/pkgs/by-name/ca/cabinpkg/package.nix b/pkgs/by-name/ca/cabinpkg/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  tbb_2021_11,
+  tbb,
   libgit2,
   curl,
   fmt,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libgit2
     fmt
-    tbb_2021_11
+    tbb
     nlohmann_json
     curl
   ];

diff --git a/pkgs/by-name/el/elmerfem/package.nix b/pkgs/by-name/el/elmerfem/package.nix
@@ -81,6 +81,8 @@ stdenv.mkDerivation rec {
       wulfsta
       broke
     ];
+    # cannot find openmp
+    broken = stdenv.hostPlatform.isDarwin;
     license = licenses.lgpl21;
   };
 

diff --git a/pkgs/by-name/hm/hmat-oss/package.nix b/pkgs/by-name/hm/hmat-oss/package.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/jeromerobert/hmat-oss";
     license = licenses.gpl2;
     platforms = platforms.unix;
+    # Lapack linking erros on macOS:
+    # "_LAPACKE_cgeqrf", referenced from:
+    #  hmat::ScalarArray<std::__1::complex<float>>::qrDecomposition(hmat::ScalarArray<std::__1::complex<float>>*, int) in scalar_array.cpp.o
+    # "_LAPACKE_cgesdd", referenced from:
+    # int hmat::sddCall<std::__1::complex<float>>(char, int, int, std::__1::complex<float>*, int, hmat::Types<std::__1::complex<float>>::real*, std::__1::complex<float>*, int, std::__1::complex<float>*, int) in lapack_operations.cpp.o
+    broken = stdenv.hostPlatform.isDarwin;
     maintainers = with maintainers; [ gdinh ];
   };
 }
diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix
@@ -18,7 +18,7 @@
   gtest,
   icu,
   spdlog,
-  tbb_2021_11,
+  tbb,
   yaml-cpp,
 }:
 
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtest
     icu
     (spdlog.override { fmt = fmt_11; })
-    tbb_2021_11
+    tbb
 
     finalAttrs.passthru.yaml-cpp # has merge-key support
     finalAttrs.passthru.libloadorder

diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix
@@ -6,7 +6,7 @@
   clipper2,
   gtest,
   glm,
-  tbb_2021_11,
+  tbb,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtest
     glm
-    tbb_2021_11
+    tbb
     clipper2
   ];
 

diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix
@@ -11,7 +11,7 @@
   libdwarf-lite,
   pkg-config,
   python3,
-  tbb_2021_11,
+  tbb,
   buildPackages,
 }:
 stdenv.mkDerivation {
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
     capnproto # cmake modules
     flex # include dir
     libdwarf-lite
-    tbb_2021_11
+    tbb
     python3
   ];
 

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -33,7 +33,7 @@
   mesa,
   mpfr,
   python3,
-  tbb_2021_11,
+  tbb,
   wayland,
   wayland-protocols,
   wrapGAppsHook3,
@@ -79,7 +79,7 @@ clangStdenv.mkDerivation rec {
     [
       clipper2
       glm
-      tbb_2021_11
+      tbb
       mimalloc
       boost
       cairo

diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
@@ -34,7 +34,7 @@
   opencv,
   pcre,
   systemd,
-  tbb_2021_11,
+  tbb,
   webkitgtk_4_0,
   wxGTK31,
   xorg,
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
       opencascade-occt_7_6
       openvdb
       pcre
-      tbb_2021_11
+      tbb
       webkitgtk_4_0
       wxGTK'
       xorg.libX11

diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "papilo";
-  version = "2.3.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "scipopt";
     repo = "papilo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-rB8kRyBxd+zn3XFueTQoN16jbFpXMvneqatQm8Hh2Hg=";
+    hash = "sha256-oQ9iq5UkFK0ghUx6uxdJIOo5niQjniHegSZptqi2fgE=";
   };
 
   buildInputs = [

diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix
@@ -8,7 +8,7 @@
   qt6,
   wrapGAppsHook3,
   openjpeg,
-  tbb_2021_11,
+  tbb,
   blend2d,
 }:
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtspeech
     lcms
     openjpeg
-    tbb_2021_11
+    tbb
     blend2d
   ];
 

diff --git a/pkgs/by-name/sa/salmon/package.nix b/pkgs/by-name/sa/salmon/package.nix
@@ -12,7 +12,7 @@
   libiconv,
   libstaden-read,
   pkg-config,
-  tbb_2021_11,
+  tbb,
   xz,
   zlib,
 }:
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     jemalloc
     libgff
     libstaden-read
-    tbb_2021_11
+    tbb
     xz
     zlib
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];

diff --git a/pkgs/by-name/th/thepeg/package.nix b/pkgs/by-name/th/thepeg/package.nix
@@ -55,6 +55,12 @@ stdenv.mkDerivation rec {
     description = "Toolkit for High Energy Physics Event Generation";
     homepage = "https://herwig.hepforge.org/";
     license = licenses.gpl3Only;
+    # Broken on macOS/clang?
+    #        > ../include/ThePEG/Config/std.h:101:12: error: no member named 'mem_fun' in namespace 'std'; did you mean 'mem_fn'?
+    #   >   101 | using std::mem_fun;
+    #   >       |       ~~~~~^~~~~~~
+    #   >       |            mem_fn
+    broken = stdenv.hostPlatform.isDarwin;
     maintainers = with maintainers; [ veprbl ];
     platforms = platforms.unix;
   };

diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix
@@ -7,7 +7,7 @@
   openssl,
   zeromq,
   cppzmq,
-  tbb_2021_11,
+  tbb,
   spdlog,
   libsodium,
   fmt,
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
       openssl
       zeromq
       cppzmq
-      tbb_2021_11
+      tbb
       spdlog
       libsodium
       fmt

diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
     "-DOPENVDB_BUILD_NANOVDB=ON"
   ];
 
+  # Fixes clang build
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-missing-template-arg-list-after-template-kw"
+  ];
+
   postFixup = ''
     substituteInPlace $dev/lib/cmake/OpenVDB/FindOpenVDB.cmake \
       --replace \''${OPENVDB_LIBRARYDIR} $out/lib \

diff --git a/pkgs/development/octave-modules/geometry/default.nix b/pkgs/development/octave-modules/geometry/default.nix
@@ -1,30 +1,33 @@
 {
   buildOctavePackage,
   lib,
-  fetchhg,
+  fetchzip,
   matgeom,
+  stdenv,
 }:
 
 buildOctavePackage rec {
   pname = "geometry";
-  version = "unstable-2021-07-07";
+  version = "4.1.0";
 
-  src = fetchhg {
-    url = "http://hg.code.sf.net/p/octave/${pname}";
-    rev = "04965cda30b5f9e51774194c67879e7336df1710";
-    sha256 = "sha256-ECysYOJMF4gPiCFung9hFSlyyO60X3MGirQ9FlYDix8=";
+  src = fetchzip {
+    url = "https://downloads.sourceforge.net/project/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases/geometry-${version}.tar.gz";
+    sha256 = "sha256-Gru+wDm8TzAMrN49Jj7d7vj7sUrxPTbGbwmterwQAAw";
   };
 
   requiredOctavePackages = [
     matgeom
   ];
 
   meta = with lib; {
-    homepage = "https://octave.sourceforge.io/geometry/index.html";
+    homepage = "https://gnu-octave.github.io/packages/geometry/";
     license = with licenses; [
       gpl3Plus
       boost
     ];
+    # Build error on macOS
+    # ./martinez.h:40:30: error: no template named 'binary_function'; did you mean '__binary_function'?
+    broken = stdenv.hostPlatform.isDarwin;
     maintainers = with maintainers; [ KarlJoad ];
     description = "Library for extending MatGeom functionality";
   };

diff --git a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix
@@ -41,6 +41,8 @@ tcl.mkTclDerivation rec {
     homepage = "https://sourceforge.net/projects/tkimg/";
     description = "Img package adds several image formats to Tcl/Tk";
     maintainers = with lib.maintainers; [ matthewcroughan ];
+    # fdopen is not defined but used.
+    badPlatforms = [ "aarch64-darwin" ];
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
   };

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -237,7 +237,6 @@ with pkgs;
   };
 
   basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix {
-    tbb = tbb_2021_11;
     cereal = cereal_1_3_2;
     opencv = opencv.override { enableGtk3 = true; };
   };
@@ -6651,8 +6650,7 @@ with pkgs;
   tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };
   tbb_2021_11 = callPackage ../development/libraries/tbb { };
   tbb_2022_0 = callPackage ../development/libraries/tbb/2022_0.nix { };
-  # many packages still fail with latest version
-  tbb = tbb_2020_3;
+  tbb = tbb_2021_11;
 
   terra = callPackage ../development/compilers/terra {
     inherit (darwin) libobjc;
@@ -7864,7 +7862,6 @@ with pkgs;
 
   ikos = callPackage ../development/tools/analysis/ikos {
     inherit (llvmPackages_14) stdenv clang llvm;
-    tbb = tbb_2021_11;
   };
 
   include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
@@ -7946,7 +7943,6 @@ with pkgs;
 
   mold = callPackage ../by-name/mo/mold/package.nix {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
-    tbb = tbb_2021_11;
   };
 
   mold-wrapped = wrapBintoolsWith {
@@ -8480,7 +8476,6 @@ with pkgs;
 
   cctag = callPackage ../development/libraries/cctag {
     stdenv = clangStdenv;
-    tbb = tbb_2021_11;
   };
 
   cctz = callPackage ../development/libraries/cctz {
@@ -11356,9 +11351,7 @@ with pkgs;
   opensmtpd = callPackage ../servers/mail/opensmtpd { };
   opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { };
   opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { };
-  osrm-backend = callPackage ../servers/osrm-backend {
-    tbb = tbb_2021_11;
-  };
+  osrm-backend = callPackage ../servers/osrm-backend { };
 
   system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { });
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,6 +81,8 @@ stdenv.mkDerivation rec { @@
           wulfsta
           broke
         ];
+        # cannot find openmp
+        broken = stdenv.hostPlatform.isDarwin;
         license = licenses.lgpl21;
       };
@@ Expand Down @@