[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: self: Do not build (guix man-db).
From: |
Ludovic Courtès |
Subject: |
01/07: self: Do not build (guix man-db). |
Date: |
Sat, 2 Jun 2018 10:02:58 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 8292f5a9c5232e8a77d80f4cd33afaeac7a60d79
Author: Ludovic Courtès <address@hidden>
Date: Sat Jun 2 15:40:03 2018 +0200
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".
---
guix/self.scm | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/guix/self.scm b/guix/self.scm
index a24e9c6..3acfac6 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*)
- branch master updated (9296379 -> 15dcd29), Ludovic Courtès, 2018/06/02
- 02/07: gnu: Add emacs-evil-ediff., Ludovic Courtès, 2018/06/02
- 01/07: self: Do not build (guix man-db).,
Ludovic Courtès <=
- 05/07: gnu: Add emacs-evil-multiedit., Ludovic Courtès, 2018/06/02
- 06/07: gnu: Add emacs-evil-org., Ludovic Courtès, 2018/06/02
- 03/07: gnu: Add emacs-evil-magit., Ludovic Courtès, 2018/06/02
- 07/07: gnu: Add emacs-fish-completion., Ludovic Courtès, 2018/06/02
- 04/07: gnu: Add emacs-evil-mu4e., Ludovic Courtès, 2018/06/02