mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-26 22:38:07 -05:00
905443abb7
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> |
||
|---|---|---|
| .. | ||
| keys | ||
| services | ||
| accounts.scm | ||
| base16.scm | ||
| base32.scm | ||
| base64.scm | ||
| boot-parameters.scm | ||
| bournish.scm | ||
| build-emacs-utils.scm | ||
| build-utils.scm | ||
| builders.scm | ||
| cache.scm | ||
| challenge.scm | ||
| channels.scm | ||
| combinators.scm | ||
| containers.scm | ||
| cpan.scm | ||
| cpio.scm | ||
| cran.scm | ||
| crate.scm | ||
| cve-sample.json | ||
| cve.scm | ||
| debug-link.scm | ||
| derivations.scm | ||
| discovery.scm | ||
| egg.scm | ||
| elm.scm | ||
| elpa.scm | ||
| file-systems.scm | ||
| gem.scm | ||
| gexp.scm | ||
| git-authenticate.scm | ||
| git.scm | ||
| glob.scm | ||
| gnu-maintenance.scm | ||
| go.scm | ||
| grafts.scm | ||
| graph.scm | ||
| gremlin.scm | ||
| guix-archive.sh | ||
| guix-authenticate.sh | ||
| guix-build-branch.sh | ||
| guix-build.sh | ||
| guix-daemon.sh | ||
| guix-describe.sh | ||
| guix-download.sh | ||
| guix-environment-container.sh | ||
| guix-environment.sh | ||
| guix-gc.sh | ||
| guix-git-authenticate.sh | ||
| guix-graph.sh | ||
| guix-hash.sh | ||
| guix-home.sh | ||
| guix-lint.sh | ||
| guix-pack-localstatedir.sh | ||
| guix-pack-relocatable.sh | ||
| guix-pack.sh | ||
| guix-package-aliases.sh | ||
| guix-package-net.sh | ||
| guix-package.sh | ||
| guix-repl.sh | ||
| guix-shell-export-manifest.sh | ||
| guix-shell.sh | ||
| guix-style.sh | ||
| guix-system.sh | ||
| hackage.scm | ||
| hexpm.scm | ||
| home-import.scm | ||
| home-services.scm | ||
| http-client.scm | ||
| import-git.scm | ||
| import-github.scm | ||
| import-utils.scm | ||
| inferior.scm | ||
| ipfs.scm | ||
| lint.scm | ||
| minetest.scm | ||
| modules.scm | ||
| monads.scm | ||
| nar.scm | ||
| networking.scm | ||
| offload.scm | ||
| opam.scm | ||
| openpgp.scm | ||
| pack.scm | ||
| packages.scm | ||
| pki.scm | ||
| print.scm | ||
| processes.scm | ||
| profiles.scm | ||
| publish.scm | ||
| pypi.scm | ||
| read-print.scm | ||
| records.scm | ||
| scripts.scm | ||
| search-paths.scm | ||
| services.scm | ||
| sets.scm | ||
| size.scm | ||
| status.scm | ||
| store-database.scm | ||
| store-deduplication.scm | ||
| store-roots.scm | ||
| store.scm | ||
| style.scm | ||
| substitute.scm | ||
| swh.scm | ||
| syscalls.scm | ||
| system.scm | ||
| test.drv | ||
| texlive.scm | ||
| transformations.scm | ||
| ui.scm | ||
| union.scm | ||
| upstream.scm | ||
| utils.scm | ||
| uuid.scm | ||
| workers.scm | ||