aboutsummaryrefslogtreecommitdiff
path: root/guix-build-coordinator/datastore.scm
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2020-04-17 11:44:43 +0100
committerChristopher Baines <mail@cbaines.net>2020-04-17 11:44:43 +0100
commit79053c06f5cbfd1160b898b31967ac0a5145bcdd (patch)
tree2822e52f7b745596151f1eb6c7afc5213030c542 /guix-build-coordinator/datastore.scm
parent3d54ef4926ba20b9f6979d7b6916e1fde0805588 (diff)
downloadbuild-coordinator-79053c06f5cbfd1160b898b31967ac0a5145bcdd.tar
build-coordinator-79053c06f5cbfd1160b898b31967ac0a5145bcdd.tar.gz
Re-work how the datastore module re-exports things
This seems to avoid all the warnings, and fix the broken merge-generics behaviour.
Diffstat (limited to 'guix-build-coordinator/datastore.scm')
-rw-r--r--guix-build-coordinator/datastore.scm46
1 files changed, 25 insertions, 21 deletions
diff --git a/guix-build-coordinator/datastore.scm b/guix-build-coordinator/datastore.scm
index ae5d20f..111c854 100644
--- a/guix-build-coordinator/datastore.scm
+++ b/guix-build-coordinator/datastore.scm
@@ -1,32 +1,36 @@
(define-module (guix-build-coordinator datastore)
#:use-module (srfi srfi-1)
#:use-module (oop goops)
- #:duplicates (merge-generics)
#:use-module (guix-build-coordinator datastore abstract)
#:use-module (guix-build-coordinator datastore sqlite)
- ;; #:use-module (guix-build-coordinator datastore postgresql)
- #:re-export (datastore-store-derivation
- datastore-store-build
- datastore-new-agent
- datastore-list-agents
- datastore-find-agent
- datastore-store-build-result
- datastore-fetch-setup-failures
- datastore-store-setup-failure
- datastore-store-setup-failure/missing-inputs
- datastore-new-agent-password
- datastore-agent-password-exists?
- datastore-find-build
- datastore-list-unprocessed-builds
- datastore-list-agent-builds
- datastore-find-derivation-outputs
- datastore-agent-for-build
- datastore-replace-build-allocation-plan
- datastore-allocate-builds-to-agent
- datastore-list-allocation-plan-builds)
+ #:use-module (guix-build-coordinator datastore postgresql)
+ #:duplicates (merge-generics)
#:export (database-uri->datastore
datastore-find-build-output))
+(re-export datastore-store-derivation)
+(re-export datastore-store-build)
+(re-export datastore-new-agent)
+(re-export datastore-list-agents)
+(re-export datastore-find-agent)
+(re-export datastore-store-build-result)
+(re-export datastore-fetch-setup-failures)
+(re-export datastore-store-setup-failure)
+(re-export datastore-store-setup-failure/missing-inputs)
+(re-export datastore-list-setup-failure-missing-inputs)
+(re-export datastore-new-agent-password)
+(re-export datastore-agent-password-exists?)
+(re-export datastore-find-build)
+(re-export datastore-list-unprocessed-builds)
+(re-export datastore-list-agent-builds)
+(re-export datastore-find-derivation-outputs)
+(re-export datastore-find-derivation-inputs)
+(re-export datastore-list-builds-for-output)
+(re-export datastore-agent-for-build)
+(re-export datastore-replace-build-allocation-plan)
+(re-export datastore-allocate-builds-to-agent)
+(re-export datastore-list-allocation-plan-builds)
+
(define (database-uri->datastore database)
(cond
((string-prefix? "pg://" database)