Merge fort-nix/nix-bitcoin#431: Improve Pkgs

a31d07d8bf ci: update container image for modules tests (Erik Arvstedt) bc7d3a2ed7 fetch-release: check that only one key is imported (Erik Arvstedt) 5ab85cb2a5 pkgs: add `meta` attr (Erik Arvstedt) 602281b132 rtl, cl-rest: add /bin to pkg output (Erik Arvstedt) f4872f3334 spark-wallet: use node package lockfile (Erik Arvstedt) 3091b0a4fb cl-rest: use node package lockfile (Erik Arvstedt) fbfb61210a rtl: use node package lockfile (Erik Arvstedt) d296b2d1fb charge-lnd: remove unneeded use of `literalExample` (Erik Arvstedt) f13ffe0146 run-tests: make `nixosSearch` compatible with `--copy-src` (Erik Arvstedt) 2069f62abc krops: -> 1.26.2 (Erik Arvstedt) Pull request description: ACKs for top commit: nixbitcoin: reACK a31d07d8bf Tree-SHA512: 9fcc031b2bc8a56181fa0eae84c4809d896070bca5782f6b15a79e7d3545c77b8d436f512f709a203bcead81afe3293167dd8757635d6aeb5e5c320f106b6a83
2021-12-19 19:14:13 +00:00 · 2021-12-19 19:14:13 +00:00 · dc382b8b67
commit dc382b8b67
parent 2aeee22251 a31d07d8bf
36 changed files with 1382 additions and 973 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@ -10,7 +10,8 @@ task:
  matrix:
    - name: modules_test
      container:
-        image: nixos/nix
+        # Use Nix release 2.3.x, the default on NixOS stable
+        image: nixos/nix:2.3.12
        # Besides virtualization, this also enables privileged containers which are required for
        # sandboxed builds
        kvm: true
--- a/helper/fetch-release
+++ b/helper/fetch-release
@ -1,9 +1,11 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash coreutils curl jq gnupg
+#!nix-shell -i bash -p bash coreutils curl jq gnupg gnugrep
 set -euo pipefail

 scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)

+trap 'echo "Error at ${BASH_SOURCE[0]}, line $LINENO"' ERR
+
 repo=fort-nix/nix-bitcoin
 if [[ ! -v version ]]; then
    version=$(curl -s --show-error "https://api.github.com/repos/$repo/releases/latest" | jq -r '.tag_name' | tail -c +2)
@ -17,6 +19,8 @@ mkdir -p -m 700 "$GPG_HOME"

 # Import key
 gpg --homedir $GPG_HOME --import "$scriptDir/key-jonasnick.bin" &> /dev/null
+# Check that exactly one key was imported
+(($(gpg --list-keys --with-colons | grep -c pub) == 1))
 # Verify key fingerprint
 gpg --homedir $GPG_HOME --list-keys "36C7 1A37 C9D9 88BD E825 08D9 B1A7 0E4F 8DCD 0366" > /dev/null

--- a/modules/btcpayserver.nix
+++ b/modules/btcpayserver.nix
@ -4,7 +4,7 @@ with lib;
 let
  options.services = {
    btcpayserver = {
-      enable = mkEnableOption "btcpayserver";
+      enable = mkEnableOption "btcpayserver, a self-hosted Bitcoin payment processor";
      address = mkOption {
        type = types.str;
        default = "127.0.0.1";
--- a/modules/charge-lnd.nix
+++ b/modules/charge-lnd.nix
@ -37,7 +37,7 @@ let
    policies = mkOption {
      type = types.lines;
      default = "";
-      example = literalExample ''
+      example = ''
        [discourage-routing-out-of-balance]
        chan.max_ratio = 0.1
        chan.min_capacity = 250000
--- a/modules/clightning.nix
+++ b/modules/clightning.nix
@ -3,7 +3,7 @@
 with lib;
 let
  options.services.clightning = {
-    enable = mkEnableOption "clightning";
+    enable = mkEnableOption "clightning, a Lightning Network implementation in C";
    address = mkOption {
      type = types.str;
      default = "127.0.0.1";
--- a/modules/electrs.nix
+++ b/modules/electrs.nix
@ -3,7 +3,7 @@
 with lib;
 let
  options.services.electrs = {
-    enable = mkEnableOption "electrs";
+    enable = mkEnableOption "electrs, an Electrum server implemented in Rust";
    address = mkOption {
      type = types.str;
      default = "127.0.0.1";
--- a/modules/joinmarket.nix
+++ b/modules/joinmarket.nix
@ -3,7 +3,7 @@
 with lib;
 let
  options.services.joinmarket = {
-    enable = mkEnableOption "JoinMarket";
+    enable = mkEnableOption "JoinMarket, a Bitcoin CoinJoin implementation";
    payjoinAddress = mkOption {
      type = types.str;
      default = "127.0.0.1";
@ -58,7 +58,7 @@ let
    inherit (nbLib) cliExec;

    yieldgenerator = {
-      enable = mkEnableOption "yield generator bot";
+      enable = mkEnableOption "JoinMarket yield generator bot";
      ordertype = mkOption {
        type = types.enum [ "reloffer" "absoffer" ];
        default = "reloffer";
--- a/modules/lightning-loop.nix
+++ b/modules/lightning-loop.nix
@ -3,7 +3,7 @@
 with lib;
 let
  options.services.lightning-loop = {
-    enable = mkEnableOption "lightning-loop";
+    enable = mkEnableOption "Lightning Loop, a non-custodial off/on chain bridge";
    rpcAddress = mkOption {
       type = types.str;
       default = "localhost";
--- a/modules/lightning-pool.nix
+++ b/modules/lightning-pool.nix
@ -3,7 +3,7 @@
 with lib;
 let
  options.services.lightning-pool = {
-    enable = mkEnableOption "lightning-pool";
+    enable = mkEnableOption "Lightning Pool, a marketplace for inbound lightning liquidity ";
    rpcAddress = mkOption {
       type = types.str;
       default = "localhost";
--- a/modules/liquid.nix
+++ b/modules/liquid.nix
@ -4,7 +4,7 @@ with lib;
 let
  options = {
    services.liquidd = {
-      enable = mkEnableOption "Liquid sidechain";
+      enable = mkEnableOption "Liquid Bitcoin sidechain daemon";
      address = mkOption {
        type = types.str;
        default = "127.0.0.1";
--- a/modules/lnd.nix
+++ b/modules/lnd.nix
@ -3,7 +3,7 @@
 with lib;
 let
  options.services.lnd = {
-    enable = mkEnableOption "Lightning Network Daemon";
+    enable = mkEnableOption "Lightning Network daemon, a Lightning Network implementation in Go";
    address = mkOption {
      type = types.str;
      default = "localhost";
--- a/modules/rtl.nix
+++ b/modules/rtl.nix
@ -3,7 +3,7 @@
 with lib;
 let
  options.services.rtl = {
-    enable = mkEnableOption "rtl";
+    enable = mkEnableOption "Ride The Lightning, a web interface for lnd and clightning ";
    address = mkOption {
      type = types.str;
      default = "127.0.0.1";
@ -105,6 +105,7 @@ let

  cfg = config.services.rtl;
  nbLib = config.nix-bitcoin.lib;
+  nbPkgs = config.nix-bitcoin.pkgs;
  secretsDir = config.nix-bitcoin.secretsDir;

  node = { isLnd, index }: ''
@ -223,7 +224,7 @@ in {
            install -D -o ${cfg.user} -g ${cfg.group} ${lnd.networkDir}/admin.macaroon \
              '${cfg.dataDir}/macaroons/admin.macaroon'
          '');
-        ExecStart = "${pkgs.nodejs}/bin/node ${config.nix-bitcoin.pkgs.rtl}/lib/node_modules/rtl/rtl";
+        ExecStart = "${nbPkgs.rtl}/bin/rtl";
        # Show "rtl" instead of "node" in the journal
        SyslogIdentifier = "rtl";
        User = cfg.user;
@ -247,7 +248,7 @@ in {
        StateDirectory = "cl-rest";
        # cl-rest reads the config file from the working directory
        WorkingDirectory = cl-rest.dataDir;
-        ExecStart = "${pkgs.nodejs}/bin/node ${config.nix-bitcoin.pkgs.cl-rest}/lib/node_modules/c-lightning-rest/cl-rest";
+        ExecStart = "${nbPkgs.cl-rest}/bin/cl-rest";
        # Show "cl-rest" instead of "node" in the journal
        SyslogIdentifier = "cl-rest";
        User = cfg.user;
--- a/pkgs/cl-rest/composition.nix
+++ b/pkgs/cl-rest/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" {
--- a/pkgs/cl-rest/default.nix
+++ b/pkgs/cl-rest/default.nix
@ -1,5 +1,23 @@
-{ stdenv, pkgs, lib }:
-lib.head (builtins.attrValues (import ./composition.nix {
-    inherit pkgs;
-    inherit (stdenv.hostPlatform) system;
-}))
+{ pkgs, lib, makeWrapper }:
+let
+  inherit (pkgs) nodejs;
+  nodePackages = import ./composition.nix { inherit pkgs nodejs; };
+in
+nodePackages.package.overrideAttrs (old: {
+  nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
+    makeWrapper
+  ];
+
+  postInstall = ''
+    makeWrapper ${nodejs}/bin/node $out/bin/cl-rest \
+      --add-flags $out/lib/node_modules/c-lightning-rest/cl-rest
+  '';
+
+  meta = with lib; {
+    description = "REST API for C-Lightning";
+    homepage = "https://github.com/Ride-The-Lightning/c-lightning-REST";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nixbitcoin earvstedt ];
+    platforms = platforms.unix;
+  };
+})
--- a/pkgs/cl-rest/generate.sh
+++ b/pkgs/cl-rest/generate.sh
@ -1,31 +1,44 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix gnupg wget jq moreutils
+#! nix-shell -i bash -p nodePackages.node2nix gnupg wget jq gnused
 set -euo pipefail

 TMPDIR="$(mktemp -d -p /tmp)"
 trap "rm -rf $TMPDIR" EXIT

-# Get/verify source tarball
 version="0.6.0"
+repo=https://github.com/Ride-The-Lightning/c-lightning-REST
+
+# Fetch and verify source tarball
+file=v${version}.tar.gz
+url=$repo/archive/refs/tags/$file
 export GNUPGHOME=$TMPDIR
 gpg --keyserver hkps://keyserver.ubuntu.com --recv-key 3E9BD4436C288039CA827A9200C9E2BC2E45666F
-wget -P $TMPDIR https://github.com/Ride-The-Lightning/c-lightning-REST/archive/refs/tags/v${version}.tar.gz
-wget -P $TMPDIR https://github.com/Ride-The-Lightning/c-lightning-REST/releases/download/v${version}/v${version}.tar.gz.asc
-gpg --verify $TMPDIR/v${version}.tar.gz.asc $TMPDIR/v${version}.tar.gz
-shasum=$(sha256sum $TMPDIR/v${version}.tar.gz | cut -d\  -f1)
+wget -P $TMPDIR $url
+wget -P $TMPDIR $repo/releases/download/v${version}/$file.asc
+gpg --verify $TMPDIR/$file.asc $TMPDIR/$file
+hash=$(nix hash file $TMPDIR/$file)

-# Run node2nix
-mkdir $TMPDIR/package && tar xvf $TMPDIR/v${version}.tar.gz -C $TMPDIR/package --strip-components 1
-cp pkg.json $TMPDIR/pkg.json
-node2nix --nodejs-10 -i $TMPDIR/pkg.json -c composition.nix --no-copy-node-env
+# Extract source
+src=$TMPDIR/src
+mkdir $src
+tar xvf $TMPDIR/$file -C $src --strip-components 1 >/dev/null

-# Set node env import.
-# The reason for not providing a custom node-env.nix file is the following:
-# To be flakes-compatible, we have to locate the nixpgs source via `pkgs.path` instead of `<nixpkgs>`.
-# This requires the `pkgs` variable which is available only in composition.nix, not in node-env.nix.
+# Generate nix pkg
+node2nix \
+  --input $src/package.json \
+  --lock $src/package-lock.json \
+  --composition composition.nix \
+  --no-copy-node-env
+
+# Use node-env.nix from nixpkgs
 nodeEnvImport='import "${toString pkgs.path}/pkgs/development/node-packages/node-env.nix"'
 sed -i "s|import ./node-env.nix|$nodeEnvImport|" composition.nix

-# Use verified source in node-packages.nix
-url="https://github.com/Ride-The-Lightning/c-lightning-REST/archive/refs/tags/v$version.tar.gz"
-sed -i '/packageName = "c-lightning-rest";/!b;n;n;c\    src = fetchurl {\n      url = "'$url'";\n      sha256 = "'$shasum'";\n    };' node-packages.nix
+# Use the verified package src
+read -d '' fetchurl <<EOF || :
+fetchurl {
+      url = "$url";
+      hash = "$hash";
+    };
+EOF
+sed -i "s|src = .*/src;|src = ${fetchurl//$'\n'/\\n}|" node-packages.nix
--- a/pkgs/cl-rest/node-packages.nix
+++ b/pkgs/cl-rest/node-packages.nix
@ -94,13 +94,13 @@ let
        sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
      };
    };
-    "balanced-match-1.0.2" = {
+    "balanced-match-1.0.0" = {
      name = "balanced-match";
      packageName = "balanced-match";
-      version = "1.0.2";
+      version = "1.0.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz";
-        sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==";
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
      };
    };
    "bcrypt-pbkdf-1.0.2" = {
@ -112,6 +112,15 @@ let
        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
      };
    };
+    "body-parser-1.18.3" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.18.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz";
+        sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4";
+      };
+    };
    "body-parser-1.19.0" = {
      name = "body-parser";
      packageName = "body-parser";
@ -130,6 +139,15 @@ let
        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
      };
    };
+    "bytes-3.0.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz";
+        sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
+      };
+    };
    "bytes-3.1.0" = {
      name = "bytes";
      packageName = "bytes";
@ -175,22 +193,13 @@ let
        sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
      };
    };
-    "commander-2.20.3" = {
+    "commander-2.20.0" = {
      name = "commander";
      packageName = "commander";
-      version = "2.20.3";
+      version = "2.20.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
-        sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
-      };
-    };
-    "commander-4.0.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-4.0.1.tgz";
-        sha512 = "IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==";
+        url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz";
+        sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==";
      };
    };
    "concat-map-0.0.1" = {
@ -202,13 +211,13 @@ let
        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
      };
    };
-    "content-disposition-0.5.3" = {
+    "content-disposition-0.5.2" = {
      name = "content-disposition";
      packageName = "content-disposition";
-      version = "0.5.3";
+      version = "0.5.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz";
-        sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==";
+        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz";
+        sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4";
      };
    };
    "content-type-1.0.4" = {
@ -220,13 +229,13 @@ let
        sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
      };
    };
-    "cookie-0.4.0" = {
+    "cookie-0.3.1" = {
      name = "cookie";
      packageName = "cookie";
-      version = "0.4.0";
+      version = "0.3.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz";
-        sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==";
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz";
+        sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
      };
    };
    "cookie-signature-1.0.6" = {
@ -328,13 +337,13 @@ let
        sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
      };
    };
-    "error-7.2.1" = {
+    "error-7.0.2" = {
      name = "error";
      packageName = "error";
-      version = "7.2.1";
+      version = "7.0.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/error/-/error-7.2.1.tgz";
-        sha512 = "fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==";
+        url = "https://registry.npmjs.org/error/-/error-7.0.2.tgz";
+        sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02";
      };
    };
    "escape-html-1.0.3" = {
@ -373,13 +382,13 @@ let
        sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
      };
    };
-    "express-4.17.1" = {
+    "express-4.16.4" = {
      name = "express";
      packageName = "express";
-      version = "4.17.1";
+      version = "4.16.4";
      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz";
-        sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==";
+        url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz";
+        sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==";
      };
    };
    "extend-3.0.2" = {
@ -418,13 +427,13 @@ let
        sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
      };
    };
-    "finalhandler-1.1.2" = {
+    "finalhandler-1.1.1" = {
      name = "finalhandler";
      packageName = "finalhandler";
-      version = "1.1.2";
+      version = "1.1.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz";
-        sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz";
+        sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==";
      };
    };
    "forever-agent-0.6.1" = {
@ -445,13 +454,13 @@ let
        sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
      };
    };
-    "forwarded-0.2.0" = {
+    "forwarded-0.1.2" = {
      name = "forwarded";
      packageName = "forwarded";
-      version = "0.2.0";
+      version = "0.1.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz";
-        sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==";
+        url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz";
+        sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
      };
    };
    "fresh-0.5.2" = {
@ -481,13 +490,13 @@ let
        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
      };
    };
-    "glob-7.1.6" = {
+    "glob-7.1.4" = {
      name = "glob";
      packageName = "glob";
-      version = "7.1.6";
+      version = "7.1.4";
      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
-        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
+        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
      };
    };
    "har-schema-2.0.0" = {
@ -508,6 +517,15 @@ let
        sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==";
      };
    };
+    "http-errors-1.6.3" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz";
+        sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d";
+      };
+    };
    "http-errors-1.7.2" = {
      name = "http-errors";
      packageName = "http-errors";
@ -526,6 +544,15 @@ let
        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
      };
    };
+    "iconv-lite-0.4.23" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.23";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";
+        sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==";
+      };
+    };
    "iconv-lite-0.4.24" = {
      name = "iconv-lite";
      packageName = "iconv-lite";
@ -553,13 +580,13 @@ let
        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
      };
    };
-    "ipaddr.js-1.9.1" = {
+    "ipaddr.js-1.9.0" = {
      name = "ipaddr.js";
      packageName = "ipaddr.js";
-      version = "1.9.1";
+      version = "1.9.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
-        sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz";
+        sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==";
      };
    };
    "is-typedarray-1.0.0" = {
@ -607,13 +634,13 @@ let
        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
      };
    };
-    "json-schema-ref-parser-7.1.4" = {
+    "json-schema-ref-parser-7.1.2" = {
      name = "json-schema-ref-parser";
      packageName = "json-schema-ref-parser";
-      version = "7.1.4";
+      version = "7.1.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-7.1.4.tgz";
-        sha512 = "AD7bvav0vak1/63w3jH8F7eHId/4E4EPdMAEZhGxtjktteUv9dnNB/cJy6nVnMyoTPBJnLwFK6tiQPSTeleCtQ==";
+        url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-7.1.2.tgz";
+        sha512 = "bi2Nns2UqdX7wThX5qSHd+lOxlu9oeJvlCnWGuR3qS4Ex4UZtuwygkyq/43J31GuNGX8xBHeV6zjQztYk/G5VA==";
      };
    };
    "json-schema-traverse-0.4.1" = {
@ -706,31 +733,31 @@ let
        sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
      };
    };
-    "mime-1.6.0" = {
+    "mime-1.4.1" = {
      name = "mime";
      packageName = "mime";
-      version = "1.6.0";
+      version = "1.4.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
-        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
+        url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz";
+        sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
      };
    };
-    "mime-db-1.51.0" = {
+    "mime-db-1.40.0" = {
      name = "mime-db";
      packageName = "mime-db";
-      version = "1.51.0";
+      version = "1.40.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz";
-        sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
+        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
      };
    };
-    "mime-types-2.1.34" = {
+    "mime-types-2.1.24" = {
      name = "mime-types";
      packageName = "mime-types";
-      version = "2.1.34";
+      version = "2.1.24";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz";
-        sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
+        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
      };
    };
    "minimatch-3.0.4" = {
@ -751,15 +778,6 @@ let
        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
      };
    };
-    "ms-2.1.1" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
-        sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
-      };
-    };
    "negotiator-0.6.2" = {
      name = "negotiator";
      packageName = "negotiator";
@ -796,13 +814,13 @@ let
        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
      };
    };
-    "ono-6.0.1" = {
+    "ono-5.1.0" = {
      name = "ono";
      packageName = "ono";
-      version = "6.0.1";
+      version = "5.1.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/ono/-/ono-6.0.1.tgz";
-        sha512 = "5rdYW/106kHqLeG22GE2MHKq+FlsxMERZev9DCzQX1zwkxnFwBivSn5i17a5O/rDmOJOdf4Wyt80UZljzx9+DA==";
+        url = "https://registry.npmjs.org/ono/-/ono-5.1.0.tgz";
+        sha512 = "GgqRIUWErLX4l9Up0khRtbrlH8Fyj59A0nKv8V6pWEto38aUgnOGOOF7UmgFFLzFnDSc8REzaTXOc0hqEe7yIw==";
      };
    };
    "openapi-schemas-1.0.3" = {
@ -859,13 +877,13 @@ let
        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
      };
    };
-    "proxy-addr-2.0.7" = {
+    "proxy-addr-2.0.5" = {
      name = "proxy-addr";
      packageName = "proxy-addr";
-      version = "2.0.7";
+      version = "2.0.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz";
-        sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz";
+        sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
      };
    };
    "psl-1.8.0" = {
@ -913,6 +931,15 @@ let
        sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
      };
    };
+    "raw-body-2.3.3" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz";
+        sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==";
+      };
+    };
    "raw-body-2.4.0" = {
      name = "raw-body";
      packageName = "raw-body";
@ -949,22 +976,31 @@ let
        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
      };
    };
-    "send-0.17.1" = {
+    "send-0.16.2" = {
      name = "send";
      packageName = "send";
-      version = "0.17.1";
+      version = "0.16.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz";
-        sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==";
+        url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz";
+        sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==";
      };
    };
-    "serve-static-1.14.1" = {
+    "serve-static-1.13.2" = {
      name = "serve-static";
      packageName = "serve-static";
-      version = "1.14.1";
+      version = "1.13.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz";
-        sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz";
+        sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==";
+      };
+    };
+    "setprototypeof-1.1.0" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz";
+        sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==";
      };
    };
    "setprototypeof-1.1.1" = {
@ -1003,6 +1039,15 @@ let
        sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
      };
    };
+    "statuses-1.4.0" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz";
+        sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==";
+      };
+    };
    "statuses-1.5.0" = {
      name = "statuses";
      packageName = "statuses";
@ -1021,13 +1066,13 @@ let
        sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add";
      };
    };
-    "swagger-jsdoc-3.7.0" = {
+    "swagger-jsdoc-3.4.0" = {
      name = "swagger-jsdoc";
      packageName = "swagger-jsdoc";
-      version = "3.7.0";
+      version = "3.4.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-jsdoc/-/swagger-jsdoc-3.7.0.tgz";
-        sha512 = "K3R1NaP1CoWXeBp2F8Oh1vrtHRaDA2+pN17Ls/U1lHOtRlKtbtICwPKLRNOA2kDY0x2SXsCZisKiJlBStnv3yg==";
+        url = "https://registry.npmjs.org/swagger-jsdoc/-/swagger-jsdoc-3.4.0.tgz";
+        sha512 = "lS3dpULpwQ5TSfPF9d9nxyXicTjJMgBGu74g/GQ0r247QMVsgqa6cL9sJ0NtK2IGxzG3HozBcXKv7qo+ns+hqg==";
      };
    };
    "swagger-methods-2.0.2" = {
@ -1039,31 +1084,31 @@ let
        sha512 = "/RNqvBZkH8+3S/FqBPejHxJxZenaYq3MrpeXnzi06aDIS39Mqf5YCUNb/ZBjsvFFt8h9FxfKs8EXPtcYdfLiRg==";
      };
    };
-    "swagger-parser-8.0.4" = {
+    "swagger-parser-8.0.0" = {
      name = "swagger-parser";
      packageName = "swagger-parser";
-      version = "8.0.4";
+      version = "8.0.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-parser/-/swagger-parser-8.0.4.tgz";
-        sha512 = "KGRdAaMJogSEB7sPKI31ptKIWX8lydEDAwWgB4pBMU7zys5cd54XNhoPSVlTxG/A3LphjX47EBn9j0dOGyzWbA==";
+        url = "https://registry.npmjs.org/swagger-parser/-/swagger-parser-8.0.0.tgz";
+        sha512 = "zk6ig8J2B4OqCnBSIqO67/Ui96NTjuoX10YGa4YVlIlQzLpHUZbLFZaO+zSubQoqAiJxmpvlbUplEcFIsPCESA==";
      };
    };
-    "swagger-ui-dist-3.52.5" = {
+    "swagger-ui-dist-3.24.0" = {
      name = "swagger-ui-dist";
      packageName = "swagger-ui-dist";
-      version = "3.52.5";
+      version = "3.24.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.52.5.tgz";
-        sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw==";
+        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.24.0.tgz";
+        sha512 = "5uAjeEqV+zbtalBDXAIrkqUZwsUHYwvBSeGYlFcLj1ERS3jfprL4OPLSSriDoeXCtNmWzpz5aooV2qJW+DqdUQ==";
      };
    };
-    "swagger-ui-express-4.1.6" = {
+    "swagger-ui-express-4.1.2" = {
      name = "swagger-ui-express";
      packageName = "swagger-ui-express";
-      version = "4.1.6";
+      version = "4.1.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.1.6.tgz";
-        sha512 = "Xs2BGGudvDBtL7RXcYtNvHsFtP1DBFPMJFRxHe5ez/VG/rzVOEjazJOOSc/kSCyxreCTKfJrII6MJlL9a6t8vw==";
+        url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.1.2.tgz";
+        sha512 = "bVT16qj6WdNlEKFkSLOoTeGuqEm2lfOFRq6mVHAx+viA/ikORE+n4CS3WpVcYmQzM4HE6+DUFgAWcMRBJNpjcw==";
      };
    };
    "toidentifier-1.0.0" = {
@ -1102,22 +1147,22 @@ let
        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
      };
    };
-    "tweetnacl-1.0.3" = {
+    "tweetnacl-1.0.1" = {
      name = "tweetnacl";
      packageName = "tweetnacl";
-      version = "1.0.3";
+      version = "1.0.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz";
-        sha512 = "6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==";
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.1.tgz";
+        sha512 = "kcoMoKTPYnoeS50tzoqjPY3Uv9axeuuFAZY9M/9zFnhoVvRfxz9K29IMPD7jGmt2c8SW7i3gT9WqDl2+nV7p4A==";
      };
    };
-    "tweetnacl-util-0.15.1" = {
+    "tweetnacl-util-0.15.0" = {
      name = "tweetnacl-util";
      packageName = "tweetnacl-util";
-      version = "0.15.1";
+      version = "0.15.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz";
-        sha512 = "RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw==";
+        url = "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.0.tgz";
+        sha1 = "4576c1cee5e2d63d207fee52f1ba02819480bc75";
      };
    };
    "type-is-1.6.18" = {
@ -1165,13 +1210,13 @@ let
        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
      };
    };
-    "validator-13.7.0" = {
+    "validator-11.1.0" = {
      name = "validator";
      packageName = "validator";
-      version = "13.7.0";
+      version = "11.1.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz";
-        sha512 = "nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==";
+        url = "https://registry.npmjs.org/validator/-/validator-11.1.0.tgz";
+        sha512 = "qiQ5ktdO7CD6C/5/mYV4jku/7qnqzjrxb3C/Q5wR3vGGinHTgJZN/TdFT3ZX4vXhX2R1PXx42fB1cn5W+uJ4lg==";
      };
    };
    "vary-1.1.2" = {
@ -1201,34 +1246,41 @@ let
        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
      };
    };
-    "ws-8.3.0" = {
+    "ws-8.2.3" = {
      name = "ws";
      packageName = "ws";
-      version = "8.3.0";
+      version = "8.2.3";
      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz";
-        sha512 = "Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==";
+        url = "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz";
+        sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==";
      };
    };
-    "z-schema-4.2.4" = {
+    "xtend-4.0.1" = {
+      name = "xtend";
+      packageName = "xtend";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
+        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+      };
+    };
+    "z-schema-4.2.2" = {
      name = "z-schema";
      packageName = "z-schema";
-      version = "4.2.4";
+      version = "4.2.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/z-schema/-/z-schema-4.2.4.tgz";
-        sha512 = "YvBeW5RGNeNzKOUJs3rTL4+9rpcvHXt5I051FJbOcitV8bl40pEfcG0Q+dWSwS0/BIYrMZ/9HHoqLllMkFhD0w==";
+        url = "https://registry.npmjs.org/z-schema/-/z-schema-4.2.2.tgz";
+        sha512 = "7bGR7LohxSdlK1EOdvA/OHksvKGE4jTLSjd8dBj9YKT0S43N9pdMZ0Z7GZt9mHrBFhbNTRh3Ky6Eu2MHsPJe8g==";
      };
    };
  };
-in
-{
-  "c-lightning-REST-file:./package" = nodeEnv.buildNodePackage {
+  args = {
    name = "c-lightning-rest";
    packageName = "c-lightning-rest";
    version = "0.6.0";
    src = fetchurl {
      url = "https://github.com/Ride-The-Lightning/c-lightning-REST/archive/refs/tags/v0.6.0.tar.gz";
-      sha256 = "7fcc3150b84f764e8e994742d0ffaa4511e052964e71bddd8e4c1420531fdaa1";
+      hash = "sha256-f8wxULhPdk6OmUdC0P+qRRHgUpZOcb3djkwUIFMf2qE=";
    };
    dependencies = [
      sources."accepts-1.3.7"
@ -1241,12 +1293,8 @@ in
      sources."atob-2.1.2"
      sources."aws-sign2-0.7.0"
      sources."aws4-1.11.0"
-      sources."balanced-match-1.0.2"
-      (sources."bcrypt-pbkdf-1.0.2" // {
-        dependencies = [
-          sources."tweetnacl-0.14.5"
-        ];
-      })
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
      sources."body-parser-1.19.0"
      sources."brace-expansion-1.1.11"
      sources."bytes-3.1.0"
@ -1254,11 +1302,11 @@ in
      sources."caseless-0.12.0"
      sources."clightningjs-0.1.1"
      sources."combined-stream-1.0.8"
-      sources."commander-4.0.1"
+      sources."commander-2.20.0"
      sources."concat-map-0.0.1"
-      sources."content-disposition-0.5.3"
+      sources."content-disposition-0.5.2"
      sources."content-type-1.0.4"
-      sources."cookie-0.4.0"
+      sources."cookie-0.3.1"
      sources."cookie-signature-1.0.6"
      sources."core-util-is-1.0.2"
      sources."dashdash-1.14.1"
@ -1270,24 +1318,39 @@ in
      sources."ecc-jsbn-0.1.2"
      sources."ee-first-1.1.1"
      sources."encodeurl-1.0.2"
-      sources."error-7.2.1"
+      sources."error-7.0.2"
      sources."escape-html-1.0.3"
      sources."esprima-4.0.1"
      sources."esutils-2.0.3"
      sources."etag-1.8.1"
-      sources."express-4.17.1"
+      (sources."express-4.16.4" // {
+        dependencies = [
+          sources."body-parser-1.18.3"
+          sources."bytes-3.0.0"
+          sources."http-errors-1.6.3"
+          sources."iconv-lite-0.4.23"
+          sources."qs-6.5.2"
+          sources."raw-body-2.3.3"
+          sources."setprototypeof-1.1.0"
+          sources."statuses-1.4.0"
+        ];
+      })
      sources."extend-3.0.2"
      sources."extsprintf-1.3.0"
      sources."fast-deep-equal-3.1.3"
      sources."fast-json-stable-stringify-2.1.0"
-      sources."finalhandler-1.1.2"
+      (sources."finalhandler-1.1.1" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
      sources."forever-agent-0.6.1"
      sources."form-data-2.3.3"
-      sources."forwarded-0.2.0"
+      sources."forwarded-0.1.2"
      sources."fresh-0.5.2"
      sources."fs.realpath-1.0.0"
      sources."getpass-0.1.7"
-      sources."glob-7.1.6"
+      sources."glob-7.1.4"
      sources."har-schema-2.0.0"
      sources."har-validator-5.1.5"
      sources."http-errors-1.7.2"
@ -1295,40 +1358,44 @@ in
      sources."iconv-lite-0.4.24"
      sources."inflight-1.0.6"
      sources."inherits-2.0.3"
-      sources."ipaddr.js-1.9.1"
+      sources."ipaddr.js-1.9.0"
      sources."is-typedarray-1.0.0"
      sources."isstream-0.1.2"
      sources."js-yaml-3.13.1"
      sources."jsbn-0.1.1"
      sources."json-schema-0.2.3"
-      sources."json-schema-ref-parser-7.1.4"
+      sources."json-schema-ref-parser-7.1.2"
      sources."json-schema-traverse-0.4.1"
      sources."json-stringify-safe-5.0.1"
      sources."jsonparse-1.3.1"
      sources."jsprim-1.4.1"
      sources."lodash.get-4.4.2"
      sources."lodash.isequal-4.5.0"
-      sources."macaroon-3.0.4"
+      (sources."macaroon-3.0.4" // {
+        dependencies = [
+          sources."tweetnacl-1.0.1"
+        ];
+      })
      sources."media-typer-0.3.0"
      sources."merge-descriptors-1.0.1"
      sources."methods-1.1.2"
-      sources."mime-1.6.0"
-      sources."mime-db-1.51.0"
-      sources."mime-types-2.1.34"
+      sources."mime-1.4.1"
+      sources."mime-db-1.40.0"
+      sources."mime-types-2.1.24"
      sources."minimatch-3.0.4"
      sources."ms-2.0.0"
      sources."negotiator-0.6.2"
      sources."oauth-sign-0.9.0"
      sources."on-finished-2.3.0"
      sources."once-1.4.0"
-      sources."ono-6.0.1"
+      sources."ono-5.1.0"
      sources."openapi-schemas-1.0.3"
      sources."openapi-types-1.3.5"
      sources."parseurl-1.3.3"
      sources."path-is-absolute-1.0.1"
      sources."path-to-regexp-0.1.7"
      sources."performance-now-2.1.0"
-      sources."proxy-addr-2.0.7"
+      sources."proxy-addr-2.0.5"
      sources."psl-1.8.0"
      sources."punycode-2.1.1"
      sources."qs-6.7.0"
@ -1341,47 +1408,42 @@ in
      })
      sources."safe-buffer-5.1.2"
      sources."safer-buffer-2.1.2"
-      (sources."send-0.17.1" // {
+      (sources."send-0.16.2" // {
        dependencies = [
-          sources."ms-2.1.1"
+          sources."http-errors-1.6.3"
+          sources."setprototypeof-1.1.0"
+          sources."statuses-1.4.0"
        ];
      })
-      sources."serve-static-1.14.1"
+      sources."serve-static-1.13.2"
      sources."setprototypeof-1.1.1"
      sources."sjcl-1.0.8"
      sources."sprintf-js-1.0.3"
-      (sources."sshpk-1.16.1" // {
-        dependencies = [
-          sources."tweetnacl-0.14.5"
-        ];
-      })
+      sources."sshpk-1.16.1"
      sources."statuses-1.5.0"
      sources."string-template-0.2.1"
-      sources."swagger-jsdoc-3.7.0"
+      sources."swagger-jsdoc-3.4.0"
      sources."swagger-methods-2.0.2"
-      sources."swagger-parser-8.0.4"
-      sources."swagger-ui-dist-3.52.5"
-      sources."swagger-ui-express-4.1.6"
+      sources."swagger-parser-8.0.0"
+      sources."swagger-ui-dist-3.24.0"
+      sources."swagger-ui-express-4.1.2"
      sources."toidentifier-1.0.0"
      sources."tough-cookie-2.5.0"
      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-1.0.3"
-      sources."tweetnacl-util-0.15.1"
+      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-util-0.15.0"
      sources."type-is-1.6.18"
      sources."unpipe-1.0.0"
      sources."uri-js-4.4.1"
      sources."utils-merge-1.0.1"
      sources."uuid-3.4.0"
-      sources."validator-13.7.0"
+      sources."validator-11.1.0"
      sources."vary-1.1.2"
      sources."verror-1.10.0"
      sources."wrappy-1.0.2"
-      sources."ws-8.3.0"
-      (sources."z-schema-4.2.4" // {
-        dependencies = [
-          sources."commander-2.20.3"
-        ];
-      })
+      sources."ws-8.2.3"
+      sources."xtend-4.0.1"
+      sources."z-schema-4.2.2"
    ];
    buildInputs = globalBuildInputs;
    meta = {
@ -1390,6 +1452,25 @@ in
    };
    production = true;
    bypassCache = true;
-    reconstructLock = true;
+    reconstructLock = false;
  };
+in
+{
+  args = args;
+  sources = sources;
+  tarball = nodeEnv.buildNodeSourceDist args;
+  package = nodeEnv.buildNodePackage args;
+  shell = nodeEnv.buildNodeShell args;
+  nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
+    src = stdenv.mkDerivation {
+      name = args.name + "-package-json";
+      src = nix-gitignore.gitignoreSourcePure [
+        "*"
+        "!package.json"
+        "!package-lock.json"
+      ] args.src;
+      dontBuild = true;
+      installPhase = "mkdir -p $out; cp -r ./* $out;";
+    };
+  });
 }
--- a/pkgs/clboss/default.nix
+++ b/pkgs/clboss/default.nix
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Automated C-Lightning Node Manager";
    homepage = "https://github.com/ZmnSCPxj/clboss";
-    maintainers = with maintainers; [ nixbitcoin ];
    license = licenses.mit;
+    maintainers = with maintainers; [ nixbitcoin ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/clightning-plugins/default.nix
+++ b/pkgs/clightning-plugins/default.nix
@ -13,19 +13,22 @@ let
  version = builtins.substring 0 7 src.rev;

  plugins = with nbPython3Packages; {
-    helpme = {};
-    monitor = {};
+    helpme = { description = "Walks you through setting up a c-lightning node, offering advice for common problems"; };
+    monitor = { description = "Helps you analyze the health of your peers and channels"; };
    prometheus = {
+      description = "Lightning node exporter for the prometheus timeseries server";
      extraPkgs = [ prometheus_client ];
      patchRequirements =
        "--replace prometheus-client==0.6.0 prometheus-client==0.11.0"
        + " --replace pyln-client~=0.9.3 pyln-client~=0.10.1";
    };
-    rebalance = {};
+    rebalance = { description = "Keeps your channels balanced"; };
    summary = {
+      description = "Prints a summary of the node status";
      extraPkgs = [ packaging requests ];
    };
    zmq = {
+      description = "Publishes notifications via ZeroMQ to configured endpoints";
      scriptName = "cl-zmq";
      extraPkgs = [ twisted txzmq ];
    };
@ -58,6 +61,14 @@ let
      '';

      passthru.path = "${drv}/${script}";
+
+      meta = with lib; {
+        inherit (plugin) description;
+        homepage = "https://github.com/lightningd/plugins";
+        license = licenses.bsd3;
+        maintainers = with maintainers; [ nixbitcoin earvstedt ];
+        platforms = platforms.unix;
+      };
    };
  in drv;

--- a/pkgs/joinmarket/default.nix
+++ b/pkgs/joinmarket/default.nix
@ -54,4 +54,12 @@ stdenv.mkDerivation {
    # These files must be placed in the same dir as ob-watcher
    cp -r scripts/obwatch/{orderbook.html,sybil_attack_calculations.py,vendor} $obw
  '';
+
+  meta = with lib; {
+    description = "Bitcoin CoinJoin implementation";
+    homepage = "https://github.com/JoinMarket-Org/joinmarket-clientserver";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ nixbitcoin ];
+    platforms = platforms.unix;
+  };
 }
--- a/pkgs/krops/default.nix
+++ b/pkgs/krops/default.nix
@ -3,8 +3,8 @@
 let
  src = pkgs.fetchgit {
    url = "https://cgit.krebsco.de/krops";
-    rev = "804c79a14dc8f81a602d31d5a1eed5f82b3f2457";
-    sha256 = "1k20l7zqprsrm9s38xslr7190vssf4sjdprd9gh146hxlvln2qrf";
+    rev = "1.26.2";
+    sha256 = "0mzn213dh3pklvdzfpwi4nin4lncdap447zvl11j81r809jll76j";
  };
 in {
  lib = import "${src}/lib";
--- a/pkgs/krops/fetch-release.sh
+++ b/pkgs/krops/fetch-release.sh
@ -0,0 +1,17 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p git
+set -euo pipefail
+
+archive_hash () {
+    repo=$1
+    rev=$2
+    nix-prefetch-url --unpack "https://github.com/${repo}/archive/${rev}.tar.gz" 2> /dev/null
+}
+
+echo "Fetching latest version"
+version=$(
+  git ls-remote --tags https://github.com/krebs/krops | cut -f 2 \
+    | sed -E 's|refs/tags/||g; s|((v)?(.*))|\1 \3|g' | sort -k 2 -V | tail -1 | cut -f 1 -d' '
+)
+echo "rev: ${version}"
+echo "sha256: $(archive_hash krebs/krops $version)"
--- a/pkgs/krops/get-sha256.sh
+++ b/pkgs/krops/get-sha256.sh
@ -1,14 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p git
-set -euo pipefail
-
-archive_hash () {
-    repo=$1
-    rev=$2
-    nix-prefetch-url --unpack "https://github.com/${repo}/archive/${rev}.tar.gz" 2> /dev/null
-}
-
-echo "Fetching latest krops commit"
-latest=$(git ls-remote https://github.com/krebs/krops master | cut -f 1)
-echo "rev: ${latest}"
-echo "sha256: $(archive_hash krebs/krops $latest)"
--- a/pkgs/liquid-swap/default.nix
+++ b/pkgs/liquid-swap/default.nix
@ -14,5 +14,12 @@ buildPythonPackage rec {
  installFlags = [ ".[CLI]" ];
  # The tests unfortunately seem to require the PyQt for the GUI
  doCheck = false;
-}

+  meta = with lib; {
+    description = "Swap issued assets on the Liquid network using confidential transactions";
+    homepage = "https://github.com/Blockstream/liquid-swap";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ nixbitcoin ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/rtl/composition.nix
+++ b/pkgs/rtl/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" {
--- a/pkgs/rtl/default.nix
+++ b/pkgs/rtl/default.nix
@ -1,5 +1,23 @@
-{ stdenv, pkgs, lib }:
-lib.head (builtins.attrValues (import ./composition.nix {
-    inherit pkgs;
-    inherit (stdenv.hostPlatform) system;
-}))
+{ pkgs, lib, makeWrapper }:
+let
+  inherit (pkgs) nodejs;
+  nodePackages = import ./composition.nix { inherit pkgs nodejs; };
+in
+nodePackages.package.overrideAttrs (old: {
+  nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
+    makeWrapper
+  ];
+
+  postInstall = ''
+    makeWrapper ${nodejs}/bin/node $out/bin/rtl \
+      --add-flags $out/lib/node_modules/rtl/rtl
+  '';
+
+  meta = with lib; {
+    description = "A web interface for LND, c-lightning and Eclair";
+    homepage = "https://github.com/Ride-The-Lightning/RTL";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nixbitcoin earvstedt ];
+    platforms = platforms.unix;
+  };
+})
--- a/pkgs/rtl/generate.sh
+++ b/pkgs/rtl/generate.sh
@ -1,31 +1,44 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix gnupg wget jq moreutils
+#! nix-shell -i bash -p nodePackages.node2nix gnupg wget jq gnused
 set -euo pipefail

 TMPDIR="$(mktemp -d -p /tmp)"
 trap "rm -rf $TMPDIR" EXIT

-# Get/verify source tarball
 version="0.11.2"
+repo=https://github.com/Ride-The-Lightning/RTL
+
+# Fetch and verify source tarball
+file=v${version}.tar.gz
+url=$repo/archive/refs/tags/$file
 export GNUPGHOME=$TMPDIR
 gpg --keyserver hkps://keyserver.ubuntu.com --recv-key 3E9BD4436C288039CA827A9200C9E2BC2E45666F
-wget -P $TMPDIR https://github.com/Ride-The-Lightning/RTL/archive/refs/tags/v${version}.tar.gz
-wget -P $TMPDIR https://github.com/Ride-The-Lightning/RTL/releases/download/v${version}/v${version}.tar.gz.asc
-gpg --verify $TMPDIR/v${version}.tar.gz.asc $TMPDIR/v${version}.tar.gz
-shasum=$(sha256sum $TMPDIR/v${version}.tar.gz | cut -d\  -f1)
+wget -P $TMPDIR $url
+wget -P $TMPDIR $repo/releases/download/v${version}/$file.asc
+gpg --verify $TMPDIR/$file.asc $TMPDIR/$file
+hash=$(nix hash file $TMPDIR/$file)

-# Run node2nix
-mkdir $TMPDIR/package && tar xvf $TMPDIR/v${version}.tar.gz -C $TMPDIR/package --strip-components 1
-cp pkg.json $TMPDIR/pkg.json
-node2nix --nodejs-10 -i $TMPDIR/pkg.json -c composition.nix --no-copy-node-env
+# Extract source
+src=$TMPDIR/src
+mkdir $src
+tar xvf $TMPDIR/$file -C $src --strip-components 1 >/dev/null

-# Set node env import.
-# The reason for not providing a custom node-env.nix file is the following:
-# To be flakes-compatible, we have to locate the nixpgs source via `pkgs.path` instead of `<nixpkgs>`.
-# This requires the `pkgs` variable which is available only in composition.nix, not in node-env.nix.
+# Generate nix pkg
+node2nix \
+  --input $src/package.json \
+  --lock $src/package-lock.json \
+  --composition composition.nix \
+  --no-copy-node-env
+
+# Use node-env.nix from nixpkgs
 nodeEnvImport='import "${toString pkgs.path}/pkgs/development/node-packages/node-env.nix"'
 sed -i "s|import ./node-env.nix|$nodeEnvImport|" composition.nix

-# Use verified source in node-packages.nix
-url="https://github.com/Ride-The-Lightning/RTL/archive/refs/tags/v$version.tar.gz"
-sed -i '/packageName = "rtl";/!b;n;n;c\    src = fetchurl {\n      url = "'$url'";\n      sha256 = "'$shasum'";\n    };' node-packages.nix
+# Use the verified package src
+read -d '' fetchurl <<EOF || :
+fetchurl {
+      url = "$url";
+      hash = "$hash";
+    };
+EOF
+sed -i "s|src = .*/src;|src = ${fetchurl//$'\n'/\\n}|" node-packages.nix
--- a/pkgs/rtl/node-packages.nix
+++ b/pkgs/rtl/node-packages.nix
@ -13,13 +13,13 @@ let
        sha512 = "BPdTCtgDJ9zNzHpuA6X3NmtzDiIt5SHZk840j0q3HCq6rP6C/oo2UnPT6w8YDOGMejDpWdHvTgXH4jVKDN1wCQ==";
      };
    };
-    "@angular/cdk-12.2.12" = {
+    "@angular/cdk-12.0.5" = {
      name = "_at_angular_slash_cdk";
      packageName = "@angular/cdk";
-      version = "12.2.12";
+      version = "12.0.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular/cdk/-/cdk-12.2.12.tgz";
-        sha512 = "AK+74JZP95BDj9OJ1YUaRqPXkgs+oadTk7z+8omu1RcvDoUivouKxgODCQX5jI7rZeQIlnV49hEgBne07hYk4A==";
+        url = "https://registry.npmjs.org/@angular/cdk/-/cdk-12.0.5.tgz";
+        sha512 = "eOTv4uW/mT8gbPk+kam34ECoQ3iqJYP1oDOtBVxhXE8SCFC+tZMRU56ddIAjpZO+uZFgF0hvboPraG4L9tPSCA==";
      };
    };
    "@angular/common-12.0.5" = {
@ -58,13 +58,13 @@ let
        sha512 = "uVYsZa1VqVw8vNcjUYgfjXBc1M3WaxLXoLnCsDvutJiln4csa8Yw8p7RqQSrZ6AgQ8o2LHD2JJ5kus3EDMwfcA==";
      };
    };
-    "@angular/flex-layout-12.0.0-beta.35" = {
+    "@angular/flex-layout-12.0.0-beta.34" = {
      name = "_at_angular_slash_flex-layout";
      packageName = "@angular/flex-layout";
-      version = "12.0.0-beta.35";
+      version = "12.0.0-beta.34";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-12.0.0-beta.35.tgz";
-        sha512 = "nPi2MGDFuCacwWHqxF/G7lUJd2X99HbLjjUvKXnyLwyCIVgH1sfS52su2wYbVYWJRqAVAB2/VMlrtW8Khr8hDA==";
+        url = "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-12.0.0-beta.34.tgz";
+        sha512 = "nLwKovXpyG+/U3Lbmfwt+q4ARupxtbPmFTZD0Y8oItFAV6/Oh9l+QQsNQa2VhOHAOrVagyDwcEM+SePtB5EmrQ==";
      };
    };
    "@angular/forms-12.0.5" = {
@ -76,13 +76,13 @@ let
        sha512 = "Ew/fGPTsywoYnm6DFPA/DyLl4Sb+1/uzpledrbxUHzaSKIrnXFrjQiUTmsbbq+8qono3JzbUIblqH1DrNThYiA==";
      };
    };
-    "@angular/material-12.2.12" = {
+    "@angular/material-12.0.5" = {
      name = "_at_angular_slash_material";
      packageName = "@angular/material";
-      version = "12.2.12";
+      version = "12.0.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular/material/-/material-12.2.12.tgz";
-        sha512 = "Fgpffplmd3KfoK9Ms34jYXRaqFYLbgXdGl250Acg7fV16LN1KTOyYm2Qs+FQuqyhuXfhePPt6Srh7VcGTLT4+g==";
+        url = "https://registry.npmjs.org/@angular/material/-/material-12.0.5.tgz";
+        sha512 = "n4tNhkEu/WtVDxG9049fJSfLZmUFaRT7ZmxRoPTnzXzw+h+/z3yC1rt0H4QvG5RzJtmLVZhmnPwYvlI9+nFP3w==";
      };
    };
    "@angular/platform-browser-12.0.5" = {
@ -112,148 +112,148 @@ let
        sha512 = "2jiaT+OxCmJbeJ0MTPmIHBsTFLysenvPZteozYsjcmUo9mOzJHAjqHLJvTC+Ri+E9xvnplh+8BPETRleV1pAFw==";
      };
    };
-    "@babel/code-frame-7.16.0" = {
+    "@babel/code-frame-7.14.5" = {
      name = "_at_babel_slash_code-frame";
      packageName = "@babel/code-frame";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz";
-        sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz";
+        sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==";
      };
    };
-    "@babel/compat-data-7.16.0" = {
+    "@babel/compat-data-7.14.5" = {
      name = "_at_babel_slash_compat-data";
      packageName = "@babel/compat-data";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.0.tgz";
-        sha512 = "DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew==";
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.5.tgz";
+        sha512 = "kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w==";
      };
    };
-    "@babel/core-7.16.0" = {
+    "@babel/core-7.14.6" = {
      name = "_at_babel_slash_core";
      packageName = "@babel/core";
-      version = "7.16.0";
+      version = "7.14.6";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz";
-        sha512 = "mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz";
+        sha512 = "gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==";
      };
    };
-    "@babel/generator-7.16.0" = {
+    "@babel/generator-7.14.5" = {
      name = "_at_babel_slash_generator";
      packageName = "@babel/generator";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz";
-        sha512 = "RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz";
+        sha512 = "y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==";
      };
    };
-    "@babel/helper-compilation-targets-7.16.0" = {
+    "@babel/helper-compilation-targets-7.14.5" = {
      name = "_at_babel_slash_helper-compilation-targets";
      packageName = "@babel/helper-compilation-targets";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz";
-        sha512 = "S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg==";
+        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz";
+        sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==";
      };
    };
-    "@babel/helper-function-name-7.16.0" = {
+    "@babel/helper-function-name-7.14.5" = {
      name = "_at_babel_slash_helper-function-name";
      packageName = "@babel/helper-function-name";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz";
-        sha512 = "BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz";
+        sha512 = "Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==";
      };
    };
-    "@babel/helper-get-function-arity-7.16.0" = {
+    "@babel/helper-get-function-arity-7.14.5" = {
      name = "_at_babel_slash_helper-get-function-arity";
      packageName = "@babel/helper-get-function-arity";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz";
-        sha512 = "ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==";
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz";
+        sha512 = "I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==";
      };
    };
-    "@babel/helper-hoist-variables-7.16.0" = {
+    "@babel/helper-hoist-variables-7.14.5" = {
      name = "_at_babel_slash_helper-hoist-variables";
      packageName = "@babel/helper-hoist-variables";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz";
-        sha512 = "1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==";
+        url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz";
+        sha512 = "R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==";
      };
    };
-    "@babel/helper-member-expression-to-functions-7.16.0" = {
+    "@babel/helper-member-expression-to-functions-7.14.5" = {
      name = "_at_babel_slash_helper-member-expression-to-functions";
      packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz";
-        sha512 = "bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==";
+        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz";
+        sha512 = "UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ==";
      };
    };
-    "@babel/helper-module-imports-7.16.0" = {
+    "@babel/helper-module-imports-7.14.5" = {
      name = "_at_babel_slash_helper-module-imports";
      packageName = "@babel/helper-module-imports";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz";
-        sha512 = "kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==";
+        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz";
+        sha512 = "SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==";
      };
    };
-    "@babel/helper-module-transforms-7.16.0" = {
+    "@babel/helper-module-transforms-7.14.5" = {
      name = "_at_babel_slash_helper-module-transforms";
      packageName = "@babel/helper-module-transforms";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz";
-        sha512 = "My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==";
+        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz";
+        sha512 = "iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==";
      };
    };
-    "@babel/helper-optimise-call-expression-7.16.0" = {
+    "@babel/helper-optimise-call-expression-7.14.5" = {
      name = "_at_babel_slash_helper-optimise-call-expression";
      packageName = "@babel/helper-optimise-call-expression";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz";
-        sha512 = "SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==";
+        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz";
+        sha512 = "IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==";
      };
    };
-    "@babel/helper-replace-supers-7.16.0" = {
+    "@babel/helper-replace-supers-7.14.5" = {
      name = "_at_babel_slash_helper-replace-supers";
      packageName = "@babel/helper-replace-supers";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz";
-        sha512 = "TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==";
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz";
+        sha512 = "3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==";
      };
    };
-    "@babel/helper-simple-access-7.16.0" = {
+    "@babel/helper-simple-access-7.14.5" = {
      name = "_at_babel_slash_helper-simple-access";
      packageName = "@babel/helper-simple-access";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz";
-        sha512 = "o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==";
+        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz";
+        sha512 = "nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==";
      };
    };
-    "@babel/helper-split-export-declaration-7.16.0" = {
+    "@babel/helper-split-export-declaration-7.14.5" = {
      name = "_at_babel_slash_helper-split-export-declaration";
      packageName = "@babel/helper-split-export-declaration";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz";
-        sha512 = "0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==";
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz";
+        sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==";
      };
    };
-    "@babel/helper-validator-identifier-7.15.7" = {
+    "@babel/helper-validator-identifier-7.14.5" = {
      name = "_at_babel_slash_helper-validator-identifier";
      packageName = "@babel/helper-validator-identifier";
-      version = "7.15.7";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz";
-        sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz";
+        sha512 = "5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==";
      };
    };
    "@babel/helper-validator-option-7.14.5" = {
@ -265,58 +265,58 @@ let
        sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==";
      };
    };
-    "@babel/helpers-7.16.0" = {
+    "@babel/helpers-7.14.6" = {
      name = "_at_babel_slash_helpers";
      packageName = "@babel/helpers";
-      version = "7.16.0";
+      version = "7.14.6";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.0.tgz";
-        sha512 = "dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz";
+        sha512 = "yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==";
      };
    };
-    "@babel/highlight-7.16.0" = {
+    "@babel/highlight-7.14.5" = {
      name = "_at_babel_slash_highlight";
      packageName = "@babel/highlight";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz";
-        sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==";
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz";
+        sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==";
      };
    };
-    "@babel/parser-7.16.2" = {
+    "@babel/parser-7.14.6" = {
      name = "_at_babel_slash_parser";
      packageName = "@babel/parser";
-      version = "7.16.2";
+      version = "7.14.6";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz";
-        sha512 = "RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.6.tgz";
+        sha512 = "oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ==";
      };
    };
-    "@babel/template-7.16.0" = {
+    "@babel/template-7.14.5" = {
      name = "_at_babel_slash_template";
      packageName = "@babel/template";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz";
-        sha512 = "MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz";
+        sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==";
      };
    };
-    "@babel/traverse-7.16.0" = {
+    "@babel/traverse-7.14.5" = {
      name = "_at_babel_slash_traverse";
      packageName = "@babel/traverse";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.0.tgz";
-        sha512 = "qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.5.tgz";
+        sha512 = "G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg==";
      };
    };
-    "@babel/types-7.16.0" = {
+    "@babel/types-7.14.5" = {
      name = "_at_babel_slash_types";
      packageName = "@babel/types";
-      version = "7.16.0";
+      version = "7.14.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz";
-        sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz";
+        sha512 = "M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==";
      };
    };
    "@fortawesome/angular-fontawesome-0.8.2" = {
@ -328,58 +328,58 @@ let
        sha512 = "K/AiykA4YbHKE6XKEtZ0ZvVRQocUHyk+79HYWIfhGy3teHpzxsUqB/UjDaxivgBd6dF6ihlzgEbgrDMHlGNwGg==";
      };
    };
-    "@fortawesome/fontawesome-common-types-0.2.36" = {
+    "@fortawesome/fontawesome-common-types-0.2.35" = {
      name = "_at_fortawesome_slash_fontawesome-common-types";
      packageName = "@fortawesome/fontawesome-common-types";
-      version = "0.2.36";
+      version = "0.2.35";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz";
-        sha512 = "a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==";
+        url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz";
+        sha512 = "IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw==";
      };
    };
-    "@fortawesome/fontawesome-svg-core-1.2.36" = {
+    "@fortawesome/fontawesome-svg-core-1.2.35" = {
      name = "_at_fortawesome_slash_fontawesome-svg-core";
      packageName = "@fortawesome/fontawesome-svg-core";
-      version = "1.2.36";
+      version = "1.2.35";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz";
-        sha512 = "YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==";
+        url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz";
+        sha512 = "uLEXifXIL7hnh2sNZQrIJWNol7cTVIzwI+4qcBIq9QWaZqUblm0IDrtSqbNg+3SQf8SMGHkiSigD++rHmCHjBg==";
      };
    };
-    "@fortawesome/free-regular-svg-icons-5.15.4" = {
+    "@fortawesome/free-regular-svg-icons-5.15.3" = {
      name = "_at_fortawesome_slash_free-regular-svg-icons";
      packageName = "@fortawesome/free-regular-svg-icons";
-      version = "5.15.4";
+      version = "5.15.3";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.4.tgz";
-        sha512 = "9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==";
+        url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.3.tgz";
+        sha512 = "q4/p8Xehy9qiVTdDWHL4Z+o5PCLRChePGZRTXkl+/Z7erDVL8VcZUuqzJjs6gUz6czss4VIPBRdCz6wP37/zMQ==";
      };
    };
-    "@fortawesome/free-solid-svg-icons-5.15.4" = {
+    "@fortawesome/free-solid-svg-icons-5.15.3" = {
      name = "_at_fortawesome_slash_free-solid-svg-icons";
      packageName = "@fortawesome/free-solid-svg-icons";
-      version = "5.15.4";
+      version = "5.15.3";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz";
-        sha512 = "JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==";
+        url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz";
+        sha512 = "XPeeu1IlGYqz4VWGRAT5ukNMd4VHUEEJ7ysZ7pSSgaEtNvSo+FLurybGJVmiqkQdK50OkSja2bfZXOeyMGRD8Q==";
      };
    };
-    "@ngrx/effects-12.5.1" = {
+    "@ngrx/effects-12.1.0" = {
      name = "_at_ngrx_slash_effects";
      packageName = "@ngrx/effects";
-      version = "12.5.1";
+      version = "12.1.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@ngrx/effects/-/effects-12.5.1.tgz";
-        sha512 = "fVNGIIntYLRWW1XWe0os2XOv03L22S4WTkX0OPZ9O6ztwuaNq0yzxWN7UeAC6H385F+g0k76KwRV78zHyP0bfQ==";
+        url = "https://registry.npmjs.org/@ngrx/effects/-/effects-12.1.0.tgz";
+        sha512 = "DcVovaJB9hZ8qo5UNjRS0KqLaMX8YreuR3EtRPUysB0aePBuoWQiN8HUic8DgmI2cN3KcZxOsRKj/1VaVArLJw==";
      };
    };
-    "@ngrx/store-12.5.1" = {
+    "@ngrx/store-12.1.0" = {
      name = "_at_ngrx_slash_store";
      packageName = "@ngrx/store";
-      version = "12.5.1";
+      version = "12.1.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@ngrx/store/-/store-12.5.1.tgz";
-        sha512 = "NLVkHLVeZc7IboXSDZlFoq1QrupmwYTYKRHS6se7ZasAv/lrIjHWsVVdICKSVRBsHZYu3+dmCXmu+YgulP7iHw==";
+        url = "https://registry.npmjs.org/@ngrx/store/-/store-12.1.0.tgz";
+        sha512 = "HrNs7bs/MNkLxFnvGx7uPIvEP3RWqGMewVaFjqUxq6sDefn6D6TQ/Sv/8KsNNxuG7r7pKGw+U/tClunJhmRfpw==";
      };
    };
    "@otplib/core-12.0.1" = {
@ -454,13 +454,13 @@ let
        sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
      };
    };
-    "angular-user-idle-2.2.7" = {
+    "angular-user-idle-2.2.6" = {
      name = "angular-user-idle";
      packageName = "angular-user-idle";
-      version = "2.2.7";
+      version = "2.2.6";
      src = fetchurl {
-        url = "https://registry.npmjs.org/angular-user-idle/-/angular-user-idle-2.2.7.tgz";
-        sha512 = "Vu+vioYIRwT/Y2Aq+qXhP+wrleAfU50FIix736CY0IW37yAjRNPuXVljgRRtBSildVIzLRVtaGTqvC44duDo2w==";
+        url = "https://registry.npmjs.org/angular-user-idle/-/angular-user-idle-2.2.6.tgz";
+        sha512 = "R3fiokwxqt9VSIO/tZDm9I4xHYmjx5yYaWs5yWgUtDvc5q0mmZPU8IjBcl4kYEF1ibPCRXGuT9WJgh5Ngabt2w==";
      };
    };
    "angularx-qrcode-11.0.0" = {
@ -481,13 +481,13 @@ let
        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
      };
    };
-    "ansi-regex-5.0.1" = {
+    "ansi-regex-5.0.0" = {
      name = "ansi-regex";
      packageName = "ansi-regex";
-      version = "5.0.1";
+      version = "5.0.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz";
-        sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz";
+        sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==";
      };
    };
    "ansi-styles-3.2.1" = {
@ -625,13 +625,13 @@ let
        sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
      };
    };
-    "browserslist-4.17.5" = {
+    "browserslist-4.16.6" = {
      name = "browserslist";
      packageName = "browserslist";
-      version = "4.17.5";
+      version = "4.16.6";
      src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz";
-        sha512 = "I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz";
+        sha512 = "Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==";
      };
    };
    "buffer-equal-constant-time-1.0.1" = {
@ -661,13 +661,13 @@ let
        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
      };
    };
-    "caniuse-lite-1.0.30001274" = {
+    "caniuse-lite-1.0.30001237" = {
      name = "caniuse-lite";
      packageName = "caniuse-lite";
-      version = "1.0.30001274";
+      version = "1.0.30001237";
      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001274.tgz";
-        sha512 = "+Nkvv0fHyhISkiMIjnyjmf5YJcQ1IQHZN6U9TLUMroWR38FNwpsC51Gb68yueafX1V6ifOisInSgP9WJFS13ew==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz";
+        sha512 = "pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw==";
      };
    };
    "canonical-path-1.0.0" = {
@ -760,6 +760,15 @@ let
        sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
      };
    };
+    "colorette-1.2.2" = {
+      name = "colorette";
+      packageName = "colorette";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz";
+        sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==";
+      };
+    };
    "combined-stream-1.0.8" = {
      name = "combined-stream";
      packageName = "combined-stream";
@ -796,13 +805,13 @@ let
        sha1 = "08c04568922c27776b8a2e81a95d393362ea0b65";
      };
    };
-    "convert-source-map-1.8.0" = {
+    "convert-source-map-1.7.0" = {
      name = "convert-source-map";
      packageName = "convert-source-map";
-      version = "1.8.0";
+      version = "1.7.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz";
-        sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==";
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz";
+        sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==";
      };
    };
    "convert-string-0.1.0" = {
@ -1048,13 +1057,13 @@ let
        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
      };
    };
-    "debug-4.3.2" = {
+    "debug-4.3.1" = {
      name = "debug";
      packageName = "debug";
-      version = "4.3.2";
+      version = "4.3.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
-        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz";
+        sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==";
      };
    };
    "decamelize-1.2.0" = {
@ -1138,13 +1147,13 @@ let
        sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
      };
    };
-    "electron-to-chromium-1.3.886" = {
+    "electron-to-chromium-1.3.752" = {
      name = "electron-to-chromium";
      packageName = "electron-to-chromium";
-      version = "1.3.886";
+      version = "1.3.752";
      src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.886.tgz";
-        sha512 = "+vYdeBosI63VkCtNWnEVFjgNd/IZwvnsWkKyPtWAvrhA+XfByKoBJcbsMgudVU/bUcGAF9Xp3aXn96voWlc3oQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz";
+        sha512 = "2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A==";
      };
    };
    "emoji-regex-7.0.3" = {
@ -1525,13 +1534,13 @@ let
        sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==";
      };
    };
-    "is-glob-4.0.3" = {
+    "is-glob-4.0.1" = {
      name = "is-glob";
      packageName = "is-glob";
-      version = "4.0.3";
+      version = "4.0.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz";
-        sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==";
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
+        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
      };
    };
    "is-number-7.0.0" = {
@ -1813,22 +1822,22 @@ let
        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
      };
    };
-    "mime-db-1.50.0" = {
+    "mime-db-1.48.0" = {
      name = "mime-db";
      packageName = "mime-db";
-      version = "1.50.0";
+      version = "1.48.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz";
-        sha512 = "9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz";
+        sha512 = "FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==";
      };
    };
-    "mime-types-2.1.33" = {
+    "mime-types-2.1.31" = {
      name = "mime-types";
      packageName = "mime-types";
-      version = "2.1.33";
+      version = "2.1.31";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz";
-        sha512 = "plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz";
+        sha512 = "XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==";
      };
    };
    "minimist-1.2.5" = {
@ -1885,13 +1894,13 @@ let
        sha512 = "f9IaDJGlBzSxnJ3Ki76n2JdzfQngUFyCf0E+CuVLaR5jL0IJDcTu7vOs8wexXunRMTd8xvIv0+sdIxf8hXAGWg==";
      };
    };
-    "node-releases-2.0.1" = {
+    "node-releases-1.1.73" = {
      name = "node-releases";
      packageName = "node-releases";
-      version = "2.0.1";
+      version = "1.1.73";
      src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz";
-        sha512 = "CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz";
+        sha512 = "uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==";
      };
    };
    "normalize-path-3.0.0" = {
@ -2011,15 +2020,6 @@ let
        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
      };
    };
-    "picocolors-1.0.0" = {
-      name = "picocolors";
-      packageName = "picocolors";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz";
-        sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==";
-      };
-    };
    "picomatch-2.3.0" = {
      name = "picomatch";
      packageName = "picomatch";
@ -2209,13 +2209,13 @@ let
        sha512 = "OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g==";
      };
    };
-    "rxjs-7.4.0" = {
+    "rxjs-7.1.0" = {
      name = "rxjs";
      packageName = "rxjs";
-      version = "7.4.0";
+      version = "7.1.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz";
-        sha512 = "7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-7.1.0.tgz";
+        sha512 = "gCFO5iHIbRPwznl6hAYuwNFld8W4S2shtSJIqG27ReWXo9IWrCyEICxUA+6vJHwSR/OakoenC4QsDxq50tzYmw==";
      };
    };
    "safe-buffer-5.1.2" = {
@ -2371,13 +2371,13 @@ let
        sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
      };
    };
-    "string-width-4.2.3" = {
+    "string-width-4.2.2" = {
      name = "string-width";
      packageName = "string-width";
-      version = "4.2.3";
+      version = "4.2.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz";
-        sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==";
+        url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz";
+        sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==";
      };
    };
    "strip-ansi-5.2.0" = {
@ -2389,13 +2389,13 @@ let
        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
      };
    };
-    "strip-ansi-6.0.1" = {
+    "strip-ansi-6.0.0" = {
      name = "strip-ansi";
      packageName = "strip-ansi";
-      version = "6.0.1";
+      version = "6.0.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz";
-        sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==";
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz";
+        sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==";
      };
    };
    "supports-color-5.5.0" = {
@ -2470,13 +2470,13 @@ let
        sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==";
      };
    };
-    "tslib-2.3.1" = {
+    "tslib-2.3.0" = {
      name = "tslib";
      packageName = "tslib";
-      version = "2.3.1";
+      version = "2.3.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz";
-        sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz";
+        sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==";
      };
    };
    "tsscmp-1.0.6" = {
@ -2668,13 +2668,13 @@ let
        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
      };
    };
-    "yargs-parser-20.2.9" = {
+    "yargs-parser-20.2.7" = {
      name = "yargs-parser";
      packageName = "yargs-parser";
-      version = "20.2.9";
+      version = "20.2.7";
      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz";
-        sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz";
+        sha512 = "FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==";
      };
    };
    "zone.js-0.11.4" = {
@ -2687,72 +2687,70 @@ let
      };
    };
  };
-in
-{
-  "RTL-file:./package" = nodeEnv.buildNodePackage {
+  args = {
    name = "rtl";
    packageName = "rtl";
    version = "0.11.2-beta";
    src = fetchurl {
      url = "https://github.com/Ride-The-Lightning/RTL/archive/refs/tags/v0.11.2.tar.gz";
-      sha256 = "53fd365e8b14b94ed74be6041bccb34362e4eeec191c13c5ce9f3031b99457e9";
+      hash = "sha256-U/02XosUuU7XS+YEG8yzQ2Lk7uwZHBPFzp8wMbmUV+k=";
    };
    dependencies = [
      sources."@angular/animations-12.0.5"
-      sources."@angular/cdk-12.2.12"
+      sources."@angular/cdk-12.0.5"
      sources."@angular/common-12.0.5"
      sources."@angular/compiler-12.0.5"
      sources."@angular/compiler-cli-12.0.5"
      sources."@angular/core-12.0.5"
-      sources."@angular/flex-layout-12.0.0-beta.35"
+      sources."@angular/flex-layout-12.0.0-beta.34"
      sources."@angular/forms-12.0.5"
-      sources."@angular/material-12.2.12"
+      sources."@angular/material-12.0.5"
      sources."@angular/platform-browser-12.0.5"
      sources."@angular/platform-browser-dynamic-12.0.5"
      sources."@angular/router-12.0.5"
-      sources."@babel/code-frame-7.16.0"
-      sources."@babel/compat-data-7.16.0"
-      (sources."@babel/core-7.16.0" // {
+      sources."@babel/code-frame-7.14.5"
+      sources."@babel/compat-data-7.14.5"
+      (sources."@babel/core-7.14.6" // {
        dependencies = [
          sources."semver-6.3.0"
          sources."source-map-0.5.7"
        ];
      })
-      (sources."@babel/generator-7.16.0" // {
+      (sources."@babel/generator-7.14.5" // {
        dependencies = [
          sources."source-map-0.5.7"
        ];
      })
-      (sources."@babel/helper-compilation-targets-7.16.0" // {
+      (sources."@babel/helper-compilation-targets-7.14.5" // {
        dependencies = [
          sources."semver-6.3.0"
        ];
      })
-      sources."@babel/helper-function-name-7.16.0"
-      sources."@babel/helper-get-function-arity-7.16.0"
-      sources."@babel/helper-hoist-variables-7.16.0"
-      sources."@babel/helper-member-expression-to-functions-7.16.0"
-      sources."@babel/helper-module-imports-7.16.0"
-      sources."@babel/helper-module-transforms-7.16.0"
-      sources."@babel/helper-optimise-call-expression-7.16.0"
-      sources."@babel/helper-replace-supers-7.16.0"
-      sources."@babel/helper-simple-access-7.16.0"
-      sources."@babel/helper-split-export-declaration-7.16.0"
-      sources."@babel/helper-validator-identifier-7.15.7"
+      sources."@babel/helper-function-name-7.14.5"
+      sources."@babel/helper-get-function-arity-7.14.5"
+      sources."@babel/helper-hoist-variables-7.14.5"
+      sources."@babel/helper-member-expression-to-functions-7.14.5"
+      sources."@babel/helper-module-imports-7.14.5"
+      sources."@babel/helper-module-transforms-7.14.5"
+      sources."@babel/helper-optimise-call-expression-7.14.5"
+      sources."@babel/helper-replace-supers-7.14.5"
+      sources."@babel/helper-simple-access-7.14.5"
+      sources."@babel/helper-split-export-declaration-7.14.5"
+      sources."@babel/helper-validator-identifier-7.14.5"
      sources."@babel/helper-validator-option-7.14.5"
-      sources."@babel/helpers-7.16.0"
-      sources."@babel/highlight-7.16.0"
-      sources."@babel/parser-7.16.2"
-      sources."@babel/template-7.16.0"
-      sources."@babel/traverse-7.16.0"
-      sources."@babel/types-7.16.0"
+      sources."@babel/helpers-7.14.6"
+      sources."@babel/highlight-7.14.5"
+      sources."@babel/parser-7.14.6"
+      sources."@babel/template-7.14.5"
+      sources."@babel/traverse-7.14.5"
+      sources."@babel/types-7.14.5"
      sources."@fortawesome/angular-fontawesome-0.8.2"
-      sources."@fortawesome/fontawesome-common-types-0.2.36"
-      sources."@fortawesome/fontawesome-svg-core-1.2.36"
-      sources."@fortawesome/free-regular-svg-icons-5.15.4"
-      sources."@fortawesome/free-solid-svg-icons-5.15.4"
-      sources."@ngrx/effects-12.5.1"
-      sources."@ngrx/store-12.5.1"
+      sources."@fortawesome/fontawesome-common-types-0.2.35"
+      sources."@fortawesome/fontawesome-svg-core-1.2.35"
+      sources."@fortawesome/free-regular-svg-icons-5.15.3"
+      sources."@fortawesome/free-solid-svg-icons-5.15.3"
+      sources."@ngrx/effects-12.1.0"
+      sources."@ngrx/store-12.1.0"
      sources."@otplib/core-12.0.1"
      sources."@otplib/plugin-crypto-12.0.1"
      sources."@otplib/plugin-thirty-two-12.0.1"
@ -2761,13 +2759,13 @@ in
      sources."@swimlane/ngx-charts-16.0.0"
      sources."accepts-1.3.7"
      sources."ajv-6.12.6"
-      (sources."angular-user-idle-2.2.7" // {
+      (sources."angular-user-idle-2.2.6" // {
        dependencies = [
          sources."tslib-1.14.1"
        ];
      })
      sources."angularx-qrcode-11.0.0"
-      sources."ansi-regex-5.0.1"
+      sources."ansi-regex-5.0.0"
      sources."ansi-styles-3.2.1"
      sources."anymatch-3.1.2"
      sources."array-flatten-1.1.1"
@ -2789,11 +2787,11 @@ in
        ];
      })
      sources."braces-3.0.2"
-      sources."browserslist-4.17.5"
+      sources."browserslist-4.16.6"
      sources."buffer-equal-constant-time-1.0.1"
      sources."bytes-3.1.0"
      sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001274"
+      sources."caniuse-lite-1.0.30001237"
      sources."canonical-path-1.0.0"
      sources."caseless-0.12.0"
      sources."chalk-2.4.2"
@ -2801,11 +2799,12 @@ in
      sources."cliui-7.0.4"
      sources."color-convert-1.9.3"
      sources."color-name-1.1.3"
+      sources."colorette-1.2.2"
      sources."combined-stream-1.0.8"
      sources."content-disposition-0.5.3"
      sources."content-type-1.0.4"
      sources."convert-hex-0.1.0"
-      sources."convert-source-map-1.8.0"
+      sources."convert-source-map-1.7.0"
      sources."convert-string-0.1.0"
      sources."cookie-0.4.0"
      sources."cookie-parser-1.4.5"
@ -2835,7 +2834,7 @@ in
      sources."d3-timer-1.0.10"
      sources."d3-transition-1.3.2"
      sources."dashdash-1.14.1"
-      sources."debug-4.3.2"
+      sources."debug-4.3.1"
      sources."decamelize-1.2.0"
      sources."delayed-stream-1.0.0"
      sources."depd-1.1.2"
@ -2845,7 +2844,7 @@ in
      sources."ecc-jsbn-0.1.2"
      sources."ecdsa-sig-formatter-1.0.11"
      sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.886"
+      sources."electron-to-chromium-1.3.752"
      sources."emoji-regex-8.0.0"
      sources."encodeurl-1.0.2"
      sources."escalade-3.1.1"
@ -2894,7 +2893,7 @@ in
      sources."is-binary-path-2.1.0"
      sources."is-extglob-2.1.1"
      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
+      sources."is-glob-4.0.1"
      sources."is-number-7.0.0"
      sources."is-typedarray-1.0.0"
      sources."isarray-2.0.5"
@ -2930,13 +2929,13 @@ in
      sources."merge-descriptors-1.0.1"
      sources."methods-1.1.2"
      sources."mime-1.6.0"
-      sources."mime-db-1.50.0"
-      sources."mime-types-2.1.33"
+      sources."mime-db-1.48.0"
+      sources."mime-types-2.1.31"
      sources."minimist-1.2.5"
      sources."ms-2.1.2"
      sources."negotiator-0.6.2"
      sources."ngx-perfect-scrollbar-10.1.1"
-      sources."node-releases-2.0.1"
+      sources."node-releases-1.1.73"
      sources."normalize-path-3.0.0"
      sources."oauth-sign-0.9.0"
      sources."on-finished-2.3.0"
@ -2950,7 +2949,6 @@ in
      sources."path-to-regexp-0.1.7"
      sources."perfect-scrollbar-1.5.0"
      sources."performance-now-2.1.0"
-      sources."picocolors-1.0.0"
      sources."picomatch-2.3.0"
      sources."pngjs-3.4.0"
      sources."proxy-addr-2.0.7"
@ -2993,7 +2991,7 @@ in
      sources."resize-observer-polyfill-1.5.1"
      sources."rndm-1.2.0"
      sources."roboto-fontface-0.10.0"
-      (sources."rxjs-7.4.0" // {
+      (sources."rxjs-7.1.0" // {
        dependencies = [
          sources."tslib-2.1.0"
        ];
@ -3020,15 +3018,15 @@ in
      sources."sshpk-1.16.1"
      sources."statuses-1.5.0"
      sources."stealthy-require-1.1.1"
-      sources."string-width-4.2.3"
-      sources."strip-ansi-6.0.1"
+      sources."string-width-4.2.2"
+      sources."strip-ansi-6.0.0"
      sources."supports-color-5.5.0"
      sources."thirty-two-1.0.2"
      sources."to-fast-properties-2.0.0"
      sources."to-regex-range-5.0.1"
      sources."toidentifier-1.0.0"
      sources."tough-cookie-2.5.0"
-      sources."tslib-2.3.1"
+      sources."tslib-2.3.0"
      sources."tsscmp-1.0.6"
      sources."tunnel-agent-0.6.0"
      sources."tweetnacl-0.14.5"
@ -3052,7 +3050,7 @@ in
      sources."y18n-5.0.8"
      sources."yallist-4.0.0"
      sources."yargs-16.2.0"
-      sources."yargs-parser-20.2.9"
+      sources."yargs-parser-20.2.7"
      sources."zone.js-0.11.4"
    ];
    buildInputs = globalBuildInputs;
@ -3061,6 +3059,25 @@ in
    };
    production = true;
    bypassCache = true;
-    reconstructLock = true;
+    reconstructLock = false;
  };
+in
+{
+  args = args;
+  sources = sources;
+  tarball = nodeEnv.buildNodeSourceDist args;
+  package = nodeEnv.buildNodePackage args;
+  shell = nodeEnv.buildNodeShell args;
+  nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
+    src = stdenv.mkDerivation {
+      name = args.name + "-package-json";
+      src = nix-gitignore.gitignoreSourcePure [
+        "*"
+        "!package.json"
+        "!package-lock.json"
+      ] args.src;
+      dontBuild = true;
+      installPhase = "mkdir -p $out; cp -r ./* $out;";
+    };
+  });
 }
--- a/pkgs/rtl/pkg.json
+++ b/pkgs/rtl/pkg.json
@ -1,3 +0,0 @@
-[
-  { "RTL": "file:./package" }
-]
--- a/pkgs/secp256k1/default.nix
+++ b/pkgs/secp256k1/default.nix
@ -19,8 +19,8 @@ stdenv.mkDerivation {
  meta = with lib; {
    description = "Optimized C library for EC operations on curve secp256k1";
    homepage = "https://github.com/bitcoin-core/secp256k1";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
    maintainers = with maintainers; [ nixbitcoin ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/spark-wallet/default.nix
+++ b/pkgs/spark-wallet/default.nix
@ -1,5 +1,16 @@
-{ stdenv, pkgs, lib }:
-lib.head (builtins.attrValues (import ./composition.nix {
-    inherit pkgs;
-    inherit (stdenv.hostPlatform) system;
-}))
+{ pkgs, lib }:
+let
+  nodePackages = import ./composition.nix { inherit pkgs; };
+in
+nodePackages.package.override {
+  # Required because spark-wallet uses `npm-shrinkwrap.json` as the lock file
+  reconstructLock = true;
+
+  meta = with lib; {
+    description = "A minimalistic wallet GUI for c-lightning";
+    homepage = "https://github.com/shesek/spark-wallet";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nixbitcoin earvstedt ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/spark-wallet/generate.sh
+++ b/pkgs/spark-wallet/generate.sh
@ -1,34 +1,49 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix gnupg wget jq moreutils
+#! nix-shell -i bash -p nodePackages.node2nix gnupg wget jq moreutils gnused
 set -euo pipefail

 TMPDIR="$(mktemp -d -p /tmp)"
 trap "rm -rf $TMPDIR" EXIT

-# Get/verify spark-wallet-npm.tgz
 version="0.3.1"
+repo=https://github.com/shesek/spark-wallet
+
+# Fetch and verify source tarball
+file=spark-wallet-${version}-npm.tgz
+url=$repo/releases/download/v$version/$file
 export GNUPGHOME=$TMPDIR
 gpg --keyserver hkps://keyserver.ubuntu.com --recv-key FCF19B67866562F08A43AAD681F6104CD0F150FC
-wget -P $TMPDIR https://github.com/shesek/spark-wallet/releases/download/v${version}/SHA256SUMS.asc
-wget -P $TMPDIR https://github.com/shesek/spark-wallet/releases/download/v${version}/spark-wallet-${version}-npm.tgz
-(cd $TMPDIR; gpg --verify $TMPDIR/SHA256SUMS.asc; sha256sum -c --ignore-missing $TMPDIR/SHA256SUMS.asc)
-shasum=$(sha256sum $TMPDIR/spark-wallet-${version}-npm.tgz | cut -d\  -f1)
+wget -P $TMPDIR $url
+wget -P $TMPDIR $repo/releases/download/v$version/SHA256SUMS.asc
+gpg --verify $TMPDIR/SHA256SUMS.asc
+(cd $TMPDIR; sha256sum --check --ignore-missing SHA256SUMS.asc)
+hash=$(nix hash file $TMPDIR/$file)
+
+# Extract source
+src=$TMPDIR/src
+mkdir $src
+tar xvf $TMPDIR/$file -C $src --strip-components 1 >/dev/null

 # Make qrcode-terminal a strict dependency so that node2nix includes it in the package derivation.
-tar xvf $TMPDIR/spark-wallet-*-npm.tgz -C $TMPDIR
-jq '.dependencies["qrcode-terminal"] = .optionalDependencies["qrcode-terminal"]' $TMPDIR/package/package.json | sponge $TMPDIR/package/package.json
+jq '.dependencies["qrcode-terminal"] = .optionalDependencies["qrcode-terminal"]' $src/package.json | sponge $src/package.json

-# Run node2nix
-cp pkg.json $TMPDIR/pkg.json
-node2nix --nodejs-10 -i $TMPDIR/pkg.json -c composition.nix --no-copy-node-env
+# Generate nix pkg
+node2nix \
+  --nodejs-10 \
+  --input $src/package.json \
+  --lock $src/npm-shrinkwrap.json \
+  --composition composition.nix \
+  --no-copy-node-env

-# Set node env import.
-# The reason for not providing a custom node-env.nix file is the following:
-# To be flakes-compatible, we have to locate the nixpgs source via `pkgs.path` instead of `<nixpkgs>`.
-# This requires the `pkgs` variable which is available only in composition.nix, not in node-env.nix.
+# Use node-env.nix from nixpkgs
 nodeEnvImport='import "${toString pkgs.path}/pkgs/development/node-packages/node-env.nix"'
 sed -i "s|import ./node-env.nix|$nodeEnvImport|" composition.nix

-# Use verified source in node-packages.nix
-url="https://github.com/shesek/spark-wallet/releases/download/v$version/spark-wallet-$version-npm.tgz"
-sed -i '/packageName = "spark-wallet";/!b;n;n;c\    src = fetchurl {\n      url = "'$url'";\n      sha256 = "'$shasum'";\n    };' node-packages.nix
+# Use the verified package src
+read -d '' fetchurl <<EOF || :
+fetchurl {
+      url = "$url";
+      hash = "$hash";
+    };
+EOF
+sed -i "s|src = .*/src;|src = ${fetchurl//$'\n'/\\n}|" node-packages.nix
--- a/pkgs/spark-wallet/node-packages.nix
+++ b/pkgs/spark-wallet/node-packages.nix
--- a/pkgs/spark-wallet/pkg.json
+++ b/pkgs/spark-wallet/pkg.json
@ -1,3 +0,0 @@
-[
-  { "spark-wallet": "file:./package" }
-]
--- a/test/lib/copy-src.sh
+++ b/test/lib/copy-src.sh
@ -15,4 +15,4 @@ trap "atExit" EXIT

 rsync -a --delete --exclude='.git*' "$scriptDir/../" $tmp/src
 echo "Copied src"
-_nixBitcoinInCopySrc=1 $tmp/src/test/run-tests.sh "${args[@]}"
+_nixBitcoinInCopiedSrc=1 $tmp/src/test/run-tests.sh "${args[@]}"
--- a/test/lib/create-git-repo.sh
+++ b/test/lib/create-git-repo.sh
@ -0,0 +1,13 @@
+# Create and maintain a minimal git repo at the root of the copied src
+(
+  cd "$scriptDir/.."
+  amend=--amend
+  if [[ ! -e .git ]]; then
+    git init
+    amend=
+  fi
+  git add .
+  if ! git diff --quiet --cached; then
+    git commit -a $amend -m -
+  fi
+) >/dev/null
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@ -95,7 +95,7 @@ while :; do
            ;;
        --copy-src|-c)
            shift
-            if [[ ! $_nixBitcoinInCopySrc ]]; then
+            if [[ ! $_nixBitcoinInCopiedSrc ]]; then
                . "$scriptDir/lib/copy-src.sh"
                exit
            fi
@ -271,12 +271,17 @@ flake() {
 nixosSearch() {
    if ! checkFlakeSupport "nixosSearch"; then return; fi

+    if [[ $_nixBitcoinInCopiedSrc ]]; then
+      # flake-info requires that its target flake is under version control
+      . "$scriptDir/lib/create-git-repo.sh"
+    fi
+
    if [[ $outLinkPrefix ]]; then
        # Add gcroots for flake-info
        nix build $scriptDir/nixos-search#flake-info -o "$outLinkPrefix-flake-info"
    fi
    echo "Running flake-info (nixos-search)"
-    nix run $scriptDir/nixos-search#flake-info -- flake ../.
+    nix run $scriptDir/nixos-search#flake-info -- flake "$scriptDir/.."
 }

 # A basic subset of tests to keep the total runtime within