nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2015-03-04 17:04:35 +01:00
parent 0e309f1e5b
commit 6d0b9d03ce
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/profiles.scm
View File

@ -464,9 +464,13 @@ MANIFEST. Single-file bundles are required by programs such as Git and Lynx."
(string-append result (string-append result
"/ca-certificates.crt"))))) "/ca-certificates.crt")))))
;; 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 (gexp->derivation "ca-certificate-bundle" build
#:modules '((guix build utils)) #:modules '((guix build utils))
#:local-build? #t)) #:local-build? #t)))
(define* (profile-derivation manifest (define* (profile-derivation manifest
#:key #:key

3
guix/scripts/package.scm
View File

@ -829,7 +829,8 @@ more information.~%"))
(let* ((prof-drv (run-with-store (%store) (let* ((prof-drv (run-with-store (%store)
(profile-derivation (profile-derivation
new new
#:info-dir? (not bootstrap?)))) #:info-dir? (not bootstrap?)
#:ca-certificate-bundle? (not bootstrap?))))
(prof (derivation->output-path prof-drv))) (prof (derivation->output-path prof-drv)))
(show-manifest-transaction (%store) manifest transaction (show-manifest-transaction (%store) manifest transaction
#:dry-run? dry-run?) #:dry-run? dry-run?)

3
tests/packages.scm
View File

@ -599,7 +599,8 @@
(profile-derivation (profile-derivation
(manifest (map package->manifest-entry (manifest (map package->manifest-entry
(list p1 p2))) (list p1 p2)))
#:info-dir? #f) #:info-dir? #f
#:ca-certificate-bundle? #f)
#:guile-for-build (%guile-for-build)))) #:guile-for-build (%guile-for-build))))
(build-derivations %store (list prof)) (build-derivations %store (list prof))
(string-match (format #f "^export XML_CATALOG_FILES=\"~a/xml/+bar/baz/catalog\\.xml\"\n" (string-match (format #f "^export XML_CATALOG_FILES=\"~a/xml/+bar/baz/catalog\\.xml\"\n"

3
tests/profiles.scm
View File

@ -182,7 +182,8 @@
((entry -> (package->manifest-entry %bootstrap-guile)) ((entry -> (package->manifest-entry %bootstrap-guile))
(guile (package->derivation %bootstrap-guile)) (guile (package->derivation %bootstrap-guile))
(drv (profile-derivation (manifest (list entry)) (drv (profile-derivation (manifest (list entry))
#:info-dir? #f)) #:info-dir? #f
#:ca-certificate-bundle? #f))
(profile -> (derivation->output-path drv)) (profile -> (derivation->output-path drv))
(bindir -> (string-append profile "/bin")) (bindir -> (string-append profile "/bin"))
(_ (built-derivations (list drv)))) (_ (built-derivations (list drv))))