various: unpin or bump LLVM (#434642)

Author: emilazy

nixos/modules/config/malloc.nix

@@ -52,7 +52,7 @@ let
             or (throw "scudo not supported on ${pkgs.stdenv.hostPlatform.system}");
       in
       {
-        libPath = "${pkgs.llvmPackages_14.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so";
+        libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so";
         description = ''
           A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator,
           which aims at providing additional mitigations against heap based

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

@@ -32,7 +32,7 @@
   libuuid,
   libxkbcommon,
   libxml2,
-  llvmPackages_13,
+  llvmPackages,
   matio,
   mpfr,
   ncurses,
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
     libuuid
     libxkbcommon
     libxml2
-    llvmPackages_13.libllvm.lib
+    llvmPackages.libllvm.lib
     matio
     mpfr
     ncurses

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

@@ -11,7 +11,7 @@
   gtest,
   pkg-config,
   lit,
-  llvmPackages_16,
+  llvmPackages,
 }:
 let
   # Old vendored package which has no other use than here, so not packaged in nixpkgs.
@@ -35,8 +35,8 @@ stdenv.mkDerivation {
 
   cmakeFlags = [
     "-DLIT_EXECUTABLE=${lit}/bin/lit"
-    "-DFILECHECK_EXECUTABLE=${llvmPackages_16.libllvm}/bin/FileCheck"
-    "-DYAML2OBJ_EXECUTABLE=${llvmPackages_16.libllvm}/bin/yaml2obj"
+    "-DFILECHECK_EXECUTABLE=${llvmPackages.libllvm}/bin/FileCheck"
+    "-DYAML2OBJ_EXECUTABLE=${llvmPackages.libllvm}/bin/yaml2obj"
   ];
 
   postPatch = ''
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
     capstone
     gtest
     lit
-    llvmPackages_16.libllvm
+    llvmPackages.libllvm
   ];
 
   doCheck = true;

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

@@ -2,24 +2,24 @@
   lib,
   fetchFromGitHub,
   cmake,
-  llvmPackages_16,
+  llvmPackages_18,
   unstableGitUpdater,
 }:
 
 let
-  c2ffiBranch = "llvm-16.0.0";
-  llvmPackages = llvmPackages_16;
+  c2ffiBranch = "llvm-18.1.0";
+  llvmPackages = llvmPackages_18;
 in
 
 llvmPackages.stdenv.mkDerivation {
   pname = "c2ffi-${c2ffiBranch}";
-  version = "0-unstable-2023-11-18";
+  version = "0-unstable-2024-04-20";
 
   src = fetchFromGitHub {
     owner = "rpav";
     repo = "c2ffi";
-    rev = "097cbe61ca02dc79ea60859aa056975131a9d985";
-    hash = "sha256-pflolW5OoEkVDozy4cjCdUIVxgE/SfVKIhQyNBDhENc=";
+    rev = "0de81efb64acc82c08c5eee4a7108ddcb1b00d86";
+    hash = "sha256-q81Vxq/6h/5jgQ1Leq15klN/8L+UiavlxkARGo2SrJ0=";
   };
 
   passthru.updateScript = unstableGitUpdater {

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

@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  llvmPackages_17,
   fetchurl,
   coreutils,
   cctools,
@@ -13,13 +12,6 @@
   testers,
 }@args:
 
-let
-  # x64 darwin fails with invalid memory reference with clang-18 & 19.
-  # https://github.com/cisco/ChezScheme/issues/896
-  # aarch64 darwin fails to execute `system` calls with clang-18 & 19.
-  # https://github.com/cisco/ChezScheme/issues/928
-  stdenv = if args.stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else args.stdenv;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "chez-scheme";
   version = "10.2.0";

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

@@ -20,8 +20,7 @@
   yaml-cpp,
   ncurses,
   file,
-  libutil,
-  sigtool,
+  darwin,
   nixosTests,
   installShellFiles,
   reflection-cpp,
@@ -53,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.wrapQtAppsHook
     installShellFiles
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
 
   buildInputs = [
     boxed-cpp
@@ -74,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libutil
+    darwin.libutil
   ];
 
   cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ];

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

@@ -2,7 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  llvm_17,
+  llvm,
   libffi,
   libz,
   libxml2,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    llvm_17
+    llvm
     makeWrapper
   ];
 
@@ -62,6 +62,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     };
   };
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Language for building concurrent software with confidence";
     homepage = "https://inko-lang.org/";

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

@@ -4,7 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   cargo,
-  llvm_16,
+  llvm,
   stdenv,
   libffi,
   libz,
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttr: {
       --prefix PATH : ${
         lib.makeBinPath [
           cargo
-          llvm_16.dev
+          llvm.dev
           stdenv.cc
         ]
       } \

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

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  llvmPackages_16,
+  llvmPackages_18,
   ncurses,
   cmake,
   libxml2,
@@ -14,17 +14,17 @@
 }:
 
 let
-  luajitRev = "50936d784474747b4569d988767f1b5bab8bb6d0";
+  luajitRev = "83954100dba9fc0cf5eeaf122f007df35ec9a604";
   luajitBase = "LuaJIT-${luajitRev}";
   luajitArchive = "${luajitBase}.tar.gz";
   luajitSrc = fetchFromGitHub {
     owner = "LuaJIT";
     repo = "LuaJIT";
     rev = luajitRev;
-    sha256 = "1g87pl014b5v6z2nnhiwn3wf405skawszfr5wdzyfbx00j3kgxd0";
+    hash = "sha256-L9T6lc32dDLAp9hPI5mKOzT0c4juW9JHA3FJCpm7HNQ=";
   };
 
-  llvmPackages = llvmPackages_16;
+  llvmPackages = llvmPackages_18;
   llvmMerged = symlinkJoin {
     name = "llvmClangMerged";
     paths = with llvmPackages; [
@@ -37,20 +37,20 @@ let
     ];
   };
 
-  cuda = cudaPackages.cudatoolkit_11;
+  cuda = cudaPackages.cudatoolkit;
 
   clangVersion = llvmPackages.clang-unwrapped.version;
 
 in
 stdenv.mkDerivation rec {
   pname = "terra";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "terralang";
     repo = "terra";
     rev = "release-${version}";
-    sha256 = "0v9vpxcp9ybwnfljskqn41vjq7c0srdfv7qs890a6480pnk4kavd";
+    hash = "sha256-CukNCvTHZUhjdHyvDUSH0YCVNkThUFPaeyLepyEKodA=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -65,9 +65,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags =
     let
-      resourceDir =
-        "${llvmMerged}/lib/clang/"
-        + (if lib.versionOlder clangVersion "16" then clangVersion else lib.versions.major clangVersion);
+      resourceDir = "${llvmMerged}/lib/clang/${lib.versions.major clangVersion}";
     in
     [
       "-DHAS_TERRA_VERSION=0"

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

@@ -4,8 +4,8 @@
   fetchFromGitHub,
   pkg-config,
   go,
-  llvm_16,
-  clang_16,
+  llvm,
+  clang,
   bash,
   writableTmpDirAsHomeHook,
   gitMinimal,
@@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    clang_16
+    clang
     go
-    llvm_16
+    llvm
     pkg-config
   ];