Skip to content

Commit c4d47d2

Browse files
committed
Merge bitcoin/bitcoin#26077: guix: switch from guix environment to guix shell
66c4b58 guix: switch from guix environment to guix shell (fanquake) Pull request description: See https://guix.gnu.org/manual/devel/en/html_node/Invoking-guix-environment.html. > Deprecation warning: The guix environment command is deprecated in favor of guix shell, which performs similar functions but is more convenient to use. See Invoking guix shell. > Being deprecated, guix environment is slated for eventual removal, but the Guix project is committed to keeping it until May 1st, 2023. Please get in touch with us at [email protected] if you would like to discuss it. See also https://guix.gnu.org/blog/2021/from-guix-environment-to-guix-shell/ for a blog post and additional details. Guix `shell` was added to Guix ~1 year ago, in this commit, https://git.savannah.gnu.org/cgit/guix.git/commit/?id=80edb7df6586464aa40e84e103f0045452de95db, which isn't part of the 1.3.0 release binaries out of the box, but invoking a `guix pull`, and updating will make it available. i.e: ```bash bash-5.1# guix --version guix (GNU Guix) 1.3.0 Copyright (C) 2021 the Guix authors License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. bash-5.1# guix shell guix: shell: command not found Try 'guix --help' for more information. bash-5.1# guix pull Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.org/git/guix.git'... Authenticating channel 'guix', commits 9edb3f6 to 7a980bb (6,278 new commits)... Building from this channel: guix https://git.savannah.gnu.org/git/guix.git7a980bb < snip > building /gnu/store/2wwwsczxcw61m05p4mv0kf0advx4fqsb-inferior-script.scm.drv... building package cache... building profile with 1 package... New in this revision: 6,866 new packages: a2jmidid, abjad, bash-5.1# guix help shell Usage: guix shell [OPTION] PACKAGES... [-- COMMAND...] Build an environment that includes PACKAGES and execute COMMAND or an interactive shell in that environment. ``` ACKs for top commit: TheCharlatan: ACK 66c4b58 Tree-SHA512: caa3fd2ca8d0f261c50ecdda3728a75389d24d89b51293dedc704ee77ab1342b2bb08ca8c871dcb4646229f056ec86cb15500934ded1b0c501a3ffc25aaa8ae6
2 parents 7bc8c53 + 66c4b58 commit c4d47d2

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

contrib/guix/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ details.
259259
Override the number of jobs to run simultaneously, you might want to do so on
260260
a memory-limited machine. This may be passed to:
261261

262-
- `guix` build commands as in `guix environment --cores="$JOBS"`
262+
- `guix` build commands as in `guix shell --cores="$JOBS"`
263263
- `make` as in `make --jobs="$JOBS"`
264264
- `xargs` as in `xargs -P"$JOBS"`
265265

@@ -301,7 +301,7 @@ details.
301301

302302
* _**ADDITIONAL_GUIX_ENVIRONMENT_FLAGS**_
303303

304-
Additional flags to be passed to the invocation of `guix environment` inside
304+
Additional flags to be passed to the invocation of `guix shell` inside
305305
`guix time-machine`.
306306

307307
# Choosing your security model

contrib/guix/guix-build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ EOF
365365
# Run the build script 'contrib/guix/libexec/build.sh' in the build
366366
# container specified by 'contrib/guix/manifest.scm'.
367367
#
368-
# Explanation of `guix environment` flags:
368+
# Explanation of `guix shell` flags:
369369
#
370370
# --container run command within an isolated container
371371
#
@@ -428,7 +428,7 @@ EOF
428428
# more information.
429429
#
430430
# shellcheck disable=SC2086,SC2031
431-
time-machine environment --manifest="${PWD}/contrib/guix/manifest.scm" \
431+
time-machine shell --manifest="${PWD}/contrib/guix/manifest.scm" \
432432
--container \
433433
--pure \
434434
--no-cwd \

contrib/guix/guix-codesign

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ EOF
286286
# Run the build script 'contrib/guix/libexec/build.sh' in the build
287287
# container specified by 'contrib/guix/manifest.scm'.
288288
#
289-
# Explanation of `guix environment` flags:
289+
# Explanation of `guix shell` flags:
290290
#
291291
# --container run command within an isolated container
292292
#
@@ -343,7 +343,7 @@ EOF
343343
# more information.
344344
#
345345
# shellcheck disable=SC2086,SC2031
346-
time-machine environment --manifest="${PWD}/contrib/guix/manifest.scm" \
346+
time-machine shell --manifest="${PWD}/contrib/guix/manifest.scm" \
347347
--container \
348348
--pure \
349349
--no-cwd \

contrib/guix/libexec/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export TZ=UTC
88

99
# Although Guix _does_ set umask when building its own packages (in our case,
1010
# this is all packages in manifest.scm), it does not set it for `guix
11-
# environment`. It does make sense for at least `guix environment --container`
11+
# shell`. It does make sense for at least `guix shell --container`
1212
# to set umask, so if that change gets merged upstream and we bump the
1313
# time-machine to a commit which includes the aforementioned change, we can
1414
# remove this line.

contrib/guix/libexec/codesign.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export TZ=UTC
88

99
# Although Guix _does_ set umask when building its own packages (in our case,
1010
# this is all packages in manifest.scm), it does not set it for `guix
11-
# environment`. It does make sense for at least `guix environment --container`
11+
# shell`. It does make sense for at least `guix shell --container`
1212
# to set umask, so if that change gets merged upstream and we bump the
1313
# time-machine to a commit which includes the aforementioned change, we can
1414
# remove this line.

0 commit comments

Comments
 (0)