From 668e2e26f01d95b2cfb61804f2e2611ed0342437 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 29 Nov 2021 16:23:48 +0100 Subject: [PATCH] simplification --- glicid/packages/mpi.scm | 3 --- glicid/utils.scm | 27 ++++++++++++++------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index 4e32159..7567d83 100644 --- a/glicid/packages/mpi.scm +++ b/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")) diff --git a/glicid/utils.scm b/glicid/utils.scm index 28528b3..7d5cf81 100644 --- a/glicid/utils.scm +++ b/glicid/utils.scm @@ -27,18 +27,19 @@ ) ) -;(define gcc10-instead-of-gcc -; ;; This is a procedure to replace GCC by GCC10, -; ;; recursively. -;; (package-input-rewriting/spec `((,gcc-toolchain . ,(const gcc-toolchain-10))))) -; (package-input-rewriting `((,gcc-toolchain . ,gcc-toolchain-10)))) +(define (transform-package original-package suffix) + (package + (inherit original-package) + (name (string-append (package-name original-package) "-" suffix )) + ) +) - -(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 + ) + ) +)