diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-09-14 20:54:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 20:54:40 +0200 |
| commit | 4d25b23d26aec03e6d04460a18affa70f49ce2b8 (patch) | |
| tree | 88e4a30bb4ec823f9956653a13cb2e573dcd8e58 /pkgs/development/compilers | |
| parent | 3ed019123edf43a3472fecbd675e1c56dbf77b9d (diff) | |
| parent | 272c59a75bb6aefc24775c3b8867e432248a439b (diff) | |
| download | nixlib-4d25b23d26aec03e6d04460a18affa70f49ce2b8.tar nixlib-4d25b23d26aec03e6d04460a18affa70f49ce2b8.tar.gz nixlib-4d25b23d26aec03e6d04460a18affa70f49ce2b8.tar.bz2 nixlib-4d25b23d26aec03e6d04460a18affa70f49ce2b8.tar.lz nixlib-4d25b23d26aec03e6d04460a18affa70f49ce2b8.tar.xz nixlib-4d25b23d26aec03e6d04460a18affa70f49ce2b8.tar.zst nixlib-4d25b23d26aec03e6d04460a18affa70f49ce2b8.zip | |
Merge pull request #18516 from offlinehacker/pkgs/go/1.7.1
go_1_7: 1.7 -> 1.7.1
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/go/1.7.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/remove-tools-1.7.patch | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index bc298924eb86..d623d800bd79 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "03wc4r5pgxrlh3lp8l0hb1bhsrwv4hfq1fcj8n82bfk3hvj43am2"; + sha256 = "121cvpjpbyl3lyd6j5lnnq6pr8vl7ar5zvap1132c522lxgxw356"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/remove-tools-1.7.patch b/pkgs/development/compilers/go/remove-tools-1.7.patch index b2e380f34fc5..b53e48e1a515 100644 --- a/pkgs/development/compilers/go/remove-tools-1.7.patch +++ b/pkgs/development/compilers/go/remove-tools-1.7.patch @@ -1,8 +1,8 @@ diff --git a/src/go/build/build.go b/src/go/build/build.go -index 496fe11..8c81dbd 100644 +index 9706b8b..f250751 100644 --- a/src/go/build/build.go +++ b/src/go/build/build.go -@@ -1388,7 +1388,7 @@ func init() { +@@ -1513,7 +1513,7 @@ func init() { } // ToolDir is the directory containing build tools. @@ -12,11 +12,11 @@ index 496fe11..8c81dbd 100644 // IsLocalImport reports whether the import path is // a local import path, like ".", "..", "./foo", or "../foo". diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index d346362..fb22b6e 100644 +index 441dcd9..a50277e 100644 --- a/src/runtime/extern.go +++ b/src/runtime/extern.go -@@ -194,6 +194,17 @@ func GOROOT() string { - return defaultGoroot +@@ -230,6 +230,17 @@ func GOROOT() string { + return sys.DefaultGoroot } +// GOTOOLDIR returns the root of the Go tree. |