diff options
| author | David Thompson <davet@gnu.org> | 2016-02-12 21:39:26 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-02-12 22:02:06 +0100 |
| commit | 779aa003fbacbbcb6973f289b607d1d285009cec (patch) | |
| tree | 74c05c5dd104dea4e27d9f28a30bdbfa8f15cdfe /tests/guix-environment-container.sh | |
| parent | e5f04c2dde258c14e714e748d17b1137fe0bf4f3 (diff) | |
| download | gnu-guix-779aa003fbacbbcb6973f289b607d1d285009cec.tar gnu-guix-779aa003fbacbbcb6973f289b607d1d285009cec.tar.gz | |
scripts: environment: Build environments as profiles.
Fixes <http://bugs.gnu.org/19816>.
* guix/scripts/environment.scm (evaluate-input-search-paths)
(build-inputs): Delete.
(evaluate-profile-search-paths, strip-input-name)
(package-or-package+output?, package-environment-inputs)
(build-environment, inputs->profile-derivations): New procedures.
(create-environment, show-search-paths, launch-environment)
(launch-environment/container): Replace 'inputs' argument
with 'profile' argument.
(package+propagated-inputs): Strip off names off of input tuples.
(options/resolve-packages): Handle input tuples that specify an output
in expressions.
(guix-environment): Convert inputs into a profile to use in the
environment. Remove non-package inputs such as origins from
environment inputs.
* doc/guix.texi ("invoking guix environment"): Document package+output
tuples for --expression option.
* tests/guix-environment.sh: Update tests.
* tests/guix-environment-container.sh: Likewise.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'tests/guix-environment-container.sh')
| -rw-r--r-- | tests/guix-environment-container.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh index 703ab31d27..aba34a3bd0 100644 --- a/tests/guix-environment-container.sh +++ b/tests/guix-environment-container.sh @@ -73,7 +73,7 @@ guix environment --container --ad-hoc --bootstrap guile-bootstrap \ -- guile -c "$mount_test_code" > $tmpdir/mounts cat "$tmpdir/mounts" -test `wc -l < $tmpdir/mounts` -eq 3 +test `wc -l < $tmpdir/mounts` -eq 4 current_dir="`cd $PWD; pwd -P`" grep -e "$current_dir$" $tmpdir/mounts # current directory |