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

clightning-plugins: update rev and dependencies

Browse Source
This commit is contained in:
nixbitcoin 2021-04-07 10:51:14 +00:00 committed by Erik Arvstedt
parent c5f67629e6
commit daeedda825
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
7 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/clightning-plugins/default.nix
View File

@ -6,8 +6,8 @@ let
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lightningd"; owner = "lightningd";
repo = "plugins"; repo = "plugins";
rev = "6cd472636926f05a9c472139fabe1ff11c90aa6a"; rev = "6f2b8fb6374600f9e1e06e57884bde99d85383bf";
sha256 = "1lisx85vzsfzjhdc6zdz0l6bcrdgg6rp5xbc5jmx93mv8qqg2cns"; sha256 = "0hibkwdljpja9974zwbcpvpdhb4c96vda57qfj7cbinvfswj5bi0";
}; };
version = builtins.substring 0 7 src.rev; version = builtins.substring 0 7 src.rev;

2
pkgs/default.nix
View File

@ -18,7 +18,7 @@ let self = {
secp256k1 = pkgs.callPackage ./secp256k1 { }; secp256k1 = pkgs.callPackage ./secp256k1 { };
nbPython3Packages = (pkgs.python3.override { nbPython3Packages = (pkgs.python3.override {
packageOverrides = pySelf: super: import ./python-packages self pySelf; packageOverrides = import ./python-packages self;
}).pkgs; }).pkgs;
pinned = import ./pinned.nix; pinned = import ./pinned.nix;

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

@ -1,5 +1,4 @@
nbPkgs: nbPkgs: self: super:
self:
let let
inherit (self) callPackage; inherit (self) callPackage;
@ -14,6 +13,7 @@ in {
urldecode = callPackage ./urldecode {}; urldecode = callPackage ./urldecode {};
chromalog = callPackage ./chromalog {}; chromalog = callPackage ./chromalog {};
txzmq = callPackage ./txzmq {}; txzmq = callPackage ./txzmq {};
recommonmark = callPackage ./recommonmark { inherit (super) recommonmark; };
# cryptography 3.3.2, required by joinmarketdaemon # cryptography 3.3.2, required by joinmarketdaemon
cryptography = callPackage ./cryptography {}; cryptography = callPackage ./cryptography {};

6
pkgs/python-packages/pylightning/default.nix
View File

@ -2,7 +2,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylightning"; pname = "pylightning";
version = "0.8.0"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py version = "0.9.3"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py
inherit (clightning) src; inherit (clightning) src;
@ -10,8 +10,4 @@ buildPythonPackage rec {
postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}"; postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}";
# The clightning source contains pyln-client 0.8.0
postPatch = ''
substituteInPlace requirements.txt --replace pyln-client==0.7.3 pyln-client==0.8.0
'';
} }

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

@ -2,7 +2,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyln-client"; pname = "pyln-client";
version = "0.8.0"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py version = "0.9.3"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py
inherit (clightning) src; inherit (clightning) src;

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

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyln-proto"; pname = "pyln-proto";
version = "0.8.4"; # defined in ${src}/contrib/pyln-proto/setup.py version = "0.9.3"; # defined in ${src}/contrib/pyln-proto/setup.py
inherit (clightning) src; inherit (clightning) src;
@ -22,10 +22,4 @@ buildPythonPackage rec {
postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}"; postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}";
postPatch = ''
substituteInPlace requirements.txt \
--replace base58==1.0.2 base58==2.0.1 \
--replace bitstring==3.1.6 bitstring==3.1.5 \
--replace cryptography==2.8 cryptography==3.1
'';
} }

12
pkgs/python-packages/recommonmark/default.nix Normal file
View File

@ -0,0 +1,12 @@
{ recommonmark, fetchFromGitHub }:
recommonmark.overridePythonAttrs (old: rec {
version = "0.7.1";
src = fetchFromGitHub {
owner = "rtfd";
repo = old.pname;
rev = version;
sha256 = "0kwm4smxbgq0c0ybkxfvlgrfb3gq9amdw94141jyykk9mmz38379";
};
})