Unverified Commit 72f5bfc3 authored by Emily's avatar Emily Committed by GitHub
Browse files

various: unpin or bump LLVM (#434642)

parents d22d525d dd781e6a

nixos/modules/config/malloc.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+4 −4
Original line number Diff line number Diff line
@@ -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

+6 −6
Original line number Diff line number Diff line
@@ -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

+0 −8
Original line number Diff line number Diff line 
{

  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";