alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

gotools: Fix build and update to 2015-08-19

Browse source
This commit is contained in:
William A. Kennington III 2015-08-19 13:50:27 -07:00
parent 901482ad99
commit bf0da55a8c
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/go-modules/generic/default.nix
View file

@ -16,6 +16,10 @@
, dontRenameImports ? false , dontRenameImports ? false
# Do not enable this without good reason
# IE: programs coupled with the compiler
, allowGoReference ? false
, meta ? {}, ... } @ args': , meta ? {}, ... } @ args':
if disabled then throw "${name} not supported for go ${go.meta.branch}" else if disabled then throw "${name} not supported for go ${go.meta.branch}" else
@ -161,7 +165,8 @@ go.stdenv.mkDerivation (
runHook postInstall runHook postInstall
''; '';
disallowedReferences = [ go ] ++ lib.optional (!dontRenameImports) govers; disallowedReferences = lib.optional (!allowGoReference) go
++ lib.optional (!dontRenameImports) govers;
passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };

20
pkgs/top-level/go-packages.nix
View file

@ -117,9 +117,12 @@ let
goPackageAliases = [ "github.com/golang/text" ]; goPackageAliases = [ "github.com/golang/text" ];
}; };
tools = buildGoPackage rec { tools = buildFromGitHub {
rev = "7d75e8b219c3efda2d08ae38acd6b42f8da4f5f9"; rev = "93604a3dc2a5ae0168456c672ec35cc90ea881e6";
name = "tools-${stdenv.lib.strings.substring 0 7 rev}"; date = "2015-08-19";
owner = "golang";
repo = "tools";
sha256 = "1yd3hwsbsjrmx85nihss55wy91y8sld7p0599j5k9xi0n1mrxdci";
goPackagePath = "golang.org/x/tools"; goPackagePath = "golang.org/x/tools";
goPackageAliases = [ "code.google.com/p/go.tools" ]; goPackageAliases = [ "code.google.com/p/go.tools" ];
@ -135,14 +138,11 @@ let
excludedPackages = "testdata"; excludedPackages = "testdata";
src = fetchFromGitHub {
inherit rev;
owner = "golang";
repo = "tools";
sha256 = "0vq0l3pjhgsp97v6ndlr3jcs029r5zilwai30snwfq74s580sriq";
};
buildInputs = [ net ]; buildInputs = [ net ];
# Do not copy this without a good reason for enabling
# In this case tools is heavily coupled with go itself and embeds paths.
allowGoReference = true;
}; };
## THIRD PARTY ## THIRD PARTY