diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-10-30 00:06:49 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-30 00:06:49 +0000 |
commit | dbfe42bc77c7d782beb2609e5219809eae2f7fb9 (patch) | |
tree | 2fe14f24e108c86a1855d93dff98cc136cccdafe /pkgs/development/compilers | |
parent | 1d4787f14d264da8d18bc247facaf89d3511a56e (diff) | |
parent | 39423b9f03e1ce36b6e355bb60b1891192ee5234 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/compilers')
5 files changed, 34 insertions, 23 deletions
diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 1c40d7fe516ba..85332a946450e 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -5,7 +5,8 @@ , runCommandLocal , bison , flex -, llvmPackages_8 +, llvmPackages_11 +, lld_11 , opencl-clang , python3 , spirv-llvm-translator @@ -14,7 +15,13 @@ }: let - llvmPkgs = llvmPackages_8 // { + vc_intrinsics_src = fetchFromGitHub { + owner = "intel"; + repo = "vc-intrinsics"; + rev = "e5ad7e02aa4aa21a3cd7b3e5d1f3ec9b95f58872"; + sha256 = "Vg1mngwpIQ3Tik0GgRXPG22lE4sLEAEFch492G2aIXs="; + }; + llvmPkgs = llvmPackages_11 // { inherit spirv-llvm-translator; }; inherit (llvmPkgs) llvm; @@ -24,18 +31,18 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.4241"; + version = "1.0.8744"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "1jp3c67ppl1x4pazr5nzy52615cpx0kyckaridhc0fsmrkgilyxq"; + sha256 = "G5+dYD8uZDPkRyn1sgXsRngdq4NJndiCJCYTRXyUgTA="; }; nativeBuildInputs = [ clang cmake bison flex python3 ]; - buildInputs = [ clang opencl-clang spirv-llvm-translator llvm ]; + buildInputs = [ clang opencl-clang spirv-llvm-translator llvm lld_11 ]; strictDeps = true; @@ -53,9 +60,12 @@ stdenv.mkDerivation rec { ln -s clang $out/clang-${versions.major (getVersion clang)} ln -s ${opencl-clang}/lib/* $out/ ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c.h $out/ + ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c-base.h $out/ ''; cmakeFlags = [ + "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}" + "-DINSTALL_SPIRVDLL=0" "-DCCLANG_BUILD_PREBUILDS=ON" "-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}" "-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}" diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index baa29064e20c0..b7379ac677203 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,6 +1,6 @@ -{ buildPackages, callPackage, stdenv }@prev: +{ buildPackages, callPackage }: -{ rustc, cargo, stdenv ? prev.stdenv, ... }: +{ rustc, cargo, ... }: rec { rust = { @@ -9,27 +9,27 @@ rec { fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix { git = buildPackages.gitMinimal; - inherit stdenv cargo; + inherit cargo; }; buildRustPackage = callPackage ../../../build-support/rust { git = buildPackages.gitMinimal; - inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook + inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook fetchCargoTarball importCargoLock rustc; }; importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; rustcSrc = callPackage ./rust-src.nix { - inherit stdenv rustc; + inherit rustc; }; rustLibSrc = callPackage ./rust-lib-src.nix { - inherit stdenv rustc; + inherit rustc; }; # Hooks inherit (callPackage ../../../build-support/rust/hooks { - inherit stdenv cargo rustc; + inherit cargo rustc; }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; } diff --git a/pkgs/development/compilers/scala-runners/default.nix b/pkgs/development/compilers/scala-runners/default.nix index 0f0de015af5f9..57756b423d55e 100644 --- a/pkgs/development/compilers/scala-runners/default.nix +++ b/pkgs/development/compilers/scala-runners/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' mkdir -p $out/bin $out/lib - sed -ie "s| cs | ${coursier}/bin/coursier |" scala-runner + sed -ie "s| cs | ${coursier}/bin/cs |" scala-runner cp scala-runner $out/lib ln -s $out/lib/scala-runner $out/bin/scala ln -s $out/lib/scala-runner $out/bin/scalac diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 05d1ead1fb6fd..b954fdbe1edcf 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.1.0"; pname = "dotty-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; - sha256 = "/F2yv4XH0I3oC3IFqj+jwpzShCtTEfTzg+J26Xl+P+Y="; + sha256 = "9bsZ2FtIb6AvA3W3r2Vv0dPNicuYjMBz3X48z45Avv8="; }; propagatedBuildInputs = [ jre ncurses.dev ] ; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index e4549a7d65d7f..0dff7f0e1b094 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -2,29 +2,30 @@ , fetchFromGitHub , cmake , pkg-config - , lit -, llvm_8 +, llvm_11 }: stdenv.mkDerivation rec { pname = "SPIRV-LLVM-Translator"; - version = "8.0.1-2"; + version = "unstable-2021-06-13"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-LLVM-Translator"; - rev = "v${version}"; - sha256 = "0hxalc3fkliqs61hpr97phbm3qsx4b8vgnlg30aimzr6aas403r5"; + rev = "c67e6f26a7285aa753598ef792593ac4a545adf9"; + sha256 = "sha256-1s3lVNTQDl+pUvbzSMsp3cOUSm6I4DzqJxnLMeeE3F4="; }; - nativeBuildInputs = [ pkg-config cmake llvm_8.dev ]; + nativeBuildInputs = [ pkg-config cmake llvm_11.dev ]; - buildInputs = [ llvm_8 ]; + buildInputs = [ llvm_11 ]; checkInputs = [ lit ]; - cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" ]; + cmakeFlags = [ + "-DLLVM_INCLUDE_TESTS=ON" + ]; # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist doCheck = false; |