From 149ba2666ab0dc7da8816c9163bd2c9ba1f37960 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Thu, 24 Jul 2025 14:32:25 +0200 Subject: [PATCH] guix: switch to guix shell --- contrib/guix/guix-build | 4 ++-- contrib/guix/libexec/build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index e87a15678..4e0314552 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -374,7 +374,7 @@ EOF # Run the build script 'contrib/guix/libexec/build.sh' in the build # container specified by 'contrib/guix/manifest.scm'. # - # Explanation of `guix environment` flags: + # Explanation of `guix shell` flags: # # --container run command within an isolated container # @@ -437,7 +437,7 @@ EOF # more information. # # shellcheck disable=SC2086,SC2031 - time-machine environment --manifest="${PWD}/contrib/guix/manifest.scm" \ + time-machine shell --manifest="${PWD}/contrib/guix/manifest.scm" \ --container \ --pure \ --no-cwd \ diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 40128fec3..bcb1e0d6f 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -12,7 +12,7 @@ source contrib/shell/git-utils.bash # Although Guix _does_ set umask when building its own packages (in our case, # this is all packages in manifest.scm), it does not set it for `guix -# environment`. It does make sense for at least `guix environment --container` +# shell`. It does make sense for at least `guix shell --container` # to set umask, so if that change gets merged upstream and we bump the # time-machine to a commit which includes the aforementioned change, we can # remove this line.