Skip to content

Commit 1318082

Browse files
committed
1 parent 03925ec commit 1318082

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

pkgs/development/compilers/rust/1_70.nix

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
1717
, makeRustPlatform
1818
, llvmPackages_11
19-
, llvmPackages_15, llvm_15
19+
, llvmPackages_16, llvm_16
2020
} @ args:
2121

2222
import ./default.nix {
2323
rustcVersion = "1.70.0";
2424
rustcSha256 = "sha256-sr+uAAt6UEDk7Eu8UKCfIVSBkMt1cLDtdzWDaEE70nw=";
2525

26-
llvmSharedForBuild = pkgsBuildBuild.llvmPackages_15.libllvm.override { enableSharedLibraries = true; };
27-
llvmSharedForHost = pkgsBuildHost.llvmPackages_15.libllvm.override { enableSharedLibraries = true; };
28-
llvmSharedForTarget = pkgsBuildTarget.llvmPackages_15.libllvm.override { enableSharedLibraries = true; };
26+
llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
27+
llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
28+
llvmSharedForTarget = pkgsBuildTarget.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
2929

3030
llvmBootstrapForDarwin = llvmPackages_11;
3131

3232
# For use at runtime
33-
llvmShared = llvm_15.override { enableSharedLibraries = true; };
33+
llvmShared = llvm_16.override { enableSharedLibraries = true; };
3434

3535
# Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
36-
llvmPackages = llvmPackages_15;
36+
llvmPackages = llvmPackages_16;
3737

3838
# Note: the version MUST be one version prior to the version we're
3939
# building
@@ -60,4 +60,4 @@ import ./default.nix {
6060
rustcPatches = [ ];
6161
}
6262

63-
(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"])
63+
(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_16" "llvm_16"])

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16369,7 +16369,7 @@ with pkgs;
1636916369

1637016370
rust_1_70 = callPackage ../development/compilers/rust/1_70.nix {
1637116371
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
16372-
llvm_15 = llvmPackages_15.libllvm;
16372+
llvm_16 = llvmPackages_16.libllvm;
1637316373
};
1637416374
rust = rust_1_70;
1637516375

0 commit comments

Comments
 (0)