Patch electrs to avoid chmod

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

flake.lock

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

modules/bitcoind.nix

@@ -367,9 +367,10 @@ in {
       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 = {
       # Use `wants` instead of `requires` so that bitcoind and all dependent services
@@ -412,9 +413,9 @@ in {
       '';
 
       # 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 // {
         Type = "notify";

modules/electrs.nix

@@ -61,9 +61,10 @@ in {
       listenWhitelisted = true;
     };
 
-    systemd.tmpfiles.rules = [
+    # Commented out to allow nfs mounts
-      "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group} - -"
+    # systemd.tmpfiles.rules = [
-    ];
+    #   "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group} - -"
+    # ];
 
     systemd.services.electrs = {
       wantedBy = [ "multi-user.target" ];

pkgs/clightning-plugins/default.nix

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

pkgs/pinned.nix

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

test/nixos-search/flake.lock

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