diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-14 23:59:31 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-14 23:59:31 +0000 |
commit | 388bd5ecef704d7aa423878e28cf46820ba42aaa (patch) | |
tree | f56964e1b059a3400259b2a6c9274f0bd58e5648 /nixpkgs/pkgs/development/compilers | |
parent | a5e4eba0a2066e541c1e81938655cbf62067804e (diff) | |
parent | 100012e55bc2a82fc680cba31a426ad38ead6fab (diff) | |
download | nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.gz nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.bz2 nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.lz nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.xz nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.zst nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.zip |
Merge commit '100012e55bc2a82fc680cba31a426ad38ead6fab'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers')
5 files changed, 39 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/compilers/go/1.12.nix b/nixpkgs/pkgs/development/compilers/go/1.12.nix index b3b66fde2a15..0a684a3a49e0 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.12.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.12.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.12.10"; + version = "1.12.15"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0m1rvawvpdl7kd0asw10m50xbxlhykix6dng9p4x6ih6x3y4hvpm"; + sha256 = "1hw4xjywcl883dnvfbb92w85sy8n231fdri4aynj8xajgr0p9fla"; }; # perl is used for testing go vet @@ -141,8 +141,11 @@ stdenv.mkDerivation rec { ./go-1.9-skip-flaky-20072.patch ./skip-external-network-tests.patch ./skip-nohup-tests.patch + ] ++ [ # breaks under load: https://github.com/golang/go/issues/25628 - ./skip-test-extra-files-on-386.patch + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32.patch + else ./skip-test-extra-files-on-386.patch) ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/compilers/go/1.13.nix b/nixpkgs/pkgs/development/compilers/go/1.13.nix index 6b7c99c07436..f9723728caa8 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.13.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.5"; + version = "1.13.6"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1zr6lravlmyld57nnymkcr092pys4pr8qy0ans1rj3dkl3i5dlr7"; + sha256 = "03220q6n4wlpmz6zz3mw48kl3pjxia6pxdvf03wbqh6w9favxrda"; }; # perl is used for testing go vet @@ -138,8 +138,11 @@ stdenv.mkDerivation rec { ./go-1.9-skip-flaky-20072.patch ./skip-external-network-tests.patch ./skip-nohup-tests.patch + ] ++ [ # breaks under load: https://github.com/golang/go/issues/25628 - ./skip-test-extra-files-on-386.patch + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32.patch + else ./skip-test-extra-files-on-386.patch) ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32.patch b/nixpkgs/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32.patch new file mode 100644 index 000000000000..f3566b3ddaa2 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32.patch @@ -0,0 +1,15 @@ +diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go +index 558345ff63..22129bf022 100644 +--- a/src/os/exec/exec_test.go ++++ b/src/os/exec/exec_test.go +@@ -593,6 +593,10 @@ func TestExtraFiles(t *testing.T) { + t.Skipf("skipping test on %q", runtime.GOOS) + } + ++ if runtime.GOOS == "linux" && runtime.GOARCH == "arm" { ++ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS) ++ } ++ + // Ensure that file descriptors have not already been leaked into + // our environment. + if !testedAlreadyLeaked { diff --git a/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix b/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix index a365761b014f..0070bc23f73e 100644 --- a/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/compilers/ldc/default.nix b/nixpkgs/pkgs/development/compilers/ldc/default.nix index fff6435b29ea..c397d02038da 100644 --- a/nixpkgs/pkgs/development/compilers/ldc/default.nix +++ b/nixpkgs/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" ]; |