ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity

exfat-{fuse,utils}: merge

Browse Source 
Both packages have been merged as https://github.com/relan/exfat.
Follow suit.
This commit is contained in:
Tobias Geerinckx-Rice 2015-09-11 22:31:16 +02:00
parent 3c47829cb5
commit c92ac3b1d6
3 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/tools/filesystems/exfat-utils/default.nix
View File

@ -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 = ":";
}

8
pkgs/tools/filesystems/exfat-fuse/default.nix → pkgs/tools/filesystems/exfat/default.nix
View File

@ -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 ];

6
pkgs/top-level/all-packages.nix
View File

@ -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