commit 10a29bad238f6afabeaad31b1cc66adc1eb26cde · pyrox.dev/nixpkgs

+4 -4

pkgs/applications/misc/prusa-slicer/default.nix

···

       27
        
         opencascade-occt_7_6_1,

     

       28
        
         openvdb,

     

       29
        
         qhull,

     

       30
       -
         tbb_2021,

     

       31
        
         wxGTK32,

     

       32
        
         xorg,

     

       33
        
         libbgcode,

     
···

       54
        
             hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";

     

       55
        
           };

     

       56
        
         });

     

       57
       -
         openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021; };

     

       58
        
         wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override;

     

       59
        
         opencascade-override' =

     

       60
        
           if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;

     
···

       122
        
           nanosvg-fltk

     

       123
        
           nlopt

     

       124
        
           opencascade-override'

     

       125
       -
           openvdb_tbb_2021_8

     

       126
        
           qhull

     

       127
       -
           tbb_2021

     

       128
        
           wxGTK-override'

     

       129
        
           xorg.libX11

     

       130
        
           libbgcode

···

       27
        
         opencascade-occt_7_6_1,

     

       28
        
         openvdb,

     

       29
        
         qhull,

     

       30
       +
         tbb_2022,

     

       31
        
         wxGTK32,

     

       32
        
         xorg,

     

       33
        
         libbgcode,

     
···

       54
        
             hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";

     

       55
        
           };

     

       56
        
         });

     

       57
       +
         openvdb_tbb_2022 = openvdb.override { tbb = tbb_2022; };

     

       58
        
         wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override;

     

       59
        
         opencascade-override' =

     

       60
        
           if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;

     
···

       122
        
           nanosvg-fltk

     

       123
        
           nlopt

     

       124
        
           opencascade-override'

     

       125
       +
           openvdb_tbb_2022

     

       126
        
           qhull

     

       127
       +
           tbb_2022

     

       128
        
           wxGTK-override'

     

       129
        
           xorg.libX11

     

       130
        
           libbgcode

+2 -2

pkgs/by-name/au/autotier/package.nix

···

       8
        
         boost,

     

       9
        
         fuse3,

     

       10
        
         lib45d,

     

       11
       -
         tbb_2021,

     

       12
        
         liburing,

     

       13
        
         installShellFiles,

     

       14
        
       }:

     
···

       46
        
           boost

     

       47
        
           fuse3

     

       48
        
           lib45d

     

       49
       -
           tbb_2021

     

       50
        
           liburing

     

       51
        
         ];

     

       52

···

       8
        
         boost,

     

       9
        
         fuse3,

     

       10
        
         lib45d,

     

       11
       +
         tbb_2022,

     

       12
        
         liburing,

     

       13
        
         installShellFiles,

     

       14
        
       }:

     
···

       46
        
           boost

     

       47
        
           fuse3

     

       48
        
           lib45d

     

       49
       +
           tbb_2022

     

       50
        
           liburing

     

       51
        
         ];

     

       52

+2 -2

pkgs/by-name/ba/bambu-studio/package.nix

···

       34
        
         opencv,

     

       35
        
         pcre,

     

       36
        
         systemd,

     

       37
       -
         tbb_2021,

     

       38
        
         webkitgtk_4_1,

     

       39
        
         wxGTK31,

     

       40
        
         xorg,

     
···

       101
        
           opencascade-occt_7_6

     

       102
        
           openvdb

     

       103
        
           pcre

     

       104
       -
           tbb_2021

     

       105
        
           webkitgtk_4_1

     

       106
        
           wxGTK'

     

       107
        
           xorg.libX11

···

       34
        
         opencv,

     

       35
        
         pcre,

     

       36
        
         systemd,

     

       37
       +
         tbb_2022,

     

       38
        
         webkitgtk_4_1,

     

       39
        
         wxGTK31,

     

       40
        
         xorg,

     
···

       101
        
           opencascade-occt_7_6

     

       102
        
           openvdb

     

       103
        
           pcre

     

       104
       +
           tbb_2022

     

       105
        
           webkitgtk_4_1

     

       106
        
           wxGTK'

     

       107
        
           xorg.libX11

+1 -1

pkgs/by-name/bl/blender/package.nix

···

       257
        
           libsndfile

     

       258
        
           libtiff

     

       259
        
           libwebp

     

       260
       -
           (manifold.override { tbb_2021 = tbb; })

     

       261
        
           opencolorio

     

       262
        
           openexr

     

       263
        
           openimageio

···

       257
        
           libsndfile

     

       258
        
           libtiff

     

       259
        
           libwebp

     

       260
       +
           manifold

     

       261
        
           opencolorio

     

       262
        
           openexr

     

       263
        
           openimageio

+2 -2

pkgs/by-name/ca/cabinpkg/package.nix

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       5
       -
         tbb_2021,

     

       6
        
         libgit2,

     

       7
        
         curl,

     

       8
        
         fmt,

     
···

       39
        
         buildInputs = [

     

       40
        
           libgit2

     

       41
        
           fmt

     

       42
       -
           tbb_2021

     

       43
        
           nlohmann_json

     

       44
        
           curl

     

       45
        
         ];

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       5
       +
         tbb_2022,

     

       6
        
         libgit2,

     

       7
        
         curl,

     

       8
        
         fmt,

     
···

       39
        
         buildInputs = [

     

       40
        
           libgit2

     

       41
        
           fmt

     

       42
       +
           tbb_2022

     

       43
        
           nlohmann_json

     

       44
        
           curl

     

       45
        
         ];

+2 -3

pkgs/by-name/li/libblake3/package.nix

···

       4
        
         cmake,

     

       5
        
         fetchFromGitHub,

     

       6
        
         fetchpatch,

     

       7
       -
         tbb_2021,

     

       8
        
       

     

       9
        
         useTBB ? true,

     

       10
        
       }:

     
···

       45
        
         nativeBuildInputs = [ cmake ];

     

       46
        
       

     

       47
        
         propagatedBuildInputs = lib.optionals useTBB [

     

       48
       -
           # 2022.0 crashes on macOS at the moment

     

       49
       -
           tbb_2021

     

       50
        
         ];

     

       51
        
       

     

       52
        
         cmakeFlags = [

···

       4
        
         cmake,

     

       5
        
         fetchFromGitHub,

     

       6
        
         fetchpatch,

     

       7
       +
         tbb_2022,

     

       8
        
       

     

       9
        
         useTBB ? true,

     

       10
        
       }:

     
···

       45
        
         nativeBuildInputs = [ cmake ];

     

       46
        
       

     

       47
        
         propagatedBuildInputs = lib.optionals useTBB [

     

       48
       +
           tbb_2022

     

       0
        
       
     

       49
        
         ];

     

       50
        
       

     

       51
        
         cmakeFlags = [

+2 -2

pkgs/by-name/li/libloot/package.nix

···

       18
        
         gtest,

     

       19
        
         icu,

     

       20
        
         spdlog,

     

       21
       -
         tbb_2021,

     

       22
        
         yaml-cpp,

     

       23
        
       }:

     

       24
        
       

     
···

       70
        
           gtest

     

       71
        
           icu

     

       72
        
           (spdlog.override { fmt = fmt_11; })

     

       73
       -
           tbb_2021

     

       74
        
       

     

       75
        
           finalAttrs.passthru.yaml-cpp # has merge-key support

     

       76
        
           finalAttrs.passthru.libloadorder

···

       18
        
         gtest,

     

       19
        
         icu,

     

       20
        
         spdlog,

     

       21
       +
         tbb_2022,

     

       22
        
         yaml-cpp,

     

       23
        
       }:

     

       24
        
       

     
···

       70
        
           gtest

     

       71
        
           icu

     

       72
        
           (spdlog.override { fmt = fmt_11; })

     

       73
       +
           tbb_2022

     

       74
        
       

     

       75
        
           finalAttrs.passthru.yaml-cpp # has merge-key support

     

       76
        
           finalAttrs.passthru.libloadorder

+3 -3

pkgs/by-name/ma/manifold/package.nix

···

       6
        
         clipper2,

     

       7
        
         gtest,

     

       8
        
         glm,

     

       9
       -
         tbb_2021,

     

       10
        
         python3Packages,

     

       11
        
       }:

     

       12
        
       

     
···

       26
        
         buildInputs = [

     

       27
        
           gtest

     

       28
        
           glm

     

       29
       -
           tbb_2021

     

       30
        
         ];

     

       31
        
       

     

       32
        
         propagatedBuildInputs = [ clipper2 ];

     
···

       48
        
         '';

     

       49
        
       

     

       50
        
         passthru = {

     

       51
       -
           tbb = tbb_2021;

     

       52
        
           tests = {

     

       53
        
             python = python3Packages.manifold3d;

     

       54
        
           };

···

       6
        
         clipper2,

     

       7
        
         gtest,

     

       8
        
         glm,

     

       9
       +
         tbb_2022,

     

       10
        
         python3Packages,

     

       11
        
       }:

     

       12
        
       

     
···

       26
        
         buildInputs = [

     

       27
        
           gtest

     

       28
        
           glm

     

       29
       +
           tbb_2022

     

       30
        
         ];

     

       31
        
       

     

       32
        
         propagatedBuildInputs = [ clipper2 ];

     
···

       48
        
         '';

     

       49
        
       

     

       50
        
         passthru = {

     

       51
       +
           tbb = tbb_2022;

     

       52
        
           tests = {

     

       53
        
             python = python3Packages.manifold3d;

     

       54
        
           };

-1

pkgs/by-name/mo/mold/package.nix

···

       127
        
           changelog = "https://github.com/rui314/mold/releases/tag/v${finalAttrs.version}";

     

       128
        
           license = lib.licenses.mit;

     

       129
        
           platforms = lib.platforms.unix;

     

       130
       -
           broken = stdenv.hostPlatform.isDarwin;

     

       131
        
           mainProgram = "mold";

     

       132
        
           maintainers = with lib.maintainers; [ azahi ];

     

       133
        
         };

···

       127
        
           changelog = "https://github.com/rui314/mold/releases/tag/v${finalAttrs.version}";

     

       128
        
           license = lib.licenses.mit;

     

       129
        
           platforms = lib.platforms.unix;

     

       0
        
       
     

       130
        
           mainProgram = "mold";

     

       131
        
           maintainers = with lib.maintainers; [ azahi ];

     

       132
        
         };

+2 -2

pkgs/by-name/na/naja/package.nix

···

       11
        
         pkg-config,

     

       12
        
         python3,

     

       13
        
         sphinx,

     

       14
       -
         tbb_2021,

     

       15
        
         buildPackages,

     

       16
        
         nix-update-script,

     

       17
        
       }:

     
···

       75
        
           boost

     

       76
        
           capnproto # cmake modules

     

       77
        
           flex # include dir

     

       78
       -
           tbb_2021

     

       79
        
           python3

     

       80
        
         ];

     

       81

···

       11
        
         pkg-config,

     

       12
        
         python3,

     

       13
        
         sphinx,

     

       14
       +
         tbb_2022,

     

       15
        
         buildPackages,

     

       16
        
         nix-update-script,

     

       17
        
       }:

     
···

       75
        
           boost

     

       76
        
           capnproto # cmake modules

     

       77
        
           flex # include dir

     

       78
       +
           tbb_2022

     

       79
        
           python3

     

       80
        
         ];

     

       81

+2 -2

pkgs/by-name/or/orca-slicer/package.nix

···

       34
        
         opencv,

     

       35
        
         pcre,

     

       36
        
         systemd,

     

       37
       -
         tbb_2021,

     

       38
        
         webkitgtk_4_1,

     

       39
        
         wxGTK31,

     

       40
        
         xorg,

     
···

       111
        
           opencascade-occt_7_6

     

       112
        
           openvdb

     

       113
        
           pcre

     

       114
       -
           tbb_2021

     

       115
        
           webkitgtk_4_1

     

       116
        
           wxGTK'

     

       117
        
           xorg.libX11

···

       34
        
         opencv,

     

       35
        
         pcre,

     

       36
        
         systemd,

     

       37
       +
         tbb_2022,

     

       38
        
         webkitgtk_4_1,

     

       39
        
         wxGTK31,

     

       40
        
         xorg,

     
···

       111
        
           opencascade-occt_7_6

     

       112
        
           openvdb

     

       113
        
           pcre

     

       114
       +
           tbb_2022

     

       115
        
           webkitgtk_4_1

     

       116
        
           wxGTK'

     

       117
        
           xorg.libX11

+2 -2

pkgs/by-name/pd/pdf4qt/package.nix

···

       8
        
         qt6,

     

       9
        
         wrapGAppsHook3,

     

       10
        
         openjpeg,

     

       11
       -
         tbb_2021,

     

       12
        
         blend2d,

     

       13
        
       }:

     

       14
        
       

     
···

       46
        
           qt6.qtspeech

     

       47
        
           lcms

     

       48
        
           openjpeg

     

       49
       -
           tbb_2021

     

       50
        
           blend2d

     

       51
        
         ];

     

       52

···

       8
        
         qt6,

     

       9
        
         wrapGAppsHook3,

     

       10
        
         openjpeg,

     

       11
       +
         tbb_2022,

     

       12
        
         blend2d,

     

       13
        
       }:

     

       14
        
       

     
···

       46
        
           qt6.qtspeech

     

       47
        
           lcms

     

       48
        
           openjpeg

     

       49
       +
           tbb_2022

     

       50
        
           blend2d

     

       51
        
         ];

     

       52

+2 -2

pkgs/by-name/sa/salmon/package.nix

···

       13
        
         libiconv,

     

       14
        
         libstaden-read,

     

       15
        
         pkg-config,

     

       16
       -
         tbb_2021,

     

       17
        
         xz,

     

       18
        
         zlib,

     

       19
        
       }:

     
···

       55
        
           jemalloc

     

       56
        
           libgff

     

       57
        
           libstaden-read

     

       58
       -
           tbb_2021

     

       59
        
           xz

     

       60
        
           zlib

     

       61
        
         ]

···

       13
        
         libiconv,

     

       14
        
         libstaden-read,

     

       15
        
         pkg-config,

     

       16
       +
         tbb_2022,

     

       17
        
         xz,

     

       18
        
         zlib,

     

       19
        
       }:

     
···

       55
        
           jemalloc

     

       56
        
           libgff

     

       57
        
           libstaden-read

     

       58
       +
           tbb_2022

     

       59
        
           xz

     

       60
        
           zlib

     

       61
        
         ]

+2 -2

pkgs/by-name/sc/scipopt-papilo/package.nix

···

       6
        
         boost,

     

       7
        
         blas,

     

       8
        
         gmp,

     

       9
       -
         tbb_2021,

     

       10
        
         gfortran,

     

       11
        
       }:

     

       12
        
       

     
···

       31
        
           gmp

     

       32
        
           gfortran

     

       33
        
           boost

     

       34
       -
           tbb_2021

     

       35
        
         ];

     

       36
        
       

     

       37
        
         cmakeFlags = [

···

       6
        
         boost,

     

       7
        
         blas,

     

       8
        
         gmp,

     

       9
       +
         tbb_2022,

     

       10
        
         gfortran,

     

       11
        
       }:

     

       12
        
       

     
···

       31
        
           gmp

     

       32
        
           gfortran

     

       33
        
           boost

     

       34
       +
           tbb_2022

     

       35
        
         ];

     

       36
        
       

     

       37
        
         cmakeFlags = [

+2 -2

pkgs/by-name/sc/scipopt-scip/package.nix

···

       11
        
         scipopt-papilo,

     

       12
        
         scipopt-zimpl,

     

       13
        
         ipopt,

     

       14
       -
         tbb_2021,

     

       15
        
         boost,

     

       16
        
         gfortran,

     

       17
        
         criterion,

     
···

       39
        
           gmp

     

       40
        
           readline

     

       41
        
           zlib

     

       42
       -
           tbb_2021

     

       43
        
           boost

     

       44
        
           gfortran

     

       45
        
           criterion

···

       11
        
         scipopt-papilo,

     

       12
        
         scipopt-zimpl,

     

       13
        
         ipopt,

     

       14
       +
         tbb_2022,

     

       15
        
         boost,

     

       16
        
         gfortran,

     

       17
        
         criterion,

     
···

       39
        
           gmp

     

       40
        
           readline

     

       41
        
           zlib

     

       42
       +
           tbb_2022

     

       43
        
           boost

     

       44
        
           gfortran

     

       45
        
           criterion

+2 -2

pkgs/by-name/su/supercell-wx/package.nix

···

       24
        
         gtest,

     

       25
        
         glm,

     

       26
        
         qt6,

     

       27
       -
         tbb_2021,

     

       28
        
         tracy,

     

       29
        
         replaceVars,

     

       30
        
         python3,

     
···

       130
        
           aws-sdk-cpp

     

       131
        
           howard-hinnant-date

     

       132
        
           boost

     

       133
       -
           tbb_2021

     

       134
        
           glew

     

       135
        
           geos

     

       136
        
           spdlog

···

       24
        
         gtest,

     

       25
        
         glm,

     

       26
        
         qt6,

     

       27
       +
         tbb_2022,

     

       28
        
         tracy,

     

       29
        
         replaceVars,

     

       30
        
         python3,

     
···

       130
        
           aws-sdk-cpp

     

       131
        
           howard-hinnant-date

     

       132
        
           boost

     

       133
       +
           tbb_2022

     

       134
        
           glew

     

       135
        
           geos

     

       136
        
           spdlog

-103

pkgs/by-name/tb/tbb_2021/package.nix

···

       1
       -
       {

     

       2
       -
         lib,

     

       3
       -
         stdenv,

     

       4
       -
         fetchFromGitHub,

     

       5
       -
         fetchpatch,

     

       6
       -
         cmake,

     

       7
       -
         ninja,

     

       8
       -
       }:

     

       9
       -
       

     

       10
       -
       stdenv.mkDerivation (finalAttrs: {

     

       11
       -
         pname = "tbb";

     

       12
       -
         version = "2021.12.0";

     

       13
       -
       

     

       14
       -
         outputs = [

     

       15
       -
           "out"

     

       16
       -
           "dev"

     

       17
       -
         ];

     

       18
       -
       

     

       19
       -
         src = fetchFromGitHub {

     

       20
       -
           owner = "oneapi-src";

     

       21
       -
           repo = "oneTBB";

     

       22
       -
           tag = "v${finalAttrs.version}";

     

       23
       -
           hash = "sha256-yG/Fs+3f9hNKzZ8le+W7+JDZk9hMzPsVAzbq0yTcUTc=";

     

       24
       -
         };

     

       25
       -
       

     

       26
       -
         nativeBuildInputs = [

     

       27
       -
           cmake

     

       28
       -
           ninja

     

       29
       -
         ];

     

       30
       -
       

     

       31
       -
         patches = [

     

       32
       -
           # Fix musl build from https://github.com/oneapi-src/oneTBB/pull/899

     

       33
       -
           (fetchpatch {

     

       34
       -
             url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";

     

       35
       -
             hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";

     

       36
       -
           })

     

       37
       -
           # Fix tests on FreeBSD and Windows

     

       38
       -
           (fetchpatch {

     

       39
       -
             name = "fix-tbb-freebsd-and-windows-tests.patch";

     

       40
       -
             url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";

     

       41
       -
             hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";

     

       42
       -
           })

     

       43
       -
           # Fix 32-bit PowerPC build

     

       44
       -
           (fetchpatch {

     

       45
       -
             url = "https://github.com/uxlfoundation/oneTBB/pull/987/commits/c828ae47b8f4bea7736d2f9d05460e2b529c9d7d.patch";

     

       46
       -
             hash = "sha256-faNiVdHRIkmavufDHQQ8vHppvdahZ7yhJVL3bOwNTFg=";

     

       47
       -
           })

     

       48
       -
         ];

     

       49
       -
       

     

       50
       -
         patchFlags = [

     

       51
       -
           "-p1"

     

       52
       -
           "--ignore-whitespace"

     

       53
       -
         ];

     

       54
       -
       

     

       55
       -
         # Fix build with modern gcc

     

       56
       -
         # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',

     

       57
       -
         NIX_CFLAGS_COMPILE =

     

       58
       -
           lib.optionals stdenv.cc.isGNU [

     

       59
       -
             "-Wno-error=array-bounds"

     

       60
       -
             "-Wno-error=stringop-overflow"

     

       61
       -
           ]

     

       62
       -
           ++

     

       63
       -
             # error: variable 'val' set but not used

     

       64
       -
             lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ]

     

       65
       -
           ++

     

       66
       -
             # Workaround for gcc-12 ICE when using -O3

     

       67
       -
             # https://gcc.gnu.org/PR108854

     

       68
       -
             lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ];

     

       69
       -
       

     

       70
       -
         # Fix undefined reference errors with version script under LLVM.

     

       71
       -
         NIX_LDFLAGS = lib.optionalString (

     

       72
       -
           stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"

     

       73
       -
         ) "--undefined-version";

     

       74
       -
       

     

       75
       -
         # Disable failing test on musl

     

       76
       -
         # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’?

     

       77
       -
         postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''

     

       78
       -
           substituteInPlace test/CMakeLists.txt \

     

       79
       -
             --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""

     

       80
       -
         '';

     

       81
       -
       

     

       82
       -
         enableParallelBuilding = true;

     

       83
       -
       

     

       84
       -
         meta = {

     

       85
       -
           description = "Intel Thread Building Blocks C++ Library";

     

       86
       -
           homepage = "http://threadingbuildingblocks.org/";

     

       87
       -
           license = lib.licenses.asl20;

     

       88
       -
           longDescription = ''

     

       89
       -
             Intel Threading Building Blocks offers a rich and complete approach to

     

       90
       -
             expressing parallelism in a C++ program. It is a library that helps you

     

       91
       -
             take advantage of multi-core processor performance without having to be a

     

       92
       -
             threading expert. Intel TBB is not just a threads-replacement library. It

     

       93
       -
             represents a higher-level, task-based parallelism that abstracts platform

     

       94
       -
             details and threading mechanisms for scalability and performance.

     

       95
       -
           '';

     

       96
       -
           platforms = lib.platforms.all;

     

       97
       -
           maintainers = with lib.maintainers; [

     

       98
       -
             silvanshade

     

       99
       -
             thoughtpolice

     

       100
       -
             tmarkus

     

       101
       -
           ];

     

       102
       -
         };

     

       103
       -
       })

+38

pkgs/by-name/tb/tbb_2022/fix-32-bit-powerpc-build.patch

···

       1
       +
       From c828ae47b8f4bea7736d2f9d05460e2b529c9d7d Mon Sep 17 00:00:00 2001

     

       2
       +
       From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

     

       3
       +
       Date: Fri, 9 Dec 2022 12:36:11 +0100

     

       4
       +
       Subject: [PATCH] Add cmake check for libatomic requirement when building with

     

       5
       +
        gcc (#980)

     

       6
       +
       

     

       7
       +
       Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

     

       8
       +
       ---

     

       9
       +
        cmake/compilers/GNU.cmake | 16 ++++++++++++++++

     

       10
       +
        1 file changed, 16 insertions(+)

     

       11
       +
       

     

       12
       +
       diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake

     

       13
       +
       index cd76acfe1e..59f4e6934f 100644

     

       14
       +
       --- a/cmake/compilers/GNU.cmake

     

       15
       +
       +++ b/cmake/compilers/GNU.cmake

     

       16
       +
       @@ -44,6 +44,22 @@ if (NOT MINGW)

     

       17
       +
            set(TBB_COMMON_LINK_LIBS dl)

     

       18
       +
        endif()

     

       19
       +
        

     

       20
       +
       +# Check whether code with full atomics can be built without libatomic

     

       21
       +
       +# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358

     

       22
       +
       +include(CheckCXXSourceCompiles)

     

       23
       +
       +check_cxx_source_compiles("#include <atomic>

     

       24
       +
       +int main() {

     

       25
       +
       +  std::atomic<uint8_t> w1;

     

       26
       +
       +  std::atomic<uint16_t> w2;

     

       27
       +
       +  std::atomic<uint32_t> w4;

     

       28
       +
       +  std::atomic<uint64_t> w8;

     

       29
       +
       +  return ++w1 + ++w2 + ++w4 + ++w8;

     

       30
       +
       +}" TBB_BUILDS_WITHOUT_LIBATOMIC)

     

       31
       +
       +

     

       32
       +
       +if(NOT TBB_BUILDS_WITHOUT_LIBATOMIC)

     

       33
       +
       +   set(TBB_COMMON_LINK_LIBS ${TBB_COMMON_LINK_LIBS} atomic)

     

       34
       +
       +endif()

     

       35
       +
       +

     

       36
       +
        # Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.

     

       37
       +
        if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)

     

       38
       +
            tbb_remove_compile_flag(-Werror)

+69

pkgs/by-name/tb/tbb_2022/fix-libtbbmalloc-dlopen.patch

···

       1
       +
       From 791d42ddacad829d19a4f66b77dc9ca410008db9 Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Emily <hello@emily.moe>

     

       3
       +
       Date: Sat, 13 Sep 2025 03:16:16 +0100

     

       4
       +
       Subject: [PATCH] Use `dladdr` to keep `libtbbmalloc` loaded on POSIX

     

       5
       +
       

     

       6
       +
       This fixes issues that arise when `libtbbmalloc` cannot be loaded by

     

       7
       +
       relative path, makes the behaviour consistent with the Windows code

     

       8
       +
       path, and eliminates the duplication of `MALLOCLIB_NAME`.

     

       9
       +
       ---

     

       10
       +
        src/tbbmalloc/tbbmalloc.cpp | 34 +++++++++-------------------------

     

       11
       +
        1 file changed, 9 insertions(+), 25 deletions(-)

     

       12
       +
       

     

       13
       +
       diff --git a/src/tbbmalloc/tbbmalloc.cpp b/src/tbbmalloc/tbbmalloc.cpp

     

       14
       +
       index b72e03a74f..12d62445aa 100644

     

       15
       +
       --- a/src/tbbmalloc/tbbmalloc.cpp

     

       16
       +
       +++ b/src/tbbmalloc/tbbmalloc.cpp

     

       17
       +
       @@ -1,5 +1,5 @@

     

       18
       +
        /*

     

       19
       +
       -    Copyright (c) 2005-2023 Intel Corporation

     

       20
       +
       +    Copyright (c) 2005-2025 Intel Corporation

     

       21
       +
        

     

       22
       +
            Licensed under the Apache License, Version 2.0 (the "License");

     

       23
       +
            you may not use this file except in compliance with the License.

     

       24
       +
       @@ -32,25 +32,6 @@

     

       25
       +
        namespace rml {

     

       26
       +
        namespace internal {

     

       27
       +
        

     

       28
       +
       -#if TBB_USE_DEBUG

     

       29
       +
       -#define DEBUG_SUFFIX "_debug"

     

       30
       +
       -#else

     

       31
       +
       -#define DEBUG_SUFFIX

     

       32
       +
       -#endif /* TBB_USE_DEBUG */

     

       33
       +
       -

     

       34
       +
       -// MALLOCLIB_NAME is the name of the oneTBB memory allocator library.

     

       35
       +
       -#if _WIN32||_WIN64

     

       36
       +
       -#define MALLOCLIB_NAME "tbbmalloc" DEBUG_SUFFIX ".dll"

     

       37
       +
       -#elif __APPLE__

     

       38
       +
       -#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".2.dylib"

     

       39
       +
       -#elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__

     

       40
       +
       -#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so"

     

       41
       +
       -#elif __unix__

     

       42
       +
       -#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX  __TBB_STRING(.so.2)

     

       43
       +
       -#else

     

       44
       +
       -#error Unknown OS

     

       45
       +
       -#endif

     

       46
       +
       -

     

       47
       +
        void init_tbbmalloc() {

     

       48
       +
        #if __TBB_USE_ITT_NOTIFY

     

       49
       +
            MallocInitializeITT();

     

       50
       +
       @@ -92,11 +73,14 @@ struct RegisterProcessShutdownNotification {

     

       51
       +
            RegisterProcessShutdownNotification() {

     

       52
       +
                // prevents unloading, POSIX case

     

       53
       +
        

     

       54
       +
       -        // We need better support for the library pinning

     

       55
       +
       -        // when dlopen can't find TBBmalloc library.

     

       56
       +
       -        // for example: void *ret = dlopen(MALLOCLIB_NAME, RTLD_NOW);

     

       57
       +
       -        // MALLOC_ASSERT(ret, "Allocator can't load itself.");

     

       58
       +
       -        dlopen(MALLOCLIB_NAME, RTLD_NOW);

     

       59
       +
       +        Dl_info dlinfo;

     

       60
       +
       +        int ret = dladdr((void*)&init_tbbmalloc, &dlinfo);

     

       61
       +
       +        MALLOC_ASSERT(ret && dlinfo.dli_fname, "Allocator can't find itself.");

     

       62
       +
       +        tbb::detail::suppress_unused_warning(ret);

     

       63
       +
       +

     

       64
       +
       +        void* lib = dlopen(dlinfo.dli_fname, RTLD_NOW);

     

       65
       +
       +        MALLOC_ASSERT(lib, "Allocator can't load itself.");

     

       66
       +
       +        tbb::detail::suppress_unused_warning(lib);

     

       67
       +
            }

     

       68
       +
        

     

       69
       +
            RegisterProcessShutdownNotification(RegisterProcessShutdownNotification&) = delete;

+24

pkgs/by-name/tb/tbb_2022/fix-musl-build.patch

···

       1
       +
       From 493774eb57f9c424fc8907d137665e687861ad94 Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Ismael Luceno <ismael@iodev.co.uk>

     

       3
       +
       Date: Fri, 9 Sep 2022 16:18:18 +0200

     

       4
       +
       Subject: [PATCH] Fix build against musl libc

     

       5
       +
       

     

       6
       +
       Probably MALLOC_UNIXLIKE_OVERLOAD_ENABLED only works with glibc, so use

     

       7
       +
       __GLIBC__ in addition to __linux__ to define it.

     

       8
       +
       ---

     

       9
       +
        src/tbbmalloc_proxy/proxy.h | 2 +-

     

       10
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       11
       +
       

     

       12
       +
       diff --git a/src/tbbmalloc_proxy/proxy.h b/src/tbbmalloc_proxy/proxy.h

     

       13
       +
       index 5f0133f9e0..ba1a07c396 100644

     

       14
       +
       --- a/src/tbbmalloc_proxy/proxy.h

     

       15
       +
       +++ b/src/tbbmalloc_proxy/proxy.h

     

       16
       +
       @@ -17,7 +17,7 @@

     

       17
       +
        #ifndef _TBB_malloc_proxy_H_

     

       18
       +
        #define _TBB_malloc_proxy_H_

     

       19
       +
        

     

       20
       +
       -#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED __linux__

     

       21
       +
       +#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED (__linux__ && __GLIBC__)

     

       22
       +
        #define MALLOC_ZONE_OVERLOAD_ENABLED __APPLE__

     

       23
       +
        

     

       24
       +
        // MALLOC_UNIXLIKE_OVERLOAD_ENABLED depends on MALLOC_CHECK_RECURSION stuff

+36 -40

pkgs/by-name/tb/tbb_2022/package.nix

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       5
       -
         fetchpatch,

     

       6
        
         cmake,

     

       7
        
         ninja,

     

       0
        
       
     

       8
        
       }:

     

       9
        
       

     

       10
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
        
         pname = "tbb";

     

       12
       -
         version = "2022.1.0";

     

       13
        
       

     

       14
        
         outputs = [

     

       15
        
           "out"

     
···

       20
        
           owner = "oneapi-src";

     

       21
        
           repo = "oneTBB";

     

       22
        
           tag = "v${finalAttrs.version}";

     

       23
       -
           hash = "sha256-DqJkNlC94cPJSXnhyFcEqWYGCQPunMfIfb05UcFGynw=";

     

       24
        
         };

     

       25
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       26
        
         nativeBuildInputs = [

     

       27
        
           cmake

     

       28
        
           ninja

     

       0
        
       
     

       29
        
         ];

     

       30
        
       

     

       31
       -
         patches = [

     

       32
       -
           # Fix musl build from https://github.com/oneapi-src/oneTBB/pull/899

     

       33
       -
           (fetchpatch {

     

       34
       -
             url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";

     

       35
       -
             hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";

     

       36
       -
           })

     

       37
       -
           # Fix tests on FreeBSD and Windows

     

       38
       -
           (fetchpatch {

     

       39
       -
             name = "fix-tbb-freebsd-and-windows-tests.patch";

     

       40
       -
             url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";

     

       41
       -
             hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";

     

       42
       -
           })

     

       43
       -
           # Fix 32-bit PowerPC build

     

       44
       -
           (fetchpatch {

     

       45
       -
             url = "https://github.com/uxlfoundation/oneTBB/pull/987/commits/c828ae47b8f4bea7736d2f9d05460e2b529c9d7d.patch";

     

       46
       -
             hash = "sha256-faNiVdHRIkmavufDHQQ8vHppvdahZ7yhJVL3bOwNTFg=";

     

       47
       -
           })

     

       48
       -
         ];

     

       49
        
       

     

       50
       -
         # Fix build with modern gcc

     

       51
       -
         # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',

     

       52
       -
         NIX_CFLAGS_COMPILE =

     

       53
       -
           lib.optionals stdenv.cc.isGNU [

     

       54
       -
             "-Wno-error=array-bounds"

     

       55
       -
             "-Wno-error=stringop-overflow"

     

       56
       -
           ]

     

       57
       -
           ++

     

       58
       -
             # error: variable 'val' set but not used

     

       59
       -
             lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ]

     

       60
       -
           ++

     

       61
       -
             # Workaround for gcc-12 ICE when using -O3

     

       62
       -
             # https://gcc.gnu.org/PR108854

     

       63
       -
             lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ];

     

       64
        
       

     

       65
       -
         # Fix undefined reference errors with version script under LLVM.

     

       66
       -
         NIX_LDFLAGS = lib.optionalString (

     

       67
       -
           stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"

     

       68
       -
         ) "--undefined-version";

     

       0
        
       
     

       69
        
       

     

       70
        
         # Disable failing test on musl

     

       71
        
         # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’?

     
···

       74
        
             --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""

     

       75
        
         '';

     

       76
        
       

     

       77
       -
         enableParallelBuilding = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       78
        
       

     

       79
        
         meta = {

     

       80
        
           description = "Intel Thread Building Blocks C++ Library";

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       0
        
       
     

       5
        
         cmake,

     

       6
        
         ninja,

     

       7
       +
         ctestCheckHook,

     

       8
        
       }:

     

       9
        
       

     

       10
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
        
         pname = "tbb";

     

       12
       +
         version = "2022.2.0";

     

       13
        
       

     

       14
        
         outputs = [

     

       15
        
           "out"

     
···

       20
        
           owner = "oneapi-src";

     

       21
        
           repo = "oneTBB";

     

       22
        
           tag = "v${finalAttrs.version}";

     

       23
       +
           hash = "sha256-ASQPAGm5e4q7imvTVWlmj5ON4fGEao1L5m2C5wF7EhI=";

     

       24
        
         };

     

       25
        
       

     

       26
       +
         patches = [

     

       27
       +
           # <https://github.com/uxlfoundation/oneTBB/pull/899>

     

       28
       +
           ./fix-musl-build.patch

     

       29
       +
       

     

       30
       +
           # <https://github.com/uxlfoundation/oneTBB/pull/987>

     

       31
       +
           ./fix-32-bit-powerpc-build.patch

     

       32
       +
       

     

       33
       +
           # Fix an assumption that `libtbbmalloc` can pass a relative path to

     

       34
       +
           # `dlopen(3)` to find itself. This caused mysterious crashes on

     

       35
       +
           # macOS, where we do not use run paths by default.

     

       36
       +
           #

     

       37
       +
           # <https://github.com/uxlfoundation/oneTBB/pull/1849>

     

       38
       +
           ./fix-libtbbmalloc-dlopen.patch

     

       39
       +
         ];

     

       40
       +
       

     

       41
        
         nativeBuildInputs = [

     

       42
        
           cmake

     

       43
        
           ninja

     

       44
       +
           ctestCheckHook

     

       45
        
         ];

     

       46
        
       

     

       47
       +
         doCheck = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       48
        
       

     

       49
       +
         dontUseNinjaCheck = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       50
        
       

     

       51
       +
         # The memory leak test fails on static Linux, despite passing on

     

       52
       +
         # dynamic Musl.

     

       53
       +
         disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [

     

       54
       +
           "test_arena_constraints"

     

       55
       +
         ];

     

       56
        
       

     

       57
        
         # Disable failing test on musl

     

       58
        
         # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’?

     
···

       61
        
             --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""

     

       62
        
         '';

     

       63
        
       

     

       64
       +
         env = {

     

       65
       +
           # Fix build with modern gcc

     

       66
       +
           # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',

     

       67
       +
           NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=stringop-overflow";

     

       68
       +
       

     

       69
       +
           # Fix undefined reference errors with version script under LLVM.

     

       70
       +
           NIX_LDFLAGS = lib.optionalString (

     

       71
       +
             stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"

     

       72
       +
           ) "--undefined-version";

     

       73
       +
         };

     

       74
        
       

     

       75
        
         meta = {

     

       76
        
           description = "Intel Thread Building Blocks C++ Library";

+2 -2

pkgs/by-name/to/todds/package.nix

···

       9
        
         fmt,

     

       10
        
         hyperscan,

     

       11
        
         opencv,

     

       12
       -
         tbb_2021,

     

       13
        
         fetchFromGitHub,

     

       14
        
       }:

     

       15
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       38
        
           fmt

     

       39
        
           hyperscan

     

       40
        
           opencv

     

       41
       -
           tbb_2021

     

       42
        
         ];

     

       43
        
       

     

       44
        
         strictDeps = true;

···

       9
        
         fmt,

     

       10
        
         hyperscan,

     

       11
        
         opencv,

     

       12
       +
         tbb_2022,

     

       13
        
         fetchFromGitHub,

     

       14
        
       }:

     

       15
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       38
        
           fmt

     

       39
        
           hyperscan

     

       40
        
           opencv

     

       41
       +
           tbb_2022

     

       42
        
         ];

     

       43
        
       

     

       44
        
         strictDeps = true;

+2 -2

pkgs/by-name/ue/ueberzugpp/package.nix

+1 -1

pkgs/development/libraries/embree/2.x.nix

···

       35
        
         ];

     

       36
        
         buildInputs = [

     

       37
        
           ispc

     

       38
       -
           # tbb_2021 is not backward compatible

     

       39
        
           tbb_2020

     

       40
        
           glfw

     

       41
        
           openimageio

···

       35
        
         ];

     

       36
        
         buildInputs = [

     

       37
        
           ispc

     

       38
       +
           # tbb_2022 is not backward compatible

     

       39
        
           tbb_2020

     

       40
        
           glfw

     

       41
        
           openimageio

+1

pkgs/top-level/aliases.nix

···

       2335
        
         taplo-lsp = taplo; # Added 2022-07-30

     

       2336
        
         targetcli = targetcli-fb; # Added 2025-03-14

     

       2337
        
         taro = taproot-assets; # Added 2023-07-04

     

       0
        
       
     

       2338
        
         tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02

     

       2339
        
         tclcurl = tclPackages.tclcurl; # Added 2024-10-02

     

       2340
        
         tcllib = tclPackages.tcllib; # Added 2024-10-02

···

       2335
        
         taplo-lsp = taplo; # Added 2022-07-30

     

       2336
        
         targetcli = targetcli-fb; # Added 2025-03-14

     

       2337
        
         taro = taproot-assets; # Added 2023-07-04

     

       2338
       +
         tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use tbb_2022"; # Added 2025-09-13

     

       2339
        
         tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02

     

       2340
        
         tclcurl = tclPackages.tclcurl; # Added 2024-10-02

     

       2341
        
         tcllib = tclPackages.tcllib; # Added 2024-10-02

+3 -3

pkgs/top-level/all-packages.nix

···

       283
        
         cve = with python3Packages; toPythonApplication cvelib;

     

       284
        
       

     

       285
        
         basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix {

     

       286
       -
           tbb = tbb_2021;

     

       287
        
           cereal = cereal_1_3_2;

     

       288
        
           opencv = opencv.override { enableGtk3 = true; };

     

       289
        
         };

     
···

       6871
        
       

     

       6872
        
         ikos = callPackage ../development/tools/analysis/ikos {

     

       6873
        
           inherit (llvmPackages_14) stdenv clang llvm;

     

       6874
       -
           tbb = tbb_2021;

     

       6875
        
         };

     

       6876
        
       

     

       6877
        
         include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {

     
···

       7341
        
       

     

       7342
        
         cctag = callPackage ../development/libraries/cctag {

     

       7343
        
           stdenv = clangStdenv;

     

       7344
       -
           tbb = tbb_2021;

     

       7345
        
         };

     

       7346
        
       

     

       7347
        
         ceedling = callPackage ../development/tools/ceedling { };

···

       283
        
         cve = with python3Packages; toPythonApplication cvelib;

     

       284
        
       

     

       285
        
         basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix {

     

       286
       +
           tbb = tbb_2022;

     

       287
        
           cereal = cereal_1_3_2;

     

       288
        
           opencv = opencv.override { enableGtk3 = true; };

     

       289
        
         };

     
···

       6871
        
       

     

       6872
        
         ikos = callPackage ../development/tools/analysis/ikos {

     

       6873
        
           inherit (llvmPackages_14) stdenv clang llvm;

     

       6874
       +
           tbb = tbb_2022;

     

       6875
        
         };

     

       6876
        
       

     

       6877
        
         include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {

     
···

       7341
        
       

     

       7342
        
         cctag = callPackage ../development/libraries/cctag {

     

       7343
        
           stdenv = clangStdenv;

     

       7344
       +
           tbb = tbb_2022;

     

       7345
        
         };

     

       7346
        
       

     

       7347
        
         ceedling = callPackage ../development/tools/ceedling { };