exfat-fuse: 1.1.0 -> 1.2.0

Remove underscore & use standard name (also used by upstream).

Changes: https://github.com/relan/exfat/blob/master/ChangeLog

3 files changed, 28 insertions, 33 deletions

diff --git a/pkgs/tools/filesystems/exfat-fuse/default.nix b/pkgs/tools/filesystems/exfat-fuse/default.nix
new file mode 100644
index 00000000000..d2a18e41b0e
--- /dev/null
+++ b/pkgs/tools/filesystems/exfat-fuse/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }:
+
+let version = "1.2.0"; in
+stdenv.mkDerivation {
+  name = "exfat-fuse-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "1fsm082g8phqcdg5md6yll06jijnbvqrdy0638psa8kr159h4dv8";
+    rev = "v${version}";
+    repo = "exfat";
+    owner = "relan";
+  };
+
+  buildInputs = [ fuse ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  meta = with stdenv.lib; {
+    inherit version;
+    homepage = https://github.com/relan/exfat;
+    description = "A FUSE file system to read and write to exFAT devices";
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
+
diff --git a/pkgs/tools/filesystems/fuse-exfat/default.nix b/pkgs/tools/filesystems/fuse-exfat/default.nix
deleted file mode 100644
index ef8bf5845dd..00000000000
--- a/pkgs/tools/filesystems/fuse-exfat/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, fuse, scons }:
-
-stdenv.mkDerivation rec {
-  name = "fuse-exfat-1.1.0";
-
-  src = fetchurl {
-    sha256 = "0glmgwrf0nv09am54i6s35ksbvrywrwc51w6q32mv5by8475530r";
-    url = "https://docs.google.com/uc?export=download&id=0B7CLI-REKbE3VTdaa0EzTkhYdU0";
-    name = "${name}.tar.gz";
-  };
-
-  buildInputs = [ fuse ];
-  nativeBuildInputs = [ pkgconfig scons ];
-
-  buildPhase = ''
-    export CCFLAGS="-O2 -Wall -std=c99 -I${fuse}/include"
-    export LDFLAGS="-L${fuse}/lib"
-    mkdir -pv $out/sbin
-    scons DESTDIR=$out/sbin install
-  '';
-
-  installPhase = ":";
-
-  meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/exfat/;
-    description = "A FUSE-based filesystem that allows read and write access to exFAT devices";
-    platforms = with platforms; linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ nckx ];
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10cd25995a2..482132b9e82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1590,7 +1590,7 @@ let
 
   fuse_zip = callPackage ../tools/filesystems/fuse-zip { };
 
-  fuse_exfat = callPackage ../tools/filesystems/fuse-exfat { };
+  exfat-fuse = callPackage ../tools/filesystems/exfat-fuse { };
 
   dos2unix = callPackage ../tools/text/dos2unix { };
 
@@ -15330,6 +15330,7 @@ let
   cool-old-term = cool-retro-term; # added 2015-01-31
   cv = progress; # added 2015-09-06
   firefoxWrapper = firefox-wrapper;
+  fuse_exfat = exfat-fuse;              # 2015-09-11
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
   htmlTidy = html-tidy;  # added 2014-12-06