diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-12-17 12:43:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-12-17 14:46:42 +0100 |
| commit | a6562c7e206650ff3d8e6764e60c59a768414bf7 (patch) | |
| tree | ba168b171f14a60f77d16fe6e022f114e1b0f16f /tests/packages.scm | |
| parent | d44fb7dd604d66cee7231bb3a93c3cde023dea82 (diff) | |
| download | guix-a6562c7e206650ff3d8e6764e60c59a768414bf7.tar guix-a6562c7e206650ff3d8e6764e60c59a768414bf7.tar.gz | |
profiles: Remove dependency on 'glibc-utf8-locales' for tests.
Commit 1af0860e8be81c01ad405c1226d6bc4516e62863 added a mandatory
dependency on 'glibc-utf8-locales', which entails long rebuilds for
tests.
* guix/profiles.scm (profile-derivation): Add #:locales? parameter.
Add 'set-utf8-locale' variable. Use it when LOCALES? is true.
(link-to-empty-profile): Pass #:locales? #f.
* guix/scripts/environment.scm (inputs->profile-derivation): Pass
#:locales?.
* guix/scripts/package.scm (build-and-use-profile): Likewise.
* tests/packages.scm ("--search-paths with pattern"): Pass #:locales? #f.
* tests/profiles.scm ("profile-derivation")
("profile-derivation, inputs", "profile-manifest, search-paths")
("etc/profile", "etc/profile when etc/ already exists"):
("etc/profile when etc/ is a symlink"): Likewise.
Diffstat (limited to 'tests/packages.scm')
| -rw-r--r-- | tests/packages.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/packages.scm b/tests/packages.scm index 47e76b53e9..247f75cc43 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -968,7 +968,8 @@ (profile-derivation (manifest (map package->manifest-entry (list p1 p2))) - #:hooks '()) + #:hooks '() + #:locales? #f) #:guile-for-build (%guile-for-build)))) (build-derivations %store (list prof)) (string-match (format #f "^export XML_CATALOG_FILES=\"~a/xml/+bar/baz/catalog\\.xml\"\n" |