greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: greg:9a7e5e192120b2a2091b60cda070f8978b0c0ee9
Branches Tags
greg:master
greg:moneta-override-10
greg:moneta-override-4
greg:moneta-override-3
greg:moneta-override
greg:moneta-override-2
greg:dummy-branch
greg:dummy-branch-2
...
compare: greg:aa7bbb4bad3bffa9605cb27f52ccd84a7dfaf7c0
Branches Tags
greg:moneta-override-10
greg:master
greg:moneta-override-4
greg:moneta-override-3
greg:moneta-override
greg:moneta-override-2
greg:dummy-branch
greg:dummy-branch-2

4 Commits
9a7e5e1921 ... aa7bbb4bad

Author SHA1 Message Date
Greg Shuflin
aa7bbb4bad Patch to prevent chmod 2022-09-24 23:56:38 -07:00
Jonas Nick
34f6eb90d7
Merge fort-nix/nix-bitcoin#550: Update nixpkgs 
261f7a043f update nixpkgs (Jonas Nick)
09c765368f clightning-plugins: update packages (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 261f7a043f

Tree-SHA512: 30cec6e06dc56b84daf058441a25dc7593b2754c7cbdbb48562528a81727f8a7abbaf5d31497a136903485534e41b171d55a60d9bc91548feb7ff7997985e364
 2022-09-22 18:58:27 +00:00
Jonas Nick
261f7a043f
update nixpkgs 
electrs: 0.9.7 -> 0.9.9
elementsd: 0.21.0.2 -> 22.0
fulcrum: 1.7.0 -> 1.8.1
 2022-09-22 16:57:19 +00:00
Jonas Nick
09c765368f
clightning-plugins: update packages 2022-09-22 16:57:00 +00:00
5 changed files with 22 additions and 20 deletions
Show Stats Expand all files Collapse all files

12
flake.lock
View File

@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1662099760, "lastModified": 1663760840,
"narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=", "narHash": "sha256-ym5Iycs5H4cOaLfE2/vC0tsLp8XuBJQIHGV8/uXSy8M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "67e45078141102f45eff1589a831aeaa3182b41e", "rev": "9bdbbaa634aa666eb6a27096bdcb991c59181244",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,11 +33,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1662096612, "lastModified": 1663757063,
"narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=", "narHash": "sha256-H+BPgoXuVcdi3g5BH4cact4osjfjntaTQTdA/HNiCYE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "21de2b973f9fee595a7a1ac4693efff791245c34", "rev": "a0e390471362e27349abc1090197e09fe8c59d16",
"type": "github" "type": "github"
}, },
"original": { "original": {

16
modules/bitcoind.nix
View File

@ -367,9 +367,10 @@ in {
proto.sam.enable = true; proto.sam.enable = true;
}; };
systemd.tmpfiles.rules = [ # Commented out to avoid trying to chown the nfs-mounted directory
"d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group} - -" # systemd.tmpfiles.rules = [
]; # "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group} - -"
# ];
systemd.services.bitcoind = { systemd.services.bitcoind = {
# Use `wants` instead of `requires` so that bitcoind and all dependent services # Use `wants` instead of `requires` so that bitcoind and all dependent services
@ -412,9 +413,9 @@ in {
''; '';
# Enable RPC access for group # Enable RPC access for group
postStart = '' # postStart = ''
chmod g=r '${cfg.dataDir}/${optionalString cfg.regtest "regtest/"}.cookie' # chmod g=r '${cfg.dataDir}/${optionalString cfg.regtest "regtest/"}.cookie'
''; # '';
serviceConfig = nbLib.defaultHardening // { serviceConfig = nbLib.defaultHardening // {
Type = "notify"; Type = "notify";
@ -426,7 +427,8 @@ in {
ExecStart = "${cfg.package}/bin/bitcoind -datadir='${cfg.dataDir}'"; ExecStart = "${cfg.package}/bin/bitcoind -datadir='${cfg.dataDir}'";
Restart = "on-failure"; Restart = "on-failure";
UMask = mkIf cfg.dataDirReadableByGroup "0027"; UMask = mkIf cfg.dataDirReadableByGroup "0027";
ReadWritePaths = [ cfg.dataDir ]; #ReadWritePaths = [ cfg.dataDir ];
ReadWritePaths = [ "/dummy" ];
} // nbLib.allowedIPAddresses cfg.tor.enforce } // nbLib.allowedIPAddresses cfg.tor.enforce
// optionalAttrs zmqServerEnabled nbLib.allowNetlink; // optionalAttrs zmqServerEnabled nbLib.allowNetlink;
}; };

4
pkgs/clightning-plugins/default.nix
View File

@ -6,8 +6,8 @@ let
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lightningd"; owner = "lightningd";
repo = "plugins"; repo = "plugins";
rev = "59bad754cb338872c622ad716e8ed0063edf4052"; rev = "e625369423b00c70b23641662f62ccd898286edc";
sha256 = "19nnmv2jvb0xmcha79dij399avasn2x521n9qg11lqj8xnzadm6a"; sha256 = "04f30xlfr7pgdmdgka87x7sc9j82wc4zv7fbiqrjsc83dkmly81i";
}; };
version = builtins.substring 0 7 src.rev; version = builtins.substring 0 7 src.rev;

4
pkgs/pinned.nix
View File

@ -4,8 +4,6 @@ pkgs: pkgsUnstable:
inherit (pkgs) inherit (pkgs)
bitcoin bitcoin
bitcoind bitcoind
electrs
elementsd
extra-container extra-container
lightning-pool lightning-pool
lndconnect lndconnect
@ -15,6 +13,8 @@ pkgs: pkgsUnstable:
btcpayserver btcpayserver
charge-lnd charge-lnd
clightning clightning
electrs
elementsd
fulcrum fulcrum
hwi hwi
lightning-loop lightning-loop

6
test/nixos-search/flake.lock
View File

@ -38,11 +38,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1661847188, "lastModified": 1662653345,
"narHash": "sha256-GSA60qVevqN2Q+bbD4O6nbWUCzNtjbEQhYBvcSSRIkI=", "narHash": "sha256-0rNKV9TyHUJSGe9Y16ZNnFBGTUIpfqU5Oy4K6pW4dW0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-search", "repo": "nixos-search",
"rev": "7d1c1046ba918625fef44a204c219188824f46fb", "rev": "e7ceafb0d4fa3c570bbf06918db75760fba7f384",
"type": "github" "type": "github"
}, },
"original": { "original": {