From 019dc065ee5874eee1ef8f23f5236022843fd8c8 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Thu, 23 Apr 2020 08:11:06 +0100 Subject: gometalinter: remove gometalinter development has stopped. golangci-lint is the replacement --- pkgs/development/tools/gometalinter/default.nix | 70 ------------------------- pkgs/misc/vim-plugins/overrides.nix | 4 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 3 insertions(+), 74 deletions(-) delete mode 100644 pkgs/development/tools/gometalinter/default.nix diff --git a/pkgs/development/tools/gometalinter/default.nix b/pkgs/development/tools/gometalinter/default.nix deleted file mode 100644 index 1cd83e443aa0..000000000000 --- a/pkgs/development/tools/gometalinter/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index ef27712b5681..66e956a0f16e 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -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 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9ad282149aa6..a115a70d44a9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c3b2cc0a11c..02352346e47d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8599,8 +8599,6 @@ in gogetdoc = callPackage ../development/tools/gogetdoc { }; - gometalinter = callPackage ../development/tools/gometalinter { }; - gox = callPackage ../development/tools/gox { }; gprolog = callPackage ../development/compilers/gprolog { }; -- cgit 1.4.1