diff options
| author | Emily <vcs@emily.moe> | 2024-11-07 06:54:58 +0000 |
|---|---|---|
| committer | Emily <vcs@emily.moe> | 2024-11-07 23:05:27 +0000 |
| commit | 76d82c1f8a0a3e00895255a78e3cc9790777ec8a (patch) | |
| tree | be85dbbf5d444ed7bf3da712a139e461836fca1d | |
| parent | llvmPackages: llvmPackages_{16,18} -> llvmPackages_19 (diff) | |
| parent | rust: use LLVM 19 (diff) | |
| download | nixpkgs-76d82c1f8a0a3e00895255a78e3cc9790777ec8a.tar.gz | |
[llvm-19] rust: use LLVM 19 (#354149)
| -rw-r--r-- | pkgs/development/compilers/rust/1_82.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/compilers/rust/1_82.nix b/pkgs/development/compilers/rust/1_82.nix index 9d1281352ee1..45734f893dca 100644 --- a/pkgs/development/compilers/rust/1_82.nix +++ b/pkgs/development/compilers/rust/1_82.nix @@ -24,8 +24,8 @@ pkgsTargetTarget, makeRustPlatform, wrapRustcWith, - llvmPackages_18, - llvm_18, + llvmPackages_19, + llvm_19, wrapCCWith, overrideCC, fetchpatch, @@ -33,7 +33,7 @@ let llvmSharedFor = pkgSet: - pkgSet.llvmPackages_18.libllvm.override ( + pkgSet.llvmPackages_19.libllvm.override ( { enableSharedLibraries = true; } @@ -41,7 +41,7 @@ let # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM stdenv = pkgSet.stdenv.override { allowedRequisites = null; - cc = pkgSet.pkgsBuildHost.llvmPackages_18.clangUseLLVM; + cc = pkgSet.pkgsBuildHost.llvmPackages_19.clangUseLLVM; }; } ); @@ -68,14 +68,14 @@ import ./default.nix bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools, }: let - llvmPackages = llvmPackages_18; + llvmPackages = llvmPackages_19; setStdenv = pkg: pkg.override { stdenv = stdenv.override { allowedRequisites = null; - cc = pkgsBuildHost.llvmPackages_18.clangUseLLVM; + cc = pkgsBuildHost.llvmPackages_19.clangUseLLVM; }; }; in @@ -88,7 +88,7 @@ import ./default.nix libcxx = llvmPackages.libcxx.override { stdenv = stdenv.override { allowedRequisites = null; - cc = pkgsBuildHost.llvmPackages_18.clangNoLibcxx; + cc = pkgsBuildHost.llvmPackages_19.clangNoLibcxx; hostPlatform = stdenv.hostPlatform // { useLLVM = !stdenv.hostPlatform.isDarwin; }; @@ -102,7 +102,7 @@ import ./default.nix } ) { } else - llvmPackages_18; + llvmPackages_19; # Note: the version MUST be the same version that we are building. Upstream # ensures that each released compiler can compile itself: @@ -139,8 +139,8 @@ import ./default.nix ( builtins.removeAttrs args [ - "llvmPackages_18" - "llvm_18" + "llvmPackages_19" + "llvm_19" "wrapCCWith" "overrideCC" "fetchpatch" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ca56f8fa694..c6eda0889085 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15287,7 +15287,7 @@ with pkgs; rust_1_82 = callPackage ../development/compilers/rust/1_82.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - llvm_18 = llvmPackages_18.libllvm; + llvm_19 = llvmPackages_19.libllvm; }; rust = rust_1_82; |