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-telegram/source.json b/matrix/mautrix-telegram/source.json index b2ffba4..3929653 100644 --- a/matrix/mautrix-telegram/source.json +++ b/matrix/mautrix-telegram/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/mautrix/telegram", - "rev": "810f86343a1facb26f321be1a891298319775283", - "date": "2023-05-08T17:56:27+03:00", - "path": "/nix/store/3264m8wig7g93r2kw4g4hazis0q62gi9-telegram", - "sha256": "070fhrbxg0a7jszcc4gpw50dkllhrdq3l28g4vqdcdppvlkqb5kf", + "rev": "e1c800f3e6f82dcc4699f12febd7b8b050b1eeaa", + "date": "2023-05-16T19:47:01+03:00", + "path": "/nix/store/cjviflp4ivmryqm9bync64x5hc1l2hi8-telegram", + "sha256": "0q43nqvy4gcw49vnn6khzldkjv143x0mfnfad7925yqqrhr03ry2", "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 ];