diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-10-10 10:18:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-10-10 11:32:10 +0200 |
| commit | 338b25697c952b17ef9b012cbe068f2d0b8fc4b3 (patch) | |
| tree | 31123d2ef6ddcddb682c67d3c85a6f6b1a894fd9 /pkgs/tools/filesystems | |
| parent | ec28e32c9e1f5b4d6857e9c7f2e57cf946b75655 (diff) | |
| parent | 8bc409e546590137cd43651ee6f2909c6c9f5c73 (diff) | |
Merge branch 'master' into staging-next
Quite many rebuilds from master: > Estimating rebuild amount by counting changed Hydra jobs. > 3926 x86_64-darwin > 4645 x86_64-linux
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/apfs-fuse/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/fuse-overlayfs/default.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix index 2c7b1c271569f..32cde83d749a2 100644 --- a/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation { buildInputs = [ fuse3 bzip2 zlib attr ]; nativeBuildInputs = [ cmake ]; + postFixup = '' + ln -s $out/bin/apfs-fuse $out/bin/mount.fuse.apfs-fuse + ''; + meta = with stdenv.lib; { homepage = "https://github.com/sgan81/apfs-fuse"; description = "FUSE driver for APFS (Apple File System)"; diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 11a3615a84c8b..7e6bd7440b30b 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1ivz65nnyisha3lkk6ywx175f2sdacjz3q5vy9xddr7dixwd2b18"; + sha256 = "1ihibhj48fk1c89yh7vyb44mkywxphxqqgz7xks9caw05qw5ac1y"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; |