From 3727c021ff1c54593a9752ab7bd9a4fe2001317c Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Fri, 7 Apr 2023 09:31:07 +0200 Subject: [PATCH 1/3] add gfortran from 8 to 12. --- glicid/packages/gcc.scm | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/glicid/packages/gcc.scm b/glicid/packages/gcc.scm index 2cd0513..8ec7511 100644 --- a/glicid/packages/gcc.scm +++ b/glicid/packages/gcc.scm @@ -13,6 +13,21 @@ ;; +(define-public gfortran-12 + (hidden-package (custom-gcc gcc-12 "gfortran" + '("fortran") %generic-search-paths))) + +(define-public gfortran-toolchain-12 + (package + (inherit (make-gcc-toolchain gfortran-12)) + (synopsis "Complete GCC tool chain for fortran lang development") + (description + "This package provides a complete GCC tool chain for + fortran lang development to be installed in user profiles. This includes + fortran, as well as libc (headers and binaries, plus debugging symbols + in the @code{debug} output), and binutils."))) + + (define-public gfortran-11 (hidden-package (custom-gcc gcc-11 "gfortran" '("fortran") %generic-search-paths))) @@ -26,3 +41,46 @@ fortran lang development to be installed in user profiles. This includes fortran, as well as libc (headers and binaries, plus debugging symbols in the @code{debug} output), and binutils."))) + +(define-public gfortran-10 + (hidden-package (custom-gcc gcc-10 "gfortran" + '("fortran") %generic-search-paths))) + +(define-public gfortran-toolchain-10 + (package + (inherit (make-gcc-toolchain gfortran-10)) + (synopsis "Complete GCC tool chain for fortran lang development") + (description + "This package provides a complete GCC tool chain for + fortran lang development to be installed in user profiles. This includes + fortran, as well as libc (headers and binaries, plus debugging symbols + in the @code{debug} output), and binutils."))) + + +(define-public gfortran-9 + (hidden-package (custom-gcc gcc-9 "gfortran" + '("fortran") %generic-search-paths))) + +(define-public gfortran-toolchain-9 + (package + (inherit (make-gcc-toolchain gfortran-9)) + (synopsis "Complete GCC tool chain for fortran lang development") + (description + "This package provides a complete GCC tool chain for + fortran lang development to be installed in user profiles. This includes + fortran, as well as libc (headers and binaries, plus debugging symbols + in the @code{debug} output), and binutils."))) + +(define-public gfortran-8 + (hidden-package (custom-gcc gcc-8 "gfortran" + '("fortran") %generic-search-paths))) + +(define-public gfortran-toolchain-8 + (package + (inherit (make-gcc-toolchain gfortran-8)) + (synopsis "Complete GCC tool chain for fortran lang development") + (description + "This package provides a complete GCC tool chain for + fortran lang development to be installed in user profiles. This includes + fortran, as well as libc (headers and binaries, plus debugging symbols + in the @code{debug} output), and binutils."))) From 1c79f77a571f4538a78319567c7f0159242b8831 Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Fri, 7 Apr 2023 09:32:35 +0200 Subject: [PATCH 2/3] gfortran 10 is default --- glicid/packages/gcc.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/glicid/packages/gcc.scm b/glicid/packages/gcc.scm index 8ec7511..bb83ff2 100644 --- a/glicid/packages/gcc.scm +++ b/glicid/packages/gcc.scm @@ -42,19 +42,21 @@ fortran, as well as libc (headers and binaries, plus debugging symbols in the @code{debug} output), and binutils."))) -(define-public gfortran-10 - (hidden-package (custom-gcc gcc-10 "gfortran" +;; gfortran@10 and gfortran-toolchain@10 are defaults + +;(define-public gfortran-10 +; (hidden-package (custom-gcc gcc-10 "gfortran" '("fortran") %generic-search-paths))) -(define-public gfortran-toolchain-10 - (package - (inherit (make-gcc-toolchain gfortran-10)) - (synopsis "Complete GCC tool chain for fortran lang development") - (description - "This package provides a complete GCC tool chain for - fortran lang development to be installed in user profiles. This includes - fortran, as well as libc (headers and binaries, plus debugging symbols - in the @code{debug} output), and binutils."))) +;(define-public gfortran-toolchain-10 +; (package +; (inherit (make-gcc-toolchain gfortran-10)) +; (synopsis "Complete GCC tool chain for fortran lang development") +; (description +; "This package provides a complete GCC tool chain for +; fortran lang development to be installed in user profiles. This includes +; fortran, as well as libc (headers and binaries, plus debugging symbols +; in the @code{debug} output), and binutils."))) (define-public gfortran-9 From 66de87d295f4d007a900ed11353ee9fec21ac397 Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Fri, 7 Apr 2023 09:43:14 +0200 Subject: [PATCH 3/3] add gfortran normally hidden versions --- glicid/packages/gcc.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/gcc.scm b/glicid/packages/gcc.scm index bb83ff2..ec7f7bd 100644 --- a/glicid/packages/gcc.scm +++ b/glicid/packages/gcc.scm @@ -11,7 +11,7 @@ (define %generic-search-paths (@@ (gnu packages gcc) %generic-search-paths)) -;; +;; now define-public normally hiden versions (define-public gfortran-12 (hidden-package (custom-gcc gcc-12 "gfortran"