From 5a6b55a865840c861057f22439ea5ccad2bc9db7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 9 Jun 2025 17:56:17 +0200 Subject: [PATCH] saunafs: 4.8.1 -> 4.11.0 --- pkgs/by-name/sa/saunafs/package.nix | 14 ++++++++++++-- pkgs/by-name/sa/saunafs/sfstool.patch | 7 +++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix index d75dab2af27d..c6aeaea8f875 100644 --- a/pkgs/by-name/sa/saunafs/package.nix +++ b/pkgs/by-name/sa/saunafs/package.nix @@ -5,6 +5,9 @@ fetchFromGitHub, cmake, asciidoc, + pkg-config, + db, + curl, jemalloc, boost186, fmt, @@ -13,17 +16,19 @@ yaml-cpp, isa-l, judy, + prometheus-cpp, + libz, }: stdenv.mkDerivation (finalAttrs: { pname = "saunafs"; - version = "4.8.1"; + version = "4.11.0"; src = fetchFromGitHub { owner = "leil-io"; repo = "saunafs"; rev = "v${finalAttrs.version}"; - hash = "sha256-CGnU32TuHkDZYbC3bbjfz4lFWjYe3yrhX08K+UIP51Q="; + hash = "sha256-ZQ0+jiVpHZhAOdYneKkPi3M45LU9xj2FBbqo6VcD0JY="; }; patches = [ @@ -39,8 +44,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake asciidoc + pkg-config ]; buildInputs = [ + db + curl fmt spdlog yaml-cpp @@ -49,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: { jemalloc isa-l judy + prometheus-cpp + libz ]; cmakeFlags = [ diff --git a/pkgs/by-name/sa/saunafs/sfstool.patch b/pkgs/by-name/sa/saunafs/sfstool.patch index b3ca9e6510d2..6d8409772e19 100644 --- a/pkgs/by-name/sa/saunafs/sfstool.patch +++ b/pkgs/by-name/sa/saunafs/sfstool.patch @@ -1,12 +1,11 @@ diff --git a/src/tools/sfstools.sh b/src/tools/sfstools.sh -index ffd9ec22..a1cb83b6 100755 +index 2d47a275..30d1b20c 100755 --- a/src/tools/sfstools.sh +++ b/src/tools/sfstools.sh -@@ -1,4 +1,6 @@ - #!/usr/bin/env bash +@@ -2,4 +2,5 @@ tool="$(basename $0)" + >&2 echo "Warning: ${tool} is deprecated. Use saunafs ${tool#sfs} instead." -exec saunafs "${tool#sfs}" "$@" +dir="$(dirname $0)" -+ +exec "$dir/saunafs" "${tool#sfs}" "$@"