From 654192bd631548f5689102799f22090ab810682e Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 9 Aug 2022 11:46:05 +0200
Subject: [PATCH] garage: 0.7.0 -> 0.7.3

https://git.deuxfleurs.fr/Deuxfleurs/garage/compare/v0.7.0...v0.7.3
---
 pkgs/tools/filesystems/garage/default.nix | 31 ++++++++++++++++++-----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index 2818c335176a..13184afe73ce 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -1,22 +1,41 @@
-{ lib, stdenv, rustPlatform, fetchFromGitea, protobuf, testers, Security, garage }:
+{ lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf
+, testers, Security, garage }:
 
 rustPlatform.buildRustPackage rec {
   pname = "garage";
-  version = "0.7.0";
+  version = "0.7.3";
 
   src = fetchFromGitea {
     domain = "git.deuxfleurs.fr";
     owner = "Deuxfleurs";
     repo = "garage";
     rev = "v${version}";
-    sha256 = "sha256-gs0TW431YUrdsdJ+PYrJgnLiBmDPYnUR0iVnQ/YqIfU=";
+    sha256 = "sha256-WDhe2L+NalMoIy2rhfmv8KCNDMkcqBC9ezEKKocihJg=";
   };
 
-  cargoSha256 = "sha256-XGSenT2q3VXNcIT1Lg1e5HTOkEdOb1o3H07ahteQM/o=";
+  cargoSha256 = "sha256-5m4c8/upBYN8nuysDhGKEnNVJjEGC+yLrraicrAQOfI=";
 
-  nativeBuildInputs = [ protobuf ];
+  nativeBuildInputs = [ protobuf pkg-config ];
 
-  buildInputs = lib.optional stdenv.isDarwin Security;
+  buildInputs = [
+    openssl
+  ] ++ lib.optional stdenv.isDarwin Security;
+
+  OPENSSL_NO_VENDOR = true;
+
+  # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.7.2/default.nix#L84-L98
+  # on version changes for checking if changes are required here
+  buildFeatures = [
+    "kubernetes-discovery"
+  ];
+
+  # To make integration tests pass, we include the optional k2v feature here,
+  # but not in buildFeatures. See:
+  # https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/
+  checkFeatures = [
+    "k2v"
+    "kubernetes-discovery"
+  ];
 
   passthru = {
     tests.version = testers.testVersion { package = garage; };