From c22adb03afaa5e6caf55ee4ab8021f50533a1fd7 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 5 Feb 2021 13:37:16 +0100
Subject: [PATCH 1/4] extra-container: 0.5 -> 0.6

---
 pkgs/extra-container/default.nix | 6 +++---
 test/lib/make-container.sh       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/extra-container/default.nix b/pkgs/extra-container/default.nix
index 83385ae..98691c2 100644
--- a/pkgs/extra-container/default.nix
+++ b/pkgs/extra-container/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "extra-container-${version}";
-  version = "0.5";
+  pname = "extra-container";
+  version = "0.6";
 
   src = builtins.fetchTarball {
     url = "https://github.com/erikarvstedt/extra-container/archive/${version}.tar.gz";
-    sha256 = "12xqa11v583ajdv51g1833rxvrndmly9h4r62wc3llm8xs6k7ais";
+    sha256 = "0hm4xfjbqjrrq7n1pkbs33lpw9k5q3ms3psprqhfsxkkwzy78zlm";
   };
 
   buildCommand = ''
diff --git a/test/lib/make-container.sh b/test/lib/make-container.sh
index 6957018..e039dc1 100755
--- a/test/lib/make-container.sh
+++ b/test/lib/make-container.sh
@@ -77,8 +77,8 @@ while [[ $# > 0 ]]; do
 done
 
 containerBin=$(type -P extra-container) || true
-if [[ ! ($containerBin && $(realpath $containerBin) == *extra-container-0.5*) ]]; then
-    echo "Building extra-container. Skip this step by adding extra-container 0.5 to PATH."
+if [[ ! ($containerBin && $(realpath $containerBin) == *extra-container-0.6*) ]]; then
+    echo "Building extra-container. Skip this step by adding extra-container 0.6 to PATH."
     nix-build --out-link /tmp/extra-container "$scriptDir"/../pkgs -A extra-container >/dev/null
     export PATH="/tmp/extra-container/bin${PATH:+:}$PATH"
 fi

From d41a84316738271ac29ddd1dfb422063cf34a2d8 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 5 Feb 2021 13:37:17 +0100
Subject: [PATCH 2/4] jmbitcoin: remove secp256k1 from propagatedBuildInputs

Adding this input has no effect. jmbitcoin accesses secp256k1 via bitcointx.
---
 pkgs/python-packages/jmbitcoin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/python-packages/jmbitcoin/default.nix b/pkgs/python-packages/jmbitcoin/default.nix
index b61228d..c092436 100644
--- a/pkgs/python-packages/jmbitcoin/default.nix
+++ b/pkgs/python-packages/jmbitcoin/default.nix
@@ -1,4 +1,4 @@
-{ version, src, lib, buildPythonPackage, fetchurl, future, coincurve, urldecode, pyaes, python-bitcointx, secp256k1, joinmarketbase }:
+{ version, src, lib, buildPythonPackage, fetchurl, future, coincurve, urldecode, pyaes, python-bitcointx, joinmarketbase }:
 
 buildPythonPackage rec {
   pname = "joinmarketbitcoin";
@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   postUnpack = "sourceRoot=$sourceRoot/jmbitcoin";
 
-  propagatedBuildInputs = [ future coincurve urldecode pyaes python-bitcointx secp256k1 ];
+  propagatedBuildInputs = [ future coincurve urldecode pyaes python-bitcointx ];
 
   checkInputs = [ joinmarketbase ];
 

From a2f265cd35dffbe44f1049482759c5b552457834 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 5 Feb 2021 13:37:18 +0100
Subject: [PATCH 3/4] secp256k1: move to top-level packages

Reason: secp256k1 is not a Python package.
---
 pkgs/default.nix                                 | 1 +
 pkgs/python-packages/default.nix                 | 3 +--
 pkgs/{python-packages => }/secp256k1/default.nix | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{python-packages => }/secp256k1/default.nix (100%)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index db178c1..0fe5236 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -13,6 +13,7 @@ let self = {
   extra-container = pkgs.callPackage ./extra-container { };
   clightning-plugins = import ./clightning-plugins pkgs self.nbPython3Packages;
   clboss = pkgs.callPackage ./clboss { };
+  secp256k1 = pkgs.callPackage ./secp256k1 { };
 
   nbPython3Packages = (pkgs.python3.override {
     packageOverrides = pySelf: super: import ./python-packages self pySelf;
diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix
index 8e953ba..fdb6ef4 100644
--- a/pkgs/python-packages/default.nix
+++ b/pkgs/python-packages/default.nix
@@ -8,8 +8,7 @@ let
 in {
   bencoderpyx = callPackage ./bencoderpyx {};
   coincurve = callPackage ./coincurve {};
-  python-bitcointx = callPackage ./python-bitcointx {};
-  secp256k1 = callPackage ./secp256k1 {};
+  python-bitcointx = callPackage ./python-bitcointx { inherit (nbPkgs) secp256k1; };
   urldecode = callPackage ./urldecode {};
   chromalog = callPackage ./chromalog {};
   txzmq = callPackage ./txzmq {};
diff --git a/pkgs/python-packages/secp256k1/default.nix b/pkgs/secp256k1/default.nix
similarity index 100%
rename from pkgs/python-packages/secp256k1/default.nix
rename to pkgs/secp256k1/default.nix

From a0f48c9de9d2c45e446965bdaf3ad3cf1fc1b90f Mon Sep 17 00:00:00 2001
From: nixbitcoin <nixbitcoin@i2pmail.org>
Date: Fri, 5 Feb 2021 14:39:04 +0000
Subject: [PATCH 4/4] examples: fix deploy-container interactive flag

---
 examples/deploy-container.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/deploy-container.sh b/examples/deploy-container.sh
index f57df31..965c2ec 100755
--- a/examples/deploy-container.sh
+++ b/examples/deploy-container.sh
@@ -67,7 +67,7 @@ else
 fi
 
 if [[ $interactive ]]; then
-    runCmd=
+    runCmd=()
 else
     runCmd=(--run bash -c "$demoCmds")
 fi