ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85868 from Mic92/go-tooling

Browse Source
This commit is contained in:
Jörg Thalheim 2020-04-24 12:22:58 +01:00 committed by GitHub
commit 2bba291913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 98 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,8 +2,8 @@
buildGoPackage rec {
pname = "gocode-unstable";
version = "2018-11-05";
rev = "0af7a86943a6e0237c90f8aeb74a882e1862c898";
version = "2020-04-06";
rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c";
goPackagePath = "github.com/mdempsky/gocode";
excludedPackages = ''internal/suggest/testdata'';
@ -18,7 +18,7 @@ buildGoPackage rec {
owner = "mdempsky";
repo = "gocode";
sha256 = "0fxqn0v6dbwarn444lc1xrx5vfkcidi73f4ba7l4clsb9qdqgyam";
sha256 = "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb";
};
goDeps = ./deps.nix;

5
pkgs/development/tools/gocode/deps.nix generated
View File

@ -1,11 +1,12 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "78dc5bac0cacea7969e98b79c3b86597e0aa4e25";
sha256 = "16jg2x1sfm39kz4rchn0gxyq99fnkxw6v51wxriqbs76a2wrznp9";
rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a";
sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf";
};
}
]

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

@ -1,18 +1,20 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "godef";
version = "1.1.1";
version = "1.1.2";
rev = "v${version}";
goPackagePath = "github.com/rogpeppe/godef";
subPackages = [ "." ];
modSha256 = "06mi8f2qs54gk2anxqcf70h96s63a99xhnlm294djyv37wy1yffi";
src = fetchFromGitHub {
inherit rev;
owner = "rogpeppe";
repo = "godef";
sha256 = "1bpzqnb9fsk1pjjap3gm94pqch1jz02rfah9hg8iqbfm0dzpy31b";
sha256 = "0rhhg73kzai6qzhw31yxw3nhpsijn849qai2v9am955svmnckvf4";
};
meta = {

12
pkgs/development/tools/gogetdoc/default.nix
View File

@ -1,12 +1,14 @@
{ buildGoPackage
{ buildGoModule
, lib
, fetchFromGitHub
}:
buildGoPackage rec {
buildGoModule rec {
pname = "gogetdoc-unstable";
version = "2018-10-25";
rev = "9098cf5fc236a5e25060730544af2ba6d65cd968";
version = "2019-02-28";
rev = "b37376c5da6aeb900611837098f40f81972e63e4";
modSha256 = "0j6a2b8hx54cnjz1ya65v9czg9ygqj6zwg52ffpz7cqkx0pgl9q4";
goPackagePath = "github.com/zmb3/gogetdoc";
excludedPackages = "\\(testdata\\)";
@ -16,7 +18,7 @@ buildGoPackage rec {
owner = "zmb3";
repo = "gogetdoc";
sha256 = "159dgkd2lz07kimbpzminli5p539l4ry0dr93r46iz3lk5q76znl";
sha256 = "1v74zd0x2xh10603p8raazssacv3y0x0lr9apkpsdk0bfp5jj0lr";
};
goDeps = ./deps.nix;

70
pkgs/development/tools/gometalinter/default.nix
View File

@ -1,70 +0,0 @@
{ buildGoPackage
, deadcode
, errcheck
, fetchFromGitHub
, go
, go-check
, go-tools
, goconst
, gocyclo
, golint
, gosec
, gotools
, ineffassign
, maligned
, interfacer
, lib
, makeWrapper
, unconvert
}:
with lib;
let
runtimeDeps = [
deadcode
errcheck
go
go-check
go-tools
goconst
gocyclo
golint
gosec
gotools
ineffassign
interfacer
maligned
unconvert
];
in buildGoPackage rec {
pname = "gometalinter";
version = "3.0.0";
goPackagePath = "github.com/alecthomas/gometalinter";
excludedPackages = "\\(regressiontests\\)";
src = fetchFromGitHub {
owner = "alecthomas";
repo = "gometalinter";
rev = "v${version}";
sha256 = "06dd60531qp0hxfwnxnyi36d6div1j781jvcb99ykhgrg0kwmzq9";
};
postInstall = ''
wrapProgram $bin/bin/gometalinter --prefix PATH : "${makeBinPath runtimeDeps}"
'';
buildInputs = [ makeWrapper ];
allowGoReference = true;
meta = with lib; {
description = "Concurrently run Go lint tools and normalise their output";
homepage = "https://github.com/alecthomas/gometalinter";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit rvolosatovs ];
platforms = platforms.linux ++ platforms.darwin;
};
}

15
pkgs/development/tools/gomodifytags/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
pname = "gomodifytags-unstable";
version = "2018-09-14";
rev = "141225bf62b6e5c9c0c9554a2e993e8c30aebb1d";
buildGoModule rec {
pname = "gomodifytags";
version = "1.4.0";
modSha256 = "0nkdk2zgnwsg9lv20vqk2lshk4g9fqwqxd5bpr78nlahb9xk486s";
goPackagePath = "github.com/fatih/gomodifytags";
src = fetchFromGitHub {
inherit rev;
owner = "fatih";
repo = "gomodifytags";
sha256 = "16qbp594l90qpvf388wlv0kf6wvqj1vz2mqq0g3qcz6dkrc4cjqa";
rev = "v${version}";
sha256 = "1436wjqs6n2jxlyzx38nm4ih6fr11bybivg3wy5nvzfs6cs59q63";
};
meta = {

13
pkgs/development/tools/gopkgs/default.nix
View File

@ -1,19 +1,22 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "gopkgs";
version = "2.0.1";
version = "2.1.2";
goPackagePath = "github.com/uudashr/gopkgs";
goDeps = ./deps.nix;
subPackages = [ "cmd/gopkgs" ];
src = fetchFromGitHub {
rev = "v${version}";
owner = "uudashr";
repo = "gopkgs";
sha256 = "03zfwkmzwx2knkghky3irb2r78lbc1ccszjcg9y445b4pbqkn6w4";
sha256 = "1jak1bg6k5iasscw68ra875k59k3iqhka2ykabsd427k1j3mypln";
};
modSha256 = "0v9lg5kq3776b2s4kgyi19jy8shjqrr0f5ljrchsj1k7867sxiw7";
meta = {
description = "Tool to get list available Go packages.";
homepage = "https://github.com/uudashr/gopkgs";

23
pkgs/development/tools/gopls/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, go, buildGoModule, fetchgit }:
buildGoModule rec {
pname = "gopls";
version = "0.4.0";
rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a";
src = fetchgit {
rev = "gopls/v${version}";
url = "https://go.googlesource.com/tools";
sha256 = "1sn6f638hgqpyd8rfyal3y6i6p21x4340jnhsvmgcd8lph49pplb";
};
modRoot = "gopls";
modSha256 = "1p0g28i707xyxz1g6hb56qlc4km9ik7vjky0v80hw7n73vzs5mr9";
meta = with stdenv.lib; {
description = "Official language server for the Go language";
homepage = "https://github.com/golang/tools/tree/master/gopls";
license = licenses.bsd3;
maintainers = with maintainers; [ mic92 ];
};
}

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gotools-unstable";
version = "2019-11-14";
rev = "4191b8cbba092238a318a71cdff48b20b4e1e5d8";
version = "2020-04-21";
rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a";
src = fetchgit {
inherit rev;
url = "https://go.googlesource.com/tools";
sha256 = "16m62m303j4wqfjr1401xpqpb9m11bs6qc2dhf6x2za2d9pycish";
sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf";
};
# Build of golang.org/x/tools/gopls fails with:
@ -21,7 +21,7 @@ buildGoModule rec {
rm -rf gopls
'';
modSha256 = "16cfzmfr9jv8wz0whl433xdm614dk63fzjxv6l1xvkagjmki49iy";
modSha256 = "1pijbkp7a9n2naicg21ydii6xc0g4jm5bw42lljwaks7211ag8k9";
postConfigure = ''
# Make the builtin tools available here

7
pkgs/development/tools/impl/default.nix
View File

@ -5,17 +5,16 @@
buildGoPackage rec {
pname = "impl-unstable";
version = "2018-02-27";
rev = "3d0f908298c49598b6aa84f101c69670e15d1d03";
version = "2019-11-19";
rev = "6b9658ad00c7fbd61a7b50c195754413f6c4142c";
goPackagePath = "github.com/josharian/impl";
src = fetchFromGitHub {
inherit rev;
owner = "josharian";
repo = "impl";
sha256 = "0xpip20x5vclrl0by1760lg73v6lj6nmkbiazlskyvpkw44h8a7c";
sha256 = "1d4fvj7fgiykznx1z4fmcc06x5hsqp9wn62m5qm1ds8m0rjqaxwi";
};
goDeps = ./deps.nix;

23
pkgs/development/tools/impl/deps.nix generated
View File

@ -1,11 +1,30 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "golang.org/x/mod";
fetch = {
type = "git";
url = "https://go.googlesource.com/mod";
rev = "2addee1ccfb22349ab47953a3046338e461eb4d1";
sha256 = "1r0drcji290nlq9czibcfynpwxyqx8a5p4b7lam6wblbh2lasfb6";
};
}
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "96e9e165b75e735822645eff82850b08c377be36";
sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg";
rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a";
sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf";
};
}
{
goPackagePath = "golang.org/x/xerrors";
fetch = {
type = "git";
url = "https://go.googlesource.com/xerrors";
rev = "9bdfabe68543c54f90421aeb9a60ef8061b5b544";
sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c";
};
}
]

12
pkgs/development/tools/reftools/default.nix
View File

@ -1,12 +1,14 @@
{ buildGoPackage
{ buildGoModule
, lib
, fetchFromGitHub
}:
buildGoPackage rec {
buildGoModule rec {
pname = "reftools-unstable";
version = "2018-09-14";
rev = "654d0ba4f96d62286ca33cd46f7674b84f76d399";
version = "2019-12-21";
rev = "65925cf013156409e591f7a1be4df96f640d02f4";
modSha256 = "1sihahgkcj018ixbnz58npfh4drhqip2xmc9p7lq3an8japb9nyx";
goPackagePath = "github.com/davidrjenni/reftools";
excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)";
@ -16,7 +18,7 @@ buildGoPackage rec {
owner = "davidrjenni";
repo = "reftools";
sha256 = "12y2h1h15xadc8pa3xsj11hpdxz5dss6k7xaa4h1ifkvnasjp5w2";
sha256 = "18jg13skqi2v2vh2k6jvazv6ymhhybangjd23xn2asfk9g6cvnjs";
};
meta = with lib; {

4
pkgs/misc/vim-plugins/overrides.nix
View File

@ -22,7 +22,7 @@
# vim-go dependencies
, asmfmt, delve, errcheck, godef, golint
, gomodifytags, gotags, gotools, go-motion
, gnused, reftools, gogetdoc, gometalinter
, gnused, reftools, gogetdoc, golangci-lint
, impl, iferr, gocode, gocode-gomod, go-tools
# direnv-vim dependencies
@ -550,7 +550,7 @@ self: super: {
godef
gogetdoc
golint
gometalinter
golangci-lint
gomodifytags
gotags
gotools

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

@ -169,6 +169,7 @@ mapAliases ({
go-pup = pup; # added 2017-12-19
gobjectIntrospection = gobject-introspection; # added 2018-12-02
goimports = gotools; # added 2018-09-16
gometalinter = throw "Abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23
google-gflags = gflags; # added 2019-07-25
googleAuthenticator = google-authenticator; # added 2016-10-16
grantlee5 = libsForQt5.grantlee; # added 2015-12-19

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

@ -8605,8 +8605,6 @@ in
gogetdoc = callPackage ../development/tools/gogetdoc { };
gometalinter = callPackage ../development/tools/gometalinter { };
gox = callPackage ../development/tools/gox { };
gprolog = callPackage ../development/compilers/gprolog { };
@ -17271,6 +17269,8 @@ in
go-langserver = callPackage ../development/tools/go-langserver { };
gopls = callPackage ../development/tools/gopls { };
gotests = callPackage ../development/tools/gotests { };
gotestsum = callPackage ../development/tools/gotestsum {