From 6721cabcb1ef81bf22847a2a8e5cb1ea16d1c926 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 22 Oct 2021 22:40:05 +0200 Subject: [PATCH 01/89] change name --- glicid/packages/glicid-openldap.scm | 166 --------------------------- glicid/packages/openldap.scm | 169 ++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 166 deletions(-) delete mode 100644 glicid/packages/glicid-openldap.scm create mode 100644 glicid/packages/openldap.scm diff --git a/glicid/packages/glicid-openldap.scm b/glicid/packages/glicid-openldap.scm deleted file mode 100644 index 9fffdab..0000000 --- a/glicid/packages/glicid-openldap.scm +++ /dev/null @@ -1,166 +0,0 @@ -(use-modules (guix) - (guix build-system gnu) - ((guix licenses) #:select (openldap2.8 lgpl2.1+ gpl3+ psfl expat)) - (guix packages) - (guix utils) - (guix download) - (guix build-system gnu) - (gnu packages base) - (gnu packages autotools) - (gnu packages check) - (gnu packages compression) - (gnu packages cyrus-sasl) - (gnu packages dbm) - (gnu packages documentation) - (gnu packages gettext) - (gnu packages gnupg) - (gnu packages groff) - (gnu packages icu4c) - (gnu packages kerberos) - (gnu packages libevent) - (gnu packages linux) - (gnu packages networking) - (gnu packages nss) - (gnu packages password-utils) - (gnu packages pcre) - (gnu packages perl) - (gnu packages pkg-config) - (gnu packages python) - (gnu packages python-xyz) - (gnu packages rsync) - (gnu packages selinux) - (gnu packages time) - (gnu packages tls) - (gnu packages web) - (gnu packages databases) - (gnu packages password-utils) -) - -(define-public openldap-glicid - (package - (name "openldap-glicid") - (version "2.5.7") - (synopsis "Implementation of the Lightweight Directory Access Protocol") - (description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.") - (license openldap2.8) - (home-page "https://www.openldap.org/") - (source (origin - (method url-fetch) - (uri (list - (string-append "https://www.openldap.org/software/download/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "http://gpl.savoirfairelinux.net/pub/mirrors/openldap/" "openldap-release/openldap-" version ".tgz") - (string-append "http://repository.linagora.org/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "ftp://ftp.ntua.gr/mirror/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "https://mirror-hk.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "https://mirror.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "https://mirror.lyrahosting.com/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - )) - (sha256 ( base32 "1ayr76sa5hjwldqzis5v71sbp88hd3hysc00gw1raqn33c05g5za" )) - ) - ) - (build-system gnu-build-system) - (inputs `( - ("bdb", bdb) - ("cyrus-sasl", cyrus-sasl) - ("gnutls", gnutls) - ("libgcrypt", libgcrypt) - ("zlib", zlib) - ("libltdl", libltdl) - ("pkg-config", pkg-config) - ("libevent", libevent) - ("libtool", libtool) - ("groff", groff) - ("openssl", openssl) - ("argon2", argon2) - ("wiredtiger", wiredtiger) - ("snappy", snappy) - ("lz4", lz4) - )) - (arguments '( - ; this is needed because the make check does not work inside guix - #:tests? #f - #:configure-flags '( - "--enable-debug" "--enable-dynamic" "--enable-syslog" "--enable-ipv6" "--enable-local" "--enable-slapd" "--enable-dynacl" - "--enable-aci" "--enable-cleartext" "--enable-crypt" "--enable-spasswd" "--enable-modules" "--enable-rlookups" "--enable-slapi" - "--enable-backends=mod" "--enable-overlays=mod" "--enable-argon2" "--enable-balancer" "--disable-static" - "--enable-shared" "--with-tls=openssl" - ) - ; Disable install stripping as it breaks cross-compiling. - #:make-flags '("STRIP=") - #:phases (modify-phases %standard-phases - (add-before 'build 'make-depend - (lambda* (#:key input #:allow-other-keys) - (invoke "make" "depend") - ) - ) - ) - )) - ) - (define-record-type* - openldap-configuration make-openldap-configuration - openldap-configuration? - (openldap openldap-configuration-openldap ; - (default openldap-glicid) - ) - (arguments openldap-configuration-arguments ;list of strings - (default '()) - ) - (logflags openldap-configuration-logflags ;number - (default "0") - ) - (log-file openldap-configuration-log-file ; string - (default "/var/log/slapd.log") - ) - (pid-file openldap-configuration-pid-file ; string - (default "/var/run/openldap/slapd.pid") - ) - (config-file openldap-configuration-config-file ; string - (default %default-slapd.conf) - ) - (schema-dir openldap-configuration-schema-dir ; string - (default '()) - ) - ) - (define %default-slapd.conf - (plain-file "slapd.conf" " - # Empty file for test - ")) - (define schema_dir (local-file "ldap_schema" #:recursive? #t)) - (define openldap-shepherd-service - (match-lambda - (($ openldap arguments logflags log-file pid-file config-file schema-dir) - (list - (shepherd-service - (provision '(slapd) ) - (documentation "Run openldap.") - (requirement '(user-processes)) - (respawn? #f) - (start #~(make-forkexec-constructor - (list - #$(file-append openldap-glicid "/libexec/slapd") - "-h 'ldap:/// ldaps:///'" - "-d" #$logflags - "-f" #$config-file - ) - #:pid-file #$pid-file - )) - (stop #~(make-kill-destructor)) - ) - ) - ) - ) - ) - (define openldap-service-type - (service-type (name 'slapd) - (extensions - (list ( - service-extension - shepherd-root-service-type - openldap-shepherd-service - )) - ) - (description "Run @uref{https://www.openldap.org, Openldap} community developped LDAP software.") - ) - ) -) diff --git a/glicid/packages/openldap.scm b/glicid/packages/openldap.scm new file mode 100644 index 0000000..5008b37 --- /dev/null +++ b/glicid/packages/openldap.scm @@ -0,0 +1,169 @@ +(define-module (glicid packages openldap) + #:use-module (guix) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:select (openldap2.8 lgpl2.1+ gpl3+ psfl expat)) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages base) + #:use-module (gnu packages autotools) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages dbm) + #:use-module (gnu packages documentation) + #:use-module (gnu packages gettext) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages groff) + #:use-module (gnu packages icu4c) + #:use-module (gnu packages kerberos) + #:use-module (gnu packages libevent) + #:use-module (gnu packages linux) + #:use-module (gnu packages networking) + #:use-module (gnu packages nss) + #:use-module (gnu packages password-utils) + #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages rsync) + #:use-module (gnu packages selinux) + #:use-module (gnu packages time) + #:use-module (gnu packages tls) + #:use-module (gnu packages web) + #:use-module (gnu packages databases) + #:use-module (gnu packages password-utils) +) + +(define-public glicid-openldap + (package + (name "glicid-openldap") + (version "2.5.7") + (synopsis "Implementation of the Lightweight Directory Access Protocol") + (description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.") + (license openldap2.8) + (home-page "https://www.openldap.org/") + (source (origin + (method url-fetch) + (uri (list + (string-append "https://www.openldap.org/software/download/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "http://gpl.savoirfairelinux.net/pub/mirrors/openldap/" "openldap-release/openldap-" version ".tgz") + (string-append "http://repository.linagora.org/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "ftp://ftp.ntua.gr/mirror/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "https://mirror-hk.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "https://mirror.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "https://mirror.lyrahosting.com/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + )) + (sha256 ( base32 "1ayr76sa5hjwldqzis5v71sbp88hd3hysc00gw1raqn33c05g5za" )) + ) + ) + (build-system gnu-build-system) + (inputs `( + ("bdb", bdb) + ("cyrus-sasl", cyrus-sasl) + ("gnutls", gnutls) + ("libgcrypt", libgcrypt) + ("zlib", zlib) + ("libltdl", libltdl) + ("pkg-config", pkg-config) + ("libevent", libevent) + ("libtool", libtool) + ("groff", groff) + ("openssl", openssl) + ("argon2", argon2) + ("wiredtiger", wiredtiger) + ("snappy", snappy) + ("lz4", lz4) + )) + (arguments '( + ; this is needed because the make check does not work inside guix + #:tests? #f + #:configure-flags '( + "--enable-debug" "--enable-dynamic" "--enable-syslog" "--enable-ipv6" "--enable-local" "--enable-slapd" "--enable-dynacl" + "--enable-aci" "--enable-cleartext" "--enable-crypt" "--enable-spasswd" "--enable-modules" "--enable-rlookups" "--enable-slapi" + "--enable-backends=mod" "--enable-overlays=mod" "--enable-argon2" "--enable-balancer" "--disable-static" + "--enable-shared" "--with-tls=openssl" + ) + ; Disable install stripping as it breaks cross-compiling. + #:make-flags '("STRIP=") + #:phases (modify-phases %standard-phases + (add-before 'build 'make-depend + (lambda* (#:key input #:allow-other-keys) + (invoke "make" "depend") + ) + ) + ) + )) + ) +) +;;YD;; ; (define-record-type* +;;YD;; ; openldap-configuration make-openldap-configuration +;;YD;; openldap-configuration? +;;YD;; (openldap openldap-configuration-openldap ; +;;YD;; (default openldap-glicid) +;;YD;; ) +;;YD;; (arguments openldap-configuration-arguments ;list of strings +;;YD;; (default '()) +;;YD;; ) +;;YD;; (logflags openldap-configuration-logflags ;number +;;YD;; (default "0") +;;YD;; ) +;;YD;; (log-file openldap-configuration-log-file ; string +;;YD;; (default "/var/log/slapd.log") +;;YD;; ) +;;YD;; (pid-file openldap-configuration-pid-file ; string +;;YD;; (default "/var/run/openldap/slapd.pid") +;;YD;; ) +;;YD;; (config-file openldap-configuration-config-file ; string +;;YD;; (default %default-slapd.conf) +;;YD;; ) +;;YD;; (schema-dir openldap-configuration-schema-dir ; string +;;YD;; (default '()) +;;YD;; ) +;;YD;; ) +;;YD;; (define %default-slapd.conf +;;YD;; (plain-file "slapd.conf" " +;;YD;; # Empty file for test +;;YD;; ")) +;;YD;; (define schema_dir (local-file "ldap_schema" #:recursive? #t)) +;;YD;; (define openldap-shepherd-service +;;YD;; (match-lambda +;;YD;; (($ openldap arguments logflags log-file pid-file config-file schema-dir) +;;YD;; (list +;;YD;; (shepherd-service +;;YD;; (provision '(slapd) ) +;;YD;; (documentation "Run openldap.") +;;YD;; (requirement '(user-processes)) +;;YD;; (respawn? #f) +;;YD;; (start #~(make-forkexec-constructor +;;YD;; (list +;;YD;; #$(file-append openldap-glicid "/libexec/slapd") +;;YD;; "-h 'ldap:;;YD;;/ ldaps:;;YD;;/'" +;;YD;; "-d" #$logflags +;;YD;; "-f" #$config-file +;;YD;; ) +;;YD;; #:pid-file #$pid-file +;;YD;; )) +;;YD;; (stop #~(make-kill-destructor)) +;;YD;; ) +;;YD;; ) +;;YD;; ) +;;YD;; ) +;;YD;; ) +;;YD;; (define openldap-service-type +;;YD;; (service-type (name 'slapd) +;;YD;; (extensions +;;YD;; (list ( +;;YD;; service-extension +;;YD;; shepherd-root-service-type +;;YD;; openldap-shepherd-service +;;YD;; )) +;;YD;; ) +;;YD;; (description "Run @uref{https:;;YD;;www.openldap.org, Openldap} community developped LDAP software.") +;;YD;; ) +;;YD;; ) +;;YD;; ) + From 7f7e21d22041a3901d3f9af8ce44b561501c2171 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 22 Oct 2021 22:42:25 +0200 Subject: [PATCH 02/89] some typo corrected --- glicid/packages/openldap.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/openldap.scm b/glicid/packages/openldap.scm index 5008b37..6f769f1 100644 --- a/glicid/packages/openldap.scm +++ b/glicid/packages/openldap.scm @@ -1,5 +1,5 @@ (define-module (glicid packages openldap) - #:use-module (guix) +;; #:use-module (guix) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:select (openldap2.8 lgpl2.1+ gpl3+ psfl expat)) #:use-module (guix packages) From 27cab230740f79a3c3b86559326a4dfbdeb59e72 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 24 Oct 2021 18:55:58 +0200 Subject: [PATCH 03/89] introduction 2nd package ceph pour simplification --- glicid/packages/glicid.scm | 210 +++++++++++++++++++++++++++++++++++++ 1 file changed, 210 insertions(+) diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 48ccc50..8cfd65f 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -1460,6 +1460,216 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") ) +(define-public glicid-ceph-15b + (package + (inherit ceph) + (name "glicid-ceph-15b") + (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 glicid-qemu From 91b2248ec7a178e4adfa7a6ad8acc885ec5d12dd Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 24 Oct 2021 20:22:43 +0200 Subject: [PATCH 04/89] ceph is now in storage --- glicid/packages/glicid.scm | 451 +---------------------------- glicid/packages/storage.scm | 547 ++++++++++++++++++++++++++++++++++++ 2 files changed, 549 insertions(+), 449 deletions(-) create mode 100644 glicid/packages/storage.scm diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 8cfd65f..1461f38 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -90,6 +90,8 @@ ;; #:use-module (gnu packages glicid) #:use-module (gnu packages pretty-print) #:use-module (gnu packages virtualization) + #:use-module (glicid packages storage) + ) @@ -1223,455 +1225,6 @@ 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-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-15b - (package - (inherit ceph) - (name "glicid-ceph-15b") - (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 glicid-qemu (package diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm new file mode 100644 index 0000000..8e973a2 --- /dev/null +++ b/glicid/packages/storage.scm @@ -0,0 +1,547 @@ +(define-module (glicid packages storage) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + + +) + + + +(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-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-15b + (package + (inherit ceph) + (name "glicid-ceph-15b") + (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) + From f0447856d394ba22533ec01a66d2944b4ca6466a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 24 Oct 2021 21:21:21 +0200 Subject: [PATCH 05/89] patch for snappy --- glicid/packages/storage.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm index 8e973a2..742b313 100644 --- a/glicid/packages/storage.scm +++ b/glicid/packages/storage.scm @@ -345,8 +345,8 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") (sha256 (base32 "12cz10aascr2h7xbxp9ba5207pn9qv6m50xp5f8ns80vj6lzi6d3")) -; (patches -; (search-patches "ceph-disable-cpu-optimizations.patch")) + (patches + (search-patches "ceph-fix-snappy-breaking-change.patch")) (modules '((guix build utils))) (snippet '(begin From 90300b3cbe7264f0bb759328903ae8d2c4925064 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 24 Oct 2021 21:30:14 +0200 Subject: [PATCH 06/89] test standard snappy version --- glicid/packages/storage.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm index 742b313..c556d0b 100644 --- a/glicid/packages/storage.scm +++ b/glicid/packages/storage.scm @@ -518,7 +518,8 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") ("rapidjson" ,rapidjson) ("rdma-core" ,rdma-core) ("rocksdb" ,rocksdb) - ("snappy" ,snappy-1.1.8) +; ("snappy" ,snappy-1.1.8) + ("snappy" ,snappy) ("udev" ,eudev) ("util-linux" ,util-linux) ("util-linux:lib" ,util-linux "lib") From 5cc7c177b534d43093aea17aa7a83ac40b2897f5 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 24 Oct 2021 21:41:25 +0200 Subject: [PATCH 07/89] begin package simplification --- glicid/packages/storage.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm index c556d0b..21c6bcf 100644 --- a/glicid/packages/storage.scm +++ b/glicid/packages/storage.scm @@ -525,22 +525,23 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") ("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 +; (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 ) From 65602b11e0393a8677d3fe6b8eea24643a2ef639 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 24 Oct 2021 21:46:00 +0200 Subject: [PATCH 08/89] more simplification --- glicid/packages/storage.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm index 21c6bcf..253a2d0 100644 --- a/glicid/packages/storage.scm +++ b/glicid/packages/storage.scm @@ -481,14 +481,14 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") `("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))) +; (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) From ccec708e023d9b8baccb11ba92bd1b5a14bf39ee Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 24 Oct 2021 21:51:09 +0200 Subject: [PATCH 09/89] more simplification --- glicid/packages/storage.scm | 227 ++++++++++++++++++------------------ 1 file changed, 114 insertions(+), 113 deletions(-) diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm index 253a2d0..69b2413 100644 --- a/glicid/packages/storage.scm +++ b/glicid/packages/storage.scm @@ -367,120 +367,121 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") "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" +; (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)))))) - ;; 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 0bbbb6fc5113f78987d97c32ab58b3290fdff7ba Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 24 Oct 2021 21:59:38 +0200 Subject: [PATCH 10/89] pb is with arguments. --- glicid/packages/storage.scm | 226 ++++++++++++++++++------------------ 1 file changed, 113 insertions(+), 113 deletions(-) diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm index 69b2413..421abd7 100644 --- a/glicid/packages/storage.scm +++ b/glicid/packages/storage.scm @@ -368,119 +368,119 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") "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)))))) + (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")) From dbdfe2d6291649c38d8e21d5a559dd5f0c4dce15 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 24 Oct 2021 22:06:59 +0200 Subject: [PATCH 11/89] remove commented code --- glicid/packages/storage.scm | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm index 421abd7..0887a80 100644 --- a/glicid/packages/storage.scm +++ b/glicid/packages/storage.scm @@ -367,7 +367,6 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") "src/rocksdb" "src/boost")) #t)))) -; (build-system cmake-build-system) (arguments `(#:configure-flags (let* ((out (assoc-ref %outputs "out")) @@ -482,14 +481,6 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") 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) @@ -519,30 +510,13 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") ("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") ("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 + ) ) From 24c0002d31fdb612c07f4d629f431193f9899a3a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 24 Oct 2021 22:23:44 +0200 Subject: [PATCH 12/89] slurm now in parallel --- glicid/packages/glicid.scm | 76 --------------- glicid/packages/parallel.scm | 173 +++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+), 76 deletions(-) create mode 100644 glicid/packages/parallel.scm diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 1461f38..88cd27c 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -208,82 +208,6 @@ in the @code{debug} output), and binutils."))) ) - -(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")) - )) - (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) - ("gcc", gcc-11) - ("glicid-pmix", glicid-pmix) -; ("glicid-specific-openmpi", glicid-specific-openmpi) - ,@(package-inputs slurm) - - - )) - (propagated-inputs - `( - ("sssd" ,sssd) - )) - -)) - - -(define-public glicid-custom-slurm-20.02 - (package - (inherit glicid-custom-slurm-19.05) - (name "glicid-custom-slurm-20.02") - (version "20.02.7") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6")) - )) -)) - - -(define-public glicid-custom-slurm-20.11 - (package - (inherit glicid-custom-slurm-20.02) - (name "glicid-custom-slurm-20.11") - (version "20.11.7") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "1fdjihg1x7ks5l77yjv14a4mg6r0v8c3zk1dcxkhrhq3n4dc9nbs")) - )) -)) - -(define-public glicid-specific-slurm glicid-custom-slurm-20.02) - - (define-public glicid-librdkafka-09 (package (inherit librdkafka) diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm new file mode 100644 index 0000000..b32b91f --- /dev/null +++ b/glicid/packages/parallel.scm @@ -0,0 +1,173 @@ +(define-module (glicid packages parallel) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + + +) + + +(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")) + )) + (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) + ("gcc", gcc-11) + ("glicid-pmix", glicid-pmix) +; ("glicid-specific-openmpi", glicid-specific-openmpi) + ,@(package-inputs slurm) + + + )) + (propagated-inputs + `( + ("sssd" ,sssd) + )) + +)) + + +(define-public glicid-custom-slurm-20.02 + (package + (inherit glicid-custom-slurm-19.05) + (name "glicid-custom-slurm-20.02") + (version "20.02.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) + (sha256 (base32 "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6")) + )) +)) + + +(define-public glicid-custom-slurm-20.11 + (package + (inherit glicid-custom-slurm-20.02) + (name "glicid-custom-slurm-20.11") + (version "20.11.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) + (sha256 (base32 "1fdjihg1x7ks5l77yjv14a4mg6r0v8c3zk1dcxkhrhq3n4dc9nbs")) + )) +)) + +(define-public glicid-specific-slurm glicid-custom-slurm-20.02) + + + From e8547a84a571565a3b25dd19620e5559209abe09 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 24 Oct 2021 22:30:40 +0200 Subject: [PATCH 13/89] pmix in parrallel --- glicid/packages/glicid.scm | 34 ---------------------------------- glicid/packages/parallel.scm | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 88cd27c..775a734 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -174,40 +174,6 @@ in the @code{debug} output), and binutils."))) ;;;;;;;; -(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 license:gpl3+) - (inputs `( - ("libevent", libevent) - ("hwloc" ,hwloc-2 "lib") - ("perl", perl) - ("gcc", gcc-11) - ) - ) - ) -) - - (define-public glicid-librdkafka-09 (package (inherit librdkafka) diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm index b32b91f..7721c07 100644 --- a/glicid/packages/parallel.scm +++ b/glicid/packages/parallel.scm @@ -94,6 +94,39 @@ ) +(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 license:gpl3+) + (inputs `( + ("libevent", libevent) + ("hwloc" ,hwloc-2 "lib") + ("perl", perl) + ("gcc", gcc-11) + ) + ) + ) +) + (define-public glicid-custom-slurm-19.05 (package From 634fd4a2f09145371d8bee31001a8868efcec419 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 09:08:28 +0200 Subject: [PATCH 14/89] On continue de ventiler les packages. --- glicid/packages/linux.scm | 275 ++++++++++++++++++++++++++++++++++++++ glicid/packages/mpi.scm | 133 ++++++++++++++++++ 2 files changed, 408 insertions(+) create mode 100644 glicid/packages/linux.scm create mode 100644 glicid/packages/mpi.scm diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm new file mode 100644 index 0000000..cd74c84 --- /dev/null +++ b/glicid/packages/linux.scm @@ -0,0 +1,275 @@ +(define-module (glicid packages linux) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + +) + + +(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-11 +(package + (inherit rdma-core) + (name "glicid-rdma-core-gcc-11") + (version "32.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 + "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1")))) + (inputs `(("gcc-11", gcc-11) + ,@(package-inputs rdma-core))) + ) +) + +(define-public glicid-libfabric-gcc-11 +(package + (inherit libfabric) + (name "glicid-libfabric-gcc-11") + (version "1.11.2") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz")))) + + (inputs `(("gcc-11", gcc-11) + ,@(package-inputs libfabric))) + ) +) + + +(define-public glicid-ucx-gcc-11 + (package + (inherit ucx) + (name "glicid-ucx-gcc-11") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) + (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) + )) + + (inputs `(("gcc-11", gcc-11) + ("gfortran-11", gfortran-11) + ,@(package-inputs ucx))) + ) +) + +(define-public glicid-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) + ,@(package-inputs ucx))) + ) +) + + +(define-public glicid-specific-rdma-core-gcc-11 + (package + (inherit rdma-core) + (name "glicid-specific-rdma-core-gcc-11") + (version "36.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 +;; "1s4b80jzdi2m6j5aix3mxl6iafgbqp88pfxy7568zxwc8rkcz71x" + "13ccvy3qv5b87g3b5q86gjv4wkgv86dlm9xbmii5aiy3i10ym48l" +)))) + (inputs `(("gcc", gcc-11) + ,@(package-inputs rdma-core))) + + ) +) + +(define-public glicid-specific-libfabric-gcc-11 +(package + (inherit libfabric) + (name "glicid-specific-libfabric-gcc-11") + (version "1.12.1") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 "0b34p88w399jabdf77jpskxyv2j60nwxlsj3lyk9svjy9458wg6v")))) + + (inputs `(("gcc", gcc-11) + ("rdma-core", glicid-specific-rdma-core-gcc-11) + ,@(package-inputs libfabric))) + ) +) + +(define-public glicid-specific-ucx-gcc-11 + (package + (inherit ucx) + (name "glicid-specific-ucx-gcc-11") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) + (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) + )) + + (inputs `(("gcc", gcc-11) + ("gfortran", gfortran-11) + ("libfabric", glicid-specific-libfabric-gcc-11) + ("rdma-core",glicid-specific-rdma-core-gcc-11) + + ,@(package-inputs ucx))) + ) +) + +(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))) + ) +) + + + + +;;; glicid.scm ends here diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm new file mode 100644 index 0000000..e916cd4 --- /dev/null +++ b/glicid/packages/mpi.scm @@ -0,0 +1,133 @@ +(define-module (glicid packages mpi) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + + + +) + + +(define-public glicid-openmpi-gcc-11 + (package + (inherit openmpi) + (name "glicid-openpmi-gcc-11") + (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) + ("glicid-ucx-gcc-11",glicid-ucx-gcc-11) +;; ("glicid-rdma-core",glicid-rdma-core) ;;; segfault !!! + ,@(package-inputs openmpi))) + ) +) + + +(define-public glicid-specific-openmpi + (package + (inherit glicid-openmpi-gcc-11) + (name "glicid-specific-openmpi") + (inputs `( + ("gcc",gcc-11) + ("rdma-core",glicid-specific-rdma-core-gcc-11) + ("ucx",glicid-specific-ucx-gcc-10) + ("libfabric",glicid-specific-libfabric-gcc-11) +; ("slurm", glicid-specific-slurm) + ,@(package-inputs glicid-openmpi-gcc-11))) + ) +) + From b7ee4bc490a732716b96dc2a59e7ebda2e09ec07 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 09:14:58 +0200 Subject: [PATCH 15/89] =?UTF-8?q?on=20continue=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- glicid/packages/gcc.scm | 176 +++++++++++++++++++++++++++++++++++++ glicid/packages/glicid.scm | 3 +- glicid/packages/linux.scm | 1 + 3 files changed, 178 insertions(+), 2 deletions(-) create mode 100644 glicid/packages/gcc.scm diff --git a/glicid/packages/gcc.scm b/glicid/packages/gcc.scm new file mode 100644 index 0000000..852c6cb --- /dev/null +++ b/glicid/packages/gcc.scm @@ -0,0 +1,176 @@ +(define-module (glicid 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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + + + +) + + +(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-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)) + (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-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."))) + + + + + +;;; glicid/gcc.scm ends here diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 775a734..8e0d466 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -91,8 +91,7 @@ #:use-module (gnu packages pretty-print) #:use-module (gnu packages virtualization) #:use-module (glicid packages storage) - - + #:use-module (glicid packages gcc) ) diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index cd74c84..6fe6c14 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -90,6 +90,7 @@ ;; #:use-module (gnu packages glicid) #:use-module (gnu packages pretty-print) #:use-module (gnu packages virtualization) + #:use-module (glicid packages gcc) ) From 99735e88f380061838c0fe3b510a51df0306b247 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 09:28:47 +0200 Subject: [PATCH 16/89] add patch --- glicid/packages/glicid.scm | 275 ------------------ .../ceph-fix-snappy-breaking-change.patch | 13 + 2 files changed, 13 insertions(+), 275 deletions(-) create mode 100644 glicid/packages/patches/ceph-fix-snappy-breaking-change.patch diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 8e0d466..da3a939 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -96,80 +96,6 @@ ) -(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-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)) - (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-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."))) - - ;;;;;;;; @@ -330,101 +256,6 @@ in the @code{debug} output), and binutils."))) ) -(define-public glicid-rdma-core-gcc-11 -(package - (inherit rdma-core) - (name "glicid-rdma-core-gcc-11") - (version "32.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 - "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1")))) - (inputs `(("gcc-11", gcc-11) - ,@(package-inputs rdma-core))) - ) -) - -(define-public glicid-libfabric-gcc-11 -(package - (inherit libfabric) - (name "glicid-libfabric-gcc-11") - (version "1.11.2") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ofiwg/libfabric/releases/download/v" - version "/libfabric-" version ".tar.bz2")) - (sha256 - (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz")))) - - (inputs `(("gcc-11", gcc-11) - ,@(package-inputs libfabric))) - ) -) - - -(define-public glicid-ucx-gcc-11 - (package - (inherit ucx) - (name "glicid-ucx-gcc-11") - (version "1.10.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) - )) - - (inputs `(("gcc-11", gcc-11) - ("gfortran-11", gfortran-11) - ,@(package-inputs ucx))) - ) -) - -(define-public glicid-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) - ,@(package-inputs ucx))) - ) -) - - - -(define-public glicid-openmpi-gcc-11 - (package - (inherit openmpi) - (name "glicid-openpmi-gcc-11") - (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) - ("glicid-ucx-gcc-11",glicid-ucx-gcc-11) -;; ("glicid-rdma-core",glicid-rdma-core) ;;; segfault !!! - ,@(package-inputs openmpi))) - ) -) (define-public glicid-intel-mpi-benchmarks (package @@ -500,112 +331,6 @@ in the @code{debug} output), and binutils."))) )) -;;26.2 is ok : "1ilns8spik1xz2n668pf0awp4n7b3q7n886ml0q3bslb8fmqfl0i" -;;27.1 is ok : "1mqaxzsbhm7kh20dwdrapvx4x86wkbk1wgb2yyjz73l6bymv7vir" -;;28.1 is ok : "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr" -;; 30.0 crash : "1ycvd8sp3giwjbp0x3nvb8q2wrdc50s7lmzf44b9l51qgcnvvq93" -;; 31.0 crash : -;; 32.0 crash : "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1" -;; 33.0 crash : "0cnmw04z68x042nkqxg57wijzkf9ysmvr8xxidxhxz0mxwx9impg" - -(define-public glicid-specific-rdma-core-gcc-11 - (package - (inherit rdma-core) - (name "glicid-specific-rdma-core-gcc-11") - (version "36.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 -;; "1s4b80jzdi2m6j5aix3mxl6iafgbqp88pfxy7568zxwc8rkcz71x" - "13ccvy3qv5b87g3b5q86gjv4wkgv86dlm9xbmii5aiy3i10ym48l" -)))) - (inputs `(("gcc", gcc-11) - ,@(package-inputs rdma-core))) - - ) -) - -(define-public glicid-specific-libfabric-gcc-11 -(package - (inherit libfabric) - (name "glicid-specific-libfabric-gcc-11") - (version "1.12.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ofiwg/libfabric/releases/download/v" - version "/libfabric-" version ".tar.bz2")) - (sha256 - (base32 "0b34p88w399jabdf77jpskxyv2j60nwxlsj3lyk9svjy9458wg6v")))) - - (inputs `(("gcc", gcc-11) - ("rdma-core", glicid-specific-rdma-core-gcc-11) - ,@(package-inputs libfabric))) - ) -) - -(define-public glicid-specific-ucx-gcc-11 - (package - (inherit ucx) - (name "glicid-specific-ucx-gcc-11") - (version "1.10.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) - )) - - (inputs `(("gcc", gcc-11) - ("gfortran", gfortran-11) - ("libfabric", glicid-specific-libfabric-gcc-11) - ("rdma-core",glicid-specific-rdma-core-gcc-11) - - ,@(package-inputs ucx))) - ) -) - -(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 - (package - (inherit glicid-openmpi-gcc-11) - (name "glicid-specific-openmpi") - (inputs `( - ("gcc",gcc-11) - ("rdma-core",glicid-specific-rdma-core-gcc-11) - ("ucx",glicid-specific-ucx-gcc-10) - ("libfabric",glicid-specific-libfabric-gcc-11) -; ("slurm", glicid-specific-slurm) - ,@(package-inputs glicid-openmpi-gcc-11))) - ) -) - (define-public glicid-specific-intel-mpi-benchmarks (package (inherit glicid-intel-mpi-benchmarks) diff --git a/glicid/packages/patches/ceph-fix-snappy-breaking-change.patch b/glicid/packages/patches/ceph-fix-snappy-breaking-change.patch new file mode 100644 index 0000000..7a10e2e --- /dev/null +++ b/glicid/packages/patches/ceph-fix-snappy-breaking-change.patch @@ -0,0 +1,13 @@ +Patch tracked upstream at https://tracker.ceph.com/issues/50934 + +--- a/src/compressor/snappy/SnappyCompressor.h ++++ b/src/compressor/snappy/SnappyCompressor.h +@@ -96,7 +96,7 @@ class SnappyCompressor : public Compressor { + if (qat_enabled) + return qat_accel.decompress(p, compressed_len, dst); + #endif +- snappy::uint32 res_len = 0; ++ uint32_t res_len = 0; + BufferlistSource source_1(p, compressed_len); + if (!snappy::GetUncompressedLength(&source_1, &res_len)) { + return -1; From d7d11bc6fc426fcb5b3e02f398b6523225ed193b Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 09:32:04 +0200 Subject: [PATCH 17/89] still not compiling --- glicid/packages/glicid.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index da3a939..f747557 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -91,8 +91,9 @@ #:use-module (gnu packages pretty-print) #:use-module (gnu packages virtualization) #:use-module (glicid packages storage) + #:use-module (glicid packages mpi) #:use-module (glicid packages gcc) - + ) From 29946004f3a065a574277b0343b84f3442067517 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 09:34:02 +0200 Subject: [PATCH 18/89] wrong module name --- glicid/packages/gcc.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/gcc.scm b/glicid/packages/gcc.scm index 852c6cb..6e2c873 100644 --- a/glicid/packages/gcc.scm +++ b/glicid/packages/gcc.scm @@ -1,4 +1,4 @@ -(define-module (glicid packages glicid) +(define-module (glicid packages gcc) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) From 41cf2090eea8290a18ee91f9c6f578a1dedfe968 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 09:36:31 +0200 Subject: [PATCH 19/89] need glicid/gcc --- glicid/packages/mpi.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index e916cd4..b4e07d4 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -90,6 +90,7 @@ ;; #:use-module (gnu packages glicid) #:use-module (gnu packages pretty-print) #:use-module (gnu packages virtualization) + #:use-module (glicid packages gcc) From 3072a6e63e83f27f73395ce3bb7578a35d93f1f8 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 09:38:43 +0200 Subject: [PATCH 20/89] missing ref to glicid/linux --- glicid/packages/mpi.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index b4e07d4..7fa92c3 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -90,7 +90,9 @@ ;; #:use-module (gnu packages glicid) #:use-module (gnu packages pretty-print) #:use-module (gnu packages virtualization) - #:use-module (glicid packages gcc) + #:use-module (glicid packages gcc) + #:use-module (glicid packages linux) + From 832a0052ae5b51559dae31a7e13fc22952c445d7 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 09:48:38 +0200 Subject: [PATCH 21/89] avoid duplicate --- glicid/packages/glicid.scm | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index f747557..927d221 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -240,24 +240,6 @@ ; ) ;) -(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-intel-mpi-benchmarks (package (inherit intel-mpi-benchmarks/openmpi) From 5cc0109030145b6b8483794f77524147d9d93f71 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 16:04:29 +0200 Subject: [PATCH 22/89] keepalived is now in cluster.scm --- glicid/packages/cluster.scm | 138 ++++++++++++++++++++++++++++++++++++ glicid/packages/glicid.scm | 34 --------- 2 files changed, 138 insertions(+), 34 deletions(-) create mode 100644 glicid/packages/cluster.scm diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm new file mode 100644 index 0000000..4332883 --- /dev/null +++ b/glicid/packages/cluster.scm @@ -0,0 +1,138 @@ +(define-module (glicid packages cluster) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages storage) + #:use-module (glicid packages mpi) + #:use-module (glicid packages gcc) + +) + + +;;;;;;;; + +(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))) + + + + ) +) + + + +;;; glicid/cluster.scm ends here diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 927d221..f801b51 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -441,40 +441,6 @@ ) -(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))) - - - - ) -) - (define-public glicid-motif (package (name "glicid-motif") From 9577ca883a3f9d6482124eed6f16d16cbcb9e843 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 16:13:25 +0200 Subject: [PATCH 23/89] add new keepalived version --- glicid/packages/cluster.scm | 38 +++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 4332883..1fc0b13 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -90,16 +90,13 @@ ;; #:use-module (gnu packages glicid) #:use-module (gnu packages pretty-print) #:use-module (gnu packages virtualization) - #:use-module (glicid packages storage) - #:use-module (glicid packages mpi) - #:use-module (glicid packages gcc) ) ;;;;;;;; -(define-public glicid-keepalived +(define-public glicid-keepalived-2.1.5 (package (inherit keepalived) (name "glicid-keepalived") @@ -133,6 +130,39 @@ ) ) +(define-public glicid-keepalived-2.2.4 + (package + (inherit keepalived) + (name "glicid-keepalived") + (version "2.2.4") + (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))) + + + + ) +) ;;; glicid/cluster.scm ends here From d90738be37a3122554c0f8db1b329fda1c6585a6 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 16:18:26 +0200 Subject: [PATCH 24/89] sha mismatch --- glicid/packages/cluster.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 1fc0b13..99abbe3 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -143,7 +143,7 @@ (sha256 (base32 - "0n92fdlmm251scq2j7w1nqwly8jsla4sxrd0jnfb6nn9qp5pqkfr")))) + "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01")))) (arguments `(#:configure-flags From 4b6e21bcfd2f88d9bb89231246ea7ef2e1cd5e2a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 16:51:05 +0200 Subject: [PATCH 25/89] is it necessary --- glicid/packages/cluster.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 99abbe3..f973f90 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -164,5 +164,6 @@ ) ) +(define-public glicid-keepalived glicid-keepalived-2.2.4) ;;; glicid/cluster.scm ends here From ffcae0c89eff883f1d7fc2bc5c8841d09e91f910 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 19:14:23 +0200 Subject: [PATCH 26/89] reorg --- glicid/packages/linux.scm | 45 ++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index 6fe6c14..b01814c 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -130,6 +130,28 @@ ) ) +(define-public glicid-specific-rdma-core-gcc-11 + (package + (inherit rdma-core) + (name "glicid-specific-rdma-core-gcc-11") + (version "36.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 +;; "1s4b80jzdi2m6j5aix3mxl6iafgbqp88pfxy7568zxwc8rkcz71x" + "13ccvy3qv5b87g3b5q86gjv4wkgv86dlm9xbmii5aiy3i10ym48l" +)))) + (inputs `(("gcc", gcc-11) + ,@(package-inputs rdma-core))) + + ) +) + + (define-public glicid-libfabric-gcc-11 (package (inherit libfabric) @@ -187,27 +209,6 @@ ) -(define-public glicid-specific-rdma-core-gcc-11 - (package - (inherit rdma-core) - (name "glicid-specific-rdma-core-gcc-11") - (version "36.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 -;; "1s4b80jzdi2m6j5aix3mxl6iafgbqp88pfxy7568zxwc8rkcz71x" - "13ccvy3qv5b87g3b5q86gjv4wkgv86dlm9xbmii5aiy3i10ym48l" -)))) - (inputs `(("gcc", gcc-11) - ,@(package-inputs rdma-core))) - - ) -) - (define-public glicid-specific-libfabric-gcc-11 (package (inherit libfabric) @@ -273,4 +274,4 @@ -;;; glicid.scm ends here +;;; glicid/linux.scm ends here From 8362f6d823a9cde35994104555b3f60b8f2ce473 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 19:23:33 +0200 Subject: [PATCH 27/89] =?UTF-8?q?encore=20en=20r=C3=A9partition=20des=20pa?= =?UTF-8?q?ckages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- glicid/packages/fabric-management.scm | 180 ++++++++++++++++++++++++++ glicid/packages/linux.scm | 40 +++--- 2 files changed, 200 insertions(+), 20 deletions(-) create mode 100644 glicid/packages/fabric-management.scm diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm new file mode 100644 index 0000000..647adb7 --- /dev/null +++ b/glicid/packages/fabric-management.scm @@ -0,0 +1,180 @@ +(define-module (glicid packages fabric-management) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages gcc) + +) + + +(define-public glicid-ucx-gcc-11 + (package + (inherit ucx) + (name "glicid-ucx-gcc-11") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) + (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) + )) + + (inputs `(("gcc-11", gcc-11) + ("gfortran-11", gfortran-11) + ,@(package-inputs ucx))) + ) +) + +(define-public glicid-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) + ,@(package-inputs ucx))) + ) +) + + +(define-public glicid-specific-ucx-gcc-11 + (package + (inherit ucx) + (name "glicid-specific-ucx-gcc-11") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) + (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) + )) + + (inputs `(("gcc", gcc-11) + ("gfortran", gfortran-11) + ("libfabric", glicid-specific-libfabric-gcc-11) + ("rdma-core",glicid-specific-rdma-core-gcc-11) + + ,@(package-inputs ucx))) + ) +) + +(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))) + ) +) + + + + +;;; glicid/fabric-management.scm ends here diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index b01814c..b560588 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -171,6 +171,26 @@ ) ) +(define-public glicid-specific-libfabric-gcc-11 +(package + (inherit libfabric) + (name "glicid-specific-libfabric-gcc-11") + (version "1.12.1") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 "0b34p88w399jabdf77jpskxyv2j60nwxlsj3lyk9svjy9458wg6v")))) + + (inputs `(("gcc", gcc-11) + ("rdma-core", glicid-specific-rdma-core-gcc-11) + ,@(package-inputs libfabric))) + ) +) + (define-public glicid-ucx-gcc-11 (package @@ -209,26 +229,6 @@ ) -(define-public glicid-specific-libfabric-gcc-11 -(package - (inherit libfabric) - (name "glicid-specific-libfabric-gcc-11") - (version "1.12.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ofiwg/libfabric/releases/download/v" - version "/libfabric-" version ".tar.bz2")) - (sha256 - (base32 "0b34p88w399jabdf77jpskxyv2j60nwxlsj3lyk9svjy9458wg6v")))) - - (inputs `(("gcc", gcc-11) - ("rdma-core", glicid-specific-rdma-core-gcc-11) - ,@(package-inputs libfabric))) - ) -) - (define-public glicid-specific-ucx-gcc-11 (package (inherit ucx) From 3e8f129b5a42a986085a95ae9f90a188306c9c67 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 19:24:37 +0200 Subject: [PATCH 28/89] ucx is now in fabric-management --- glicid/packages/linux.scm | 82 --------------------------------------- 1 file changed, 82 deletions(-) diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index b560588..c9f181c 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -192,86 +192,4 @@ ) -(define-public glicid-ucx-gcc-11 - (package - (inherit ucx) - (name "glicid-ucx-gcc-11") - (version "1.10.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) - )) - - (inputs `(("gcc-11", gcc-11) - ("gfortran-11", gfortran-11) - ,@(package-inputs ucx))) - ) -) - -(define-public glicid-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) - ,@(package-inputs ucx))) - ) -) - - -(define-public glicid-specific-ucx-gcc-11 - (package - (inherit ucx) - (name "glicid-specific-ucx-gcc-11") - (version "1.10.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) - )) - - (inputs `(("gcc", gcc-11) - ("gfortran", gfortran-11) - ("libfabric", glicid-specific-libfabric-gcc-11) - ("rdma-core",glicid-specific-rdma-core-gcc-11) - - ,@(package-inputs ucx))) - ) -) - -(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))) - ) -) - - - - ;;; glicid/linux.scm ends here From 0719177d40c5fb859d482391398cce2ad47a827d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 19:26:55 +0200 Subject: [PATCH 29/89] missing module --- glicid/packages/mpi.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index 7fa92c3..e11fbe2 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -92,6 +92,7 @@ #:use-module (gnu packages virtualization) #:use-module (glicid packages gcc) #:use-module (glicid packages linux) + #:use-module (glicid packages fabric-management) From 49a0d83436d4f6d1e475c3404bb28cb269b9631c Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 19:29:17 +0200 Subject: [PATCH 30/89] missing module --- glicid/packages/fabric-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm index 647adb7..61e01d0 100644 --- a/glicid/packages/fabric-management.scm +++ b/glicid/packages/fabric-management.scm @@ -91,7 +91,7 @@ #:use-module (gnu packages pretty-print) #:use-module (gnu packages virtualization) #:use-module (glicid packages gcc) - + #:use-module (glicid packages linux) ) From 7c53675c7f75c93eb41d36e7e599ccc9e78415ee Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 20:51:36 +0200 Subject: [PATCH 31/89] packages simplification --- glicid/packages/linux.scm | 67 ++++++--------------------------------- 1 file changed, 9 insertions(+), 58 deletions(-) diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index c9f181c..8f6a199 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -99,7 +99,7 @@ (package (inherit rdma-core) (name "glicid-rdma-core") - (version "31.0") + (version "37.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -114,80 +114,31 @@ (define-public glicid-rdma-core-gcc-11 (package - (inherit rdma-core) + (inherit glicid-rdma-core) (name "glicid-rdma-core-gcc-11") - (version "32.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 - "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1")))) (inputs `(("gcc-11", gcc-11) ,@(package-inputs rdma-core))) ) ) -(define-public glicid-specific-rdma-core-gcc-11 - (package - (inherit rdma-core) - (name "glicid-specific-rdma-core-gcc-11") - (version "36.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 -;; "1s4b80jzdi2m6j5aix3mxl6iafgbqp88pfxy7568zxwc8rkcz71x" - "13ccvy3qv5b87g3b5q86gjv4wkgv86dlm9xbmii5aiy3i10ym48l" -)))) - (inputs `(("gcc", gcc-11) - ,@(package-inputs rdma-core))) +(define-public glicid-libfabric +(package + (inherit libfabric) + (name "glicid-libfabric") + (version "1.13.1") ) ) (define-public glicid-libfabric-gcc-11 (package - (inherit libfabric) + (inherit glicid-libfabric) (name "glicid-libfabric-gcc-11") - (version "1.11.2") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ofiwg/libfabric/releases/download/v" - version "/libfabric-" version ".tar.bz2")) - (sha256 - (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz")))) (inputs `(("gcc-11", gcc-11) - ,@(package-inputs libfabric))) - ) -) - -(define-public glicid-specific-libfabric-gcc-11 -(package - (inherit libfabric) - (name "glicid-specific-libfabric-gcc-11") - (version "1.12.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ofiwg/libfabric/releases/download/v" - version "/libfabric-" version ".tar.bz2")) - (sha256 - (base32 "0b34p88w399jabdf77jpskxyv2j60nwxlsj3lyk9svjy9458wg6v")))) - - (inputs `(("gcc", gcc-11) ("rdma-core", glicid-specific-rdma-core-gcc-11) - ,@(package-inputs libfabric))) + ,@(package-inputs glicid-libfabric))) ) ) From e5c7d27fce19c58e04ef62d9bec816ff3d505f2a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 20:56:06 +0200 Subject: [PATCH 32/89] simplification --- glicid/packages/fabric-management.scm | 10 +++++----- glicid/packages/linux.scm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm index 61e01d0..6fbf396 100644 --- a/glicid/packages/fabric-management.scm +++ b/glicid/packages/fabric-management.scm @@ -146,14 +146,14 @@ (inputs `(("gcc", gcc-11) ("gfortran", gfortran-11) - ("libfabric", glicid-specific-libfabric-gcc-11) - ("rdma-core",glicid-specific-rdma-core-gcc-11) + ("libfabric", glicid-libfabric-gcc-11) + ("rdma-core",glicid-rdma-core-gcc-11) ,@(package-inputs ucx))) ) ) -(define-public glicid-specific-ucx-gcc-10 +(define-public glicid-ucx-gcc-10 (package (inherit ucx) (name "glicid-specific-ucx-gcc-10") @@ -167,8 +167,8 @@ (inputs `(("gcc", gcc-10) ("gfortran", gfortran-10) - ("libfabric", glicid-specific-libfabric-gcc-11) - ("rdma-core",glicid-specific-rdma-core-gcc-11) + ("libfabric", glicid-libfabric-gcc-11) + ("rdma-core",glicid-rdma-core-gcc-11) ,@(package-inputs ucx))) ) diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index 8f6a199..b410836 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -137,7 +137,7 @@ (name "glicid-libfabric-gcc-11") (inputs `(("gcc-11", gcc-11) - ("rdma-core", glicid-specific-rdma-core-gcc-11) + ("rdma-core", glicid-rdma-core-gcc-11) ,@(package-inputs glicid-libfabric))) ) ) From 9e39b034a2e0a36925c68451a5708dce6211c070 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 20:58:28 +0200 Subject: [PATCH 33/89] simplification --- glicid/packages/mpi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index e11fbe2..3ce74cf 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -127,9 +127,9 @@ (name "glicid-specific-openmpi") (inputs `( ("gcc",gcc-11) - ("rdma-core",glicid-specific-rdma-core-gcc-11) - ("ucx",glicid-specific-ucx-gcc-10) - ("libfabric",glicid-specific-libfabric-gcc-11) + ("rdma-core",glicid-rdma-core-gcc-11) + ("ucx",glicid-ucx-gcc-10) + ("libfabric",glicid-libfabric-gcc-11) ; ("slurm", glicid-specific-slurm) ,@(package-inputs glicid-openmpi-gcc-11))) ) From 041a7780febcaf23c58e61c6a9b28494e9f1e585 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 21:04:59 +0200 Subject: [PATCH 34/89] bump ucx --- glicid/packages/fabric-management.scm | 50 ++++++++++----------------- 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm index 6fbf396..2751c06 100644 --- a/glicid/packages/fabric-management.scm +++ b/glicid/packages/fabric-management.scm @@ -95,82 +95,70 @@ ) -(define-public glicid-ucx-gcc-11 +(define-public glicid-ucx (package (inherit ucx) - (name "glicid-ucx-gcc-11") - (version "1.10.0") + (name "glicid-ucx") + (version "1.11.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) - )) + ) + + ) +) + + +(define-public glicid-ucx-gcc-11 + (package + (inherit glicid-ucx) + (name "glicid-ucx-gcc-11") (inputs `(("gcc-11", gcc-11) ("gfortran-11", gfortran-11) - ,@(package-inputs ucx))) + ,@(package-inputs glicid-ucx))) ) ) (define-public glicid-ucx-gcc-10 (package - (inherit ucx) + (inherit glicid-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) - ,@(package-inputs ucx))) + ,@(package-inputs glicid-ucx))) ) ) (define-public glicid-specific-ucx-gcc-11 (package - (inherit ucx) + (inherit glicid-ucx) (name "glicid-specific-ucx-gcc-11") (version "1.10.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) - )) (inputs `(("gcc", gcc-11) ("gfortran", gfortran-11) ("libfabric", glicid-libfabric-gcc-11) ("rdma-core",glicid-rdma-core-gcc-11) - ,@(package-inputs ucx))) + ,@(package-inputs glicid-ucx))) ) ) (define-public glicid-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-libfabric-gcc-11) ("rdma-core",glicid-rdma-core-gcc-11) - ,@(package-inputs ucx))) + ,@(package-inputs glicid-ucx))) ) ) From 1df64118ff492b9f5bb5548c062a23ea3f5b6c43 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 21:07:35 +0200 Subject: [PATCH 35/89] missing ) --- glicid/packages/fabric-management.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm index 2751c06..3faa221 100644 --- a/glicid/packages/fabric-management.scm +++ b/glicid/packages/fabric-management.scm @@ -108,9 +108,9 @@ ) ) + ) ) - (define-public glicid-ucx-gcc-11 (package (inherit glicid-ucx) @@ -162,7 +162,4 @@ ) ) - - - ;;; glicid/fabric-management.scm ends here From 829da445ace2dafbf5ea35964b5ffad8eef63b03 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 21:14:38 +0200 Subject: [PATCH 36/89] checksum changed --- glicid/packages/fabric-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm index 3faa221..6a157c9 100644 --- a/glicid/packages/fabric-management.scm +++ b/glicid/packages/fabric-management.scm @@ -104,7 +104,7 @@ (origin (method url-fetch) (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) + (sha256 (base32 "1py62vjr0hgyqsdpr04jhn918i8ccn6ghjalwpcjpz24admgisyy")) ) ) From 3f35009cb2355443a4799c236b87f31eb378e909 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 21:53:32 +0200 Subject: [PATCH 37/89] some changes. --- glicid/packages/mpi.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index 3ce74cf..8d58202 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -99,23 +99,24 @@ ) +(define-public glicid-openmpi + (package + (inherit openmpi) + (name "glicid-openpmi") + ) +) + (define-public glicid-openmpi-gcc-11 (package - (inherit openmpi) + (inherit glicid-openmpi) (name "glicid-openpmi-gcc-11") - (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) ("glicid-ucx-gcc-11",glicid-ucx-gcc-11) -;; ("glicid-rdma-core",glicid-rdma-core) ;;; segfault !!! + ("glicid-rdma-core-gcc-11",glicid-rdma-core-11) + ("libfabric",glicid-libfabric-gcc-11) ,@(package-inputs openmpi))) ) ) From 59844aa5c6a4233bd7f895382b5f014e772bfa08 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 22:07:09 +0200 Subject: [PATCH 38/89] typo --- glicid/packages/mpi.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index 8d58202..11a9acc 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -115,7 +115,7 @@ (inputs `(("gcc-11", gcc-11) ("gfortran-11", gfortran-11) ("glicid-ucx-gcc-11",glicid-ucx-gcc-11) - ("glicid-rdma-core-gcc-11",glicid-rdma-core-11) + ("glicid-rdma-core-gcc-11",glicid-rdma-core-gcc-11) ("libfabric",glicid-libfabric-gcc-11) ,@(package-inputs openmpi))) ) From 5d8a74f41abaea54c9fdab9fbf2679cc04242afb Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 25 Oct 2021 22:19:42 +0200 Subject: [PATCH 39/89] sha mismatch --- glicid/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index b410836..f3a9ceb 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -107,7 +107,7 @@ version ".tar.gz")) (sha256 (base32 - "02ym93k6khfmzm9rml79x9zh1dy8231sygw16r287mhwp0x9mbji")))) + "1hjwagf5x48vgshy5s01qjlzjr8kmxpflfcvh8pgj3zbj82zzxiz")))) ) ) From 15a65afd492e5d8d89e8631151251229f3f7ba35 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 26 Oct 2021 12:46:12 +0200 Subject: [PATCH 40/89] and now, benchmarks.scm --- glicid/packages/benchmark.scm | 125 ++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 glicid/packages/benchmark.scm diff --git a/glicid/packages/benchmark.scm b/glicid/packages/benchmark.scm new file mode 100644 index 0000000..b2cac1c --- /dev/null +++ b/glicid/packages/benchmark.scm @@ -0,0 +1,125 @@ +(define-module (glicid 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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages storage) + #:use-module (glicid packages mpi) + #:use-module (glicid packages gcc) + +) + + +;;;;;;;; + + +(define-public glicid-intel-mpi-benchmarks + (package + (inherit intel-mpi-benchmarks/openmpi) + (name "glicid-intel-mpi-benchmarks") + (inputs `(("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) + ("gcc",gcc-11) + ,@(package-inputs intel-mpi-benchmarks/openmpi))) + ) +) + +(define-public glicid-specific-intel-mpi-benchmarks + (package + (inherit glicid-intel-mpi-benchmarks) + (name "glicid-specific-intel-mpi-benchmarks") + (inputs `(("openmpi", glicid-specific-openmpi) + ("gcc",gcc-11) + ,@(package-inputs glicid-intel-mpi-benchmarks))) + ) +) + + + +;;; glicid/benchmark.scm ends here From a29cd4e641996c0aa19a9dfa86eb323d084543c9 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 26 Oct 2021 12:48:51 +0200 Subject: [PATCH 41/89] bad module name --- glicid/packages/benchmark.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/benchmark.scm b/glicid/packages/benchmark.scm index b2cac1c..641e211 100644 --- a/glicid/packages/benchmark.scm +++ b/glicid/packages/benchmark.scm @@ -1,4 +1,4 @@ -(define-module (glicid packages glicid) +(define-module (glicid packages benchmark) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) From 2615ae004180fc853753cb9634a07331d29b4a7e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 26 Oct 2021 14:19:34 +0200 Subject: [PATCH 42/89] tentative de rationalisation du nom des packages --- glicid/packages/benchmark.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/glicid/packages/benchmark.scm b/glicid/packages/benchmark.scm index 641e211..ac601e9 100644 --- a/glicid/packages/benchmark.scm +++ b/glicid/packages/benchmark.scm @@ -104,18 +104,15 @@ (package (inherit intel-mpi-benchmarks/openmpi) (name "glicid-intel-mpi-benchmarks") - (inputs `(("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) - ("gcc",gcc-11) - ,@(package-inputs intel-mpi-benchmarks/openmpi))) - ) + ) ) -(define-public glicid-specific-intel-mpi-benchmarks +(define-public glicid-intel-mpi-benchmarks-gcc-11 (package (inherit glicid-intel-mpi-benchmarks) (name "glicid-specific-intel-mpi-benchmarks") - (inputs `(("openmpi", glicid-specific-openmpi) - ("gcc",gcc-11) + (inputs `(("openmpi", glicid-openmpi-gcc-11) + ("gcc",gcc-11) ,@(package-inputs glicid-intel-mpi-benchmarks))) ) ) From 22b236822a7aa7cfe08fef8fd7a337729264cc69 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 26 Oct 2021 14:39:34 +0200 Subject: [PATCH 43/89] no more benchmark here --- glicid/packages/glicid.scm | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index f801b51..6b8154e 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -240,18 +240,6 @@ ; ) ;) -(define-public glicid-intel-mpi-benchmarks - (package - (inherit intel-mpi-benchmarks/openmpi) - (name "glicid-intel-mpi-benchmarks") - (inputs `(("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) - ("gcc",gcc-11) - ,@(package-inputs intel-mpi-benchmarks/openmpi))) - ) -) - - - (define-public glicid-gromacs-gcc-11 (package @@ -314,17 +302,6 @@ )) -(define-public glicid-specific-intel-mpi-benchmarks - (package - (inherit glicid-intel-mpi-benchmarks) - (name "glicid-specific-intel-mpi-benchmarks") - (inputs `(("openmpi", glicid-specific-openmpi) - ("gcc",gcc-11) - ,@(package-inputs glicid-intel-mpi-benchmarks))) - ) -) - - (define-public glicid-specific-hdf5 (package (inherit hdf5-1.12) From 74f5387a48829428a0808686cad64247c4817eae Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 26 Oct 2021 21:52:17 +0200 Subject: [PATCH 44/89] =?UTF-8?q?simplification=20simplification#=20commen?= =?UTF-8?q?=C3=A7ant=20par=20'#'=20seront=20ignor=C3=A9es,=20et=20un=20mes?= =?UTF-8?q?sage=20vide=20abandonne=20la=20validation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- glicid/packages/glicid.scm | 46 -------------------------------------- 1 file changed, 46 deletions(-) diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 6b8154e..68fe094 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -276,32 +276,6 @@ )) -(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/1.2/gajim-" version ".tar.gz")) - (sha256 (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx")) - )) - - (inputs `(("python-packaging", python-packaging) - ("glicid-python-nbxmpp", glicid-python-nbxmpp) - ("python-css-parser", python-css-parser) - ,@(package-inputs gajim))) - - (propagated-inputs - `( - ("glib-networking" ,glib-networking) - ("libsoup" ,libsoup) - ("gnutls" , gnutls) - )) -)) - - (define-public glicid-specific-hdf5 (package (inherit hdf5-1.12) @@ -399,24 +373,6 @@ ) ) -(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-motif (package @@ -795,6 +751,4 @@ ) - - ;;; glicid.scm ends here From ea203a88cfffc85202fe0866c3f1a566c45dfba8 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 26 Oct 2021 22:45:34 +0200 Subject: [PATCH 45/89] qemu is now in virtualization --- glicid/packages/glicid.scm | 30 ------- glicid/packages/virtualization.scm | 133 +++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 30 deletions(-) create mode 100644 glicid/packages/virtualization.scm diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 68fe094..32c929f 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -721,34 +721,4 @@ ) -(define-public glicid-qemu - - (package - (inherit qemu) - (name "glicid-qemu") - ) - ) - - -(define-public qemu-with-rbd - - - (package - (inherit glicid-qemu) - (name "qemu-with-rbd") - (arguments - - (substitute-keyword-arguments - `(#:tests? #f - ,@(package-arguments glicid-qemu))) - - ) - - (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) - ,@(package-inputs glicid-qemu))) - - ) -) - - ;;; glicid.scm ends here diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm new file mode 100644 index 0000000..774514c --- /dev/null +++ b/glicid/packages/virtualization.scm @@ -0,0 +1,133 @@ +(define-module (glicid 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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages storage) + #:use-module (glicid packages mpi) + #:use-module (glicid packages gcc) + +) + + +;;;;;;;; + + +(define-public glicid-qemu + + (package + (inherit qemu) + (name "glicid-qemu") + ) + ) + + +(define-public qemu-with-rbd + + + (package + (inherit glicid-qemu) + (name "qemu-with-rbd") + (arguments + + (substitute-keyword-arguments + `(#:tests? #f + ,@(package-arguments glicid-qemu))) + + ) + + (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) + ,@(package-inputs glicid-qemu))) + + ) +) + + +;;; glicid/virtualizationvirtualization.scm ends here From 51c60148ae0e788072a2083244f3b0c5b58c0deb Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 26 Oct 2021 22:49:33 +0200 Subject: [PATCH 46/89] wrong package name --- glicid/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index 774514c..4a6d640 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -1,4 +1,4 @@ -(define-module (glicid packages glicid) +(define-module (glicid packages virtualization) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) From 68ad92e36631bcbfdd5c56e337a414700ff2241d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 26 Oct 2021 23:31:28 +0200 Subject: [PATCH 47/89] new upstream version --- glicid/packages/storage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm index 0887a80..aef4288 100644 --- a/glicid/packages/storage.scm +++ b/glicid/packages/storage.scm @@ -337,7 +337,7 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") (package (inherit ceph) (name "glicid-ceph-15b") - (version "15.2.14") + (version "15.2.15") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" From 4fa57f53bf059165b6c08d14b5a4e5238c633a8b Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 26 Oct 2021 23:33:42 +0200 Subject: [PATCH 48/89] new checksum --- glicid/packages/storage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm index aef4288..e0b1960 100644 --- a/glicid/packages/storage.scm +++ b/glicid/packages/storage.scm @@ -344,7 +344,7 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") version ".tar.gz")) (sha256 (base32 - "12cz10aascr2h7xbxp9ba5207pn9qv6m50xp5f8ns80vj6lzi6d3")) + "1gyh01kwbds4s43nlaj3q1mbyx7lnpw0dz1bncsx865y5vzxmk2x")) (patches (search-patches "ceph-fix-snappy-breaking-change.patch")) (modules '((guix build utils))) From 926aab17fae6b50a6e276f2e61d17718701593b4 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 27 Oct 2021 09:43:51 +0200 Subject: [PATCH 49/89] new name (keepalived) --- glicid/packages/cluster.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index f973f90..ef06434 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -96,10 +96,9 @@ ;;;;;;;; -(define-public glicid-keepalived-2.1.5 +(define-public keepalived-2.1.5 (package (inherit keepalived) - (name "glicid-keepalived") (version "2.1.5") (source (origin (method url-fetch) @@ -112,7 +111,7 @@ "0n92fdlmm251scq2j7w1nqwly8jsla4sxrd0jnfb6nn9qp5pqkfr")))) (arguments - `(#:configure-flags + `(#:conf(igure-flags (list (string-append "--enable-snmp") (string-append "--enable-snmp-checker") (string-append "--enable-snmp-rfc") @@ -130,10 +129,9 @@ ) ) -(define-public glicid-keepalived-2.2.4 +(define-public keepalived-2.2.4 (package (inherit keepalived) - (name "glicid-keepalived") (version "2.2.4") (source (origin (method url-fetch) @@ -164,6 +162,6 @@ ) ) -(define-public glicid-keepalived glicid-keepalived-2.2.4) +; (define-public glicid-keepalived glicid-keepalived-2.2.4) ;;; glicid/cluster.scm ends here From e97ef4a54c88f15e7f7d84c8c1c34cce0eda9115 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 27 Oct 2021 09:46:46 +0200 Subject: [PATCH 50/89] typo --- glicid/packages/cluster.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index ef06434..455893e 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -111,7 +111,7 @@ "0n92fdlmm251scq2j7w1nqwly8jsla4sxrd0jnfb6nn9qp5pqkfr")))) (arguments - `(#:conf(igure-flags + `(#:configure-flags (list (string-append "--enable-snmp") (string-append "--enable-snmp-checker") (string-append "--enable-snmp-rfc") From 029e41f491902ebe390acd842ad2a3113ccc74d4 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 27 Oct 2021 09:50:35 +0200 Subject: [PATCH 51/89] new defs --- glicid/packages/cluster.scm | 42 ++++++++----------------------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 455893e..7318ebd 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -96,39 +96,6 @@ ;;;;;;;; -(define-public keepalived-2.1.5 - (package - (inherit 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))) - - - - ) -) - (define-public keepalived-2.2.4 (package (inherit keepalived) @@ -143,6 +110,15 @@ (base32 "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01")))) + + + ) +) + +(define-public glicid-keepalived + (package + (inherit keepalived) + (arguments `(#:configure-flags (list (string-append "--enable-snmp") From b1d93011f074a5371754f73a68f2dbb996cf2091 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 27 Oct 2021 09:56:15 +0200 Subject: [PATCH 52/89] test --- glicid/packages/cluster.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 7318ebd..047a5aa 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -96,7 +96,7 @@ ;;;;;;;; -(define-public keepalived-2.2.4 +(define-public keepalived (package (inherit keepalived) (version "2.2.4") @@ -118,7 +118,7 @@ (define-public glicid-keepalived (package (inherit keepalived) - + (name "glicid-keepalived") (arguments `(#:configure-flags (list (string-append "--enable-snmp") From 1c785ad55535437602ebb262b51820c0f4cd63fb Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 27 Oct 2021 09:59:22 +0200 Subject: [PATCH 53/89] test --- glicid/packages/cluster.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 047a5aa..d96439f 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -43,7 +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 cluster) #:prefix gnu:) #:use-module (gnu packages libevent) #:use-module (gnu packages xorg) #:use-module (gnu packages fontutils) @@ -98,7 +98,7 @@ (define-public keepalived (package - (inherit keepalived) + (inherit gnu:keepalived) (version "2.2.4") (source (origin (method url-fetch) From 442a1e23b36e35524472bb3cb57a107e59d732fd Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 27 Oct 2021 10:04:13 +0200 Subject: [PATCH 54/89] old version for test --- glicid/packages/cluster.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index d96439f..3b30555 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -99,7 +99,8 @@ (define-public keepalived (package (inherit gnu:keepalived) - (version "2.2.4") +; (version "2.2.4") + (version "2.0.18") (source (origin (method url-fetch) (uri (string-append @@ -108,7 +109,9 @@ (sha256 (base32 - "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01")))) + ;"1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" + "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql" +)))) From 08aebed361682be85790b1893e70a0373d5fdbca Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 27 Oct 2021 10:06:31 +0200 Subject: [PATCH 55/89] new version --- glicid/packages/cluster.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 3b30555..fb9c2f3 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -99,8 +99,8 @@ (define-public keepalived (package (inherit gnu:keepalived) -; (version "2.2.4") - (version "2.0.18") + (version "2.2.4") +; (version "2.0.18") (source (origin (method url-fetch) (uri (string-append @@ -109,8 +109,8 @@ (sha256 (base32 - ;"1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" - "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql" + "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" +; "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql" )))) From 2d70462346da9684365717da94c1e4f00ad46aad Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 27 Oct 2021 10:13:02 +0200 Subject: [PATCH 56/89] test --- glicid/packages/cluster.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index fb9c2f3..d9d9063 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -118,6 +118,10 @@ ) ) + +(use-modules (gnu packages cluster)) ;; to bring keepalived symbols + + (define-public glicid-keepalived (package (inherit keepalived) From 25e559068b6cfdec86b3e0f59bab84099bb940b9 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 27 Oct 2021 10:13:18 +0200 Subject: [PATCH 57/89] tests --- glicid/packages/cluster.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index d9d9063..418b96d 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -99,8 +99,8 @@ (define-public keepalived (package (inherit gnu:keepalived) - (version "2.2.4") -; (version "2.0.18") +; (version "2.2.4") + (version "2.0.18") (source (origin (method url-fetch) (uri (string-append @@ -109,8 +109,8 @@ (sha256 (base32 - "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" -; "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql" +; "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" + "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql" )))) From ecfdfe53dd548585a43b96f2f7b4373152640cd5 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 27 Oct 2021 16:46:51 +0200 Subject: [PATCH 58/89] add nfs ganesha --- glicid/packages/nfs.scm | 203 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) create mode 100644 glicid/packages/nfs.scm diff --git a/glicid/packages/nfs.scm b/glicid/packages/nfs.scm new file mode 100644 index 0000000..1d2db94 --- /dev/null +++ b/glicid/packages/nfs.scm @@ -0,0 +1,203 @@ +(define-module (glicid packages nfs) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages storage) + #:use-module (glicid packages mpi) + #:use-module (glicid packages gcc) + +) + + +;; https://github.com/nfs-ganesha/nfs-ganesha/archive/refs/tags/V3.5.tar.gz + +(define-public nfs-ganesha + (package + (name "nfs-ganesha") + (version "3.5") + (source (origin +; (method url-fetch) +; (uri (string-append +; "https://github.com/nfs-ganesha/nfs-ganesha/archive/refs/tags/V" version ".tar.gz")) +; +; +; (sha256 (base32 "0545c6snmx66vpa427ij21md81vi5xa2v77428i4pq6fk6mgm06r")) +; ) +; ) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nfs-ganesha/nfs-ganesha.git") + (commit (string-append "V" version)) + (recursive? #t) + ) + ) + (sha256 (base32 "0rdg3mjqrr4a8mywxkfis25gkbn4fylw42hg1d9cvp4dwrjk3hl4")) + (file-name (string-append name "-" version "-checkout")) + + ) +) + (build-system cmake-build-system) + (arguments + `( +;; #:validate-runpath? #f ;; we should know why + #:configure-flags + (list ;; Defaults to "lib64" on 64-bit archs. + (string-append + ; "-DCMAKE_INSTALL_LIBDIR=" + ; (assoc-ref %outputs "out") "/lib" + + "-DLIB_INSTALL_DIR=" + (assoc-ref %outputs "out") "/lib" + + ; "-DCMAKE_INSTALL_RPATH=" + ; (assoc-ref %outputs "out") + ; "/lib:" + ; (assoc-ref %outputs "out") + ; "/lib64" + ) + ) + + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ (chdir "src") #t) + + + ) + ) + ) + ) + +; (native-search-paths +; (list +; (search-path-specification +; (variable "LIBRARY_PATH") +; (files '("lib" "lib64")) +; ) +; ) +; ) + + (inputs + `( + ("perl", perl) + ("oksh",oksh) + ("python-3",python-3) + ("mit-krb5",mit-krb5) + ("gss",gss) + ("pkg-config",pkg-config) + ("jemalloc",jemalloc) + ("glicid-ceph:lib",glicid-ceph "lib") + ("libnfsidmap",libnfsidmap) + ("libnfs",libnfs) +; ("xfsprogs",xfsprogs) + ("liburcu",liburcu) + ("bison",bison) + ("flex",flex) + ("libnsl",libnsl) + ("util-linux" ,util-linux "lib") ;; uuid.h + + ) + ) + +;; placeholders + +(synopsis "nfs-ganesha") + (description + "NFS-Ganesha. + bla.") + (home-page "https://") + (license license:gpl3+)) +;) + +; ) +;) +) +;;; glicid/nfs.scm ends here From fb52b0ec4e281e0e7930ed9da489b4d6906cff3f Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Wed, 27 Oct 2021 16:58:41 +0200 Subject: [PATCH 59/89] need more modules --- glicid/packages/nfs.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/glicid/packages/nfs.scm b/glicid/packages/nfs.scm index 1d2db94..9101821 100644 --- a/glicid/packages/nfs.scm +++ b/glicid/packages/nfs.scm @@ -93,6 +93,19 @@ #:use-module (glicid packages storage) #:use-module (glicid packages mpi) #:use-module (glicid packages gcc) +#:use-module (gnu packages image) +#:use-module (gnu packages perl) +#:use-module (gnu packages shells) +#:use-module (gnu packages python) +#:use-module (gnu packages kerberos) +#:use-module (gnu packages gsasl) +#:use-module (gnu packages jemalloc) +#:use-module (gnu packages storage) +#:use-module (gnu packages file-systems) +#:use-module (gnu packages datastructures) +#:use-module (gnu packages bison) +#:use-module (gnu packages flex) +#:use-module (gnu packages onc-rpc) ) From aebad8cabd503938d7007c5afc5aafd67ea6f88b Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 28 Oct 2021 15:17:29 +0200 Subject: [PATCH 60/89] tentative --- glicid/packages/gnome.scm | 110 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 glicid/packages/gnome.scm diff --git a/glicid/packages/gnome.scm b/glicid/packages/gnome.scm new file mode 100644 index 0000000..b45a4c3 --- /dev/null +++ b/glicid/packages/gnome.scm @@ -0,0 +1,110 @@ +(define-module (glicid packages gnome) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (gnu packages gnome) + +) + + +;;;;;;;; + + +(define-public glicid-terminator + (package + (inherit terminator) + (propagated-inputs + `( + ("sssd" ,sssd) + )) + + ) +) From b0d999e09b036c271b41ca6d591c5f8cf93044a8 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 28 Oct 2021 15:23:56 +0200 Subject: [PATCH 61/89] needs name --- glicid/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/glicid/packages/gnome.scm b/glicid/packages/gnome.scm index b45a4c3..9456e79 100644 --- a/glicid/packages/gnome.scm +++ b/glicid/packages/gnome.scm @@ -101,6 +101,7 @@ (define-public glicid-terminator (package (inherit terminator) + (name "glicid-terminator") (propagated-inputs `( ("sssd" ,sssd) From e2525c07711f7422aa71a1bd0ab66841fde97759 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 28 Oct 2021 15:33:51 +0200 Subject: [PATCH 62/89] missing inherited propagated inputs --- glicid/packages/gnome.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/glicid/packages/gnome.scm b/glicid/packages/gnome.scm index 9456e79..98ff711 100644 --- a/glicid/packages/gnome.scm +++ b/glicid/packages/gnome.scm @@ -105,6 +105,8 @@ (propagated-inputs `( ("sssd" ,sssd) + ,@(package-propagated-inputs terminator) + )) ) From 44d00e1c1793629a8e1356b8089b0bd43a9f047b Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 1 Nov 2021 21:55:09 +0100 Subject: [PATCH 63/89] tests de versions. --- glicid/packages/cluster.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 418b96d..a27bd1e 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -119,12 +119,30 @@ ) -(use-modules (gnu packages cluster)) ;; to bring keepalived symbols +;(define choose-latest (package1 package2) +; (let ) +;) + +; (define glicid-version +; (version-major+minor (package-version keepalived))) + +; (define gnu-version +; (version-major+minor (package-version gnu:keepalived))) + + ;(define (latest-keepalived (if (>= glicid-version gnu-version) keepalived gnu:keepalived))) + (define-public glicid-keepalived (package - (inherit keepalived) +; (inherit (latest-keepalived)) + + ; (inherit (if (>= (version-major+minor (package-version keepalived)) (version-major+minor (package-version keepalived))) keepalived gnu:keepalived)) + (inherit (if (string> (package-version keepalived) (package-version keepalived)) keepalived gnu:keepalived)) + + + ; ) + (name "glicid-keepalived") (arguments `(#:configure-flags From 34abe6a3e569406db01848bdba2b8e2f687215b1 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 1 Nov 2021 22:00:34 +0100 Subject: [PATCH 64/89] =?UTF-8?q?mise=20=C3=A0=20jour=20des=20versions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- glicid/packages/cluster.scm | 8 +- glicid/packages/cluster.scm~ | 168 +++++ glicid/packages/fabric-management.scm~ | 165 +++++ glicid/packages/gcc.scm~ | 176 +++++ glicid/packages/glicid.scm~ | 857 +++++++++++++++++++++++++ glicid/packages/linux.scm~ | 146 +++++ glicid/packages/mpi.scm~ | 138 ++++ glicid/packages/parallel.scm~ | 173 +++++ glicid/packages/virtualization.scm~ | 133 ++++ 9 files changed, 1960 insertions(+), 4 deletions(-) create mode 100644 glicid/packages/cluster.scm~ create mode 100644 glicid/packages/fabric-management.scm~ create mode 100644 glicid/packages/gcc.scm~ create mode 100644 glicid/packages/glicid.scm~ create mode 100644 glicid/packages/linux.scm~ create mode 100644 glicid/packages/mpi.scm~ create mode 100644 glicid/packages/parallel.scm~ create mode 100644 glicid/packages/virtualization.scm~ diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index a27bd1e..bd4b714 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -99,8 +99,8 @@ (define-public keepalived (package (inherit gnu:keepalived) -; (version "2.2.4") - (version "2.0.18") + (version "2.2.4") +; (version "2.0.18") (source (origin (method url-fetch) (uri (string-append @@ -109,8 +109,8 @@ (sha256 (base32 -; "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" - "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql" + "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" +; "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql" )))) diff --git a/glicid/packages/cluster.scm~ b/glicid/packages/cluster.scm~ new file mode 100644 index 0000000..99abbe3 --- /dev/null +++ b/glicid/packages/cluster.scm~ @@ -0,0 +1,168 @@ +(define-module (glicid packages cluster) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + +) + + +;;;;;;;; + +(define-public glicid-keepalived-2.1.5 + (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))) + + + + ) +) + +(define-public glicid-keepalived-2.2.4 + (package + (inherit keepalived) + (name "glicid-keepalived") + (version "2.2.4") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.keepalived.org/software/keepalived-" + version ".tar.gz")) + + (sha256 + (base32 + "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01")))) + + (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))) + + + + ) +) + + +;;; glicid/cluster.scm ends here diff --git a/glicid/packages/fabric-management.scm~ b/glicid/packages/fabric-management.scm~ new file mode 100644 index 0000000..3faa221 --- /dev/null +++ b/glicid/packages/fabric-management.scm~ @@ -0,0 +1,165 @@ +(define-module (glicid packages fabric-management) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages gcc) + #:use-module (glicid packages linux) +) + + +(define-public glicid-ucx + (package + (inherit ucx) + (name "glicid-ucx") + (version "1.11.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) + (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) + ) + + ) + ) +) + +(define-public glicid-ucx-gcc-11 + (package + (inherit glicid-ucx) + (name "glicid-ucx-gcc-11") + + (inputs `(("gcc-11", gcc-11) + ("gfortran-11", gfortran-11) + ,@(package-inputs glicid-ucx))) + ) +) + +(define-public glicid-ucx-gcc-10 + (package + (inherit glicid-ucx) + (name "glicid-ucx-gcc-10") + + (inputs `(("gcc-10", gcc-10) + ("gfortran-10", gfortran-10) + ,@(package-inputs glicid-ucx))) + ) +) + + +(define-public glicid-specific-ucx-gcc-11 + (package + (inherit glicid-ucx) + (name "glicid-specific-ucx-gcc-11") + (version "1.10.0") + + (inputs `(("gcc", gcc-11) + ("gfortran", gfortran-11) + ("libfabric", glicid-libfabric-gcc-11) + ("rdma-core",glicid-rdma-core-gcc-11) + + ,@(package-inputs glicid-ucx))) + ) +) + +(define-public glicid-ucx-gcc-10 + (package + (inherit ucx) + + (inputs `(("gcc", gcc-10) + ("gfortran", gfortran-10) + ("libfabric", glicid-libfabric-gcc-11) + ("rdma-core",glicid-rdma-core-gcc-11) + + ,@(package-inputs glicid-ucx))) + ) +) + +;;; glicid/fabric-management.scm ends here diff --git a/glicid/packages/gcc.scm~ b/glicid/packages/gcc.scm~ new file mode 100644 index 0000000..852c6cb --- /dev/null +++ b/glicid/packages/gcc.scm~ @@ -0,0 +1,176 @@ +(define-module (glicid 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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + + + +) + + +(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-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)) + (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-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."))) + + + + + +;;; glicid/gcc.scm ends here diff --git a/glicid/packages/glicid.scm~ b/glicid/packages/glicid.scm~ new file mode 100644 index 0000000..927d221 --- /dev/null +++ b/glicid/packages/glicid.scm~ @@ -0,0 +1,857 @@ +(define-module (glicid 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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages storage) + #:use-module (glicid packages mpi) + #:use-module (glicid packages gcc) + +) + + +;;;;;;;; + + +(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-11", gfortran-11) +; ,@(package-inputs openmpi))) +; ) +;) + +(define-public glicid-intel-mpi-benchmarks + (package + (inherit intel-mpi-benchmarks/openmpi) + (name "glicid-intel-mpi-benchmarks") + (inputs `(("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) + ("gcc",gcc-11) + ,@(package-inputs intel-mpi-benchmarks/openmpi))) + ) +) + + + + +(define-public glicid-gromacs-gcc-11 + (package + (inherit gromacs) + (name "glicid-gromacs-gcc-11") + (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-11", gcc-11) + ("gfortran-11", gfortran-11) + ("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) + ,@(package-inputs gromacs))) +)) + + +(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") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://gajim.org/downloads/1.2/gajim-" version ".tar.gz")) + (sha256 (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx")) + )) + + (inputs `(("python-packaging", python-packaging) + ("glicid-python-nbxmpp", glicid-python-nbxmpp) + ("python-css-parser", python-css-parser) + ,@(package-inputs gajim))) + + (propagated-inputs + `( + ("glib-networking" ,glib-networking) + ("libsoup" ,libsoup) + ("gnutls" , gnutls) + )) +)) + + +(define-public glicid-specific-intel-mpi-benchmarks + (package + (inherit glicid-intel-mpi-benchmarks) + (name "glicid-specific-intel-mpi-benchmarks") + (inputs `(("openmpi", glicid-specific-openmpi) + ("gcc",gcc-11) + ,@(package-inputs glicid-intel-mpi-benchmarks))) + ) +) + + +(define-public glicid-specific-hdf5 + (package + (inherit hdf5-1.12) + (name "glicid-specific-hdf5") +; (arguments +; `(#:tests? #f) +; ) + (native-inputs `( + ("gcc",gcc-11) + ("gfortran",gfortran-11) + ,@(package-native-inputs hdf5-1.12))) + ) +) + +(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 glicid-specific-hdf5))) + (arguments + +; `( +; #:tests? #f + + ( + substitute-keyword-arguments (package-arguments glicid-specific-hdf5) + ((#:configure-flags flags) + ``("--enable-parallel" "--disable-tests" + ,@(delete "--enable-cxx" + (delete "--enable-threadsafe" ,flags)))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'build 'mpi-setup + ,%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) + (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-vspecific-openblas + (package + (inherit openblas) + (name "glicid-vspecific-openblas") + (version "0.3.15") + (source + (origin + (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 + "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h")))) + + (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-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 + (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))) + + + + ) +) + +(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 " ") + + ) +) + +(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 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-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.") + (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)) +) + +(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) +) +) + + +(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") + (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) + +(arguments + `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE" + "-DCMAKE_C_FLAGS=-fPIE"))) + + +(synopsis "libfido2") +(description "Todo") +(home-page "toto") +(license license:gpl2+) + + +)) + + +(define-public glicid-libfido2 + (package + + (name "glicid-libfido2") + (version "1.8.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 + "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm")) + + + )) + + (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))) + + + + ) + + +) + + +(define-public glicid-qemu + + (package + (inherit qemu) + (name "glicid-qemu") + ) + ) + + +(define-public qemu-with-rbd + + + (package + (inherit glicid-qemu) + (name "qemu-with-rbd") + (arguments + + (substitute-keyword-arguments + `(#:tests? #f + ,@(package-arguments glicid-qemu))) + + ) + + (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) + ,@(package-inputs glicid-qemu))) + + ) +) + + + + +;;; glicid.scm ends here diff --git a/glicid/packages/linux.scm~ b/glicid/packages/linux.scm~ new file mode 100644 index 0000000..b410836 --- /dev/null +++ b/glicid/packages/linux.scm~ @@ -0,0 +1,146 @@ +(define-module (glicid packages linux) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages gcc) + +) + + +(define-public glicid-rdma-core +(package + (inherit rdma-core) + (name "glicid-rdma-core") + (version "37.1") + (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-11 +(package + (inherit glicid-rdma-core) + (name "glicid-rdma-core-gcc-11") + (inputs `(("gcc-11", gcc-11) + ,@(package-inputs rdma-core))) + ) +) + + +(define-public glicid-libfabric +(package + (inherit libfabric) + (name "glicid-libfabric") + (version "1.13.1") + ) +) + + +(define-public glicid-libfabric-gcc-11 +(package + (inherit glicid-libfabric) + (name "glicid-libfabric-gcc-11") + + (inputs `(("gcc-11", gcc-11) + ("rdma-core", glicid-rdma-core-gcc-11) + ,@(package-inputs glicid-libfabric))) + ) +) + + +;;; glicid/linux.scm ends here diff --git a/glicid/packages/mpi.scm~ b/glicid/packages/mpi.scm~ new file mode 100644 index 0000000..8d58202 --- /dev/null +++ b/glicid/packages/mpi.scm~ @@ -0,0 +1,138 @@ +(define-module (glicid packages mpi) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages gcc) + #:use-module (glicid packages linux) + #:use-module (glicid packages fabric-management) + + + + +) + +(define-public glicid-openmpi + (package + (inherit openmpi) + (name "glicid-openpmi") + ) +) + + +(define-public glicid-openmpi-gcc-11 + (package + (inherit glicid-openmpi) + (name "glicid-openpmi-gcc-11") + + (inputs `(("gcc-11", gcc-11) + ("gfortran-11", gfortran-11) + ("glicid-ucx-gcc-11",glicid-ucx-gcc-11) + ("glicid-rdma-core-gcc-11",glicid-rdma-core-11) + ("libfabric",glicid-libfabric-gcc-11) + ,@(package-inputs openmpi))) + ) +) + + +(define-public glicid-specific-openmpi + (package + (inherit glicid-openmpi-gcc-11) + (name "glicid-specific-openmpi") + (inputs `( + ("gcc",gcc-11) + ("rdma-core",glicid-rdma-core-gcc-11) + ("ucx",glicid-ucx-gcc-10) + ("libfabric",glicid-libfabric-gcc-11) +; ("slurm", glicid-specific-slurm) + ,@(package-inputs glicid-openmpi-gcc-11))) + ) +) + diff --git a/glicid/packages/parallel.scm~ b/glicid/packages/parallel.scm~ new file mode 100644 index 0000000..b32b91f --- /dev/null +++ b/glicid/packages/parallel.scm~ @@ -0,0 +1,173 @@ +(define-module (glicid packages parallel) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + + +) + + +(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")) + )) + (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) + ("gcc", gcc-11) + ("glicid-pmix", glicid-pmix) +; ("glicid-specific-openmpi", glicid-specific-openmpi) + ,@(package-inputs slurm) + + + )) + (propagated-inputs + `( + ("sssd" ,sssd) + )) + +)) + + +(define-public glicid-custom-slurm-20.02 + (package + (inherit glicid-custom-slurm-19.05) + (name "glicid-custom-slurm-20.02") + (version "20.02.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) + (sha256 (base32 "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6")) + )) +)) + + +(define-public glicid-custom-slurm-20.11 + (package + (inherit glicid-custom-slurm-20.02) + (name "glicid-custom-slurm-20.11") + (version "20.11.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) + (sha256 (base32 "1fdjihg1x7ks5l77yjv14a4mg6r0v8c3zk1dcxkhrhq3n4dc9nbs")) + )) +)) + +(define-public glicid-specific-slurm glicid-custom-slurm-20.02) + + + diff --git a/glicid/packages/virtualization.scm~ b/glicid/packages/virtualization.scm~ new file mode 100644 index 0000000..774514c --- /dev/null +++ b/glicid/packages/virtualization.scm~ @@ -0,0 +1,133 @@ +(define-module (glicid 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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages storage) + #:use-module (glicid packages mpi) + #:use-module (glicid packages gcc) + +) + + +;;;;;;;; + + +(define-public glicid-qemu + + (package + (inherit qemu) + (name "glicid-qemu") + ) + ) + + +(define-public qemu-with-rbd + + + (package + (inherit glicid-qemu) + (name "qemu-with-rbd") + (arguments + + (substitute-keyword-arguments + `(#:tests? #f + ,@(package-arguments glicid-qemu))) + + ) + + (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) + ,@(package-inputs glicid-qemu))) + + ) +) + + +;;; glicid/virtualizationvirtualization.scm ends here From ae27d247f5f7f74b5bf136ce92122201c4c86de2 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 1 Nov 2021 22:03:14 +0100 Subject: [PATCH 65/89] thinko. --- glicid/packages/cluster.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index bd4b714..b8cb6fc 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -138,7 +138,7 @@ ; (inherit (latest-keepalived)) ; (inherit (if (>= (version-major+minor (package-version keepalived)) (version-major+minor (package-version keepalived))) keepalived gnu:keepalived)) - (inherit (if (string> (package-version keepalived) (package-version keepalived)) keepalived gnu:keepalived)) + (inherit (if (string> (package-version keepalived) (package-version gnu:keepalived)) keepalived gnu:keepalived)) ; ) From b1c8e6cbef292dc8150f3bbfeecbdfe57e0b0e14 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 1 Nov 2021 22:05:30 +0100 Subject: [PATCH 66/89] encore des tests de versions --- glicid/packages/cluster.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index b8cb6fc..095b623 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -99,8 +99,8 @@ (define-public keepalived (package (inherit gnu:keepalived) - (version "2.2.4") -; (version "2.0.18") +; (version "2.2.4") + (version "2.0.18") (source (origin (method url-fetch) (uri (string-append @@ -109,8 +109,8 @@ (sha256 (base32 - "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" -; "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql" +; "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" + "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql" )))) From 5cde355a832a0c0fef5fbba92f4a358a6da5c547 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 1 Nov 2021 22:13:40 +0100 Subject: [PATCH 67/89] =?UTF-8?q?version=20qui=20devrait=20=C3=AAtre=20ok.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- glicid/packages/cluster.scm | 53 +++++++++---------------------------- 1 file changed, 12 insertions(+), 41 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 095b623..5805a8d 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -87,7 +87,6 @@ #: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) @@ -99,8 +98,7 @@ (define-public keepalived (package (inherit gnu:keepalived) -; (version "2.2.4") - (version "2.0.18") + (version "2.2.4") (source (origin (method url-fetch) (uri (string-append @@ -109,8 +107,7 @@ (sha256 (base32 -; "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" - "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql" + "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" )))) @@ -119,50 +116,24 @@ ) -;(define choose-latest (package1 package2) -; (let ) -;) - -; (define glicid-version -; (version-major+minor (package-version keepalived))) - -; (define gnu-version -; (version-major+minor (package-version gnu:keepalived))) - - ;(define (latest-keepalived (if (>= glicid-version gnu-version) keepalived gnu:keepalived))) - - - (define-public glicid-keepalived (package -; (inherit (latest-keepalived)) - - ; (inherit (if (>= (version-major+minor (package-version keepalived)) (version-major+minor (package-version keepalived))) keepalived gnu:keepalived)) - (inherit (if (string> (package-version keepalived) (package-version gnu:keepalived)) keepalived gnu:keepalived)) - - - ; ) + (inherit (if (string> (package-version keepalived) (package-version gnu:keepalived)) keepalived gnu:keepalived)) (name "glicid-keepalived") - (arguments - `(#:configure-flags - (list (string-append "--enable-snmp") - (string-append "--enable-snmp-checker") - (string-append "--enable-snmp-rfc") - ) + (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))) - + (inputs `(("net-snmp", net-snmp) + ,@(package-inputs keepalived))) ) ) -; (define-public glicid-keepalived glicid-keepalived-2.2.4) - ;;; glicid/cluster.scm ends here From f2c197c92c541b127fe253a9162e94e8613f31ad Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 1 Nov 2021 23:16:44 +0100 Subject: [PATCH 68/89] =?UTF-8?q?now=20use=20a=20function=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- glicid/packages/cluster.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 5805a8d..358afe0 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -92,6 +92,9 @@ ) +;; helper function +(define (latest-version v1 v2) (if (string> (package-version v1) (package-version v2)) v1 v2)) + ;;;;;;;; @@ -118,8 +121,7 @@ (define-public glicid-keepalived (package - (inherit (if (string> (package-version keepalived) (package-version gnu:keepalived)) keepalived gnu:keepalived)) - + (inherit (latest-version keepalived gnu:keepalived)) (name "glicid-keepalived") (arguments `(#:configure-flags From 95426e627c24820947749b035fb7fbb33beb3ac7 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Tue, 2 Nov 2021 09:40:50 +0100 Subject: [PATCH 69/89] updating to use glicid package --- glicid/packages/nginx.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/glicid/packages/nginx.scm b/glicid/packages/nginx.scm index b349b60..7821332 100644 --- a/glicid/packages/nginx.scm +++ b/glicid/packages/nginx.scm @@ -5,8 +5,7 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages web) -; #:use-module (glicid packages openldap) - #:use-module (gnu packages openldap) + #:use-module (glicid packages openldap) ) (define-public nginx-ldap-auth-module From 12048d59b57ea46a13e3d63b8bb0b1f4d4839f47 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 21:06:24 +0100 Subject: [PATCH 70/89] ssh / fido now in specific packages --- glicid/packages/glicid.scm | 182 ----------------------- glicid/packages/glicid.scm~ | 133 ----------------- glicid/packages/ssh.scm | 288 ++++++++++++++++++++++++++++++++++++ 3 files changed, 288 insertions(+), 315 deletions(-) create mode 100644 glicid/packages/ssh.scm diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 32c929f..4b2cd1c 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -538,187 +538,5 @@ ) -(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") - (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) - -(arguments - `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE" - "-DCMAKE_C_FLAGS=-fPIE"))) - - -(synopsis "libfido2") -(description "Todo") -(home-page "toto") -(license license:gpl2+) - - -)) - - -(define-public glicid-libfido2 - (package - - (name "glicid-libfido2") - (version "1.8.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 - "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm")) - - - )) - - (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 diff --git a/glicid/packages/glicid.scm~ b/glicid/packages/glicid.scm~ index 927d221..32c929f 100644 --- a/glicid/packages/glicid.scm~ +++ b/glicid/packages/glicid.scm~ @@ -240,18 +240,6 @@ ; ) ;) -(define-public glicid-intel-mpi-benchmarks - (package - (inherit intel-mpi-benchmarks/openmpi) - (name "glicid-intel-mpi-benchmarks") - (inputs `(("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) - ("gcc",gcc-11) - ,@(package-inputs intel-mpi-benchmarks/openmpi))) - ) -) - - - (define-public glicid-gromacs-gcc-11 (package @@ -288,43 +276,6 @@ )) -(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/1.2/gajim-" version ".tar.gz")) - (sha256 (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx")) - )) - - (inputs `(("python-packaging", python-packaging) - ("glicid-python-nbxmpp", glicid-python-nbxmpp) - ("python-css-parser", python-css-parser) - ,@(package-inputs gajim))) - - (propagated-inputs - `( - ("glib-networking" ,glib-networking) - ("libsoup" ,libsoup) - ("gnutls" , gnutls) - )) -)) - - -(define-public glicid-specific-intel-mpi-benchmarks - (package - (inherit glicid-intel-mpi-benchmarks) - (name "glicid-specific-intel-mpi-benchmarks") - (inputs `(("openmpi", glicid-specific-openmpi) - ("gcc",gcc-11) - ,@(package-inputs glicid-intel-mpi-benchmarks))) - ) -) - - (define-public glicid-specific-hdf5 (package (inherit hdf5-1.12) @@ -422,58 +373,6 @@ ) ) -(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 - (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))) - - - - ) -) (define-public glicid-motif (package @@ -822,36 +721,4 @@ ) -(define-public glicid-qemu - - (package - (inherit qemu) - (name "glicid-qemu") - ) - ) - - -(define-public qemu-with-rbd - - - (package - (inherit glicid-qemu) - (name "qemu-with-rbd") - (arguments - - (substitute-keyword-arguments - `(#:tests? #f - ,@(package-arguments glicid-qemu))) - - ) - - (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) - ,@(package-inputs glicid-qemu))) - - ) -) - - - - ;;; glicid.scm ends here diff --git a/glicid/packages/ssh.scm b/glicid/packages/ssh.scm new file mode 100644 index 0000000..59f2f46 --- /dev/null +++ b/glicid/packages/ssh.scm @@ -0,0 +1,288 @@ +(define-module (glicid packages ssh) + #: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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages storage) + #:use-module (glicid packages mpi) + #:use-module (glicid packages gcc) + +) + + +;;;;;;;; + + + + +(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") + (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) + +(arguments + `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE" + "-DCMAKE_C_FLAGS=-fPIE"))) + + +(synopsis "libfido2") +(description "Todo") +(home-page "toto") +(license license:gpl2+) + + +)) + + +(define-public glicid-libfido2 + (package + + (name "glicid-libfido2") + (version "1.8.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 + "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm")) + + + )) + + (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/ssh.scm ends here From 90e3d4078bf2f74ef280c13137afde73f1dc64db Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 21:24:03 +0100 Subject: [PATCH 71/89] no need to glicid-qemu --- glicid/packages/virtualization.scm | 22 +++++++++++----------- glicid/packages/virtualization.scm~ | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index 4a6d640..5d17493 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -100,31 +100,31 @@ ;;;;;;;; -(define-public glicid-qemu - - (package - (inherit qemu) - (name "glicid-qemu") - ) - ) +;(define-public glicid-qemu +; +; (package +; (inherit qemu) +; (name "glicid-qemu") +; ) +; ) (define-public qemu-with-rbd (package - (inherit glicid-qemu) +; (inherit glicid-qemu) + (inherit qemu) (name "qemu-with-rbd") (arguments (substitute-keyword-arguments `(#:tests? #f - ,@(package-arguments glicid-qemu))) - + ,@(package-arguments qemu))) ) (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) - ,@(package-inputs glicid-qemu))) + ,@(package-inputs qemu))) ) ) diff --git a/glicid/packages/virtualization.scm~ b/glicid/packages/virtualization.scm~ index 774514c..4a6d640 100644 --- a/glicid/packages/virtualization.scm~ +++ b/glicid/packages/virtualization.scm~ @@ -1,4 +1,4 @@ -(define-module (glicid packages glicid) +(define-module (glicid packages virtualization) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) From 0826e059d29fa3f7c85fd6dd00d453e9ac98edab Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 21:25:52 +0100 Subject: [PATCH 72/89] less use-modules --- glicid/packages/virtualization.scm | 93 ----------------------------- glicid/packages/virtualization.scm~ | 22 +++---- 2 files changed, 11 insertions(+), 104 deletions(-) diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index 5d17493..20ea028 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -1,99 +1,6 @@ (define-module (glicid packages virtualization) - #: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-web) - #: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 fabric-management) - #:use-module (gnu packages benchmark) - #: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) - #: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 (guix build-system gnu) - #:use-module (gnu packages image) - #: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 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) #:use-module (glicid packages storage) - #:use-module (glicid packages mpi) - #:use-module (glicid packages gcc) - ) diff --git a/glicid/packages/virtualization.scm~ b/glicid/packages/virtualization.scm~ index 4a6d640..5d17493 100644 --- a/glicid/packages/virtualization.scm~ +++ b/glicid/packages/virtualization.scm~ @@ -100,31 +100,31 @@ ;;;;;;;; -(define-public glicid-qemu - - (package - (inherit qemu) - (name "glicid-qemu") - ) - ) +;(define-public glicid-qemu +; +; (package +; (inherit qemu) +; (name "glicid-qemu") +; ) +; ) (define-public qemu-with-rbd (package - (inherit glicid-qemu) +; (inherit glicid-qemu) + (inherit qemu) (name "qemu-with-rbd") (arguments (substitute-keyword-arguments `(#:tests? #f - ,@(package-arguments glicid-qemu))) - + ,@(package-arguments qemu))) ) (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) - ,@(package-inputs glicid-qemu))) + ,@(package-inputs qemu))) ) ) From cd0ddbf651efdbb6143a6896b0b3b87b9daa6b1a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 21:36:02 +0100 Subject: [PATCH 73/89] modifs. --- glicid/packages/ssh.scm~ | 724 ++++++++++++++++++++++++++++ glicid/packages/virtualization.scm | 13 - glicid/packages/virtualization.scm~ | 104 ---- 3 files changed, 724 insertions(+), 117 deletions(-) create mode 100644 glicid/packages/ssh.scm~ diff --git a/glicid/packages/ssh.scm~ b/glicid/packages/ssh.scm~ new file mode 100644 index 0000000..32c929f --- /dev/null +++ b/glicid/packages/ssh.scm~ @@ -0,0 +1,724 @@ +(define-module (glicid 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-web) + #: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 fabric-management) + #:use-module (gnu packages benchmark) + #: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) + #: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 (guix build-system gnu) + #:use-module (gnu packages image) + #: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 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) + #:use-module (glicid packages storage) + #:use-module (glicid packages mpi) + #:use-module (glicid packages gcc) + +) + + +;;;;;;;; + + +(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-11", gfortran-11) +; ,@(package-inputs openmpi))) +; ) +;) + + +(define-public glicid-gromacs-gcc-11 + (package + (inherit gromacs) + (name "glicid-gromacs-gcc-11") + (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-11", gcc-11) + ("gfortran-11", gfortran-11) + ("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) + ,@(package-inputs gromacs))) +)) + + +(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-specific-hdf5 + (package + (inherit hdf5-1.12) + (name "glicid-specific-hdf5") +; (arguments +; `(#:tests? #f) +; ) + (native-inputs `( + ("gcc",gcc-11) + ("gfortran",gfortran-11) + ,@(package-native-inputs hdf5-1.12))) + ) +) + +(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 glicid-specific-hdf5))) + (arguments + +; `( +; #:tests? #f + + ( + substitute-keyword-arguments (package-arguments glicid-specific-hdf5) + ((#:configure-flags flags) + ``("--enable-parallel" "--disable-tests" + ,@(delete "--enable-cxx" + (delete "--enable-threadsafe" ,flags)))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'build 'mpi-setup + ,%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) + (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-vspecific-openblas + (package + (inherit openblas) + (name "glicid-vspecific-openblas") + (version "0.3.15") + (source + (origin + (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 + "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h")))) + + (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-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 " ") + + ) +) + +(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 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-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.") + (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)) +) + +(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) +) +) + + +(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") + (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) + +(arguments + `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE" + "-DCMAKE_C_FLAGS=-fPIE"))) + + +(synopsis "libfido2") +(description "Todo") +(home-page "toto") +(license license:gpl2+) + + +)) + + +(define-public glicid-libfido2 + (package + + (name "glicid-libfido2") + (version "1.8.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 + "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm")) + + + )) + + (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 diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index 20ea028..e3690c8 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -3,24 +3,12 @@ #:use-module (glicid packages storage) ) - ;;;;;;;; -;(define-public glicid-qemu -; -; (package -; (inherit qemu) -; (name "glicid-qemu") -; ) -; ) - - (define-public qemu-with-rbd - (package -; (inherit glicid-qemu) (inherit qemu) (name "qemu-with-rbd") (arguments @@ -36,5 +24,4 @@ ) ) - ;;; glicid/virtualizationvirtualization.scm ends here diff --git a/glicid/packages/virtualization.scm~ b/glicid/packages/virtualization.scm~ index 5d17493..824bd71 100644 --- a/glicid/packages/virtualization.scm~ +++ b/glicid/packages/virtualization.scm~ @@ -1,119 +1,16 @@ (define-module (glicid packages virtualization) - #: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-web) - #: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 fabric-management) - #:use-module (gnu packages benchmark) - #: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) - #: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 (guix build-system gnu) - #:use-module (gnu packages image) - #: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 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) #:use-module (glicid packages storage) - #:use-module (glicid packages mpi) - #:use-module (glicid packages gcc) - ) ;;;;;;;; -;(define-public glicid-qemu -; -; (package -; (inherit qemu) -; (name "glicid-qemu") -; ) -; ) - - (define-public qemu-with-rbd (package -; (inherit glicid-qemu) (inherit qemu) (name "qemu-with-rbd") (arguments @@ -129,5 +26,4 @@ ) ) - ;;; glicid/virtualizationvirtualization.scm ends here From a4672529131fd5bf947b6c88c3aa3cae9481b434 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 21:38:39 +0100 Subject: [PATCH 74/89] missing module --- glicid/packages/virtualization.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index e3690c8..82cbfd3 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -1,4 +1,5 @@ (define-module (glicid packages virtualization) + #:use-module (guix packages) #:use-module (gnu packages virtualization) #:use-module (glicid packages storage) ) From 7a061101cb25815bbdfcc40adbe45487e0d9786f Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 21:46:00 +0100 Subject: [PATCH 75/89] need another module --- glicid/packages/virtualization.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index 82cbfd3..2b116a9 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -1,5 +1,6 @@ (define-module (glicid packages virtualization) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages virtualization) #:use-module (glicid packages storage) ) From dbc20ba2130c21623a49225763e60b10dc09cd10 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 22:14:41 +0100 Subject: [PATCH 76/89] simplification --- glicid/packages/storage.scm | 243 +----------------------------------- 1 file changed, 2 insertions(+), 241 deletions(-) diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm index e0b1960..07e8ddc 100644 --- a/glicid/packages/storage.scm +++ b/glicid/packages/storage.scm @@ -95,248 +95,10 @@ ) - -(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-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-15b +(define-public glicid-ceph (package (inherit ceph) - (name "glicid-ceph-15b") + (name "glicid-ceph") (version "15.2.15") (source (origin (method url-fetch) @@ -520,5 +282,4 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.") ) -(define-public glicid-ceph glicid-ceph-15) From 00d0f4e011c1566591a406d104f6511bebdbcfd8 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 22:23:00 +0100 Subject: [PATCH 77/89] test --- glicid/packages/cluster.scm | 6 +----- glicid/utils.scm | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 glicid/utils.scm diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 358afe0..4f79e60 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -89,13 +89,9 @@ #:use-module (gnu packages web) #:use-module (gnu packages pretty-print) #:use-module (gnu packages virtualization) - + #:use-module (glicid utils) ) -;; helper function -(define (latest-version v1 v2) (if (string> (package-version v1) (package-version v2)) v1 v2)) - - ;;;;;;;; (define-public keepalived diff --git a/glicid/utils.scm b/glicid/utils.scm new file mode 100644 index 0000000..166c14b --- /dev/null +++ b/glicid/utils.scm @@ -0,0 +1,5 @@ +(define-module (glicid utils)) +;; helper function +;; return latest version of 2 packages + +(define-public (latest-version v1 v2) (if (string> (package-version v1) (package-version v2)) v1 v2)) From 73c79f174890b6b7af81cd768c3f199afcabda0c Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 22:43:20 +0100 Subject: [PATCH 78/89] glicid utils defined --- glicid/utils.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/glicid/utils.scm b/glicid/utils.scm index 166c14b..7c317a6 100644 --- a/glicid/utils.scm +++ b/glicid/utils.scm @@ -1,5 +1,8 @@ -(define-module (glicid utils)) +(define-module (glicid utils) + #:use-module (guix packages) + #:export (latest-version) + ) ;; helper function ;; return latest version of 2 packages -(define-public (latest-version v1 v2) (if (string> (package-version v1) (package-version v2)) v1 v2)) +(define (latest-version v1 v2) (if (string> (package-version v1) (package-version v2)) v1 v2)) From f7f967bf13435f6122f4e131114b0bc804e5bc50 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 22:43:32 +0100 Subject: [PATCH 79/89] glicid utils now exist --- glicid/packages/cluster.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 4f79e60..da9cf56 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -92,6 +92,7 @@ #:use-module (glicid utils) ) + ;;;;;;;; (define-public keepalived @@ -115,6 +116,7 @@ ) + (define-public glicid-keepalived (package (inherit (latest-version keepalived gnu:keepalived)) From 543e71f55f00e7f803071fed2c18826cd11d9a9c Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 22:48:58 +0100 Subject: [PATCH 80/89] glicid-ceph -> ceph --- glicid/packages/storage.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glicid/packages/storage.scm b/glicid/packages/storage.scm index 07e8ddc..5f0cf83 100644 --- a/glicid/packages/storage.scm +++ b/glicid/packages/storage.scm @@ -21,7 +21,7 @@ #: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 storage) #:prefix gnu: ) #:use-module (gnu packages networking) #:use-module (gnu packages gtk) #:use-module (gnu packages python) @@ -95,10 +95,10 @@ ) -(define-public glicid-ceph +(define-public ceph (package - (inherit ceph) - (name "glicid-ceph") + (inherit gnu:ceph) + (name "ceph") (version "15.2.15") (source (origin (method url-fetch) From 98064c25f6169e00165075c7cc89ff49b2bb71ca Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 22:53:57 +0100 Subject: [PATCH 81/89] now select latest version of package --- glicid/packages/virtualization.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index 2b116a9..079ba0f 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -1,17 +1,20 @@ (define-module (glicid packages virtualization) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (glicid utils) ;; for latest-version #:use-module (gnu packages virtualization) - #:use-module (glicid packages storage) + #:use-module ((gnu packages storage) #:prefix gnu:) + #:use-module ((glicid packages storage) #:prefix glicid:) ) ;;;;;;;; +(define ceph (latest-version gnu:ceph glicid:ceph)) (define-public qemu-with-rbd (package - (inherit qemu) + (inherit (qemu) (name "qemu-with-rbd") (arguments @@ -20,7 +23,7 @@ ,@(package-arguments qemu))) ) - (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) + (inputs `(("ceph:lib", ceph "lib" ) ,@(package-inputs qemu))) ) From 08a504e1569b66a30f34793d4f302e7b2bc995cd Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 22:59:52 +0100 Subject: [PATCH 82/89] take the more up to date ceph --- glicid/packages/virtualization.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index 079ba0f..2fc50fa 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -1,16 +1,13 @@ (define-module (glicid packages virtualization) #:use-module (guix packages) #:use-module (guix utils) - #:use-module (glicid utils) ;; for latest-version #:use-module (gnu packages virtualization) - #:use-module ((gnu packages storage) #:prefix gnu:) - #:use-module ((glicid packages storage) #:prefix glicid:) + #:use-module (gnu packages storage) ;; «regular» ceph is defined here + #:use-module (glicid packages storage) ;; a «more up to date» version MAY be here ) ;;;;;;;; -(define ceph (latest-version gnu:ceph glicid:ceph)) - (define-public qemu-with-rbd (package @@ -23,7 +20,7 @@ ,@(package-arguments qemu))) ) - (inputs `(("ceph:lib", ceph "lib" ) + (inputs `(("ceph:lib", ceph "lib" ) ;; will take the more up to date ceph ,@(package-inputs qemu))) ) From 0e67f128cc6433e9ec7e2b37902ccd1477461b00 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 23:00:20 +0100 Subject: [PATCH 83/89] missing ) --- glicid/packages/virtualization.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index 2fc50fa..10695bf 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -25,5 +25,6 @@ ) ) +) ;;; glicid/virtualizationvirtualization.scm ends here From 2f497dce7dcc47864ebd04440b4e8c69af60690a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 23:08:42 +0100 Subject: [PATCH 84/89] modifs. --- glicid/packages/cluster.scm~ | 168 ------ glicid/packages/fabric-management.scm~ | 165 ------ glicid/packages/gcc.scm~ | 176 ------ glicid/packages/glicid.scm~ | 724 ------------------------- glicid/packages/linux.scm~ | 146 ----- glicid/packages/mpi.scm~ | 138 ----- glicid/packages/parallel.scm~ | 173 ------ glicid/packages/ssh.scm~ | 724 ------------------------- glicid/packages/virtualization.scm | 4 +- glicid/packages/virtualization.scm~ | 29 - 10 files changed, 2 insertions(+), 2445 deletions(-) delete mode 100644 glicid/packages/cluster.scm~ delete mode 100644 glicid/packages/fabric-management.scm~ delete mode 100644 glicid/packages/gcc.scm~ delete mode 100644 glicid/packages/glicid.scm~ delete mode 100644 glicid/packages/linux.scm~ delete mode 100644 glicid/packages/mpi.scm~ delete mode 100644 glicid/packages/parallel.scm~ delete mode 100644 glicid/packages/ssh.scm~ delete mode 100644 glicid/packages/virtualization.scm~ diff --git a/glicid/packages/cluster.scm~ b/glicid/packages/cluster.scm~ deleted file mode 100644 index 99abbe3..0000000 --- a/glicid/packages/cluster.scm~ +++ /dev/null @@ -1,168 +0,0 @@ -(define-module (glicid packages cluster) - #: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-web) - #: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 fabric-management) - #:use-module (gnu packages benchmark) - #: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) - #: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 (guix build-system gnu) - #:use-module (gnu packages image) - #: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 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) - -) - - -;;;;;;;; - -(define-public glicid-keepalived-2.1.5 - (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))) - - - - ) -) - -(define-public glicid-keepalived-2.2.4 - (package - (inherit keepalived) - (name "glicid-keepalived") - (version "2.2.4") - (source (origin - (method url-fetch) - (uri (string-append - "http://www.keepalived.org/software/keepalived-" - version ".tar.gz")) - - (sha256 - (base32 - "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01")))) - - (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))) - - - - ) -) - - -;;; glicid/cluster.scm ends here diff --git a/glicid/packages/fabric-management.scm~ b/glicid/packages/fabric-management.scm~ deleted file mode 100644 index 3faa221..0000000 --- a/glicid/packages/fabric-management.scm~ +++ /dev/null @@ -1,165 +0,0 @@ -(define-module (glicid packages fabric-management) - #: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-web) - #: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 fabric-management) - #:use-module (gnu packages benchmark) - #: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) - #: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 (guix build-system gnu) - #:use-module (gnu packages image) - #: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 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) - #:use-module (glicid packages gcc) - #:use-module (glicid packages linux) -) - - -(define-public glicid-ucx - (package - (inherit ucx) - (name "glicid-ucx") - (version "1.11.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) - ) - - ) - ) -) - -(define-public glicid-ucx-gcc-11 - (package - (inherit glicid-ucx) - (name "glicid-ucx-gcc-11") - - (inputs `(("gcc-11", gcc-11) - ("gfortran-11", gfortran-11) - ,@(package-inputs glicid-ucx))) - ) -) - -(define-public glicid-ucx-gcc-10 - (package - (inherit glicid-ucx) - (name "glicid-ucx-gcc-10") - - (inputs `(("gcc-10", gcc-10) - ("gfortran-10", gfortran-10) - ,@(package-inputs glicid-ucx))) - ) -) - - -(define-public glicid-specific-ucx-gcc-11 - (package - (inherit glicid-ucx) - (name "glicid-specific-ucx-gcc-11") - (version "1.10.0") - - (inputs `(("gcc", gcc-11) - ("gfortran", gfortran-11) - ("libfabric", glicid-libfabric-gcc-11) - ("rdma-core",glicid-rdma-core-gcc-11) - - ,@(package-inputs glicid-ucx))) - ) -) - -(define-public glicid-ucx-gcc-10 - (package - (inherit ucx) - - (inputs `(("gcc", gcc-10) - ("gfortran", gfortran-10) - ("libfabric", glicid-libfabric-gcc-11) - ("rdma-core",glicid-rdma-core-gcc-11) - - ,@(package-inputs glicid-ucx))) - ) -) - -;;; glicid/fabric-management.scm ends here diff --git a/glicid/packages/gcc.scm~ b/glicid/packages/gcc.scm~ deleted file mode 100644 index 852c6cb..0000000 --- a/glicid/packages/gcc.scm~ +++ /dev/null @@ -1,176 +0,0 @@ -(define-module (glicid 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-web) - #: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 fabric-management) - #:use-module (gnu packages benchmark) - #: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) - #: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 (guix build-system gnu) - #:use-module (gnu packages image) - #: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 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) - - - -) - - -(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-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)) - (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-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."))) - - - - - -;;; glicid/gcc.scm ends here diff --git a/glicid/packages/glicid.scm~ b/glicid/packages/glicid.scm~ deleted file mode 100644 index 32c929f..0000000 --- a/glicid/packages/glicid.scm~ +++ /dev/null @@ -1,724 +0,0 @@ -(define-module (glicid 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-web) - #: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 fabric-management) - #:use-module (gnu packages benchmark) - #: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) - #: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 (guix build-system gnu) - #:use-module (gnu packages image) - #: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 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) - #:use-module (glicid packages storage) - #:use-module (glicid packages mpi) - #:use-module (glicid packages gcc) - -) - - -;;;;;;;; - - -(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-11", gfortran-11) -; ,@(package-inputs openmpi))) -; ) -;) - - -(define-public glicid-gromacs-gcc-11 - (package - (inherit gromacs) - (name "glicid-gromacs-gcc-11") - (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-11", gcc-11) - ("gfortran-11", gfortran-11) - ("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) - ,@(package-inputs gromacs))) -)) - - -(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-specific-hdf5 - (package - (inherit hdf5-1.12) - (name "glicid-specific-hdf5") -; (arguments -; `(#:tests? #f) -; ) - (native-inputs `( - ("gcc",gcc-11) - ("gfortran",gfortran-11) - ,@(package-native-inputs hdf5-1.12))) - ) -) - -(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 glicid-specific-hdf5))) - (arguments - -; `( -; #:tests? #f - - ( - substitute-keyword-arguments (package-arguments glicid-specific-hdf5) - ((#:configure-flags flags) - ``("--enable-parallel" "--disable-tests" - ,@(delete "--enable-cxx" - (delete "--enable-threadsafe" ,flags)))) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'build 'mpi-setup - ,%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) - (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-vspecific-openblas - (package - (inherit openblas) - (name "glicid-vspecific-openblas") - (version "0.3.15") - (source - (origin - (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 - "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h")))) - - (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-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 " ") - - ) -) - -(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 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-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.") - (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)) -) - -(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) -) -) - - -(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") - (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) - -(arguments - `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE" - "-DCMAKE_C_FLAGS=-fPIE"))) - - -(synopsis "libfido2") -(description "Todo") -(home-page "toto") -(license license:gpl2+) - - -)) - - -(define-public glicid-libfido2 - (package - - (name "glicid-libfido2") - (version "1.8.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 - "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm")) - - - )) - - (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 diff --git a/glicid/packages/linux.scm~ b/glicid/packages/linux.scm~ deleted file mode 100644 index b410836..0000000 --- a/glicid/packages/linux.scm~ +++ /dev/null @@ -1,146 +0,0 @@ -(define-module (glicid packages linux) - #: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-web) - #: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 fabric-management) - #:use-module (gnu packages benchmark) - #: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) - #: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 (guix build-system gnu) - #:use-module (gnu packages image) - #: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 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) - #:use-module (glicid packages gcc) - -) - - -(define-public glicid-rdma-core -(package - (inherit rdma-core) - (name "glicid-rdma-core") - (version "37.1") - (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-11 -(package - (inherit glicid-rdma-core) - (name "glicid-rdma-core-gcc-11") - (inputs `(("gcc-11", gcc-11) - ,@(package-inputs rdma-core))) - ) -) - - -(define-public glicid-libfabric -(package - (inherit libfabric) - (name "glicid-libfabric") - (version "1.13.1") - ) -) - - -(define-public glicid-libfabric-gcc-11 -(package - (inherit glicid-libfabric) - (name "glicid-libfabric-gcc-11") - - (inputs `(("gcc-11", gcc-11) - ("rdma-core", glicid-rdma-core-gcc-11) - ,@(package-inputs glicid-libfabric))) - ) -) - - -;;; glicid/linux.scm ends here diff --git a/glicid/packages/mpi.scm~ b/glicid/packages/mpi.scm~ deleted file mode 100644 index 8d58202..0000000 --- a/glicid/packages/mpi.scm~ +++ /dev/null @@ -1,138 +0,0 @@ -(define-module (glicid packages mpi) - #: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-web) - #: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 fabric-management) - #:use-module (gnu packages benchmark) - #: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) - #: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 (guix build-system gnu) - #:use-module (gnu packages image) - #: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 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) - #:use-module (glicid packages gcc) - #:use-module (glicid packages linux) - #:use-module (glicid packages fabric-management) - - - - -) - -(define-public glicid-openmpi - (package - (inherit openmpi) - (name "glicid-openpmi") - ) -) - - -(define-public glicid-openmpi-gcc-11 - (package - (inherit glicid-openmpi) - (name "glicid-openpmi-gcc-11") - - (inputs `(("gcc-11", gcc-11) - ("gfortran-11", gfortran-11) - ("glicid-ucx-gcc-11",glicid-ucx-gcc-11) - ("glicid-rdma-core-gcc-11",glicid-rdma-core-11) - ("libfabric",glicid-libfabric-gcc-11) - ,@(package-inputs openmpi))) - ) -) - - -(define-public glicid-specific-openmpi - (package - (inherit glicid-openmpi-gcc-11) - (name "glicid-specific-openmpi") - (inputs `( - ("gcc",gcc-11) - ("rdma-core",glicid-rdma-core-gcc-11) - ("ucx",glicid-ucx-gcc-10) - ("libfabric",glicid-libfabric-gcc-11) -; ("slurm", glicid-specific-slurm) - ,@(package-inputs glicid-openmpi-gcc-11))) - ) -) - diff --git a/glicid/packages/parallel.scm~ b/glicid/packages/parallel.scm~ deleted file mode 100644 index b32b91f..0000000 --- a/glicid/packages/parallel.scm~ +++ /dev/null @@ -1,173 +0,0 @@ -(define-module (glicid packages parallel) - #: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-web) - #: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 fabric-management) - #:use-module (gnu packages benchmark) - #: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) - #: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 (guix build-system gnu) - #:use-module (gnu packages image) - #: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 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) - - -) - - -(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")) - )) - (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) - ("gcc", gcc-11) - ("glicid-pmix", glicid-pmix) -; ("glicid-specific-openmpi", glicid-specific-openmpi) - ,@(package-inputs slurm) - - - )) - (propagated-inputs - `( - ("sssd" ,sssd) - )) - -)) - - -(define-public glicid-custom-slurm-20.02 - (package - (inherit glicid-custom-slurm-19.05) - (name "glicid-custom-slurm-20.02") - (version "20.02.7") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6")) - )) -)) - - -(define-public glicid-custom-slurm-20.11 - (package - (inherit glicid-custom-slurm-20.02) - (name "glicid-custom-slurm-20.11") - (version "20.11.7") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "1fdjihg1x7ks5l77yjv14a4mg6r0v8c3zk1dcxkhrhq3n4dc9nbs")) - )) -)) - -(define-public glicid-specific-slurm glicid-custom-slurm-20.02) - - - diff --git a/glicid/packages/ssh.scm~ b/glicid/packages/ssh.scm~ deleted file mode 100644 index 32c929f..0000000 --- a/glicid/packages/ssh.scm~ +++ /dev/null @@ -1,724 +0,0 @@ -(define-module (glicid 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-web) - #: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 fabric-management) - #:use-module (gnu packages benchmark) - #: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) - #: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 (guix build-system gnu) - #:use-module (gnu packages image) - #: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 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) - #:use-module (glicid packages storage) - #:use-module (glicid packages mpi) - #:use-module (glicid packages gcc) - -) - - -;;;;;;;; - - -(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-11", gfortran-11) -; ,@(package-inputs openmpi))) -; ) -;) - - -(define-public glicid-gromacs-gcc-11 - (package - (inherit gromacs) - (name "glicid-gromacs-gcc-11") - (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-11", gcc-11) - ("gfortran-11", gfortran-11) - ("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11) - ,@(package-inputs gromacs))) -)) - - -(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-specific-hdf5 - (package - (inherit hdf5-1.12) - (name "glicid-specific-hdf5") -; (arguments -; `(#:tests? #f) -; ) - (native-inputs `( - ("gcc",gcc-11) - ("gfortran",gfortran-11) - ,@(package-native-inputs hdf5-1.12))) - ) -) - -(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 glicid-specific-hdf5))) - (arguments - -; `( -; #:tests? #f - - ( - substitute-keyword-arguments (package-arguments glicid-specific-hdf5) - ((#:configure-flags flags) - ``("--enable-parallel" "--disable-tests" - ,@(delete "--enable-cxx" - (delete "--enable-threadsafe" ,flags)))) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'build 'mpi-setup - ,%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) - (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-vspecific-openblas - (package - (inherit openblas) - (name "glicid-vspecific-openblas") - (version "0.3.15") - (source - (origin - (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 - "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h")))) - - (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-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 " ") - - ) -) - -(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 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-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.") - (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)) -) - -(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) -) -) - - -(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") - (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) - -(arguments - `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE" - "-DCMAKE_C_FLAGS=-fPIE"))) - - -(synopsis "libfido2") -(description "Todo") -(home-page "toto") -(license license:gpl2+) - - -)) - - -(define-public glicid-libfido2 - (package - - (name "glicid-libfido2") - (version "1.8.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 - "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm")) - - - )) - - (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 diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index 10695bf..aeaf488 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -23,8 +23,8 @@ (inputs `(("ceph:lib", ceph "lib" ) ;; will take the more up to date ceph ,@(package-inputs qemu))) - ) -) + ) + ) ) ;;; glicid/virtualizationvirtualization.scm ends here diff --git a/glicid/packages/virtualization.scm~ b/glicid/packages/virtualization.scm~ deleted file mode 100644 index 824bd71..0000000 --- a/glicid/packages/virtualization.scm~ +++ /dev/null @@ -1,29 +0,0 @@ -(define-module (glicid packages virtualization) - #:use-module (gnu packages virtualization) - #:use-module (glicid packages storage) -) - - -;;;;;;;; - - -(define-public qemu-with-rbd - - - (package - (inherit qemu) - (name "qemu-with-rbd") - (arguments - - (substitute-keyword-arguments - `(#:tests? #f - ,@(package-arguments qemu))) - ) - - (inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) - ,@(package-inputs qemu))) - - ) -) - -;;; glicid/virtualizationvirtualization.scm ends here From 627bfeac090ccab5db2f2650464fe2b79169eb22 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 23:14:02 +0100 Subject: [PATCH 85/89] malformed inherit --- glicid/packages/virtualization.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index aeaf488..0bfe6d7 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -11,20 +11,20 @@ (define-public qemu-with-rbd (package - (inherit (qemu) + (inherit qemu) (name "qemu-with-rbd") (arguments (substitute-keyword-arguments `(#:tests? #f ,@(package-arguments qemu))) - ) + ) - (inputs `(("ceph:lib", ceph "lib" ) ;; will take the more up to date ceph + (inputs `(("ceph:lib", ceph "lib" ) ;; will take the more up to date ceph ,@(package-inputs qemu))) - ) ) ) + ;;; glicid/virtualizationvirtualization.scm ends here From 6ad7019c67c20b9866d449440f8531eafe61eb73 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 2 Nov 2021 23:17:59 +0100 Subject: [PATCH 86/89] glicid ans gnu ceph use now the same name --- glicid/packages/nfs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/nfs.scm b/glicid/packages/nfs.scm index 9101821..319fa0a 100644 --- a/glicid/packages/nfs.scm +++ b/glicid/packages/nfs.scm @@ -187,7 +187,7 @@ ("gss",gss) ("pkg-config",pkg-config) ("jemalloc",jemalloc) - ("glicid-ceph:lib",glicid-ceph "lib") + ("ceph:lib",ceph "lib") ;; will use latest gnu or glicid ceph ("libnfsidmap",libnfsidmap) ("libnfs",libnfs) ; ("xfsprogs",xfsprogs) From 457ce8d99c22d78cf4b368bf1943223b81e0690c Mon Sep 17 00:00:00 2001 From: Jean-Francois GUILLAUME Date: Thu, 4 Nov 2021 10:51:26 +0000 Subject: [PATCH 87/89] Nginx --- glicid/packages/nginx.scm | 178 ++++++++++++++++++++++++-------------- 1 file changed, 112 insertions(+), 66 deletions(-) diff --git a/glicid/packages/nginx.scm b/glicid/packages/nginx.scm index 7821332..d5e1de1 100644 --- a/glicid/packages/nginx.scm +++ b/glicid/packages/nginx.scm @@ -1,10 +1,19 @@ (define-module (glicid packages nginx) - #:use-module (guix packages) - #:use-module (guix utils) + #:use-module (ice-9 match) + #:use-module (guix) + #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:select (asl2.0)) + #:use-module (guix utils) + #:use-module (gnu packages compression) + #:use-module (gnu packages curl) + #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages web) + #:use-module (gnu packages xml) + #:use-module (gnu packages tls) #:use-module (glicid packages openldap) ) @@ -69,66 +78,103 @@ ) ) -;(define-public nginx-modsecurity -; (package -; (inherit nginx) -; (name "nginx-modsecurity") -; (version "3.0.5") -; (source -; (origin -; (method url-fetch) -; (uri (list -; (string-append "https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.5/modsecurity-v" version ".tar.gz") -; ) -; ) -; (sha256 (base32 "1sarp7bjvkkdlpky5j9axfi0qmb177vw2vn2s10c8fcdg9dgj6vm" )) -; ) -; ) -; (synopsis "modsecurity module for nginx") -; (description "modsecurity module for nginx.") -; (build-system gnu-build-system) -; (inputs -; `(("nginx-sources" ,(package-source nginx)) -; ("openldap", openldap) -; ,@(package-inputs nginx))) -; (arguments -; (substitute-keyword-arguments -; `(#:configure-flags '("--add-dynamic-module=.") -; #:make-flags '("modules") -; ,@(package-arguments nginx) -; ) -; ((#:phases phases) -; `(modify-phases ,phases -; (replace 'configure -; (lambda* (#:key output #:allow-other-keys) -; (invoke "./configure" "--enable-standalone-module" "make" ) -; ) -; ) -;; (add-after 'configure 'unpack-nginx-sources -;; (lambda* (#:key inputs native-inputs #:allow-other-keys) -;; (begin -;; ;; The nginx source code is part of the module’s source. -;; (format #t "decompressing nginx source code~%") -;; (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) -;; (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") -;; ) -;; #t -;; ) -;; ) -;; ) -;; (replace 'install -;; (lambda* (#:key outputs #:allow-other-keys) -;; (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) -;; (install-file "objs/ngx_http_auth_ldap_module.so" modules-dir) -;; #t -;; ) -;; ) -;; ) -; (delete 'fix-root-dirs) -; (delete 'install-man-page) -; ) -; ) -; ) -; ) -; ) -;) +(define-public modsecurity + (package + (name "modsecurity") + (version "3.0.5") + (source + (origin + (method url-fetch) + (uri (list + (string-append "https://github.com/SpiderLabs/ModSecurity/releases/download/v" version "/modsecurity-v" version ".tar.gz") + ) + ) + (sha256 (base32 "1sarp7bjvkkdlpky5j9axfi0qmb177vw2vn2s10c8fcdg9dgj6vm" )) + ) + ) + (synopsis "modsecurity module for nginx") + (description "modsecurity module for nginx.") + (license asl2.0) + (home-page "https://github.com/SpiderLabs/ModSecurity") + (build-system gnu-build-system) + (inputs `( + ("curl", curl) + ("libxml2", libxml2) + ("libxslt", libxslt) + ("openssl", openssl) + ("pcre", pcre) + ("pcre:bin", pcre "bin") + ("zlib", zlib) + ("pkg-config", pkg-config) + ("nginx-sources", (package-source nginx)) + )) + (arguments `( + #:configure-flags (list + (string-append "--with-curl=" (assoc-ref %build-inputs "curl")) + (string-append "--with-pcre=" (assoc-ref %build-inputs "pcre:bin") "/bin/pcre-config") + (string-append "--with-libxml=" (assoc-ref %build-inputs "libxml2")) + "--enable-standalone-module" + ) + )) + ) +) + +(define-public nginx-modsecurity-module + (package + (inherit nginx) + (name "nginx-modsecurity-module") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (list + (string-append "https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v" version "/modsecurity-nginx-v" version ".tar.gz") + ) + ) + (sha256 (base32 "0clcny8276d3j73ws661lh983vqq9m29rw7qb7gn132ha066d9j1" )) + ) + ) + (synopsis "ModSecurity module for nginx") + (description "ModSecurity module for nginx.") + (build-system gnu-build-system) + (inputs + `(("nginx-sources" ,(package-source nginx)) + ("modsecurity", modsecurity) + ,@(package-inputs nginx))) + (arguments + (substitute-keyword-arguments + `(#:configure-flags '("--add-dynamic-module=.") + #:make-flags '("modules") + ,@(package-arguments nginx) + ) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'unpack-nginx-sources + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (begin + ;; The nginx source code is part of the module’s source. + (format #t "decompressing nginx source code~%") + (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) + (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") + ) + #t + ) + ) + ) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) + (install-file "objs/ngx_http_modsecurity_module.so" modules-dir) + #t + ) + ) + ) + (delete 'fix-root-dirs) + (delete 'install-man-page) + ) + ) + ) + ) + ) +) +nginx-modsecurity-module From fcc36a29b9f698fdbfd63ed5d8a2c9bb4cd6e805 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Thu, 4 Nov 2021 13:57:25 +0100 Subject: [PATCH 88/89] this was a little too much of a cleaning --- glicid/packages/openldap.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/glicid/packages/openldap.scm b/glicid/packages/openldap.scm index bbf35a0..1d81963 100644 --- a/glicid/packages/openldap.scm +++ b/glicid/packages/openldap.scm @@ -18,6 +18,21 @@ (inherit gnu:openldap) (name "openldap") (version "2.5.7") + (source (origin + (method url-fetch) + (uri (list + (string-append "https://www.openldap.org/software/download/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "http://gpl.savoirfairelinux.net/pub/mirrors/openldap/" "openldap-release/openldap-" version ".tgz") + (string-append "http://repository.linagora.org/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "ftp://ftp.ntua.gr/mirror/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "https://mirror-hk.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "https://mirror.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "https://mirror.lyrahosting.com/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + )) + (sha256 ( base32 "1ayr76sa5hjwldqzis5v71sbp88hd3hysc00gw1raqn33c05g5za" )) + ) + ) (build-system gnu-build-system) (inputs `( ("libltdl", libltdl) From b1568128a0d65e7ff48e42d9f5b29d958c055dc4 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Thu, 4 Nov 2021 14:04:54 +0100 Subject: [PATCH 89/89] looks like inherit does not keep everything --- glicid/packages/openldap.scm | 96 ++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/glicid/packages/openldap.scm b/glicid/packages/openldap.scm index 1d81963..926cbaa 100644 --- a/glicid/packages/openldap.scm +++ b/glicid/packages/openldap.scm @@ -14,52 +14,54 @@ ) (define-public openldap - (package - (inherit gnu:openldap) - (name "openldap") - (version "2.5.7") - (source (origin - (method url-fetch) - (uri (list - (string-append "https://www.openldap.org/software/download/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "http://gpl.savoirfairelinux.net/pub/mirrors/openldap/" "openldap-release/openldap-" version ".tgz") - (string-append "http://repository.linagora.org/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "ftp://ftp.ntua.gr/mirror/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "https://mirror-hk.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "https://mirror.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - (string-append "https://mirror.lyrahosting.com/OpenLDAP/" "openldap-release/openldap-" version ".tgz") - )) - (sha256 ( base32 "1ayr76sa5hjwldqzis5v71sbp88hd3hysc00gw1raqn33c05g5za" )) - ) - ) - (build-system gnu-build-system) - (inputs `( - ("libltdl", libltdl) - ("pkg-config", pkg-config) - ("libevent", libevent) - ("openssl", openssl) - ("argon2", argon2) - ("wiredtiger", wiredtiger) - ("snappy", snappy) - ("lz4", lz4) - ,@(package-inputs gnu:openldap) - )) - (arguments '( - ; this is needed because the make check does not work inside guix - #:configure-flags '( - "--enable-debug" "--enable-dynamic" "--enable-syslog" "--enable-ipv6" "--enable-local" "--enable-slapd" "--enable-dynacl" - "--enable-aci" "--enable-cleartext" "--enable-crypt" "--enable-spasswd" "--enable-modules" "--enable-rlookups" "--enable-slapi" - "--enable-backends=mod" "--enable-overlays=mod" "--enable-argon2" "--enable-balancer" "--disable-static" - "--enable-shared" "--with-tls=openssl" - ) - #:phases (modify-phases %standard-phases - (add-before 'build 'make-depend - (lambda* (#:key input #:allow-other-keys) - (invoke "make" "depend") - ) - ) - ) - )) + (package + (inherit gnu:openldap) + (name "openldap") + (version "2.5.7") + (source (origin + (method url-fetch) + (uri (list + (string-append "https://www.openldap.org/software/download/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "http://gpl.savoirfairelinux.net/pub/mirrors/openldap/" "openldap-release/openldap-" version ".tgz") + (string-append "http://repository.linagora.org/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "ftp://ftp.ntua.gr/mirror/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "https://mirror-hk.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "https://mirror.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + (string-append "https://mirror.lyrahosting.com/OpenLDAP/" "openldap-release/openldap-" version ".tgz") + )) + (sha256 ( base32 "1ayr76sa5hjwldqzis5v71sbp88hd3hysc00gw1raqn33c05g5za" )) + ) ) + (build-system gnu-build-system) + (inputs `( + ("libltdl", libltdl) + ("pkg-config", pkg-config) + ("libevent", libevent) + ("openssl", openssl) + ("argon2", argon2) + ("wiredtiger", wiredtiger) + ("snappy", snappy) + ("lz4", lz4) + ,@(package-inputs gnu:openldap) + )) + (arguments '( + ; this is needed because the make check does not work inside guix + #:tests? #f + #:configure-flags '( + "--enable-debug" "--enable-dynamic" "--enable-syslog" "--enable-ipv6" "--enable-local" "--enable-slapd" "--enable-dynacl" + "--enable-aci" "--enable-cleartext" "--enable-crypt" "--enable-spasswd" "--enable-modules" "--enable-rlookups" "--enable-slapi" + "--enable-backends=mod" "--enable-overlays=mod" "--enable-argon2" "--enable-balancer" "--disable-static" + "--enable-shared" "--with-tls=openssl" + ) + #:make-flags '("STRIP=") + #:phases (modify-phases %standard-phases + (add-before 'build 'make-depend + (lambda* (#:key input #:allow-other-keys) + (invoke "make" "depend") + ) + ) + ) + )) + ) )