From aa26adc457b74e3ea260555aaf0158897ac46f81 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 21 Apr 2020 12:23:11 +0200 Subject: [PATCH 001/200] ipl devient glicid. --- gnu/packages/glicid.scm | 184 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) create mode 100644 gnu/packages/glicid.scm diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm new file mode 100644 index 0000000..2f9d881 --- /dev/null +++ b/gnu/packages/glicid.scm @@ -0,0 +1,184 @@ +(define-module (gnu packages ccipl) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix licenses) + #:use-module (gnu packages gawk) + #:use-module (gnu packages gcc) + #:use-module (gnu packages commencement) + #:use-module (guix build-system python) + #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix utils) #:select (target-64bit?)) + #:use-module (gnu packages) + #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages freeipmi) + #:use-module (gnu packages linux) + #:use-module (gnu packages mpi) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages parallel) + #:use-module (gnu packages storage) + #:use-module (gnu packages networking) + #:use-module (gnu packages gtk) + #:use-module (gnu packages python) + #:use-module (gnu packages python-science) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages readline) + #:use-module (gnu packages tcl) + #:use-module (gnu packages tls) + #:use-module (gnu packages web)) + + + +(define-public ccipl-hello + (package + (name "ccipl-hello") + (version "0.01") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/hello/hello-" version + ".tar.gz")) + (sha256 + (base32 + "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))) + (build-system gnu-build-system) + (arguments '(#:configure-flags '("--enable-silent-rules"))) + (inputs `(("gawk" ,gawk))) + (synopsis "Hello, GNU world: An example GNU package, modified for CCIPL") + (description "Guess what GNU Hello prints!") + (home-page "https://www.gnu.org/software/hello/") + (license gpl3+))) + +(define-public ccipl-syslog-ng + (package + (name "ccipl-syslog-ng") + (version "3.25.1") + + (source (origin + ;; do not use auto-generated tarballs + (method git-fetch) + (uri (git-reference + (url "https://github.com/syslog-ng/syslog-ng.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6")))) + + (build-system gnu-build-system) + (arguments '(#:configure-flags '("--enable-silent-rules"))) + (inputs `(("gawk" ,gawk))) + (synopsis "Hello, GNU world: An example GNU package, modified for CCIPL") + (description "Guess what GNU Hello prints!") + (home-page "https://www.gnu.org/software/hello/") + (license gpl3+))) + +(define-public ccipl-custom-slurm-19.05 + (package + (inherit slurm) + (name "ccipl-custom-slurm-19.05") + (version "19.05.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) + (sha256 (base32 "1kj79r8hng5gp98ickgvj3im4gr19nzd3p3p8g6rl75axb8jin7h")) + )) + (inputs `(("gtk+-2" ,gtk+-2) + ,@(package-inputs slurm) + )) +)) + +(define-public ccipl-custom-slurm-20.02 + (package + (inherit ccipl-custom-slurm-19.05) + (name "ccipl-custom-slurm-20.02") + (version "20.02.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) + (sha256 (base32 "198in1hq0wh8qi8cfz9dqfc1p7f1qfhxc8ang0228ab8c4y83sby")) + )) +)) + +(define-public ccipl-custom-slurm ccipl-custom-slurm-19.05) + +(define-public ccipl-ceph-14 + (package + (inherit ceph) + (name "ccipl-ceph-14") + (version "14.2.9") + (source + (origin + (method url-fetch) + (uri (string-append "http://download.ceph.com/tarballs/ceph_" version ".orig.tar.gz")) + (sha256 (base32 "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il")) + )) +)) + +(define-public ccipl-librdkafka-09 + (package + (inherit librdkafka) + (name "ccipl-librdkafka-09") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/edenhill/librdkafka/archive/v" version ".tar.gz")) + (sha256 (base32 "0938yn1msaq8xcj5z7b3jcdy6rslh9kxmvz01r8rdcgbarlvchy2")) + )) +)) + + +(define-public ccipl-ceph-15 + (package + (inherit ceph) + (name "ccipl-ceph-15") + (version "15.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://download.ceph.com/tarballs/ceph_" version ".orig.tar.gz")) + (sha256 (base32 "0ql288dcpddi4kp3f6bcvipgi0hc8rqbsr38a18a4ia5nasfvib8")) + )) + (inputs `(("ccipl-librdkafka-09" ,ccipl-librdkafka-09) + ,@(package-inputs ceph) + )) + +)) + + +(define-public ccipl-x2go + (package + (name "ccipl-x2go") + (version "4.1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://code.x2go.org/releases/source/x2goserver/x2goserver-" version ".tar.gz")) + (sha256 (base32 "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7")) + )) + + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + + (inputs + `(("perl" , perl))) + + (build-system gnu-build-system) + (synopsis "X2go") + (description "X2go") + (license "not checked") + (home-page "https://wiki.x2go.org") + ) + +) + + +;;; ccipl.scm ends here From a41204d1090889e1825486c073f01f29077d24c6 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 21 Apr 2020 12:30:46 +0200 Subject: [PATCH 002/200] renommage ccipl / glicid --- gnu/packages/glicid.scm | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 2f9d881..d9c61d8 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1,4 +1,4 @@ -(define-module (gnu packages ccipl) +(define-module (gnu packages glicid) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -33,9 +33,9 @@ -(define-public ccipl-hello +(define-public glicid-hello (package - (name "ccipl-hello") + (name "glicid-hello") (version "0.01") (source (origin (method url-fetch) @@ -47,14 +47,14 @@ (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-silent-rules"))) (inputs `(("gawk" ,gawk))) - (synopsis "Hello, GNU world: An example GNU package, modified for CCIPL") + (synopsis "Hello, GNU world: An example GNU package, modified for GLICID") (description "Guess what GNU Hello prints!") (home-page "https://www.gnu.org/software/hello/") (license gpl3+))) -(define-public ccipl-syslog-ng +(define-public glicid-syslog-ng (package - (name "ccipl-syslog-ng") + (name "glicid-syslog-ng") (version "3.25.1") (source (origin @@ -71,15 +71,15 @@ (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-silent-rules"))) (inputs `(("gawk" ,gawk))) - (synopsis "Hello, GNU world: An example GNU package, modified for CCIPL") + (synopsis "Hello, GNU world: An example GNU package, modified for GLICID") (description "Guess what GNU Hello prints!") (home-page "https://www.gnu.org/software/hello/") (license gpl3+))) -(define-public ccipl-custom-slurm-19.05 +(define-public glicid-custom-slurm-19.05 (package (inherit slurm) - (name "ccipl-custom-slurm-19.05") + (name "glicid-custom-slurm-19.05") (version "19.05.6") (source (origin @@ -92,10 +92,10 @@ )) )) -(define-public ccipl-custom-slurm-20.02 +(define-public glicid-custom-slurm-20.02 (package - (inherit ccipl-custom-slurm-19.05) - (name "ccipl-custom-slurm-20.02") + (inherit glicid-custom-slurm-19.05) + (name "glicid-custom-slurm-20.02") (version "20.02.1") (source (origin @@ -105,12 +105,12 @@ )) )) -(define-public ccipl-custom-slurm ccipl-custom-slurm-19.05) +(define-public glicid-custom-slurm glicid-custom-slurm-19.05) -(define-public ccipl-ceph-14 +(define-public glicid-ceph-14 (package (inherit ceph) - (name "ccipl-ceph-14") + (name "glicid-ceph-14") (version "14.2.9") (source (origin @@ -120,10 +120,10 @@ )) )) -(define-public ccipl-librdkafka-09 +(define-public glicid-librdkafka-09 (package (inherit librdkafka) - (name "ccipl-librdkafka-09") + (name "glicid-librdkafka-09") (version "0.9.2") (source (origin @@ -134,10 +134,10 @@ )) -(define-public ccipl-ceph-15 +(define-public glicid-ceph-15 (package (inherit ceph) - (name "ccipl-ceph-15") + (name "glicid-ceph-15") (version "15.2.1") (source (origin @@ -145,16 +145,16 @@ (uri (string-append "http://download.ceph.com/tarballs/ceph_" version ".orig.tar.gz")) (sha256 (base32 "0ql288dcpddi4kp3f6bcvipgi0hc8rqbsr38a18a4ia5nasfvib8")) )) - (inputs `(("ccipl-librdkafka-09" ,ccipl-librdkafka-09) + (inputs `(("glicid-librdkafka-09" ,glicid-librdkafka-09) ,@(package-inputs ceph) )) )) -(define-public ccipl-x2go +(define-public glicid-x2go (package - (name "ccipl-x2go") + (name "glicid-x2go") (version "4.1.0.3") (source (origin @@ -181,4 +181,4 @@ ) -;;; ccipl.scm ends here +;;; glicid.scm ends here From e77233c915a3158a1c0760b0393b7a0d357f22a9 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 6 May 2020 17:39:35 +0200 Subject: [PATCH 003/200] upgrade slurm 20.02 version --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index d9c61d8..59d096a 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -96,12 +96,12 @@ (package (inherit glicid-custom-slurm-19.05) (name "glicid-custom-slurm-20.02") - (version "20.02.1") + (version "20.02.2") (source (origin (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "198in1hq0wh8qi8cfz9dqfc1p7f1qfhxc8ang0228ab8c4y83sby")) + (sha256 (base32 "0bna1kyqphw6v7ca3gyfb3nlcpclc9vx8py55w7l7sv8xxsqrrvy")) )) )) From a169c74bd51522b2eefb794b83b31b73075c58a9 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 6 May 2020 21:53:05 +0200 Subject: [PATCH 004/200] ajout des fortrans --- gnu/packages/glicid.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 59d096a..1522d06 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -178,7 +178,13 @@ (home-page "https://wiki.x2go.org") ) + +(define-public glicid-fortan-toolchain-8 + (make-gcc-toolchain gfortran-8)) + +(define-public glicid-fortran-toolchain-9 + (make-gcc-toolchain gfortan-9)) + ) - ;;; glicid.scm ends here From 2683e5ff584adecb08b93e4e62700f2d22ca5be1 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sat, 9 May 2020 20:00:27 +0200 Subject: [PATCH 005/200] ne fonctionne pas. --- gnu/packages/glicid.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 1522d06..2834aad 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -29,6 +29,8 @@ #:use-module (gnu packages readline) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) + #:use-module (gnu packages commencement) + #:use-module (gnu packages gcc) #:use-module (gnu packages web)) @@ -177,14 +179,14 @@ (license "not checked") (home-page "https://wiki.x2go.org") ) - - -(define-public glicid-fortan-toolchain-8 - (make-gcc-toolchain gfortran-8)) - -(define-public glicid-fortran-toolchain-9 - (make-gcc-toolchain gfortan-9)) - ) +;(define-public glicid-fortan-toolchain-8 +; (make-gcc-toolchain gfortran)) + +;(define-public glicid-fortran-toolchain-9 +; (make-gcc-toolchain gfortan)) + + + ;;; glicid.scm ends here From b0c6893913b1ace6636e170b7b227980a4006a17 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 10 May 2020 12:57:51 +0200 Subject: [PATCH 006/200] modif commentaires. --- gnu/packages/glicid.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 2834aad..f387057 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -181,11 +181,11 @@ ) ) -;(define-public glicid-fortan-toolchain-8 -; (make-gcc-toolchain gfortran)) +;;(define-public glicid-fortan-toolchain-8 +;; (make-gcc-toolchain gfortran)) -;(define-public glicid-fortran-toolchain-9 -; (make-gcc-toolchain gfortan)) +;;(define-public glicid-fortran-toolchain-9 +;; (make-gcc-toolchain gfortan)) From 333e53b89c170f81a0cfd894bf2b89accc22348b Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 12:42:11 +0200 Subject: [PATCH 007/200] test... --- gnu/packages/glicid.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index f387057..5a232a2 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -188,5 +188,11 @@ ;; (make-gcc-toolchain gfortan)) +(define-public glicid-gfortran-9 + (hidden-package + (custom-gcc gcc-9 "gfortran" '("fortran") + %generic-search-paths))) + + ;;; glicid.scm ends here From 1521440a80bbcd17940627d9d0b79e3500e82795 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 12:47:00 +0200 Subject: [PATCH 008/200] test2 --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 5a232a2..d914c76 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -189,7 +189,7 @@ (define-public glicid-gfortran-9 - (hidden-package + (package (custom-gcc gcc-9 "gfortran" '("fortran") %generic-search-paths))) From 46879d0de00b912750dae3e7344ab7d7b9663088 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 13:32:23 +0200 Subject: [PATCH 009/200] WIP --- gnu/packages/glicid.scm | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index d914c76..ba575dc 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -188,6 +188,55 @@ ;; (make-gcc-toolchain gfortan)) +(define %generic-search-paths + ;; This is the language-neutral search path for GCC. Entries in $CPATH are + ;; not considered "system headers", which means GCC can raise warnings for + ;; issues in those headers. 'CPATH' is the only one that works for + ;; front-ends not in the C family. + (list (search-path-specification + (variable "CPATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) + + + +(define* (custom-gcc gcc name languages + #:optional + (search-paths (package-native-search-paths gcc)) + #:key (separate-lib-output? #t)) + "Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PATHS +as the 'native-search-paths' field." + (package (inherit gcc) + (name name) + (outputs (if separate-lib-output? + (package-outputs gcc) + (delete "lib" (package-outputs gcc)))) + (native-search-paths search-paths) + (properties (alist-delete 'hidden? (package-properties gcc))) + (arguments + (substitute-keyword-arguments (package-arguments gcc) + ((#:modules modules %gnu-build-system-modules) + `(,@modules + (srfi srfi-1) + (srfi srfi-26) + (ice-9 regex))) + ((#:configure-flags flags) + `(cons (string-append "--enable-languages=" + ,(string-join languages ",")) + (remove (cut string-match "--enable-languages.*" <>) + ,flags))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'remove-broken-or-conflicting-files + (lambda* (#:key outputs #:allow-other-keys) + (for-each delete-file + (find-files (string-append (assoc-ref outputs "out") "/bin") + ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) + #t)))))))) + + (define-public glicid-gfortran-9 (package (custom-gcc gcc-9 "gfortran" '("fortran") From 42e26c47a780ede2214f1825596798ef00faff8a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 13:40:51 +0200 Subject: [PATCH 010/200] test de definitions de gfortran --- gnu/packages/glicid.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index ba575dc..3fca9de 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages commencement) #:use-module (gnu packages gcc) + #:use-module (srfi srfi-1) #:use-module (gnu packages web)) @@ -237,11 +238,17 @@ as the 'native-search-paths' field." #t)))))))) -(define-public glicid-gfortran-9 - (package +(define-public gfortran-9 + (hidden-package (custom-gcc gcc-9 "gfortran" '("fortran") %generic-search-paths))) +(define-public gfortran-10 + (hidden-package + (custom-gcc gcc-10 "gfortran" '("fortran") + %generic-search-paths))) +(define-public glicid-gfortran-9 gfortran-9) +(define-public glicid-gfortran-10 gfortran-10) ;;; glicid.scm ends here From 947a620e8bde3204459ad1843fc677995d6132ef Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 15:57:58 +0200 Subject: [PATCH 011/200] WIP --- gnu/packages/glicid.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3fca9de..42d3127 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -95,6 +95,8 @@ )) )) +(define-public glicid-custom-slurm glicid-custom-slurm-19.05) + (define-public glicid-custom-slurm-20.02 (package (inherit glicid-custom-slurm-19.05) @@ -108,7 +110,7 @@ )) )) -(define-public glicid-custom-slurm glicid-custom-slurm-19.05) + (define-public glicid-ceph-14 (package @@ -239,16 +241,16 @@ as the 'native-search-paths' field." (define-public gfortran-9 - (hidden-package (custom-gcc gcc-9 "gfortran" '("fortran") - %generic-search-paths))) + %generic-search-paths)) (define-public gfortran-10 - (hidden-package (custom-gcc gcc-10 "gfortran" '("fortran") - %generic-search-paths))) + %generic-search-paths)) (define-public glicid-gfortran-9 gfortran-9) (define-public glicid-gfortran-10 gfortran-10) + + ;;; glicid.scm ends here From e3aa03bc6055068754a7bf216c4e3e1183477812 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 16:19:09 +0200 Subject: [PATCH 012/200] WIP --- gnu/packages/glicid.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 42d3127..543ec57 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -95,7 +95,7 @@ )) )) -(define-public glicid-custom-slurm glicid-custom-slurm-19.05) +;; (define-public glicid-custom-slurm glicid-custom-slurm-19.05) (define-public glicid-custom-slurm-20.02 (package @@ -248,8 +248,8 @@ as the 'native-search-paths' field." (custom-gcc gcc-10 "gfortran" '("fortran") %generic-search-paths)) -(define-public glicid-gfortran-9 gfortran-9) -(define-public glicid-gfortran-10 gfortran-10) +;;(define-public glicid-gfortran-9 gfortran-9) +;;(define-public glicid-gfortran-10 gfortran-10) From 76e05e1490285979bb60632b86e196a60b70c194 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 16:32:25 +0200 Subject: [PATCH 013/200] WIP --- gnu/packages/glicid.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3fca9de..3493bbc 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -238,17 +238,17 @@ as the 'native-search-paths' field." #t)))))))) -(define-public gfortran-9 - (hidden-package - (custom-gcc gcc-9 "gfortran" '("fortran") - %generic-search-paths))) +;(define-public gfortran-9 +; (hidden-package +; (custom-gcc gcc-9 "gfortran" '("fortran") +; %generic-search-paths))) -(define-public gfortran-10 - (hidden-package - (custom-gcc gcc-10 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public glicid-gfortran-9 gfortran-9) -(define-public glicid-gfortran-10 gfortran-10) +;(define-public gfortran-10 +; (hidden-package +; (custom-gcc gcc-10 "gfortran" '("fortran") +; %generic-search-paths))) +; +;(define-public glicid-gfortran-9 gfortran-9) +;(define-public glicid-gfortran-10 gfortran-10) ;;; glicid.scm ends here From a7dfc71ae17b2ee7102affcda0b3ab6c33acd72d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 16:39:00 +0200 Subject: [PATCH 014/200] WIP --- gnu/packages/glicid.scm | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 543ec57..8eda7e2 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -184,26 +184,6 @@ ) ) -;;(define-public glicid-fortan-toolchain-8 -;; (make-gcc-toolchain gfortran)) - -;;(define-public glicid-fortran-toolchain-9 -;; (make-gcc-toolchain gfortan)) - - -(define %generic-search-paths - ;; This is the language-neutral search path for GCC. Entries in $CPATH are - ;; not considered "system headers", which means GCC can raise warnings for - ;; issues in those headers. 'CPATH' is the only one that works for - ;; front-ends not in the C family. - (list (search-path-specification - (variable "CPATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64"))))) - - (define* (custom-gcc gcc name languages #:optional @@ -248,8 +228,8 @@ as the 'native-search-paths' field." (custom-gcc gcc-10 "gfortran" '("fortran") %generic-search-paths)) -;;(define-public glicid-gfortran-9 gfortran-9) -;;(define-public glicid-gfortran-10 gfortran-10) +(define-public glicid-gfortran-9 gfortran-9) +(define-public glicid-gfortran-10 gfortran-10) From 2c419542672d04bb054b343f28ee8e2fb3bd05c3 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 16:43:54 +0200 Subject: [PATCH 015/200] WIP --- gnu/packages/glicid.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 8eda7e2..74af1e0 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -219,6 +219,17 @@ as the 'native-search-paths' field." ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) #t)))))))) +(define %generic-search-paths + ;; This is the language-neutral search path for GCC. Entries in $CPATH are + ;; not considered "system headers", which means GCC can raise warnings for + ;; issues in those headers. 'CPATH' is the only one that works for + ;; front-ends not in the C family. + (list (search-path-specification + (variable "CPATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) (define-public gfortran-9 (custom-gcc gcc-9 "gfortran" '("fortran") From 7f83f288fe3da9e8ba80bd7b158e4ade96fe9b94 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 16:57:03 +0200 Subject: [PATCH 016/200] =?UTF-8?q?attention,=20gcc.scm=20est=20patch?= =?UTF-8?q?=C3=A9...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnu/packages/glicid.scm | 66 +++++++---------------------------------- 1 file changed, 10 insertions(+), 56 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 74af1e0..97df735 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -185,62 +185,16 @@ ) -(define* (custom-gcc gcc name languages - #:optional - (search-paths (package-native-search-paths gcc)) - #:key (separate-lib-output? #t)) - "Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PATHS -as the 'native-search-paths' field." - (package (inherit gcc) - (name name) - (outputs (if separate-lib-output? - (package-outputs gcc) - (delete "lib" (package-outputs gcc)))) - (native-search-paths search-paths) - (properties (alist-delete 'hidden? (package-properties gcc))) - (arguments - (substitute-keyword-arguments (package-arguments gcc) - ((#:modules modules %gnu-build-system-modules) - `(,@modules - (srfi srfi-1) - (srfi srfi-26) - (ice-9 regex))) - ((#:configure-flags flags) - `(cons (string-append "--enable-languages=" - ,(string-join languages ",")) - (remove (cut string-match "--enable-languages.*" <>) - ,flags))) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'remove-broken-or-conflicting-files - (lambda* (#:key outputs #:allow-other-keys) - (for-each delete-file - (find-files (string-append (assoc-ref outputs "out") "/bin") - ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) - #t)))))))) - -(define %generic-search-paths - ;; This is the language-neutral search path for GCC. Entries in $CPATH are - ;; not considered "system headers", which means GCC can raise warnings for - ;; issues in those headers. 'CPATH' is the only one that works for - ;; front-ends not in the C family. - (list (search-path-specification - (variable "CPATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64"))))) - -(define-public gfortran-9 - (custom-gcc gcc-9 "gfortran" '("fortran") - %generic-search-paths)) - -(define-public gfortran-10 - (custom-gcc gcc-10 "gfortran" '("fortran") - %generic-search-paths)) - -(define-public glicid-gfortran-9 gfortran-9) -(define-public glicid-gfortran-10 gfortran-10) +;(define-public gfortran-9 +; (custom-gcc gcc-9 "gfortran" '("fortran") +; %generic-search-paths)) +; +;(define-public gfortran-10 +; (custom-gcc gcc-10 "gfortran" '("fortran") +; %generic-search-paths)) +; +;(define-public glicid-gfortran-9 gfortran-9) +;(define-public glicid-gfortran-10 gfortran-10) From 7af6b330ff4f9a57a77b694a45f0c4a03bd54893 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 22:34:56 +0200 Subject: [PATCH 017/200] WIP --- gnu/packages/glicid.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 4bba6ff..f40e57f 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages commencement) #:use-module (gnu packages gcc) #:use-module (srfi srfi-1) + #:use-module (gnu packages mpi) #:use-module (gnu packages web)) @@ -185,8 +186,11 @@ ) -(define-public glicid-gfortran-9 gfortran-9) -(define-public glicid-gfortran-10 gfortran-10) +(define-public glicid-openmpi + (package + (inherit openmpi) + (name "glicid-openpmi") +)) ;;; glicid.scm ends here From 8072571e72cb1c8952cbf2d17bb161b43419d7e4 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 13 May 2020 12:30:11 +0200 Subject: [PATCH 018/200] =?UTF-8?q?Revert=20"attention,=20gcc.scm=20est=20?= =?UTF-8?q?patch=C3=A9..."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7f83f288fe3da9e8ba80bd7b158e4ade96fe9b94. Conflicts: gnu/packages/glicid.scm --- gnu/packages/glicid.scm | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index f40e57f..cf28868 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -186,11 +186,71 @@ ) +<<<<<<< HEAD (define-public glicid-openmpi (package (inherit openmpi) (name "glicid-openpmi") )) +======= +(define* (custom-gcc gcc name languages + #:optional + (search-paths (package-native-search-paths gcc)) + #:key (separate-lib-output? #t)) + "Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PATHS +as the 'native-search-paths' field." + (package (inherit gcc) + (name name) + (outputs (if separate-lib-output? + (package-outputs gcc) + (delete "lib" (package-outputs gcc)))) + (native-search-paths search-paths) + (properties (alist-delete 'hidden? (package-properties gcc))) + (arguments + (substitute-keyword-arguments (package-arguments gcc) + ((#:modules modules %gnu-build-system-modules) + `(,@modules + (srfi srfi-1) + (srfi srfi-26) + (ice-9 regex))) + ((#:configure-flags flags) + `(cons (string-append "--enable-languages=" + ,(string-join languages ",")) + (remove (cut string-match "--enable-languages.*" <>) + ,flags))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'remove-broken-or-conflicting-files + (lambda* (#:key outputs #:allow-other-keys) + (for-each delete-file + (find-files (string-append (assoc-ref outputs "out") "/bin") + ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) + #t)))))))) + +(define %generic-search-paths + ;; This is the language-neutral search path for GCC. Entries in $CPATH are + ;; not considered "system headers", which means GCC can raise warnings for + ;; issues in those headers. 'CPATH' is the only one that works for + ;; front-ends not in the C family. + (list (search-path-specification + (variable "CPATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) + +(define-public gfortran-9 + (custom-gcc gcc-9 "gfortran" '("fortran") + %generic-search-paths)) + +(define-public gfortran-10 + (custom-gcc gcc-10 "gfortran" '("fortran") + %generic-search-paths)) + +(define-public glicid-gfortran-9 gfortran-9) +(define-public glicid-gfortran-10 gfortran-10) + +>>>>>>> parent of 34257ea... attention, gcc.scm est patché... ;;; glicid.scm ends here From b078e8c3414703ecd87efe06fa74add67717b7ec Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 13 May 2020 12:30:42 +0200 Subject: [PATCH 019/200] Revert "WIP" This reverts commit 2c419542672d04bb054b343f28ee8e2fb3bd05c3. --- gnu/packages/glicid.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index cf28868..7351b4d 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -227,17 +227,6 @@ as the 'native-search-paths' field." ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) #t)))))))) -(define %generic-search-paths - ;; This is the language-neutral search path for GCC. Entries in $CPATH are - ;; not considered "system headers", which means GCC can raise warnings for - ;; issues in those headers. 'CPATH' is the only one that works for - ;; front-ends not in the C family. - (list (search-path-specification - (variable "CPATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64"))))) (define-public gfortran-9 (custom-gcc gcc-9 "gfortran" '("fortran") From d2b3c8993a8b020f5616b8a174ee0d589a1d47ea Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 14 May 2020 12:32:14 +0200 Subject: [PATCH 020/200] erreur... --- gnu/packages/glicid.scm | 50 +---------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 7351b4d..a8a8313 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -185,61 +185,13 @@ ) ) +;; pour futures customisations. -<<<<<<< HEAD (define-public glicid-openmpi (package (inherit openmpi) (name "glicid-openpmi") )) -======= -(define* (custom-gcc gcc name languages - #:optional - (search-paths (package-native-search-paths gcc)) - #:key (separate-lib-output? #t)) - "Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PATHS -as the 'native-search-paths' field." - (package (inherit gcc) - (name name) - (outputs (if separate-lib-output? - (package-outputs gcc) - (delete "lib" (package-outputs gcc)))) - (native-search-paths search-paths) - (properties (alist-delete 'hidden? (package-properties gcc))) - (arguments - (substitute-keyword-arguments (package-arguments gcc) - ((#:modules modules %gnu-build-system-modules) - `(,@modules - (srfi srfi-1) - (srfi srfi-26) - (ice-9 regex))) - ((#:configure-flags flags) - `(cons (string-append "--enable-languages=" - ,(string-join languages ",")) - (remove (cut string-match "--enable-languages.*" <>) - ,flags))) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'remove-broken-or-conflicting-files - (lambda* (#:key outputs #:allow-other-keys) - (for-each delete-file - (find-files (string-append (assoc-ref outputs "out") "/bin") - ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) - #t)))))))) - - -(define-public gfortran-9 - (custom-gcc gcc-9 "gfortran" '("fortran") - %generic-search-paths)) - -(define-public gfortran-10 - (custom-gcc gcc-10 "gfortran" '("fortran") - %generic-search-paths)) - -(define-public glicid-gfortran-9 gfortran-9) -(define-public glicid-gfortran-10 gfortran-10) - ->>>>>>> parent of 34257ea... attention, gcc.scm est patché... ;;; glicid.scm ends here From dae65f5476657a30a9c0400cb933ab08e09c4a23 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 14 May 2020 14:09:50 +0200 Subject: [PATCH 021/200] ajout de glicid-gromacs --- gnu/packages/glicid.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index a8a8313..6d83c6c 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -194,4 +194,12 @@ )) +(define-public glicid-gromacs + (package + (inherit gromacs) + (name "glicid-gromacs") + +)) + + ;;; glicid.scm ends here From dec8e62a80ec3a4bf8cb6427f170162c12db7177 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 14 May 2020 14:11:59 +0200 Subject: [PATCH 022/200] ajour de chemistry pour gromacs --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 6d83c6c..60e1dd9 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages commencement) #:use-module (gnu packages gcc) + #:use-module (gnu packages chemistry) #:use-module (srfi srfi-1) #:use-module (gnu packages mpi) #:use-module (gnu packages web)) From 6a5819b135d6976179222510d11a456c09b67f57 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 15 May 2020 18:49:21 +0200 Subject: [PATCH 023/200] ajout openldap --- gnu/packages/glicid.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 60e1dd9..9b05c52 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages chemistry) #:use-module (srfi srfi-1) #:use-module (gnu packages mpi) + #:use-module (gnu packages openldap) #:use-module (gnu packages web)) @@ -93,6 +94,7 @@ (sha256 (base32 "1kj79r8hng5gp98ickgvj3im4gr19nzd3p3p8g6rl75axb8jin7h")) )) (inputs `(("gtk+-2" ,gtk+-2) + ("openldap", openldap) ,@(package-inputs slurm) )) )) @@ -195,12 +197,12 @@ )) -(define-public glicid-gromacs - (package - (inherit gromacs) - (name "glicid-gromacs") - -)) +;;(define-public glicid-gromacs +;; (package +;; (inherit gromacs) +;; (name "glicid-gromacs") +;; ("gcc-toolchain" ,gcc-toolchain-10) +;;)) ;;; glicid.scm ends here From cec6cfb4689fb2e8cc6094b34f51030c64b01da1 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 15 May 2020 22:02:42 +0200 Subject: [PATCH 024/200] sssd needed for slurm (centos compat) --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 9b05c52..871c996 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -94,7 +94,7 @@ (sha256 (base32 "1kj79r8hng5gp98ickgvj3im4gr19nzd3p3p8g6rl75axb8jin7h")) )) (inputs `(("gtk+-2" ,gtk+-2) - ("openldap", openldap) + ("sssd", sssd) ,@(package-inputs slurm) )) )) From 2c496cd3e09fc279b854a442aeb7dc1879cba68a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 15 May 2020 22:08:21 +0200 Subject: [PATCH 025/200] wip --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 871c996..ef206d1 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -34,7 +34,7 @@ #:use-module (gnu packages chemistry) #:use-module (srfi srfi-1) #:use-module (gnu packages mpi) - #:use-module (gnu packages openldap) + #:use-module (gnu packages sssd) #:use-module (gnu packages web)) From 09f6db132b4f0e3326bb979af75b433fc022f9ba Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 11:28:09 +0200 Subject: [PATCH 026/200] =?UTF-8?q?OpenMPI=20customis=C3=A9=20pour=20gcc-8?= =?UTF-8?q?,=209=20et=2010.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnu/packages/glicid.scm | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index ef206d1..5596ba4 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -190,12 +190,35 @@ ;; pour futures customisations. -(define-public glicid-openmpi - (package - (inherit openmpi) +(define-public glicid-openmpi-gcc-8 + (package + (inherit openmpi) (name "glicid-openpmi") -)) + (inputs `(("gcc-8", gcc-8) + ("gfortran-8", gfortran-8) + ,@(package-inputs openmpi))) + ) +) +(define-public glicid-openmpi-gcc-9 + (package + (inherit openmpi) + (name "glicid-openpmi") + (inputs `(("gcc-9", gcc-9) + ("gfortran-9", gfortran-9) + ,@(package-inputs openmpi))) + ) +) + +(define-public glicid-openmpi-gcc-10 + (package + (inherit openmpi) + (name "glicid-openpmi") + (inputs `(("gcc-10", gcc-10) + ("gfortran-10", gfortran-10) + ,@(package-inputs openmpi))) + ) +) ;;(define-public glicid-gromacs ;; (package From 6aa2e93f2e2dd21cf4696a24521e7cb604a50b3b Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 11:39:04 +0200 Subject: [PATCH 027/200] pb avec les noms de packages openmpi --- gnu/packages/glicid.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 5596ba4..776b701 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -193,7 +193,7 @@ (define-public glicid-openmpi-gcc-8 (package (inherit openmpi) - (name "glicid-openpmi") + (name "glicid-openpmi-gcc-8") (inputs `(("gcc-8", gcc-8) ("gfortran-8", gfortran-8) ,@(package-inputs openmpi))) @@ -203,7 +203,7 @@ (define-public glicid-openmpi-gcc-9 (package (inherit openmpi) - (name "glicid-openpmi") + (name "glicid-openpmi-gcc-9") (inputs `(("gcc-9", gcc-9) ("gfortran-9", gfortran-9) ,@(package-inputs openmpi))) @@ -213,7 +213,7 @@ (define-public glicid-openmpi-gcc-10 (package (inherit openmpi) - (name "glicid-openpmi") + (name "glicid-openpmi-gcc-10") (inputs `(("gcc-10", gcc-10) ("gfortran-10", gfortran-10) ,@(package-inputs openmpi))) From 8e66519dc6a76ad49b03784f857a4749c1228e70 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 12:16:03 +0200 Subject: [PATCH 028/200] gromacs en gcc 10 --- gnu/packages/glicid.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 776b701..fa2c689 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -220,12 +220,15 @@ ) ) -;;(define-public glicid-gromacs -;; (package -;; (inherit gromacs) -;; (name "glicid-gromacs") -;; ("gcc-toolchain" ,gcc-toolchain-10) -;;)) +(define-public glicid-gromacs-gcc-10 + (package + (inherit gromacs) + (name "glicid-gromacs-gcc-10") + (inputs `(("gcc-10", gcc-10) + ("gfortran-10", gfortran-10) + ("glicid-openmpi-gcc-10") + ,@(package-inputs gromacs))) +)) ;;; glicid.scm ends here From 2b02c5d272ca2f6ce3a87d2252cf037b008a6a70 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 12:21:38 +0200 Subject: [PATCH 029/200] typo --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index fa2c689..3800a3a 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -226,7 +226,7 @@ (name "glicid-gromacs-gcc-10") (inputs `(("gcc-10", gcc-10) ("gfortran-10", gfortran-10) - ("glicid-openmpi-gcc-10") + ("glicid-openmpi-gcc-10", glicid-openmpi-gcc-10) ,@(package-inputs gromacs))) )) From c37e5fef0ab37daee8b05fcf97eaaa83fa83c2fd Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 12:31:57 +0200 Subject: [PATCH 030/200] gromacs gcc-9 --- gnu/packages/glicid.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3800a3a..3b16f36 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -220,6 +220,16 @@ ) ) +(define-public glicid-gromacs-gcc-9 + (package + (inherit gromacs) + (name "glicid-gromacs-gcc-9") + (inputs `(("gcc-9", gcc-9) + ("gfortran-9", gfortran-9) + ("glicid-openmpi-gcc-9", glicid-openmpi-gcc-9) + ,@(package-inputs gromacs))) +)) + (define-public glicid-gromacs-gcc-10 (package (inherit gromacs) From 8eb2db1ffa55e0c845f07b8ad54c03f2ab861fce Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 12:48:06 +0200 Subject: [PATCH 031/200] gromacs gcc-9 --- gnu/packages/glicid.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3b16f36..ca06a93 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -220,6 +220,17 @@ ) ) +(define-public glicid-gromacs-gcc-8 + (package + (inherit gromacs) + (name "glicid-gromacs-gcc-8") + (inputs `(("gcc-8", gcc-8) + ("gfortran-8", gfortran-8) + ("glicid-openmpi-gcc-8", glicid-openmpi-gcc-8) + ,@(package-inputs gromacs))) +)) + + (define-public glicid-gromacs-gcc-9 (package (inherit gromacs) From ac371c025811a8f57b379b56a9be2eccc26e9016 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 14:31:00 +0200 Subject: [PATCH 032/200] gromacs avec openmpi --- gnu/packages/glicid.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index ca06a93..41b42cf 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -188,6 +188,15 @@ ) ) +(define-public glicid-gromacs-openmpi + (package + (inherit gromacs) + (name "glicid-gromacs-openmpiy") + (inputs `(("openmpi", openmpi) + ,@(package-inputs gromacs))) +)) + + ;; pour futures customisations. (define-public glicid-openmpi-gcc-8 From 237d081348ff8a5e28c2d9afda6330e5ec6b1b9e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 14:36:08 +0200 Subject: [PATCH 033/200] Typo. --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 41b42cf..dc40276 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -191,7 +191,7 @@ (define-public glicid-gromacs-openmpi (package (inherit gromacs) - (name "glicid-gromacs-openmpiy") + (name "glicid-gromacs-openmpi") (inputs `(("openmpi", openmpi) ,@(package-inputs gromacs))) )) From 76581783b1b37a6f40d1892392e4280f4be9238e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 15:03:43 +0200 Subject: [PATCH 034/200] =?UTF-8?q?test=20d'ajout=20=C3=A0=20configure.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnu/packages/glicid.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index dc40276..11779c6 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -194,7 +194,15 @@ (name "glicid-gromacs-openmpi") (inputs `(("openmpi", openmpi) ,@(package-inputs gromacs))) -)) + (build-system cmake-build-system) + (arguments + (#:configure-flags configure-flags) + (append configure-flags (list "-DGMX_MPI=on" + "-DCMAKE_C_COMPILER=mpicc" + "-DCMAKE_CXX_COMPILER=mpiicxx" + ))) + ) +) ;; pour futures customisations. From bfc5952c1c144dccf89f3fe34c7ec817e6333e06 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 15:08:32 +0200 Subject: [PATCH 035/200] WIP --- gnu/packages/glicid.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 11779c6..87e3343 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -195,13 +195,14 @@ (inputs `(("openmpi", openmpi) ,@(package-inputs gromacs))) (build-system cmake-build-system) - (arguments - (#:configure-flags configure-flags) + (arguments + `(#:configure-flags configure-flags) (append configure-flags (list "-DGMX_MPI=on" "-DCMAKE_C_COMPILER=mpicc" "-DCMAKE_CXX_COMPILER=mpiicxx" - ))) - ) + )) + ) + ) ) From 97bd6a8c6a2a31061a82a0eaa6c0b2c4d1804933 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 15:10:29 +0200 Subject: [PATCH 036/200] WIP --- gnu/packages/glicid.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 87e3343..0320ef0 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -188,22 +188,22 @@ ) ) -(define-public glicid-gromacs-openmpi - (package - (inherit gromacs) - (name "glicid-gromacs-openmpi") - (inputs `(("openmpi", openmpi) - ,@(package-inputs gromacs))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags configure-flags) - (append configure-flags (list "-DGMX_MPI=on" - "-DCMAKE_C_COMPILER=mpicc" - "-DCMAKE_CXX_COMPILER=mpiicxx" - )) - ) - ) -) +;(define-public glicid-gromacs-openmpi +; (package +; (inherit gromacs) +; (name "glicid-gromacs-openmpi") +; (inputs `(("openmpi", openmpi) +; ,@(package-inputs gromacs))) +; (build-system cmake-build-system) +; (arguments +; `(#:configure-flags configure-flags) +; (append configure-flags (list "-DGMX_MPI=on" +; "-DCMAKE_C_COMPILER=mpicc" +; "-DCMAKE_CXX_COMPILER=mpiicxx" +; )) +; ) +; ) +;) ;; pour futures customisations. From da13ce644ac19dd30ef4dd3357a1d72f650a827b Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 16:48:22 +0200 Subject: [PATCH 037/200] gromacs openmpi --- gnu/packages/glicid.scm | 65 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 0320ef0..411d5fd 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -206,6 +206,71 @@ ;) +(define-public glicid-gromacs-openmpi + (package + (inherit gromacs) + (name "glicid-gromacs-openmpi") + (inputs `(("openmpi", openmpi) + ("openssh", openssh) + ,@(package-inputs gromacs))) + (build-system cmake-build-system) + + (arguments + `(#:configure-flags + (list "-DGMX_DEVELOPER_BUILD=on" ; Needed to run tests + ;; Unbundling + "-DGMX_USE_LMFIT=EXTERNAL" + "-DGMX_BUILD_OWN_FFTW=off" + "-DGMX_EXTERNAL_BLAS=on" + "-DGMX_EXTERNAL_LAPACK=on" + "-DGMX_EXTERNAL_TNG=on" + "-DGMX_EXTERNAL_ZLIB=on" + "-DGMX_EXTERNAL_TINYXML2=on" + ;; special glicid + "-DGMX_MPI=on" + "-DCMAKE_C_COMPILER=mpicc" + "-DCMAKE_CXX_COMPILER=mpicxx" + (string-append "-DTinyXML2_DIR=" + (assoc-ref %build-inputs "tinyxml2")) + ;; Workaround for cmake/FindSphinx.cmake version parsing that does + ;; not understand the guix-wrapped `sphinx-build --version' answer + (string-append "-DSPHINX_EXECUTABLE_VERSION=" + ,(package-version python-sphinx))) + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fixes + (lambda* (#:key inputs #:allow-other-keys) + ;; Still bundled: part of gromacs, source behind registration + ;; but free software anyways + ;;(delete-file-recursively "src/external/vmd_molfile") + ;; Still bundled: threads-based OpenMPI-compatible fallback + ;; designed to be bundled like that + ;;(delete-file-recursively "src/external/thread_mpi") + ;; Unbundling + (delete-file-recursively "src/external/lmfit") + (delete-file-recursively "src/external/clFFT") + (delete-file-recursively "src/external/fftpack") + (delete-file-recursively "src/external/build-fftw") + (delete-file-recursively "src/external/tng_io") + (delete-file-recursively "src/external/tinyxml2") + (delete-file-recursively "src/external/googletest") + (copy-recursively (assoc-ref inputs "googletest-source") + "src/external/googletest") + ;; This test warns about the build host hardware, disable + (substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp" + (("TEST\\(HardwareTopologyTest, HwlocExecute\\)") + "void __guix_disabled()")) + #t))))) + + + + ) + +) + + + ;; pour futures customisations. (define-public glicid-openmpi-gcc-8 From bbd4973877978528d648b2bfd89d03e0038e320c Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 16:51:11 +0200 Subject: [PATCH 038/200] missing cmake --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 411d5fd..c61b985 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -3,6 +3,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) #:use-module (guix licenses) #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) From 3a669c09e52655364281207aa65a4002ad1b9026 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 16:58:29 +0200 Subject: [PATCH 039/200] no test : no ssh needed. --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index c61b985..69f558e 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -212,7 +212,7 @@ (inherit gromacs) (name "glicid-gromacs-openmpi") (inputs `(("openmpi", openmpi) - ("openssh", openssh) + ;; ("openssh", openssh) ;; only for tests... disabled now ,@(package-inputs gromacs))) (build-system cmake-build-system) From 251a2444bd3058e78efb723a605d0725d46319f7 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 May 2020 17:04:08 +0200 Subject: [PATCH 040/200] sphinx needed for gromacs --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 69f558e..ddf02d5 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages commencement) #:use-module (gnu packages gcc) #:use-module (gnu packages chemistry) + #:use-module (gnu packages sphinx) #:use-module (srfi srfi-1) #:use-module (gnu packages mpi) #:use-module (gnu packages sssd) From f0d1b274e1fd9acead926335431ce1ea45147b99 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 26 May 2020 09:54:29 +0200 Subject: [PATCH 041/200] nouvelles options gromacs --- gnu/packages/glicid.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index ddf02d5..97828a3 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -232,6 +232,9 @@ "-DGMX_MPI=on" "-DCMAKE_C_COMPILER=mpicc" "-DCMAKE_CXX_COMPILER=mpicxx" + "-DGMX_DOUBLE=off" + "-DGMX_OPENMP=on" + "-DGMX_SIMD=AVX2_256" (string-append "-DTinyXML2_DIR=" (assoc-ref %build-inputs "tinyxml2")) ;; Workaround for cmake/FindSphinx.cmake version parsing that does From d97978ba47d8009826cc3698f64a6b8b2b37a4b4 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 29 May 2020 22:55:19 +0200 Subject: [PATCH 042/200] ajout de mpich --- gnu/packages/glicid.scm | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 97828a3..baf9e3c 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -281,7 +281,7 @@ (define-public glicid-openmpi-gcc-8 (package (inherit openmpi) - (name "glicid-openpmi-gcc-8") + (name "glicid-openmpi-gcc-8") (inputs `(("gcc-8", gcc-8) ("gfortran-8", gfortran-8) ,@(package-inputs openmpi))) @@ -291,7 +291,7 @@ (define-public glicid-openmpi-gcc-9 (package (inherit openmpi) - (name "glicid-openpmi-gcc-9") + (name "glicid-openmpi-gcc-9") (inputs `(("gcc-9", gcc-9) ("gfortran-9", gfortran-9) ,@(package-inputs openmpi))) @@ -301,13 +301,44 @@ (define-public glicid-openmpi-gcc-10 (package (inherit openmpi) - (name "glicid-openpmi-gcc-10") + (name "glicid-openmpi-gcc-10") (inputs `(("gcc-10", gcc-10) ("gfortran-10", gfortran-10) ,@(package-inputs openmpi))) ) ) +(define-public glicid-mpich-gcc-8 + (package + (inherit mpich) + (name "glicid-mpich-gcc-8") + (inputs `(("gcc-8", gcc-8) + ("gfortran-8", gfortran-8) + ,@(package-inputs mpich))) + ) +) + +(define-public glicid-mpich-gcc-9 + (package + (inherit mpich) + (name "glicid-mpich-gcc-9") + (inputs `(("gcc-9", gcc-9) + ("gfortran-9", gfortran-9) + ,@(package-inputs mpich))) + ) +) + +(define-public glicid-mpich-gcc-10 + (package + (inherit mpich) + (name "glicid-mpich-gcc-10") + (inputs `(("gcc-10", gcc-10) + ("gfortran-10", gfortran-10) + ,@(package-inputs mpich))) + ) +) + + (define-public glicid-gromacs-gcc-8 (package (inherit gromacs) From 888f26eaf505b24fcb50c71651261179f5a45132 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 30 Jul 2020 16:54:25 +0200 Subject: [PATCH 043/200] suppression temporaires packages glicid (packages fortran) --- gnu/packages/glicid.scm | 374 ---------------------------------------- 1 file changed, 374 deletions(-) delete mode 100644 gnu/packages/glicid.scm diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm deleted file mode 100644 index baf9e3c..0000000 --- a/gnu/packages/glicid.scm +++ /dev/null @@ -1,374 +0,0 @@ -(define-module (gnu packages glicid) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system cmake) - #:use-module (guix licenses) - #:use-module (gnu packages gawk) - #:use-module (gnu packages gcc) - #:use-module (gnu packages commencement) - #:use-module (guix build-system python) - #:use-module ((guix licenses) #:prefix license:) - #:use-module ((guix utils) #:select (target-64bit?)) - #:use-module (gnu packages) - #:use-module (gnu packages admin) - #:use-module (gnu packages autotools) - #:use-module (gnu packages base) - #:use-module (gnu packages freeipmi) - #:use-module (gnu packages linux) - #:use-module (gnu packages mpi) - #:use-module (gnu packages perl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages parallel) - #:use-module (gnu packages storage) - #:use-module (gnu packages networking) - #:use-module (gnu packages gtk) - #:use-module (gnu packages python) - #:use-module (gnu packages python-science) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages readline) - #:use-module (gnu packages tcl) - #:use-module (gnu packages tls) - #:use-module (gnu packages commencement) - #:use-module (gnu packages gcc) - #:use-module (gnu packages chemistry) - #:use-module (gnu packages sphinx) - #:use-module (srfi srfi-1) - #:use-module (gnu packages mpi) - #:use-module (gnu packages sssd) - #:use-module (gnu packages web)) - - - -(define-public glicid-hello - (package - (name "glicid-hello") - (version "0.01") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/hello/hello-" version - ".tar.gz")) - (sha256 - (base32 - "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))) - (build-system gnu-build-system) - (arguments '(#:configure-flags '("--enable-silent-rules"))) - (inputs `(("gawk" ,gawk))) - (synopsis "Hello, GNU world: An example GNU package, modified for GLICID") - (description "Guess what GNU Hello prints!") - (home-page "https://www.gnu.org/software/hello/") - (license gpl3+))) - -(define-public glicid-syslog-ng - (package - (name "glicid-syslog-ng") - (version "3.25.1") - - (source (origin - ;; do not use auto-generated tarballs - (method git-fetch) - (uri (git-reference - (url "https://github.com/syslog-ng/syslog-ng.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6")))) - - (build-system gnu-build-system) - (arguments '(#:configure-flags '("--enable-silent-rules"))) - (inputs `(("gawk" ,gawk))) - (synopsis "Hello, GNU world: An example GNU package, modified for GLICID") - (description "Guess what GNU Hello prints!") - (home-page "https://www.gnu.org/software/hello/") - (license gpl3+))) - -(define-public glicid-custom-slurm-19.05 - (package - (inherit slurm) - (name "glicid-custom-slurm-19.05") - (version "19.05.6") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "1kj79r8hng5gp98ickgvj3im4gr19nzd3p3p8g6rl75axb8jin7h")) - )) - (inputs `(("gtk+-2" ,gtk+-2) - ("sssd", sssd) - ,@(package-inputs slurm) - )) -)) - -;; (define-public glicid-custom-slurm glicid-custom-slurm-19.05) - -(define-public glicid-custom-slurm-20.02 - (package - (inherit glicid-custom-slurm-19.05) - (name "glicid-custom-slurm-20.02") - (version "20.02.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "0bna1kyqphw6v7ca3gyfb3nlcpclc9vx8py55w7l7sv8xxsqrrvy")) - )) -)) - - - -(define-public glicid-ceph-14 - (package - (inherit ceph) - (name "glicid-ceph-14") - (version "14.2.9") - (source - (origin - (method url-fetch) - (uri (string-append "http://download.ceph.com/tarballs/ceph_" version ".orig.tar.gz")) - (sha256 (base32 "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il")) - )) -)) - -(define-public glicid-librdkafka-09 - (package - (inherit librdkafka) - (name "glicid-librdkafka-09") - (version "0.9.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/edenhill/librdkafka/archive/v" version ".tar.gz")) - (sha256 (base32 "0938yn1msaq8xcj5z7b3jcdy6rslh9kxmvz01r8rdcgbarlvchy2")) - )) -)) - - -(define-public glicid-ceph-15 - (package - (inherit ceph) - (name "glicid-ceph-15") - (version "15.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "http://download.ceph.com/tarballs/ceph_" version ".orig.tar.gz")) - (sha256 (base32 "0ql288dcpddi4kp3f6bcvipgi0hc8rqbsr38a18a4ia5nasfvib8")) - )) - (inputs `(("glicid-librdkafka-09" ,glicid-librdkafka-09) - ,@(package-inputs ceph) - )) - -)) - - -(define-public glicid-x2go - (package - (name "glicid-x2go") - (version "4.1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://code.x2go.org/releases/source/x2goserver/x2goserver-" version ".tar.gz")) - (sha256 (base32 "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7")) - )) - - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) - - (inputs - `(("perl" , perl))) - - (build-system gnu-build-system) - (synopsis "X2go") - (description "X2go") - (license "not checked") - (home-page "https://wiki.x2go.org") - ) -) - -;(define-public glicid-gromacs-openmpi -; (package -; (inherit gromacs) -; (name "glicid-gromacs-openmpi") -; (inputs `(("openmpi", openmpi) -; ,@(package-inputs gromacs))) -; (build-system cmake-build-system) -; (arguments -; `(#:configure-flags configure-flags) -; (append configure-flags (list "-DGMX_MPI=on" -; "-DCMAKE_C_COMPILER=mpicc" -; "-DCMAKE_CXX_COMPILER=mpiicxx" -; )) -; ) -; ) -;) - - -(define-public glicid-gromacs-openmpi - (package - (inherit gromacs) - (name "glicid-gromacs-openmpi") - (inputs `(("openmpi", openmpi) - ;; ("openssh", openssh) ;; only for tests... disabled now - ,@(package-inputs gromacs))) - (build-system cmake-build-system) - - (arguments - `(#:configure-flags - (list "-DGMX_DEVELOPER_BUILD=on" ; Needed to run tests - ;; Unbundling - "-DGMX_USE_LMFIT=EXTERNAL" - "-DGMX_BUILD_OWN_FFTW=off" - "-DGMX_EXTERNAL_BLAS=on" - "-DGMX_EXTERNAL_LAPACK=on" - "-DGMX_EXTERNAL_TNG=on" - "-DGMX_EXTERNAL_ZLIB=on" - "-DGMX_EXTERNAL_TINYXML2=on" - ;; special glicid - "-DGMX_MPI=on" - "-DCMAKE_C_COMPILER=mpicc" - "-DCMAKE_CXX_COMPILER=mpicxx" - "-DGMX_DOUBLE=off" - "-DGMX_OPENMP=on" - "-DGMX_SIMD=AVX2_256" - (string-append "-DTinyXML2_DIR=" - (assoc-ref %build-inputs "tinyxml2")) - ;; Workaround for cmake/FindSphinx.cmake version parsing that does - ;; not understand the guix-wrapped `sphinx-build --version' answer - (string-append "-DSPHINX_EXECUTABLE_VERSION=" - ,(package-version python-sphinx))) - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fixes - (lambda* (#:key inputs #:allow-other-keys) - ;; Still bundled: part of gromacs, source behind registration - ;; but free software anyways - ;;(delete-file-recursively "src/external/vmd_molfile") - ;; Still bundled: threads-based OpenMPI-compatible fallback - ;; designed to be bundled like that - ;;(delete-file-recursively "src/external/thread_mpi") - ;; Unbundling - (delete-file-recursively "src/external/lmfit") - (delete-file-recursively "src/external/clFFT") - (delete-file-recursively "src/external/fftpack") - (delete-file-recursively "src/external/build-fftw") - (delete-file-recursively "src/external/tng_io") - (delete-file-recursively "src/external/tinyxml2") - (delete-file-recursively "src/external/googletest") - (copy-recursively (assoc-ref inputs "googletest-source") - "src/external/googletest") - ;; This test warns about the build host hardware, disable - (substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp" - (("TEST\\(HardwareTopologyTest, HwlocExecute\\)") - "void __guix_disabled()")) - #t))))) - - - - ) - -) - - - -;; pour futures customisations. - -(define-public glicid-openmpi-gcc-8 - (package - (inherit openmpi) - (name "glicid-openmpi-gcc-8") - (inputs `(("gcc-8", gcc-8) - ("gfortran-8", gfortran-8) - ,@(package-inputs openmpi))) - ) -) - -(define-public glicid-openmpi-gcc-9 - (package - (inherit openmpi) - (name "glicid-openmpi-gcc-9") - (inputs `(("gcc-9", gcc-9) - ("gfortran-9", gfortran-9) - ,@(package-inputs openmpi))) - ) -) - -(define-public glicid-openmpi-gcc-10 - (package - (inherit openmpi) - (name "glicid-openmpi-gcc-10") - (inputs `(("gcc-10", gcc-10) - ("gfortran-10", gfortran-10) - ,@(package-inputs openmpi))) - ) -) - -(define-public glicid-mpich-gcc-8 - (package - (inherit mpich) - (name "glicid-mpich-gcc-8") - (inputs `(("gcc-8", gcc-8) - ("gfortran-8", gfortran-8) - ,@(package-inputs mpich))) - ) -) - -(define-public glicid-mpich-gcc-9 - (package - (inherit mpich) - (name "glicid-mpich-gcc-9") - (inputs `(("gcc-9", gcc-9) - ("gfortran-9", gfortran-9) - ,@(package-inputs mpich))) - ) -) - -(define-public glicid-mpich-gcc-10 - (package - (inherit mpich) - (name "glicid-mpich-gcc-10") - (inputs `(("gcc-10", gcc-10) - ("gfortran-10", gfortran-10) - ,@(package-inputs mpich))) - ) -) - - -(define-public glicid-gromacs-gcc-8 - (package - (inherit gromacs) - (name "glicid-gromacs-gcc-8") - (inputs `(("gcc-8", gcc-8) - ("gfortran-8", gfortran-8) - ("glicid-openmpi-gcc-8", glicid-openmpi-gcc-8) - ,@(package-inputs gromacs))) -)) - - -(define-public glicid-gromacs-gcc-9 - (package - (inherit gromacs) - (name "glicid-gromacs-gcc-9") - (inputs `(("gcc-9", gcc-9) - ("gfortran-9", gfortran-9) - ("glicid-openmpi-gcc-9", glicid-openmpi-gcc-9) - ,@(package-inputs gromacs))) -)) - -(define-public glicid-gromacs-gcc-10 - (package - (inherit gromacs) - (name "glicid-gromacs-gcc-10") - (inputs `(("gcc-10", gcc-10) - ("gfortran-10", gfortran-10) - ("glicid-openmpi-gcc-10", glicid-openmpi-gcc-10) - ,@(package-inputs gromacs))) -)) - - -;;; glicid.scm ends here From b154b3cd9ca477478eefd523c3cd178e2f1b762d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 31 Jul 2020 09:29:12 +0200 Subject: [PATCH 044/200] ajout mpi --- gnu/packages/glicid.scm | 241 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 241 insertions(+) create mode 100644 gnu/packages/glicid.scm diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm new file mode 100644 index 0000000..40aec85 --- /dev/null +++ b/gnu/packages/glicid.scm @@ -0,0 +1,241 @@ +(define-module (gnu packages glicid) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) + #:use-module (guix licenses) + #:use-module (gnu packages gawk) + #:use-module (gnu packages gcc) + #:use-module (gnu packages commencement) + #:use-module (guix build-system python) + #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix utils) #:select (target-64bit?)) + #:use-module (gnu packages) + #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages freeipmi) + #:use-module (gnu packages linux) + #:use-module (gnu packages mpi) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages parallel) + #:use-module (gnu packages storage) + #:use-module (gnu packages networking) + #:use-module (gnu packages gtk) + #:use-module (gnu packages python) + #:use-module (gnu packages python-science) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages readline) + #:use-module (gnu packages tcl) + #:use-module (gnu packages tls) + #:use-module (gnu packages commencement) + #:use-module (gnu packages gcc) + #:use-module (gnu packages chemistry) + #:use-module (gnu packages sphinx) + #:use-module (srfi srfi-1) + #:use-module (gnu packages mpi) + #:use-module (gnu packages sssd) + #:use-module (gnu packages web)) + + + +(define-public glicid-custom-slurm-19.05 + (package + (inherit slurm) + (name "glicid-custom-slurm-19.05") + (version "19.05.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) + (sha256 (base32 "1kj79r8hng5gp98ickgvj3im4gr19nzd3p3p8g6rl75axb8jin7h")) + )) + (inputs `(("gtk+-2" ,gtk+-2) + ("sssd", sssd) + ,@(package-inputs slurm) + )) +)) + +;; (define-public glicid-custom-slurm glicid-custom-slurm-19.05) + +(define-public glicid-custom-slurm-20.02 + (package + (inherit glicid-custom-slurm-19.05) + (name "glicid-custom-slurm-20.02") + (version "20.02.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) + (sha256 (base32 "0bna1kyqphw6v7ca3gyfb3nlcpclc9vx8py55w7l7sv8xxsqrrvy")) + )) +)) + + + + +(define-public glicid-librdkafka-09 + (package + (inherit librdkafka) + (name "glicid-librdkafka-09") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/edenhill/librdkafka/archive/v" version ".tar.gz")) + (sha256 (base32 "0938yn1msaq8xcj5z7b3jcdy6rslh9kxmvz01r8rdcgbarlvchy2")) + )) +)) + + + +(define-public glicid-x2go + (package + (name "glicid-x2go") + (version "4.1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://code.x2go.org/releases/source/x2goserver/x2goserver-" version ".tar.gz")) + (sha256 (base32 "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7")) + )) + + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + + (inputs + `(("perl" , perl))) + + (build-system gnu-build-system) + (synopsis "X2go") + (description "X2go") + (license "not checked") + (home-page "https://wiki.x2go.org") + ) +) + +;(define-public glicid-gromacs-openmpi +; (package +; (inherit gromacs) +; (name "glicid-gromacs-openmpi") +; (inputs `(("openmpi", openmpi) +; ,@(package-inputs gromacs))) +; (build-system cmake-build-system) +; (arguments +; `(#:configure-flags configure-flags) +; (append configure-flags (list "-DGMX_MPI=on" +; "-DCMAKE_C_COMPILER=mpicc" +; "-DCMAKE_CXX_COMPILER=mpiicxx" +; )) +; ) +; ) +;) + + +(define-public glicid-gromacs-openmpi + (package + (inherit gromacs) + (name "glicid-gromacs-openmpi") + (inputs `(("openmpi", openmpi) + ;; ("openssh", openssh) ;; only for tests... disabled now + ,@(package-inputs gromacs))) + (build-system cmake-build-system) + + (arguments + `(#:configure-flags + (list "-DGMX_DEVELOPER_BUILD=on" ; Needed to run tests + ;; Unbundling + "-DGMX_USE_LMFIT=EXTERNAL" + "-DGMX_BUILD_OWN_FFTW=off" + "-DGMX_EXTERNAL_BLAS=on" + "-DGMX_EXTERNAL_LAPACK=on" + "-DGMX_EXTERNAL_TNG=on" + "-DGMX_EXTERNAL_ZLIB=on" + "-DGMX_EXTERNAL_TINYXML2=on" + ;; special glicid + "-DGMX_MPI=on" + "-DCMAKE_C_COMPILER=mpicc" + "-DCMAKE_CXX_COMPILER=mpicxx" + "-DGMX_DOUBLE=off" + "-DGMX_OPENMP=on" + "-DGMX_SIMD=AVX2_256" + (string-append "-DTinyXML2_DIR=" + (assoc-ref %build-inputs "tinyxml2")) + ;; Workaround for cmake/FindSphinx.cmake version parsing that does + ;; not understand the guix-wrapped `sphinx-build --version' answer + (string-append "-DSPHINX_EXECUTABLE_VERSION=" + ,(package-version python-sphinx))) + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fixes + (lambda* (#:key inputs #:allow-other-keys) + ;; Still bundled: part of gromacs, source behind registration + ;; but free software anyways + ;;(delete-file-recursively "src/external/vmd_molfile") + ;; Still bundled: threads-based OpenMPI-compatible fallback + ;; designed to be bundled like that + ;;(delete-file-recursively "src/external/thread_mpi") + ;; Unbundling + (delete-file-recursively "src/external/lmfit") + (delete-file-recursively "src/external/clFFT") + (delete-file-recursively "src/external/fftpack") + (delete-file-recursively "src/external/build-fftw") + (delete-file-recursively "src/external/tng_io") + (delete-file-recursively "src/external/tinyxml2") + (delete-file-recursively "src/external/googletest") + (copy-recursively (assoc-ref inputs "googletest-source") + "src/external/googletest") + ;; This test warns about the build host hardware, disable + (substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp" + (("TEST\\(HardwareTopologyTest, HwlocExecute\\)") + "void __guix_disabled()")) + #t))))) + + + + ) + +) + + + +;; pour futures customisations. + +(define-public glicid-openmpi-gcc-10 + (package + (inherit openmpi) + (name "glicid-openpmi-gcc-10") + (inputs `(("gcc-10", gcc-10) + ("gfortran-10", gfortran-10) + ,@(package-inputs openmpi))) + ) +) + +(define-public glicid-openmpi-gcc-10 + (package + (inherit openmpi) + (name "glicid-openpmi-gcc-10") + (inputs `(("gcc-10", gcc-10) + ("gfortran-10", gfortran-10) + ,@(package-inputs openmpi))) + ) +) + + +(define-public glicid-gromacs-gcc-10 + (package + (inherit gromacs) + (name "glicid-gromacs-gcc-10") + (inputs `(("gcc-10", gcc-10) + ("gfortran-10", gfortran-10) + ("glicid-openmpi-gcc-10", glicid-openmpi-gcc-10) + ,@(package-inputs gromacs))) +)) + + +;;; glicid.scm ends here From 493b7b5969e26b201df77ef1b60d9431d73fd650 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 31 Jul 2020 09:56:20 +0200 Subject: [PATCH 045/200] upgrade to 4.0.4 --- gnu/packages/glicid.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 40aec85..f0a5386 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -220,6 +220,14 @@ (package (inherit openmpi) (name "glicid-openpmi-gcc-10") + (version "4.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-" version ".tar.gz")) + (sha256 (base32 "0cw26vbn56yiknrqcqh0r5gk4gnqzwdi7pbb945587s143s698nw")) + )) + (inputs `(("gcc-10", gcc-10) ("gfortran-10", gfortran-10) ,@(package-inputs openmpi))) From 2e19645aca8bcc78966d983be600b825832f3150 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 31 Aug 2020 17:20:07 +0200 Subject: [PATCH 046/200] tentative ucx --- gnu/packages/glicid.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index f0a5386..91e50cf 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -37,6 +37,7 @@ #:use-module (srfi srfi-1) #:use-module (gnu packages mpi) #:use-module (gnu packages sssd) + #:use-module (gnu packages fabric-management) #:use-module (gnu packages web)) @@ -216,6 +217,25 @@ ) ) +(define-public glicid-ucx + (package + (inherit ucx) + (name "glicid-ucx") + (version "1.8.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) + (sha256 (base32 "0cw26vbn56yiknrqcqh0r5gk4gnqzwdi7pbb945587s143s698nw")) + )) + + (inputs `(("gcc-10", gcc-10) + ("gfortran-10", gfortran-10) + ,@(package-inputs ucx))) + ) +) + + (define-public glicid-openmpi-gcc-10 (package (inherit openmpi) From 5397a3c48ef89e5210c00e9eb96582be64a2fadc Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 31 Aug 2020 17:27:22 +0200 Subject: [PATCH 047/200] correct sha --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 91e50cf..1cddeef 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -226,7 +226,7 @@ (origin (method url-fetch) (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0cw26vbn56yiknrqcqh0r5gk4gnqzwdi7pbb945587s143s698nw")) + (sha256 (base32 "0sjmbg1zy1wyh9w72r8pc0kydpf1r2kh7fp7yg6baq87ip5j1254")) )) (inputs `(("gcc-10", gcc-10) From cd57c592de00445adbd1dbb573dd506a5c8181e4 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 31 Aug 2020 20:24:50 +0200 Subject: [PATCH 048/200] bump openmpi version & now uses glixid-ucx --- gnu/packages/glicid.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 1cddeef..8c7140f 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -240,16 +240,17 @@ (package (inherit openmpi) (name "glicid-openpmi-gcc-10") - (version "4.0.4") + (version "4.0.5") (source (origin (method url-fetch) (uri (string-append "https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-" version ".tar.gz")) - (sha256 (base32 "0cw26vbn56yiknrqcqh0r5gk4gnqzwdi7pbb945587s143s698nw")) + (sha256 (base32 "01dxs4jrfl4x54g9vrxjp00ymf24gxp1d2hvdzqdfizx85s7fbjp")) )) (inputs `(("gcc-10", gcc-10) ("gfortran-10", gfortran-10) + ("glicid-ucx",glicid-ucx) ,@(package-inputs openmpi))) ) ) From 28dff6ea6c34508f6b26496048d47619b9df7959 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 31 Aug 2020 20:56:49 +0200 Subject: [PATCH 049/200] glicid intel mpi bench --- gnu/packages/glicid.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 8c7140f..6c84826 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages mpi) #:use-module (gnu packages sssd) #:use-module (gnu packages fabric-management) + #:use-module (gnu packages benchmark) #:use-module (gnu packages web)) @@ -236,6 +237,8 @@ ) + + (define-public glicid-openmpi-gcc-10 (package (inherit openmpi) @@ -255,6 +258,17 @@ ) ) +(define-public glicid-intel-mpi-benchmarks + (package + (inherit intel-mpi-benchmarks) + (name "glicid-intel-mpi-benchmarks") + (inputs `(("glicid-openmpi-gcc-10", glicid-openmpi-gcc-10) + ,@(package-inputs intel-mpi-benchmarks))) + ) +) + + + (define-public glicid-gromacs-gcc-10 (package @@ -267,4 +281,7 @@ )) + + + ;;; glicid.scm ends here From c4424360b9e21cb06c7b8a821d398bcd1e93c49d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 31 Aug 2020 21:00:50 +0200 Subject: [PATCH 050/200] test... --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 6c84826..cd229f2 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -260,10 +260,10 @@ (define-public glicid-intel-mpi-benchmarks (package - (inherit intel-mpi-benchmarks) + (inherit intel-mpi-benchmarks/openmpi) (name "glicid-intel-mpi-benchmarks") (inputs `(("glicid-openmpi-gcc-10", glicid-openmpi-gcc-10) - ,@(package-inputs intel-mpi-benchmarks))) + ,@(package-inputs intel-mpi-benchmarks/openmpi))) ) ) From 77a83865cd2b493aa81479837fcdd195b22f92bd Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 1 Sep 2020 09:50:04 +0200 Subject: [PATCH 051/200] bump version. --- gnu/packages/glicid.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index cd229f2..6b7185a 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -274,6 +274,14 @@ (package (inherit gromacs) (name "glicid-gromacs-gcc-10") + (version "2020.3") + (source + (origin + (method url-fetch) + (uri (string-append "http://ftp.gromacs.org/pub/gromacs/gromacs-" version ".tar.gz")) + (sha256 (base32 "1acjrhcfzpqy2dncblhj97602jbg9gdha4q1bgji9nrj25lq6cch")) + )) + (inputs `(("gcc-10", gcc-10) ("gfortran-10", gfortran-10) ("glicid-openmpi-gcc-10", glicid-openmpi-gcc-10) From 3588399ad051f470a3422ee91d5a3a5e6f3f4f7e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 15 Sep 2020 15:35:43 +0200 Subject: [PATCH 052/200] version de gajim, test. --- gnu/packages/glicid.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 6b7185a..bb44397 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages sssd) #:use-module (gnu packages fabric-management) #:use-module (gnu packages benchmark) + #:use-module (gnu packages messaging) #:use-module (gnu packages web)) @@ -290,6 +291,24 @@ +(define-public glicid-gajim + (package + (inherit gajim) + (name "glicid-gajim") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://gajim.org/downloads/" + (version-major+minor version) + "/gajim-" version ".tar.gz")) + (sha256 (base32 "093mqyi861yj9lgqlh9v1himpnly8j7qwdmywpwzyak9qv78mwp8")) + )) + +)) + + + ;;; glicid.scm ends here From 0b1ce1fd842a7d0bb4147f579b751853c68336e1 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 15 Sep 2020 15:45:36 +0200 Subject: [PATCH 053/200] pb with url --- gnu/packages/glicid.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index bb44397..74e4803 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -299,9 +299,7 @@ (source (origin (method url-fetch) - (uri (string-append "https://gajim.org/downloads/" - (version-major+minor version) - "/gajim-" version ".tar.gz")) + (uri (string-append "https://gajim.org/downloads/1.2/gajim-" version ".tar.gz")) (sha256 (base32 "093mqyi861yj9lgqlh9v1himpnly8j7qwdmywpwzyak9qv78mwp8")) )) From 826b974172a559db948b4e36bd859bb03b06a953 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 15 Sep 2020 15:55:08 +0200 Subject: [PATCH 054/200] bad checksum... --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 74e4803..5b8add5 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -300,7 +300,7 @@ (origin (method url-fetch) (uri (string-append "https://gajim.org/downloads/1.2/gajim-" version ".tar.gz")) - (sha256 (base32 "093mqyi861yj9lgqlh9v1himpnly8j7qwdmywpwzyak9qv78mwp8")) + (sha256 (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx")) )) )) From e7e33c64f8d0d69e24b26e38ec406845b56fc65b Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 15 Sep 2020 16:13:18 +0200 Subject: [PATCH 055/200] test --- gnu/packages/glicid.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 5b8add5..f2b20e4 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -303,6 +303,10 @@ (sha256 (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx")) )) + (inputs `(("python-packaging", python-packaging) + ,@(package-inputs gajim))) + + )) From dfac120ffb6a70aac73e87aac82b4d62e248de34 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 15 Sep 2020 16:28:08 +0200 Subject: [PATCH 056/200] new packages --- gnu/packages/glicid.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index f2b20e4..4f4c48c 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -303,7 +303,8 @@ (sha256 (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx")) )) - (inputs `(("python-packaging", python-packaging) + (inputs `(("python-packaging", python-packaging) + ("python-nbxmpp", python-nbxmpp) ,@(package-inputs gajim))) From ac8798d91604a1f0262c7f1fa950d479963c96ee Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 18 Sep 2020 17:08:45 +0200 Subject: [PATCH 057/200] bump ucx version --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 4f4c48c..48749e0 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -223,12 +223,12 @@ (package (inherit ucx) (name "glicid-ucx") - (version "1.8.1") + (version "1.9.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0sjmbg1zy1wyh9w72r8pc0kydpf1r2kh7fp7yg6baq87ip5j1254")) + (sha256 (base32 "1mch8ks4jikpxhnbcr1mbaibz6yddqnfm1z2kjslk28cyx8n3v95")) )) (inputs `(("gcc-10", gcc-10) From f5cc3a29731d5966b133ba103c3b85cc13b4b871 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 20 Sep 2020 21:40:15 +0200 Subject: [PATCH 058/200] new gajim version. --- gnu/packages/glicid.scm | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 48749e0..be4fe23 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -290,8 +290,22 @@ )) +(define-public glicid-python-nbxmpp + (package + (inherit python-nbxmpp) + (name "glicid-python-nbxmpp") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nbxmpp" version)) + (sha256 + (base32 + "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr")))) + +)) + -(define-public glicid-gajim (package (inherit gajim) (name "glicid-gajim") @@ -304,11 +318,17 @@ )) (inputs `(("python-packaging", python-packaging) - ("python-nbxmpp", python-nbxmpp) - ,@(package-inputs gajim))) + ("glicid-python-nbxmpp", glicid-python-nbxmpp) + ("python-css-parser", python-css-parser) + ,@(package-inputs gajim))) + (propagated-inputs + `( + ("glib-networking" ,glib-networking) + ("libsoup" ,libsoup) + )) +) -)) From 78b5aec399f3efb118e48bce574ff9fb9d8ab7ae Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 20 Sep 2020 21:47:17 +0200 Subject: [PATCH 059/200] oubli. --- gnu/packages/glicid.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index be4fe23..de23d00 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -306,6 +306,7 @@ )) +(define-public glicid-gajim (package (inherit gajim) (name "glicid-gajim") @@ -327,7 +328,7 @@ ("glib-networking" ,glib-networking) ("libsoup" ,libsoup) )) -) +)) From ead465afbfb615ddca640262bc73989614f85cd6 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 20 Sep 2020 21:53:44 +0200 Subject: [PATCH 060/200] damn, missing package ! --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index de23d00..7b61ab9 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -26,6 +26,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages python) #:use-module (gnu packages python-science) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages tcl) From 0fb584bb8917214585c4564296693c9ed8277ef2 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 20 Sep 2020 22:01:16 +0200 Subject: [PATCH 061/200] damn, missing package --- gnu/packages/glicid.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 7b61ab9..d83562d 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -41,7 +41,8 @@ #:use-module (gnu packages fabric-management) #:use-module (gnu packages benchmark) #:use-module (gnu packages messaging) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (gnu packages gnome)) From cbac7675519a279546a4c044f383cbe1e8b0c49e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 09:39:50 +0200 Subject: [PATCH 062/200] add glicid-rdma-core --- gnu/packages/glicid.scm | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 48749e0..131447f 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -209,20 +209,39 @@ ;; pour futures customisations. -(define-public glicid-openmpi-gcc-10 - (package - (inherit openmpi) - (name "glicid-openpmi-gcc-10") - (inputs `(("gcc-10", gcc-10) - ("gfortran-10", gfortran-10) - ,@(package-inputs openmpi))) - ) +;(define-public glicid-openmpi-gcc-10 +; (package +; (inherit openmpi) +; (name "glicid-openpmi-gcc-10") +; (inputs `(("gcc-10", gcc-10) +; ("gfortran-10", gfortran-10) +; ,@(package-inputs openmpi))) +; ) +;) + +(define-public glicid-rdma-core-gcc-10 +(package + (inherit rdma-core) + (name "glicid-rdma-core-gcc-10") + (version "31.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/linux-rdma/rdma-core" + "/releases/download/v" version "/rdma-core-" + version ".tar.gz")) + (sha256 + (base32 + "02ym93k6khfmzm9rml79x9zh1dy8231sygw16r287mhwp0x9mbji")))) + (inputs `(("gcc-10", gcc-10) + ,@(package-inputs rdma-core))) + ) ) -(define-public glicid-ucx + +(define-public glicid-ucx-gcc-10 (package (inherit ucx) - (name "glicid-ucx") + (name "glicid-ucx-gcc-10") (version "1.9.0") (source (origin @@ -255,6 +274,7 @@ (inputs `(("gcc-10", gcc-10) ("gfortran-10", gfortran-10) ("glicid-ucx",glicid-ucx) + ("glicid-rdma-core",glicid-rdma-core-gcc-10) ,@(package-inputs openmpi))) ) ) From 3ea1cec15a3ae069f147997360b61acc1a6c5f9d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 09:43:07 +0200 Subject: [PATCH 063/200] rename some packages --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index e442c2a..4c514e4 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -275,8 +275,8 @@ (inputs `(("gcc-10", gcc-10) ("gfortran-10", gfortran-10) - ("glicid-ucx",glicid-ucx) - ("glicid-rdma-core",glicid-rdma-core-gcc-10) + ("glicid-ucx-gcc-10",glicid-ucx-gcc-10) + ("glicid-rdma-core-gcc-10",glicid-rdma-core-gcc-10) ,@(package-inputs openmpi))) ) ) From 991fc28e865c853cb940a2d884ce785fb02aebae Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 10:21:07 +0200 Subject: [PATCH 064/200] add non gcc-10 version --- gnu/packages/glicid.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 4c514e4..4c7384c 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -221,6 +221,23 @@ ; ) ;) +(define-public glicid-rdma-core +(package + (inherit rdma-core) + (name "glicid-rdma-core") + (version "31.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/linux-rdma/rdma-core" + "/releases/download/v" version "/rdma-core-" + version ".tar.gz")) + (sha256 + (base32 + "02ym93k6khfmzm9rml79x9zh1dy8231sygw16r287mhwp0x9mbji")))) + ) +) + + (define-public glicid-rdma-core-gcc-10 (package (inherit rdma-core) @@ -276,7 +293,7 @@ (inputs `(("gcc-10", gcc-10) ("gfortran-10", gfortran-10) ("glicid-ucx-gcc-10",glicid-ucx-gcc-10) - ("glicid-rdma-core-gcc-10",glicid-rdma-core-gcc-10) + ("glicid-rdma-core",glicid-rdma-core) ,@(package-inputs openmpi))) ) ) From 5348413a4832ef037f777ee15159d21aaf4142ee Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 10:56:36 +0200 Subject: [PATCH 065/200] revert rdma version --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 4c7384c..3bf8578 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -293,7 +293,7 @@ (inputs `(("gcc-10", gcc-10) ("gfortran-10", gfortran-10) ("glicid-ucx-gcc-10",glicid-ucx-gcc-10) - ("glicid-rdma-core",glicid-rdma-core) +;; ("glicid-rdma-core",glicid-rdma-core) ;;; segfault !!! ,@(package-inputs openmpi))) ) ) From d99e67acea51e5f17073b30ac5a31a6b708dfb33 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 12:07:02 +0200 Subject: [PATCH 066/200] introduce specific rdma versions --- gnu/packages/glicid.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3bf8578..e86beed 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -369,6 +369,34 @@ )) )) +(define-public glicid-specific-rdma-core-gcc-10 + (package + (inherit rdma-core) + (name "glicid-specific-rdma-core-gcc-10") + (version "31.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/linux-rdma/rdma-core" + "/releases/download/v" version "/rdma-core-" + version ".tar.gz")) + (sha256 + (base32 + "02ym93k6khfmzm9rml79x9zh1dy8231sygw16r287mhwp0x9mbji")))) + (inputs `(("gcc-10", gcc-10) + ,@(package-inputs rdma-core))) + + + + ) +) + +(define-public glicid-specific-openmpi-gcc-10 + (package + (inherit glicid-openmpi-gcc-10) + (name "glicid-specific-openmpi-gcc-10") + (inputs `(("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10) + ,@(package-inputs glicid-openmpi-gcc-10))) +) From 63eadf0d004fae45b140aca276a21ba174aaf49d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 12:33:10 +0200 Subject: [PATCH 067/200] true 1.9.0 version --- gnu/packages/glicid.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index e86beed..546d1e4 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -266,7 +266,7 @@ (origin (method url-fetch) (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "1mch8ks4jikpxhnbcr1mbaibz6yddqnfm1z2kjslk28cyx8n3v95")) + (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) )) (inputs `(("gcc-10", gcc-10) @@ -398,6 +398,15 @@ ,@(package-inputs glicid-openmpi-gcc-10))) ) +(define-public glicid-specific-intel-mpi-benchmarks + (package + (inherit glicid-intel-mpi-benchmarks/openmpi) + (name "glicid-specific-intel-mpi-benchmarks") + (inputs `(("glicid-specific-openmpi-gcc-10", glicid-specific-openmpi-gcc-10) + ,@(package-inputs glicid-intel-mpi-benchmarks))) + ) +) + From dc9340a0bb253879b5423e1349214450eee3cf4c Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 12:36:46 +0200 Subject: [PATCH 068/200] missing ) --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 546d1e4..3fb0327 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -396,6 +396,7 @@ (name "glicid-specific-openmpi-gcc-10") (inputs `(("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10) ,@(package-inputs glicid-openmpi-gcc-10))) + ) ) (define-public glicid-specific-intel-mpi-benchmarks From de81e97723171324d04412b8856584ad90623dd8 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 12:39:05 +0200 Subject: [PATCH 069/200] typo --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3fb0327..01654dd 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -401,7 +401,7 @@ (define-public glicid-specific-intel-mpi-benchmarks (package - (inherit glicid-intel-mpi-benchmarks/openmpi) + (inherit glicid-intel-mpi-benchmarks) (name "glicid-specific-intel-mpi-benchmarks") (inputs `(("glicid-specific-openmpi-gcc-10", glicid-specific-openmpi-gcc-10) ,@(package-inputs glicid-intel-mpi-benchmarks))) From 7629ce60677e184c12940a06276acc0456731bf7 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 14:31:55 +0200 Subject: [PATCH 070/200] down to 30.0 --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 01654dd..44780ed 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -373,7 +373,7 @@ (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-10") - (version "31.0") + (version "30.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -381,7 +381,7 @@ version ".tar.gz")) (sha256 (base32 - "02ym93k6khfmzm9rml79x9zh1dy8231sygw16r287mhwp0x9mbji")))) + "1ycvd8sp3giwjbp0x3nvb8q2wrdc50s7lmzf44b9l51qgcnvvq93")))) (inputs `(("gcc-10", gcc-10) ,@(package-inputs rdma-core))) From 1d4aaaf6c281a25717e8d3702cba15ae651833fc Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 15:01:42 +0200 Subject: [PATCH 071/200] new libfabric --- gnu/packages/glicid.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 44780ed..469536c 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -256,6 +256,25 @@ ) ) +(define-public glicid-libfabric-gcc-10 +(package + (inherit libfabric) + (name "glicid-libfabric-gcc-10") + (version "1.11.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r")))) + + (inputs `(("gcc-10", gcc-10) + ,@(package-inputs libfabric))) + ) +) + (define-public glicid-ucx-gcc-10 (package @@ -275,8 +294,26 @@ ) ) +(define-public glicid-specific-ucx-gcc-10 + (package + (inherit ucx) + (name "glicid-ucx-gcc-10") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) + (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) + )) + (inputs `(("gcc-10", gcc-10) + ("gfortran-10", gfortran-10) + ("glicid-libfabric-gcc-10", glicid-libfabric-gcc-10) + ("glicid-specific-rdma-core",glicid-specific-rdma-core) + ,@(package-inputs ucx))) + ) +) (define-public glicid-openmpi-gcc-10 (package @@ -395,6 +432,7 @@ (inherit glicid-openmpi-gcc-10) (name "glicid-specific-openmpi-gcc-10") (inputs `(("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10) + ("glicid-specific-ucx-gcc-10",glicid-specific-ucx-gcc-10) ,@(package-inputs glicid-openmpi-gcc-10))) ) ) From 4b25a5d8127710c13cb0c34ffb1af8c11da8d492 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 15:14:18 +0200 Subject: [PATCH 072/200] include specific libfabric --- gnu/packages/glicid.scm | 64 +++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 469536c..9d58136 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -294,27 +294,6 @@ ) ) -(define-public glicid-specific-ucx-gcc-10 - (package - (inherit ucx) - (name "glicid-ucx-gcc-10") - (version "1.9.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) - )) - - (inputs `(("gcc-10", gcc-10) - ("gfortran-10", gfortran-10) - ("glicid-libfabric-gcc-10", glicid-libfabric-gcc-10) - ("glicid-specific-rdma-core",glicid-specific-rdma-core) - - ,@(package-inputs ucx))) - ) -) - (define-public glicid-openmpi-gcc-10 (package (inherit openmpi) @@ -406,6 +385,7 @@ )) )) + (define-public glicid-specific-rdma-core-gcc-10 (package (inherit rdma-core) @@ -427,12 +407,54 @@ ) ) +(define-public glicid-specific-libfabric-gcc-10 +(package + (inherit libfabric) + (name "glicid-specific-libfabric-gcc-10") + (version "1.11.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r")))) + + (inputs `(("gcc-10", gcc-10) + ,@(package-inputs libfabric))) + ) +) + +(define-public glicid-specific-ucx-gcc-10 + (package + (inherit ucx) + (name "glicid-ucx-gcc-10") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) + (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) + )) + + (inputs `(("gcc-10", gcc-10) + ("gfortran-10", gfortran-10) + ("glicid-specific-libfabric-gcc-10", glicid-specific-libfabric-gcc-10) + ("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10) + + ,@(package-inputs ucx))) + ) +) + + (define-public glicid-specific-openmpi-gcc-10 (package (inherit glicid-openmpi-gcc-10) (name "glicid-specific-openmpi-gcc-10") (inputs `(("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10) ("glicid-specific-ucx-gcc-10",glicid-specific-ucx-gcc-10) + ("glicid-specific-fabric-gcc-10",glicid-specific-fabric-gcc-10) ,@(package-inputs glicid-openmpi-gcc-10))) ) ) From 0693219a06146290acef4211da046d87a0db8cd5 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 15:21:07 +0200 Subject: [PATCH 073/200] typo --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 9d58136..8b1ddb9 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -454,7 +454,7 @@ (name "glicid-specific-openmpi-gcc-10") (inputs `(("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10) ("glicid-specific-ucx-gcc-10",glicid-specific-ucx-gcc-10) - ("glicid-specific-fabric-gcc-10",glicid-specific-fabric-gcc-10) + ("glicid-specific-libfabric-gcc-10",glicid-specific-libfabric-gcc-10) ,@(package-inputs glicid-openmpi-gcc-10))) ) ) From b9d96cdaa07f212c3032de19032f41c815fb874a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 15:28:58 +0200 Subject: [PATCH 074/200] typo --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 8b1ddb9..05e63f7 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -429,7 +429,7 @@ (define-public glicid-specific-ucx-gcc-10 (package (inherit ucx) - (name "glicid-ucx-gcc-10") + (name "glicid-specific-ucx-gcc-10") (version "1.9.0") (source (origin From fcc5de01db92c240a2a06625b6b18db1ce3e07d0 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 15:37:36 +0200 Subject: [PATCH 075/200] dependancy hell --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 05e63f7..0b09877 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -422,6 +422,7 @@ (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r")))) (inputs `(("gcc-10", gcc-10) + ("glicid-specific-rdma-core-gcc-10", glicid-specific-rdma-core-gcc-10) ,@(package-inputs libfabric))) ) ) From 0f0c07134ed3b380a186dd6b2f3426c11a6b36da Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 16:03:19 +0200 Subject: [PATCH 076/200] bump ti v31 --- gnu/packages/glicid.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 0b09877..fc0f9f3 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -390,7 +390,7 @@ (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-10") - (version "30.0") + (version "31.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -398,12 +398,10 @@ version ".tar.gz")) (sha256 (base32 - "1ycvd8sp3giwjbp0x3nvb8q2wrdc50s7lmzf44b9l51qgcnvvq93")))) + "02ym93k6khfmzm9rml79x9zh1dy8231sygw16r287mhwp0x9mbji")))) (inputs `(("gcc-10", gcc-10) ,@(package-inputs rdma-core))) - - ) ) From 2285f10ac7130fa01c4eb0461ffeadde8c04e796 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 16:38:26 +0200 Subject: [PATCH 077/200] bad substitutions --- gnu/packages/glicid.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index fc0f9f3..9452152 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -399,7 +399,7 @@ (sha256 (base32 "02ym93k6khfmzm9rml79x9zh1dy8231sygw16r287mhwp0x9mbji")))) - (inputs `(("gcc-10", gcc-10) + (inputs `(("gcc", gcc-10) ,@(package-inputs rdma-core))) ) @@ -419,8 +419,8 @@ (sha256 (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r")))) - (inputs `(("gcc-10", gcc-10) - ("glicid-specific-rdma-core-gcc-10", glicid-specific-rdma-core-gcc-10) + (inputs `(("gcc", gcc-10) + ("rdma-core", glicid-specific-rdma-core-gcc-10) ,@(package-inputs libfabric))) ) ) @@ -437,10 +437,10 @@ (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) )) - (inputs `(("gcc-10", gcc-10) - ("gfortran-10", gfortran-10) - ("glicid-specific-libfabric-gcc-10", glicid-specific-libfabric-gcc-10) - ("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10) + (inputs `(("gcc", gcc-10) + ("gfortran", gfortran-10) + ("libfabric", glicid-specific-libfabric-gcc-10) + ("rdma-core",glicid-specific-rdma-core-gcc-10) ,@(package-inputs ucx))) ) @@ -451,9 +451,11 @@ (package (inherit glicid-openmpi-gcc-10) (name "glicid-specific-openmpi-gcc-10") - (inputs `(("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10) - ("glicid-specific-ucx-gcc-10",glicid-specific-ucx-gcc-10) - ("glicid-specific-libfabric-gcc-10",glicid-specific-libfabric-gcc-10) + (inputs `( + ("gcc",gcc-10) + ("rdma-core",glicid-specific-rdma-core-gcc-10) + ("ucx",glicid-specific-ucx-gcc-10) + ("libfabric",glicid-specific-libfabric-gcc-10) ,@(package-inputs glicid-openmpi-gcc-10))) ) ) @@ -462,7 +464,7 @@ (package (inherit glicid-intel-mpi-benchmarks) (name "glicid-specific-intel-mpi-benchmarks") - (inputs `(("glicid-specific-openmpi-gcc-10", glicid-specific-openmpi-gcc-10) + (inputs `(("openmpi", glicid-specific-openmpi-gcc-10) ,@(package-inputs glicid-intel-mpi-benchmarks))) ) ) From 67406156c680f62b2c694e76ea0b6820e93375f9 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 17:17:54 +0200 Subject: [PATCH 078/200] try 26.2 --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 9452152..dccc21d 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -390,7 +390,7 @@ (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-10") - (version "31.0") + (version "26.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -398,7 +398,7 @@ version ".tar.gz")) (sha256 (base32 - "02ym93k6khfmzm9rml79x9zh1dy8231sygw16r287mhwp0x9mbji")))) + "1ilns8spik1xz2n668pf0awp4n7b3q7n886ml0q3bslb8fmqfl0i")))) (inputs `(("gcc", gcc-10) ,@(package-inputs rdma-core))) From bf4d29b3caae4aa3744e5139f2600a97d14504b7 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 17:28:13 +0200 Subject: [PATCH 079/200] no libfabric upgrade --- gnu/packages/glicid.scm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index dccc21d..a67262c 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -405,25 +405,25 @@ ) ) -(define-public glicid-specific-libfabric-gcc-10 -(package - (inherit libfabric) - (name "glicid-specific-libfabric-gcc-10") - (version "1.11.0") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ofiwg/libfabric/releases/download/v" - version "/libfabric-" version ".tar.bz2")) - (sha256 - (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r")))) - - (inputs `(("gcc", gcc-10) - ("rdma-core", glicid-specific-rdma-core-gcc-10) - ,@(package-inputs libfabric))) - ) -) +;(define-public glicid-specific-libfabric-gcc-10 +;(package +; (inherit libfabric) +; (name "glicid-specific-libfabric-gcc-10") +; (version "1.11.0") +; (source +; (origin +; (method url-fetch) +; (uri +; (string-append "https://github.com/ofiwg/libfabric/releases/download/v" +; version "/libfabric-" version ".tar.bz2")) +; (sha256 +; (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r")))) +; +; (inputs `(("gcc", gcc-10) +; ("rdma-core", glicid-specific-rdma-core-gcc-10) +; ,@(package-inputs libfabric))) +; ) +;) (define-public glicid-specific-ucx-gcc-10 (package @@ -439,7 +439,7 @@ (inputs `(("gcc", gcc-10) ("gfortran", gfortran-10) - ("libfabric", glicid-specific-libfabric-gcc-10) +;; ("libfabric", glicid-specific-libfabric-gcc-10) ("rdma-core",glicid-specific-rdma-core-gcc-10) ,@(package-inputs ucx))) From c153ef02361e460f8f288cbe2d999824b35f1a94 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 17:33:00 +0200 Subject: [PATCH 080/200] no specific fabric --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index a67262c..94d3c97 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -455,7 +455,7 @@ ("gcc",gcc-10) ("rdma-core",glicid-specific-rdma-core-gcc-10) ("ucx",glicid-specific-ucx-gcc-10) - ("libfabric",glicid-specific-libfabric-gcc-10) +;; ("libfabric",glicid-specific-libfabric-gcc-10) ,@(package-inputs glicid-openmpi-gcc-10))) ) ) From 88fa768ecaee83fabf1865b3bfc7a0898ff92d06 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 17:56:38 +0200 Subject: [PATCH 081/200] test 27.1 --- gnu/packages/glicid.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 94d3c97..df6d21e 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -386,11 +386,13 @@ )) +;;26.2 is ok : "1ilns8spik1xz2n668pf0awp4n7b3q7n886ml0q3bslb8fmqfl0i" + (define-public glicid-specific-rdma-core-gcc-10 (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-10") - (version "26.2") + (version "27.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -398,7 +400,7 @@ version ".tar.gz")) (sha256 (base32 - "1ilns8spik1xz2n668pf0awp4n7b3q7n886ml0q3bslb8fmqfl0i")))) + "1mqaxzsbhm7kh20dwdrapvx4x86wkbk1wgb2yyjz73l6bymv7vir")))) (inputs `(("gcc", gcc-10) ,@(package-inputs rdma-core))) From 8eb1feebb63555ce35df330a7f658ece596d1ed2 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 19:03:39 +0200 Subject: [PATCH 082/200] try 28.1 --- gnu/packages/glicid.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index df6d21e..bc0b95d 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -387,12 +387,12 @@ ;;26.2 is ok : "1ilns8spik1xz2n668pf0awp4n7b3q7n886ml0q3bslb8fmqfl0i" - +;;27.1 is ok : "1mqaxzsbhm7kh20dwdrapvx4x86wkbk1wgb2yyjz73l6bymv7vir" (define-public glicid-specific-rdma-core-gcc-10 (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-10") - (version "27.1") + (version "28.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -400,7 +400,7 @@ version ".tar.gz")) (sha256 (base32 - "1mqaxzsbhm7kh20dwdrapvx4x86wkbk1wgb2yyjz73l6bymv7vir")))) + "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr")))) (inputs `(("gcc", gcc-10) ,@(package-inputs rdma-core))) From b0e0077943e93a47ab549c7318e4845e290f2046 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 19:28:40 +0200 Subject: [PATCH 083/200] test 30.0 --- gnu/packages/glicid.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index bc0b95d..558ae09 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -388,11 +388,13 @@ ;;26.2 is ok : "1ilns8spik1xz2n668pf0awp4n7b3q7n886ml0q3bslb8fmqfl0i" ;;27.1 is ok : "1mqaxzsbhm7kh20dwdrapvx4x86wkbk1wgb2yyjz73l6bymv7vir" +;;28.1 is ok : "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr" + (define-public glicid-specific-rdma-core-gcc-10 (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-10") - (version "28.1") + (version "30.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -400,7 +402,7 @@ version ".tar.gz")) (sha256 (base32 - "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr")))) + "1ycvd8sp3giwjbp0x3nvb8q2wrdc50s7lmzf44b9l51qgcnvvq93")))) (inputs `(("gcc", gcc-10) ,@(package-inputs rdma-core))) From c8e3707ed91dc938b4c0fd9d17e74842872ed4bf Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 20:23:11 +0200 Subject: [PATCH 084/200] back to 28.1 --- gnu/packages/glicid.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 558ae09..f78815a 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -389,12 +389,13 @@ ;;26.2 is ok : "1ilns8spik1xz2n668pf0awp4n7b3q7n886ml0q3bslb8fmqfl0i" ;;27.1 is ok : "1mqaxzsbhm7kh20dwdrapvx4x86wkbk1wgb2yyjz73l6bymv7vir" ;;28.1 is ok : "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr" +;; 30.0 crash : "1ycvd8sp3giwjbp0x3nvb8q2wrdc50s7lmzf44b9l51qgcnvvq93" (define-public glicid-specific-rdma-core-gcc-10 (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-10") - (version "30.0") + (version "28.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -402,7 +403,7 @@ version ".tar.gz")) (sha256 (base32 - "1ycvd8sp3giwjbp0x3nvb8q2wrdc50s7lmzf44b9l51qgcnvvq93")))) + "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr")))) (inputs `(("gcc", gcc-10) ,@(package-inputs rdma-core))) From 40412fde272e624aaab2fb8800e25c78213ade6a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Sep 2020 20:36:26 +0200 Subject: [PATCH 085/200] re-enter libfabric --- gnu/packages/glicid.scm | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index f78815a..3d496b7 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -410,25 +410,25 @@ ) ) -;(define-public glicid-specific-libfabric-gcc-10 -;(package -; (inherit libfabric) -; (name "glicid-specific-libfabric-gcc-10") -; (version "1.11.0") -; (source -; (origin -; (method url-fetch) -; (uri -; (string-append "https://github.com/ofiwg/libfabric/releases/download/v" -; version "/libfabric-" version ".tar.bz2")) -; (sha256 -; (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r")))) -; -; (inputs `(("gcc", gcc-10) -; ("rdma-core", glicid-specific-rdma-core-gcc-10) -; ,@(package-inputs libfabric))) -; ) -;) +(define-public glicid-specific-libfabric-gcc-10 +(package + (inherit libfabric) + (name "glicid-specific-libfabric-gcc-10") + (version "1.11.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r")))) + + (inputs `(("gcc", gcc-10) + ("rdma-core", glicid-specific-rdma-core-gcc-10) + ,@(package-inputs libfabric))) + ) +) (define-public glicid-specific-ucx-gcc-10 (package @@ -444,7 +444,7 @@ (inputs `(("gcc", gcc-10) ("gfortran", gfortran-10) -;; ("libfabric", glicid-specific-libfabric-gcc-10) + ("libfabric", glicid-specific-libfabric-gcc-10) ("rdma-core",glicid-specific-rdma-core-gcc-10) ,@(package-inputs ucx))) @@ -460,7 +460,7 @@ ("gcc",gcc-10) ("rdma-core",glicid-specific-rdma-core-gcc-10) ("ucx",glicid-specific-ucx-gcc-10) -;; ("libfabric",glicid-specific-libfabric-gcc-10) + ("libfabric",glicid-specific-libfabric-gcc-10) ,@(package-inputs glicid-openmpi-gcc-10))) ) ) From 7e9eac346c66bda147077f1a90b1102ebc10bf9c Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 24 Sep 2020 18:27:35 +0200 Subject: [PATCH 086/200] bump guix version --- gnu/packages/glicid.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3d496b7..a391901 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -63,18 +63,16 @@ )) )) -;; (define-public glicid-custom-slurm glicid-custom-slurm-19.05) - (define-public glicid-custom-slurm-20.02 (package (inherit glicid-custom-slurm-19.05) (name "glicid-custom-slurm-20.02") - (version "20.02.2") + (version "20.02.5") (source (origin (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "0bna1kyqphw6v7ca3gyfb3nlcpclc9vx8py55w7l7sv8xxsqrrvy")) + (sha256 (base32 "08qp60rxsny6fcx58xim88avx7f7h7q1vpq3lfw6nlha04r7lan3")) )) )) From 63bde1d4b69662fbf0c1b78b659eb62f923b339b Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 24 Sep 2020 18:57:18 +0200 Subject: [PATCH 087/200] slurm : needs ssd in propagated-inputs ? --- gnu/packages/glicid.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index a391901..7279442 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -58,9 +58,15 @@ (sha256 (base32 "1kj79r8hng5gp98ickgvj3im4gr19nzd3p3p8g6rl75axb8jin7h")) )) (inputs `(("gtk+-2" ,gtk+-2) - ("sssd", sssd) ,@(package-inputs slurm) - )) + + + )) + (propagated-inputs + `( + ("sssd" ,sssd) + )) + )) (define-public glicid-custom-slurm-20.02 From 67e6ce353dd7ac574661cc2b26bc2c41888d7d19 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 24 Sep 2020 23:32:49 +0200 Subject: [PATCH 088/200] missing gnutls ? --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 7279442..cece54f 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -386,6 +386,7 @@ `( ("glib-networking" ,glib-networking) ("libsoup" ,libsoup) + ("gnutls" , gnutls) )) )) From 2e9b8788842821b3f3334b805821346905226600 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 2 Oct 2020 20:59:52 +0200 Subject: [PATCH 089/200] add specific pmix --- gnu/packages/glicid.scm | 57 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index cece54f..d3c710a 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -44,6 +44,39 @@ #:use-module (gnu packages web) #:use-module (gnu packages gnome)) +(define-public glicid-pmix + (package + (name "glicid-pmix-3.1.5") + (version "3.1.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openpmix/openpmix/releases/download/v" version "/pmix-" version ".tar.bz2")) + (sha256 (base32 "1xswdkfcrw123ghcr9gmrb852nzjbl4i6qwrid3xyma42yal34w8")) + ) + ) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc") ) + ) + ) + ) + (synopsis "MPIX lib") + (description "MPIX. More to come. FIXIT") + (home-page "https://www.gnu.org/software/hello/") + (license gpl3+) + (inputs `( + ("libevent", libevent) + ("hwloc" ,hwloc-2 "lib") + ("perl", perl) + ("gcc", gcc-10) + ) + ) + ) +) + (define-public glicid-custom-slurm-19.05 @@ -57,8 +90,28 @@ (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) (sha256 (base32 "1kj79r8hng5gp98ickgvj3im4gr19nzd3p3p8g6rl75axb8jin7h")) )) + (arguments + `(#:configure-flags + (list "--enable-pam" "--sysconfdir=/etc/slurm" + "--disable-static" + (string-append "--with-freeipmi=" (assoc-ref %build-inputs "freeipmi")) + (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc")) + (string-append "--with-json=" (assoc-ref %build-inputs "json-c")) + (string-append "--with-munge=" (assoc-ref %build-inputs "munge")) + (string-append "--with-pmix=" (assoc-ref %build-inputs "glicid-pmix")) + + ;; 32-bit support is marked as deprecated and needs to be + ;; explicitly enabled. + ;;;; ,@(if (target-64bit?) '() '("--enable-deprecated")) + + ) + ) + ) + (inputs `(("gtk+-2" ,gtk+-2) - ,@(package-inputs slurm) + ("gcc", gcc-10) + ("glicid-pmix", glicid-pmix) + ,@(package-inputs slurm) )) @@ -69,6 +122,7 @@ )) + (define-public glicid-custom-slurm-20.02 (package (inherit glicid-custom-slurm-19.05) @@ -395,6 +449,7 @@ ;;27.1 is ok : "1mqaxzsbhm7kh20dwdrapvx4x86wkbk1wgb2yyjz73l6bymv7vir" ;;28.1 is ok : "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr" ;; 30.0 crash : "1ycvd8sp3giwjbp0x3nvb8q2wrdc50s7lmzf44b9l51qgcnvvq93" +;; 31.0 crash : (define-public glicid-specific-rdma-core-gcc-10 (package From 6a517f52839e6cff6ee12c401bc12c36e55d513a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 2 Oct 2020 21:14:57 +0200 Subject: [PATCH 090/200] missing use package --- gnu/packages/glicid.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index d3c710a..df40cfa 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -42,7 +42,8 @@ #:use-module (gnu packages benchmark) #:use-module (gnu packages messaging) #:use-module (gnu packages web) - #:use-module (gnu packages gnome)) + #:use-module (gnu packages gnome) + #:use-module (gnu packages libevent)) (define-public glicid-pmix (package From e7e57a48cd7f10e28432389ace4bed38ea406c32 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 2 Nov 2020 18:30:15 +0100 Subject: [PATCH 091/200] bump versions --- gnu/packages/glicid.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index df40cfa..17db36b 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -301,7 +301,7 @@ (package (inherit rdma-core) (name "glicid-rdma-core-gcc-10") - (version "31.0") + (version "32.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -309,7 +309,7 @@ version ".tar.gz")) (sha256 (base32 - "02ym93k6khfmzm9rml79x9zh1dy8231sygw16r287mhwp0x9mbji")))) + "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1")))) (inputs `(("gcc-10", gcc-10) ,@(package-inputs rdma-core))) ) @@ -319,7 +319,7 @@ (package (inherit libfabric) (name "glicid-libfabric-gcc-10") - (version "1.11.0") + (version "1.11.1") (source (origin (method url-fetch) @@ -327,7 +327,7 @@ (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (sha256 - (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r")))) + (base32 "1rqz25wvhsnsd6iqz70yga2aak02wfnvqcxgy6gd1gi2cfn7sam7")))) (inputs `(("gcc-10", gcc-10) ,@(package-inputs libfabric))) @@ -451,12 +451,13 @@ ;;28.1 is ok : "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr" ;; 30.0 crash : "1ycvd8sp3giwjbp0x3nvb8q2wrdc50s7lmzf44b9l51qgcnvvq93" ;; 31.0 crash : +;; 32.0 : "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1" (define-public glicid-specific-rdma-core-gcc-10 (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-10") - (version "28.1") + (version "32.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -464,7 +465,7 @@ version ".tar.gz")) (sha256 (base32 - "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr")))) + "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1")))) (inputs `(("gcc", gcc-10) ,@(package-inputs rdma-core))) @@ -475,7 +476,7 @@ (package (inherit libfabric) (name "glicid-specific-libfabric-gcc-10") - (version "1.11.0") + (version "1.11.1") (source (origin (method url-fetch) @@ -483,7 +484,7 @@ (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (sha256 - (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r")))) + (base32 "1rqz25wvhsnsd6iqz70yga2aak02wfnvqcxgy6gd1gi2cfn7sam7")))) (inputs `(("gcc", gcc-10) ("rdma-core", glicid-specific-rdma-core-gcc-10) From 2502b9f0fa8abcd64f8e383bd4f0f4f6e63eb9ed Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 2 Nov 2020 18:59:33 +0100 Subject: [PATCH 092/200] back to 28.1 --- gnu/packages/glicid.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 17db36b..39683b5 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -451,13 +451,13 @@ ;;28.1 is ok : "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr" ;; 30.0 crash : "1ycvd8sp3giwjbp0x3nvb8q2wrdc50s7lmzf44b9l51qgcnvvq93" ;; 31.0 crash : -;; 32.0 : "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1" +;; 32.0 crash : "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1" (define-public glicid-specific-rdma-core-gcc-10 (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-10") - (version "32.0") + (version "28.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -465,7 +465,7 @@ version ".tar.gz")) (sha256 (base32 - "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1")))) + "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr")))) (inputs `(("gcc", gcc-10) ,@(package-inputs rdma-core))) From 9bf3718c3817932177d9575e4421c47d8752feaa Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 13 Nov 2020 11:33:59 +0100 Subject: [PATCH 093/200] ajout glicid-keepalived --- gnu/packages/glicid.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 39683b5..f2b4c66 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages messaging) #:use-module (gnu packages web) #:use-module (gnu packages gnome) + #:use-module (gnu packages cluster) #:use-module (gnu packages libevent)) (define-public glicid-pmix @@ -537,6 +538,40 @@ ) +(define-public glicid-keepalived + (package + (inherit keepalived) + (name "glicid-keepalived") + (version "2.1.5") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.keepalived.org/software/keepalived-" + version ".tar.gz")) + + (sha256 + (base32 + "0n92fdlmm251scq2j7w1nqwly8jsla4sxrd0jnfb6nn9qp5pqkfr")))) + + (arguments + `(#:configure-flags + (list (string-append "--enable-snmp") + (string-append "--enable-snmp-checker") + (string-append "--enable-snmp-rfc") + ) + ) + + ) + + + (inputs `(("net-snmp", net-snmp) + ,@(package-inputs keepalived))) + + + + ) +) + From 197d9c06e9c3590994e14846ab0477ff77aad9f7 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 4 Dec 2020 17:20:45 +0100 Subject: [PATCH 094/200] ajout glicid-motif + glicid-xmgrace --- gnu/packages/glicid.scm | 99 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index f2b4c66..fb5a1b9 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -572,6 +572,105 @@ ) ) +(define-public glicid-motif + (package + (name "glicid-motif") + (version "2.3.8") + (source (origin + (method url-fetch) + (uri (string-append "https://sourceforge.net/projects/motif/files/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz/download")) + + (sha256 (base32 "1rxwkrhmj8sfg7dwmkhq885valwqbh26d79033q7vb7fcqv756w5")) + ) + ) + (build-system gnu-build-system) + +(arguments + `(#:make-flags +;; #:make-flags + (list (string-append "PREFIX=" %output) +; (string-append "CC=" ,(cc-for-target)) + ;; Xft.h #includes without ‘freetype2/’. The Makefile + ;; works around this by hard-coding /usr/include & $PREFIX. + (string-append "CPPFLAGS=-I" + (assoc-ref %build-inputs "freetype") + "/include/freetype2") + "V=1") + ) +) + +(inputs + `(("libxext" ,libxext) + ("libx11", libx11) + ("freetype",freetype) + ("libxft",libxft) + ("xbitmaps",xbitmaps) + ("pkg-config" ,pkg-config) + ("flex" ,flex) + ("bison" ,bison) + ("libxt" ,libxt))) + + (synopsis "Motif") + (description "Motif ") + (home-page "https://sourceforge.net/untested") + (license " ") + + ) +) + +(define-public glicid-xmgrace + (package + (name "glicid-xmgrace") + (version "5.1.25") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://oauth2:9i-PgbC2w_JEx6DUUqzf@gitlab.univ-nantes.fr/CCIPL/legacy_code_mirror/grace.git") + (commit (string-append "v" version)))) + (sha256 (base32 "1wb8v0q8xa2akas0swpgdgw1s66i50k7kh1g2f894hnk91fzx56z")) + ) + ) + (build-system gnu-build-system) + + (arguments + `( + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-/bin/sh + (lambda _ + (substitute* '("Make.conf") + (("/bin/sh") (which "bash")) + ) + ) + ) + ) + ) + ) + + (inputs + `( + ("libx11", libx11) + ("libxft",libxft) + ("libxt",libxt) + ("libxpm",libxpm) + ("libxext" ,libxext) + ("autoconf", autoconf) + ("glicid-motif" ,glicid-motif) + ("fontconfig", fontconfig) + ("gfortran", gfortran) + ("libjpeg-turbo", libjpeg-turbo) +;; ("libxmhtml", libxmhtml) + ) + ) + + + (synopsis "Xmgrace") + (description "xmgrace") + (home-page "https://sourceforge.net/untested") + (license " ") + + ) +) From 50c9bf966350d5f764ddd8f524f61b98f02becd6 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 4 Dec 2020 17:31:48 +0100 Subject: [PATCH 095/200] modules... --- gnu/packages/glicid.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index fb5a1b9..ed2b26f 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -44,7 +44,17 @@ #:use-module (gnu packages web) #:use-module (gnu packages gnome) #:use-module (gnu packages cluster) - #:use-module (gnu packages libevent)) + #:use-module (gnu packages libevent) + #:use-modules (gnu packages xorg) + #:use-modules (gnu packages fontutils) + #:use-modules (gnu packages flex) + #:use-modules (gnu packages bison)) + #:use-modules (gnu packages pkg-config) + #:use-modules (gnu packages autotools) + #:use-modules (gnu packages fontutils) + #:use-modules (gnu packages gcc) + #:use-modules (gnu packages image)) + (define-public glicid-pmix (package From 746ce1956f76dd3951379be243c978ce9136b600 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 4 Dec 2020 21:29:14 +0100 Subject: [PATCH 096/200] gcc was redundant. --- gnu/packages/glicid.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index ed2b26f..51b19f9 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -52,7 +52,6 @@ #:use-modules (gnu packages pkg-config) #:use-modules (gnu packages autotools) #:use-modules (gnu packages fontutils) - #:use-modules (gnu packages gcc) #:use-modules (gnu packages image)) From ed73d2bf95a02852d36a74873405ba674f7af6fb Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 4 Dec 2020 21:33:49 +0100 Subject: [PATCH 097/200] too much ) --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 51b19f9..318dbc8 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -48,7 +48,7 @@ #:use-modules (gnu packages xorg) #:use-modules (gnu packages fontutils) #:use-modules (gnu packages flex) - #:use-modules (gnu packages bison)) + #:use-modules (gnu packages bison) #:use-modules (gnu packages pkg-config) #:use-modules (gnu packages autotools) #:use-modules (gnu packages fontutils) From a19a364a861b795d5a1e0df495e9e5be0392dd26 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 4 Dec 2020 21:37:30 +0100 Subject: [PATCH 098/200] typos ! --- gnu/packages/glicid.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 318dbc8..5a1205c 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -45,14 +45,14 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages cluster) #:use-module (gnu packages libevent) - #:use-modules (gnu packages xorg) - #:use-modules (gnu packages fontutils) - #:use-modules (gnu packages flex) - #:use-modules (gnu packages bison) - #:use-modules (gnu packages pkg-config) - #:use-modules (gnu packages autotools) - #:use-modules (gnu packages fontutils) - #:use-modules (gnu packages image)) + #:use-module (gnu packages xorg) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages flex) + #:use-module (gnu packages bison) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages autotools) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages image)) (define-public glicid-pmix From dd7addf8e36fd68105c2909cb093c916e3e6bf99 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Jan 2021 17:54:10 +0100 Subject: [PATCH 099/200] bump version --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 5a1205c..6a8eaa6 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -138,12 +138,12 @@ (package (inherit glicid-custom-slurm-19.05) (name "glicid-custom-slurm-20.02") - (version "20.02.5") + (version "20.02.6") (source (origin (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "08qp60rxsny6fcx58xim88avx7f7h7q1vpq3lfw6nlha04r7lan3")) + (sha256 (base32 "0ji76jgyny6jqdsi4nj9wmk0ny539aq4vvhp2jx99mwwdzpcv701")) )) )) From 22bead6ac3b74be9e5bb454959a91945f9901c1d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Jan 2021 18:06:27 +0100 Subject: [PATCH 100/200] new 20.11 slurm version --- gnu/packages/glicid.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 6a8eaa6..fec982a 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -148,6 +148,20 @@ )) +(define-public glicid-custom-slurm-20.11 + (package + (inherit glicid-custom-slurm-20.02) + (name "glicid-custom-slurm-20.11") + (version "20.11.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) + (sha256 (base32 "1s70x6yh60sx63dgmp5rlhq8jcz7kxv9pk8gbs9v1jg8zps5h5bk")) + )) +)) + + (define-public glicid-librdkafka-09 From 502c6adf58df98221d47995ba93784e3fe8795cc Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Jan 2021 21:39:55 +0100 Subject: [PATCH 101/200] bump openmpi version --- gnu/packages/glicid.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index fec982a..d0c4475 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -381,12 +381,12 @@ (package (inherit openmpi) (name "glicid-openpmi-gcc-10") - (version "4.0.5") + (version "4.1.0") (source (origin (method url-fetch) - (uri (string-append "https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-" version ".tar.gz")) - (sha256 (base32 "01dxs4jrfl4x54g9vrxjp00ymf24gxp1d2hvdzqdfizx85s7fbjp")) + (uri (string-append "https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-" version ".tar.gz")) + (sha256 (base32 "02hlg2pgk1np78dqlplwd5qcgrrymy8s49ng4sdrscqmvp1ng112")) )) (inputs `(("gcc-10", gcc-10) From 8c44ad7835a2f821c4a60ed69a25e9725c022ff0 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Jan 2021 22:08:58 +0100 Subject: [PATCH 102/200] bump libfabric version --- gnu/packages/glicid.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index d0c4475..6d259ea 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -343,7 +343,7 @@ (package (inherit libfabric) (name "glicid-libfabric-gcc-10") - (version "1.11.1") + (version "1.11.2") (source (origin (method url-fetch) @@ -351,7 +351,7 @@ (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (sha256 - (base32 "1rqz25wvhsnsd6iqz70yga2aak02wfnvqcxgy6gd1gi2cfn7sam7")))) + (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz")))) (inputs `(("gcc-10", gcc-10) ,@(package-inputs libfabric))) @@ -500,7 +500,7 @@ (package (inherit libfabric) (name "glicid-specific-libfabric-gcc-10") - (version "1.11.1") + (version "1.11.2") (source (origin (method url-fetch) @@ -508,7 +508,7 @@ (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (sha256 - (base32 "1rqz25wvhsnsd6iqz70yga2aak02wfnvqcxgy6gd1gi2cfn7sam7")))) + (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz")))) (inputs `(("gcc", gcc-10) ("rdma-core", glicid-specific-rdma-core-gcc-10) From 50f3fc6f2696458dab0c07a5851d9d8e31d25851 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Jan 2021 22:31:15 +0100 Subject: [PATCH 103/200] bump rdma-core version --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 6d259ea..78d91ee 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -481,7 +481,7 @@ (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-10") - (version "28.1") + (version "33.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -489,7 +489,7 @@ version ".tar.gz")) (sha256 (base32 - "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr")))) + "0cnmw04z68x042nkqxg57wijzkf9ysmvr8xxidxhxz0mxwx9impg")))) (inputs `(("gcc", gcc-10) ,@(package-inputs rdma-core))) From 124d1bba684ba015386865ef5a0fabe26aeb880d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 26 Jan 2021 09:32:18 +0100 Subject: [PATCH 104/200] iback to 28.1 --- gnu/packages/glicid.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 78d91ee..984d5d2 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -476,12 +476,13 @@ ;; 30.0 crash : "1ycvd8sp3giwjbp0x3nvb8q2wrdc50s7lmzf44b9l51qgcnvvq93" ;; 31.0 crash : ;; 32.0 crash : "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1" +;; 33.0 crash : "0cnmw04z68x042nkqxg57wijzkf9ysmvr8xxidxhxz0mxwx9impg" (define-public glicid-specific-rdma-core-gcc-10 (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-10") - (version "33.0") + (version "28.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -489,7 +490,7 @@ version ".tar.gz")) (sha256 (base32 - "0cnmw04z68x042nkqxg57wijzkf9ysmvr8xxidxhxz0mxwx9impg")))) + "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr")))) (inputs `(("gcc", gcc-10) ,@(package-inputs rdma-core))) From acb3cc3001f63fe0dc51a5bd5f6e785e0c2caf19 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 5 Mar 2021 09:29:15 +0100 Subject: [PATCH 105/200] =?UTF-8?q?suite=20au=20commentaire=20de=20simon?= =?UTF-8?q?=20tournier,=20meilleure=20d=C3=A9finition=20de=20gcc=2010?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnu/packages/glicid.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 984d5d2..dc707c0 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -55,6 +55,14 @@ #:use-module (gnu packages image)) +(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)))) + (define-public glicid-pmix (package (name "glicid-pmix-3.1.5") From 9c10d7c3950e249fa18c9723e50d8e2b5cb0c7e3 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 5 Mar 2021 09:36:19 +0100 Subject: [PATCH 106/200] manque package gcc --- gnu/packages/glicid.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index dc707c0..28a7a45 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -52,8 +52,9 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages autotools) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gcc) #:use-module (gnu packages image)) - + (define-public gfortran-10 (hidden-package From 375b4360d8b467ef4972063336906f533e5785e0 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 5 Mar 2021 09:45:45 +0100 Subject: [PATCH 107/200] modifs pour gcc --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 28a7a45..30b25b1 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -52,7 +52,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages autotools) #:use-module (gnu packages fontutils) - #:use-module (gnu packages gcc) + #:use-module (guix build-system gnu) #:use-module (gnu packages image)) From 46082cbb9491509dae1eac1617b7d67f61a611bf Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 5 Mar 2021 10:09:14 +0100 Subject: [PATCH 108/200] =?UTF-8?q?d=C3=A9sactivation=20modifs,=20=C3=A7a?= =?UTF-8?q?=20ne=20fonctionne=20pas=20comme=20attendu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnu/packages/glicid.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 30b25b1..3ac0495 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -56,13 +56,13 @@ #:use-module (gnu packages image)) -(define-public gfortran-10 - (hidden-package - (custom-gcc gcc-10 "gfortran" '("fortran") - %generic-search-paths))) +; (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)))) +;(define-public gfortran-toolchain-10 +; (package (inherit (make-gcc-toolchain gfortran-10)))) (define-public glicid-pmix (package From c93b452c3cf2e56b8773ba85309229bf07ae434f Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sat, 10 Apr 2021 18:08:29 +0200 Subject: [PATCH 109/200] add asciidoctor-revealjs --- gnu/packages/glicid.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3ac0495..0c44c4c 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -705,6 +705,43 @@ ) ) +(use-modules (guix packages)) +(use-modules (guix download)) +(use-modules (gnu packages ruby)) +(use-modules (guix build-system ruby)) +(use-modules (guix licenses)) + + + +(define-public glicid-ruby-asciidoctor-revealjs + (package + (name "ruby-asciidoctor-revealjs") + (version "4.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "asciidoctor-revealjs" version)) + (sha256 + (base32 + "03vmbcc3x059h17ry4qwk1p0yar9wgh87l2qssi307gy45cjw2mq")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) + (propagated-inputs + `(("ruby-asciidoctor" ,ruby-asciidoctor) +; ("ruby-concurrent-ruby" ,ruby-concurrent-ruby) + ("ruby-concurrent" ,ruby-concurrent) + ("ruby-thread-safe" ,ruby-thread-safe))) + (synopsis + "Converts AsciiDoc documents into HTML5 presentations designed to be executed by the reveal.js presentation framework.") + (description + "Converts AsciiDoc documents into HTML5 presentations designed to be executed by the reveal.js presentation framework.") + (home-page + "https://github.com/asciidoctor/asciidoctor-reveal.js") + (license license:expat)) +) + + ;;; glicid.scm ends here From 1b3bc0659e512cb89c642a3ad7d9ad96de6dae79 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 18 Apr 2021 16:57:15 +0200 Subject: [PATCH 110/200] nom --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 0c44c4c..eab0598 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -713,7 +713,7 @@ -(define-public glicid-ruby-asciidoctor-revealjs +(define-public ruby-asciidoctor-revealjs (package (name "ruby-asciidoctor-revealjs") (version "4.1.0") From 0060e237e175f7c25fd2de64bbe4c980b1e7de11 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 18 Apr 2021 17:22:46 +0200 Subject: [PATCH 111/200] new package asciidoctor-kroki --- gnu/packages/glicid.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index eab0598..b4f318e 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -741,7 +741,31 @@ (license license:expat)) ) - +(define-public ruby-asciidoctor-kroki +(package + (name "ruby-asciidoctor-kroki") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "asciidoctor-kroki" version)) + (sha256 + (base32 + "13gx22xld4rbxxirnsxyrsajy9v666r8a4ngms71611af5afgk6w")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) + (propagated-inputs + `(("ruby-asciidoctor" ,ruby-asciidoctor))) + (synopsis + "An extension for Asciidoctor to convert diagrams to images using https://kroki.io") + (description + "An extension for Asciidoctor to convert diagrams to images using https://kroki.io") + (home-page + "https://github.com/Mogztter/asciidoctor-kroki") + (license license:expat) +) +) ;;; glicid.scm ends here From ab36949111b849df91cc739637e7f6ba24d7037e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 19 Apr 2021 12:40:39 +0200 Subject: [PATCH 112/200] =?UTF-8?q?ajout=20asciidoctor-kroki=20en=20d?= =?UTF-8?q?=C3=A9pendance=20de=20asciidotor-reveal.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index b4f318e..2bf0a37 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -731,6 +731,7 @@ `(("ruby-asciidoctor" ,ruby-asciidoctor) ; ("ruby-concurrent-ruby" ,ruby-concurrent-ruby) ("ruby-concurrent" ,ruby-concurrent) + ("ruby-asciidoctor-kroki", ruby-asciidoctor-kroki) ("ruby-thread-safe" ,ruby-thread-safe))) (synopsis "Converts AsciiDoc documents into HTML5 presentations designed to be executed by the reveal.js presentation framework.") From 19da8ec628c270248aafca9e26444eb0dfeb376e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 30 Apr 2021 09:38:39 +0200 Subject: [PATCH 113/200] bump gcc from 10 to 11 --- gnu/packages/glicid.scm | 92 ++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 2bf0a37..1474157 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -91,7 +91,7 @@ ("libevent", libevent) ("hwloc" ,hwloc-2 "lib") ("perl", perl) - ("gcc", gcc-10) + ("gcc", gcc-11) ) ) ) @@ -129,7 +129,7 @@ ) (inputs `(("gtk+-2" ,gtk+-2) - ("gcc", gcc-10) + ("gcc", gcc-11) ("glicid-pmix", glicid-pmix) ,@(package-inputs slurm) @@ -308,7 +308,7 @@ ; (inherit openmpi) ; (name "glicid-openpmi-gcc-10") ; (inputs `(("gcc-10", gcc-10) -; ("gfortran-10", gfortran-10) +; ("gfortan-11", gfortan-11) ; ,@(package-inputs openmpi))) ; ) ;) @@ -330,10 +330,10 @@ ) -(define-public glicid-rdma-core-gcc-10 +(define-public glicid-rdma-core-gcc-11 (package (inherit rdma-core) - (name "glicid-rdma-core-gcc-10") + (name "glicid-rdma-core-gcc-11") (version "32.0") (source (origin (method url-fetch) @@ -343,15 +343,15 @@ (sha256 (base32 "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1")))) - (inputs `(("gcc-10", gcc-10) + (inputs `(("gcc-11", gcc-11) ,@(package-inputs rdma-core))) ) ) -(define-public glicid-libfabric-gcc-10 +(define-public glicid-libfabric-gcc-11 (package (inherit libfabric) - (name "glicid-libfabric-gcc-10") + (name "glicid-libfabric-gcc-11") (version "1.11.2") (source (origin @@ -362,16 +362,16 @@ (sha256 (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz")))) - (inputs `(("gcc-10", gcc-10) + (inputs `(("gcc-11", gcc-11) ,@(package-inputs libfabric))) ) ) -(define-public glicid-ucx-gcc-10 +(define-public glicid-ucx-gcc-11 (package (inherit ucx) - (name "glicid-ucx-gcc-10") + (name "glicid-ucx-gcc-11") (version "1.9.0") (source (origin @@ -380,16 +380,16 @@ (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) )) - (inputs `(("gcc-10", gcc-10) - ("gfortran-10", gfortran-10) + (inputs `(("gcc-11", gcc-11) + ("gfortan-11", gfortan-11) ,@(package-inputs ucx))) ) ) -(define-public glicid-openmpi-gcc-10 +(define-public glicid-openmpi-gcc-11 (package (inherit openmpi) - (name "glicid-openpmi-gcc-10") + (name "glicid-openpmi-gcc-11") (version "4.1.0") (source (origin @@ -398,9 +398,9 @@ (sha256 (base32 "02hlg2pgk1np78dqlplwd5qcgrrymy8s49ng4sdrscqmvp1ng112")) )) - (inputs `(("gcc-10", gcc-10) - ("gfortran-10", gfortran-10) - ("glicid-ucx-gcc-10",glicid-ucx-gcc-10) + (inputs `(("gcc-11", gcc-11) + ("gfortan-11", gfortan-11) + ("glicid-ucx-gcc-11",glicid-ucx-gcc-11) ;; ("glicid-rdma-core",glicid-rdma-core) ;;; segfault !!! ,@(package-inputs openmpi))) ) @@ -410,7 +410,7 @@ (package (inherit intel-mpi-benchmarks/openmpi) (name "glicid-intel-mpi-benchmarks") - (inputs `(("glicid-openmpi-gcc-10", glicid-openmpi-gcc-10) + (inputs `(("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) ,@(package-inputs intel-mpi-benchmarks/openmpi))) ) ) @@ -418,10 +418,10 @@ -(define-public glicid-gromacs-gcc-10 +(define-public glicid-gromacs-gcc-11 (package (inherit gromacs) - (name "glicid-gromacs-gcc-10") + (name "glicid-gromacs-gcc-11") (version "2020.3") (source (origin @@ -430,9 +430,9 @@ (sha256 (base32 "1acjrhcfzpqy2dncblhj97602jbg9gdha4q1bgji9nrj25lq6cch")) )) - (inputs `(("gcc-10", gcc-10) - ("gfortran-10", gfortran-10) - ("glicid-openmpi-gcc-10", glicid-openmpi-gcc-10) + (inputs `(("gcc-11", gcc-11) + ("gfortan-11", gfortan-11) + ("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) ,@(package-inputs gromacs))) )) @@ -487,10 +487,10 @@ ;; 32.0 crash : "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1" ;; 33.0 crash : "0cnmw04z68x042nkqxg57wijzkf9ysmvr8xxidxhxz0mxwx9impg" -(define-public glicid-specific-rdma-core-gcc-10 +(define-public glicid-specific-rdma-core-gcc-11 (package (inherit rdma-core) - (name "glicid-specific-rdma-core-gcc-10") + (name "glicid-specific-rdma-core-gcc-11") (version "28.1") (source (origin (method url-fetch) @@ -500,16 +500,16 @@ (sha256 (base32 "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr")))) - (inputs `(("gcc", gcc-10) + (inputs `(("gcc", gcc-11) ,@(package-inputs rdma-core))) ) ) -(define-public glicid-specific-libfabric-gcc-10 +(define-public glicid-specific-libfabric-gcc-11 (package (inherit libfabric) - (name "glicid-specific-libfabric-gcc-10") + (name "glicid-specific-libfabric-gcc-11") (version "1.11.2") (source (origin @@ -520,16 +520,16 @@ (sha256 (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz")))) - (inputs `(("gcc", gcc-10) - ("rdma-core", glicid-specific-rdma-core-gcc-10) + (inputs `(("gcc", gcc-11) + ("rdma-core", glicid-specific-rdma-core-gcc-11) ,@(package-inputs libfabric))) ) ) -(define-public glicid-specific-ucx-gcc-10 +(define-public glicid-specific-ucx-gcc-11 (package (inherit ucx) - (name "glicid-specific-ucx-gcc-10") + (name "glicid-specific-ucx-gcc-11") (version "1.9.0") (source (origin @@ -538,26 +538,26 @@ (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) )) - (inputs `(("gcc", gcc-10) - ("gfortran", gfortran-10) - ("libfabric", glicid-specific-libfabric-gcc-10) - ("rdma-core",glicid-specific-rdma-core-gcc-10) + (inputs `(("gcc", gcc-11) + ("gfortran", gfortan-11) + ("libfabric", glicid-specific-libfabric-gcc-11) + ("rdma-core",glicid-specific-rdma-core-gcc-11) ,@(package-inputs ucx))) ) ) -(define-public glicid-specific-openmpi-gcc-10 +(define-public glicid-specific-openmpi-gcc-11 (package - (inherit glicid-openmpi-gcc-10) - (name "glicid-specific-openmpi-gcc-10") + (inherit glicid-openmpi-gcc-11) + (name "glicid-specific-openmpi-gcc-11") (inputs `( - ("gcc",gcc-10) - ("rdma-core",glicid-specific-rdma-core-gcc-10) - ("ucx",glicid-specific-ucx-gcc-10) - ("libfabric",glicid-specific-libfabric-gcc-10) - ,@(package-inputs glicid-openmpi-gcc-10))) + ("gcc",gcc-11) + ("rdma-core",glicid-specific-rdma-core-gcc-11) + ("ucx",glicid-specific-ucx-gcc-11) + ("libfabric",glicid-specific-libfabric-gcc-11) + ,@(package-inputs glicid-openmpi-gcc-11))) ) ) @@ -565,7 +565,7 @@ (package (inherit glicid-intel-mpi-benchmarks) (name "glicid-specific-intel-mpi-benchmarks") - (inputs `(("openmpi", glicid-specific-openmpi-gcc-10) + (inputs `(("openmpi", glicid-specific-openmpi-gcc-11) ,@(package-inputs glicid-intel-mpi-benchmarks))) ) ) From e6b80db09a9ba1a5fda6b1909a26aae19026c62f Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 30 Apr 2021 23:36:08 +0200 Subject: [PATCH 114/200] test gfortran 11 --- gnu/packages/glicid.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 1474157..1f10a72 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -54,7 +54,13 @@ #:use-module (gnu packages fontutils) #:use-module (guix build-system gnu) #:use-module (gnu packages image)) - + + +(define-public gfortran-11 + (hidden-package + (custom-gcc gcc-11 "gfortran" '("fortran") + %generic-search-paths))) + ; (define-public gfortran-10 ; (hidden-package From 4091cdc9794cc795a7f654357d34adf088c16a82 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 30 Apr 2021 23:50:56 +0200 Subject: [PATCH 115/200] test --- gnu/packages/glicid.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 1f10a72..0630f00 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -53,7 +53,8 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages fontutils) #:use-module (guix build-system gnu) - #:use-module (gnu packages image)) + #:use-module (gnu packages image) + #:use-module ((gnu packages gcc) #:select (custom-gcc)) (define-public gfortran-11 From 80e3dc57d01477993bbffc433e35d5a139687edc Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 14:42:18 +0200 Subject: [PATCH 116/200] missing ) --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 0630f00..b468d21 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -6,7 +6,7 @@ #:use-module (guix build-system cmake) #:use-module (guix licenses) #:use-module (gnu packages gawk) - #:use-module (gnu packages gcc) +; #:use-module (gnu packages gcc) #:use-module (gnu packages commencement) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) @@ -54,7 +54,7 @@ #:use-module (gnu packages fontutils) #:use-module (guix build-system gnu) #:use-module (gnu packages image) - #:use-module ((gnu packages gcc) #:select (custom-gcc)) + #:use-module ((gnu packages gcc) #:select(custom-gcc)) ) (define-public gfortran-11 From f1694a72fc659111d18d7eb9d31199f291b222f4 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 14:56:33 +0200 Subject: [PATCH 117/200] tests. --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index b468d21..1d305dd 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -6,7 +6,7 @@ #:use-module (guix build-system cmake) #:use-module (guix licenses) #:use-module (gnu packages gawk) -; #:use-module (gnu packages gcc) + #:use-module (gnu packages gcc) #:use-module (gnu packages commencement) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) @@ -54,7 +54,7 @@ #:use-module (gnu packages fontutils) #:use-module (guix build-system gnu) #:use-module (gnu packages image) - #:use-module ((gnu packages gcc) #:select(custom-gcc)) ) +; #:use-module ((gnu packages gcc) #:select(custom-gcc)) ) (define-public gfortran-11 From 4b8288b7e23a5279cfd5520065b4cf543e658e17 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 14:58:52 +0200 Subject: [PATCH 118/200] test --- gnu/packages/glicid.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 1d305dd..437cde9 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -54,7 +54,8 @@ #:use-module (gnu packages fontutils) #:use-module (guix build-system gnu) #:use-module (gnu packages image) -; #:use-module ((gnu packages gcc) #:select(custom-gcc)) ) +; #:use-module ((gnu packages gcc) #:select(custom-gcc)) +) (define-public gfortran-11 From 98f234d557dc5193be8861c2b12f8564efb9b8da Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 15:03:24 +0200 Subject: [PATCH 119/200] embed custom-gcc --- gnu/packages/glicid.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 437cde9..0eb1de7 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -58,6 +58,43 @@ ) +(define* (custom-gcc gcc name languages + #:optional + (search-paths (package-native-search-paths gcc)) + #:key (separate-lib-output? #t)) + "Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PATHS +as the 'native-search-paths' field." + (package (inherit gcc) + (name name) + (outputs (if separate-lib-output? + (package-outputs gcc) + (delete "lib" (package-outputs gcc)))) + (native-search-paths search-paths) + (properties (alist-delete 'hidden? (package-properties gcc))) + (arguments + (substitute-keyword-arguments (package-arguments gcc) + ((#:modules modules %gnu-build-system-modules) + `(,@modules + (srfi srfi-1) + (srfi srfi-26) + (ice-9 regex))) + ((#:configure-flags flags) + `(cons (string-append "--enable-languages=" + ,(string-join languages ",")) + (remove (cut string-match "--enable-languages.*" <>) + ,flags))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'remove-broken-or-conflicting-files + (lambda* (#:key outputs #:allow-other-keys) + (for-each delete-file + (find-files (string-append (assoc-ref outputs "out") "/bin") + ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) + #t)))))))) + + + + (define-public gfortran-11 (hidden-package (custom-gcc gcc-11 "gfortran" '("fortran") From 6befdb7d137948045c5691c03e46b122fa73be60 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 15:12:07 +0200 Subject: [PATCH 120/200] more from gcc.scm --- gnu/packages/glicid.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 0eb1de7..45222bf 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -92,6 +92,17 @@ as the 'native-search-paths' field." ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) #t)))))))) +(define %generic-search-paths + ;; This is the language-neutral search path for GCC. Entries in $CPATH are + ;; not considered "system headers", which means GCC can raise warnings for + ;; issues in those headers. 'CPATH' is the only one that works for + ;; front-ends not in the C family. + (list (search-path-specification + (variable "CPATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) From 12082959247ee6ff5bec811eaa9f7d465f20a24e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 20:57:27 +0200 Subject: [PATCH 121/200] test --- gnu/packages/glicid.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 45222bf..eb6e828 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -106,10 +106,10 @@ as the 'native-search-paths' field." -(define-public gfortran-11 - (hidden-package - (custom-gcc gcc-11 "gfortran" '("fortran") - %generic-search-paths))) +; (define-public gfortran-11 +; (hidden-package +; (custom-gcc gcc-11 "gfortran" '("fortran") +; %generic-search-paths))) ; (define-public gfortran-10 From f9e0da44f9d8fed3520622ae69150eae5c0a90f8 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 21:15:30 +0200 Subject: [PATCH 122/200] typo --- gnu/packages/glicid.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index eb6e828..148947b 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -364,7 +364,7 @@ as the 'native-search-paths' field." ; (inherit openmpi) ; (name "glicid-openpmi-gcc-10") ; (inputs `(("gcc-10", gcc-10) -; ("gfortan-11", gfortan-11) +; ("gfortran-11", gfortran-11) ; ,@(package-inputs openmpi))) ; ) ;) @@ -437,7 +437,7 @@ as the 'native-search-paths' field." )) (inputs `(("gcc-11", gcc-11) - ("gfortan-11", gfortan-11) + ("gfortran-11", gfortran-11) ,@(package-inputs ucx))) ) ) @@ -455,7 +455,7 @@ as the 'native-search-paths' field." )) (inputs `(("gcc-11", gcc-11) - ("gfortan-11", gfortan-11) + ("gfortran-11", gfortran-11) ("glicid-ucx-gcc-11",glicid-ucx-gcc-11) ;; ("glicid-rdma-core",glicid-rdma-core) ;;; segfault !!! ,@(package-inputs openmpi))) @@ -487,7 +487,7 @@ as the 'native-search-paths' field." )) (inputs `(("gcc-11", gcc-11) - ("gfortan-11", gfortan-11) + ("gfortran-11", gfortran-11) ("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) ,@(package-inputs gromacs))) )) @@ -595,7 +595,7 @@ as the 'native-search-paths' field." )) (inputs `(("gcc", gcc-11) - ("gfortran", gfortan-11) + ("gfortran", gfortran-11) ("libfabric", glicid-specific-libfabric-gcc-11) ("rdma-core",glicid-specific-rdma-core-gcc-11) From 11625347a165acc88493aba359404c0d54456cb1 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 21:26:23 +0200 Subject: [PATCH 123/200] test --- gnu/packages/glicid.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 148947b..cf67ac0 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -106,16 +106,16 @@ as the 'native-search-paths' field." -; (define-public gfortran-11 -; (hidden-package -; (custom-gcc gcc-11 "gfortran" '("fortran") -; %generic-search-paths))) + (define-public gfortran-11 + (hidden-package + (custom-gcc gcc-11 "gfortran" '("fortran") + %generic-search-paths))) -; (define-public gfortran-10 -; (hidden-package -; (custom-gcc gcc-10 "gfortran" '("fortran") -; %generic-search-paths))) + (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)))) From be0a4fb2b50537316c8269ad40a74692b00902b0 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 21:33:17 +0200 Subject: [PATCH 124/200] test --- gnu/packages/glicid.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index cf67ac0..5b80cd0 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -106,6 +106,32 @@ as the 'native-search-paths' field." +;;;; CUSTOM CCIPL + +(define-public gfortran-toolchain-10 + (package (inherit (make-gcc-toolchain gfortran-10)) + (synopsis "Complete GCC tool chain for fortean 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."))) + + +;;;; CUSTOM CCIPL + +(define-public gfortran-toolchain-11 + (package (inherit (make-gcc-toolchain gfortran-11)) + (synopsis "Complete GCC tool chain for fortean 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") From 8a6c734ca1ee1d0a0d3b3c4e5e1cd879a2733534 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 21:40:49 +0200 Subject: [PATCH 125/200] tests --- gnu/packages/glicid.scm | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 5b80cd0..366b8f9 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -104,6 +104,17 @@ as the 'native-search-paths' field." (variable "LIBRARY_PATH") (files '("lib" "lib64"))))) + (define-public gfortran-11 + (hidden-package + (custom-gcc gcc-11 "gfortran" '("fortran") + %generic-search-paths))) + + + (define-public gfortran-10 + (hidden-package + (custom-gcc gcc-10 "gfortran" '("fortran") + %generic-search-paths))) + ;;;; CUSTOM CCIPL @@ -128,24 +139,9 @@ 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))) - - - (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)))) - (define-public glicid-pmix (package (name "glicid-pmix-3.1.5") From 8bdf8c51168c9dec414c05928bd82094ccc7ea6e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 21:55:13 +0200 Subject: [PATCH 126/200] test --- gnu/packages/glicid.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 366b8f9..7f8b9a9 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -62,8 +62,7 @@ #:optional (search-paths (package-native-search-paths gcc)) #: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) (name name) (outputs (if separate-lib-output? From 3e65479dab928cd9b05a0f51a6aa61514ab7b2eb Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 2 May 2021 22:06:40 +0200 Subject: [PATCH 127/200] fix license --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 7f8b9a9..fe59466 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -4,7 +4,7 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) - #:use-module (guix licenses) +; #:use-module (guix licenses) #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) #:use-module (gnu packages commencement) @@ -163,7 +163,7 @@ in the @code{debug} output), and binutils."))) (synopsis "MPIX lib") (description "MPIX. More to come. FIXIT") (home-page "https://www.gnu.org/software/hello/") - (license gpl3+) + (license license:gpl3+) (inputs `( ("libevent", libevent) ("hwloc" ,hwloc-2 "lib") From bf3867ff0f3df23fa7f88671252611885068ebc8 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 3 May 2021 21:29:20 +0200 Subject: [PATCH 128/200] test --- gnu/packages/glicid.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index fe59466..9efbc63 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -55,6 +55,8 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages image) ; #:use-module ((gnu packages gcc) #:select(custom-gcc)) + #:use-module (guix utils) + ) From 0852a34c2c1d39348e42fabb4cd29a8b584826e1 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 3 May 2021 22:27:17 +0200 Subject: [PATCH 129/200] license symbol clashes. --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 9efbc63..b47de8e 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -788,7 +788,7 @@ in the @code{debug} output), and binutils."))) (use-modules (guix download)) (use-modules (gnu packages ruby)) (use-modules (guix build-system ruby)) -(use-modules (guix licenses)) +;(use-modules (guix licenses)) From 8f77d11c9e173274e96a9ba50668272b2ae99e86 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 3 May 2021 22:40:38 +0200 Subject: [PATCH 130/200] bump ucx version --- gnu/packages/glicid.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index b47de8e..efc77d7 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -451,12 +451,12 @@ in the @code{debug} output), and binutils."))) (package (inherit ucx) (name "glicid-ucx-gcc-11") - (version "1.9.0") + (version "1.19.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) + (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) )) (inputs `(("gcc-11", gcc-11) @@ -609,12 +609,12 @@ in the @code{debug} output), and binutils."))) (package (inherit ucx) (name "glicid-specific-ucx-gcc-11") - (version "1.9.0") + (version "1.11.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) + (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) )) (inputs `(("gcc", gcc-11) From 16515ff102937766b40232e5b1b3630daa855c7a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 3 May 2021 22:47:42 +0200 Subject: [PATCH 131/200] typo --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index efc77d7..3817779 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -609,7 +609,7 @@ in the @code{debug} output), and binutils."))) (package (inherit ucx) (name "glicid-specific-ucx-gcc-11") - (version "1.11.0") + (version "1.19.0") (source (origin (method url-fetch) From 9c25f4883fa13decd5a38be921719f908bbad188 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 3 May 2021 22:57:42 +0200 Subject: [PATCH 132/200] typo, again --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3817779..d5fc051 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -451,7 +451,7 @@ in the @code{debug} output), and binutils."))) (package (inherit ucx) (name "glicid-ucx-gcc-11") - (version "1.19.0") + (version "1.10.0") (source (origin (method url-fetch) @@ -609,7 +609,7 @@ in the @code{debug} output), and binutils."))) (package (inherit ucx) (name "glicid-specific-ucx-gcc-11") - (version "1.19.0") + (version "1.10.0") (source (origin (method url-fetch) From 70029d82dd918688ade3940eb26eb90c521dbffd Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 4 May 2021 09:07:40 +0200 Subject: [PATCH 133/200] bump specific openmpi versio --- gnu/packages/glicid.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index d5fc051..a965fa0 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -469,13 +469,13 @@ in the @code{debug} output), and binutils."))) (package (inherit openmpi) (name "glicid-openpmi-gcc-11") - (version "4.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-" version ".tar.gz")) - (sha256 (base32 "02hlg2pgk1np78dqlplwd5qcgrrymy8s49ng4sdrscqmvp1ng112")) - )) + (version "4.1.1") +; (source +; (origin +; (method url-fetch) +; (uri (string-append "https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-" version ".tar.gz")) +; (sha256 (base32 "02hlg2pgk1np78dqlplwd5qcgrrymy8s49ng4sdrscqmvp1ng112")) +; )) (inputs `(("gcc-11", gcc-11) ("gfortran-11", gfortran-11) From 814fb1cc8730b478ecae16016453addefff370c9 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 4 May 2021 12:24:14 +0200 Subject: [PATCH 134/200] bump libfabric version --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index a965fa0..5c174ab 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -589,7 +589,7 @@ in the @code{debug} output), and binutils."))) (package (inherit libfabric) (name "glicid-specific-libfabric-gcc-11") - (version "1.11.2") + (version "1.12.1") (source (origin (method url-fetch) @@ -597,7 +597,7 @@ in the @code{debug} output), and binutils."))) (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (sha256 - (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz")))) + (base32 "0b34p88w399jabdf77jpskxyv2j60nwxlsj3lyk9svjy9458wg6v")))) (inputs `(("gcc", gcc-11) ("rdma-core", glicid-specific-rdma-core-gcc-11) From 884e261316df2cb04f288465ff11c37cb1ab7371 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 4 May 2021 14:22:13 +0200 Subject: [PATCH 135/200] bump version (test) --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 5c174ab..1562f16 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -570,7 +570,7 @@ in the @code{debug} output), and binutils."))) (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-11") - (version "28.1") + (version "34.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -578,7 +578,7 @@ in the @code{debug} output), and binutils."))) version ".tar.gz")) (sha256 (base32 - "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr")))) + "1s4b80jzdi2m6j5aix3mxl6iafgbqp88pfxy7568zxwc8rkcz71x")))) (inputs `(("gcc", gcc-11) ,@(package-inputs rdma-core))) From e3a9a060fe0dc4207b653436d4210744d79bd3ef Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 4 May 2021 16:59:47 +0200 Subject: [PATCH 136/200] bench was not compiled with latest gcc --- gnu/packages/glicid.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 1562f16..56700c9 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -489,7 +489,8 @@ in the @code{debug} output), and binutils."))) (package (inherit intel-mpi-benchmarks/openmpi) (name "glicid-intel-mpi-benchmarks") - (inputs `(("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) + (inputs `(("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) + ("gcc",gcc-11) ,@(package-inputs intel-mpi-benchmarks/openmpi))) ) ) @@ -644,7 +645,8 @@ in the @code{debug} output), and binutils."))) (package (inherit glicid-intel-mpi-benchmarks) (name "glicid-specific-intel-mpi-benchmarks") - (inputs `(("openmpi", glicid-specific-openmpi-gcc-11) + (inputs `(("openmpi", glicid-specific-openmpi-gcc-11) + ("gcc",gcc-11) ,@(package-inputs glicid-intel-mpi-benchmarks))) ) ) From c717f858e7526551c34d28c33632e6c50c7eb8e5 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 4 May 2021 21:46:34 +0200 Subject: [PATCH 137/200] add ucx 1.9.0 --- gnu/packages/glicid.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 56700c9..41e10a7 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -465,6 +465,26 @@ in the @code{debug} output), and binutils."))) ) ) +(define-public glicid-ucx-gcc-11 + (package + (inherit ucx) + (name "glicid-ucx-gcc-11") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) + (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) + )) + + (inputs `(("gcc-11", gcc-11) + ("gfortran-11", gfortran-11) + ,@(package-inputs ucx))) + ) +) + + + (define-public glicid-openmpi-gcc-11 (package (inherit openmpi) From fc5190f955275513f0bf4a6929054b75673043e2 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 4 May 2021 22:19:03 +0200 Subject: [PATCH 138/200] ucx 1.9 don't compile with gcc 11 --- gnu/packages/glicid.scm | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 41e10a7..8f32d47 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -465,10 +465,10 @@ in the @code{debug} output), and binutils."))) ) ) -(define-public glicid-ucx-gcc-11 +(define-public glicid-ucx-gcc-10 (package (inherit ucx) - (name "glicid-ucx-gcc-11") + (name "glicid-ucx-gcc-10") (version "1.9.0") (source (origin @@ -477,8 +477,8 @@ in the @code{debug} output), and binutils."))) (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) )) - (inputs `(("gcc-11", gcc-11) - ("gfortran-11", gfortran-11) + (inputs `(("gcc-10", gcc-10) + ("gfortran-10", gfortran-10) ,@(package-inputs ucx))) ) ) @@ -647,6 +647,27 @@ in the @code{debug} output), and binutils."))) ) ) +(define-public glicid-specific-ucx-gcc-10 + (package + (inherit ucx) + (name "glicid-specific-ucx-gcc-10") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) + (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) + )) + + (inputs `(("gcc", gcc-10) + ("gfortran", gfortran-10) + ("libfabric", glicid-specific-libfabric-gcc-11) + ("rdma-core",glicid-specific-rdma-core-gcc-11) + + ,@(package-inputs ucx))) + ) +) + (define-public glicid-specific-openmpi-gcc-11 (package @@ -665,7 +686,7 @@ in the @code{debug} output), and binutils."))) (package (inherit glicid-intel-mpi-benchmarks) (name "glicid-specific-intel-mpi-benchmarks") - (inputs `(("openmpi", glicid-specific-openmpi-gcc-11) + (inputs `(("openmpi", glicid-specific-openmpi-gcc-10) ("gcc",gcc-11) ,@(package-inputs glicid-intel-mpi-benchmarks))) ) From bea7e3bfb30a41f37dde04e16e96e731f7fa3b0e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 4 May 2021 22:26:56 +0200 Subject: [PATCH 139/200] specific package --- gnu/packages/glicid.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 8f32d47..b329d9c 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -669,14 +669,14 @@ in the @code{debug} output), and binutils."))) ) -(define-public glicid-specific-openmpi-gcc-11 +(define-public glicid-specific-openmpi (package (inherit glicid-openmpi-gcc-11) (name "glicid-specific-openmpi-gcc-11") (inputs `( ("gcc",gcc-11) ("rdma-core",glicid-specific-rdma-core-gcc-11) - ("ucx",glicid-specific-ucx-gcc-11) + ("ucx",glicid-specific-ucx-gcc-10) ("libfabric",glicid-specific-libfabric-gcc-11) ,@(package-inputs glicid-openmpi-gcc-11))) ) @@ -686,7 +686,7 @@ in the @code{debug} output), and binutils."))) (package (inherit glicid-intel-mpi-benchmarks) (name "glicid-specific-intel-mpi-benchmarks") - (inputs `(("openmpi", glicid-specific-openmpi-gcc-10) + (inputs `(("openmpi", glicid-specific-openmpi) ("gcc",gcc-11) ,@(package-inputs glicid-intel-mpi-benchmarks))) ) From 948f10d9aa38334412ee182eb1759a8f56ebfd46 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 4 May 2021 23:06:51 +0200 Subject: [PATCH 140/200] rename for simplicity --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index b329d9c..dab2a12 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -672,7 +672,7 @@ in the @code{debug} output), and binutils."))) (define-public glicid-specific-openmpi (package (inherit glicid-openmpi-gcc-11) - (name "glicid-specific-openmpi-gcc-11") + (name "glicid-specific-openmpi") (inputs `( ("gcc",gcc-11) ("rdma-core",glicid-specific-rdma-core-gcc-11) From 92ef036456840adfb6dd09c6810d4c5b29070b5c Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 5 May 2021 14:10:23 +0200 Subject: [PATCH 141/200] test hdf5 --- gnu/packages/glicid.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index dab2a12..c0fddb6 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -54,7 +54,7 @@ #:use-module (gnu packages fontutils) #:use-module (guix build-system gnu) #:use-module (gnu packages image) -; #:use-module ((gnu packages gcc) #:select(custom-gcc)) + #:use-module (gnu packages maths) #:use-module (guix utils) ) @@ -117,9 +117,6 @@ %generic-search-paths))) - -;;;; CUSTOM CCIPL - (define-public gfortran-toolchain-10 (package (inherit (make-gcc-toolchain gfortran-10)) (synopsis "Complete GCC tool chain for fortean lang development") @@ -128,9 +125,6 @@ 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."))) - -;;;; CUSTOM CCIPL - (define-public gfortran-toolchain-11 (package (inherit (make-gcc-toolchain gfortran-11)) (synopsis "Complete GCC tool chain for fortean lang development") @@ -693,6 +687,18 @@ in the @code{debug} output), and binutils."))) ) +(define-public glicid-specific-hdf5 + (package + (inherit hdf5) + (name "glicid-specific-hdf5") + (inputs `( + ("gcc",gcc-11) + ("gfortran",gfortran-11) + ,@(package-inputs hdf5))) + ) +) + + (define-public glicid-keepalived (package (inherit keepalived) From f41521444d41fa1b2afaff2bc5710be21ab9052c Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 5 May 2021 14:53:15 +0200 Subject: [PATCH 142/200] custom openblas --- gnu/packages/glicid.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index c0fddb6..66ca9e1 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -698,6 +698,19 @@ in the @code{debug} output), and binutils."))) ) ) +(define-public glicid-specific-openblas + (package + (inherit openblas) + (name "glicid-specific-openblas") + (inputs `( + ("fortran-lib",gfortran-11 "lib") + ,@(package-inputs openblas))) + (native-inputs `( + ("fortran" ,gfortran-11) + ,@(package-native-inputs openblas))) + ) +) + (define-public glicid-keepalived (package From 87320c6b40e82fbb84a7985fb7a4ba8e3b0ec0d5 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 5 May 2021 15:01:23 +0200 Subject: [PATCH 143/200] gcc is needed. --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 66ca9e1..a3c088b 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -706,6 +706,7 @@ in the @code{debug} output), and binutils."))) ("fortran-lib",gfortran-11 "lib") ,@(package-inputs openblas))) (native-inputs `( + ("gcc", gcc-11) ("fortran" ,gfortran-11) ,@(package-native-inputs openblas))) ) From 510594090c8b613fad33a6fb0eba64e1e92ca82e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 5 May 2021 16:22:25 +0200 Subject: [PATCH 144/200] bump to 3.15 --- gnu/packages/glicid.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index a3c088b..97f18ed 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -712,6 +712,32 @@ in the @code{debug} output), and binutils."))) ) ) +(define-public glicid-specific-openblas + (package + (inherit openblas) + (version "0.3.15") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/openblas/v" version "/OpenBLAS%20" + version "%20version.tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ylyh9j2c6qfyxh8zc35zp3pzaclfx5f0vf06y1f9jl6nhpdsdbs")))) + + (name "glicid-specific-openblas") + (inputs `( + ("fortran-lib",gfortran-11 "lib") + ,@(package-inputs openblas))) + (native-inputs `( + ("gcc", gcc-11) + ("fortran" ,gfortran-11) + ,@(package-native-inputs openblas))) + ) +) + + (define-public glicid-keepalived (package From d52c08509f53aaa3a77393a4356e7a23949f9003 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 5 May 2021 16:39:05 +0200 Subject: [PATCH 145/200] change name --- gnu/packages/glicid.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 97f18ed..d57cb9b 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -712,9 +712,10 @@ in the @code{debug} output), and binutils."))) ) ) -(define-public glicid-specific-openblas +(define-public glicid-vspecific-openblas (package (inherit openblas) + (name "glicid-vspecific-openblas") (version "0.3.15") (source (origin From bae504e8b585df98c7d8333790b9a00a82ba5029 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 5 May 2021 16:48:49 +0200 Subject: [PATCH 146/200] name 2 times. --- gnu/packages/glicid.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index d57cb9b..b4514f2 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -715,7 +715,6 @@ in the @code{debug} output), and binutils."))) (define-public glicid-vspecific-openblas (package (inherit openblas) - (name "glicid-vspecific-openblas") (version "0.3.15") (source (origin From e815a46a3ba451b325baa9643ce0d25528ceb092 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 5 May 2021 17:36:13 +0200 Subject: [PATCH 147/200] native inputs instead inputs --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index b4514f2..abd5a6f 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -691,10 +691,10 @@ in the @code{debug} output), and binutils."))) (package (inherit hdf5) (name "glicid-specific-hdf5") - (inputs `( + (native-inputs `( ("gcc",gcc-11) ("gfortran",gfortran-11) - ,@(package-inputs hdf5))) + ,@(package-native-inputs hdf5))) ) ) From afd7f359f0c3d7941c884327250a7f988d62cb43 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 5 May 2021 17:42:08 +0200 Subject: [PATCH 148/200] =?UTF-8?q?typo=20,=20reverse=20commit=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index abd5a6f..b261ab8 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -715,6 +715,7 @@ in the @code{debug} output), and binutils."))) (define-public glicid-vspecific-openblas (package (inherit openblas) + (name "glicid-vspecific-openblas") (version "0.3.15") (source (origin From 8a162f6f3a4fcea1afd88bfcb43549ce51fb30a4 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 6 May 2021 21:26:26 +0200 Subject: [PATCH 149/200] add specific hdf5 --- gnu/packages/glicid.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index b261ab8..2397662 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -698,6 +698,40 @@ in the @code{debug} output), and binutils."))) ) ) +(define-public glicid-specific-hdf5-parallel-openmpi + (package/inherit glicid-specific-hdf5 ;use the latest + (name "glicid-specific-hdf5-parallel-openmpi") + (inputs + `(("mpi" ,glicid-specific-openmpi) + ,@(package-inputs hdf5))) + (arguments + (substitute-keyword-arguments (package-arguments glicid-specific-hdf5) + ((#:configure-flags flags) + ``("--enable-parallel" + ,@(delete "--enable-cxx" + (delete "--enable-threadsafe" ,flags)))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'build 'mpi-setup + ,%glicid-specific-openmpi-setup) + (add-before 'check 'patch-tests + (lambda _ + ;; OpenMPI's mpirun will exit with non-zero status if it + ;; detects an "abnormal termination", i.e. any process not + ;; calling MPI_Finalize(). Since the test is explicitly + ;; avoiding MPI_Finalize so as not to have at_exit and thus + ;; H5C_flush_cache from being called, mpirun will always + ;; complain, so turn this test off. + (substitute* "testpar/Makefile" + (("(^TEST_PROG_PARA.*)t_pflush1(.*)" front back) + (string-append front back "\n"))) + (substitute* "tools/test/h5diff/testph5diff.sh" + (("/bin/sh") (which "sh"))) + #t)))))) + (synopsis "Management suite for data with parallel IO support"))) + + + (define-public glicid-specific-openblas (package (inherit openblas) From 608064fb717499e76f8ede79e6efe0e770973c61 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 6 May 2021 21:38:19 +0200 Subject: [PATCH 150/200] wrong name --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 2397662..54053b9 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -713,7 +713,7 @@ in the @code{debug} output), and binutils."))) ((#:phases phases) `(modify-phases ,phases (add-after 'build 'mpi-setup - ,%glicid-specific-openmpi-setup) + ,%openmpi-setup) (add-before 'check 'patch-tests (lambda _ ;; OpenMPI's mpirun will exit with non-zero status if it From 707d4d47261b65903d7bbd9d22aa484f5730b209 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 6 May 2021 22:20:05 +0200 Subject: [PATCH 151/200] suppress tests ?? --- gnu/packages/glicid.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 54053b9..aafaaca 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -727,7 +727,10 @@ in the @code{debug} output), and binutils."))) (string-append front back "\n"))) (substitute* "tools/test/h5diff/testph5diff.sh" (("/bin/sh") (which "sh"))) - #t)))))) + #t))))) + '(#:tests? #f)) + +) (synopsis "Management suite for data with parallel IO support"))) From 0fd827821f9033fb425fed895814157dd0a03240 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 6 May 2021 22:52:33 +0200 Subject: [PATCH 152/200] hum, is syntax ok ? --- gnu/packages/glicid.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index aafaaca..eee52d9 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -705,7 +705,12 @@ in the @code{debug} output), and binutils."))) `(("mpi" ,glicid-specific-openmpi) ,@(package-inputs hdf5))) (arguments - (substitute-keyword-arguments (package-arguments glicid-specific-hdf5) + + `( + #:tests? #f + + + substitute-keyword-arguments (package-arguments glicid-specific-hdf5) ((#:configure-flags flags) ``("--enable-parallel" ,@(delete "--enable-cxx" @@ -727,10 +732,12 @@ in the @code{debug} output), and binutils."))) (string-append front back "\n"))) (substitute* "tools/test/h5diff/testph5diff.sh" (("/bin/sh") (which "sh"))) - #t))))) - '(#:tests? #f)) + #t)))) + +)) + + -) (synopsis "Management suite for data with parallel IO support"))) From ac183668a4904bf4057fed53ba167cec0677ac39 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 6 May 2021 23:02:41 +0200 Subject: [PATCH 153/200] step back --- gnu/packages/glicid.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index eee52d9..4e3cbb2 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -706,10 +706,10 @@ in the @code{debug} output), and binutils."))) ,@(package-inputs hdf5))) (arguments - `( - #:tests? #f +; `( +; #:tests? #f - + ( substitute-keyword-arguments (package-arguments glicid-specific-hdf5) ((#:configure-flags flags) ``("--enable-parallel" From 585aca782a1051d9263ef0de821c4f96ed31f00a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 6 May 2021 23:28:39 +0200 Subject: [PATCH 154/200] no tests for all glicid-specific hdf5 --- gnu/packages/glicid.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 4e3cbb2..65a9c1b 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -691,6 +691,9 @@ in the @code{debug} output), and binutils."))) (package (inherit hdf5) (name "glicid-specific-hdf5") + (arguments + '(#:tests? #f)) + (native-inputs `( ("gcc",gcc-11) ("gfortran",gfortran-11) From 68a30a310a6bf89d8a26808a9dd9b707d4892837 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 6 May 2021 23:45:28 +0200 Subject: [PATCH 155/200] if tests are not enabled, packages are not built --- gnu/packages/glicid.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 65a9c1b..4e3cbb2 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -691,9 +691,6 @@ in the @code{debug} output), and binutils."))) (package (inherit hdf5) (name "glicid-specific-hdf5") - (arguments - '(#:tests? #f)) - (native-inputs `( ("gcc",gcc-11) ("gfortran",gfortran-11) From 485b425d204180e98ea3204a3141423135b41d70 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 7 May 2021 00:07:14 +0200 Subject: [PATCH 156/200] =?UTF-8?q?bump=20hdf5=20to=201.12=C2=A0=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnu/packages/glicid.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 4e3cbb2..5539d36 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -689,12 +689,12 @@ in the @code{debug} output), and binutils."))) (define-public glicid-specific-hdf5 (package - (inherit hdf5) + (inherit hdf5-1.12) (name "glicid-specific-hdf5") (native-inputs `( ("gcc",gcc-11) ("gfortran",gfortran-11) - ,@(package-native-inputs hdf5))) + ,@(package-native-inputs hdf5-1.12))) ) ) @@ -703,7 +703,7 @@ in the @code{debug} output), and binutils."))) (name "glicid-specific-hdf5-parallel-openmpi") (inputs `(("mpi" ,glicid-specific-openmpi) - ,@(package-inputs hdf5))) + ,@(package-inputs glicid-specific-hdf5))) (arguments ; `( From 97b78b1a4be14fa9f7f461b3866aa77927e5ad63 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 7 May 2021 00:31:28 +0200 Subject: [PATCH 157/200] last test --- gnu/packages/glicid.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 5539d36..ce67348 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -691,6 +691,9 @@ in the @code{debug} output), and binutils."))) (package (inherit hdf5-1.12) (name "glicid-specific-hdf5") + (arguments + `(#:tests? #f) + ) (native-inputs `( ("gcc",gcc-11) ("gfortran",gfortran-11) From 59bfedd572392c11a5017cc12edf293b0e40ad17 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 7 May 2021 09:17:32 +0200 Subject: [PATCH 158/200] other way to avoid tests ? --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index ce67348..2de9c00 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -715,7 +715,7 @@ in the @code{debug} output), and binutils."))) ( substitute-keyword-arguments (package-arguments glicid-specific-hdf5) ((#:configure-flags flags) - ``("--enable-parallel" + ``("--enable-parallel" "--disable-tests" ,@(delete "--enable-cxx" (delete "--enable-threadsafe" ,flags)))) ((#:phases phases) From 343fed7951c4395fe0824813b15c1f8e697d5dfd Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 7 May 2021 09:26:16 +0200 Subject: [PATCH 159/200] re enable tests globally --- gnu/packages/glicid.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 2de9c00..7c2ebdb 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -691,9 +691,9 @@ in the @code{debug} output), and binutils."))) (package (inherit hdf5-1.12) (name "glicid-specific-hdf5") - (arguments - `(#:tests? #f) - ) +; (arguments +; `(#:tests? #f) +; ) (native-inputs `( ("gcc",gcc-11) ("gfortran",gfortran-11) From fd0b5f07766ac8b51652c3d7c80653cd8fc38317 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 7 May 2021 11:48:07 +0200 Subject: [PATCH 160/200] new openblas --- gnu/packages/glicid.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 7c2ebdb..ea0caa1 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -766,13 +766,12 @@ in the @code{debug} output), and binutils."))) (version "0.3.15") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/openblas/v" version "/OpenBLAS%20" - version "%20version.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method url-fetch) + (uri (string-append "https://github.com/xianyi/OpenBLAS/releases/download/v" version "/OpenBLAS-" version ".tar.gz" )) +; (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ylyh9j2c6qfyxh8zc35zp3pzaclfx5f0vf06y1f9jl6nhpdsdbs")))) + "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h")))) (name "glicid-specific-openblas") (inputs `( From 090053646aae7d312008821a0db1b730e90bc8ab Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 7 May 2021 12:26:20 +0200 Subject: [PATCH 161/200] bump cmake version --- gnu/packages/glicid.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index ea0caa1..cca2f8b 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -56,6 +56,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages maths) #:use-module (guix utils) + #:use-module (gnu packages cmake) ) @@ -784,6 +785,23 @@ in the @code{debug} output), and binutils."))) ) ) +(define-public glicid-specific-cmake + (package + (inherit cmake) + (name "glicid-specific-cmake") + (version "3.20.2") + ;; TODO: Move the following source field to the cmake-bootstrap package in + ;; the next rebuild cycle. + (source (origin + (method url-fetch) + (uri (string-append "https://cmake.org/files/v" + (version-major+minor version) + "/cmake-" version ".tar.gz")) + (sha256 + (base32 + "0kjlb7sxbwg8z4027c3jjcmyjh9d36p0r9d4nqxynyaijz5nxkxf")))) + ) +) (define-public glicid-keepalived From c53be3ab0f7e5aa16959874c60dd7a435617aef4 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 19 May 2021 14:04:10 +0200 Subject: [PATCH 162/200] bump slurm versions --- gnu/packages/glicid.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index cca2f8b..483bd5e 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -221,12 +221,12 @@ in the @code{debug} output), and binutils."))) (package (inherit glicid-custom-slurm-19.05) (name "glicid-custom-slurm-20.02") - (version "20.02.6") + (version "20.02.7") (source (origin (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "0ji76jgyny6jqdsi4nj9wmk0ny539aq4vvhp2jx99mwwdzpcv701")) + (sha256 (base32 "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6")) )) )) @@ -235,12 +235,12 @@ in the @code{debug} output), and binutils."))) (package (inherit glicid-custom-slurm-20.02) (name "glicid-custom-slurm-20.11") - (version "20.11.3") + (version "20.11.7") (source (origin (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "1s70x6yh60sx63dgmp5rlhq8jcz7kxv9pk8gbs9v1jg8zps5h5bk")) + (sha256 (base32 "1fdjihg1x7ks5l77yjv14a4mg6r0v8c3zk1dcxkhrhq3n4dc9nbs")) )) )) From 7a877375a568693120c278687a6ead33af86f9af Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 24 May 2021 23:50:47 +0200 Subject: [PATCH 163/200] add clam !! alpha ! --- gnu/packages/glicid-clam.scm | 629 +++++++++++++++++++++++++++++++++++ 1 file changed, 629 insertions(+) create mode 100644 gnu/packages/glicid-clam.scm diff --git a/gnu/packages/glicid-clam.scm b/gnu/packages/glicid-clam.scm new file mode 100644 index 0000000..5b275a4 --- /dev/null +++ b/gnu/packages/glicid-clam.scm @@ -0,0 +1,629 @@ +(define-module (gnu packages glicid-clam) + +#:use-module (guix packages) +#:use-module (guix download) +#:use-module (gnu packages linux) +#:use-module (gnu packages virtualization) +#:use-module (gnu packages storage) +#:use-module (gnu packages gcc) +#:use-module (gnu packages glicid) +#:use-module (guix build-system python) +#:use-module ((guix licenses) #:prefix license:) +#:use-module (guix git-download) +#:use-module (gnu packages python) +#:use-module (guix build-system python) +#:use-module (gnu packages python-web) +#:use-module (gnu packages python-xyz) +#:use-module (gnu packages python-crypto) +#:use-module (gnu packages check) +#:use-module (guix build-system copy) +#:use-module (gnu packages django) +#:use-module (gnu packages time) +#:use-module (gnu packages databases) +) + +(define-public python-pytest-runner-4.5.1 + (package + (name "python-pytest-runner") + (version "4.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-runner" version)) + (sha256 + (base32 + "1vzilbayx5mznsdm1r258m3616374p6kvhsbj4j6238j9djkvjyi")))) + (build-system python-build-system) + (arguments + '(;; FIXME: The test suite requires 'python-flake8' and 'python-black', + ;; but that introduces a circular dependency. + #:tests? #f + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "pytest" "-vv") + (format #t "test suite not run~%")) + #t))))) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) + (home-page "https://github.com/pytest-dev/pytest-runner") + (synopsis "Invoke py.test as a distutils command") + (description + "This package provides a @command{pytest-runner} command that +@file{setup.py} files can use to run tests.") + (license license:expat))) + +(define-public python-keycloak-client-0.2.3 +(package + (name "python-keycloak-client") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-keycloak-client" version)) + (sha256 + (base32 + "0gw6wj1rlacfpgbp4b2wyp68ccrh713438qjpv11x6bnlcnf52x3")))) + (build-system python-build-system) ;; FIXME: Tests require specific "pytest", + ;; we don't have it for the moment. + (arguments + '(#:tests? #f)) + + + (propagated-inputs + `(("python-jose" ,python-jose) + ("python-pytest-runner-4.5.1", python-pytest-runner-4.5.1) + ("python-requests" ,python-requests))) + (native-inputs + `(("python-bumpversion" ,python-bumpversion) + ("python-pytest-runner-4.5.1", python-pytest-runner-4.5.1) + ("python-twine" ,python-twine))) + (home-page + "https://github.com/Peter-Slump/python-keycloak-client") + (synopsis "Install Python Keycloak client.") + (description "Install Python Keycloak client.") + (license license:expat)) + +) + + +(define-public glicid-django-keycloak + (package + (name "glicid-django-keycloak") + (version "v0.1.2-bird") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://oauth2:9i-PgbC2w_JEx6DUUqzf@gitlab.univ-nantes.fr/CCIPL/stages/2021/django-keycloak.git") (commit version) + ) + ) + + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l380q6z504nndjl15cb5lkghpmm6f3rs4bgwy8sx5s12xz2sbck" + ) + ) + ) + ) + + (build-system python-build-system) + ;; XXX: The git repository has no tags, and the PyPI releases do not + ;; contain tests. + (arguments '(#:tests? #f)) + (native-inputs `(("python-keycloak-client" , python-keycloak-client-0.2.3) + ("python-ecdsa", python-ecdsa) + )) + (home-page "https://blabla") + (synopsis "blabla") + (description + "This package provides a single-file minifier for CSS, HTML, and JavaScript.") + ;; XXX: The README just says "GNU GPL and GNU LGPL and MIT". From + ;; it + ;; looks like the user can choose a license. + (license (list license:gpl3+ license:lgpl3+ license:expat)) + + ) +) + + +(define-public python-django-autocomplete-light +(package + (name "python-django-autocomplete-light") + (version "3.8.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-autocomplete-light" version)) + (sha256 + (base32 + "145snirk0a7bgcgwisn5fzmb0w4m88zf6r55m2biz3wsnmqymw15")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; pb with django ? + (native-inputs `(("python-django", python-django))) + (propagated-inputs `(("python-six" ,python-six))) + (home-page + "http://django-autocomplete-light.rtfd.org") + (synopsis "Fresh autocompletes for Django") + (description "Fresh autocompletes for Django") + (license license:expat)) +) + +(define-public python-django-icons + +(package + (name "python-django-icons") + (version "4.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-icons" version)) + (sha256 + (base32 + "06r0d68qknqa7p44nss6wzdcawakyr7ildgyl6mp5md9xb8klbah")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; django pb + (propagated-inputs + `(("python-django" ,python-django) + ("python-importlib-metadata" + ,python-importlib-metadata))) + (home-page + "https://github.com/zostera/django-icons") + (synopsis "Icons for Django") + (description "Icons for Django") + (license #f)) + +) + +(define-public python-django-admin-row-actions +(package + (name "python-django-admin-row-actions") + (version "0.0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-admin-row-actions" version)) + (sha256 + (base32 + "0rz71a54lj73wfi56flfh5m5fi7ah1cl8fph1h8y386s0am8plpz")))) + (build-system python-build-system) + + (native-inputs `(("python-django", python-django))) + (arguments '(#:tests? #f)) ; iteration problem + + (propagated-inputs `(("python-six" ,python-six))) + (home-page + "https://github.com/DjangoAdminHackers/django-admin-row-actions") + (synopsis "django admin row actions") + (description "django admin row actions") + (license #f)) +) + +(define-public python-django-bootstrap4 +(package + (name "python-django-bootstrap4") + (version "3.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-bootstrap4" version)) + (sha256 + (base32 + "0azcalm95yh713fm1bmsqd73iz53fhmyajsg3fly6mmvffs7zjf5")))) + (build-system python-build-system) + (native-inputs `(("python-django", python-django))) +(arguments '(#:tests? #f)) ; gdal not found. + (propagated-inputs + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-django" ,python-django) + ("python-importlib-metadata" + ,python-importlib-metadata))) + (home-page + "https://github.com/zostera/django-bootstrap4") + (synopsis "Bootstrap 4 for Django") + (description "Bootstrap 4 for Django") + (license #f)) + + + +) + +(define-public python-django-mathfilters +(package + (name "python-django-mathfilters") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-mathfilters" version)) + (sha256 + (base32 + "01sbnrznai6sz4w4qs7ld35039l7q5wh5zawwy1kd2gwdppr5f69")))) + (build-system python-build-system) + (native-inputs `(("python-django", python-django))) +; (arguments '(#:tests? #f)) ; iteration problem + (home-page + "https://github.com/dbrgn/django-mathfilters") + (synopsis + "A set of simple math filters for Django") + (description + "A set of simple math filters for Django") + (license license:expat)) + +) + +(define-public python-tablib +(package + (name "python-tablib") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tablib" version)) + (sha256 + (base32 + "03f1z6jq6rf67gwhbm9ma4rydm8h447a5nh5lcs5l8jg8l4aqg7q")))) + (build-system python-build-system) +; (arguments '(#:tests? #f)) ; need setuptools ? + (native-inputs `(("python-setuptools-scm", python-setuptools-scm))) + (home-page "https://tablib.readthedocs.io") + (synopsis + "Format agnostic tabular data library (XLS, JSON, YAML, CSV)") + (description + "Format agnostic tabular data library (XLS, JSON, YAML, CSV)") + (license license:expat)) + + +) + +(define-public python-markuppy + +(package + (name "python-markuppy") + (version "1.14") + (source + (origin + (method url-fetch) + (uri (pypi-uri "MarkupPy" version)) + (sha256 + (base32 + "0pqdmpxbr8iq22b4css2gz5z6s01ddpzyj25x27kgbs2lp0f5phs")))) + (build-system python-build-system) + (home-page + "https://github.com/tylerbakke/MarkupPy") + (synopsis "An HTML/XML generator") + (description "An HTML/XML generator") + (license license:expat)) + + +) + +(define-public python-xlwt +(package + (name "python-xlwt") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "xlwt" version)) + (sha256 + (base32 + "123c2pdamshkq75wwvck8fq0cjq1843xd3x9qaiz2a4vg9qi56f5")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; code error + (home-page "http://www.python-excel.org/") + (synopsis "Library to create spreadsheet files compatible with MS Excel 97/2000/XP/2003 XLS files, on any platform, with Python 2.6, 2.7, 3.3+") + (description "Library to create spreadsheet files compatible with MS Excel 97/2000/XP/2003 XLS files, on any platform, with Python 2.6, 2.7, 3.3+") + (license license:bsd-3)) + +) + +(define-public python-django-import-export +(package + (name "python-django-import-export") + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-import-export" version)) + (sha256 + (base32 + "0j0gsj18bkkmbn262qj2syla80vncvqn49bllwxvcgw0zhxh1763")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; django error + (native-inputs `(("python-markuppy", python-markuppy) + ("python-odfpy",python-odfpy) + ("python-xlwt",python-xlwt) + ("python-xlrd",python-xlrd) + ("python-pyyaml",python-pyyaml) + ("python-openpyxl",python-openpyxl) + )) + (propagated-inputs + `(("python-diff-match-patch" + ,python-diff-match-patch) + ("python-django" ,python-django) + ("python-tablib" ,python-tablib) + )) + (home-page + "https://github.com/django-import-export/django-import-export") + (synopsis + "Django application and library for importing and exporting data with included admin integration.") + (description + "Django application and library for importing and exporting data with included admin integration.") + (license license:bsd-3)) + + +) + +(define-public python-django-timezone-field +(package + (name "python-django-timezone-field") + (version "4.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-timezone-field" version)) + (sha256 + (base32 + "1pxrs6mkayr2rqxj8q4wdfrdhw1dnzvwkacajdjy6q6ha8jcdyng")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; needs rest-framework ? + (propagated-inputs + `(("python-django" ,python-django) + ("python-pytz" ,python-pytz))) + (home-page + "http://github.com/mfogel/django-timezone-field/") + (synopsis + "A Django app providing database and form fields for pytz timezone objects.") + (description + "A Django app providing database and form fields for pytz timezone objects.") + (license license:bsd-3)) + + +) + + +(define-public python-crontab +(package + (name "python-crontab") + (version "2.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-crontab" version)) + (sha256 + (base32 + "0cccrqc10r8781ba81x8r2frs3pl2m4hkm599k5358ak0xr7xgjb")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; AssertionError: 2 != 0 : Windows shell command not found! + + (propagated-inputs + `(("python-dateutil" ,python-dateutil))) + (home-page + "https://gitlab.com/doctormo/python-crontab/") + (synopsis "Python Crontab API") + (description "Python Crontab API") + (license #f)) + + +) + +(define-public python-click-repl + +(package + (name "python-click-repl") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "click-repl" version)) + (sha256 + (base32 + "1mcmz95595nrp4r58spy1ac993db26hk4q97isghbmn4md99vwmr")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click) + ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-six" ,python-six))) + (home-page + "https://github.com/untitaker/click-repl") + (synopsis "REPL plugin for Click") + (description "REPL plugin for Click") + (license license:expat)) +) + + +(define-public python-click-didyoumean + +(package + (name "python-click-didyoumean") + (version "0.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "click-didyoumean" version)) + (sha256 + (base32 + "1svaza5lpvdbmyrx5xi0riqzq4hb9wnlpqrg6r8zy14pbi42j8hi")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click))) + (home-page + "https://github.com/timofurrer/click-didyoumean") + (synopsis + "Enable git-like did-you-mean feature in click.") + (description + "Enable git-like did-you-mean feature in click.") + (license #f)) + +) + +(define-public python-pytest-celery + +(package + (name "python-pytest-celery") + (version "0.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-celery" version)) + (sha256 + (base32 + "01pli108qqiiyrn8qsqqabcpazrzj27r7cji9wgglsk76by61l6g")))) + (build-system python-build-system) + (propagated-inputs + `(("python-celery" ,python-celery-5.1.0))) + (home-page + "https://github.com/graingert/pytest-celery") + (synopsis + "pytest-celery a shim pytest plugin to enable celery.contrib.pytest") + (description + "pytest-celery a shim pytest plugin to enable celery.contrib.pytest") + (license license:bsd-3)) + +) + +(define-public python-celery-5.1.0 + +(package + (name "python-celery") + (version "5.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "celery" version)) + (sha256 + (base32 + "110ix1h9axnc5dwzyswi1cvypzbr38p1jb1msyf1ikvq8p063w35")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; circular depedency + (propagated-inputs + `(("python-billiard" ,python-billiard) + ("python-click" ,python-click) + ("python-click-didyoumean" + ,python-click-didyoumean) + ("python-click-plugins" ,python-click-plugins) + ("python-click-repl" ,python-click-repl) + ("python-kombu" ,python-kombu) + ("python-pytz" ,python-pytz) + ("python-setuptools" ,python-setuptools) + ("python-vine" ,python-vine))) + ; (native-inputs + ; `(("python-pytest-celery" ,python-pytest-celery))) ;; circular depedency !! + (home-page "http://celeryproject.org") + (synopsis "Distributed Task Queue.") + (description "Distributed Task Queue.") + (license license:bsd-3)) + +) + +(define-public python-django-celery-beat + +(package + (name "python-django-celery-beat") + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-celery-beat" version)) + (sha256 + (base32 + "0hx5ig1g0naagkmh39xbb64hhckd3b3pm12g9z03zig72pxkm8dq")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; needs much more up to date python-vine + + ; (native-inputs `(("python-vine", python-vine))) + (propagated-inputs + `(("python-celery" ,python-celery-5.1.0) + ("python-crontab" ,python-crontab) + ("python-django" ,python-django) + ("python-django-timezone-field" + ,python-django-timezone-field))) + (home-page + "https://github.com/celery/django-celery-beat") + (synopsis "Database-backed Periodic Tasks.") + (description "Database-backed Periodic Tasks.") + (license license:bsd-3)) + +) + + + +(define-public glicid-clam + (package + (name "glicid-clam") + (version "v0.0.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://oauth2:9i-PgbC2w_JEx6DUUqzf@gitlab.univ-nantes.fr/CCIPL/stages/2021/cluster_account_manager.git") (commit version) + ) + ) + + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x8q8wfl3p430dw8cawvfw4a4jjqw80gdg6zm90wmiad1f1lgd6r" + ) + ) + ) + ) + +; (build-system python-build-system) + (build-system copy-build-system) + ;; XXX: The git repository has no tags, and the PyPI releases do not + ;; contain tests. + (arguments '( + +;#:tests? #f +; #:use-setuptools? #f ; uses custom distutils 'install' command + + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-files-writable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each make-file-writable + (find-files out "\\.gz$")) + #t)))))) + + + + + + +; ) +; ) + + (propagated-inputs `(("python-keycloak-client" , python-keycloak-client-0.2.3) + ("python-ecdsa", python-ecdsa) + ("python-django", python-django) + ("python-celery", python-celery-5.1.0) + ("python-django-auth-ldap",python-django-auth-ldap) + ("python-django-autocomplete-light",python-django-autocomplete-light) + ("python-django-admin-row-actions", python-django-admin-row-actions) + ("python-django-bootstrap4",python-django-bootstrap4) + ("python-django-icons",python-django-icons) + ("python-django-mathfilters",python-django-mathfilters) + ("python-django-import-export",python-django-import-export) + ("python-django-celery-beat",python-django-celery-beat) + ("python-psycopg2",python-psycopg2) + ("python-magic",python-magic) + + )) + (home-page "https://blabla") + (synopsis "blabla") + (description + "This package provides a single-file minifier for CSS, HTML, and JavaScript.") + ;; XXX: The README just says "GNU GPL and GNU LGPL and MIT". From + ;; it + ;; looks like the user can choose a license. + (license (list license:gpl3+ license:lgpl3+ license:expat)) + + ) +) From feb2b3bd06f676431dba7a4ae5bd63961af0dd83 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 25 May 2021 16:46:30 +0200 Subject: [PATCH 164/200] add openmpi as input for slurm --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 483bd5e..339d779 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -205,6 +205,7 @@ in the @code{debug} output), and binutils."))) (inputs `(("gtk+-2" ,gtk+-2) ("gcc", gcc-11) ("glicid-pmix", glicid-pmix) + ("glicid-specific-openmpi", glicid-specific-openmpi) ,@(package-inputs slurm) From 22cdb52c4a11c65254fc6eaf0ad4f80a789a1769 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 25 May 2021 17:31:06 +0200 Subject: [PATCH 165/200] test openmpi with direct slurm support --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 339d779..fd8911b 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -674,6 +674,7 @@ in the @code{debug} output), and binutils."))) ("rdma-core",glicid-specific-rdma-core-gcc-11) ("ucx",glicid-specific-ucx-gcc-10) ("libfabric",glicid-specific-libfabric-gcc-11) + ("slurm", glicid-specific-slurm-gcc-11) ,@(package-inputs glicid-openmpi-gcc-11))) ) ) From 03154583ea66c23336f92e9fa4f034b5bdddc58d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 25 May 2021 17:41:59 +0200 Subject: [PATCH 166/200] rename versions --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index fd8911b..75b1dca 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -245,7 +245,7 @@ in the @code{debug} output), and binutils."))) )) )) - +(define-public glicid-specific-slurm glicid-custom-slurm-20.02) (define-public glicid-librdkafka-09 @@ -674,7 +674,7 @@ in the @code{debug} output), and binutils."))) ("rdma-core",glicid-specific-rdma-core-gcc-11) ("ucx",glicid-specific-ucx-gcc-10) ("libfabric",glicid-specific-libfabric-gcc-11) - ("slurm", glicid-specific-slurm-gcc-11) + ("slurm", glicid-specific-slurm) ,@(package-inputs glicid-openmpi-gcc-11))) ) ) From 4fc92feeec87a8c6575d95d707b6cc16308a7f3c Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 27 May 2021 22:03:26 +0200 Subject: [PATCH 167/200] remove circular dependency --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 75b1dca..6c8288b 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -674,7 +674,7 @@ in the @code{debug} output), and binutils."))) ("rdma-core",glicid-specific-rdma-core-gcc-11) ("ucx",glicid-specific-ucx-gcc-10) ("libfabric",glicid-specific-libfabric-gcc-11) - ("slurm", glicid-specific-slurm) +; ("slurm", glicid-specific-slurm) ,@(package-inputs glicid-openmpi-gcc-11))) ) ) From 815306c3e6190cc431406bf1573acf53f797cafb Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 27 May 2021 22:17:36 +0200 Subject: [PATCH 168/200] tjrs pb de dependance --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 6c8288b..a551ee3 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -205,7 +205,7 @@ in the @code{debug} output), and binutils."))) (inputs `(("gtk+-2" ,gtk+-2) ("gcc", gcc-11) ("glicid-pmix", glicid-pmix) - ("glicid-specific-openmpi", glicid-specific-openmpi) +; ("glicid-specific-openmpi", glicid-specific-openmpi) ,@(package-inputs slurm) From dd7b1a2496c083007fd4384298c37f7d06e3f648 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 2 Jun 2021 16:40:33 +0200 Subject: [PATCH 169/200] add libcbor (dependancy for fido2) --- gnu/packages/glicid.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index a551ee3..0e2e6b2 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1004,4 +1004,29 @@ in the @code{debug} output), and binutils."))) ) +(define-public glicid-libcbor + (package + (name "glicid-libcbor") + (version "0.8.0") +(source + (origin + +(method url-fetch) + (uri (string-append + "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz")) + (sha256 + (base32 + "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031")) + +)) +(build-system cmake-build-system) +(synopsis "libcbor") +(description "Todo") +(home-page "toto") +(license license:gpl2+) + + +)) + + ;;; glicid.scm ends here From edff71e8e0f76dc9a52485cbc1f88179c72d1488 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 2 Jun 2021 21:36:50 +0200 Subject: [PATCH 170/200] add glicid-specific-openssh with fido2 support --- gnu/packages/glicid.scm | 163 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 162 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 0e2e6b2..8f8510f 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1004,6 +1004,25 @@ in the @code{debug} output), and binutils."))) ) +(use-modules (guix packages)) +(use-modules (guix download)) +(use-modules (gnu packages linux)) +(use-modules (gnu packages gcc)) +(use-modules (gnu packages glicid)) +(use-modules (gnu packages ssh)) +(use-modules (gnu packages hurd)) +(use-modules (guix build-system gnu)) +(use-modules (guix build-system cmake)) +(use-modules (gnu packages compression)) +(use-modules (gnu packages crypto)) +(use-modules (gnu packages tls)) +(use-modules (gnu packages glicid)) +(use-modules (gnu packages pkg-config)) + + +(use-modules ((guix licenses) #:prefix license:)) + + (define-public glicid-libcbor (package (name "glicid-libcbor") @@ -1020,7 +1039,13 @@ in the @code{debug} output), and binutils."))) )) (build-system cmake-build-system) -(synopsis "libcbor") + +(arguments + `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE" + "-DCMAKE_C_FLAGS=-fPIE"))) + + +(synopsis "libfido2") (description "Todo") (home-page "toto") (license license:gpl2+) @@ -1029,4 +1054,140 @@ in the @code{debug} output), and binutils."))) )) +(define-public glicid-libfido2 + (package + + (name "glicid-libfido2") + (version "1.7.0") + (source + (origin + +(method url-fetch) + (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" + version ".tar.gz")) +; (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "13khkp2q8g447797l09p83qxy0z8vgmzr54l8dcnapy9lsr4jrqi")) + + + )) + + (build-system cmake-build-system) + (arguments '(#:tests? #f)) + + +(inputs `( + ("glicid-libcbor",glicid-libcbor) + ("openssl",openssl) + ("zlib", zlib) + ("pkg-config", pkg-config) ; or cmake won't find zlib ! + ("eudev", eudev) + + )) + +(synopsis "libfido2") +(description "Todo") +(home-page "toto") +(license license:gpl2+) +) + +) + + +(define-public glicid-specific-openssh + (package + (inherit openssh) + (name "glicid-specific-openssh") +(arguments + + `(#:test-target "tests" + ;; Otherwise, the test scripts try to use a nonexistent directory and + ;; fail. + #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"") + + #:configure-flags `("--sysconfdir=/etc/ssh" + + ;; Default value of 'PATH' used by sshd. + "--with-default-path=/run/current-system/profile/bin" + + ;; configure needs to find krb5-config. + ,(string-append "--with-kerberos5=" + (assoc-ref %build-inputs "mit-krb5") + "/bin") + + ;; libedit is needed for sftp completion. + "--with-libedit" + ;; for u2f + "--with-security-key-builtin" +; ,(string-append "--with-fido2=" (assoc-ref %build-inputs "libfido2")) + + ;; Enable PAM support in sshd. + ,,@(if (hurd-target?) + '() + '("--with-pam")) + + ;; "make install" runs "install -s" by default, + ;; which doesn't work for cross-compiled binaries + ;; because it invokes 'strip' instead of + ;; 'TRIPLET-strip'. Work around this. + ,,@(if (%current-target-system) + '("--disable-strip") + '() +)) + + +#:phases + (modify-phases %standard-phases + (add-after 'configure 'reset-/var/empty + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("PRIVSEP_PATH=/var/empty") + (string-append "PRIVSEP_PATH=" out "/var/empty"))) + #t))) + (add-before 'check 'patch-tests + (lambda _ + (substitute* "regress/test-exec.sh" + (("/bin/sh") (which "sh"))) + + ;; Remove 't-exec' regress target which requires user 'sshd'. + (substitute* (list "Makefile" + "regress/Makefile") + (("^(tests:.*) t-exec(.*)" all pre post) + (string-append pre post))) + #t)) + (replace 'install + (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) + ;; Install without host keys and system configuration files. + (apply invoke "make" "install-nosysconf" make-flags) + (install-file "contrib/ssh-copy-id" + (string-append (assoc-ref outputs "out") + "/bin/")) + (chmod (string-append (assoc-ref outputs "out") + "/bin/ssh-copy-id") #o555) + (install-file "contrib/ssh-copy-id.1" + (string-append (assoc-ref outputs "out") + "/share/man/man1/")) + #t))) ; )) + + +) + ) + +(inputs `(("glicid-libfido2", glicid-libfido2) + ("glicid-libcbor", glicid-libcbor) + ,@(package-inputs openssh))) + + + + ) + + +) + + + + + ;;; glicid.scm ends here From b5d7a6be9a58c322e72dab331131f82cbf62e2e0 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 26 Jul 2021 22:09:45 +0200 Subject: [PATCH 171/200] add a compiling ceph version --- gnu/packages/glicid.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 8f8510f..3d99691 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1189,5 +1189,44 @@ in the @code{debug} output), and binutils."))) +(use-modules (guix inferior) (guix channels) + (srfi srfi-1)) ;pour « first » + + +(define channels + ;; L'ancienne révision depuis laquelle on veut + ;; extraire guile-json. + (list (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (commit + "c9c274172b781c51e67868c53c8b2ea394bf7a94")))) ; just before snappy 1.19 + + +(define inferior + ;; Un inférieur représentant la révision ci-dessus. + (inferior-for-channels channels)) + +(define-public old-snappy + (first (lookup-inferior-packages inferior "snappy") + ) +) + + +(define-public glicid-ceph + (package + (inherit ceph) + (name "glicid-ceph") + + + (inputs `(("snappy",old-snappy) + ,@(package-inputs ceph))) + + ) +) + + + + ;;; glicid.scm ends here From eb34ee537c8d80ee28264b9fe4222a3334046e0c Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 26 Jul 2021 22:19:53 +0200 Subject: [PATCH 172/200] re-add snappy 1.1.8 --- gnu/packages/glicid.scm | 51 ++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3d99691..b0fb896 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1188,29 +1188,32 @@ in the @code{debug} output), and binutils."))) - -(use-modules (guix inferior) (guix channels) - (srfi srfi-1)) ;pour « first » - - -(define channels - ;; L'ancienne révision depuis laquelle on veut - ;; extraire guile-json. - (list (channel - (name 'guix) - (url "https://git.savannah.gnu.org/git/guix.git") - (commit - "c9c274172b781c51e67868c53c8b2ea394bf7a94")))) ; just before snappy 1.19 - - -(define inferior - ;; Un inférieur représentant la révision ci-dessus. - (inferior-for-channels channels)) - -(define-public old-snappy - (first (lookup-inferior-packages inferior "snappy") - ) -) +(define-public snappy + (package + (name "snappy") + (version "1.1.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/snappy") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1j0kslq2dvxgkcxl1gakhvsa731yrcvcaipcp5k8k7ayicvkv9jv")) + (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) + (home-page "https://github.com/google/snappy") + (synopsis "Fast compressor/decompressor") + (description "Snappy is a compression/decompression library. It does not +aim for maximum compression, or compatibility with any other compression library; +instead, it aims for very high speeds and reasonable compression. For instance, +compared to the fastest mode of zlib, Snappy is an order of magnitude faster +for most inputs, but the resulting compressed files are anywhere from 20% to +100% bigger.") + (license license:asl2.0))) (define-public glicid-ceph @@ -1219,7 +1222,7 @@ in the @code{debug} output), and binutils."))) (name "glicid-ceph") - (inputs `(("snappy",old-snappy) + (inputs `(("snappy",snappy@1.1.8) ,@(package-inputs ceph))) ) From 4374ce46c6975c126d8b378aee87ab92279b1dfd Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 26 Jul 2021 22:33:02 +0200 Subject: [PATCH 173/200] snappy 1.1.8 --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index b0fb896..2adac1c 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1188,7 +1188,7 @@ in the @code{debug} output), and binutils."))) -(define-public snappy +(define-public snappy-1.1.8 (package (name "snappy") (version "1.1.8") From 1e3ca7145c0f6655fd4aa82ee8221af5c1a3c65d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 27 Jul 2021 10:06:40 +0200 Subject: [PATCH 174/200] syntax error ? --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 2adac1c..cf21228 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1222,7 +1222,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to (name "glicid-ceph") - (inputs `(("snappy",snappy@1.1.8) + (inputs `(("snappy",snappy-1.1.8) ,@(package-inputs ceph))) ) From 598d568c04d4e44e02718d0525a138f65d5df722 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 3 Aug 2021 14:05:36 +0200 Subject: [PATCH 175/200] bump ceph-14 versions --- gnu/packages/glicid.scm | 56 ++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index cf21228..d399907 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1186,48 +1186,40 @@ in the @code{debug} output), and binutils."))) ) +(define-public glicid-ceph-14 -(define-public snappy-1.1.8 - (package - (name "snappy") - (version "1.1.8") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/snappy") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1j0kslq2dvxgkcxl1gakhvsa731yrcvcaipcp5k8k7ayicvkv9jv")) - (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) - (home-page "https://github.com/google/snappy") - (synopsis "Fast compressor/decompressor") - (description "Snappy is a compression/decompression library. It does not -aim for maximum compression, or compatibility with any other compression library; -instead, it aims for very high speeds and reasonable compression. For instance, -compared to the fastest mode of zlib, Snappy is an order of magnitude faster -for most inputs, but the resulting compressed files are anywhere from 20% to -100% bigger.") - (license license:asl2.0))) - - -(define-public glicid-ceph (package (inherit ceph) - (name "glicid-ceph") + (name "glicid-ceph-14") + (version "14.2.21") + (source + (origin + + (method url-fetch) + (uri + (string-append "https://download.ceph.com/tarballs/ceph_" version ".orig.tar.gz") + ) + (sha256 + (base32 + "1hhdxrmp7a8n00kmx9s4bib84dvfal98x7i9c65p4q6nknlcdvdw" + ) + ) - (inputs `(("snappy",snappy-1.1.8) - ,@(package-inputs ceph))) + ) + ) + + + +; (inputs `(("snappy",snappy-1.1.8) +; ,@(package-inputs glicid-ceph))) ) ) +(define-public glicid-ceph glicid-ceph-14) + From ad74bb58ad4c452cfd15b266e702dd787d513fbc Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 3 Aug 2021 14:18:53 +0200 Subject: [PATCH 176/200] need old snappy --- gnu/packages/glicid.scm | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index d399907..caa80b4 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1186,6 +1186,35 @@ in the @code{debug} output), and binutils."))) ) +(define-public snappy-1.1.8 + (package + (name "snappy") + (version "1.1.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/snappy") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1j0kslq2dvxgkcxl1gakhvsa731yrcvcaipcp5k8k7ayicvkv9jv")) + (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) + (home-page "https://github.com/google/snappy") + (synopsis "Fast compressor/decompressor") + (description "Snappy is a compression/decompression library. It does not +aim for maximum compression, or compatibility with any other compression library; +instead, it aims for very high speeds and reasonable compression. For instance, +compared to the fastest mode of zlib, Snappy is an order of magnitude faster +for most inputs, but the resulting compressed files are anywhere from 20% to +100% bigger.") + (license license:asl2.0))) + + + (define-public glicid-ceph-14 @@ -1212,8 +1241,8 @@ in the @code{debug} output), and binutils."))) -; (inputs `(("snappy",snappy-1.1.8) -; ,@(package-inputs glicid-ceph))) + (inputs `(("snappy",snappy-1.1.8) + ,@(package-inputs glicid-ceph))) ) ) From 219a1d81899b687206d84f28ea61c573dc58872d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 3 Aug 2021 14:27:25 +0200 Subject: [PATCH 177/200] recurse error --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index caa80b4..e945558 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1242,7 +1242,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to (inputs `(("snappy",snappy-1.1.8) - ,@(package-inputs glicid-ceph))) + ,@(package-inputs ceph))) ) ) From 0805c16e9a73c33c7c3096c67aa3570a4abba670 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 3 Aug 2021 15:18:35 +0200 Subject: [PATCH 178/200] add qemu-with-rbd --- gnu/packages/glicid.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index e945558..1d5a10e 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -57,6 +57,8 @@ #:use-module (gnu packages maths) #:use-module (guix utils) #:use-module (gnu packages cmake) + #:use-module (gnu packages virtualization) + ) @@ -1249,6 +1251,42 @@ for most inputs, but the resulting compressed files are anywhere from 20% to (define-public glicid-ceph glicid-ceph-14) +(define-public qemu-with-rbd + + + (package + (inherit qemu) + (name "qemu-with-rbd") +; (arguments +; `(#:configure-flags +; (let ((gcc (string-append (assoc-ref %build-inputs "gcc") "/bin/gcc")) +; (out (assoc-ref %outputs "out"))) +; (list (string-append "--cc=" gcc) +; ;; Some architectures insist on using HOST_CC. +; (string-append "--host-cc=" gcc) +; (string-append "--prefix=" out) +; "--sysconfdir=/etc" +; (string-append "--smbd=" out "/libexec/samba-wrapper") +; "--disable-debug-info --enable-rbd" ;for space considerations +; ;; The binaries need to be linked against -lrt. +; (string-append "--extra-ldflags=-lrt"))) +; ;; Make build and test output verbose to facilitate investigation upon failure. +; )) + +; (arguments +; +; `(#:tests? #f) +; ) + + + + (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) + ,@(package-inputs qemu))) + + + + ) +) From b7c6b66123b10f5144627f2dcd1346f503b3ca74 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 6 Aug 2021 16:41:53 +0200 Subject: [PATCH 179/200] =?UTF-8?q?ceph=2015=20is=20here=E2=80=A6=0B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnu/packages/glicid.scm | 212 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 211 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 1d5a10e..90bd4f8 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1249,7 +1249,217 @@ for most inputs, but the resulting compressed files are anywhere from 20% to ) ) -(define-public glicid-ceph glicid-ceph-14) + +(define-public glicid-ceph-15 + (package + (name "glicid-ceph-15") + (version "15.2.14") + (source (origin + (method url-fetch) + (uri (string-append "https://download.ceph.com/tarballs/ceph-" + version ".tar.gz")) + (sha256 + (base32 + "12cz10aascr2h7xbxp9ba5207pn9qv6m50xp5f8ns80vj6lzi6d3")) +; (patches +; (search-patches "ceph-disable-cpu-optimizations.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + '(;; TODO: Unbundle these: + ;"src/isa-l" + ;"src/lua" + ;"src/xxHash" + ;"src/zstd" + ;"src/civetweb" + ;"src/seastar/fmt" + ; "src/test/downloads" + "src/c-ares" + "src/fmt" ;; YD + "src/googletest" + "src/rapidjson" + "src/spdk" + "src/rocksdb" + "src/boost")) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (lib (assoc-ref %outputs "lib")) + (libdir (string-append lib "/lib"))) + (list (string-append "-DCMAKE_INSTALL_PREFIX=" out) + (string-append "-DCMAKE_INSTALL_LIBDIR=" libdir) + (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" + lib "/include") + ;; We need both libdir and libdir/ceph in RUNPATH. + (string-append "-DCMAKE_INSTALL_RPATH=" + libdir ";" libdir "/ceph") + (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" out "/etc") + (string-append "-DCMAKE_INSTALL_DATADIR=" lib "/share") + (string-append "-DCMAKE_INSTALL_MANDIR=" out "/share/man") + (string-append "-DCMAKE_INSTALL_DOCDIR=" out "/share/ceph/doc") + (string-append "-DCMAKE_INSTALL_LIBEXECDIR=" out "/libexec") + (string-append "-DKEYUTILS_INCLUDE_DIR=" + (assoc-ref %build-inputs "keyutils") "/include") + (string-append "-DXFS_INCLUDE_DIR=" + (assoc-ref %build-inputs "xfsprogs") "/include") + "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" + "-DBUILD_SHARED_LIBS=ON" + "-DWITH_SYSTEM_ROCKSDB=ON" + "-DWITH_SYSTEM_BOOST=ON" + "-DWITH_PYTHON3=ON" + ;; TODO: Enable these when available in Guix. + "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" ;requires node + nodeenv + "-DWITH_BABELTRACE=OFF" + "-DWITH_LTTNG=OFF" + "-DWITH_SPDK=OFF" + "-DWITH_RADOSGW_AMQP_ENDPOINT=OFF" + + ;; Use jemalloc instead of tcmalloc. + "-DALLOCATOR=jemalloc" + + ;; Do not bother building the tests; we are not currently running + ;; them, and they do not build with system googletest as of 14.2.5. + "-DWITH_TESTS=OFF")) + ;; FIXME: Some of the tests leak Btrfs subvolumes on Btrfs. See + ;; for details. Disable tests until + ;; resolved. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (lib (assoc-ref outputs "lib"))) + + (substitute* "cmake/modules/Distutils.cmake" + ;; Prevent creation of Python eggs. + (("setup.py install") + "setup.py install --single-version-externally-managed --root=/")) + + (substitute* (find-files "src/pybind" "^setup\\.py$") + ;; Here we inject an extra line to the `setup.py' of the + ;; Python C libraries so RUNPATH gets set up correctly. +; (("^([[:blank:]]+)extra_compile_args=(.*)$" _ indent args) +; (string-append indent "extra_compile_args=" args +; indent "extra_link_args=['-Wl,-rpath=" +; lib "/lib'],\n"))) + + + (("^([[:blank:]]+)extra_link_args=(.*)$" _ indent args) + (string-append indent "extra_link_args=(['-Wl,-rpath=" lib "/lib'] + distutils.sysconfig.get_config_var('LDFLAGS').split() + \n"))) + + + ;; Statically link libcrc32 because it does not get installed, + ;; yet several libraries end up referring to it. + (substitute* "src/common/CMakeLists.txt" + (("add_library\\(crc32") + "add_library(crc32 STATIC")) + + (substitute* "udev/50-rbd.rules" + (("/usr/bin/ceph-rbdnamer") + (string-append out "/bin/ceph-rbdnamer"))) + #t))) + (add-before 'install 'set-install-environment + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (py3sitedir + (string-append out "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + ;; The Python install scripts refuses to function if + ;; the install directory is not on PYTHONPATH. + (setenv "PYTHONPATH" + (string-append py3sitedir ":" + (getenv "PYTHONPATH"))) + #t))) + (add-after 'install 'wrap-python-scripts + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (scripts '("ceph" "ceph-mgr" "ceph-volume")) + (prettytable (assoc-ref inputs "python-prettytable")) + (six (assoc-ref inputs "python-six")) + (sitedir (lambda (package) + (string-append package + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (PYTHONPATH (string-append + (sitedir out) ":" + (sitedir six) ":" + (sitedir prettytable)))) + (for-each (lambda (executable) + (wrap-program (string-append out "/bin/" executable) + `("PYTHONPATH" ":" prefix (,PYTHONPATH)))) + scripts) + #t)))))) + (outputs + '("out" "lib")) + (native-inputs + `(("gperf" ,gperf) + ("pkg-config" ,pkg-config) + ("python-cython" ,python-cython) + ("python-sphinx" ,python-sphinx) + ("yasm" ,yasm))) + (inputs + `(("boost" ,boost) + ("curl" ,curl) + ("cryptsetup" ,cryptsetup) + ("expat" ,expat) + ("fcgi" ,fcgi) + ("fmt",fmt) ;; maybe need v5 ? + ("fuse" ,fuse) + ("jemalloc" ,jemalloc) + ("keyutils" ,keyutils) + ("leveldb" ,leveldb) + ("libaio" ,libaio) + ("libatomic-ops" ,libatomic-ops) + ("libcap-ng" ,libcap-ng) + ("libnl" ,libnl) + ("librdkafka" ,librdkafka) + ("lua" ,lua) + ("lz4" ,lz4) + ("oath-toolkit" ,oath-toolkit) + ("openldap" ,openldap) + ("openssl" ,openssl) + ("ncurses" ,ncurses) + ("nss" ,nss) + ("python-prettytable" ,python-prettytable) ;used by ceph_daemon.py + ("python-six" ,python-six) ;for ceph-mgr + plugins + ("python" ,python-wrapper) + ("rapidjson" ,rapidjson) + ("rdma-core" ,rdma-core) + ("rocksdb" ,rocksdb) + ("snappy" ,snappy-1.1.8) + ("udev" ,eudev) + ("util-linux" ,util-linux) + ("util-linux:lib" ,util-linux "lib") + ("xfsprogs" ,xfsprogs) + ("zlib" ,zlib))) + (home-page "https://ceph.com/") + (synopsis "Distributed object store and file system") + (description + "Ceph is a distributed storage system designed for reliability and +performance. It provides network-based block devices (RBD), a POSIX +compliant file system (CephFS), and offers compatibility with various +storage protocols (S3, NFS, and others) through the RADOS gateway.") + ;; The Ceph libraries are LGPL2.1 and most of the utilities fall under + ;; GPL2. The installed erasure code plugins are BSD-3 licensed and do + ;; not use the GPL code. The source archive includes a number of files + ;; carrying other licenses; consult COPYING for more information. Note + ;; that COPYING does not cover third-party bundled software. + (license (list license:lgpl2.1 license:gpl2 ;some files are 'or later' + license:cc-by-sa3.0 ;documentation + license:bsd-3 ;isa-l,jerasure,++ + license:expat))) ;civetweb,java bindings + +) + +(define-public glicid-ceph glicid-ceph-15) (define-public qemu-with-rbd From d0f2ab1884117d71f9df85a04d8193d5713c0e56 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 6 Aug 2021 16:56:52 +0200 Subject: [PATCH 180/200] missing packages --- gnu/packages/glicid.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 90bd4f8..031b650 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -57,6 +57,8 @@ #:use-module (gnu packages maths) #:use-module (guix utils) #:use-module (gnu packages cmake) + #:use-module (gnu packages pretty-print) + #:use-module (gnu packages boost) #:use-module (gnu packages virtualization) From 53d62b12d9f82586936ce80770c51a9157b58438 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 6 Aug 2021 17:04:17 +0200 Subject: [PATCH 181/200] missing package --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 031b650..8056f11 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages cmake) #:use-module (gnu packages pretty-print) #:use-module (gnu packages boost) + #:use-module (gnu packages curl) #:use-module (gnu packages virtualization) From 1803d94878083b86cf94f06b120c4f0a8e5b100e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 6 Aug 2021 17:10:14 +0200 Subject: [PATCH 182/200] missing packages --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 8056f11..423b05e 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -60,6 +60,7 @@ #:use-module (gnu packages pretty-print) #:use-module (gnu packages boost) #:use-module (gnu packages curl) + #:use-module (gnu packages cryptsetup) #:use-module (gnu packages virtualization) From 141f4ed32214fcc2bc12a24fa0f291e56e11a8d1 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 6 Aug 2021 17:15:34 +0200 Subject: [PATCH 183/200] add missing package --- gnu/packages/glicid.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 423b05e..8d55beb 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages curl) #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages expat) #:use-module (gnu packages virtualization) From 3bd5ea6b3c05cf7c7dce316d640d15b02afb9176 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 6 Aug 2021 17:17:34 +0200 Subject: [PATCH 184/200] missing package --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 8d55beb..6449c9b 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -61,7 +61,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages curl) #:use-module (gnu packages cryptsetup) - #:use-module (gnu packages expat) + #:use-module (gnu packages xml) #:use-module (gnu packages virtualization) From 4a937f69152ba4dd30ce9c834d2fc16404289292 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 6 Aug 2021 17:23:30 +0200 Subject: [PATCH 185/200] need to undup all modules. --- gnu/packages/glicid.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 6449c9b..821b1a7 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -62,6 +62,33 @@ #:use-module (gnu packages curl) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages xml) + #:use-module (gnu packages admin) + #:use-module (gnu packages assembly) + #:use-module (gnu packages authentication) + #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages boost) + #:use-module (gnu packages compression) + #: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) From 35cc460db46698245f74f1ed10ec9c617ebeefe9 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 31 Aug 2021 22:21:55 +0200 Subject: [PATCH 186/200] add qemu 6.1 --- gnu/packages/glicid.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 821b1a7..a0514f4 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1255,7 +1255,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to (package (inherit ceph) (name "glicid-ceph-14") - (version "14.2.21") + (version "14.2.22") (source (origin @@ -1493,6 +1493,29 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") (define-public glicid-ceph glicid-ceph-15) +(define-public glicid-qemu + + (package + (inherit qemu) + (name "glicid-qemu") + (version "6.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.qemu.org/qemu-" + version ".tar.xz")) + (sha256 + (base32 + "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f")) + ) + ) + + + ) +) + + + (define-public qemu-with-rbd From 7318988f6d56cf72dad0c923dcde1418fd091bc5 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 31 Aug 2021 23:20:29 +0200 Subject: [PATCH 187/200] change qemu with rbd to 6.1 --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index a0514f4..dc5d110 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1520,7 +1520,7 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") (package - (inherit qemu) + (inherit glicid-qemu) (name "qemu-with-rbd") ; (arguments ; `(#:configure-flags @@ -1546,7 +1546,7 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) - ,@(package-inputs qemu))) + ,@(package-inputs glicid-qemu))) From d858d31af4ab2fa0667b823bd62d76fdb05c4ca8 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 2 Sep 2021 21:34:07 +0200 Subject: [PATCH 188/200] bump libfido version --- gnu/packages/glicid.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index dc5d110..c15398d 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1092,7 +1092,7 @@ in the @code{debug} output), and binutils."))) (package (name "glicid-libfido2") - (version "1.7.0") + (version "1.8.0") (source (origin @@ -1102,7 +1102,7 @@ in the @code{debug} output), and binutils."))) ; (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "13khkp2q8g447797l09p83qxy0z8vgmzr54l8dcnapy9lsr4jrqi")) + "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm")) )) From f9bbd6b4f4fedb08a687651f6962c7ea4605c0f1 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 6 Sep 2021 21:02:48 +0200 Subject: [PATCH 189/200] try without tests --- gnu/packages/glicid.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 821b1a7..15aacb5 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1515,10 +1515,10 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") ; ;; Make build and test output verbose to facilitate investigation upon failure. ; )) -; (arguments -; -; `(#:tests? #f) -; ) + (arguments + + `(#:tests? #f) + ) From f8fc8bbfe82ac846bc4ab1e87092a71ef23d39bf Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 6 Sep 2021 21:24:24 +0200 Subject: [PATCH 190/200] no tests on qemu --- gnu/packages/glicid.scm | 147 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 143 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 6da60f3..44480fd 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1538,11 +1538,150 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") ; ;; Make build and test output verbose to facilitate investigation upon failure. ; )) - (arguments - - `(#:tests? #f) - ) +; (arguments +; +; `(#:tests? #f) +; ) +(arguments + ;; FIXME: Disable tests on i686 to work around + ;; . + `(#:tests? #f +; ,(or (%current-target-system) +; (not (string=? "i686-linux" (%current-system)))) + #:configure-flags + (let ((gcc (string-append (assoc-ref %build-inputs "gcc") "/bin/gcc")) + (out (assoc-ref %outputs "out"))) + (list (string-append "--cc=" gcc) + ;; Some architectures insist on using HOST_CC. + (string-append "--host-cc=" gcc) + (string-append "--prefix=" out) + "--sysconfdir=/etc" + (string-append "--smbd=" out "/libexec/samba-wrapper") + "--disable-debug-info" ;for space considerations + ;; The binaries need to be linked against -lrt. + (string-append "--extra-ldflags=-lrt"))) + ;; Make build and test output verbose to facilitate investigation upon failure. + #:make-flags '("V=1") + #:modules ((srfi srfi-1) + (srfi srfi-26) + (ice-9 ftw) + (ice-9 match) + ,@%gnu-build-system-modules) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'extend-test-time-outs + (lambda _ + ;; These tests can time out on heavily-loaded and/or slow storage. + (substitute* (cons* "tests/qemu-iotests/common.qemu" + (find-files "tests/qemu-iotests" "^[0-9]+$")) + (("QEMU_COMM_TIMEOUT=[0-9]+" match) + (string-append match "9"))))) + (add-after 'unpack 'disable-unusable-tests + (lambda _ + (substitute* "tests/unit/meson.build" + ;; Comment out the test-qga test, which needs /sys and + ;; fails within the build environment. + (("tests.*test-qga.*$" all) + (string-append "# " all)) + ;; Comment out the test-char test, which needs networking and + ;; fails within the build environment. + ((".*'test-char':.*" all) + (string-append "# " all))))) + (add-after 'patch-source-shebangs 'patch-embedded-shebangs + (lambda _ + ;; Ensure the executables created by these source files reference + ;; /bin/sh from the store so they work inside the build container. + (substitute* '("block/cloop.c" "migration/exec.c" + "net/tap.c" "tests/qtest/libqtest.c") + (("/bin/sh") (which "sh"))) + (substitute* "Makefile" + (("SHELL = /usr/bin/env bash -o pipefail") + "SHELL = bash -o pipefail")) + (substitute* "tests/qemu-iotests/check" + (("#!/usr/bin/env python3") + (string-append "#!" (which "python3")))))) + (add-before 'configure 'fix-optionrom-makefile + (lambda _ + ;; Work around the inability of the rules defined in this + ;; Makefile to locate the firmware files (e.g.: No rule to make + ;; target 'multiboot.bin') by extending the VPATH. + (substitute* "pc-bios/optionrom/Makefile" + (("^VPATH = \\$\\(SRC_DIR\\)") + "VPATH = $(SRC_DIR):$(TOPSRC_DIR)/pc-bios")))) + ;; XXX ./configure is being re-run at beginning of build phase... + (replace 'configure + (lambda* (#:key inputs outputs configure-flags #:allow-other-keys) + ;; The `configure' script doesn't understand some of the + ;; GNU options. Thus, add a new phase that's compatible. + (let ((out (assoc-ref outputs "out"))) + (setenv "SHELL" (which "bash")) + ;; Ensure config.status gets the correct shebang off the bat. + ;; The build system gets confused if we change it later and + ;; attempts to re-run the whole configuration, and fails. + (substitute* "configure" + (("#!/bin/sh") + (string-append "#!" (which "sh")))) + (mkdir-p "b/qemu") + (chdir "b/qemu") + (apply invoke "../../configure" configure-flags)))) + ;; Configure, build and install QEMU user-emulation static binaries. + (add-after 'configure 'configure-user-static + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((gcc (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + (static (assoc-ref outputs "static")) + ;; This is the common set of configure flags; it is + ;; duplicated here to isolate this phase from manipulations + ;; to the #:configure-flags build argument, as done in + ;; derived packages such as qemu-minimal. + (configure-flags (list (string-append "--cc=" gcc) + (string-append "--host-cc=" gcc) + "--sysconfdir=/etc" + "--disable-debug-info"))) + (mkdir-p "../user-static") + (with-directory-excursion "../user-static" + (apply invoke "../../configure" + "--static" + "--disable-docs" ;already built + "--disable-system" + "--enable-linux-user" + (string-append "--prefix=" static) + configure-flags))))) + (add-after 'build 'build-user-static + (lambda args + (with-directory-excursion "../user-static" + (apply (assoc-ref %standard-phases 'build) args)))) + (add-after 'install 'install-user-static + (lambda* (#:key outputs #:allow-other-keys) + (let* ((static (assoc-ref outputs "static")) + (bin (string-append static "/bin"))) + (with-directory-excursion "../user-static" + (for-each (cut install-file <> bin) + (append-map (cut find-files <> "^qemu-" #:stat stat) + (scandir "." + (cut string-suffix? + "-linux-user" <>)))))))) + ;; Create a wrapper for Samba. This allows QEMU to use Samba without + ;; pulling it in as an input. Note that you need to explicitly install + ;; Samba in your Guix profile for Samba support. + (add-after 'install 'create-samba-wrapper + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libexec (string-append out "/libexec"))) + (call-with-output-file "samba-wrapper" + (lambda (port) + (format port "#!/bin/sh +exec smbd $@"))) + (chmod "samba-wrapper" #o755) + (install-file "samba-wrapper" libexec)))) + (add-after 'install 'move-html-doc + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (qemu-doc (string-append doc "/share/doc/qemu-" ,version))) + (mkdir-p qemu-doc) + (rename-file (string-append out "/share/doc/qemu") + (string-append qemu-doc "/html")))))))) (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) From 5aeda79296343bf8ae00e21e2f93f452c18a6a94 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 6 Sep 2021 21:34:41 +0200 Subject: [PATCH 191/200] chnages. --- gnu/packages/glicid.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 44480fd..598bc38 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1546,9 +1546,11 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") (arguments ;; FIXME: Disable tests on i686 to work around ;; . - `(#:tests? #f -; ,(or (%current-target-system) -; (not (string=? "i686-linux" (%current-system)))) + + `(#:tests? ,(or (%current-target-system) + (not (string=? "x86_64-linux" (%current-system)))) + + #:configure-flags (let ((gcc (string-append (assoc-ref %build-inputs "gcc") "/bin/gcc")) (out (assoc-ref %outputs "out"))) From a748f499eabbd4877aec51e7430c3961198a2bf5 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 6 Sep 2021 21:54:14 +0200 Subject: [PATCH 192/200] tests --- gnu/packages/glicid.scm | 150 ++-------------------------------------- 1 file changed, 7 insertions(+), 143 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 598bc38..1e54d25 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1538,152 +1538,16 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") ; ;; Make build and test output verbose to facilitate investigation upon failure. ; )) -; (arguments -; -; `(#:tests? #f) -; ) + (arguments -(arguments - ;; FIXME: Disable tests on i686 to work around - ;; . - - `(#:tests? ,(or (%current-target-system) - (not (string=? "x86_64-linux" (%current-system)))) + (substitute-keyword-arguments + `(#:tests? #f + ,@(package-arguments glicid-qemu))) - #:configure-flags - (let ((gcc (string-append (assoc-ref %build-inputs "gcc") "/bin/gcc")) - (out (assoc-ref %outputs "out"))) - (list (string-append "--cc=" gcc) - ;; Some architectures insist on using HOST_CC. - (string-append "--host-cc=" gcc) - (string-append "--prefix=" out) - "--sysconfdir=/etc" - (string-append "--smbd=" out "/libexec/samba-wrapper") - "--disable-debug-info" ;for space considerations - ;; The binaries need to be linked against -lrt. - (string-append "--extra-ldflags=-lrt"))) - ;; Make build and test output verbose to facilitate investigation upon failure. - #:make-flags '("V=1") - #:modules ((srfi srfi-1) - (srfi srfi-26) - (ice-9 ftw) - (ice-9 match) - ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'extend-test-time-outs - (lambda _ - ;; These tests can time out on heavily-loaded and/or slow storage. - (substitute* (cons* "tests/qemu-iotests/common.qemu" - (find-files "tests/qemu-iotests" "^[0-9]+$")) - (("QEMU_COMM_TIMEOUT=[0-9]+" match) - (string-append match "9"))))) - (add-after 'unpack 'disable-unusable-tests - (lambda _ - (substitute* "tests/unit/meson.build" - ;; Comment out the test-qga test, which needs /sys and - ;; fails within the build environment. - (("tests.*test-qga.*$" all) - (string-append "# " all)) - ;; Comment out the test-char test, which needs networking and - ;; fails within the build environment. - ((".*'test-char':.*" all) - (string-append "# " all))))) - (add-after 'patch-source-shebangs 'patch-embedded-shebangs - (lambda _ - ;; Ensure the executables created by these source files reference - ;; /bin/sh from the store so they work inside the build container. - (substitute* '("block/cloop.c" "migration/exec.c" - "net/tap.c" "tests/qtest/libqtest.c") - (("/bin/sh") (which "sh"))) - (substitute* "Makefile" - (("SHELL = /usr/bin/env bash -o pipefail") - "SHELL = bash -o pipefail")) - (substitute* "tests/qemu-iotests/check" - (("#!/usr/bin/env python3") - (string-append "#!" (which "python3")))))) - (add-before 'configure 'fix-optionrom-makefile - (lambda _ - ;; Work around the inability of the rules defined in this - ;; Makefile to locate the firmware files (e.g.: No rule to make - ;; target 'multiboot.bin') by extending the VPATH. - (substitute* "pc-bios/optionrom/Makefile" - (("^VPATH = \\$\\(SRC_DIR\\)") - "VPATH = $(SRC_DIR):$(TOPSRC_DIR)/pc-bios")))) - ;; XXX ./configure is being re-run at beginning of build phase... - (replace 'configure - (lambda* (#:key inputs outputs configure-flags #:allow-other-keys) - ;; The `configure' script doesn't understand some of the - ;; GNU options. Thus, add a new phase that's compatible. - (let ((out (assoc-ref outputs "out"))) - (setenv "SHELL" (which "bash")) - ;; Ensure config.status gets the correct shebang off the bat. - ;; The build system gets confused if we change it later and - ;; attempts to re-run the whole configuration, and fails. - (substitute* "configure" - (("#!/bin/sh") - (string-append "#!" (which "sh")))) - (mkdir-p "b/qemu") - (chdir "b/qemu") - (apply invoke "../../configure" configure-flags)))) - ;; Configure, build and install QEMU user-emulation static binaries. - (add-after 'configure 'configure-user-static - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((gcc (string-append (assoc-ref inputs "gcc") "/bin/gcc")) - (static (assoc-ref outputs "static")) - ;; This is the common set of configure flags; it is - ;; duplicated here to isolate this phase from manipulations - ;; to the #:configure-flags build argument, as done in - ;; derived packages such as qemu-minimal. - (configure-flags (list (string-append "--cc=" gcc) - (string-append "--host-cc=" gcc) - "--sysconfdir=/etc" - "--disable-debug-info"))) - (mkdir-p "../user-static") - (with-directory-excursion "../user-static" - (apply invoke "../../configure" - "--static" - "--disable-docs" ;already built - "--disable-system" - "--enable-linux-user" - (string-append "--prefix=" static) - configure-flags))))) - (add-after 'build 'build-user-static - (lambda args - (with-directory-excursion "../user-static" - (apply (assoc-ref %standard-phases 'build) args)))) - (add-after 'install 'install-user-static - (lambda* (#:key outputs #:allow-other-keys) - (let* ((static (assoc-ref outputs "static")) - (bin (string-append static "/bin"))) - (with-directory-excursion "../user-static" - (for-each (cut install-file <> bin) - (append-map (cut find-files <> "^qemu-" #:stat stat) - (scandir "." - (cut string-suffix? - "-linux-user" <>)))))))) - ;; Create a wrapper for Samba. This allows QEMU to use Samba without - ;; pulling it in as an input. Note that you need to explicitly install - ;; Samba in your Guix profile for Samba support. - (add-after 'install 'create-samba-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libexec (string-append out "/libexec"))) - (call-with-output-file "samba-wrapper" - (lambda (port) - (format port "#!/bin/sh -exec smbd $@"))) - (chmod "samba-wrapper" #o755) - (install-file "samba-wrapper" libexec)))) - (add-after 'install 'move-html-doc - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (qemu-doc (string-append doc "/share/doc/qemu-" ,version))) - (mkdir-p qemu-doc) - (rename-file (string-append out "/share/doc/qemu") - (string-append qemu-doc "/html")))))))) + + ) + (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) From 7d4e08f4ed93521e557fdecb678f36b07067eeff Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 16 Sep 2021 15:06:32 +0200 Subject: [PATCH 193/200] back to 6.0.0 for qemu --- gnu/packages/glicid.scm | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 1e54d25..6dbf1db 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -621,7 +621,7 @@ in the @code{debug} output), and binutils."))) (package (inherit rdma-core) (name "glicid-specific-rdma-core-gcc-11") - (version "34.0") + (version "36.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -1498,7 +1498,8 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") (package (inherit qemu) (name "glicid-qemu") - (version "6.1.0") +; (version "6.1.0") ;; hang on check with version 6.1.0 + (version "6.0.0") (source (origin (method url-fetch) @@ -1506,55 +1507,35 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") version ".tar.xz")) (sha256 (base32 - "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f")) +; 6.1.0 ; "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f") + "1f9hz8rf12jm8baa7kda34yl4hyl0xh0c4ap03krfjx23i3img47" + ) + ) ) + + ) - - - ) + ) ) - (define-public qemu-with-rbd (package (inherit glicid-qemu) (name "qemu-with-rbd") -; (arguments -; `(#:configure-flags -; (let ((gcc (string-append (assoc-ref %build-inputs "gcc") "/bin/gcc")) -; (out (assoc-ref %outputs "out"))) -; (list (string-append "--cc=" gcc) -; ;; Some architectures insist on using HOST_CC. -; (string-append "--host-cc=" gcc) -; (string-append "--prefix=" out) -; "--sysconfdir=/etc" -; (string-append "--smbd=" out "/libexec/samba-wrapper") -; "--disable-debug-info --enable-rbd" ;for space considerations -; ;; The binaries need to be linked against -lrt. -; (string-append "--extra-ldflags=-lrt"))) -; ;; Make build and test output verbose to facilitate investigation upon failure. -; )) - (arguments (substitute-keyword-arguments `(#:tests? #f ,@(package-arguments glicid-qemu))) - - ) - - (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) ,@(package-inputs glicid-qemu))) - - ) ) From 5101a905202186d306a8b67583e5606661b10b75 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 16 Sep 2021 15:28:39 +0200 Subject: [PATCH 194/200] cheksum change --- gnu/packages/glicid.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 6dbf1db..34b6126 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -629,7 +629,9 @@ in the @code{debug} output), and binutils."))) version ".tar.gz")) (sha256 (base32 - "1s4b80jzdi2m6j5aix3mxl6iafgbqp88pfxy7568zxwc8rkcz71x")))) +;; "1s4b80jzdi2m6j5aix3mxl6iafgbqp88pfxy7568zxwc8rkcz71x" + "13ccvy3qv5b87g3b5q86gjv4wkgv86dlm9xbmii5aiy3i10ym48l" +)))) (inputs `(("gcc", gcc-11) ,@(package-inputs rdma-core))) @@ -1516,7 +1518,7 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") ) ) -) + ) (define-public qemu-with-rbd From f2fcab1db58d66935822d973e230c9dd29e3daad Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 13 Oct 2021 09:30:29 +0200 Subject: [PATCH 195/200] use same version (qemu 6.1) --- gnu/packages/glicid.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 34b6126..92804b2 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1501,22 +1501,22 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") (inherit qemu) (name "glicid-qemu") ; (version "6.1.0") ;; hang on check with version 6.1.0 - (version "6.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.qemu.org/qemu-" - version ".tar.xz")) - (sha256 - (base32 -; 6.1.0 ; "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f") - "1f9hz8rf12jm8baa7kda34yl4hyl0xh0c4ap03krfjx23i3img47" - ) - ) - ) +; (version "6.0.0") +; (source +; (origin +; (method url-fetch) +; (uri (string-append "https://download.qemu.org/qemu-" +; version ".tar.xz")) +; (sha256 +; (base32 +;; 6.1.0 ; "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f") +; "1f9hz8rf12jm8baa7kda34yl4hyl0xh0c4ap03krfjx23i3img47" +; ) +; ) +; ) - ) +; ) ) ) From 52d3f0db2a8a3619b78c155f2b560085fdf03a8a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 18 Oct 2021 18:05:35 +0200 Subject: [PATCH 196/200] rename glicid-ceph-15 -> ceph-15 --- gnu/packages/glicid.scm | 85 ++--------------------------------------- 1 file changed, 3 insertions(+), 82 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 92804b2..00c952f 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1222,71 +1222,9 @@ in the @code{debug} output), and binutils."))) ) -(define-public snappy-1.1.8 +(define-public ceph-15 (package - (name "snappy") - (version "1.1.8") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/snappy") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1j0kslq2dvxgkcxl1gakhvsa731yrcvcaipcp5k8k7ayicvkv9jv")) - (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) - (home-page "https://github.com/google/snappy") - (synopsis "Fast compressor/decompressor") - (description "Snappy is a compression/decompression library. It does not -aim for maximum compression, or compatibility with any other compression library; -instead, it aims for very high speeds and reasonable compression. For instance, -compared to the fastest mode of zlib, Snappy is an order of magnitude faster -for most inputs, but the resulting compressed files are anywhere from 20% to -100% bigger.") - (license license:asl2.0))) - - - -(define-public glicid-ceph-14 - - - (package - (inherit ceph) - (name "glicid-ceph-14") - (version "14.2.22") - (source - (origin - - (method url-fetch) - (uri - (string-append "https://download.ceph.com/tarballs/ceph_" version ".orig.tar.gz") - ) - (sha256 - (base32 - "1hhdxrmp7a8n00kmx9s4bib84dvfal98x7i9c65p4q6nknlcdvdw" - ) - ) - - - ) - ) - - - - (inputs `(("snappy",snappy-1.1.8) - ,@(package-inputs ceph))) - - ) -) - - -(define-public glicid-ceph-15 - (package - (name "glicid-ceph-15") + (name "ceph-15") (version "15.2.14") (source (origin (method url-fetch) @@ -1493,30 +1431,13 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") ) -(define-public glicid-ceph glicid-ceph-15) +(define-public glicid-ceph ceph-15) (define-public glicid-qemu (package (inherit qemu) (name "glicid-qemu") -; (version "6.1.0") ;; hang on check with version 6.1.0 -; (version "6.0.0") -; (source -; (origin -; (method url-fetch) -; (uri (string-append "https://download.qemu.org/qemu-" -; version ".tar.xz")) -; (sha256 -; (base32 -;; 6.1.0 ; "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f") -; "1f9hz8rf12jm8baa7kda34yl4hyl0xh0c4ap03krfjx23i3img47" -; ) -; ) -; ) - - -; ) ) ) From ad1359fdad5964b8236ca69a9db1a000ad22dfd9 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 18 Oct 2021 18:12:40 +0200 Subject: [PATCH 197/200] plus besoin de snappy specifique --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 00c952f..6b49763 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1406,7 +1406,7 @@ in the @code{debug} output), and binutils."))) ("rapidjson" ,rapidjson) ("rdma-core" ,rdma-core) ("rocksdb" ,rocksdb) - ("snappy" ,snappy-1.1.8) +; ("snappy" ,snappy-1.1.8) ("udev" ,eudev) ("util-linux" ,util-linux) ("util-linux:lib" ,util-linux "lib") From 1cfba51d04c45fdf1ff8f1845db9cf2754870eb0 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 18 Oct 2021 18:14:21 +0200 Subject: [PATCH 198/200] package simplification --- gnu/packages/glicid.scm | 117 +--------------------------------------- 1 file changed, 1 insertion(+), 116 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 6b49763..7c74def 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1224,6 +1224,7 @@ in the @code{debug} output), and binutils."))) (define-public ceph-15 (package + (inherit ceph) (name "ceph-15") (version "15.2.14") (source (origin @@ -1233,8 +1234,6 @@ in the @code{debug} output), and binutils."))) (sha256 (base32 "12cz10aascr2h7xbxp9ba5207pn9qv6m50xp5f8ns80vj6lzi6d3")) -; (patches -; (search-patches "ceph-disable-cpu-optimizations.patch")) (modules '((guix build utils))) (snippet '(begin @@ -1255,120 +1254,6 @@ in the @code{debug} output), and binutils."))) "src/rocksdb" "src/boost")) #t)))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - (let* ((out (assoc-ref %outputs "out")) - (lib (assoc-ref %outputs "lib")) - (libdir (string-append lib "/lib"))) - (list (string-append "-DCMAKE_INSTALL_PREFIX=" out) - (string-append "-DCMAKE_INSTALL_LIBDIR=" libdir) - (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" - lib "/include") - ;; We need both libdir and libdir/ceph in RUNPATH. - (string-append "-DCMAKE_INSTALL_RPATH=" - libdir ";" libdir "/ceph") - (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" out "/etc") - (string-append "-DCMAKE_INSTALL_DATADIR=" lib "/share") - (string-append "-DCMAKE_INSTALL_MANDIR=" out "/share/man") - (string-append "-DCMAKE_INSTALL_DOCDIR=" out "/share/ceph/doc") - (string-append "-DCMAKE_INSTALL_LIBEXECDIR=" out "/libexec") - (string-append "-DKEYUTILS_INCLUDE_DIR=" - (assoc-ref %build-inputs "keyutils") "/include") - (string-append "-DXFS_INCLUDE_DIR=" - (assoc-ref %build-inputs "xfsprogs") "/include") - "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" - "-DBUILD_SHARED_LIBS=ON" - "-DWITH_SYSTEM_ROCKSDB=ON" - "-DWITH_SYSTEM_BOOST=ON" - "-DWITH_PYTHON3=ON" - ;; TODO: Enable these when available in Guix. - "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" ;requires node + nodeenv - "-DWITH_BABELTRACE=OFF" - "-DWITH_LTTNG=OFF" - "-DWITH_SPDK=OFF" - "-DWITH_RADOSGW_AMQP_ENDPOINT=OFF" - - ;; Use jemalloc instead of tcmalloc. - "-DALLOCATOR=jemalloc" - - ;; Do not bother building the tests; we are not currently running - ;; them, and they do not build with system googletest as of 14.2.5. - "-DWITH_TESTS=OFF")) - ;; FIXME: Some of the tests leak Btrfs subvolumes on Btrfs. See - ;; for details. Disable tests until - ;; resolved. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (lib (assoc-ref outputs "lib"))) - - (substitute* "cmake/modules/Distutils.cmake" - ;; Prevent creation of Python eggs. - (("setup.py install") - "setup.py install --single-version-externally-managed --root=/")) - - (substitute* (find-files "src/pybind" "^setup\\.py$") - ;; Here we inject an extra line to the `setup.py' of the - ;; Python C libraries so RUNPATH gets set up correctly. -; (("^([[:blank:]]+)extra_compile_args=(.*)$" _ indent args) -; (string-append indent "extra_compile_args=" args -; indent "extra_link_args=['-Wl,-rpath=" -; lib "/lib'],\n"))) - - - (("^([[:blank:]]+)extra_link_args=(.*)$" _ indent args) - (string-append indent "extra_link_args=(['-Wl,-rpath=" lib "/lib'] + distutils.sysconfig.get_config_var('LDFLAGS').split() + \n"))) - - - ;; Statically link libcrc32 because it does not get installed, - ;; yet several libraries end up referring to it. - (substitute* "src/common/CMakeLists.txt" - (("add_library\\(crc32") - "add_library(crc32 STATIC")) - - (substitute* "udev/50-rbd.rules" - (("/usr/bin/ceph-rbdnamer") - (string-append out "/bin/ceph-rbdnamer"))) - #t))) - (add-before 'install 'set-install-environment - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (py3sitedir - (string-append out "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages"))) - ;; The Python install scripts refuses to function if - ;; the install directory is not on PYTHONPATH. - (setenv "PYTHONPATH" - (string-append py3sitedir ":" - (getenv "PYTHONPATH"))) - #t))) - (add-after 'install 'wrap-python-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (scripts '("ceph" "ceph-mgr" "ceph-volume")) - (prettytable (assoc-ref inputs "python-prettytable")) - (six (assoc-ref inputs "python-six")) - (sitedir (lambda (package) - (string-append package - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages"))) - (PYTHONPATH (string-append - (sitedir out) ":" - (sitedir six) ":" - (sitedir prettytable)))) - (for-each (lambda (executable) - (wrap-program (string-append out "/bin/" executable) - `("PYTHONPATH" ":" prefix (,PYTHONPATH)))) - scripts) - #t)))))) (outputs '("out" "lib")) (native-inputs From 3f0a87b56cd3fbac8cadd34723c0d15ea1d9f33f Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 18 Oct 2021 18:34:31 +0200 Subject: [PATCH 199/200] il manquait la version de snappy --- gnu/packages/glicid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 7c74def..c6e0f3e 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1291,7 +1291,7 @@ in the @code{debug} output), and binutils."))) ("rapidjson" ,rapidjson) ("rdma-core" ,rdma-core) ("rocksdb" ,rocksdb) -; ("snappy" ,snappy-1.1.8) + ("snappy" ,snappy) ("udev" ,eudev) ("util-linux" ,util-linux) ("util-linux:lib" ,util-linux "lib") From 1cc90d25a4279ee72d150410055788b0281d9dc6 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 18 Oct 2021 18:49:51 +0200 Subject: [PATCH 200/200] =?UTF-8?q?patches=20ceph=20(non=20h=C3=A9rit?= =?UTF-8?q?=C3=A9s=20=3F=3F)=0B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnu/packages/glicid.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index c6e0f3e..8dcfdb6 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -1234,6 +1234,10 @@ in the @code{debug} output), and binutils."))) (sha256 (base32 "12cz10aascr2h7xbxp9ba5207pn9qv6m50xp5f8ns80vj6lzi6d3")) + (patches + (search-patches + "ceph-fix-snappy-breaking-change.patch")) + (modules '((guix build utils))) (snippet '(begin