summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorFederico Beffa <beffa@fbengineering.ch>2015-04-04 22:51:13 +0200
committerFederico Beffa <beffa@fbengineering.ch>2015-04-08 17:31:12 +0200
commit042bc828fcd2dc7bbacbe6ef0408722a3d51a684 (patch)
tree54d0d855fd047e9f36b4eabf6032a2607dea9de8 /tests
parent283cce508ae2d300132be21ed1e37ce9f59cd1cb (diff)
downloadguix-042bc828fcd2dc7bbacbe6ef0408722a3d51a684.tar.gz
profiles: Generate GHC's package database cache.
* guix/profiles.scm (ghc-package-cache-file): New procedure.
  (profile-derivation): Add 'ghc-package-cache?' keyword argument.  If true
  (the default), add the result of 'ghc-package-cache-file' to 'inputs'.
* guix/scripts/package.scm (guix-package)[process-actions]: Pass
  #:ghc-package-cache? to 'profile-generation'.
* tests/packages.scm ("--search-paths with pattern"): Likewise.
* tests/profiles.scm ("profile-derivation"): Likewise.
Diffstat (limited to 'tests')
-rw-r--r--tests/packages.scm1
-rw-r--r--tests/profiles.scm2
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/packages.scm b/tests/packages.scm
index c9dd5d859a..4e3a116cb8 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -600,6 +600,7 @@
                   (manifest (map package->manifest-entry
                                  (list p1 p2)))
                   #:info-dir? #f
+                  #:ghc-package-cache? #f
                   #:ca-certificate-bundle? #f)
                  #:guile-for-build (%guile-for-build))))
     (build-derivations %store (list prof))
diff --git a/tests/profiles.scm b/tests/profiles.scm
index 7b942e35b0..d20cb9d808 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -184,6 +184,7 @@
        (guile      (package->derivation %bootstrap-guile))
        (drv        (profile-derivation (manifest (list entry))
                                        #:info-dir? #f
+                                       #:ghc-package-cache? #f
                                        #:ca-certificate-bundle? #f))
        (profile -> (derivation->output-path drv))
        (bindir ->  (string-append profile "/bin"))
@@ -197,6 +198,7 @@
       ((entry ->   (package->manifest-entry packages:glibc "debug"))
        (drv        (profile-derivation (manifest (list entry))
                                        #:info-dir? #f
+                                       #:ghc-package-cache? #f
                                        #:ca-certificate-bundle? #f)))
     (return (derivation-inputs drv))))