From 7daab74b374b7b2819be09676cc4a6c596c79ad2 Mon Sep 17 00:00:00 2001
From: notplants <max@mfowler.info>
Date: Thu, 7 Jul 2022 10:51:44 +0200
Subject: [PATCH] Fix golgi import

---
 Cargo.lock           | 25 +++----------------------
 peach-lib/Cargo.toml |  2 +-
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a22bff..382dac8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1095,25 +1095,6 @@ dependencies = [
  "sha2",
 ]
 
-[[package]]
-name = "golgi"
-version = "0.1.5"
-source = "git+https://git.coopcloud.tech/golgi-ssb/golgi.git?branch=dev#414e8869f91974ae88431d74a8c8138e0a0ccdc6"
-dependencies = [
- "async-std",
- "async-stream 0.3.3",
- "base64 0.13.0",
- "futures 0.3.21",
- "hex",
- "kuska-handshake",
- "kuska-sodiumoxide",
- "kuska-ssb",
- "log 0.4.17",
- "serde 1.0.137",
- "serde_json",
- "sha2",
-]
-
 [[package]]
 name = "h2"
 version = "0.1.26"
@@ -2224,7 +2205,7 @@ dependencies = [
  "async-std",
  "clap",
  "env_logger 0.6.2",
- "golgi 0.1.4",
+ "golgi",
  "lazy_static",
  "log 0.4.17",
  "peach-lib",
@@ -2266,7 +2247,7 @@ dependencies = [
  "chrono",
  "dirs 4.0.0",
  "fslock",
- "golgi 0.1.5",
+ "golgi",
  "jsonrpc-client-core",
  "jsonrpc-client-http",
  "jsonrpc-core 8.0.1",
@@ -2360,7 +2341,7 @@ dependencies = [
  "dirs 4.0.0",
  "env_logger 0.8.4",
  "futures 0.3.21",
- "golgi 0.1.4",
+ "golgi",
  "lazy_static",
  "log 0.4.17",
  "maud",
diff --git a/peach-lib/Cargo.toml b/peach-lib/Cargo.toml
index 5228801..7c8ea4a 100644
--- a/peach-lib/Cargo.toml
+++ b/peach-lib/Cargo.toml
@@ -9,7 +9,7 @@ async-std = "1.10"
 chrono = "0.4"
 dirs = "4.0"
 fslock="0.1"
-golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi.git", branch = "dev" }
+golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi.git" }
 jsonrpc-client-core = "0.5"
 jsonrpc-client-http = "0.5"
 jsonrpc-core = "8.0"