aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xaux/guix/with-container.sh13
-rwxr-xr-xsh/templates/aux/guix/with-container.sh13
2 files changed, 12 insertions, 14 deletions
diff --git a/aux/guix/with-container.sh b/aux/guix/with-container.sh
index 6561b2ce..13b6cd3c 100755
--- a/aux/guix/with-container.sh
+++ b/aux/guix/with-container.sh
@@ -2,13 +2,12 @@
set -eux
if [ -z "${1:-}" ]; then
- guix time-machine -C aux/guix/pinned-channels.scm -- \
- environment -m aux/guix/manifest.scm
+ guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \
+ environment --fallback -m aux/guix/manifest.scm
elif [ "$1" = '-p' ]; then
- guix time-machine -C aux/guix/pinned-channels.scm -- \
- environment --pure -C -m aux/guix/manifest.scm
+ guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \
+ environment --fallback -m aux/guix/manifest.scm --pure -C
else
- guix time-machine -C aux/guix/pinned-channels.scm -- \
- environment --pure -C -m aux/guix/manifest.scm -- \
- sh -c "$@"
+ guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \
+ environment --fallback -m aux/guix/manifest.scm --pure -C -- sh -c "$@"
fi
diff --git a/sh/templates/aux/guix/with-container.sh b/sh/templates/aux/guix/with-container.sh
index 6561b2ce..13b6cd3c 100755
--- a/sh/templates/aux/guix/with-container.sh
+++ b/sh/templates/aux/guix/with-container.sh
@@ -2,13 +2,12 @@
set -eux
if [ -z "${1:-}" ]; then
- guix time-machine -C aux/guix/pinned-channels.scm -- \
- environment -m aux/guix/manifest.scm
+ guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \
+ environment --fallback -m aux/guix/manifest.scm
elif [ "$1" = '-p' ]; then
- guix time-machine -C aux/guix/pinned-channels.scm -- \
- environment --pure -C -m aux/guix/manifest.scm
+ guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \
+ environment --fallback -m aux/guix/manifest.scm --pure -C
else
- guix time-machine -C aux/guix/pinned-channels.scm -- \
- environment --pure -C -m aux/guix/manifest.scm -- \
- sh -c "$@"
+ guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \
+ environment --fallback -m aux/guix/manifest.scm --pure -C -- sh -c "$@"
fi