diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 33 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 6 |
2 files changed, 19 insertions, 20 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d47121eaf08ef..177928a17d817 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -608,7 +608,7 @@ in arandr = callPackage ../tools/X11/arandr { }; - inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_2 arangodb_3_3 arangodb_3_4 arangodb_3_5; + inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_3 arangodb_3_4 arangodb_3_5; arangodb = arangodb_3_4; arcanist = callPackage ../development/tools/misc/arcanist {}; @@ -3825,8 +3825,6 @@ in highlight = callPackage ../tools/text/highlight ({ lua = lua5; - } // lib.optionalAttrs stdenv.isDarwin { - inherit (llvmPackages_38) stdenv; }); holochain-go = callPackage ../servers/holochain-go { }; @@ -3914,8 +3912,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; }; }) @@ -7427,7 +7425,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 { @@ -7509,9 +7506,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; - # Temporary solution until #40038 is fixed - gcc = if stdenv.isDarwin then gcc7 else gcc8; + gccFun = callPackage ../development/compilers/gcc/8; + gcc = gcc8; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { @@ -7746,6 +7742,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"; @@ -8115,7 +8119,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; @@ -8126,14 +8129,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; @@ -9077,6 +9072,8 @@ in mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; + rappel = callPackage ../development/misc/rappel/default.nix { }; + pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; pharo-cog32 = pharo-vms.cog32; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3720361474438..af3f446cb259f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -57,7 +57,9 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; - bap = callPackage ../development/ocaml-modules/bap { }; + bap = callPackage ../development/ocaml-modules/bap { + llvm = pkgs.llvm_8; + }; batteries = callPackage ../development/ocaml-modules/batteries { }; @@ -395,7 +397,7 @@ let linenoise = callPackage ../development/ocaml-modules/linenoise { }; llvm = callPackage ../development/ocaml-modules/llvm { - llvm = pkgs.llvm_39; + llvm = pkgs.llvm_8; }; logs = callPackage ../development/ocaml-modules/logs { |