~ruther/guix-local

6d0b9d03ced244093c026b3433ec06643d78236c — Ludovic Courtès 11 years ago 0e309f1
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.
4 files changed, 13 insertions(+), 6 deletions(-)

M guix/profiles.scm
M guix/scripts/package.scm
M tests/packages.scm
M tests/profiles.scm
M guix/profiles.scm => guix/profiles.scm +7 -3
@@ 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

M guix/scripts/package.scm => guix/scripts/package.scm +2 -1
@@ 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?)

M tests/packages.scm => tests/packages.scm +2 -1
@@ 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"

M tests/profiles.scm => tests/profiles.scm +2 -1
@@ 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))))