John Kehayias 905443abb7
shell: Fix '--emulate-fhs' sometimes not including 'glibc-for-fhs'. ...
Fixes <https://issues.guix.gnu.org/58861 >.
Previously the order of the options giving to 'guix shell' could mean that the
'glibc-for-fhs' package included with the '--emulate-fhs' option would not
appear in the container. For example, using the development option with a
package using the 'gnu-build-system', e.g. 'guix shell -CFD hello', would
include the regular 'glibc' package. The option ordered mattered: 'guix shell
-CD hello -F' would include the expected 'glibc-for-fhs'. We fix this by
having 'glibc-for-fhs' added to the package list just before calling
'options-with-caching' so the option order given by the user does not matter.
* guix/scripts/shell.scm (%options): Move the '--emulate-fhs' (expression
. ...) component from here...
(parse-args): ... to here.
* tests/guix-environment-container.sh: Add a test to check that
'glibc-for-fhs' is in the container even when 'glibc' is included in the 'guix
shell' package list.
Signed-off-by: Ludovic Courtès <ludo@gnu.org >
2022-11-06 12:38:02 +01:00
2022-05-18 23:20:21 +02:00
2022-08-28 22:28:47 -04:00
2019-08-28 00:27:14 +02:00
2020-08-29 16:24:17 +02:00
2022-08-28 23:37:28 +02:00
2022-07-13 10:49:40 -04:00
2022-01-10 11:44:29 -05:00
2022-10-22 01:46:55 +02:00
2022-06-04 12:04:23 +02:00
2021-01-16 11:51:03 +00:00
2022-10-22 01:46:55 +02:00
2020-10-01 12:51:13 +02:00
2022-10-22 01:46:55 +02:00
2021-12-18 04:09:47 +01:00
2022-05-30 16:34:39 +02:00
2020-12-21 17:47:35 +01:00
2019-10-23 16:40:17 +02:00
2022-10-22 01:46:55 +02:00
2021-11-17 23:43:14 +01:00
2022-05-22 01:07:52 +02:00
2021-12-18 22:51:55 +01:00
2021-07-18 02:10:49 -04:00
2022-09-17 19:09:27 +02:00
2022-10-22 01:46:55 +02:00
2022-02-14 11:23:08 +01:00
2022-10-17 09:37:27 +02:00
2020-12-09 22:25:17 +01:00
2022-09-26 23:29:37 +02:00
2021-09-28 22:00:47 +02:00
2021-04-15 03:22:55 -04:00
2022-10-22 01:46:55 +02:00
2022-01-16 20:21:27 -08:00
2020-12-15 17:32:09 +01:00
2021-12-22 10:53:19 +01:00
2022-10-22 01:46:54 +02:00
2022-02-18 14:14:38 +01:00
2022-10-22 01:46:55 +02:00
2022-09-04 23:10:10 +02:00
2020-09-28 21:06:36 -05:00
2022-11-06 12:38:02 +01:00
2021-10-31 14:49:47 +02:00
2020-09-28 21:06:36 -05:00
2022-02-14 11:23:08 +01:00
2022-01-16 23:56:56 +01:00
2022-01-04 20:37:29 -05:00
2022-08-05 15:28:03 +02:00
2021-02-22 12:07:45 +01:00
2019-05-18 12:23:31 +02:00
2020-12-04 13:12:08 +00:00
2022-05-25 09:28:43 +02:00
2020-10-02 23:28:09 +02:00
2022-01-19 22:07:54 +01:00
2022-05-23 16:24:46 +02:00
2020-09-16 16:04:01 +02:00
2022-06-16 23:57:40 +02:00
2022-09-04 23:10:10 +02:00
2022-08-08 11:53:33 +02:00
2022-10-07 16:01:39 +02:00
2022-06-06 13:26:51 +02:00
2022-06-15 10:18:34 +02:00
2022-09-20 19:24:31 +02:00
2022-06-04 12:04:24 +02:00
2022-03-06 22:49:46 +01:00
2021-09-18 19:37:45 +02:00
2022-03-07 22:49:27 +01:00
2022-10-05 23:59:48 +02:00
2022-07-08 13:51:34 +01:00
2021-04-12 18:42:22 +02:00
2022-10-27 19:43:06 +02:00
2022-01-06 16:27:30 +01:00
2021-12-23 10:54:00 +01:00
2022-10-22 01:46:55 +02:00
2021-11-16 14:34:28 +01:00
2021-01-16 23:30:59 +01:00
2020-08-25 13:45:27 -04:00
2021-11-18 22:56:10 +01:00
2021-12-22 10:53:19 +01:00
2022-10-22 01:46:55 +02:00
2022-10-22 01:46:55 +02:00
2022-09-29 22:59:48 +02:00
2019-12-10 10:49:42 +01:00
2022-10-22 01:46:55 +02:00
2022-04-29 18:07:17 +02:00
2022-02-11 23:51:39 +01:00
2022-09-20 19:24:31 +02:00
2022-07-01 12:10:29 +02:00
2019-03-24 00:13:53 +01:00
2019-06-14 22:09:38 +02:00
2022-05-18 22:29:54 +02:00
2022-06-26 23:19:14 +02:00
2021-01-31 21:49:58 +01:00
2021-11-16 14:34:28 +01:00
2019-04-10 17:09:47 +02:00
2021-12-05 19:17:41 +01:00
2022-08-08 11:22:32 +02:00
2022-09-28 22:28:27 +02:00
2021-01-21 11:22:08 +01:00
2021-10-26 12:46:27 +02:00
2022-10-22 01:46:55 +02:00
2022-07-22 23:03:46 +02:00
2022-09-29 22:59:49 +02:00
2022-06-16 23:57:41 +02:00
2019-06-14 21:57:39 +02:00
2022-01-05 21:17:58 +01:00
2021-11-07 01:38:23 -04:00
2019-05-07 12:18:44 +02:00
John Kehayias
905443abb7