9 files changed, 20 insertions, 250 deletions
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index 5e9e1ca17aef1..5710d80c2cc75 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -5,7 +5,6 @@
 , bash
 , btrfs-progs
 , coreutils
-, linuxHeaders_5_19
 , python3Packages
 , util-linux
 , nixosTests
@@ -15,13 +14,13 @@ let
 
   bees = stdenv.mkDerivation rec {
     pname = "bees";
-    version = "0.8";
+    version = "0.9.3";
 
     src = fetchFromGitHub {
       owner = "Zygo";
       repo = "bees";
       rev = "v${version}";
-      sha256 = "sha256-xBejyi/W8DLQmcicTqEQb5c4uZKu7jsLGjmWmW74t88=";
+      sha256 = "sha256-krG8TzfOz3m7h3GfkBU+NJz7EdlXiWOOXY8bQRq9z4Q=";
     };
 
     buildInputs = [
diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index f7de571dc099f..c2af098577281 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "f2fs-tools";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-RSWvdC6kV0KfyJefK9qyFCWjlezFc7DBOOn+uy7S3Lk=";
+    sha256 = "sha256-zNG1F//+BTBzlEc6qNVixyuCB6PMZD5Kf8pVK0ePYiA=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
index f5d9b4191e3f5..dad5d2dd9e6c0 100644
--- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix
+++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    inherit (src.homepage);
+    inherit (src.meta) homepage;
     description = "A FUSE-based filesystem that uses the p7zip library";
     longDescription = ''
       fuse-7z-ng is a FUSE file system that uses the p7zip
diff --git a/pkgs/tools/filesystems/kio-admin/default.nix b/pkgs/tools/filesystems/kio-admin/default.nix
deleted file mode 100644
index 7e4a97fa255ab..0000000000000
--- a/pkgs/tools/filesystems/kio-admin/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitLab, cmake, extra-cmake-modules, qtbase, wrapQtAppsHook, kio, ki18n, polkit-qt }:
-
-stdenv.mkDerivation rec {
-  pname = "kio-admin";
-  version = "1.0.0";
-
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "system";
-    repo = "kio-admin";
-    rev = "v${version}";
-    hash = "sha256-llnUsOttqFJVArJdZS9s6qHS9eGbdtdoaPMXKHtsUn4=";
-  };
-
-  nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
-  buildInputs = [ qtbase kio ki18n polkit-qt ];
-
-  meta = with lib; {
-    description = "Manage files as administrator using the admin:// KIO protocol.";
-    homepage = "https://invent.kde.org/system/kio-admin";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ k900 ];
-  };
-}
diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix
index 58c5a8d54a2ce..0a6623bfdc4af 100644
--- a/pkgs/tools/filesystems/mtpfs/default.nix
+++ b/pkgs/tools/filesystems/mtpfs/default.nix
@@ -7,13 +7,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse libmtp glib libid3tag libmad ];
 
-  # adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs
-  preConfigure = ''
-    export MAD_CFLAGS=${libmad}/include
-    export MAD_LIBS=${libmad}/lib/libmad.so
-    export LIBS=${libid3tag}/lib/libid3tag.so
-  '';
-
   src = fetchurl {
     url = "https://www.adebenham.com/files/mtp/mtpfs-${version}.tar.gz";
     sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv";
diff --git a/pkgs/tools/filesystems/securefs/add-macfuse-support.patch b/pkgs/tools/filesystems/securefs/add-macfuse-support.patch
deleted file mode 100644
index 217f637ff9dbe..0000000000000
--- a/pkgs/tools/filesystems/securefs/add-macfuse-support.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From 8c65c2219976c02a68e27c28156ec0c4c02857e0 Mon Sep 17 00:00:00 2001
-From: midchildan <git@midchildan.org>
-Date: Sun, 28 Mar 2021 23:39:59 +0900
-Subject: [PATCH] Support the latest FUSE on macOS
-
-This drops osxfuse support in favor of macFUSE. macFUSE is a newer
-version of osxfuse that supports the latest release of macOS, and is a
-rebranded version of the same project.
----
- CMakeLists.txt             |  8 ++----
- LICENSE.md                 | 58 ++++++++++++++++++++------------------
- README.md                  |  2 +-
- sources/commands.cpp       |  6 ----
- 4 files changed, 33 insertions(+), 41 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7b5e57d..c176554 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,12 +18,8 @@ git_describe(GIT_VERSION --tags)
- configure_file(${CMAKE_SOURCE_DIR}/sources/git-version.cpp.in ${CMAKE_BINARY_DIR}/git-version.cpp)
- 
- if (UNIX)
--    find_path(FUSE_INCLUDE_DIR fuse.h PATHS /usr/local/include PATH_SUFFIXES osxfuse)
--    if (APPLE)
--        find_library(FUSE_LIBRARIES osxfuse PATHS /usr/local/lib)
--    else()
--        find_library(FUSE_LIBRARIES fuse PATHS /usr/local/lib)
--    endif()
-+    find_path(FUSE_INCLUDE_DIR fuse.h PATHS /usr/local/include)
-+    find_library(FUSE_LIBRARIES fuse PATHS /usr/local/lib)
-     include_directories(${FUSE_INCLUDE_DIR})
-     link_libraries(${FUSE_LIBRARIES})
-     add_compile_options(-Wall -Wextra -Wno-unknown-pragmas)
-diff --git a/LICENSE.md b/LICENSE.md
-index a8f920c..b134532 100644
---- a/LICENSE.md
-+++ b/LICENSE.md
-@@ -758,13 +758,11 @@ Public License instead of this License.
- 
- ------------------------------------------------------------------------------
- 
--# [osxfuse] (https://github.com/osxfuse/osxfuse)
-+# [macFUSE] (https://github.com/osxfuse/osxfuse)
- 
--FUSE for macOS is a software developed by the osxfuse project and is covered
--under the following BSD-style license:
-+macFUSE is covered under the following license:
- 
--  Copyright (c) 2011-2016 Benjamin Fleischer
--  Copyright (c) 2011-2012 Erik Larsson
-+  Copyright (c) 2011-2021 Benjamin Fleischer
-   All rights reserved.
- 
-   Redistribution  and  use  in  source  and  binary  forms,  with   or   without
-@@ -775,9 +773,13 @@ under the following BSD-style license:
-   2. Redistributions in binary form must reproduce the above  copyright  notice,
-      this list of conditions and the following disclaimer in  the  documentation
-      and/or other materials provided with the distribution.
--  3. Neither the name of osxfuse nor the names of its contributors may  be  used
--     to endorse or promote products derived from this software without  specific
--     prior written permission.
-+  3. Neither the name of the copyright holder nor the names of its  contributors
-+     may be used to endorse or  promote  products  derived  from  this  software 
-+     without specific prior written permission.
-+  4. Redistributions in binary form, bundled with commercial software,  are  not
-+     allowed without  specific  prior  written  permission.  This  includes  the
-+     automated download or installation or  both  of  the  binary  form  in  the
-+     context of commercial software.
- 
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND  CONTRIBUTORS  "AS  IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED  TO,  THE
-@@ -791,9 +793,9 @@ under the following BSD-style license:
-   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN  IF  ADVISED  OF  THE
-   POSSIBILITY OF SUCH DAMAGE.
- 
--FUSE for macOS is a fork of MacFUSE. MacFUSE has been developed by Google Inc..
--Additional information and the original source of MacFUSE are available on
--http://code.google.com/p/macfuse/. MacFUSE is covered under the following
-+macFUSE is a fork of the legacy Google MacFUSE software. Additional information
-+and the original source code of Google MacFUSE are available on
-+http://code.google.com/p/macfuse/. Google MacFUSE is covered under the following
- BSD-style license:
- 
-   Copyright (c) 2007—2009 Google Inc.
-@@ -830,9 +832,9 @@ BSD-style license:
- Portions of this package were derived from code developed by other authors.
- Please read further for specific details.
- 
--* Unless otherwise noted, parts of the FUSE for macOS kernel extension contain
--  code derived from the FreeBSD version of FUSE, which is covered under the
--  following BSD-style license:
-+* Unless otherwise noted, parts of the macFUSE kernel extension contain code
-+  derived from the FreeBSD version of FUSE, which is covered under the following
-+  BSD-style license:
- 
-     Copyright (C) 2005 Csaba Henk. All rights reserved.
- 
-@@ -856,12 +858,13 @@ Please read further for specific details.
-     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT  OF  THE  USE  OF
-     THIS  SOFTWARE,  EVEN  IF  ADVISED  OF  THE  POSSIBILITY  OF  SUCH   DAMAGE.
- 
--* Parts of the FUSE for macOS kernel extension contain code derived from Tuxera
--  Inc.'s "rebel" branch. The original source of the "rebel" branch is available
--  on https://github.com/tuxera. These modifications are covered under the
--  following BSD-style license:
-+* Parts of the macFUSE kernel extension contain code derived from Tuxera's
-+  "rebel" branch. The original source code of the "rebel" branch is available on
-+  https://github.com/tuxera. These modifications are covered under the following
-+  BSD-style license:
- 
-     Copyright (c) 2010 Tuxera Inc.
-+    Copyright (c) 2011-2012 Erik Larsson
-     All rights reserved.
- 
-     Redistribution  and  use  in  source  and  binary  forms,  with  or  without
-@@ -888,9 +891,9 @@ Please read further for specific details.
-     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED  OF  THE
-     POSSIBILITY OF SUCH DAMAGE.
- 
--* Parts of FUSE for macOS contain code derived from Fuse4X. The original source
--  of Fuse4X is available on https://github.com/fuse4x. Fuse4X is covered under
--  the following BSD-style license:
-+* Parts of macFUSE contain code derived from Fuse4X. The original source code of
-+  Fuse4X is available on https://github.com/fuse4x. Fuse4X is covered under the
-+  following BSD-style license:
- 
-     Copyright (c) 2011 Anatol Pomozov
-     All rights reserved.
-@@ -916,21 +919,20 @@ Please read further for specific details.
-     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED  OF  THE
-     POSSIBILITY OF SUCH DAMAGE.
- 
--* Parts of the mount_osxfuse command-line program are covered under the Apple
-+* Parts of the mount_macfuse command-line program are covered under the Apple
-   Public Source License (APSL). You can read the APSL at:
- 
-     http://www.opensource.apple.com/license/apsl/
- 
--* fuse_kernel.h is an unmodified copy of the interface header from the Linux
-+* fuse_kernel.h is a modified copy of the interface header from the Linux
-   FUSE distribution (https://github.com/libfuse/libfuse). fuse_kernel.h can be
-   redistributed either under the GPL or under the BSD license. It is being
-   redistributed here under the BSD license.
- 
--* fuse_nodehash.c is a slightly modified version of HashNode.c from an
--  Apple Developer Technical Support (DTS) sample code example. The original
--  source, which is available on
--  http://developer.apple.com/library/mac/#samplecode/MFSLives/, has the
--  following disclaimer:
-+* fuse_nodehash.c is a modified version of HashNode.c from an Apple Developer
-+  Technical Support (DTS) sample code example. The original source, which is
-+  available on http://developer.apple.com/library/mac/#samplecode/MFSLives/,
-+  has the following disclaimer:
- 
-     Disclaimer: IMPORTANT: This Apple software  is  supplied  to  you  by  Apple
-     Computer, Inc.  Apple") in consideration of your agreement to the  following
-diff --git a/README.md b/README.md
-index 9085e96..6fe3592 100644
---- a/README.md
-+++ b/README.md
-@@ -28,7 +28,7 @@ There are already many encrypting filesystem in widespread use. Some notable one
- 
- ### macOS
- 
--Install with [Homebrew](https://brew.sh). [osxfuse](https://osxfuse.github.io) has to be installed beforehand.
-+Install with [Homebrew](https://brew.sh). [macFUSE](https://osxfuse.github.io) has to be installed beforehand.
- ```
- brew install securefs
- ```
-diff --git a/sources/commands.cpp b/sources/commands.cpp
-index a371212..862602b 100644
---- a/sources/commands.cpp
-+++ b/sources/commands.cpp
-@@ -1252,12 +1252,6 @@ class VersionCommand : public CommandBase
-                 printf("WinFsp %u.%u\n", vn >> 16, vn & 0xFFFFu);
-             }
-         }
--#elif defined(__APPLE__)
--        typedef const char* version_function(void);
--        auto osx_version_func
--            = reinterpret_cast<version_function*>(::dlsym(RTLD_DEFAULT, "osxfuse_version"));
--        if (osx_version_func)
--            printf("osxfuse %s\n", osx_version_func());
- #else
-         typedef int version_function(void);
-         auto fuse_version_func
-
diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix
index 5fad07d87b731..791c01d8eed81 100644
--- a/pkgs/tools/filesystems/securefs/default.nix
+++ b/pkgs/tools/filesystems/securefs/default.nix
@@ -1,29 +1,22 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib
+, stdenv
+, fetchFromGitHub
 , cmake
-, fuse }:
+, fuse
+}:
 
 stdenv.mkDerivation rec {
   pname = "securefs";
-  version = "0.11.1";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
-    sha256 = "1sxfgqgy63ml7vg7zj3glvra4wj2qmfv9jzmpm1jqy8hq7qlqlsx";
-    rev = version;
-    repo = "securefs";
     owner = "netheril96";
+    repo = "securefs";
+    rev = version;
     fetchSubmodules = true;
+    hash = "sha256-7xjGuN7jcLgfGkaBoSj+WsBpM806PPGzeBs7DnI+fwc=";
   };
 
-  patches = [
-    # Make it build with macFUSE
-    # Backported from https://github.com/netheril96/securefs/pull/114
-    ./add-macfuse-support.patch
-  ];
-
-  postPatch = ''
-    sed -i -e '/TEST_SOURCES/d' CMakeLists.txt
-  '';
-
   nativeBuildInputs = [ cmake ];
   buildInputs = [ fuse ];
 
@@ -42,7 +35,5 @@ stdenv.mkDerivation rec {
     '';
     license = with licenses; [ bsd2 mit ];
     platforms = platforms.unix;
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }
diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix
index cdfbe47d84571..73cb3798ef2e8 100644
--- a/pkgs/tools/filesystems/stratisd/default.nix
+++ b/pkgs/tools/filesystems/stratisd/default.nix
@@ -26,18 +26,18 @@
 
 stdenv.mkDerivation rec {
   pname = "stratisd";
-  version = "3.5.2";
+  version = "3.5.4";
 
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-vnN0SO3KbmSQPDGqn4hnrVSxv5ebSDTOoPim1EKWweQ=";
+    hash = "sha256-V/1gNgjunT11ErXWIa5hDp2+onPCTequCswwXWD5+9E=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    hash = "sha256-Cl/6A3SNMKWzuu1JLYgzzXc8XSp+ws+YtAvfPCXZGEA=";
+    hash = "sha256-RljuLL8tep42KNGVsS5CxI7xuhxEjRZ90jVn3jUhVYM=";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix
index e92f82ad27a5a..4ac3d777bc547 100644
--- a/pkgs/tools/filesystems/tar2ext4/default.nix
+++ b/pkgs/tools/filesystems/tar2ext4/default.nix
@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "tar2ext4";
-  version = "0.9.6";
+  version = "0.9.8";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "hcsshim";
     rev = "v${version}";
-    sha256 = "sha256-sBcagAFjmnLfPFYwOhWIt6bnEXyOKYobvMI2rQf4S5A=";
+    sha256 = "sha256-CvXn5b1kEZ2gYqfKSFRNzqkyOAcfcI1/3etRJTKwqog=";
   };
 
   sourceRoot = "source/cmd/tar2ext4";
-  vendorSha256 = null;
+  vendorHash = null;
 
   meta = with lib; {
     description = "Convert a tar archive to an ext4 image";