From e96fccae1b4e07f09d7552dc6682582e99bc18c9 Mon Sep 17 00:00:00 2001
From: Brian Picciano <mediocregopher@gmail.com>
Date: Tue, 22 Nov 2022 12:51:21 +0100
Subject: [PATCH] Upgrade to garage v0.8.0, plus a commit to fix panics

We were encountering panics (see
https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/414). The new garage
commit is simply 0.8.0 plus the fix for that issue.
---
 entrypoint/src/garage/admin_client.go | 2 +-
 nix/garage.nix                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/entrypoint/src/garage/admin_client.go b/entrypoint/src/garage/admin_client.go
index 13fa6d4..e01174e 100644
--- a/entrypoint/src/garage/admin_client.go
+++ b/entrypoint/src/garage/admin_client.go
@@ -103,7 +103,7 @@ func (c *AdminClient) Do(
 
 	defer res.Body.Close()
 
-	if res.StatusCode != 200 {
+	if res.StatusCode >= 300 {
 		body, _ := io.ReadAll(res.Body)
 		return AdminClientError{
 			StatusCode: res.StatusCode,
diff --git a/nix/garage.nix b/nix/garage.nix
index 3b8110c..43e832a 100644
--- a/nix/garage.nix
+++ b/nix/garage.nix
@@ -6,13 +6,13 @@
 
 }: let
 
-  version = "0.8.0-rc1";
+  version = "0.8.0-unstable";
 
   src = fetchgit {
     name = "garage-v${version}";
     url = "https://git.deuxfleurs.fr/Deuxfleurs/garage.git";
-    rev = "2197753dfdb25944e55c25d911ae6d14b8506c4d";
-    sha256 = "sha256-Rzwx1/vl3xg5bj4Chxj8VLBZ25zlPawOc+uMl3AHhkw=";
+    rev = "293139a94a8911aaac1b650e4707379a972196aa";
+    sha256 = "sha256-b6HHLnxMdmpngiywll6Egr8O9/4cqBN01Mj3OwVMeBc=";
   };
 
 in rec {