From 49a060ea1f15f91c9334c74cc819550617ba9024 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Sep 2017 07:25:16 +0000 Subject: [PATCH 1/2] envoy: mark as broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit building Extracting Bazel installation... Loading: Analyzing: target //source/exe:envoy-static ERROR: java.io.IOException: Could not read the crosstool configuration file 'CROSSTOOL file /tmp/nix-build-envoy-1.3.0.drv-0/envoy-v1.3.0-src/.home/.cache/bazel/_bazel_nixbld1/cbe181aaebf3d7253cbcf6057028e514/external/local_config_cc/CROSSTOOL', because of a parser error (945:1: Expected identifier. Found '%') INFO: Elapsed time: 3.065s FAILED: Build did NOT complete successfully builder for ‘/nix/store/09wh9hd81529pgr3ddwfw68higfzkfgr-envoy-1.3.0.drv’ failed with exit code 2 error: build of ‘/nix/store/09wh9hd81529pgr3ddwfw68higfzkfgr-envoy-1.3.0.drv’ failed --- pkgs/tools/networking/envoy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix index 83af542b8ad..a31e6ad004c 100644 --- a/pkgs/tools/networking/envoy/default.nix +++ b/pkgs/tools/networking/envoy/default.nix @@ -299,5 +299,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; + broken = true; }; } From 589574e5c91c477cc5303d3f86eff9f686dd7a3c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 17 Sep 2017 05:56:11 +0000 Subject: [PATCH 2/2] go: fix tests and impurity --- pkgs/development/compilers/go/1.9.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index c5d44af2b5b..11d28681abc 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -118,6 +118,15 @@ stdenv.mkDerivation rec { ./ssl-cert-file-1.9.patch ./creds-test.patch ./remove-test-pie-1.9.patch + + (fetchpatch { + url = "https://github.com/golang/go/commit/29415eb2b92e78481897c4161ba99f5b09fa6102.patch"; + sha256 = "01jkm4b2dazzjnfla7rdd0w2clzplga3zza6ybpmkjkk3i4bp73d"; + }) + (fetchpatch { + url = "https://github.com/golang/go/commit/27e80f7c4d8001598367e15a1617fa524bd0fb11.patch"; + sha256 = "1250nrc79jwcagkjqffn5srn78isykvjhvmqhwipwyqb99q85wcz"; + }) ]; postPatch = optionalString stdenv.isDarwin '' @@ -171,11 +180,11 @@ stdenv.mkDerivation rec { disallowedReferences = [ go_bootstrap ]; meta = with stdenv.lib; { - branch = "1.8"; + branch = "1.9"; homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan wkennington ]; + maintainers = with maintainers; [ cstrahan orivej wkennington ]; platforms = platforms.linux ++ platforms.darwin; }; }