JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llvm-packages: update default 4 -> 5

Browse Source
This commit is contained in:
Will Dietz 2018-01-03 08:02:17 -06:00 committed by Daiderd Jordan
parent 3e87443100
commit 19d8850164
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/top-level/all-packages.nix
View File

@ -6251,7 +6251,7 @@ with pkgs;
llvm_35 = llvmPackages_35.llvm; llvm_35 = llvmPackages_35.llvm;
llvm_34 = llvmPackages_34.llvm; llvm_34 = llvmPackages_34.llvm;
llvmPackages = recurseIntoAttrs llvmPackages_4; llvmPackages = recurseIntoAttrs llvmPackages_5;
llvmPackagesSelf = llvmPackages_34.override { llvmPackagesSelf = llvmPackages_34.override {
stdenv = libcxxStdenv; stdenv = libcxxStdenv;
@ -6277,7 +6277,11 @@ with pkgs;
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
}; };
llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ llvmPackages_4 = callPackage ../development/compilers/llvm/4 {
inherit (stdenvAdapters) overrideCC;
};
llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
} // stdenv.lib.optionalAttrs stdenv.isDarwin { } // stdenv.lib.optionalAttrs stdenv.isDarwin {
cmake = cmake.override { isBootstrap = true; }; cmake = cmake.override { isBootstrap = true; };
@ -6285,10 +6289,6 @@ with pkgs;
python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; }; python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
}); });
llvmPackages_5 = callPackage ../development/compilers/llvm/5 {
inherit (stdenvAdapters) overrideCC;
};
manticore = callPackage ../development/compilers/manticore { }; manticore = callPackage ../development/compilers/manticore { };
mentorToolchains = recurseIntoAttrs ( mentorToolchains = recurseIntoAttrs (
@ -7944,7 +7944,6 @@ with pkgs;
ycmd = callPackage ../development/tools/misc/ycmd { ycmd = callPackage ../development/tools/misc/ycmd {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
llvmPackages = llvmPackages_5;
python = python2; python = python2;
}; };
@ -10100,8 +10099,6 @@ with pkgs;
# makes it slower, but during runtime we link against just mesa_drivers # makes it slower, but during runtime we link against just mesa_drivers
# through /run/opengl-driver*, which is overriden according to config.grsecurity # through /run/opengl-driver*, which is overriden according to config.grsecurity
# grsecEnabled = true; # no more support in nixpkgs ATM # grsecEnabled = true; # no more support in nixpkgs ATM
llvmPackages = llvmPackages_5;
}); });
mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });