Merge #537: update nixpkgs

321e8ba clightning: fix build (Erik Arvstedt)
4456123 rtl: set explicit nodejs version (Erik Arvstedt)
f2cb5bf update nixpkgs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 321e8ba

Tree-SHA512: f15d29ca63d88e4253a6bfe5f310e80092f1dd2e932be41e9e35d60636b12e617ed5c9ddc9ee8a200646973a66603e776adf07f5bac82ce635499095a92340fc

pkgs/clightning-mistune-workaround/default.nix

@@ -0,0 +1,12 @@
+{ clightning, python3 }:
+
+clightning.override {
+  python3 = python3.override {
+    packageOverrides = self: super: {
+      mistune = self.callPackage ./mistune.nix {
+        version = "0.8.4";
+        sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e";
+      };
+    };
+  };
+}

pkgs/clightning-mistune-workaround/mistune.nix

@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, version
+, sha256
+, format ? "setuptools"
+, extraMeta ? {}
+}:
+
+buildPythonPackage rec {
+  inherit version format;
+  pname = "mistune";
+
+  src = fetchPypi {
+    inherit pname version sha256;
+  };
+
+  buildInputs = [ nose ];
+  pythonImportsCheck = [ "mistune" ];
+
+  meta = with lib; {
+    description = "The fastest markdown parser in pure Python";
+    homepage = "https://github.com/lepture/mistune";
+    license = licenses.bsd3;
+  } // extraMeta;
+}

pkgs/default.nix

@@ -25,6 +25,14 @@ let self = {
     packageOverrides = import ./python-packages self;
   }).pkgs;
 
+  # Fix clightning build by using python package mistune 0.8.4, which is a
+  # strict requirement. This version is affected by CVE-2022-34749, but this
+  # is irrelevant in this context.
+  #
+  # TODO-EXTERNAL:
+  # Remove this when the clightning build is fixed upstream.
+  clightning = pkgs.callPackage ./clightning-mistune-workaround { inherit (pkgs) clightning; };
+
   # Internal pkgs
   netns-exec = pkgs.callPackage ./netns-exec { };
   krops = import ./krops { inherit pkgs; };

pkgs/pinned.nix

@@ -4,21 +4,20 @@ pkgs: pkgsUnstable:
   inherit (pkgs)
     bitcoin
     bitcoind
-    charge-lnd
     electrs
     elementsd
     extra-container
     lightning-pool
-    lndconnect;
+    lndconnect
+    nbxplorer;
 
   inherit (pkgsUnstable)
     btcpayserver
-    clightning
+    charge-lnd
     fulcrum
     hwi
     lightning-loop
-    lnd
-    nbxplorer;
+    lnd;
 
   inherit pkgs pkgsUnstable;
 }

pkgs/python-packages/default.nix

@@ -3,7 +3,7 @@ let
   inherit (self) callPackage;
 
   joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; };
-  clightningPkg = pkg: callPackage pkg { inherit (nbPkgs.pinned) clightning; };
+  clightningPkg = pkg: callPackage pkg { inherit (nbPkgs) clightning; };
 
   unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
 in {

pkgs/rtl/default.nix

@@ -1,6 +1,6 @@
 { pkgs, lib, makeWrapper }:
 let
-  inherit (pkgs) nodejs;
+  nodejs = pkgs.nodejs-14_x;
   nodePackages = import ./composition.nix { inherit pkgs nodejs; };
 in
 nodePackages.package.overrideAttrs (old: {