3 files changed, 19 insertions, 16 deletions
diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix
new file mode 100644
index 000000000000..23ced868bd3e
--- /dev/null
+++ b/pkgs/development/tools/pup/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "pup-${version}";
+  version = "20160425-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "e76307d03d4d2e0f01fb7ab51dee09f2671c3db6";
+  
+  goPackagePath = "github.com/ericchiang/pup";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/ericchiang/pup";
+    sha256 = "15lwas4cjchlwhrwnd5l4gxcwqdfgazdyh466hava5qzxacqxrm5";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b9edee05fd6..b3f38640780e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1760,7 +1760,7 @@ in
 
   go-mtpfs = (callPackage ../tools/filesystems/go-mtpfs { }).bin;
 
-  go-pup = goPackages.pup.bin // { outputs = [ "bin" ]; };
+  go-pup = (callPackage ../development/tools/pup { }).bin;
 
   go-sct = goPackages.go-sct.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 52bb8df4cb41..39596bead4c4 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3987,21 +3987,6 @@ let
     buildInputs = [ ansicolor go-colorable ];
   };
 
-  pup = buildFromGitHub {
-    rev      = "9693b292601dd24dab3c04bc628f9ae3fa72f831";
-    owner    = "EricChiang";
-    repo     = "pup";
-    sha256   = "04j3fy1vk6xap8ad7k3c05h9b5mg2n1vy9vcyg9rs02cb13d3sy0";
-    propagatedBuildInputs = [ net ];
-    buildInputs = [ go-colorable color ];
-    postPatch = ''
-      grep -sr github.com/ericchiang/pup/Godeps/_workspace/src/ |
-        cut -f 1 -d : |
-        sort -u |
-        xargs -d '\n' sed -i -e s,github.com/ericchiang/pup/Godeps/_workspace/src/,,g
-    '';
-  };
-
   textsecure = buildFromGitHub rec {
     rev = "505e129c42fc4c5cb2d105520cef7c04fa3a6b64";
     owner = "janimo";