From ffabad225b3dcfbce91ee78a771f5d9130fa825e Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Thu, 20 Jan 2022 21:58:11 +0000
Subject: [PATCH 1/2] spark-wallet: switch from nodejs 10 to 12

nixpkgs starts marking nodejs 10 as insecure because it is end of life.
---
 pkgs/spark-wallet/composition.nix | 2 +-
 pkgs/spark-wallet/generate.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/spark-wallet/composition.nix b/pkgs/spark-wallet/composition.nix
index f49b28e..01c4b77 100644
--- a/pkgs/spark-wallet/composition.nix
+++ b/pkgs/spark-wallet/composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
 
 let
   nodeEnv = import "${toString pkgs.path}/pkgs/development/node-packages/node-env.nix" {
diff --git a/pkgs/spark-wallet/generate.sh b/pkgs/spark-wallet/generate.sh
index 88dfffc..6f2aa7e 100755
--- a/pkgs/spark-wallet/generate.sh
+++ b/pkgs/spark-wallet/generate.sh
@@ -29,7 +29,7 @@ jq '.dependencies["qrcode-terminal"] = .optionalDependencies["qrcode-terminal"]'
 
 # Generate nix pkg
 node2nix \
-  --nodejs-10 \
+  --nodejs-12 \
   --input $src/package.json \
   --lock $src/npm-shrinkwrap.json \
   --composition composition.nix \

From 5b7bc2d6ff1926c5d60e58b79d7dd19204a8690e Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Thu, 20 Jan 2022 21:52:06 +0000
Subject: [PATCH 2/2] update nixpkgs{-unstable}

electrs: 0.9.3 -> 0.9.4
---
 flake.lock                   | 12 ++++++------
 pkgs/pinned.nix              |  2 +-
 test/nixos-search/flake.lock |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7ab8387..771933d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1640887906,
-        "narHash": "sha256-Eupk1UlNicCD2UNZuEKt6yhE6kFWAxXM/HyziOjG9CA=",
+        "lastModified": 1642609835,
+        "narHash": "sha256-ZwJnV4mdis28u5vH240ec2mrApuEJYJekn23qlTwJ8c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8a053bc2255659c5ca52706b9e12e76a8f50dbdd",
+        "rev": "77aa71f66fd05d9e7b7d1c084865d703a8008ab7",
         "type": "github"
       },
       "original": {
@@ -33,11 +33,11 @@
     },
     "nixpkgsUnstable": {
       "locked": {
-        "lastModified": 1641016545,
-        "narHash": "sha256-JMNwvnBzG0RjGG3eH27Y5/GlJ9ryeCdGJfqGbqxnmZY=",
+        "lastModified": 1642336556,
+        "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6f05cfdb1e78d36c0337516df674560e4b51c79b",
+        "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
index 3aa2d1a..951a70d 100644
--- a/pkgs/pinned.nix
+++ b/pkgs/pinned.nix
@@ -6,13 +6,13 @@ pkgs: pkgsUnstable:
     bitcoind
     charge-lnd
     clightning
-    electrs
     extra-container
     hwi
     lndconnect;
 
   inherit (pkgsUnstable)
     btcpayserver
+    electrs
     elementsd
     lightning-loop
     lightning-pool
diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock
index 1afbb83..a10c22d 100644
--- a/test/nixos-search/flake.lock
+++ b/test/nixos-search/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1640965022,
-        "narHash": "sha256-PByGLFoP+VaZWKCI8KFc4EC15AWvF91Bjlpr/vvdusM=",
+        "lastModified": 1642458481,
+        "narHash": "sha256-IbWfblbs/F1UdP7Cr3zACf2WZoeEcvz6ftnojcDyPYo=",
         "owner": "nixos",
         "repo": "nixos-search",
-        "rev": "078c68764be9ef0eb51339b28f37f0d91cd8275b",
+        "rev": "5a40a2c43a5615a73c8f4ff6d0c1b84106e1280d",
         "type": "github"
       },
       "original": {