01/03: tests: Remove dependency on 'glibc-utf8-locales' for profile tests.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 6d0b9d03ced244093c026b3433ec06643d78236c
Author: Ludovic Courtès <address@hidden>
Date:   Wed Mar 4 17:04:35 2015 +0100

    tests: Remove dependency on 'glibc-utf8-locales' for profile tests.
    
    This fixes a regression introduced in commit 536c3ee.
    
    * guix/profiles.scm (ca-certificate-bundle): When MANIFEST is empty,
      make a trivial derivation.
    * guix/scripts/package.scm (guix-package)[process-actions]: Pass
      #:ca-certificate-bundle? to 'profile-generation'.
    * tests/packages.scm ("--search-paths with pattern"): Likewise.
    * tests/profiles.scm ("profile-derivation"): Likewise.
---
 guix/profiles.scm        |   10 +++++++---
 guix/scripts/package.scm |    3 ++-
 tests/packages.scm       |    3 ++-
 tests/profiles.scm       |    3 ++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 5ceba25..d626749 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -464,9 +464,13 @@ MANIFEST.  Single-file bundles are required by programs 
such as Git and Lynx."
                              (string-append result
                                             "/ca-certificates.crt")))))
 
-  (gexp->derivation "ca-certificate-bundle" build
-                    #:modules '((guix build utils))
-                    #:local-build? #t))
+  ;; Don't depend on 'glibc-utf8-locales' and its dependencies when there's
+  ;; nothing to do.
+  (if (null? (manifest-entries manifest))
+      (gexp->derivation "ca-certificate-bundle" #~(mkdir #$output))
+      (gexp->derivation "ca-certificate-bundle" build
+                        #:modules '((guix build utils))
+                        #:local-build? #t)))
 
 (define* (profile-derivation manifest
                              #:key
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index c27207f..a24c657 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -829,7 +829,8 @@ more information.~%"))
                (let* ((prof-drv (run-with-store (%store)
                                   (profile-derivation
                                    new
-                                   #:info-dir? (not bootstrap?))))
+                                   #:info-dir? (not bootstrap?)
+                                   #:ca-certificate-bundle? (not bootstrap?))))
                       (prof     (derivation->output-path prof-drv)))
                  (show-manifest-transaction (%store) manifest transaction
                                             #:dry-run? dry-run?)
diff --git a/tests/packages.scm b/tests/packages.scm
index d6371b3..c9dd5d8 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -599,7 +599,8 @@
                  (profile-derivation
                   (manifest (map package->manifest-entry
                                  (list p1 p2)))
-                  #:info-dir? #f)
+                  #:info-dir? #f
+                  #:ca-certificate-bundle? #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"
diff --git a/tests/profiles.scm b/tests/profiles.scm
index 833b08b..1bac9d9 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -182,7 +182,8 @@
       ((entry ->   (package->manifest-entry %bootstrap-guile))
        (guile      (package->derivation %bootstrap-guile))
        (drv        (profile-derivation (manifest (list entry))
-                                       #:info-dir? #f))
+                                       #:info-dir? #f
+                                       #:ca-certificate-bundle? #f))
        (profile -> (derivation->output-path drv))
        (bindir ->  (string-append profile "/bin"))
        (_          (built-derivations (list drv))))