diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-06-03 03:36:47 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-06-03 03:36:47 -0400 |
| commit | 0c0431f9ce32a64ca663a2c5fc6656cbb86dc245 (patch) | |
| tree | b494cf43c627a689e72591ebcb51a41399b142d0 /guix | |
| parent | f52ef55e2b7c728ebf6dd102a0344dd0c78c8118 (diff) | |
| parent | 2c790226d22f86b641191918462fa7527c8a3ac7 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/self.scm | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/guix/self.scm b/guix/self.scm index a24e9c6147..3acfac6f80 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -82,7 +82,6 @@ GUILE-VERSION (\"2.0\" or \"2.2\"), or #f if none of the packages matches." ("guile-json" (ref '(gnu packages guile) 'guile-json)) ("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh)) ("guile-git" (ref '(gnu packages guile) 'guile-git)) - ("guile-gdbm-ffi" (ref '(gnu packages guile) 'guile-gdbm-ffi)) ("guile-sqlite3" (ref '(gnu packages guile) 'guile-sqlite3)) ("libgcrypt" (ref '(gnu packages gnupg) 'libgcrypt)) ("zlib" (ref '(gnu packages compression) 'zlib)) @@ -94,7 +93,6 @@ GUILE-VERSION (\"2.0\" or \"2.2\"), or #f if none of the packages matches." ("guile2.0-json" (ref '(gnu packages guile) 'guile2.0-json)) ("guile2.0-ssh" (ref '(gnu packages ssh) 'guile2.0-ssh)) ("guile2.0-git" (ref '(gnu packages guile) 'guile2.0-git)) - ("guile2.0-gdbm-ffi" (ref '(gnu packages guile) 'guile2.0-gdbm-ffi)) ;; XXX: No "guile2.0-sqlite3". (_ #f)))) ;no such package @@ -220,12 +218,6 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'." "guile-git" "guile2.0-git")) - (define guile-gdbm-ffi - (package-for-guile guile-version - "guile-gdbm-ffi" - "guile2.0-gdbm-ffi")) - - (define guile-sqlite3 (package-for-guile guile-version "guile-sqlite3" @@ -235,8 +227,7 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'." (match (append-map (lambda (package) (cons (list "x" package) (package-transitive-propagated-inputs package))) - (list guile-git guile-json guile-ssh - guile-gdbm-ffi guile-sqlite3)) + (list guile-git guile-json guile-ssh guile-sqlite3)) (((labels packages _ ...) ...) packages))) @@ -264,12 +255,19 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'." (specification->package "libgcrypt")))) + ;; (guix man-db) is needed at build-time by (guix profiles) + ;; but we don't need to compile it; not compiling it allows + ;; us to avoid an extra dependency on guile-gdbm-ffi. + #:extra-files + `(("guix/man-db.scm" ,(local-file "../guix/man-db.scm"))) + #:guile-for-build guile-for-build)) (define *extra-modules* (scheme-node "guix-extra" (filter-map (match-lambda (('guix 'scripts _ ..1) #f) + (('guix 'man-db) #f) (name name)) (scheme-modules* source "guix")) (list *core-modules*) |