Update kubo

This commit is contained in:
Gitea Bot 2023-05-19 14:32:21 +00:00
parent 4d7fa1d1bb
commit 9039618245
No known key found for this signature in database
GPG key ID: 417A4BCCAB696E24
5 changed files with 25 additions and 23 deletions

View file

@ -23,7 +23,7 @@
cd $out cd $out
cp ${./go.mod} go.mod cp ${./go.mod} go.mod
cp ${./go.sum} go.sum 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 echo -e "\nstorjds storj.io/ipfs-go-ds-storj/plugin 0" >> plugin/loader/preload_list
patchShebangs . patchShebangs .
''; '';
@ -48,7 +48,7 @@ in
outputs = ["out" "systemd_unit" "systemd_unit_hardened"]; outputs = ["out" "systemd_unit" "systemd_unit_hardened"];
buildPhase = '' buildPhase = ''
make build make build
''; '';
installPhase = '' installPhase = ''

View file

@ -24,4 +24,5 @@ func init() {
Preload(pluginpeerlog.Plugins...) Preload(pluginpeerlog.Plugins...)
Preload(pluginfxtest.Plugins...) Preload(pluginfxtest.Plugins...)
Preload(pluginstorjds.Plugins[0]) Preload(pluginstorjds.Plugins[0])
Preload(pluginstorjds.Plugins[0])
} }

View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/ipfs/kubo", "url": "https://github.com/ipfs/kubo",
"rev": "b27da1cc871ad98862409c3ceb1bfbca9e8f9bd5", "rev": "da28fbc65a2e0f1ce59f9923823326ae2bc4f713",
"date": "2023-05-09T15:05:35+02:00", "date": "2023-05-16T15:42:54+02:00",
"path": "/nix/store/yvgn9bbpq1401la8vymrbyygy5gbi9ya-kubo", "path": "/nix/store/kbfj1y2diqivxh1xn4phrgr7092ks9l8-kubo",
"sha256": "1ffs4bzmazpxzazgkx14vn61dfpw1y4f6rvcavjy6ncf3a5vm61x", "sha256": "1f4rdwpcbyxg9dplbjp5l6k643rqzq1fmm5v0mv09fcvzjpymcdw",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

View file

@ -1,21 +1,22 @@
{ lib, {
lib,
fetchFromGitHub, fetchFromGitHub,
buildLinux, buildLinux,
... ...
} @ args: } @ args: let
modDirVersion = "6.3.0";
let source = builtins.fromJSON (builtins.readFile ./source.json);
modDirVersion = "6.3.0"; in
source = builtins.fromJSON (builtins.readFile ./source.json); buildLinux (args
in buildLinux (args // { // {
inherit modDirVersion; inherit modDirVersion;
version = "6.3.0+${source.rev}"; version = "6.3.0+${source.rev}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "koverstreet"; owner = "koverstreet";
repo = "bcachefs"; repo = "bcachefs";
inherit (source) rev sha256; inherit (source) rev sha256;
}; };
structuredExtraConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {
BCACHEFS_FS = module; BCACHEFS_FS = module;
BCACHEFS_DEBUG = yes; BCACHEFS_DEBUG = yes;
KALLSYMS = yes; KALLSYMS = yes;
@ -23,10 +24,10 @@ in buildLinux (args // {
DEBUG_FS = yes; DEBUG_FS = yes;
DYNAMIC_FTRACE = yes; DYNAMIC_FTRACE = yes;
FTRACE = yes; FTRACE = yes;
}; };
passthru.updateScript = [ passthru.updateScript = [
../../scripts/update-git.sh ../../scripts/update-git.sh
"github.com/koverstreet/bcachefs" "github.com/koverstreet/bcachefs"
"linux/bcachefs/source.json" "linux/bcachefs/source.json"
]; ];
}) })

View file

@ -85,7 +85,7 @@ system: self: super: let
wordpress-plugins = self.callPackage ./web/wordpress-plugins {}; wordpress-plugins = self.callPackage ./web/wordpress-plugins {};
wordpress-themes = self.callPackage ./web/wordpress-themes {}; wordpress-themes = self.callPackage ./web/wordpress-themes {};
kubo = self.callPackage ./ipfs/kubo {}; kubo = self.callPackage ./ipfs/kubo {};
linux-bcachefs = self.callPackage ./linux/bcachefs { kernelPatches = []; }; linux-bcachefs = self.callPackage ./linux/bcachefs {kernelPatches = [];};
}) })
riscv-overlay riscv-overlay
]; ];