summary refs log tree commit diff
path: root/pkgs/development/compilers/go
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-09-17 05:56:11 +0000
committerOrivej Desh <orivej@gmx.fr>2017-09-28 10:21:17 +0000
commit589574e5c91c477cc5303d3f86eff9f686dd7a3c (patch)
treec6237a1395c48baf1edd946ae61e6f63f32af94d /pkgs/development/compilers/go
parent49a060ea1f15f91c9334c74cc819550617ba9024 (diff)
downloadnixlib-589574e5c91c477cc5303d3f86eff9f686dd7a3c.tar
nixlib-589574e5c91c477cc5303d3f86eff9f686dd7a3c.tar.gz
nixlib-589574e5c91c477cc5303d3f86eff9f686dd7a3c.tar.bz2
nixlib-589574e5c91c477cc5303d3f86eff9f686dd7a3c.tar.lz
nixlib-589574e5c91c477cc5303d3f86eff9f686dd7a3c.tar.xz
nixlib-589574e5c91c477cc5303d3f86eff9f686dd7a3c.tar.zst
nixlib-589574e5c91c477cc5303d3f86eff9f686dd7a3c.zip
go: fix tests and impurity
Diffstat (limited to 'pkgs/development/compilers/go')
-rw-r--r--pkgs/development/compilers/go/1.9.nix13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index c5d44af2b5ba..11d28681abcd 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;
   };
 }