From 6c883d0f1deacff4fc227a4f925414a3733efc6e Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <othacehe@gnu.org>
Date: Wed, 10 Mar 2021 09:05:02 +0100
Subject: 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.
---
 gnu/services/cuirass.scm | 82 +-----------------------------------------------
 1 file changed, 1 insertion(+), 81 deletions(-)

(limited to 'gnu/services')

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 @@ (define-module (gnu services cuirass)
             <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 @@ (define cuirass-remote-worker-service-type
                         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)))
-- 
cgit v1.2.3