mirror of
https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git
synced 2025-04-30 14:18:38 +02:00
simplification
This commit is contained in:
parent
1c725ab134
commit
668e2e26f0
2 changed files with 14 additions and 16 deletions
|
@ -121,9 +121,6 @@
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
;(define slurm20-instead-of-slurm (instead-of "slurm" slurm-20.02))
|
|
||||||
|
|
||||||
|
|
||||||
(define-public openmpi-glicid
|
(define-public openmpi-glicid
|
||||||
(transform-package
|
(transform-package
|
||||||
((instead-of "slurm" slurm-20.02) openmpi) "glicid"))
|
((instead-of "slurm" slurm-20.02) openmpi) "glicid"))
|
||||||
|
|
|
@ -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 (gcc10-instead-of-gcc packagetorewrite)
|
|
||||||
(let ((toolchaingcc (specification->package "gcc-toolchain@10"))
|
|
||||||
; (toolchaingfortran (specification->package "gfortran-toolchain@10.3.0"))
|
|
||||||
)
|
)
|
||||||
(package-with-c-toolchain packagetorewrite `(("toolchaingcc" ,toolchaingcc)
|
)
|
||||||
; ("toulchaingfortran",toolchaingfortran)
|
|
||||||
))))
|
|
||||||
|
(define (instead-of package-a-spec package-b)
|
||||||
|
(package-input-rewriting/spec `(
|
||||||
|
(,package-a-spec . ,(const package-b)
|
||||||
|
)
|
||||||
|
; #:deep? #t
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
Loading…
Add table
Reference in a new issue