From 12ebd64d985e674ec55e3d7312c5ecea2c692db2 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 14 Mar 2023 10:06:43 +0100
Subject: garage: 0.8.1 -> 0.8.2

https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v0.8.2

Remove workaround for failing tests, upstream fixed them in
https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/526
---
 pkgs/tools/filesystems/garage/default.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'pkgs/tools/filesystems/garage')

diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index eeb8dddb645b..4eb488b2d025 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -27,7 +27,7 @@ let
 
     OPENSSL_NO_VENDOR = true;
 
-    # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.7.2/default.nix#L84-L98
+    # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.8.2/nix/compile.nix#L192-L198
     # on version changes for checking if changes are required here
     buildFeatures = [
       "kubernetes-discovery"
@@ -57,10 +57,6 @@ let
       "sqlite"
     ]);
 
-    # Workaround until upstream fixes integration test race condition
-    # https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/528
-    dontUseCargoParallelTests = true;
-
     passthru = nixosTests.garage;
 
     meta = {
@@ -87,13 +83,13 @@ in
 
     garage_0_7 = garage_0_7_3;
 
-    garage_0_8_1 = generic {
-      version = "0.8.1";
-      sha256 = "sha256-lpNp/jw4YaczG3NM3pVWR0cZ8u/KBQCWvvfAswO4+Do=";
-      cargoSha256 = "sha256-TXHSAnttXfxoFLOP+vsd86O8sVoyrSkadij26cF4aXI=";
+    garage_0_8_2 = generic {
+      version = "0.8.2";
+      sha256 = "sha256-IlDWbNWI1yXvPPF3HIqQvo79M2FQCtoX1wRLJrDbd9k=";
+      cargoSha256 = "sha256-6l4tDBMcOvckTkEO05rman4hHlmVbBt1nCeX5/dETKk=";
     };
 
-    garage_0_8 = garage_0_8_1;
+    garage_0_8 = garage_0_8_2;
 
     garage = garage_0_8;
   }
-- 
cgit 1.4.1