Merge branch 'llvm-bump'

Bump default llvm on non-darwin too

pkgs/development/compilers/llvm/3.5/llvm.nix

@@ -42,9 +42,11 @@ in stdenv.mkDerivation rec {
     "-DLLVM_BUILD_TESTS=ON"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
-    "-DCMAKE_CXX_FLAGS=-stdlib=libc++"
   ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"
-    ++ stdenv.lib.optional ( isDarwin) "-DCAN_TARGET_i386=false";
+    ++ stdenv.lib.optionals ( isDarwin) [
+    "-DCMAKE_CXX_FLAGS=-stdlib=libc++"
+    "-DCAN_TARGET_i386=false"
+  ];
 
   postBuild = ''
     rm -fR $out

pkgs/top-level/all-packages.nix

@@ -3638,7 +3638,7 @@ let
 
   llvm_v = path: callPackage path { };
 
-  llvmPackages = if stdenv.isDarwin then llvmPackages_35 else llvmPackages_34;
+  llvmPackages = llvmPackages_35;
 
   llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
     inherit stdenv newScope fetchurl;