Merge #317: Pkg updates

a0f48c9de9 examples: fix deploy-container interactive flag (nixbitcoin)
a2f265cd35 secp256k1: move to top-level packages (Erik Arvstedt)
d41a843167 jmbitcoin: remove secp256k1 from propagatedBuildInputs (Erik Arvstedt)
c22adb03af extra-container: 0.5 -> 0.6 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  nixbitcoin:
    ACK a0f48c9de9
  jonasnick:
    ACK a0f48c9de9

Tree-SHA512: 29fa58a960673df407831dd41594c66b26dad1de1e792f4fcc8e35641f39dd873d77b725651be5e01c875bf42284fa78903bab0ea677ec5a0e7eccf98816845d

examples/deploy-container.sh

@@ -67,7 +67,7 @@ else
 fi
 
 if [[ $interactive ]]; then
-    runCmd=
+    runCmd=()
 else
     runCmd=(--run bash -c "$demoCmds")
 fi

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;

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 = ''

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 {};

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 ];
 

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