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

Merge pull request #46752 from rvolosatovs/feature/gotools

Browse Source 
Gotools etc. update, remove goimports
This commit is contained in:
Jörg Thalheim 2018-09-20 08:16:43 +01:00 committed by GitHub
commit 3388263e82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/go2nix/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, go-bindata, goimports, nix-prefetch-git, git, makeWrapper, { stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper,
fetchFromGitHub }: fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
@ -19,7 +19,7 @@ buildGoPackage rec {
outputs = [ "bin" "out" "man" ]; outputs = [ "bin" "out" "man" ];
buildInputs = [ go-bindata goimports makeWrapper ]; buildInputs = [ go-bindata gotools makeWrapper ];
preBuild = ''go generate ./...''; preBuild = ''go generate ./...'';
postInstall = '' postInstall = ''

8
pkgs/development/tools/godef/default.nix
View File

@ -2,8 +2,8 @@
buildGoPackage rec { buildGoPackage rec {
name = "godef-${version}"; name = "godef-${version}";
version = "20170920-${stdenv.lib.strings.substring 0 7 rev}"; version = "1.0.0";
rev = "b692db1de5229d4248e23c41736b431eb665615d"; rev = "7b4626be9fa8081987905fd4719d2f6628f9d8b5";
goPackagePath = "github.com/rogpeppe/godef"; goPackagePath = "github.com/rogpeppe/godef";
excludedPackages = "go/printer/testdata"; excludedPackages = "go/printer/testdata";
@ -11,13 +11,13 @@ buildGoPackage rec {
src = fetchgit { src = fetchgit {
inherit rev; inherit rev;
url = "https://github.com/rogpeppe/godef"; url = "https://github.com/rogpeppe/godef";
sha256 = "0xqp9smfyznm8v2iy4wyy3kd24mga12fx0y0896qimac4hj2al15"; sha256 = "0zhw4ba19hy0kv74c58ax759h8721khmwj04fak2y5800ymsgndg";
}; };
meta = { meta = {
description = "Print where symbols are defined in Go source code"; description = "Print where symbols are defined in Go source code";
homepage = https://github.com/rogpeppe/godef/; homepage = https://github.com/rogpeppe/godef/;
maintainers = with stdenv.lib.maintainers; [ vdemeester ]; maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ];
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}; };
} }

16
pkgs/development/tools/goimports/default.nix
View File

@ -1,16 +0,0 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
name = "goimports-${version}";
version = "20160519-${stdenv.lib.strings.substring 0 7 rev}";
rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
goPackagePath = "golang.org/x/tools";
subPackages = [ "cmd/goimports" ];
src = fetchgit {
inherit rev;
url = "https://go.googlesource.com/tools";
sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
};
}

6
pkgs/development/tools/gotools/default.nix
View File

@ -2,8 +2,8 @@
buildGoPackage rec { buildGoPackage rec {
name = "gotools-unstable-${version}"; name = "gotools-unstable-${version}";
version = "2018-07-20"; version = "2018-09-11";
rev = "be728107ea8275e6f58ba07e246b94181acaab24"; rev = "677d2ff680c188ddb7dcd2bfa6bc7d3f2f2f75b2";
goPackagePath = "golang.org/x/tools"; goPackagePath = "golang.org/x/tools";
goPackageAliases = [ "code.google.com/p/go.tools" ]; goPackageAliases = [ "code.google.com/p/go.tools" ];
@ -11,7 +11,7 @@ buildGoPackage rec {
src = fetchgit { src = fetchgit {
inherit rev; inherit rev;
url = "https://go.googlesource.com/tools"; url = "https://go.googlesource.com/tools";
sha256 = "1vkc87qcnfybfcgq9kbwbwzvvzrwm6ar25q5i8z3q26b8dpaxmlw"; sha256 = "0vp1w1haqcjd82dxd6x9xrllbfwvm957rxwkpji96cgvhsli2bq5";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;

1
pkgs/top-level/aliases.nix
View File

@ -106,6 +106,7 @@ mapAliases ({
gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
gnustep-make = gnustep.make; # added 2016-7-6 gnustep-make = gnustep.make; # added 2016-7-6
go-pup = pup; # added 2017-12-19 go-pup = pup; # added 2017-12-19
goimports = gotools; # added 2018-09-16
googleAuthenticator = google-authenticator; # added 2016-10-16 googleAuthenticator = google-authenticator; # added 2016-10-16
grantlee5 = libsForQt5.grantlee; # added 2015-12-19 grantlee5 = libsForQt5.grantlee; # added 2015-12-19
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25

2
pkgs/top-level/all-packages.nix
View File

@ -14506,8 +14506,6 @@ with pkgs;
godef = callPackage ../development/tools/godef { }; godef = callPackage ../development/tools/godef { };
goimports = callPackage ../development/tools/goimports { };
gopkgs = callPackage ../development/tools/gopkgs { }; gopkgs = callPackage ../development/tools/gopkgs { };
govers = callPackage ../development/tools/govers { }; govers = callPackage ../development/tools/govers { };