From fc88548b5d792c3ba4ac0cd2a127cdae52db0420 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 16:41:51 +0200
Subject: go2nix: extracted from goPackages

---
 pkgs/top-level/all-packages.nix |  2 +-
 pkgs/top-level/go-packages.nix  | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

(limited to 'pkgs/top-level')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 891472ae4c90..41a2534b4e67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9628,7 +9628,7 @@ in
 
   goPackages = go16Packages;
 
-  go2nix = goPackages.go2nix.bin // { outputs = [ "bin" ]; };
+  go2nix = callPackage ../development/tools/go2nix { };
 
   ### DEVELOPMENT / LISP MODULES
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3602c68d908f..521452b55064 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3241,25 +3241,6 @@ let
     goPackageAliases = [ "gopkg.in/alecthomas/kingpin.v2" ];
   };
 
-  go2nix = buildFromGitHub rec {
-    rev = "4c552dadd855e3694ed3499feb46dca9cd855f60";
-    owner = "kamilchm";
-    repo = "go2nix";
-    sha256 = "1pwnm1vrjxvgl17pk9n1k5chmhgwxkrwp2s1bzi64xf12anibj63";
-
-    buildInputs = [ pkgs.makeWrapper go-bindata.bin tools.bin vcs go-spew gls go-difflib assertions goconvey testify kingpin ];
-
-    preBuild = ''go generate ./...'';
-
-    postInstall = ''
-      wrapProgram $bin/bin/go2nix \
-        --prefix PATH : ${pkgs.nix-prefetch-git}/bin \
-        --prefix PATH : ${pkgs.git}/bin
-    '';
-
-    allowGoReference = true;
-  };
-
   godotenv = buildFromGitHub rec {
     rev    = "4ed13390c0acd2ff4e371e64d8b97c8954138243";
     version = "2015-09-07";
-- 
cgit 1.4.1