From 00163cdaef6e23b7dcb85e42a304cac860c5a39d Mon Sep 17 00:00:00 2001 From: Gitea Bot Date: Wed, 17 May 2023 13:45:03 +0000 Subject: [PATCH] Update mautrix-signal --- ipfs/kubo/default.nix | 4 ++-- linux/bcachefs/default.nix | 33 ++++++++++++++++--------------- matrix/mautrix-signal/source.json | 8 ++++---- overlay.nix | 2 +- 4 files changed, 24 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/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/matrix/mautrix-signal/source.json b/matrix/mautrix-signal/source.json index 2a131b4..7a57b7c 100644 --- a/matrix/mautrix-signal/source.json +++ b/matrix/mautrix-signal/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/mautrix/signal", - "rev": "e98a9900c1f0ec924c55b4d7de5530e516c9d7e1", - "date": "2023-05-07T18:19:56+03:00", - "path": "/nix/store/8gsd9nam1dls49f613l66wn5mjx2hlnw-signal", - "sha256": "1jwp6dxc76p306wl7wm6v3d16kpfx0s8l6mycrmwpldshc16xdjz", + "rev": "e30f6f71bec99da396b9f98b09577315d0fbbc3a", + "date": "2023-05-17T15:03:49+03:00", + "path": "/nix/store/jrw7n7yp2lavpvqd7i71qljg00qw57f5-signal", + "sha256": "1gwbivb1vmv1xmvlyxilqyraxb8hznk01z5nrzq054q61fldzswn", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, 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 ];