commit 72f5bfc3b5338a608e268fa867d4706dec66fd25 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/config/malloc.nix

···

       52
        
                   or (throw "scudo not supported on ${pkgs.stdenv.hostPlatform.system}");

     

       53
        
             in

     

       54
        
             {

     

       55
       -
               libPath = "${pkgs.llvmPackages_14.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so";

     

       56
        
               description = ''

     

       57
        
                 A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator,

     

       58
        
                 which aims at providing additional mitigations against heap based

···

       52
        
                   or (throw "scudo not supported on ${pkgs.stdenv.hostPlatform.system}");

     

       53
        
             in

     

       54
        
             {

     

       55
       +
               libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so";

     

       56
        
               description = ''

     

       57
        
                 A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator,

     

       58
        
                 which aims at providing additional mitigations against heap based

+2 -2

pkgs/applications/science/math/mathematica/generic.nix

···

       32
        
         libuuid,

     

       33
        
         libxkbcommon,

     

       34
        
         libxml2,

     

       35
       -
         llvmPackages_13,

     

       36
        
         matio,

     

       37
        
         mpfr,

     

       38
        
         ncurses,

     
···

       102
        
           libuuid

     

       103
        
           libxkbcommon

     

       104
        
           libxml2

     

       105
       -
           llvmPackages_13.libllvm.lib

     

       106
        
           matio

     

       107
        
           mpfr

     

       108
        
           ncurses

···

       32
        
         libuuid,

     

       33
        
         libxkbcommon,

     

       34
        
         libxml2,

     

       35
       +
         llvmPackages,

     

       36
        
         matio,

     

       37
        
         mpfr,

     

       38
        
         ncurses,

     
···

       102
        
           libuuid

     

       103
        
           libxkbcommon

     

       104
        
           libxml2

     

       105
       +
           llvmPackages.libllvm.lib

     

       106
        
           matio

     

       107
        
           mpfr

     

       108
        
           ncurses

+4 -4

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

···

       11
        
         gtest,

     

       12
        
         pkg-config,

     

       13
        
         lit,

     

       14
       -
         llvmPackages_16,

     

       15
        
       }:

     

       16
        
       let

     

       17
        
         # Old vendored package which has no other use than here, so not packaged in nixpkgs.

     
···

       35
        
       

     

       36
        
         cmakeFlags = [

     

       37
        
           "-DLIT_EXECUTABLE=${lit}/bin/lit"

     

       38
       -
           "-DFILECHECK_EXECUTABLE=${llvmPackages_16.libllvm}/bin/FileCheck"

     

       39
       -
           "-DYAML2OBJ_EXECUTABLE=${llvmPackages_16.libllvm}/bin/yaml2obj"

     

       40
        
         ];

     

       41
        
       

     

       42
        
         postPatch = ''

     
···

       66
        
           capstone

     

       67
        
           gtest

     

       68
        
           lit

     

       69
       -
           llvmPackages_16.libllvm

     

       70
        
         ];

     

       71
        
       

     

       72
        
         doCheck = true;

···

       11
        
         gtest,

     

       12
        
         pkg-config,

     

       13
        
         lit,

     

       14
       +
         llvmPackages,

     

       15
        
       }:

     

       16
        
       let

     

       17
        
         # Old vendored package which has no other use than here, so not packaged in nixpkgs.

     
···

       35
        
       

     

       36
        
         cmakeFlags = [

     

       37
        
           "-DLIT_EXECUTABLE=${lit}/bin/lit"

     

       38
       +
           "-DFILECHECK_EXECUTABLE=${llvmPackages.libllvm}/bin/FileCheck"

     

       39
       +
           "-DYAML2OBJ_EXECUTABLE=${llvmPackages.libllvm}/bin/yaml2obj"

     

       40
        
         ];

     

       41
        
       

     

       42
        
         postPatch = ''

     
···

       66
        
           capstone

     

       67
        
           gtest

     

       68
        
           lit

     

       69
       +
           llvmPackages.libllvm

     

       70
        
         ];

     

       71
        
       

     

       72
        
         doCheck = true;

+6 -6

pkgs/by-name/c2/c2ffi/package.nix

···

       2
        
         lib,

     

       3
        
         fetchFromGitHub,

     

       4
        
         cmake,

     

       5
       -
         llvmPackages_16,

     

       6
        
         unstableGitUpdater,

     

       7
        
       }:

     

       8
        
       

     

       9
        
       let

     

       10
       -
         c2ffiBranch = "llvm-16.0.0";

     

       11
       -
         llvmPackages = llvmPackages_16;

     

       12
        
       in

     

       13
        
       

     

       14
        
       llvmPackages.stdenv.mkDerivation {

     

       15
        
         pname = "c2ffi-${c2ffiBranch}";

     

       16
       -
         version = "0-unstable-2023-11-18";

     

       17
        
       

     

       18
        
         src = fetchFromGitHub {

     

       19
        
           owner = "rpav";

     

       20
        
           repo = "c2ffi";

     

       21
       -
           rev = "097cbe61ca02dc79ea60859aa056975131a9d985";

     

       22
       -
           hash = "sha256-pflolW5OoEkVDozy4cjCdUIVxgE/SfVKIhQyNBDhENc=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         passthru.updateScript = unstableGitUpdater {

···

       2
        
         lib,

     

       3
        
         fetchFromGitHub,

     

       4
        
         cmake,

     

       5
       +
         llvmPackages_18,

     

       6
        
         unstableGitUpdater,

     

       7
        
       }:

     

       8
        
       

     

       9
        
       let

     

       10
       +
         c2ffiBranch = "llvm-18.1.0";

     

       11
       +
         llvmPackages = llvmPackages_18;

     

       12
        
       in

     

       13
        
       

     

       14
        
       llvmPackages.stdenv.mkDerivation {

     

       15
        
         pname = "c2ffi-${c2ffiBranch}";

     

       16
       +
         version = "0-unstable-2024-04-20";

     

       17
        
       

     

       18
        
         src = fetchFromGitHub {

     

       19
        
           owner = "rpav";

     

       20
        
           repo = "c2ffi";

     

       21
       +
           rev = "0de81efb64acc82c08c5eee4a7108ddcb1b00d86";

     

       22
       +
           hash = "sha256-q81Vxq/6h/5jgQ1Leq15klN/8L+UiavlxkARGo2SrJ0=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         passthru.updateScript = unstableGitUpdater {

-8

pkgs/by-name/ch/chez/package.nix

···

       1
        
       {

     

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
       -
         llvmPackages_17,

     

       5
        
         fetchurl,

     

       6
        
         coreutils,

     

       7
        
         cctools,

     
···

       13
        
         testers,

     

       14
        
       }@args:

     

       15
        
       

     

       16
       -
       let

     

       17
       -
         # x64 darwin fails with invalid memory reference with clang-18 & 19.

     

       18
       -
         # https://github.com/cisco/ChezScheme/issues/896

     

       19
       -
         # aarch64 darwin fails to execute `system` calls with clang-18 & 19.

     

       20
       -
         # https://github.com/cisco/ChezScheme/issues/928

     

       21
       -
         stdenv = if args.stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else args.stdenv;

     

       22
       -
       in

     

       23
        
       stdenv.mkDerivation (finalAttrs: {

     

       24
        
         pname = "chez-scheme";

     

       25
        
         version = "10.2.0";

···

       1
        
       {

     

       2
        
         lib,

     

       3
        
         stdenv,

     

       0
        
       
     

       4
        
         fetchurl,

     

       5
        
         coreutils,

     

       6
        
         cctools,

     
···

       12
        
         testers,

     

       13
        
       }@args:

     

       14
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       stdenv.mkDerivation (finalAttrs: {

     

       16
        
         pname = "chez-scheme";

     

       17
        
         version = "10.2.0";

+3 -4

pkgs/by-name/co/contour/package.nix

···

       20
        
         yaml-cpp,

     

       21
        
         ncurses,

     

       22
        
         file,

     

       23
       -
         libutil,

     

       24
       -
         sigtool,

     

       25
        
         nixosTests,

     

       26
        
         installShellFiles,

     

       27
        
         reflection-cpp,

     
···

       53
        
           qt6.wrapQtAppsHook

     

       54
        
           installShellFiles

     

       55
        
         ]

     

       56
       -
         ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];

     

       57
        
       

     

       58
        
         buildInputs = [

     

       59
        
           boxed-cpp

     
···

       74
        
         ]

     

       75
        
         ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]

     

       76
        
         ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       77
       -
           libutil

     

       78
        
         ];

     

       79
        
       

     

       80
        
         cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ];

···

       20
        
         yaml-cpp,

     

       21
        
         ncurses,

     

       22
        
         file,

     

       23
       +
         darwin,

     

       0
        
       
     

       24
        
         nixosTests,

     

       25
        
         installShellFiles,

     

       26
        
         reflection-cpp,

     
···

       52
        
           qt6.wrapQtAppsHook

     

       53
        
           installShellFiles

     

       54
        
         ]

     

       55
       +
         ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];

     

       56
        
       

     

       57
        
         buildInputs = [

     

       58
        
           boxed-cpp

     
···

       73
        
         ]

     

       74
        
         ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]

     

       75
        
         ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       76
       +
           darwin.libutil

     

       77
        
         ];

     

       78
        
       

     

       79
        
         cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ];

+4 -2

pkgs/by-name/in/inko/package.nix

···

       2
        
         lib,

     

       3
        
         rustPlatform,

     

       4
        
         fetchFromGitHub,

     

       5
       -
         llvm_17,

     

       6
        
         libffi,

     

       7
        
         libz,

     

       8
        
         libxml2,

     
···

       35
        
         ];

     

       36
        
       

     

       37
        
         nativeBuildInputs = [

     

       38
       -
           llvm_17

     

       39
        
           makeWrapper

     

       40
        
         ];

     

       41
        
       

     
···

       61
        
             simple = callPackage ./test.nix { };

     

       62
        
           };

     

       63
        
         };

     

       0
        
       
     

       0
        
       
     

       64
        
       

     

       65
        
         meta = {

     

       66
        
           description = "Language for building concurrent software with confidence";

···

       2
        
         lib,

     

       3
        
         rustPlatform,

     

       4
        
         fetchFromGitHub,

     

       5
       +
         llvm,

     

       6
        
         libffi,

     

       7
        
         libz,

     

       8
        
         libxml2,

     
···

       35
        
         ];

     

       36
        
       

     

       37
        
         nativeBuildInputs = [

     

       38
       +
           llvm

     

       39
        
           makeWrapper

     

       40
        
         ];

     

       41
        
       

     
···

       61
        
             simple = callPackage ./test.nix { };

     

       62
        
           };

     

       63
        
         };

     

       64
       +
       

     

       65
       +
         __darwinAllowLocalNetworking = true;

     

       66
        
       

     

       67
        
         meta = {

     

       68
        
           description = "Language for building concurrent software with confidence";

+2 -2

pkgs/by-name/iv/ivm/package.nix

···

       4
        
         fetchFromGitHub,

     

       5
        
         makeWrapper,

     

       6
        
         cargo,

     

       7
       -
         llvm_16,

     

       8
        
         stdenv,

     

       9
        
         libffi,

     

       10
        
         libz,

     
···

       39
        
             --prefix PATH : ${

     

       40
        
               lib.makeBinPath [

     

       41
        
                 cargo

     

       42
       -
                 llvm_16.dev

     

       43
        
                 stdenv.cc

     

       44
        
               ]

     

       45
        
             } \

···

       4
        
         fetchFromGitHub,

     

       5
        
         makeWrapper,

     

       6
        
         cargo,

     

       7
       +
         llvm,

     

       8
        
         stdenv,

     

       9
        
         libffi,

     

       10
        
         libz,

     
···

       39
        
             --prefix PATH : ${

     

       40
        
               lib.makeBinPath [

     

       41
        
                 cargo

     

       42
       +
                 llvm.dev

     

       43
        
                 stdenv.cc

     

       44
        
               ]

     

       45
        
             } \

+8 -10

pkgs/by-name/te/terra/package.nix

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       5
       -
         llvmPackages_16,

     

       6
        
         ncurses,

     

       7
        
         cmake,

     

       8
        
         libxml2,

     
···

       14
        
       }:

     

       15
        
       

     

       16
        
       let

     

       17
       -
         luajitRev = "50936d784474747b4569d988767f1b5bab8bb6d0";

     

       18
        
         luajitBase = "LuaJIT-${luajitRev}";

     

       19
        
         luajitArchive = "${luajitBase}.tar.gz";

     

       20
        
         luajitSrc = fetchFromGitHub {

     

       21
        
           owner = "LuaJIT";

     

       22
        
           repo = "LuaJIT";

     

       23
        
           rev = luajitRev;

     

       24
       -
           sha256 = "1g87pl014b5v6z2nnhiwn3wf405skawszfr5wdzyfbx00j3kgxd0";

     

       25
        
         };

     

       26
        
       

     

       27
       -
         llvmPackages = llvmPackages_16;

     

       28
        
         llvmMerged = symlinkJoin {

     

       29
        
           name = "llvmClangMerged";

     

       30
        
           paths = with llvmPackages; [

     
···

       37
        
           ];

     

       38
        
         };

     

       39
        
       

     

       40
       -
         cuda = cudaPackages.cudatoolkit_11;

     

       41
        
       

     

       42
        
         clangVersion = llvmPackages.clang-unwrapped.version;

     

       43
        
       

     

       44
        
       in

     

       45
        
       stdenv.mkDerivation rec {

     

       46
        
         pname = "terra";

     

       47
       -
         version = "1.1.0";

     

       48
        
       

     

       49
        
         src = fetchFromGitHub {

     

       50
        
           owner = "terralang";

     

       51
        
           repo = "terra";

     

       52
        
           rev = "release-${version}";

     

       53
       -
           sha256 = "0v9vpxcp9ybwnfljskqn41vjq7c0srdfv7qs890a6480pnk4kavd";

     

       54
        
         };

     

       55
        
       

     

       56
        
         nativeBuildInputs = [ cmake ];

     
···

       65
        
       

     

       66
        
         cmakeFlags =

     

       67
        
           let

     

       68
       -
             resourceDir =

     

       69
       -
               "${llvmMerged}/lib/clang/"

     

       70
       -
               + (if lib.versionOlder clangVersion "16" then clangVersion else lib.versions.major clangVersion);

     

       71
        
           in

     

       72
        
           [

     

       73
        
             "-DHAS_TERRA_VERSION=0"

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       5
       +
         llvmPackages_18,

     

       6
        
         ncurses,

     

       7
        
         cmake,

     

       8
        
         libxml2,

     
···

       14
        
       }:

     

       15
        
       

     

       16
        
       let

     

       17
       +
         luajitRev = "83954100dba9fc0cf5eeaf122f007df35ec9a604";

     

       18
        
         luajitBase = "LuaJIT-${luajitRev}";

     

       19
        
         luajitArchive = "${luajitBase}.tar.gz";

     

       20
        
         luajitSrc = fetchFromGitHub {

     

       21
        
           owner = "LuaJIT";

     

       22
        
           repo = "LuaJIT";

     

       23
        
           rev = luajitRev;

     

       24
       +
           hash = "sha256-L9T6lc32dDLAp9hPI5mKOzT0c4juW9JHA3FJCpm7HNQ=";

     

       25
        
         };

     

       26
        
       

     

       27
       +
         llvmPackages = llvmPackages_18;

     

       28
        
         llvmMerged = symlinkJoin {

     

       29
        
           name = "llvmClangMerged";

     

       30
        
           paths = with llvmPackages; [

     
···

       37
        
           ];

     

       38
        
         };

     

       39
        
       

     

       40
       +
         cuda = cudaPackages.cudatoolkit;

     

       41
        
       

     

       42
        
         clangVersion = llvmPackages.clang-unwrapped.version;

     

       43
        
       

     

       44
        
       in

     

       45
        
       stdenv.mkDerivation rec {

     

       46
        
         pname = "terra";

     

       47
       +
         version = "1.2.0";

     

       48
        
       

     

       49
        
         src = fetchFromGitHub {

     

       50
        
           owner = "terralang";

     

       51
        
           repo = "terra";

     

       52
        
           rev = "release-${version}";

     

       53
       +
           hash = "sha256-CukNCvTHZUhjdHyvDUSH0YCVNkThUFPaeyLepyEKodA=";

     

       54
        
         };

     

       55
        
       

     

       56
        
         nativeBuildInputs = [ cmake ];

     
···

       65
        
       

     

       66
        
         cmakeFlags =

     

       67
        
           let

     

       68
       +
             resourceDir = "${llvmMerged}/lib/clang/${lib.versions.major clangVersion}";

     

       0
        
       
     

       0
        
       
     

       69
        
           in

     

       70
        
           [

     

       71
        
             "-DHAS_TERRA_VERSION=0"

+4 -4

pkgs/by-name/te/tetragon/package.nix

···

       4
        
         fetchFromGitHub,

     

       5
        
         pkg-config,

     

       6
        
         go,

     

       7
       -
         llvm_16,

     

       8
       -
         clang_16,

     

       9
        
         bash,

     

       10
        
         writableTmpDirAsHomeHook,

     

       11
        
         gitMinimal,

     
···

       28
        
         ];

     

       29
        
       

     

       30
        
         buildInputs = [

     

       31
       -
           clang_16

     

       32
        
           go

     

       33
       -
           llvm_16

     

       34
        
           pkg-config

     

       35
        
         ];

     

       36

···

       4
        
         fetchFromGitHub,

     

       5
        
         pkg-config,

     

       6
        
         go,

     

       7
       +
         llvm,

     

       8
       +
         clang,

     

       9
        
         bash,

     

       10
        
         writableTmpDirAsHomeHook,

     

       11
        
         gitMinimal,

     
···

       28
        
         ];

     

       29
        
       

     

       30
        
         buildInputs = [

     

       31
       +
           clang

     

       32
        
           go

     

       33
       +
           llvm

     

       34
        
           pkg-config

     

       35
        
         ];

     

       36

+6 -3

pkgs/by-name/tr/tracee/package.nix

···

       3
        
         buildGoModule,

     

       4
        
         fetchFromGitHub,

     

       5
        
       

     

       6
       -
         clang_14,

     

       7
        
         pkg-config,

     

       8
        
       

     

       9
        
         elfutils,

     
···

       37
        
       

     

       38
        
         enableParallelBuilding = true;

     

       39
        
         # needed to build bpf libs

     

       40
       -
         hardeningDisable = [ "stackprotector" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       41
        
       

     

       42
        
         nativeBuildInputs = [

     

       43
       -
           clang_14

     

       44
        
           pkg-config

     

       45
        
         ];

     

       46
        
         buildInputs = [

···

       3
        
         buildGoModule,

     

       4
        
         fetchFromGitHub,

     

       5
        
       

     

       6
       +
         clang,

     

       7
        
         pkg-config,

     

       8
        
       

     

       9
        
         elfutils,

     
···

       37
        
       

     

       38
        
         enableParallelBuilding = true;

     

       39
        
         # needed to build bpf libs

     

       40
       +
         hardeningDisable = [

     

       41
       +
           "stackprotector"

     

       42
       +
           "zerocallusedregs"

     

       43
       +
         ];

     

       44
        
       

     

       45
        
         nativeBuildInputs = [

     

       46
       +
           clang

     

       47
        
           pkg-config

     

       48
        
         ];

     

       49
        
         buildInputs = [

+1 -2

pkgs/development/compilers/flutter/engine/package.nix

···

       18
        
         fetchgit,

     

       19
        
         runCommand,

     

       20
        
         llvmPackages,

     

       21
       -
         llvmPackages_15,

     

       22
        
         patchelf,

     

       23
        
         openbox,

     

       24
        
         xorg,

     
···

       217
        
           cp -pr --reflink=auto $swiftshader src/flutter/third_party/swiftshader

     

       218
        
           chmod -R u+w -- src/flutter/third_party/swiftshader

     

       219
        
       

     

       220
       -
           ln -s ${llvmPackages_15.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project

     

       221
        
       

     

       222
        
           mkdir -p src/flutter/buildtools/${constants.alt-platform}

     

       223
        
           ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang

···

       18
        
         fetchgit,

     

       19
        
         runCommand,

     

       20
        
         llvmPackages,

     

       0
        
       
     

       21
        
         patchelf,

     

       22
        
         openbox,

     

       23
        
         xorg,

     
···

       216
        
           cp -pr --reflink=auto $swiftshader src/flutter/third_party/swiftshader

     

       217
        
           chmod -R u+w -- src/flutter/third_party/swiftshader

     

       218
        
       

     

       219
       +
           ln -s ${llvmPackages.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project

     

       220
        
       

     

       221
        
           mkdir -p src/flutter/buildtools/${constants.alt-platform}

     

       222
        
           ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang

+1 -1

pkgs/development/haskell-modules/configuration-nix.nix

···

       184
        
       

     

       185
        
         # Doesn't declare LLVM dependency, needs llvm-config

     

       186
        
         llvm-codegen = addBuildTools [

     

       187
       -
           pkgs.llvmPackages_17.llvm.dev # for native llvm-config

     

       188
        
         ] super.llvm-codegen;

     

       189
        
       

     

       190
        
         # hledger* overrides

···

       184
        
       

     

       185
        
         # Doesn't declare LLVM dependency, needs llvm-config

     

       186
        
         llvm-codegen = addBuildTools [

     

       187
       +
           pkgs.llvmPackages.llvm.dev # for native llvm-config

     

       188
        
         ] super.llvm-codegen;

     

       189
        
       

     

       190
        
         # hledger* overrides

+4 -12

pkgs/development/libraries/qt-5/5.15/default.nix

···

       26
        
         gst-plugins-base,

     

       27
        
         gtk3,

     

       28
        
         dconf,

     

       29
       -
         llvmPackages_15,

     

       30
       -
         overrideLibcxx,

     

       31
        
         darwin,

     

       32
        
       

     

       33
        
         # options

     
···

       328
        
             qtwayland = callPackage ../modules/qtwayland.nix { };

     

       329
        
             qtwebchannel = callPackage ../modules/qtwebchannel.nix { };

     

       330
        
             qtwebengine = callPackage ../modules/qtwebengine.nix {

     

       331
       -
               # The version of Chromium used by Qt WebEngine 5.15.x does not build with clang 16 due

     

       332
       -
               # to the following errors:

     

       333
       -
               # * -Wenum-constexpr-conversion: This is a downgradable error in clang 16, but it is planned

     

       334
       -
               #   to be made into a hard error in a future version of clang. Patches are not available for

     

       335
       -
               #   the version of v8 used by Chromium in Qt WebEngine, and fixing the code is non-trivial.

     

       336
       -
               # * -Wincompatible-function-pointer-types: This is also a downgradable error generated

     

       337
       -
               #   starting with clang 16. Patches are available upstream that can be backported.

     

       338
       -
               # Because the first error is non-trivial to fix and suppressing it risks future breakage,

     

       339
       -
               # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary.

     

       340
       -
               stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv;

     

       341
        
               inherit (srcs.qtwebengine) version;

     

       342
        
               inherit (darwin) bootstrap_cmds;

     

       343
        
               python = python3;

···

       26
        
         gst-plugins-base,

     

       27
        
         gtk3,

     

       28
        
         dconf,

     

       29
       +
         llvmPackages_19,

     

       0
        
       
     

       30
        
         darwin,

     

       31
        
       

     

       32
        
         # options

     
···

       327
        
             qtwayland = callPackage ../modules/qtwayland.nix { };

     

       328
        
             qtwebchannel = callPackage ../modules/qtwebchannel.nix { };

     

       329
        
             qtwebengine = callPackage ../modules/qtwebengine.nix {

     

       330
       +
               # Won’t build with Clang 20, as `-Wenum-constexpr-conversion`

     

       331
       +
               # was made a hard error.

     

       332
       +
               stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       333
        
               inherit (srcs.qtwebengine) version;

     

       334
        
               inherit (darwin) bootstrap_cmds;

     

       335
        
               python = python3;

+25

pkgs/development/libraries/qt-5/modules/qtwebengine-gperf-3.2.patch

···

       1
       +
       Backported from: <https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch>

     

       2
       +
       Original author: Daniel Richard G <iskunk@gmail.com>

     

       3
       +
       

     

       4
       +
       diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py

     

       5
       +
       index 5ee4905..6c500a0 100644

     

       6
       +
       --- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py

     

       7
       +
       +++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py

     

       8
       +
       @@ -36,10 +36,13 @@ def generate_gperf(gperf_path, gperf_input, gperf_args):

     

       9
       +
                # https://savannah.gnu.org/bugs/index.php?53028

     

       10
       +
                gperf_output = re.sub(r'\bregister ', '', gperf_output)

     

       11
       +
                # -Wimplicit-fallthrough needs an explicit fallthrough statement,

     

       12
       +
       -        # so replace gperf's /*FALLTHROUGH*/ comment with the statement.

     

       13
       +
       -        # https://savannah.gnu.org/bugs/index.php?53029

     

       14
       +
       -        gperf_output = gperf_output.replace('/*FALLTHROUGH*/',

     

       15
       +
       -                                            '  FALLTHROUGH;')

     

       16
       +
       +        # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.

     

       17
       +
       +        # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)

     

       18
       +
       +        if re.search(

     

       19
       +
       +                r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/',

     

       20
       +
       +                gperf_output):

     

       21
       +
       +            gperf_output = gperf_output.replace('/*FALLTHROUGH*/',

     

       22
       +
       +                                                '  [[fallthrough]];')

     

       23
       +
                # -Wpointer-to-int-cast warns about casting pointers to smaller ints

     

       24
       +
                # Replace {(int)(long)&(foo), bar} with

     

       25
       +
                # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}

+3

pkgs/development/libraries/qt-5/modules/qtwebengine.nix

···

       219
        
               hash = "sha256-DcAYOV9b30ogPCiedvQimEmiZpUJquk5j6WLjJxR54U=";

     

       220
        
               extraPrefix = "";

     

       221
        
             })

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       222
        
           ];

     

       223
        
       

     

       224
        
           postPatch = ''

···

       219
        
               hash = "sha256-DcAYOV9b30ogPCiedvQimEmiZpUJquk5j6WLjJxR54U=";

     

       220
        
               extraPrefix = "";

     

       221
        
             })

     

       222
       +
       

     

       223
       +
             # Fix the build with gperf ≥ 3.2 and Clang 19.

     

       224
       +
             ./qtwebengine-gperf-3.2.patch

     

       225
        
           ];

     

       226
        
       

     

       227
        
           postPatch = ''

-5

pkgs/development/mobile/androidenv/emulator.nix

···

       36
        
               nss

     

       37
        
               nspr

     

       38
        
               alsa-lib

     

       39
       -
               llvmPackages_15.libllvm.lib

     

       40
        
               waylandpp.lib

     

       41
        
             ]

     

       42
        
           )

     
···

       68
        
             # This library is linked against a version of libtiff that nixpkgs doesn't have

     

       69
        
             for file in $out/libexec/android-sdk/emulator/*/qt/plugins/imageformats/libqtiffAndroidEmu.so; do

     

       70
        
               patchelf --replace-needed libtiff.so.5 libtiff.so "$file" || true

     

       71
       -
             done

     

       72
       -
       

     

       73
       -
             for file in $out/libexec/android-sdk/emulator/lib64/vulkan/libvulkan_lvp.so; do

     

       74
       -
               patchelf --replace-needed libLLVM-15.so.1 libLLVM-15.so "$file" || true

     

       75
        
             done

     

       76
        
       

     

       77
        
             autoPatchelf $out

···

       36
        
               nss

     

       37
        
               nspr

     

       38
        
               alsa-lib

     

       0
        
       
     

       39
        
               waylandpp.lib

     

       40
        
             ]

     

       41
        
           )

     
···

       67
        
             # This library is linked against a version of libtiff that nixpkgs doesn't have

     

       68
        
             for file in $out/libexec/android-sdk/emulator/*/qt/plugins/imageformats/libqtiffAndroidEmu.so; do

     

       69
        
               patchelf --replace-needed libtiff.so.5 libtiff.so "$file" || true

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       70
        
             done

     

       71
        
       

     

       72
        
             autoPatchelf $out

+3 -3

pkgs/development/python-modules/shiboken2/default.nix

···

       6
        
         cmake,

     

       7
        
         qt5,

     

       8
        
         libxcrypt,

     

       9
       -
         llvmPackages_15,

     

       10
        
       }:

     

       11
        
       

     

       12
        
       stdenv.mkDerivation {

     
···

       18
        
           cd sources/shiboken2

     

       19
        
         '';

     

       20
        
       

     

       21
       -
         CLANG_INSTALL_DIR = llvmPackages_15.libclang.out;

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

     

       24
        
           cmake

     
···

       32
        
         ];

     

       33
        
       

     

       34
        
         buildInputs = [

     

       35
       -
           llvmPackages_15.libclang

     

       36
        
           python.pkgs.setuptools

     

       37
        
           qt5.qtbase

     

       38
        
           qt5.qtxmlpatterns

···

       6
        
         cmake,

     

       7
        
         qt5,

     

       8
        
         libxcrypt,

     

       9
       +
         llvmPackages,

     

       10
        
       }:

     

       11
        
       

     

       12
        
       stdenv.mkDerivation {

     
···

       18
        
           cd sources/shiboken2

     

       19
        
         '';

     

       20
        
       

     

       21
       +
         CLANG_INSTALL_DIR = llvmPackages.libclang.out;

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

     

       24
        
           cmake

     
···

       32
        
         ];

     

       33
        
       

     

       34
        
         buildInputs = [

     

       35
       +
           llvmPackages.libclang

     

       36
        
           python.pkgs.setuptools

     

       37
        
           qt5.qtbase

     

       38
        
           qt5.qtxmlpatterns

+2 -2

pkgs/development/python-modules/wasmer/default.nix

···

       9
        
         libiconv,

     

       10
        
         libffi,

     

       11
        
         libxml2,

     

       12
       -
         llvm_14,

     

       13
        
         ncurses,

     

       14
        
         zlib,

     

       15
        
       }:

     
···

       99
        
           pname = "wasmer-compiler-llvm";

     

       100
        
           buildAndTestSubdir = "packages/compiler-llvm";

     

       101
        
           cargoHash = "sha256-oHyjzEqv88e2CHhWhKjUh6K0UflT9Y1JD//3oiE/UBQ=";

     

       102
       -
           extraNativeBuildInputs = [ llvm_14 ];

     

       103
        
           extraBuildInputs = [

     

       104
        
             libffi

     

       105
        
             libxml2.out

···

       9
        
         libiconv,

     

       10
        
         libffi,

     

       11
        
         libxml2,

     

       12
       +
         llvm,

     

       13
        
         ncurses,

     

       14
        
         zlib,

     

       15
        
       }:

     
···

       99
        
           pname = "wasmer-compiler-llvm";

     

       100
        
           buildAndTestSubdir = "packages/compiler-llvm";

     

       101
        
           cargoHash = "sha256-oHyjzEqv88e2CHhWhKjUh6K0UflT9Y1JD//3oiE/UBQ=";

     

       102
       +
           extraNativeBuildInputs = [ llvm ];

     

       103
        
           extraBuildInputs = [

     

       104
        
             libffi

     

       105
        
             libxml2.out

+1 -1

pkgs/development/tools/build-managers/build2/bootstrap.nix

···

       31
        
       

     

       32
        
           # Build2 needs to use lld on Darwin because it creates thin archives when it detects `llvm-ar`,

     

       33
        
           # which ld64 does not support.

     

       34
       -
           (lib.getBin buildPackages.llvmPackages_16.lld)

     

       35
        
         ];

     

       36
        
       

     

       37
        
         doCheck = true;

···

       31
        
       

     

       32
        
           # Build2 needs to use lld on Darwin because it creates thin archives when it detects `llvm-ar`,

     

       33
        
           # which ld64 does not support.

     

       34
       +
           (lib.getBin buildPackages.llvmPackages.lld)

     

       35
        
         ];

     

       36
        
       

     

       37
        
         doCheck = true;

+1 -1

pkgs/development/tools/build-managers/build2/default.nix

···

       71
        
       

     

       72
        
           # Build2 needs to use lld on Darwin because it creates thin archives when it detects `llvm-ar`,

     

       73
        
           # which ld64 does not support.

     

       74
       -
           (lib.getBin buildPackages.llvmPackages_16.lld)

     

       75
        
         ];

     

       76
        
       

     

       77
        
         postPatch = ''

···

       71
        
       

     

       72
        
           # Build2 needs to use lld on Darwin because it creates thin archives when it detects `llvm-ar`,

     

       73
        
           # which ld64 does not support.

     

       74
       +
           (lib.getBin buildPackages.llvmPackages.lld)

     

       75
        
         ];

     

       76
        
       

     

       77
        
         postPatch = ''

+2 -2

pkgs/development/tools/wasmedge/default.nix

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       5
       -
         llvmPackages_17,

     

       6
        
         boost,

     

       7
        
         cmake,

     

       8
        
         spdlog,

     
···

       20
        
         # ```

     

       21
        
         #

     

       22
        
         # > Where `.#` is the flake path were the repo `wasmedge` was cloned at the expected version.

     

       23
       -
         llvmPackages = llvmPackages_17;

     

       24
        
       in

     

       25
        
       llvmPackages.stdenv.mkDerivation (finalAttrs: {

     

       26
        
         pname = "wasmedge";

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       5
       +
         llvmPackages_19,

     

       6
        
         boost,

     

       7
        
         cmake,

     

       8
        
         spdlog,

     
···

       20
        
         # ```

     

       21
        
         #

     

       22
        
         # > Where `.#` is the flake path were the repo `wasmedge` was cloned at the expected version.

     

       23
       +
         llvmPackages = llvmPackages_19;

     

       24
        
       in

     

       25
        
       llvmPackages.stdenv.mkDerivation (finalAttrs: {

     

       26
        
         pname = "wasmedge";

+2 -13

pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix

···

       1
        
       {

     

       2
        
         buildPgrxExtension,

     

       3
        
         cargo-pgrx_0_12_0_alpha_1,

     

       4
       -
         clang_16,

     

       5
        
         fetchFromGitHub,

     

       6
        
         lib,

     

       7
        
         nix-update-script,

     
···

       10
        
         postgresql,

     

       11
        
         postgresqlTestExtension,

     

       12
        
         replaceVars,

     

       13
       -
         rustPlatform,

     

       14
        
       }:

     

       15
        
       

     

       16
       -
       let

     

       17
       -
         # Upstream only works with clang 16, so we're pinning it here to

     

       18
       -
         # avoid future incompatibility.

     

       19
       -
         # See https://docs.vectorchord.ai/developers/development.html#set-up-development-environment, step 2

     

       20
       -
         clang = clang_16;

     

       21
       -
         rustPlatform' = rustPlatform // {

     

       22
       -
           bindgenHook = rustPlatform.bindgenHook.override { inherit clang; };

     

       23
       -
         };

     

       24
       -
       

     

       25
       -
       in

     

       26
       -
       (buildPgrxExtension.override { rustPlatform = rustPlatform'; }) (finalAttrs: {

     

       27
        
         inherit postgresql;

     

       28
        
         cargo-pgrx = cargo-pgrx_0_12_0_alpha_1;

     

       29

···

       1
        
       {

     

       2
        
         buildPgrxExtension,

     

       3
        
         cargo-pgrx_0_12_0_alpha_1,

     

       4
       +
         clang,

     

       5
        
         fetchFromGitHub,

     

       6
        
         lib,

     

       7
        
         nix-update-script,

     
···

       10
        
         postgresql,

     

       11
        
         postgresqlTestExtension,

     

       12
        
         replaceVars,

     

       0
        
       
     

       13
        
       }:

     

       14
        
       

     

       15
       +
       buildPgrxExtension (finalAttrs: {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
         inherit postgresql;

     

       17
        
         cargo-pgrx = cargo-pgrx_0_12_0_alpha_1;

     

       18

+2 -13

pkgs/top-level/all-packages.nix

···

       1472
        
       

     

       1473
        
         ### APPLICATIONS/TERMINAL-EMULATORS

     

       1474
        
       

     

       1475
       -
         contour = callPackage ../by-name/co/contour/package.nix {

     

       1476
       -
           inherit (darwin) libutil sigtool;

     

       1477
       -
           stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv;

     

       1478
       -
         };

     

       1479
       -
       

     

       1480
        
         cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };

     

       1481
        
       

     

       1482
        
         kitty = callPackage ../by-name/ki/kitty/package.nix {

     
···

       5319
        
       

     

       5320
        
         ghdl-llvm = callPackage ../by-name/gh/ghdl/package.nix {

     

       5321
        
           backend = "llvm";

     

       5322
       -
           inherit (llvmPackages_15) llvm;

     

       5323
        
         };

     

       5324
        
       

     

       5325
        
         gcc-arm-embedded = gcc-arm-embedded-14;

     
···

       8632
        
       

     

       8633
        
         libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix { };

     

       8634
        
       

     

       8635
       -
         libunicode = callPackage ../by-name/li/libunicode/package.nix {

     

       8636
       -
           stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv;

     

       8637
       -
         };

     

       8638
       -
       

     

       8639
        
         libunwind =

     

       8640
        
           # Use the system unwinder in the SDK but provide a compatibility package to:

     

       8641
        
           # 1. avoid evaluation errors with setting `unwind` to `null`; and

     
···

       9108
        
               perl

     

       9109
        
               gtk3

     

       9110
        
               python3

     

       9111
       -
               llvmPackages_15

     

       9112
       -
               overrideLibcxx

     

       9113
        
               darwin

     

       9114
        
               ;

     

       9115
        
             inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;

     
···

       9391
        
         tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { };

     

       9392
        
       

     

       9393
        
         termbench-pro = callPackage ../by-name/te/termbench-pro/package.nix {

     

       9394
       -
           stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv;

     

       9395
        
           fmt = fmt_11;

     

       9396
        
         };

     

       9397

···

       1472
        
       

     

       1473
        
         ### APPLICATIONS/TERMINAL-EMULATORS

     

       1474
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1475
        
         cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };

     

       1476
        
       

     

       1477
        
         kitty = callPackage ../by-name/ki/kitty/package.nix {

     
···

       5314
        
       

     

       5315
        
         ghdl-llvm = callPackage ../by-name/gh/ghdl/package.nix {

     

       5316
        
           backend = "llvm";

     

       5317
       +
           inherit (llvmPackages) llvm;

     

       5318
        
         };

     

       5319
        
       

     

       5320
        
         gcc-arm-embedded = gcc-arm-embedded-14;

     
···

       8627
        
       

     

       8628
        
         libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix { };

     

       8629
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8630
        
         libunwind =

     

       8631
        
           # Use the system unwinder in the SDK but provide a compatibility package to:

     

       8632
        
           # 1. avoid evaluation errors with setting `unwind` to `null`; and

     
···

       9099
        
               perl

     

       9100
        
               gtk3

     

       9101
        
               python3

     

       9102
       +
               llvmPackages_19

     

       0
        
       
     

       9103
        
               darwin

     

       9104
        
               ;

     

       9105
        
             inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;

     
···

       9381
        
         tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { };

     

       9382
        
       

     

       9383
        
         termbench-pro = callPackage ../by-name/te/termbench-pro/package.nix {

     

       0
        
       
     

       9384
        
           fmt = fmt_11;

     

       9385
        
         };

     

       9386

+1 -1

pkgs/top-level/ocaml-packages.nix

···

       89
        
               backoff = callPackage ../development/ocaml-modules/backoff { };

     

       90
        
       

     

       91
        
               bap = callPackage ../development/ocaml-modules/bap {

     

       92
       -
                 inherit (pkgs.llvmPackages_14) llvm;

     

       93
        
               };

     

       94
        
       

     

       95
        
               base64 = callPackage ../development/ocaml-modules/base64 { };

···

       89
        
               backoff = callPackage ../development/ocaml-modules/backoff { };

     

       90
        
       

     

       91
        
               bap = callPackage ../development/ocaml-modules/bap {

     

       92
       +
                 inherit (pkgs.llvmPackages) llvm;

     

       93
        
               };

     

       94
        
       

     

       95
        
               base64 = callPackage ../development/ocaml-modules/base64 { };

+1 -1

pkgs/top-level/python-packages.nix

···

       16500
        
         shellingham = callPackage ../development/python-modules/shellingham { };

     

       16501
        
       

     

       16502
        
         shiboken2 = toPythonModule (

     

       16503
       -
           callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages_15 qt5; }

     

       16504
        
         );

     

       16505
        
       

     

       16506
        
         shiboken6 = toPythonModule (

···

       16500
        
         shellingham = callPackage ../development/python-modules/shellingham { };

     

       16501
        
       

     

       16502
        
         shiboken2 = toPythonModule (

     

       16503
       +
           callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages qt5; }

     

       16504
        
         );

     

       16505
        
       

     

       16506
        
         shiboken6 = toPythonModule (