go-mtpfs: extracted from goPackages

5 files changed, 51 insertions, 22 deletions

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 964875cc3f7..497487f5d1e 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -124,5 +124,14 @@
       "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8",
       "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"
     }
+  },
+  {
+    "goPackagePath": "github.com/hanwen/go-fuse",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hanwen/go-fuse",
+      "rev": "bd746dd8bcc8c059a9d953a786a6156eb83f398e",
+      "sha256": "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
new file mode 100644
index 00000000000..55be2dd9e73
--- /dev/null
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -0,0 +1,23 @@
+# This file was generated by go2nix.
+{ stdenv, lib, pkgconfig, libusb1, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "go-mtpfs-${version}";
+  version = "20150917-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "bc7c0f716e3b4ed5610069a55fc00828ebba890b";
+
+  goPackagePath = "github.com/hanwen/go-mtpfs";
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libusb1 ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/hanwen/go-mtpfs";
+    sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.json b/pkgs/tools/filesystems/go-mtpfs/deps.json
new file mode 100644
index 00000000000..cc2ce33ac30
--- /dev/null
+++ b/pkgs/tools/filesystems/go-mtpfs/deps.json
@@ -0,0 +1,17 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/hanwen/go-fuse"
+    ]
+  },
+  {
+    "goPackagePath": "github.com/hanwen/usb",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hanwen/usb",
+      "rev": "69aee4530ac705cec7c5344418d982aaf15cf0b1",
+      "sha256": "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"
+    }
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0c02f58a5a..7b9edee05fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1758,7 +1758,7 @@ in
 
   goaccess = callPackage ../tools/misc/goaccess { };
 
-  go-mtpfs = goPackages.mtpfs.bin // { outputs = [ "bin" ]; };
+  go-mtpfs = (callPackage ../tools/filesystems/go-mtpfs { }).bin;
 
   go-pup = goPackages.pup.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index dfc21301c05..52bb8df4cb4 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2536,15 +2536,6 @@ let
     };
   };
 
-  mtpfs = buildFromGitHub {
-    rev = "bc7c0f716e3b4ed5610069a55fc00828ebba890b";
-    date = "2015-09-17";
-    owner = "hanwen";
-    repo = "go-mtpfs";
-    sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm";
-    buildInputs = [ go-fuse usb ];
-  };
-
   mux = buildFromGitHub {
     rev = "5a8a0400500543e28b2886a8c52d21a435815411";
     version = "2015-08-05";
@@ -3824,17 +3815,6 @@ let
     sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni";
   };
 
-  usb = buildFromGitHub rec {
-    rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1";
-    version = "2014-12-17";
-    owner = "hanwen";
-    repo = "usb";
-    sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky";
-
-    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ pkgs.libusb1 ];
-  };
-
   uuid = buildFromGitHub {
     rev = "cccd189d45f7ac3368a0d127efb7f4d08ae0b655";
     version = "2015-08-24";