Unverified Commit 674d3867 authored by Markus Kowalewski's avatar Markus Kowalewski Committed by GitHub
Browse files

saunafs: 4.8.1 -> 4.11.0 (#415352)

parents 33bb85fc 5a6b55a8

pkgs/by-name/sa/saunafs/package.nix

+12 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/by-name/sa/saunafs/sfstool.patch

+3 −4
Original line number Diff line number Diff line 
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}" "$@"