From 926f1febb74c57917757ac341ac84838c4ce6a4c Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 3 Sep 2021 13:19:28 +0200 Subject: [PATCH] make-container: update extra-container version Keep this file in sync with the latest extra-container update. --- pkgs/extra-container/default.nix | 1 + test/lib/make-container.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/extra-container/default.nix b/pkgs/extra-container/default.nix index 07b495f..40f8308 100644 --- a/pkgs/extra-container/default.nix +++ b/pkgs/extra-container/default.nix @@ -4,6 +4,7 @@ stdenv.mkDerivation rec { pname = "extra-container"; + # Update this file when changing the version: ../../test/lib/make-container.sh version = "0.7"; src = builtins.fetchTarball { diff --git a/test/lib/make-container.sh b/test/lib/make-container.sh index af19185..70803fb 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.6*) ]]; then - echo "Building extra-container. Skip this step by adding extra-container 0.6 to PATH." +if [[ ! ($containerBin && $(realpath $containerBin) == *extra-container-0.7*) ]]; then + echo "Building extra-container. Skip this step by adding extra-container 0.7 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