diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-27 00:59:44 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-27 01:02:00 -0700 |
| commit | 2c4186b0450e28e865b885729e19a5517b2511ec (patch) | |
| tree | a450dc393ea8ca712d193611dae9efdae304ea1f /pkgs/top-level/go-packages.nix | |
| parent | ab70c601b696ed0097afb231dc8dfa56e6c4ebcb (diff) | |
| download | nixpkgs-2c4186b0450e28e865b885729e19a5517b2511ec.tar nixpkgs-2c4186b0450e28e865b885729e19a5517b2511ec.tar.gz nixpkgs-2c4186b0450e28e865b885729e19a5517b2511ec.tar.bz2 nixpkgs-2c4186b0450e28e865b885729e19a5517b2511ec.tar.lz nixpkgs-2c4186b0450e28e865b885729e19a5517b2511ec.tar.xz nixpkgs-2c4186b0450e28e865b885729e19a5517b2511ec.tar.zst nixpkgs-2c4186b0450e28e865b885729e19a5517b2511ec.zip | |
Fix go-tools to include cover/vet for 1.4 but not 1.5 onward
Diffstat (limited to 'pkgs/top-level/go-packages.nix')
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 70a8c1770d1..cb7feb8cbf9 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -118,11 +118,11 @@ let }; tools = buildFromGitHub { - rev = "93604a3dc2a5ae0168456c672ec35cc90ea881e6"; - date = "2015-08-19"; + rev = "b48dc8da98ae78c3d11f220e7d327304c84e623a"; + date = "2015-08-24"; owner = "golang"; repo = "tools"; - sha256 = "1yd3hwsbsjrmx85nihss55wy91y8sld7p0599j5k9xi0n1mrxdci"; + sha256 = "187p3jjxrw2qjnzqwwrq7f9w10zh6vcnwnfl3q7ms8rbiffpjy5c"; goPackagePath = "golang.org/x/tools"; goPackageAliases = [ "code.google.com/p/go.tools" ]; @@ -136,7 +136,9 @@ let 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 ]; |