diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-09-11 22:31:16 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-09-11 22:39:54 +0200 |
commit | c92ac3b1d6549774617b8b4f61f69726b205dda0 (patch) | |
tree | 9fc8658ef53aa4a52efeba72a78ddccafd6d50f5 | |
parent | 3c47829cb530bbfdcfcf1e1a71dd7cf14bdb3598 (diff) | |
download | nixlib-c92ac3b1d6549774617b8b4f61f69726b205dda0.tar nixlib-c92ac3b1d6549774617b8b4f61f69726b205dda0.tar.gz nixlib-c92ac3b1d6549774617b8b4f61f69726b205dda0.tar.bz2 nixlib-c92ac3b1d6549774617b8b4f61f69726b205dda0.tar.lz nixlib-c92ac3b1d6549774617b8b4f61f69726b205dda0.tar.xz nixlib-c92ac3b1d6549774617b8b4f61f69726b205dda0.tar.zst nixlib-c92ac3b1d6549774617b8b4f61f69726b205dda0.zip |
exfat-{fuse,utils}: merge
Both packages have been merged as https://github.com/relan/exfat. Follow suit.
-rw-r--r-- | pkgs/tools/filesystems/exfat-utils/default.nix | 34 | ||||
-rw-r--r-- | pkgs/tools/filesystems/exfat/default.nix (renamed from pkgs/tools/filesystems/exfat-fuse/default.nix) | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 6 insertions, 42 deletions
diff --git a/pkgs/tools/filesystems/exfat-utils/default.nix b/pkgs/tools/filesystems/exfat-utils/default.nix deleted file mode 100644 index eb7977c71a3b..000000000000 --- a/pkgs/tools/filesystems/exfat-utils/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, scons }: - -let version = "1.1.1"; in -stdenv.mkDerivation rec { - name = "exfat-utils-${version}"; - - src = fetchurl { - sha256 = "0ck2snhlhp965bb9a4y1g2lpl979sw1yznm79wbavyv174458i66"; - url = "https://docs.google.com/uc?export=download&id=0B7CLI-REKbE3UzNtSkRvdHBpdjQ"; - name = "${name}.tar.gz"; - }; - - meta = with stdenv.lib; { - description = "Free exFAT file system utilities"; - longDescription = '' - Full-featured exFAT file system implementation for GNU/Linux and other - Unix-like systems. - ''; - homepage = https://code.google.com/p/exfat; - license = licenses.gpl2Plus; - platforms = with platforms; linux; - maintainers = with maintainers; [ nckx ]; - }; - - nativeBuildInputs = [ scons ]; - - buildPhase = '' - export CCFLAGS="-std=c99" - mkdir -pv $out/sbin - scons DESTDIR=$out/sbin install - ''; - - installPhase = ":"; -} diff --git a/pkgs/tools/filesystems/exfat-fuse/default.nix b/pkgs/tools/filesystems/exfat/default.nix index d2a18e41b0e0..a0a4223731c0 100644 --- a/pkgs/tools/filesystems/exfat-fuse/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }: let version = "1.2.0"; in -stdenv.mkDerivation { - name = "exfat-fuse-${version}"; +stdenv.mkDerivation rec { + name = "exfat-${version}"; src = fetchFromGitHub { sha256 = "1fsm082g8phqcdg5md6yll06jijnbvqrdy0638psa8kr159h4dv8"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit version; - homepage = https://github.com/relan/exfat; - description = "A FUSE file system to read and write to exFAT devices"; + inherit (src.meta) homepage; + description = "Free exFAT file system implementation"; platforms = 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 482132b9e827..6c765e18385f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1451,8 +1451,6 @@ let exercism = callPackage ../development/tools/exercism { }; - exfat-utils = callPackage ../tools/filesystems/exfat-utils { }; - exif = callPackage ../tools/graphics/exif { }; exiftags = callPackage ../tools/graphics/exiftags { }; @@ -1590,7 +1588,7 @@ let fuse_zip = callPackage ../tools/filesystems/fuse-zip { }; - exfat-fuse = callPackage ../tools/filesystems/exfat-fuse { }; + exfat = callPackage ../tools/filesystems/exfat { }; dos2unix = callPackage ../tools/text/dos2unix { }; @@ -15330,7 +15328,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 + fuse_exfat = exfat; # 2015-09-11 haskell-ng = haskell; # 2015-04-19 haskellngPackages = haskellPackages; # 2015-04-19 htmlTidy = html-tidy; # added 2014-12-06 |