3 files changed, 12 insertions, 29 deletions
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
deleted file mode 100644
index 7be4f84680af..000000000000
--- a/pkgs/development/tools/golint/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "8ca23475bcb43213a55dd8210b69363f6b0e09c1";
-  name = "golint-${lib.strings.substring 0 7 rev}";
-  goPackagePath = "github.com/golang/lint";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "golang";
-    repo = "lint";
-    sha256 = "16wbykik6dw3x9s7iqi4ln8kvzsh3g621wb8mk4nfldw7lyqp3cs";
-  };
-
-  subPackages = [ "golint" ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Linter for Go source code";
-    homepage = https://github.com/golang/lint;
-    license = licenses.mit;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95dd3cadd1a5..7064ad1855f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10043,7 +10043,7 @@ let
 
   gotags = callPackage ../development/tools/gotags { };
 
-  golint = callPackage ../development/tools/golint { goPackages = go13Packages; };
+  golint = goPackages.lint;
 
   godep = callPackage ../development/tools/godep { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 826aa90e8d16..231d2c812726 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1298,6 +1298,17 @@ let
     sha256 = "0v6g14ygnjl1l2fykyfjyvnab82a70jy0zzmsn5swlyy45b9gq2d";
   };
 
+  lint = buildFromGitHub {
+    rev = "7b7f4364ff76043e6c3610281525fabc0d90f0e4";
+    date = "2015-06-23";
+    owner = "golang";
+    repo = "lint";
+    sha256 = "1bj7zv534hyh87bp2vsbhp94qijc5nixb06li1dzfz9n0wcmlqw9";
+    excludedPackages = "testdata";
+    dontInstallSrc = true;
+    buildInputs = [ tools ];
+  };
+
   goquery = buildGoPackage rec {
     rev = "f065786d418c9d22a33cad33decd59277af31471"; #tag v.0.3.2
     name = "goquery-${stdenv.lib.strings.substring 0 7 rev}";