greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clightning: update python pkgs to new version

Browse Source
This commit is contained in:
Erik Arvstedt 2021-11-10 21:25:11 +01:00
parent 6ad7107ddb
commit 38a843d005
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
4 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/python-packages/default.nix
View File

@ -19,6 +19,7 @@ in {
pyln-client = clightningPkg ./pyln-client; pyln-client = clightningPkg ./pyln-client;
pyln-proto = clightningPkg ./pyln-proto; pyln-proto = clightningPkg ./pyln-proto;
pyln-bolt7 = clightningPkg ./pyln-bolt7;
pylightning = clightningPkg ./pylightning; pylightning = clightningPkg ./pylightning;
## Specific versions of packages that already exist in nixpkgs ## Specific versions of packages that already exist in nixpkgs

22
pkgs/python-packages/pyln-bolt7/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ buildPythonPackage, clightning, pyln-proto }:
buildPythonPackage rec {
pname = "pyln-bolt7";
# See fn `bolt_meta` in
# https://github.com/ElementsProject/lightning/blob/master/contrib/pyln-spec/bolt7/setup.py
version = "1.0.2.186";
inherit (clightning) src;
propagatedBuildInputs = [ pyln-proto ];
postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-spec/bolt7";
# TODO-EXTERNAL
# Remove when this fix is released
# https://github.com/ElementsProject/lightning/pull/4910
postPatch = ''
sed -i 's|pyln.proto|pyln-proto|' requirements.txt
'';
}

8
pkgs/python-packages/pyln-client/default.nix
View File

@ -1,12 +1,14 @@
{ buildPythonPackage, clightning, recommonmark }: { buildPythonPackage, clightning, pyln-bolt7, recommonmark, setuptools-scm }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyln-client"; pname = "pyln-client";
version = "0.10.1"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py version = clightning.version;
inherit (clightning) src; inherit (clightning) src;
propagatedBuildInputs = [ recommonmark ]; propagatedBuildInputs = [ pyln-bolt7 recommonmark setuptools-scm ];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}"; postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}";
} }

14
pkgs/python-packages/pyln-proto/default.nix
View File

@ -4,11 +4,12 @@
, coincurve , coincurve
, base58 , base58
, mypy , mypy
, setuptools-scm
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyln-proto"; pname = "pyln-proto";
version = "0.10.1"; # defined in ${src}/contrib/pyln-proto/setup.py version = clightning.version;
inherit (clightning) src; inherit (clightning) src;
@ -18,8 +19,17 @@ buildPythonPackage rec {
coincurve coincurve
base58 base58
mypy mypy
setuptools-scm
]; ];
postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}"; SETUPTOOLS_SCM_PRETEND_VERSION = version;
postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-proto";
postPatch = ''
sed -i '
s|coincurve ~= 13.0|coincurve == 15.0.0|
s|base58 ~= 2.0.1|base58 == 2.1.0|
s|mypy==0.790|mypy == 0.812|
' requirements.txt
'';
} }