Merge pull request #10010

149ba26 guix: switch to guix shell (tobtoht)
This commit is contained in:
tobtoht 2025-08-21 17:30:51 +00:00
commit a9b8a8a4b1
No known key found for this signature in database
GPG Key ID: E45B10DD027D2472
2 changed files with 3 additions and 3 deletions

View File

@ -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 \

View File

@ -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.