diff options
author | Mathieu Othacehe <othacehe@gnu.org> | 2021-03-10 09:05:02 +0100 |
---|---|---|
committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-03-10 09:05:02 +0100 |
commit | 6c883d0f1deacff4fc227a4f925414a3733efc6e (patch) | |
tree | ea1e5213d85ec67e3d7cd9dd8b122fd96e591955 /gnu/services | |
parent | 76bea3f8bcd951ded88dfb7f8cad5bc3e5a1701f (diff) | |
download | guix-6c883d0f1deacff4fc227a4f925414a3733efc6e.tar.gz |
services: cuirass: Remove simple cuirass configuration.
The Cuirass configuration has been simplified so that this is no longer needed. * gnu/services/cuirass.scm (<build-manifest>, <simple-cuirass-configuration>, simple-cuirass-configuration->specs): Remove them.
Diffstat (limited to 'gnu/services')
-rw-r--r-- | gnu/services/cuirass.scm | 82 |
1 files changed, 1 insertions, 81 deletions
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index dae895107e..317d877459 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -50,17 +50,7 @@ <cuirass-remote-worker-configuration> cuirass-remote-worker-configuration cuirass-remote-worker-configuration? - cuirass-remote-worker-service-type - - <build-manifest> - build-manifest - build-manifest? - - <simple-cuirass-configuration> - simple-cuirass-configuration - simple-cuirass-configuration? - - simple-cuirass-configuration->specs)) + cuirass-remote-worker-service-type)) ;;;; Commentary: ;;; @@ -395,73 +385,3 @@ CONFIG." cuirass-remote-worker-shepherd-service))) (description "Run the Cuirass remote build worker service."))) - -(define-record-type* <build-manifest> - build-manifest make-build-manifest - build-manifest? - (channel-name build-manifest-channel-name) ;symbol - (manifest build-manifest-manifest)) ;string - -(define-record-type* <simple-cuirass-configuration> - simple-cuirass-configuration make-simple-cuirass-configuration - simple-cuirass-configuration? - (build simple-cuirass-configuration-build - (default 'all)) ;symbol or list of <build-manifest> - (channels simple-cuirass-configuration-channels - (default %default-channels)) ;list of <channel> - (non-package-channels simple-cuirass-configuration-package-channels - (default '())) ;list of channels name - (systems simple-cuirass-configuration-systems - (default (list (%current-system))))) ;list of strings - -(define* (simple-cuirass-configuration->specs config) - (define (format-name name) - (if (string? name) - name - (symbol->string name))) - - (define (format-manifests build-manifests) - (map (lambda (build-manifest) - (match-record build-manifest <build-manifest> - (channel-name manifest) - (cons (format-name channel-name) manifest))) - build-manifests)) - - (define (channel->input channel) - (let ((name (channel-name channel)) - (url (channel-url channel)) - (branch (channel-branch channel))) - `((#:name . ,(format-name name)) - (#:url . ,url) - (#:load-path . ".") - (#:branch . ,branch) - (#:no-compile? #t)))) - - (define (package-path channels non-package-channels) - (filter-map (lambda (channel) - (let ((name (channel-name channel))) - (and (not (member name non-package-channels)) - (not (eq? name 'guix)) - (format-name name)))) - channels)) - - (define (config->spec config) - (match-record config <simple-cuirass-configuration> - (build channels non-package-channels systems) - `((#:name . "simple-config") - (#:load-path-inputs . ("guix")) - (#:package-path-inputs . ,(package-path channels - non-package-channels)) - (#:proc-input . "guix") - (#:proc-file . "build-aux/cuirass/gnu-system.scm") - (#:proc . cuirass-jobs) - (#:proc-args . ((systems . ,systems) - ,@(if (eq? build 'all) - '() - `((subset . "manifests") - (manifests . ,(format-manifests build)))))) - (#:inputs . ,(map channel->input channels)) - (#:build-outputs . ()) - (#:priority . 1)))) - - #~(list '#$(config->spec config))) |