From 9c766df16a0e58e25fa5ced1d4c05f7fae19425e Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Sat, 3 Sep 2022 15:33:44 +0000
Subject: [PATCH] Revert "clightning: fix build"

This reverts commit 321e8ba06efd05605ff13fe9087f099b5b4ec8dc which is not
necessary anymore due to the nixpkgs update.
---
 .../clightning-mistune-workaround/default.nix | 12 ---------
 .../clightning-mistune-workaround/mistune.nix | 27 -------------------
 pkgs/default.nix                              |  8 ------
 pkgs/pinned.nix                               |  1 +
 pkgs/python-packages/default.nix              |  2 +-
 5 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/clightning-mistune-workaround/default.nix
 delete mode 100644 pkgs/clightning-mistune-workaround/mistune.nix

diff --git a/pkgs/clightning-mistune-workaround/default.nix b/pkgs/clightning-mistune-workaround/default.nix
deleted file mode 100644
index 5fd55d9..0000000
--- a/pkgs/clightning-mistune-workaround/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ clightning, python3 }:
-
-clightning.override {
-  python3 = python3.override {
-    packageOverrides = self: super: {
-      mistune = self.callPackage ./mistune.nix {
-        version = "0.8.4";
-        sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e";
-      };
-    };
-  };
-}
diff --git a/pkgs/clightning-mistune-workaround/mistune.nix b/pkgs/clightning-mistune-workaround/mistune.nix
deleted file mode 100644
index 2450837..0000000
--- a/pkgs/clightning-mistune-workaround/mistune.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ 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;
-}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index cc5fb42..21ede79 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -27,14 +27,6 @@ let self = {
 
   fetchNodeModules = pkgs.callPackage ./build-support/fetch-node-modules.nix { };
 
-  # 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; };
diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
index 91629b3..e61c9b4 100644
--- a/pkgs/pinned.nix
+++ b/pkgs/pinned.nix
@@ -14,6 +14,7 @@ pkgs: pkgsUnstable:
   inherit (pkgsUnstable)
     btcpayserver
     charge-lnd
+    clightning
     fulcrum
     hwi
     lightning-loop
diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix
index 3d4f84f..cd2c593 100644
--- a/pkgs/python-packages/default.nix
+++ b/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) clightning; };
+  clightningPkg = pkg: callPackage pkg { inherit (nbPkgs.pinned) clightning; };
 
   unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
 in {