aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2020-10-23 14:59:17 +0100
committerChristopher Baines <mail@cbaines.net>2020-10-23 15:40:10 +0100
commitb0d6098f03ed297fda2bdb2dfdf36a2ae0f8bd8d (patch)
tree9619fcc27298aa4fe376050704374db24bc5781b
parent4b8acf715dd806f9034e7c7a073e6b49301985d3 (diff)
downloadguix-b0d6098f03ed297fda2bdb2dfdf36a2ae0f8bd8d.tar.gz
guix-b0d6098f03ed297fda2bdb2dfdf36a2ae0f8bd8d.zip
gnu: guix-build-coordinator: Propagate the guile inputs.
This means the package is usable as a library, which is useful when using the procedures to send requests to the Guix Build Coordinator. * gnu/packages/package-management.scm (guix-build-coordinator)[inputs]: Move guile inputs to propagated inputs. [propagated-inputs]: Receive some inputs. * gnu/services/guix.scm (make-guix-build-coordinator-start-script): Adjust the start script to include propagated inputs.
-rw-r--r--gnu/packages/package-management.scm9
-rw-r--r--gnu/services/guix.scm7
2 files changed, 10 insertions, 6 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 349897fd16..7afbd92b0d 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1059,7 +1059,10 @@ environments.")
("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))))
(inputs
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
- ("guile-fibers" ,guile-fibers)
+ ("sqlite" ,sqlite)
+ ("sqitch" ,sqitch)))
+ (propagated-inputs
+ `(("guile-fibers" ,guile-fibers)
("guile-prometheus" ,guile-prometheus)
("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-3)
@@ -1067,9 +1070,7 @@ environments.")
("guile-zlib" ,guile-zlib)
("guile-sqlite3" ,guile-sqlite3)
("guix" ,guix)
- ("gnutls" ,gnutls)
- ("sqlite" ,sqlite)
- ("sqitch" ,sqitch)))
+ ("gnutls" ,gnutls)))
(home-page "https://git.cbaines.net/guix/build-coordinator/")
(synopsis "Tool to help build derivations")
(description
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index 87f00338da..b909c651cc 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -188,8 +188,11 @@
;; libraries, but it means that the Guile libraries
;; needed for the Guix Build Coordinator don't need
;; to be individually specified here.
- (map second (package-inputs
- guix-build-coordinator-package)))
+ (append
+ (map second (package-inputs
+ guix-build-coordinator-package))
+ (map second (package-propagated-inputs
+ guix-build-coordinator-package))))
#~(begin
(use-modules (srfi srfi-1)
(ice-9 match)