From 35eac3f2b7f1ff137dd8b9e70dba7977b7fb53d4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 3 Sep 2025 11:03:41 +0200 Subject: [PATCH] saunafs: 4.11.0 -> 5.1.2 override fmt and spdlog. saunafs now needs fmt_11. spdlog needs to be built with same version of fmt. --- pkgs/by-name/sa/saunafs/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix index c6aeaea8f875..6137211a8f8a 100644 --- a/pkgs/by-name/sa/saunafs/package.nix +++ b/pkgs/by-name/sa/saunafs/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "saunafs"; - version = "4.11.0"; + version = "5.1.2"; src = fetchFromGitHub { owner = "leil-io"; repo = "saunafs"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZQ0+jiVpHZhAOdYneKkPi3M45LU9xj2FBbqo6VcD0JY="; + hash = "sha256-56PlUeXHqNhKYokKWqLCeaP3FZBdefhQFQQoP8YytQQ="; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2148de80af5..cefc8f15ceb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4110,6 +4110,13 @@ with pkgs; sasview = libsForQt5.callPackage ../applications/science/misc/sasview { }; + saunafs = callPackage ../by-name/sa/saunafs/package.nix { + fmt = fmt_11; + spdlog = spdlog.override { + fmt = fmt_11; + }; + }; + scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { }; segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; };