From fe7168b3351128c2ec91fdca934ce319539f0bcf Mon Sep 17 00:00:00 2001
From: Joseph Goulden <joegoulden@protonmail.com>
Date: Mon, 30 Sep 2024 16:33:53 +0100
Subject: [PATCH] build: Exclude python plugins from flake build

---
 .version             | 2 +-
 nix/pkgs/default.nix | 6 +++---
 nix/shells.nix       | 1 +
 plugins/Makefile     | 4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.version b/.version
index 3dce2e921..d1c32a23d 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-24.08
+24.08.1
diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix
index 423794eee..28b5e522f 100644
--- a/nix/pkgs/default.nix
+++ b/nix/pkgs/default.nix
@@ -8,8 +8,8 @@ with pkgs;
 let
   version = builtins.readFile ../../.version;
   py3 = python3.withPackages (p: [
-    p.mako
     p.grpcio-tools
+    p.mako
   ]);
 in
 stdenv.mkDerivation {
@@ -19,6 +19,7 @@ stdenv.mkDerivation {
   makeFlags = [
     "VERSION=${version}"
     "MTIME=${self.lastModifiedDate}"
+    "NO_PYTHON=1"
   ];
 
   # when building on darwin we need cctools to provide the correct libtool
@@ -33,6 +34,7 @@ stdenv.mkDerivation {
       gitMinimal
       libtool
       lowdown
+      pkgconf
       py3
       unzip
       which
@@ -79,9 +81,7 @@ stdenv.mkDerivation {
     stdenv.isDarwin && stdenv.isx86_64
   ) "-Wno-error=gnu-folding-constant";
 
-  # The `clnrest` plugin requires a Python environment to run
   postInstall = ''
-    rm -r $out/libexec/c-lightning/plugins/clnrest
     cp ${config.packages.rust}/bin/cln-grpc $out/libexec/c-lightning/plugins
   '';
 
diff --git a/nix/shells.nix b/nix/shells.nix
index 4f7bb90bc..e2c4f23f5 100644
--- a/nix/shells.nix
+++ b/nix/shells.nix
@@ -9,6 +9,7 @@
     }:
     {
       devShells = {
+        default = pkgs.mkShell { inputsFrom = [ config.packages.default ]; };
         rust = pkgs.craneLib.devShell {
           checks = {
             inherit (self.checks.${system}) rust;
diff --git a/plugins/Makefile b/plugins/Makefile
index 23c8d1492..320aefa0c 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -114,9 +114,11 @@ C_PLUGINS :=					\
 	plugins/spenderp			\
 	plugins/cln-askrene
 
+ifneq ($(NO_PYTHON), 1)
 PY_PLUGINS :=					\
 	plugins/clnrest/clnrest \
 	plugins/wss-proxy/wss-proxy
+endif
 
 ifeq ($(HAVE_SQLITE3),1)
 C_PLUGINS += plugins/sql
@@ -216,7 +218,7 @@ plugins/txprepare: $(PLUGIN_TXPREPARE_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_O
 
 plugins/bcli: $(PLUGIN_BCLI_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS)
 
-plugins/keysend: wire/tlvstream.o wire/onion_wiregen.o $(PLUGIN_KEYSEND_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_PAY_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) common/gossmap.o common/fp16.o common/route.o common/dijkstra.o common/blindedpay.o common/blindedpath.o common/hmac.o common/blinding.o common/onion_encode.o common/gossmods_listpeerchannels.o common/sciddir_or_pubkey.o 
+plugins/keysend: wire/tlvstream.o wire/onion_wiregen.o $(PLUGIN_KEYSEND_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_PAY_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) common/gossmap.o common/fp16.o common/route.o common/dijkstra.o common/blindedpay.o common/blindedpath.o common/hmac.o common/blinding.o common/onion_encode.o common/gossmods_listpeerchannels.o common/sciddir_or_pubkey.o
 $(PLUGIN_KEYSEND_OBJS): $(PLUGIN_PAY_LIB_HEADER)
 
 plugins/spenderp: bitcoin/block.o bitcoin/preimage.o bitcoin/psbt.o common/psbt_open.o common/json_channel_type.o common/channel_type.o common/features.o wire/peer_wiregen.o $(PLUGIN_SPENDER_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS)