darkkirb/nix-packages
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update mautrix-telegram #63

Closed
gitea-bot wants to merge 1 commit from update-mautrix-telegram into main
pull from: update-mautrix-telegram
merge into: darkkirb:main
Conversation 0 Commits 1 Files changed 4 +24 -23
4 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ipfs/kubo/default.nix
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 = ''

33
linux/bcachefs/default.nix
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"
]; ];
}) })

8
matrix/mautrix-telegram/source.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/mautrix/telegram", "url": "https://github.com/mautrix/telegram",
"rev": "810f86343a1facb26f321be1a891298319775283", "rev": "e1c800f3e6f82dcc4699f12febd7b8b050b1eeaa",
"date": "2023-05-08T17:56:27+03:00", "date": "2023-05-16T19:47:01+03:00",
"path": "/nix/store/3264m8wig7g93r2kw4g4hazis0q62gi9-telegram", "path": "/nix/store/cjviflp4ivmryqm9bync64x5hc1l2hi8-telegram",
"sha256": "070fhrbxg0a7jszcc4gpw50dkllhrdq3l28g4vqdcdppvlkqb5kf", "sha256": "0q43nqvy4gcw49vnn6khzldkjv143x0mfnfad7925yqqrhr03ry2",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

2
overlay.nix
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
]; ];