extra-container: pin to nixpkgs-unstable

extra-container is now part of nixpkgs.
fort-nix · Oct 6, 2021 · 265fc19 · 265fc19
1 parent 75b89f3
commit 265fc19
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 42 deletions.
diff --git a/helper/makeShell.nix b/helper/makeShell.nix
@@ -6,7 +6,7 @@ let
   nbPkgs = import ../pkgs { inherit pkgs; };
   cfgDir = toString configDir;
   path = lib.optionalString pkgs.stdenv.isLinux ''
-    export PATH="${lib.makeBinPath [ nbPkgs.extra-container ]}''${PATH:+:}$PATH"
+    export PATH="${lib.makeBinPath [ nbPkgs.pinned.extra-container ]}''${PATH:+:}$PATH"
   '';
 in
 pkgs.stdenv.mkDerivation {

diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -13,7 +13,6 @@ let self = {
   nixops19_09 = pkgs.callPackage ./nixops { };
   krops = import ./krops { };
   netns-exec = pkgs.callPackage ./netns-exec { };
-  extra-container = pkgs.callPackage ./extra-container { };
   clightning-plugins = pkgs.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages);
   clboss = pkgs.callPackage ./clboss { };
   secp256k1 = pkgs.callPackage ./secp256k1 { };

diff --git a/pkgs/extra-container/default.nix b/pkgs/extra-container/default.nix
diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
@@ -12,6 +12,7 @@ pkgs: pkgsUnstable:
     clightning
     electrs
     elementsd
+    extra-container
     hwi
     lightning-loop
     lightning-pool

diff --git a/test/lib/make-container.sh b/test/lib/make-container.sh
@@ -77,9 +77,10 @@ while [[ $# > 0 ]]; do
 done
 
 containerBin=$(type -P extra-container) || true
-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
+if [[ ! ($containerBin && $(realpath $containerBin) == *extra-container-0.8*) ]]; then
+    echo "Building extra-container. Skip this step by adding extra-container 0.8 to PATH."
+    nix-build --out-link /tmp/extra-container "$scriptDir"/../pkgs \
+      -A pinned.extra-container >/dev/null
     export PATH="/tmp/extra-container/bin${PATH:+:}$PATH"
 fi