colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

bonsaid: acquire from upstream module

Browse Source
This commit is contained in:
Colin
2024-10-11 00:06:51 +00:00
parent c10686cf0f
commit ddb10a0da3
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common/programs/bonsai.nix
View File

@@ -25,7 +25,7 @@ in
''; '';
}); });
# fs.".config/bonsai/bonsai_tree.json".symlink.target = config.services.bonsaid.settingsFile; fs.".config/bonsai/bonsai_tree.json".symlink.target = config.services.bonsaid.settingsFile;
sandbox.extraRuntimePaths = [ sandbox.extraRuntimePaths = [
"bonsai" "bonsai"

2
modules/services/default.nix
View File

@@ -1,7 +1,7 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
./bonsaid.nix # ./bonsaid.nix #< UPSTREAMING IN PROGRESS: <https://github.com/NixOS/nixpkgs/pull/347818>
./buffyboard.nix ./buffyboard.nix
./dropbear.nix ./dropbear.nix
./clightning.nix ./clightning.nix

7
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -39,6 +39,13 @@ in
# hash = "sha256-4nzTHWmAiY9HMTu07rj0RdhlK7SWshXpkoqlKHg25do="; # hash = "sha256-4nzTHWmAiY9HMTu07rj0RdhlK7SWshXpkoqlKHg25do=";
# }) # })
(fetchpatch' {
name = "nixos/bonsaid: init";
prUrl = "https://github.com/NixOS/nixpkgs/pull/347818";
# saneCommit = "bc3d311bdc11a26b8b0a95806c0ea7b80554548d";
hash = "sha256-xCZIz7vmA/Fq0/G3tyapkdU2qIVtfueArN1qvbZ0y3w=";
})
(fetchpatch' { (fetchpatch' {
name = "nixos/pam: replace apparmor warnings with assertions"; name = "nixos/pam: replace apparmor warnings with assertions";
prUrl = "https://github.com/NixOS/nixpkgs/pull/332119"; prUrl = "https://github.com/NixOS/nixpkgs/pull/332119";