simplification

glicid/packages/mpi.scm

@@ -121,9 +121,6 @@
 )
 
 
-;(define slurm20-instead-of-slurm (instead-of "slurm" slurm-20.02)) 
-
-
 (define-public openmpi-glicid
  (transform-package
   ((instead-of "slurm" slurm-20.02) openmpi) "glicid"))

glicid/utils.scm

@@ -27,18 +27,19 @@
   )
 )
 
-;(define gcc10-instead-of-gcc 
+(define (transform-package original-package suffix)
-;  ;; This is a procedure to replace GCC by GCC10,
+ (package
-;  ;; recursively.
+  (inherit original-package)
-;;  (package-input-rewriting/spec `((,gcc-toolchain . ,(const gcc-toolchain-10)))))
+  (name (string-append (package-name original-package) "-" suffix ))
-;  (package-input-rewriting `((,gcc-toolchain . ,gcc-toolchain-10))))
+ )
+)
 
 
-
+(define (instead-of package-a-spec package-b) 
-(define (gcc10-instead-of-gcc packagetorewrite)
+ (package-input-rewriting/spec `(
- (let ((toolchaingcc (specification->package "gcc-toolchain@10"))
+                                  (,package-a-spec . ,(const package-b)
-      ; (toolchaingfortran  (specification->package "gfortran-toolchain@10.3.0"))
+                                  ) 
-      )
+                                ;  #:deep? #t
-   (package-with-c-toolchain packagetorewrite `(("toolchaingcc" ,toolchaingcc)
+                                 )
- ;                                  ("toulchaingfortran",toolchaingfortran)
+  )
-   ))))
+)