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