diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:19 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:19 +0100 |
commit | 960f062825d22e328828766f4910b702f81ddade (patch) | |
tree | fa16e624b184fa3ee21681ac9a98eaf6fbef4ce3 /pkgs/development/compilers | |
parent | 1a654573b0a29c5ac8bbe16169cd544c02e945a9 (diff) | |
parent | e5672143d86ef0beb4b200105330e7da65c9d773 (diff) | |
download | nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.gz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.bz2 nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.lz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.xz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.zst nixpkgs-960f062825d22e328828766f4910b702f81ddade.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/intel-graphics-compiler/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ldc/default.nix | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index a365761b014..0070bc23f73 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.2878"; + version = "1.0.3041"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "0rgij1013fy2x2szfchy3z6390mjfqw3nz4zprcb5v2v6mpvcj4l"; + sha256 = "1d3vxq4v8jdjgl5jdm9qpxzgaw98r84dzs9lk9ph02khfkajqhjm"; }; nativeBuildInputs = [ clang cmake bison flex llvm python ]; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index fff6435b29e..c397d02038d 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata , python, libconfig, lit, gdb, unzip, darwin, bash -, callPackage, makeWrapper, targetPackages +, callPackage, makeWrapper, runCommand, targetPackages , bootstrapVersion ? false , version ? "1.17.0" , ldcSha256 ? "1aag5jfrng6p4ms0fs90hjbv9bcj3hj8h52r68c3cm6racdajbva" @@ -18,6 +18,11 @@ let else ""; + pathConfig = runCommand "ldc-lib-paths" {} '' + mkdir $out + echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile + ''; in stdenv.mkDerivation rec { @@ -42,17 +47,14 @@ stdenv.mkDerivation rec { rm ldc-${version}-src/tests/d2/dmd-testsuite/fail_compilation/mixin_gc.d rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/xtest46_gc.d rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/testptrref_gc.d + + # test depends on current year + rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d '' + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' # https://github.com/NixOS/nixpkgs/issues/34817 rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall - '' - - + stdenv.lib.optionalString (!bootstrapVersion) '' - echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile - - echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > ldc-${version}-src/LibcurlPathFile ''; postPatch = '' @@ -98,7 +100,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl tzdata ]; cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ - "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J$PWD" + "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" "-DCMAKE_BUILD_TYPE=Release" ]; |