clightning: fix build
This commit is contained in:
parent
44561235b2
commit
321e8ba06e
12
pkgs/clightning-mistune-workaround/default.nix
Normal file
12
pkgs/clightning-mistune-workaround/default.nix
Normal file
@ -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";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
27
pkgs/clightning-mistune-workaround/mistune.nix
Normal file
27
pkgs/clightning-mistune-workaround/mistune.nix
Normal file
@ -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;
|
||||||
|
}
|
@ -25,6 +25,14 @@ let self = {
|
|||||||
packageOverrides = import ./python-packages self;
|
packageOverrides = import ./python-packages self;
|
||||||
}).pkgs;
|
}).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
|
# Internal pkgs
|
||||||
netns-exec = pkgs.callPackage ./netns-exec { };
|
netns-exec = pkgs.callPackage ./netns-exec { };
|
||||||
krops = import ./krops { inherit pkgs; };
|
krops = import ./krops { inherit pkgs; };
|
||||||
|
@ -14,7 +14,6 @@ pkgs: pkgsUnstable:
|
|||||||
inherit (pkgsUnstable)
|
inherit (pkgsUnstable)
|
||||||
btcpayserver
|
btcpayserver
|
||||||
charge-lnd
|
charge-lnd
|
||||||
clightning
|
|
||||||
fulcrum
|
fulcrum
|
||||||
hwi
|
hwi
|
||||||
lightning-loop
|
lightning-loop
|
||||||
|
@ -3,7 +3,7 @@ let
|
|||||||
inherit (self) callPackage;
|
inherit (self) callPackage;
|
||||||
|
|
||||||
joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; };
|
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;
|
unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
|
||||||
in {
|
in {
|
||||||
|
Loading…
Reference in New Issue
Block a user