diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eccf4850ffe..087b615cb3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3942,8 +3942,8 @@ in idevicerestore = callPackage ../tools/misc/idevicerestore { }; inherit (callPackages ../tools/filesystems/irods rec { - stdenv = llvmPackages_38.libcxxStdenv; - libcxx = llvmPackages_38.libcxx; + stdenv = llvmPackages.libcxxStdenv; + libcxx = llvmPackages.libcxx; boost = boost160.override { inherit stdenv; }; avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; }; }) @@ -7448,7 +7448,6 @@ in clang_5 = llvmPackages_5.clang; clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; - clang_38 = llvmPackages_38.clang; clang_35 = wrapCC llvmPackages_35.clang; clang-tools = callPackage ../development/tools/clang-tools { @@ -7530,8 +7529,8 @@ in gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; - gccFun = callPackage ../development/compilers/gcc/7; - gcc = gcc7; + gccFun = callPackage ../development/compilers/gcc/8; + gcc = gcc8; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { @@ -7766,6 +7765,14 @@ in profiledCompiler = false; }); + gfortran8 = wrapCC (gcc8.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj6; gcj6 = wrapCC (gcc6.cc.override { name = "gcj"; @@ -8147,7 +8154,6 @@ in llvm_5 = llvmPackages_5.llvm; llvm_4 = llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; - llvm_38 = llvmPackages_38.llvm; llvm_35 = llvmPackages_35.llvm; llvmPackages = recurseIntoAttrs llvmPackages_7; @@ -8158,14 +8164,6 @@ in stdenv = gcc6Stdenv; }); - llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_38.tools; - targetLlvmLibraries = targetPackages.llvmPackages_38.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = gcc6Stdenv; - }); - llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_39.tools; |