diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 6a05d71d021..4bb2a3c24d5 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,20 +1,29 @@ -{ pkg-config, libusb1, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, pkg-config, libusb1 }: -buildGoPackage rec { +buildGoModule rec { pname = "go-mtpfs"; - version = "unstable-2018-02-09"; - - goPackagePath = "github.com/hanwen/go-mtpfs"; + version = "1.0.0"; src = fetchFromGitHub { owner = "hanwen"; repo = "go-mtpfs"; - rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb"; - sha256 = "sha256-sz+ikhZGwSIAI2YBSQKURF3WXB8dHgQ/C/dbkXwrDSg="; + rev = "v${version}"; + sha256 = "sha256-HVfB8/MImgZZLx4tcrlYOfQjpAdHMHshEaSsd+n758w="; }; + vendorSha256 = "sha256-OrAEvD2rF0Y0bvCD9TUv/E429lASsvC3uK3qNvbg734="; + + ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; - goDeps = ./deps.nix; + checkFlags = [ "-short" ]; + + meta = with lib; { + description = "A simple FUSE filesystem for mounting Android devices as a MTP device"; + homepage = "https://github.com/hanwen/go-mtpfs"; + license = licenses.bsd3; + maintainers = with maintainers; [ aaronjheng ]; + }; } diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.nix b/pkgs/tools/filesystems/go-mtpfs/deps.nix deleted file mode 100644 index f558a53f7d2..00000000000 --- a/pkgs/tools/filesystems/go-mtpfs/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/hanwen/go-fuse"; - fetch = { - type = "git"; - url = "https://github.com/hanwen/go-fuse"; - rev = "d1c826d19ad0c8d0c7e5b4eb34ee0f2ae09f6cef"; - sha256 = "0hn2iqsb6rip2b05fvcngyh0sazln2h3fx18khq4fv41n1iy11dc"; - }; - } - { - goPackagePath = "github.com/hanwen/usb"; - fetch = { - type = "git"; - url = "https://github.com/hanwen/usb"; - rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; - sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "48ac38b7c8cbedd50b1613c0fccacfc7d88dfcdf"; - sha256 = "037vs8sdvq310j3b6z9k62zlby1mzmsr9ha01rcy98dv5v8bkhin"; - }; - } -]