public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix go-tools to include cover/vet for 1.4 but not 1.5 onward

Browse Source
This commit is contained in:
William A. Kennington III 2015-08-27 00:59:44 -07:00
parent ab70c601b6
commit 2c4186b045
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/compilers/go/remove-tools-1.5.patch
View File

@ -1,22 +1,10 @@
diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
index 61e3d8d..f8475f4 100644 index 61e3d8d..b8422ad 100644
--- a/src/cmd/go/pkg.go --- a/src/cmd/go/pkg.go
+++ b/src/cmd/go/pkg.go +++ b/src/cmd/go/pkg.go
@@ -665,7 +665,7 @@ var goTools = map[string]targetDir{ @@ -678,7 +678,7 @@ var goTools = map[string]targetDir{
"cmd/asm": toTool,
"cmd/compile": toTool,
"cmd/cgo": toTool,
- "cmd/cover": toTool,
+ "nixos.org/x/tools/cmd/cover": toTool,
"cmd/dist": toTool,
"cmd/doc": toTool,
"cmd/fix": toTool,
@@ -676,9 +676,9 @@ var goTools = map[string]targetDir{
"cmd/pack": toTool,
"cmd/pprof": toTool,
"cmd/trace": toTool, "cmd/trace": toTool,
- "cmd/vet": toTool, "cmd/vet": toTool,
+ "nixos.org/x/tools/cmd/vet": toTool,
"cmd/yacc": toTool, "cmd/yacc": toTool,
- "golang.org/x/tools/cmd/godoc": toBin, - "golang.org/x/tools/cmd/godoc": toBin,
+ "nixos.org/x/tools/cmd/godoc": toBin, + "nixos.org/x/tools/cmd/godoc": toBin,

10
pkgs/top-level/go-packages.nix
View File

@ -118,11 +118,11 @@ let
}; };
tools = buildFromGitHub { tools = buildFromGitHub {
rev = "93604a3dc2a5ae0168456c672ec35cc90ea881e6"; rev = "b48dc8da98ae78c3d11f220e7d327304c84e623a";
date = "2015-08-19"; date = "2015-08-24";
owner = "golang"; owner = "golang";
repo = "tools"; repo = "tools";
sha256 = "1yd3hwsbsjrmx85nihss55wy91y8sld7p0599j5k9xi0n1mrxdci"; sha256 = "187p3jjxrw2qjnzqwwrq7f9w10zh6vcnwnfl3q7ms8rbiffpjy5c";
goPackagePath = "golang.org/x/tools"; goPackagePath = "golang.org/x/tools";
goPackageAliases = [ "code.google.com/p/go.tools" ]; goPackageAliases = [ "code.google.com/p/go.tools" ];
@ -136,7 +136,9 @@ let
export GOTOOLDIR=$out/bin export GOTOOLDIR=$out/bin
''; '';
excludedPackages = "testdata"; excludedPackages = "\\("
+ stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ])
+ "\\)";
buildInputs = [ net ]; buildInputs = [ net ];