From d2ff74f9dde46dd63b475986de935d0986d82988 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 10 Jul 2017 00:05:27 +0000
Subject: [PATCH] unionfs-fuse: 1.0 -> 2.0
---
pkgs/tools/filesystems/unionfs-fuse/default.nix | 13 +++++++------
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index b7d7a07a084f..cfe3ff421fe4 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "unionfs-fuse-${version}";
- version = "1.0";
+ version = "2.0";
src = fetchFromGitHub {
owner = "rpodgorny";
repo = "unionfs-fuse";
rev = "v${version}";
- sha256 = "0g2hd6yi6v8iqzmgncg1zi9a7ixy9hsh51rzf6jnmzi79543dihf";
+ sha256 = "0lb8zgdxnjy2fjr2284hvdfn7inc1in44ynzgcr66x54bxzvynj6";
};
patches =
@@ -34,10 +34,11 @@ stdenv.mkDerivation rec {
substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs
'';
- meta = {
+ meta = with stdenv.lib; {
description = "FUSE UnionFS implementation";
- homepage = http://podgorny.cz/moin/UnionFsFuse;
- license = stdenv.lib.licenses.bsd3;
- platforms = stdenv.lib.platforms.linux;
+ homepage = https://github.com/rpodgorny/unionfs-fuse;
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ orivej ];
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52df066c74d1..0802f663c8ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1346,7 +1346,7 @@ with pkgs;
unifdef = callPackage ../development/tools/misc/unifdef { };
- "unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { };
+ unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { };
usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { };