mirror of
https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git
synced 2025-04-30 22:28:38 +02:00
formatting
This commit is contained in:
parent
a5b5e6d9d6
commit
e30fa0129d
4 changed files with 193 additions and 203 deletions
|
@ -1,10 +1,10 @@
|
||||||
(define-module (glicid packages algebra)
|
(define-module (glicid packages algebra)
|
||||||
|
#:use-module (guix download)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
#:use-module (gnu packages algebra)
|
#:use-module (gnu packages algebra)
|
||||||
#:use-module (gnu packages commencement)
|
#:use-module (gnu packages commencement)
|
||||||
#:use-module (gnu packages mpi)
|
#:use-module (gnu packages mpi)
|
||||||
#:use-module (guix download)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
(define-public fftw-openmpi-with-fortran
|
(define-public fftw-openmpi-with-fortran
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
(define-module (glicid packages cluster)
|
(define-module (glicid packages cluster)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (gnu packages networking) ;; net-snmp
|
#:use-module (gnu packages networking)
|
||||||
#:use-module ((gnu packages cluster) #:prefix gnu:)
|
#:use-module ((gnu packages cluster) #:prefix gnu:)
|
||||||
#:use-module (glicid utils)
|
#:use-module (glicid utils)
|
||||||
)
|
)
|
||||||
|
|
||||||
;;;;;;;;
|
|
||||||
|
|
||||||
(define-public keepalived-newer-2.2.4
|
(define-public keepalived-newer-2.2.4
|
||||||
(package
|
(package
|
||||||
(inherit gnu:keepalived)
|
(inherit gnu:keepalived)
|
||||||
|
@ -15,24 +13,15 @@
|
||||||
(version "2.2.4")
|
(version "2.2.4")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append "http://www.keepalived.org/software/keepalived-" version ".tar.gz"))
|
||||||
"http://www.keepalived.org/software/keepalived-"
|
(sha256 (base32 "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" ))
|
||||||
version ".tar.gz"))
|
))
|
||||||
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01"
|
|
||||||
))))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
(define local:keepalived keepalived-newer-2.2.4)
|
(define local:keepalived keepalived-newer-2.2.4)
|
||||||
(define keepalived-latest (latest-version local:keepalived gnu:keepalived))
|
(define keepalived-latest (latest-version local:keepalived gnu:keepalived))
|
||||||
|
|
||||||
|
|
||||||
(define-public keepalived-glicid
|
(define-public keepalived-glicid
|
||||||
(package
|
(package
|
||||||
(inherit keepalived-latest)
|
(inherit keepalived-latest)
|
||||||
|
@ -40,17 +29,16 @@
|
||||||
(version (string-append (package-version keepalived-latest) "-glicid" ))
|
(version (string-append (package-version keepalived-latest) "-glicid" ))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags
|
`(#:configure-flags
|
||||||
(list (string-append "--enable-snmp")
|
(list
|
||||||
|
(string-append "--enable-snmp")
|
||||||
(string-append "--enable-snmp-checker")
|
(string-append "--enable-snmp-checker")
|
||||||
(string-append "--enable-snmp-rfc")
|
(string-append "--enable-snmp-rfc")
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
(inputs `(
|
||||||
|
("net-snmp", net-snmp)
|
||||||
(inputs `(("net-snmp", net-snmp)
|
,@(package-inputs keepalived-latest)
|
||||||
,@(package-inputs keepalived-latest)))
|
))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
;;; glicid/cluster.scm ends here
|
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
(define-module (glicid packages fabric-management)
|
(define-module (glicid packages fabric-management)
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix packages)
|
||||||
#:use-module ((gnu packages fabric-management) #:prefix gnu:)
|
#:use-module ((gnu packages fabric-management) #:prefix gnu:)
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
(define-public ucx-newer-1.11.2
|
(define-public ucx-newer-1.11.2
|
||||||
|
@ -16,14 +15,9 @@
|
||||||
(uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" ))
|
(uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" ))
|
||||||
(sha256 (base32 "1py62vjr0hgyqsdpr04jhn918i8ccn6ghjalwpcjpz24admgisyy"))
|
(sha256 (base32 "1py62vjr0hgyqsdpr04jhn918i8ccn6ghjalwpcjpz24admgisyy"))
|
||||||
)
|
)
|
||||||
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
(define local-ucx ucx-newer-1.11.2)
|
(define local-ucx ucx-newer-1.11.2)
|
||||||
(define-public ucx-latest local-ucx) ;; for now
|
(define-public ucx-latest local-ucx)
|
||||||
|
|
||||||
|
|
||||||
;;; glicid/fabric-management.scm ends here
|
|
||||||
|
|
||||||
|
|
|
@ -1,176 +1,184 @@
|
||||||
(define-module (glicid packages gcc)
|
(define-module (glicid packages gcc)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix build-system cmake)
|
||||||
#:use-module (guix download)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix build-system python)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix download)
|
||||||
#:use-module (guix build-system cmake)
|
#:use-module (guix git-download)
|
||||||
; #:use-module (guix licenses)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (gnu packages gawk)
|
#:use-module (guix packages)
|
||||||
#:use-module (gnu packages gcc)
|
#:use-module (guix utils)
|
||||||
#:use-module (gnu packages commencement)
|
#:use-module ((guix utils) #:select (target-64bit?))
|
||||||
#:use-module (guix build-system python)
|
#:use-module (gnu packages)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module (gnu packages admin)
|
||||||
#:use-module ((guix utils) #:select (target-64bit?))
|
#:use-module (gnu packages assembly)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages authentication)
|
||||||
#:use-module (gnu packages admin)
|
#:use-module (gnu packages autotools)
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages bdw-gc)
|
||||||
#:use-module (gnu packages freeipmi)
|
#:use-module (gnu packages benchmark)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages bison)
|
||||||
#:use-module (gnu packages mpi)
|
#:use-module (gnu packages boost)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages chemistry)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages cluster)
|
||||||
#:use-module (gnu packages parallel)
|
#:use-module (gnu packages cmake)
|
||||||
#:use-module (gnu packages storage)
|
#:use-module (gnu packages commencement)
|
||||||
#:use-module (gnu packages networking)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages crypto)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages cryptsetup)
|
||||||
#:use-module (gnu packages python-science)
|
#:use-module (gnu packages curl)
|
||||||
#:use-module (gnu packages python-web)
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages python-xyz)
|
#:use-module (gnu packages disk)
|
||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages fabric-management)
|
||||||
#:use-module (gnu packages tcl)
|
#:use-module (gnu packages flex)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages fontutils)
|
||||||
#:use-module (gnu packages commencement)
|
#:use-module (gnu packages freeipmi)
|
||||||
#:use-module (gnu packages gcc)
|
#:use-module (gnu packages gawk)
|
||||||
#:use-module (gnu packages chemistry)
|
#:use-module (gnu packages gcc)
|
||||||
#:use-module (gnu packages sphinx)
|
#:use-module (gnu packages gnome)
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (gnu packages gperf)
|
||||||
#:use-module (gnu packages mpi)
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages sssd)
|
#:use-module (gnu packages image)
|
||||||
#:use-module (gnu packages fabric-management)
|
#:use-module (gnu packages jemalloc)
|
||||||
#:use-module (gnu packages benchmark)
|
#:use-module (gnu packages libevent)
|
||||||
#:use-module (gnu packages messaging)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages web)
|
#:use-module (gnu packages lua)
|
||||||
#:use-module (gnu packages gnome)
|
#:use-module (gnu packages maths)
|
||||||
#:use-module (gnu packages cluster)
|
#:use-module (gnu packages messaging)
|
||||||
#:use-module (gnu packages libevent)
|
#:use-module (gnu packages mpi)
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages fontutils)
|
#:use-module (gnu packages networking)
|
||||||
#:use-module (gnu packages flex)
|
#:use-module (gnu packages nss)
|
||||||
#:use-module (gnu packages bison)
|
#:use-module (gnu packages openldap)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages parallel)
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages fontutils)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (gnu packages pretty-print)
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages maths)
|
#:use-module (gnu packages python-science)
|
||||||
#:use-module (guix utils)
|
#:use-module (gnu packages python-web)
|
||||||
#:use-module (gnu packages cmake)
|
#:use-module (gnu packages python-xyz)
|
||||||
#:use-module (gnu packages pretty-print)
|
#:use-module (gnu packages readline)
|
||||||
#:use-module (gnu packages boost)
|
#:use-module (gnu packages sphinx)
|
||||||
#:use-module (gnu packages curl)
|
#:use-module (gnu packages sssd)
|
||||||
#:use-module (gnu packages cryptsetup)
|
#:use-module (gnu packages storage)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages tcl)
|
||||||
#:use-module (gnu packages admin)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (gnu packages assembly)
|
#:use-module (gnu packages virtualization)
|
||||||
#:use-module (gnu packages authentication)
|
#:use-module (gnu packages web)
|
||||||
#:use-module (gnu packages bdw-gc)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages boost)
|
#:use-module (gnu packages xorg)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (gnu packages crypto)
|
|
||||||
#:use-module (gnu packages cryptsetup)
|
|
||||||
#:use-module (gnu packages curl)
|
|
||||||
#:use-module (gnu packages databases)
|
|
||||||
#:use-module (gnu packages disk)
|
|
||||||
#:use-module (gnu packages gperf)
|
|
||||||
#:use-module (gnu packages jemalloc)
|
|
||||||
#:use-module (gnu packages linux)
|
|
||||||
#:use-module (gnu packages lua)
|
|
||||||
#:use-module (gnu packages ncurses)
|
|
||||||
#:use-module (gnu packages networking)
|
|
||||||
#:use-module (gnu packages nss)
|
|
||||||
#:use-module (gnu packages openldap)
|
|
||||||
#:use-module (gnu packages pkg-config)
|
|
||||||
#:use-module (gnu packages python)
|
|
||||||
#:use-module (gnu packages python-xyz)
|
|
||||||
#:use-module (gnu packages sphinx)
|
|
||||||
#:use-module (gnu packages tls)
|
|
||||||
#:use-module (gnu packages web)
|
|
||||||
;; #:use-module (gnu packages glicid)
|
|
||||||
#:use-module (gnu packages pretty-print)
|
|
||||||
#:use-module (gnu packages virtualization)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
(define*
|
||||||
(define* (custom-gcc gcc name languages
|
(custom-gcc gcc name languages
|
||||||
#:optional
|
#:optional (search-paths (package-native-search-paths gcc))
|
||||||
(search-paths (package-native-search-paths gcc))
|
#:key (separate-lib-output? #t)
|
||||||
#:key (separate-lib-output? #t))
|
)
|
||||||
"Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PATHS as the 'native-search-paths' field."
|
"Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PATHS as the 'native-search-paths' field."
|
||||||
(package (inherit gcc)
|
(package
|
||||||
|
(inherit gcc)
|
||||||
(name (string-append name "-upstream" ))
|
(name (string-append name "-upstream" ))
|
||||||
(outputs (if separate-lib-output?
|
(outputs
|
||||||
|
(if separate-lib-output?
|
||||||
(package-outputs gcc)
|
(package-outputs gcc)
|
||||||
(delete "lib" (package-outputs gcc))))
|
(delete "lib" (package-outputs gcc))
|
||||||
|
)
|
||||||
|
)
|
||||||
(native-search-paths search-paths)
|
(native-search-paths search-paths)
|
||||||
(properties (alist-delete 'hidden? (package-properties gcc)))
|
(properties
|
||||||
|
(alist-delete 'hidden? (package-properties gcc))
|
||||||
|
)
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments gcc)
|
(substitute-keyword-arguments (package-arguments gcc)
|
||||||
((#:modules modules %gnu-build-system-modules)
|
(
|
||||||
|
(#:modules modules %gnu-build-system-modules)
|
||||||
`(,@modules
|
`(,@modules
|
||||||
(srfi srfi-1)
|
(srfi srfi-1)
|
||||||
(srfi srfi-26)
|
(srfi srfi-26)
|
||||||
(ice-9 regex)))
|
(ice-9 regex)
|
||||||
((#:configure-flags flags)
|
)
|
||||||
`(cons (string-append "--enable-languages="
|
)
|
||||||
,(string-join languages ","))
|
(
|
||||||
(remove (cut string-match "--enable-languages.*" <>)
|
(#:configure-flags flags)
|
||||||
,flags)))
|
`(cons
|
||||||
|
(string-append
|
||||||
|
"--enable-languages="
|
||||||
|
,(string-join languages ",")
|
||||||
|
)
|
||||||
|
(remove (cut string-match "--enable-languages.*" <>) ,flags)
|
||||||
|
)
|
||||||
|
)
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
`(modify-phases ,phases
|
`(modify-phases ,phases
|
||||||
(add-after 'install 'remove-broken-or-conflicting-files
|
(add-after 'install 'remove-broken-or-conflicting-files
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(for-each delete-file
|
(for-each delete-file
|
||||||
(find-files (string-append (assoc-ref outputs "out") "/bin")
|
(find-files (string-append (assoc-ref outputs "out") "/bin") ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")
|
||||||
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))
|
)
|
||||||
#t))))))))
|
#t
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
(define %generic-search-paths
|
(define %generic-search-paths
|
||||||
;; This is the language-neutral search path for GCC. Entries in $CPATH are
|
;; This is the language-neutral search path for GCC. Entries in $CPATH are
|
||||||
;; not considered "system headers", which means GCC can raise warnings for
|
;; not considered "system headers", which means GCC can raise warnings for
|
||||||
;; issues in those headers. 'CPATH' is the only one that works for
|
;; issues in those headers. 'CPATH' is the only one that works for
|
||||||
;; front-ends not in the C family.
|
;; front-ends not in the C family.
|
||||||
(list (search-path-specification
|
(list
|
||||||
|
(search-path-specification
|
||||||
(variable "CPATH")
|
(variable "CPATH")
|
||||||
(files '("include")))
|
(files '("include"))
|
||||||
|
)
|
||||||
(search-path-specification
|
(search-path-specification
|
||||||
(variable "LIBRARY_PATH")
|
(variable "LIBRARY_PATH")
|
||||||
(files '("lib" "lib64")))))
|
(files '("lib" "lib64"))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
(define-public gfortran-11
|
(define-public gfortran-11
|
||||||
(hidden-package
|
(hidden-package
|
||||||
(custom-gcc gcc-11 "gfortran" '("fortran")
|
(custom-gcc gcc-11 "gfortran" '("fortran")
|
||||||
%generic-search-paths)))
|
%generic-search-paths
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
(define-public gfortran-10
|
||||||
(define-public gfortran-10
|
|
||||||
(hidden-package
|
(hidden-package
|
||||||
(custom-gcc gcc-10 "gfortran" '("fortran")
|
(custom-gcc gcc-10 "gfortran" '("fortran")
|
||||||
%generic-search-paths)))
|
%generic-search-paths
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
(define-public gfortran-toolchain-10
|
(define-public gfortran-toolchain-10
|
||||||
(package (inherit (make-gcc-toolchain gfortran-10))
|
(package
|
||||||
|
(inherit (make-gcc-toolchain gfortran-10))
|
||||||
(synopsis "Complete GCC tool chain for fortean lang development")
|
(synopsis "Complete GCC tool chain for fortean lang development")
|
||||||
(description "This package provides a complete GCC tool chain for
|
(description "This package provides a complete GCC tool chain for
|
||||||
fortran lang development to be installed in user profiles. This includes
|
fortran lang development to be installed in user profiles. This includes
|
||||||
fortran, as well as libc (headers and binaries, plus debugging symbols
|
fortran, as well as libc (headers and binaries, plus debugging symbols
|
||||||
in the @code{debug} output), and binutils.")))
|
in the @code{debug} output), and binutils."
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
(define-public gfortran-toolchain-11
|
(define-public gfortran-toolchain-11
|
||||||
(package (inherit (make-gcc-toolchain gfortran-11))
|
(package
|
||||||
|
(inherit (make-gcc-toolchain gfortran-11))
|
||||||
(synopsis "Complete GCC tool chain for fortean lang development")
|
(synopsis "Complete GCC tool chain for fortean lang development")
|
||||||
(description "This package provides a complete GCC tool chain for
|
(description "This package provides a complete GCC tool chain for
|
||||||
fortran lang development to be installed in user profiles. This includes
|
fortran lang development to be installed in user profiles. This includes
|
||||||
fortran, as well as libc (headers and binaries, plus debugging symbols
|
fortran, as well as libc (headers and binaries, plus debugging symbols
|
||||||
in the @code{debug} output), and binutils.")))
|
in the @code{debug} output), and binutils."
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
;;; glicid/gcc.scm ends here
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue