Port golint to buildGoPackage

2 files changed, 13 insertions, 43 deletions

diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index 83dd50f8d4c..382e67ed74c 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -1,23 +1,20 @@
-{ stdenv, lib, go_1_3, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
-  name = "golint";
+with goPackages;
 
-  src = import ./deps.nix {
-    inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
-  };
-
-  buildInputs = [ go_1_3 ];
+buildGoPackage rec {
+  rev = "8ca23475bcb43213a55dd8210b69363f6b0e09c1";
+  name = "golint-${lib.strings.substring 0 7 rev}";
+  goPackagePath = "github.com/golang/lint";
 
-  buildPhase = ''
-    export GOPATH=$src
-    go build -v -o lint github.com/golang/lint/golint
-  '';
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "golang";
+    repo = "lint";
+    sha256 = "16wbykik6dw3x9s7iqi4ln8kvzsh3g621wb8mk4nfldw7lyqp3cs";
+  };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    mv lint $out/bin/golint
-  '';
+  subPackages = [ "golint" ];
 
   meta = with lib; {
     description = "Linter for Go source code";
diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix
deleted file mode 100644
index 47b8ade2298..00000000000
--- a/pkgs/development/tools/golint/deps.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
-
-let
-  goDeps = [
-    {
-      root = "github.com/golang/lint";
-      src = fetchFromGitHub {
-        owner = "golang";
-        repo = "lint";
-        rev = "8ca23475bcb43213a55dd8210b69363f6b0e09c1";
-        sha256 = "16wbykik6dw3x9s7iqi4ln8kvzsh3g621wb8mk4nfldw7lyqp3cs";
-      };
-    }
-  ];
-
-in
-
-stdenv.mkDerivation rec {
-  name = "go-deps";
-
-  buildCommand =
-    lib.concatStrings
-      (map (dep: ''
-              mkdir -p $out/src/`dirname ${dep.root}`
-              ln -s ${dep.src} $out/src/${dep.root}
-            '') goDeps);
-}