From daeedda8251d8ad8c0bd75c594460b51df21a15c Mon Sep 17 00:00:00 2001
From: nixbitcoin <nixbitcoin@i2pmail.org>
Date: Wed, 7 Apr 2021 10:51:14 +0000
Subject: [PATCH] clightning-plugins: update rev and dependencies

---
 pkgs/clightning-plugins/default.nix           |  4 ++--
 pkgs/default.nix                              |  2 +-
 pkgs/python-packages/default.nix              |  4 ++--
 pkgs/python-packages/pylightning/default.nix  |  6 +-----
 pkgs/python-packages/pyln-client/default.nix  |  2 +-
 pkgs/python-packages/pyln-proto/default.nix   |  8 +-------
 pkgs/python-packages/recommonmark/default.nix | 12 ++++++++++++
 7 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/python-packages/recommonmark/default.nix

diff --git a/pkgs/clightning-plugins/default.nix b/pkgs/clightning-plugins/default.nix
index 28561af..7b57908 100644
--- a/pkgs/clightning-plugins/default.nix
+++ b/pkgs/clightning-plugins/default.nix
@@ -6,8 +6,8 @@ let
   src = pkgs.fetchFromGitHub {
     owner = "lightningd";
     repo = "plugins";
-    rev = "6cd472636926f05a9c472139fabe1ff11c90aa6a";
-    sha256 = "1lisx85vzsfzjhdc6zdz0l6bcrdgg6rp5xbc5jmx93mv8qqg2cns";
+    rev = "6f2b8fb6374600f9e1e06e57884bde99d85383bf";
+    sha256 = "0hibkwdljpja9974zwbcpvpdhb4c96vda57qfj7cbinvfswj5bi0";
   };
 
   version = builtins.substring 0 7 src.rev;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4275100..5fa33df 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -18,7 +18,7 @@ let self = {
   secp256k1 = pkgs.callPackage ./secp256k1 { };
 
   nbPython3Packages = (pkgs.python3.override {
-    packageOverrides = pySelf: super: import ./python-packages self pySelf;
+    packageOverrides = import ./python-packages self;
   }).pkgs;
 
   pinned = import ./pinned.nix;
diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix
index 21e875e..d8cbc5b 100644
--- a/pkgs/python-packages/default.nix
+++ b/pkgs/python-packages/default.nix
@@ -1,5 +1,4 @@
-nbPkgs:
-self:
+nbPkgs: self: super:
 let
   inherit (self) callPackage;
 
@@ -14,6 +13,7 @@ in {
   urldecode = callPackage ./urldecode {};
   chromalog = callPackage ./chromalog {};
   txzmq = callPackage ./txzmq {};
+  recommonmark = callPackage ./recommonmark { inherit (super) recommonmark; };
 
   # cryptography 3.3.2, required by joinmarketdaemon
   cryptography = callPackage ./cryptography {};
diff --git a/pkgs/python-packages/pylightning/default.nix b/pkgs/python-packages/pylightning/default.nix
index c9dc340..5659dbf 100644
--- a/pkgs/python-packages/pylightning/default.nix
+++ b/pkgs/python-packages/pylightning/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   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;
 
@@ -10,8 +10,4 @@ buildPythonPackage rec {
 
   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
-  '';
 }
diff --git a/pkgs/python-packages/pyln-client/default.nix b/pkgs/python-packages/pyln-client/default.nix
index ea8a392..f306f11 100644
--- a/pkgs/python-packages/pyln-client/default.nix
+++ b/pkgs/python-packages/pyln-client/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   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;
 
diff --git a/pkgs/python-packages/pyln-proto/default.nix b/pkgs/python-packages/pyln-proto/default.nix
index f924a48..2b35bdd 100644
--- a/pkgs/python-packages/pyln-proto/default.nix
+++ b/pkgs/python-packages/pyln-proto/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   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;
 
@@ -22,10 +22,4 @@ buildPythonPackage rec {
 
   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
-  '';
 }
diff --git a/pkgs/python-packages/recommonmark/default.nix b/pkgs/python-packages/recommonmark/default.nix
new file mode 100644
index 0000000..1fba1c1
--- /dev/null
+++ b/pkgs/python-packages/recommonmark/default.nix
@@ -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";
+  };
+})