From 049cdee2fbdf030fb0a0d10c8d421484a96f6e6d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 5 Feb 2025 17:02:57 +0100
Subject: [PATCH] saunafs: 4.6.0 -> 4.7.0

---
 pkgs/by-name/sa/saunafs/package.nix   |  9 ++++-----
 pkgs/by-name/sa/saunafs/sfstool.patch | 13 ++++++-------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix
index 374e52b7ebcc..d9fe7402f42b 100644
--- a/pkgs/by-name/sa/saunafs/package.nix
+++ b/pkgs/by-name/sa/saunafs/package.nix
@@ -6,7 +6,7 @@
   cmake,
   asciidoc,
   jemalloc,
-  boost,
+  boost186,
   fmt,
   fuse3,
   spdlog,
@@ -17,18 +17,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "saunafs";
-  version = "4.6.0";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "leil-io";
     repo = "saunafs";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uPHgyCL4/HYjoIm1Ev5p7lXAf1KlpV/OAqLVhu5Ang4=";
+    hash = "sha256-6WXSnItbydH3Lk04l0Iph14EKzL/Pl5vriWdhHxTF6I=";
   };
 
   patches = [
     ./sfstool.patch
-
   ];
 
   outputs = [
@@ -46,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     spdlog
     yaml-cpp
     fuse3
-    boost
+    boost186
     jemalloc
     isa-l
     judy
diff --git a/pkgs/by-name/sa/saunafs/sfstool.patch b/pkgs/by-name/sa/saunafs/sfstool.patch
index 90c5f840489d..b3ca9e6510d2 100644
--- a/pkgs/by-name/sa/saunafs/sfstool.patch
+++ b/pkgs/by-name/sa/saunafs/sfstool.patch
@@ -1,13 +1,12 @@
 diff --git a/src/tools/sfstools.sh b/src/tools/sfstools.sh
-index c6c41197..9a59814f 100755
+index ffd9ec22..a1cb83b6 100755
 --- a/src/tools/sfstools.sh
 +++ b/src/tools/sfstools.sh
-@@ -1,5 +1,6 @@
+@@ -1,4 +1,6 @@
  #!/usr/bin/env bash
  
--tool=$(basename $0)
-+tool="$(basename $0)"
+ tool="$(basename $0)"
+-exec saunafs "${tool#sfs}" "$@"
 +dir="$(dirname $0)"
- 
--${tool/saunafs/saunafs } "$@"
-+$dir/saunafs ${tool/sfs/} "$@"
++
++exec "$dir/saunafs" "${tool#sfs}" "$@"