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

self: Do not build (guix man-db). 

* guix/self.scm (specification->package): Remove "guile-gdbm-ffi" and
"guile2.0-gdbm-ffi".
(compiled-guix)[guile-gdbm-ffi]: Remove.
[dependencies]: Remove it.
[*core-modules*]: Add "guix/man-db.scm" via #:extra-files.
[*extra-modules*]: Exclude "guix/man-db.scm".
This commit is contained in:
Ludovic Courtès 2018-06-02 15:40:03 +02:00
parent 92963798a6
commit 8292f5a9c5
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
guix/self.scm
View File

@ -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-json" (ref '(gnu packages guile) 'guile-json))
("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh)) ("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh))
("guile-git" (ref '(gnu packages guile) 'guile-git)) ("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)) ("guile-sqlite3" (ref '(gnu packages guile) 'guile-sqlite3))
("libgcrypt" (ref '(gnu packages gnupg) 'libgcrypt)) ("libgcrypt" (ref '(gnu packages gnupg) 'libgcrypt))
("zlib" (ref '(gnu packages compression) 'zlib)) ("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-json" (ref '(gnu packages guile) 'guile2.0-json))
("guile2.0-ssh" (ref '(gnu packages ssh) 'guile2.0-ssh)) ("guile2.0-ssh" (ref '(gnu packages ssh) 'guile2.0-ssh))
("guile2.0-git" (ref '(gnu packages guile) 'guile2.0-git)) ("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". ;; XXX: No "guile2.0-sqlite3".
(_ #f)))) ;no such package (_ #f)))) ;no such package
@ -220,12 +218,6 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'."
"guile-git" "guile-git"
"guile2.0-git")) "guile2.0-git"))
(define guile-gdbm-ffi
(package-for-guile guile-version
"guile-gdbm-ffi"
"guile2.0-gdbm-ffi"))
(define guile-sqlite3 (define guile-sqlite3
(package-for-guile guile-version (package-for-guile guile-version
"guile-sqlite3" "guile-sqlite3"
@ -235,8 +227,7 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'."
(match (append-map (lambda (package) (match (append-map (lambda (package)
(cons (list "x" package) (cons (list "x" package)
(package-transitive-propagated-inputs package))) (package-transitive-propagated-inputs package)))
(list guile-git guile-json guile-ssh (list guile-git guile-json guile-ssh guile-sqlite3))
guile-gdbm-ffi guile-sqlite3))
(((labels packages _ ...) ...) (((labels packages _ ...) ...)
packages))) packages)))
@ -264,12 +255,19 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'."
(specification->package (specification->package
"libgcrypt")))) "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)) #:guile-for-build guile-for-build))
(define *extra-modules* (define *extra-modules*
(scheme-node "guix-extra" (scheme-node "guix-extra"
(filter-map (match-lambda (filter-map (match-lambda
(('guix 'scripts _ ..1) #f) (('guix 'scripts _ ..1) #f)
(('guix 'man-db) #f)
(name name)) (name name))
(scheme-modules* source "guix")) (scheme-modules* source "guix"))
(list *core-modules*) (list *core-modules*)