Merge fort-nix/nix-bitcoin#489: Update nixpkgs & joinmarket: 0.9.5 -> 0.9.6

cb295d1a16 joinmarket: 0.9.5 -> 0.9.6 (nixbitcoin)
568d728e5c joinmarket: put python-packages in alphabetical order (nixbitcoin)
a3ff1351d9 update nixpkgs (Jonas Nick)
636d508b50 spark-wallet: use nodejs 14 instead of 12 since latter is EOL (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK cb295d1a16

Tree-SHA512: ca124de4d393c3828454599e4d3d3357560a6ae902c569b3edabf395cd6f5d50d8904db9f078f02b70cd0b67d013a263d238e9bc36ba34bc1bb7d9d9fd02a7e9

pkgs/joinmarket/default.nix

@@ -1,18 +1,18 @@
 { stdenv, lib, fetchurl, applyPatches, fetchpatch, python3, nbPythonPackageOverrides, pkgs }:
 
 let
-  version = "0.9.5";
+  version = "0.9.6";
   src = applyPatches {
     src = fetchurl {
       url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz";
-      sha256 = "0q8hfq4y7az5ly97brq1khhhvhnq6irzw0ginmz20fwn7w3yc5sn";
+      sha256 = "040qj3abqkk74zyi5yav1ijlh5cmd49wlymald2lzk35adnx804g";
     };
     patches = [
       (fetchpatch {
-        # https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1206
-        name = "ob-export-fix";
-        url = "https://patch-diff.githubusercontent.com/raw/JoinMarket-Org/joinmarket-clientserver/pull/1206.patch";
-        sha256 = "0532gixjyc8r11sfmlf32v5iwy0rhkpa8rbvm4b7h509hnyycvhx";
+        # https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1264
+        name = "use-twisted-22.4.0";
+        url = "https://patch-diff.githubusercontent.com/raw/JoinMarket-Org/joinmarket-clientserver/pull/1264.patch";
+        sha256 = "1nlyhc5myph9239d5zczsl4jan4qj4ggy0l1f39jv0ihjbjhcks5";
       })
     ];
   };

pkgs/pinned.nix

@@ -3,8 +3,7 @@ pkgs: pkgsUnstable:
 {
   inherit (pkgs)
     charge-lnd
-    extra-container
-    lndconnect;
+    extra-container;
 
   inherit (pkgsUnstable)
     bitcoin
@@ -17,6 +16,7 @@ pkgs: pkgsUnstable:
     lightning-loop
     lightning-pool
     lnd
+    lndconnect
     nbxplorer;
 
   inherit pkgs pkgsUnstable;

pkgs/python-packages/default.nix

@@ -8,13 +8,13 @@ let
   unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
 in {
   bencoderpyx = callPackage ./bencoderpyx {};
+  chromalog = callPackage ./chromalog {};
   coincurve = callPackage ./coincurve {};
   python-bitcointx = callPackage ./python-bitcointx { inherit (nbPkgs) secp256k1; };
-  urldecode = callPackage ./urldecode {};
-  chromalog = callPackage ./chromalog {};
-  txzmq = callPackage ./txzmq {};
-  sha256 = callPackage ./sha256 {};
   runes = callPackage ./runes {};
+  sha256 = callPackage ./sha256 {};
+  txzmq = callPackage ./txzmq {};
+  urldecode = callPackage ./urldecode {};
 
   joinmarketbase = joinmarketPkg ./jmbase;
   joinmarketclient = joinmarketPkg ./jmclient;

pkgs/spark-wallet/composition.nix

@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import "${toString pkgs.path}/pkgs/development/node-packages/node-env.nix" {

pkgs/spark-wallet/generate.sh

@@ -28,8 +28,11 @@ tar xvf $TMPDIR/$file -C $src --strip-components 1 >/dev/null
 jq '.dependencies["qrcode-terminal"] = .optionalDependencies["qrcode-terminal"]' $src/package.json | sponge $src/package.json
 
 # Generate nix pkg
+# TODO-EXTERNAL: remove --nodejs-14 option once
+# https://github.com/svanderburg/node2nix/pull/296 has made its way into a
+# node2nix release.
 node2nix \
-  --nodejs-12 \
+  --nodejs-14 \
   --input $src/package.json \
   --lock $src/npm-shrinkwrap.json \
   --composition composition.nix \