diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:51:33 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:51:33 +0100 |
| commit | c9171e5a4c3e61f9afa0e3da3755712d1da5d693 (patch) | |
| tree | 89b09dee818b612c9c52fb92d79b7169f1202006 /pkgs/tools/filesystems | |
| parent | e851d53ceaf2cd48d0757c385626dd2040db0f12 (diff) | |
| parent | 078fc69425787c9ceebfa003add3c1d80e49560c (diff) | |
| download | nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.gz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.bz2 nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.lz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.xz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.zst nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1430035
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/cryfs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/exfat/default.nix | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 0469ad54eb13..7bbfafef819d 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cryfs-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "cryfs"; repo = "cryfs"; rev = "${version}"; - sha256 = "1wsv4cyjkyg3cyr6vipw1mj41bln2m69123l3miav8r4mvmkfq8w"; + sha256 = "1lrzmzjakv08qjq09a3krllfw5vrgblfxzijpf3lm3yjgih63r1k"; }; prePatch = '' diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index f404d06eda46..831594973e21 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -2,22 +2,23 @@ stdenv.mkDerivation rec { name = "exfat-${version}"; - version = "1.2.4"; + version = "1.2.7"; src = fetchFromGitHub { - sha256 = "0x8wjvvlqmp0g2361m6d24csi1p4df8za2cqhyys03s1hv1qmy0k"; - rev = "v${version}"; - repo = "exfat"; owner = "relan"; + repo = "exfat"; + rev = "v${version}"; + sha256 = "1sk4z133djh8sdvx2vvmd8kf4qfly2i3hdar4zpg0s41jpbzdx69"; }; - buildInputs = [ fuse ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fuse ]; meta = with stdenv.lib; { - inherit (src.meta) homepage; description = "Free exFAT file system implementation"; - platforms = platforms.linux; + inherit (src.meta) homepage; license = licenses.gpl2Plus; + maintainers = with maintainers; [ dywedir ]; + platforms = platforms.linux; }; } |