commit 052b3cf0e2137e7f18fb9bc671ae7681abd4efc9 · pyrox.dev/nixpkgs

+4 -4

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

···

       27
       27
        
         opencascade-occt_7_6_1,

     

       28
       28
        
         openvdb,

     

       29
       29
        
         qhull,

     

       30
       30
       -
         tbb_2021,

     

       30
       30
       +
         tbb_2022,

     

       31
       31
        
         wxGTK32,

     

       32
       32
        
         xorg,

     

       33
       33
        
         libbgcode,

     
···

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

     

       55
       55
        
           };

     

       56
       56
        
         });

     

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

     

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

     

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

     

       59
       59
        
         opencascade-override' =

     

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

     
···

       122
       122
        
           nanosvg-fltk

     

       123
       123
        
           nlopt

     

       124
       124
        
           opencascade-override'

     

       125
       125
       -
           openvdb_tbb_2021_8

     

       125
       125
       +
           openvdb_tbb_2022

     

       126
       126
        
           qhull

     

       127
       127
       -
           tbb_2021

     

       127
       127
       +
           tbb_2022

     

       128
       128
        
           wxGTK-override'

     

       129
       129
        
           xorg.libX11

     

       130
       130
        
           libbgcode

+2 -2

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

···

       8
       8
        
         boost,

     

       9
       9
        
         fuse3,

     

       10
       10
        
         lib45d,

     

       11
       11
       -
         tbb_2021,

     

       11
       11
       +
         tbb_2022,

     

       12
       12
        
         liburing,

     

       13
       13
        
         installShellFiles,

     

       14
       14
        
       }:

     
···

       46
       46
        
           boost

     

       47
       47
        
           fuse3

     

       48
       48
        
           lib45d

     

       49
       49
       -
           tbb_2021

     

       49
       49
       +
           tbb_2022

     

       50
       50
        
           liburing

     

       51
       51
        
         ];

     

       52
       52

+2 -2

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

···

       34
       34
        
         opencv,

     

       35
       35
        
         pcre,

     

       36
       36
        
         systemd,

     

       37
       37
       -
         tbb_2021,

     

       37
       37
       +
         tbb_2022,

     

       38
       38
        
         webkitgtk_4_1,

     

       39
       39
        
         wxGTK31,

     

       40
       40
        
         xorg,

     
···

       101
       101
        
           opencascade-occt_7_6

     

       102
       102
        
           openvdb

     

       103
       103
        
           pcre

     

       104
       104
       -
           tbb_2021

     

       104
       104
       +
           tbb_2022

     

       105
       105
        
           webkitgtk_4_1

     

       106
       106
        
           wxGTK'

     

       107
       107
        
           xorg.libX11

+1 -1

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

···

       257
       257
        
           libsndfile

     

       258
       258
        
           libtiff

     

       259
       259
        
           libwebp

     

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

     

       260
       260
       +
           manifold

     

       261
       261
        
           opencolorio

     

       262
       262
        
           openexr

     

       263
       263
        
           openimageio

+2 -2

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

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         tbb_2021,

     

       5
       5
       +
         tbb_2022,

     

       6
       6
        
         libgit2,

     

       7
       7
        
         curl,

     

       8
       8
        
         fmt,

     
···

       39
       39
        
         buildInputs = [

     

       40
       40
        
           libgit2

     

       41
       41
        
           fmt

     

       42
       42
       -
           tbb_2021

     

       42
       42
       +
           tbb_2022

     

       43
       43
        
           nlohmann_json

     

       44
       44
        
           curl

     

       45
       45
        
         ];

+2 -3

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

···

       4
       4
        
         cmake,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
        
         fetchpatch,

     

       7
       7
       -
         tbb_2021,

     

       7
       7
       +
         tbb_2022,

     

       8
       8
        
       

     

       9
       9
        
         useTBB ? true,

     

       10
       10
        
       }:

     
···

       45
       45
        
         nativeBuildInputs = [ cmake ];

     

       46
       46
        
       

     

       47
       47
        
         propagatedBuildInputs = lib.optionals useTBB [

     

       48
       48
       -
           # 2022.0 crashes on macOS at the moment

     

       49
       49
       -
           tbb_2021

     

       48
       48
       +
           tbb_2022

     

       50
       49
        
         ];

     

       51
       50
        
       

     

       52
       51
        
         cmakeFlags = [

+2 -2

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

···

       18
       18
        
         gtest,

     

       19
       19
        
         icu,

     

       20
       20
        
         spdlog,

     

       21
       21
       -
         tbb_2021,

     

       21
       21
       +
         tbb_2022,

     

       22
       22
        
         yaml-cpp,

     

       23
       23
        
       }:

     

       24
       24
        
       

     
···

       70
       70
        
           gtest

     

       71
       71
        
           icu

     

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

     

       73
       73
       -
           tbb_2021

     

       73
       73
       +
           tbb_2022

     

       74
       74
        
       

     

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

     

       76
       76
        
           finalAttrs.passthru.libloadorder

+3 -3

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

···

       6
       6
        
         clipper2,

     

       7
       7
        
         gtest,

     

       8
       8
        
         glm,

     

       9
       9
       -
         tbb_2021,

     

       9
       9
       +
         tbb_2022,

     

       10
       10
        
         python3Packages,

     

       11
       11
        
       }:

     

       12
       12
        
       

     
···

       26
       26
        
         buildInputs = [

     

       27
       27
        
           gtest

     

       28
       28
        
           glm

     

       29
       29
       -
           tbb_2021

     

       29
       29
       +
           tbb_2022

     

       30
       30
        
         ];

     

       31
       31
        
       

     

       32
       32
        
         propagatedBuildInputs = [ clipper2 ];

     
···

       48
       48
        
         '';

     

       49
       49
        
       

     

       50
       50
        
         passthru = {

     

       51
       51
       -
           tbb = tbb_2021;

     

       51
       51
       +
           tbb = tbb_2022;

     

       52
       52
        
           tests = {

     

       53
       53
        
             python = python3Packages.manifold3d;

     

       54
       54
        
           };

+2 -2

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

···

       11
       11
        
         pkg-config,

     

       12
       12
        
         python3,

     

       13
       13
        
         sphinx,

     

       14
       14
       -
         tbb_2021,

     

       14
       14
       +
         tbb_2022,

     

       15
       15
        
         buildPackages,

     

       16
       16
        
         nix-update-script,

     

       17
       17
        
       }:

     
···

       75
       75
        
           boost

     

       76
       76
        
           capnproto # cmake modules

     

       77
       77
        
           flex # include dir

     

       78
       78
       -
           tbb_2021

     

       78
       78
       +
           tbb_2022

     

       79
       79
        
           python3

     

       80
       80
        
         ];

     

       81
       81

+2 -2

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

···

       34
       34
        
         opencv,

     

       35
       35
        
         pcre,

     

       36
       36
        
         systemd,

     

       37
       37
       -
         tbb_2021,

     

       37
       37
       +
         tbb_2022,

     

       38
       38
        
         webkitgtk_4_1,

     

       39
       39
        
         wxGTK31,

     

       40
       40
        
         xorg,

     
···

       111
       111
        
           opencascade-occt_7_6

     

       112
       112
        
           openvdb

     

       113
       113
        
           pcre

     

       114
       114
       -
           tbb_2021

     

       114
       114
       +
           tbb_2022

     

       115
       115
        
           webkitgtk_4_1

     

       116
       116
        
           wxGTK'

     

       117
       117
        
           xorg.libX11

+2 -2

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

···

       8
       8
        
         qt6,

     

       9
       9
        
         wrapGAppsHook3,

     

       10
       10
        
         openjpeg,

     

       11
       11
       -
         tbb_2021,

     

       11
       11
       +
         tbb_2022,

     

       12
       12
        
         blend2d,

     

       13
       13
        
       }:

     

       14
       14
        
       

     
···

       46
       46
        
           qt6.qtspeech

     

       47
       47
        
           lcms

     

       48
       48
        
           openjpeg

     

       49
       49
       -
           tbb_2021

     

       49
       49
       +
           tbb_2022

     

       50
       50
        
           blend2d

     

       51
       51
        
         ];

     

       52
       52

+2 -2

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

···

       13
       13
        
         libiconv,

     

       14
       14
        
         libstaden-read,

     

       15
       15
        
         pkg-config,

     

       16
       16
       -
         tbb_2021,

     

       16
       16
       +
         tbb_2022,

     

       17
       17
        
         xz,

     

       18
       18
        
         zlib,

     

       19
       19
        
       }:

     
···

       55
       55
        
           jemalloc

     

       56
       56
        
           libgff

     

       57
       57
        
           libstaden-read

     

       58
       58
       -
           tbb_2021

     

       58
       58
       +
           tbb_2022

     

       59
       59
        
           xz

     

       60
       60
        
           zlib

     

       61
       61
        
         ]

+2 -2

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

···

       6
       6
        
         boost,

     

       7
       7
        
         blas,

     

       8
       8
        
         gmp,

     

       9
       9
       -
         tbb_2021,

     

       9
       9
       +
         tbb_2022,

     

       10
       10
        
         gfortran,

     

       11
       11
        
       }:

     

       12
       12
        
       

     
···

       31
       31
        
           gmp

     

       32
       32
        
           gfortran

     

       33
       33
        
           boost

     

       34
       34
       -
           tbb_2021

     

       34
       34
       +
           tbb_2022

     

       35
       35
        
         ];

     

       36
       36
        
       

     

       37
       37
        
         cmakeFlags = [

+2 -2

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

···

       11
       11
        
         scipopt-papilo,

     

       12
       12
        
         scipopt-zimpl,

     

       13
       13
        
         ipopt,

     

       14
       14
       -
         tbb_2021,

     

       14
       14
       +
         tbb_2022,

     

       15
       15
        
         boost,

     

       16
       16
        
         gfortran,

     

       17
       17
        
         criterion,

     
···

       39
       39
        
           gmp

     

       40
       40
        
           readline

     

       41
       41
        
           zlib

     

       42
       42
       -
           tbb_2021

     

       42
       42
       +
           tbb_2022

     

       43
       43
        
           boost

     

       44
       44
        
           gfortran

     

       45
       45
        
           criterion

+2 -2

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

···

       24
       24
        
         gtest,

     

       25
       25
        
         glm,

     

       26
       26
        
         qt6,

     

       27
       27
       -
         tbb_2021,

     

       27
       27
       +
         tbb_2022,

     

       28
       28
        
         tracy,

     

       29
       29
        
         replaceVars,

     

       30
       30
        
         python3,

     
···

       130
       130
        
           aws-sdk-cpp

     

       131
       131
        
           howard-hinnant-date

     

       132
       132
        
           boost

     

       133
       133
       -
           tbb_2021

     

       133
       133
       +
           tbb_2022

     

       134
       134
        
           glew

     

       135
       135
        
           geos

     

       136
       136
        
           spdlog

+2 -2

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

···

       9
       9
        
         fmt,

     

       10
       10
        
         hyperscan,

     

       11
       11
        
         opencv,

     

       12
       12
       -
         tbb_2021,

     

       12
       12
       +
         tbb_2022,

     

       13
       13
        
         fetchFromGitHub,

     

       14
       14
        
       }:

     

       15
       15
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       38
       38
        
           fmt

     

       39
       39
        
           hyperscan

     

       40
       40
        
           opencv

     

       41
       41
       -
           tbb_2021

     

       41
       41
       +
           tbb_2022

     

       42
       42
        
         ];

     

       43
       43
        
       

     

       44
       44
        
         strictDeps = true;

+2 -2

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

+1 -1

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

···

       35
       35
        
         ];

     

       36
       36
        
         buildInputs = [

     

       37
       37
        
           ispc

     

       38
       38
       -
           # tbb_2021 is not backward compatible

     

       38
       38
       +
           # tbb_2022 is not backward compatible

     

       39
       39
        
           tbb_2020

     

       40
       40
        
           glfw

     

       41
       41
        
           openimageio

+3 -3

pkgs/top-level/all-packages.nix

···

       283
       283
        
         cve = with python3Packages; toPythonApplication cvelib;

     

       284
       284
        
       

     

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

     

       286
       286
       -
           tbb = tbb_2021;

     

       286
       286
       +
           tbb = tbb_2022;

     

       287
       287
        
           cereal = cereal_1_3_2;

     

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

     

       289
       289
        
         };

     
···

       6878
       6878
        
       

     

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

     

       6880
       6880
        
           inherit (llvmPackages_14) stdenv clang llvm;

     

       6881
       6881
       -
           tbb = tbb_2021;

     

       6881
       6881
       +
           tbb = tbb_2022;

     

       6882
       6882
        
         };

     

       6883
       6883
        
       

     

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

     
···

       7348
       7348
        
       

     

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

     

       7350
       7350
        
           stdenv = clangStdenv;

     

       7351
       7351
       -
           tbb = tbb_2021;

     

       7351
       7351
       +
           tbb = tbb_2022;

     

       7352
       7352
        
         };

     

       7353
       7353
        
       

     

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