Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

rustc: 1_52, use correct llvm version

authored by Luka Blaskovic and committed by Jonathan Ringer 76e136bb 0ef2fe6f

+8 -7
+7 -6
pkgs/development/compilers/rust/1_52.nix
··· 15 15 , CoreFoundation, Security 16 16 , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost 17 17 , makeRustPlatform 18 - , llvmPackages_11, llvm_11 18 + , llvmPackages_11 19 + , llvmPackages_12, llvm_12 19 20 } @ args: 20 21 21 22 import ./default.nix { 22 23 rustcVersion = "1.52.1"; 23 24 rustcSha256 = "sha256-Om8jom0Oj4erv78yxc19qgwLcdCYar78Vrml+/vQv5g="; 24 25 25 - llvmSharedForBuild = pkgsBuildBuild.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; 26 - llvmSharedForHost = pkgsBuildHost.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; 27 - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; 26 + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; 27 + llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; 28 + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; 28 29 29 30 llvmBootstrapForDarwin = llvmPackages_11; 30 31 31 32 # For use at runtime 32 - llvmShared = llvm_11.override { enableSharedLibraries = true; }; 33 + llvmShared = llvm_12.override { enableSharedLibraries = true; }; 33 34 34 35 # Note: the version MUST be one version prior to the version we're 35 36 # building ··· 55 56 ]; 56 57 } 57 58 58 - (builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvm_11"]) 59 + (builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_12" "llvm_12"])
+1 -1
pkgs/top-level/all-packages.nix
··· 11597 11597 }; 11598 11598 rust_1_52 = callPackage ../development/compilers/rust/1_52.nix { 11599 11599 inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; 11600 - llvm_11 = llvmPackages_11.libllvm; 11600 + llvm_12 = llvmPackages_12.libllvm; 11601 11601 }; 11602 11602 rust = rust_1_52; 11603 11603