summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-09-30 16:17:19 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-09-30 16:18:36 -0700
commit3e96b763d2458537e994a23478f5ce4257930f31 (patch)
treeafb89b24f719a16345e4476e95cd32edab277716
parentcfba54975e4193389657c0e67747b1c0632e71dd (diff)
downloadnixlib-3e96b763d2458537e994a23478f5ce4257930f31.tar
nixlib-3e96b763d2458537e994a23478f5ce4257930f31.tar.gz
nixlib-3e96b763d2458537e994a23478f5ce4257930f31.tar.bz2
nixlib-3e96b763d2458537e994a23478f5ce4257930f31.tar.lz
nixlib-3e96b763d2458537e994a23478f5ce4257930f31.tar.xz
nixlib-3e96b763d2458537e994a23478f5ce4257930f31.tar.zst
nixlib-3e96b763d2458537e994a23478f5ce4257930f31.zip
llvm: Switch to 3.7 by default
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24bd66c1c1ee..20770b428db0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4149,7 +4149,7 @@ let
   llvm_34 = llvmPackages_34.llvm;
   llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { };
 
-  llvmPackages = recurseIntoAttrs llvmPackages_36;
+  llvmPackages = recurseIntoAttrs llvmPackages_37;
 
   llvmPackagesSelf = llvmPackages_34.override {
     stdenv = libcxxStdenv;
@@ -7558,7 +7558,6 @@ let
     # makes it slower, but during runtime we link against just mesa_drivers
     # through /run/opengl-driver*, which is overriden according to config.grsecurity
     grsecEnabled = true;
-    llvmPackages = llvmPackages_36;
   });
   mesa_glu =  mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });
   mesa_drivers = mesaDarwinOr (