From 90396182457ba69337339d8b21d9da9a7684c763 Mon Sep 17 00:00:00 2001
From: Gitea Bot <gitea-bot@chir.rs>
Date: Fri, 19 May 2023 14:32:21 +0000
Subject: [PATCH] Update kubo

---
 ipfs/kubo/default.nix      |  4 ++--
 ipfs/kubo/preload.go       |  1 +
 ipfs/kubo/source.json      |  8 ++++----
 linux/bcachefs/default.nix | 33 +++++++++++++++++----------------
 overlay.nix                |  2 +-
 5 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/ipfs/kubo/default.nix b/ipfs/kubo/default.nix
index da33660..51c3653 100644
--- a/ipfs/kubo/default.nix
+++ b/ipfs/kubo/default.nix
@@ -23,7 +23,7 @@
       cd $out
       cp ${./go.mod} go.mod
       cp ${./go.sum} go.sum
-      cp ${./preload.go} plugin/loader/preload.go 
+      cp ${./preload.go} plugin/loader/preload.go
       echo -e "\nstorjds storj.io/ipfs-go-ds-storj/plugin 0" >> plugin/loader/preload_list
       patchShebangs .
     '';
@@ -48,7 +48,7 @@ in
     outputs = ["out" "systemd_unit" "systemd_unit_hardened"];
 
     buildPhase = ''
-        make build
+      make build
     '';
 
     installPhase = ''
diff --git a/ipfs/kubo/preload.go b/ipfs/kubo/preload.go
index c2345e1..e7c70e3 100644
--- a/ipfs/kubo/preload.go
+++ b/ipfs/kubo/preload.go
@@ -24,4 +24,5 @@ func init() {
 	Preload(pluginpeerlog.Plugins...)
 	Preload(pluginfxtest.Plugins...)
 	Preload(pluginstorjds.Plugins[0])
+	Preload(pluginstorjds.Plugins[0])
 }
diff --git a/ipfs/kubo/source.json b/ipfs/kubo/source.json
index 047c789..2c40688 100644
--- a/ipfs/kubo/source.json
+++ b/ipfs/kubo/source.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/ipfs/kubo",
-  "rev": "b27da1cc871ad98862409c3ceb1bfbca9e8f9bd5",
-  "date": "2023-05-09T15:05:35+02:00",
-  "path": "/nix/store/yvgn9bbpq1401la8vymrbyygy5gbi9ya-kubo",
-  "sha256": "1ffs4bzmazpxzazgkx14vn61dfpw1y4f6rvcavjy6ncf3a5vm61x",
+  "rev": "da28fbc65a2e0f1ce59f9923823326ae2bc4f713",
+  "date": "2023-05-16T15:42:54+02:00",
+  "path": "/nix/store/kbfj1y2diqivxh1xn4phrgr7092ks9l8-kubo",
+  "sha256": "1f4rdwpcbyxg9dplbjp5l6k643rqzq1fmm5v0mv09fcvzjpymcdw",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/linux/bcachefs/default.nix b/linux/bcachefs/default.nix
index b4a3bbb..f868953 100644
--- a/linux/bcachefs/default.nix
+++ b/linux/bcachefs/default.nix
@@ -1,21 +1,22 @@
-{ lib,
+{
+  lib,
   fetchFromGitHub,
   buildLinux,
   ...
-} @ args:
-
-let 
-    modDirVersion = "6.3.0";
-    source = builtins.fromJSON (builtins.readFile ./source.json);
-in buildLinux (args // {
-    inherit modDirVersion;
-    version = "6.3.0+${source.rev}";
-    src = fetchFromGitHub {
+} @ args: let
+  modDirVersion = "6.3.0";
+  source = builtins.fromJSON (builtins.readFile ./source.json);
+in
+  buildLinux (args
+    // {
+      inherit modDirVersion;
+      version = "6.3.0+${source.rev}";
+      src = fetchFromGitHub {
         owner = "koverstreet";
         repo = "bcachefs";
         inherit (source) rev sha256;
-    };
-    structuredExtraConfig = with lib.kernel; {
+      };
+      structuredExtraConfig = with lib.kernel; {
         BCACHEFS_FS = module;
         BCACHEFS_DEBUG = yes;
         KALLSYMS = yes;
@@ -23,10 +24,10 @@ in buildLinux (args // {
         DEBUG_FS = yes;
         DYNAMIC_FTRACE = yes;
         FTRACE = yes;
-    };
-    passthru.updateScript = [
+      };
+      passthru.updateScript = [
         ../../scripts/update-git.sh
         "github.com/koverstreet/bcachefs"
         "linux/bcachefs/source.json"
-    ];
-})
+      ];
+    })
diff --git a/overlay.nix b/overlay.nix
index 38cd697..92ba92b 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -85,7 +85,7 @@ system: self: super: let
       wordpress-plugins = self.callPackage ./web/wordpress-plugins {};
       wordpress-themes = self.callPackage ./web/wordpress-themes {};
       kubo = self.callPackage ./ipfs/kubo {};
-      linux-bcachefs = self.callPackage ./linux/bcachefs { kernelPatches = []; };
+      linux-bcachefs = self.callPackage ./linux/bcachefs {kernelPatches = [];};
     })
     riscv-overlay
   ];