From 28772b12a71a9239a30dee85a54d5869ae3ea95b Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Wed, 11 Jan 2023 11:48:34 +0100 Subject: [PATCH 1/6] munge 0.5.15 [NOT WORKING] --- glicid/packages/admin.scm | 148 ++++++++++++++++++++------------------ 1 file changed, 77 insertions(+), 71 deletions(-) diff --git a/glicid/packages/admin.scm b/glicid/packages/admin.scm index 0695a01..f74f78a 100644 --- a/glicid/packages/admin.scm +++ b/glicid/packages/admin.scm @@ -1,81 +1,87 @@ (define-module (glicid packages admin) - #:use-module ((gnu packages admin) - #:prefix gnu:) - #:use-module (gnu packages base) - #:use-module (gnu packages compression) - #:use-module (gnu packages cyrus-sasl) - #:use-module (gnu packages groff) - #:use-module (gnu packages hurd) - #:use-module (gnu packages linux) - #:use-module (gnu packages openldap) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages tls) - #:use-module (guix build-system gnu) - #:use-module (guix build-system python) - #:use-module (guix download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (glicid packages python)) + #:use-module ((gnu packages admin) #:prefix gnu:) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages groff) + #:use-module (gnu packages hurd) + #:use-module (gnu packages linux) + #:use-module (gnu packages openldap) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (glicid packages python)) (define-public shadow - (package - (inherit gnu:shadow) - (name "shadow") - (version "4.13") - (source (origin - (method url-fetch) - (uri (list (string-append - "https://github.com/shadow-maint/shadow/releases/download/v" - version "/shadow-" version ".tar.xz"))) - (sha256 - (base32 - "0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls")))))) + (package + (inherit gnu:shadow) + (name "shadow") + (version "4.13") + (source (origin + (method url-fetch) + (uri (list (string-append + "https://github.com/shadow-maint/shadow/releases/download/v" + version "/shadow-" version ".tar.xz"))) + (sha256 + (base32 + "0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls")))))) (define-public sudo - (let* ((sudo-minimal gnu:sudo)) - (package - (inherit sudo-minimal) - (name (string-append (package-name sudo-minimal) "-with-ldap")) - (arguments - (substitute-keyword-arguments (package-arguments sudo-minimal) - ((#:configure-flags flags) - `(append (list "--enable-sasl" "--with-ldap" "--enable-openssl" - "--with-nsswitch") - ,flags)))) - (inputs (modify-inputs (package-inputs sudo-minimal) - (append openldap openssl cyrus-sasl))) - (native-inputs (modify-inputs (package-native-inputs sudo-minimal) - (append pkg-config)))))) + (let* ((sudo-minimal gnu:sudo)) + (package + (inherit sudo-minimal) + (name (string-append (package-name sudo-minimal) "-with-ldap")) + (arguments + (substitute-keyword-arguments (package-arguments sudo-minimal) + ((#:configure-flags flags) + `(append (list "--enable-sasl" "--with-ldap" "--enable-openssl" + "--with-nsswitch") + ,flags)))) + (inputs (modify-inputs (package-inputs sudo-minimal) + (append openldap openssl cyrus-sasl))) + (native-inputs (modify-inputs (package-native-inputs sudo-minimal) + (append pkg-config)))))) (define-public ansible - (package - (inherit gnu:ansible) - (name "ansible") - (version "6.3.0") - (source (origin - (method url-fetch) - (uri (pypi-uri name version)) - (sha256 - (base32 - "09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm")))) - (propagated-inputs (list ansible-core)))) + (package + (inherit gnu:ansible) + (name "ansible") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 + "09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm")))) + (propagated-inputs (list ansible-core)))) (define-public ansible-core - (package - (inherit gnu:ansible-core) - (name "ansible-core") - (version "2.13.3") - (source (origin - (method url-fetch) - (uri (pypi-uri name version)) - (sha256 - (base32 - "120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf")))) - (arguments - `(#:tests? #f - #:phases (modify-phases %standard-phases - (delete 'sanity-check)))))) + (package + (inherit gnu:ansible-core) + (name "ansible-core") + (version "2.13.3") + (source (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 + "120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf")))) + (arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (delete 'sanity-check)))))) -shadow +;(define-public munge +; (package +; (inherit gnu:munge) +; (name "munge") +; (version "0.5.15") +; (source (origin +; (method url-fetch) +; (uri (string-append "https://github.com/dun/munge/releases/download/munge-" version "/munge-" version ".tar.xz")) +; (sha256 (base32 "1fm93pslfdbwm661c3vx7f7b1pjb0hhmb0z2izdp8k532zqrv5rz" )))))) From 94b6ef696887251285767c2e19883cb56e9fa6da Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Wed, 11 Jan 2023 16:15:49 +0100 Subject: [PATCH 2/6] updating cuirass config service --- glicid/services/cuirass.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glicid/services/cuirass.scm b/glicid/services/cuirass.scm index b557e94..116c8dc 100644 --- a/glicid/services/cuirass.scm +++ b/glicid/services/cuirass.scm @@ -112,7 +112,9 @@ (use-substitutes? (cuirass-configuration-use-substitutes? config)) (one-shot? (cuirass-configuration-one-shot? config)) (fallback? (cuirass-configuration-fallback? config)) - (extra-options (cuirass-configuration-extra-options config))) + (extra-options (cuirass-configuration-extra-options config)) + (http-proxy cuirass-configuration-http-proxy config) + (https-proxy cuirass-configuration-https-proxy config) ) `(,(shepherd-service (documentation "Run Cuirass.") (provision '(cuirass)) From 6623858abdddf2b08c986bf4a17f38b98a5fc440 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Wed, 11 Jan 2023 16:21:25 +0100 Subject: [PATCH 3/6] updating cuirass config service --- glicid/services/cuirass.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glicid/services/cuirass.scm b/glicid/services/cuirass.scm index 116c8dc..f2a22ec 100644 --- a/glicid/services/cuirass.scm +++ b/glicid/services/cuirass.scm @@ -113,8 +113,8 @@ (one-shot? (cuirass-configuration-one-shot? config)) (fallback? (cuirass-configuration-fallback? config)) (extra-options (cuirass-configuration-extra-options config)) - (http-proxy cuirass-configuration-http-proxy config) - (https-proxy cuirass-configuration-https-proxy config) ) + (http-proxy (cuirass-configuration-http-proxy config)) + (https-proxy (cuirass-configuration-https-proxy config))) `(,(shepherd-service (documentation "Run Cuirass.") (provision '(cuirass)) From 769424b8943a14c9bf4ee2eabac9a00e87ed6fd2 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Thu, 2 Feb 2023 14:18:21 +0100 Subject: [PATCH 4/6] adding timescaledb 2.9.1 --- glicid/packages/databases.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 glicid/packages/databases.scm diff --git a/glicid/packages/databases.scm b/glicid/packages/databases.scm new file mode 100644 index 0000000..b5e60c1 --- /dev/null +++ b/glicid/packages/databases.scm @@ -0,0 +1,29 @@ +(define-module (glicid packages databases) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module ((gnu packages databases)#:prefix gnu:) + ) + +(define-public timescaledb + (package + (inherit gnu:timescaledb) + (name "timescaledb") + (version "2.9.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/timescale/timescaledb") + (commit version))) + (file-name (git-file-name name version)) + (sha256 (base32 "1gxmq6hglz4simmsp5ypa2dav3nhvf8bsdp4raq0fr4673255xby")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "tsl") + (for-each delete-file + '("scripts/c_license_header-timescale.h" + "scripts/license_tsl.spec" + "scripts/sql_license_tsl.sql" + "test/perl/AccessNode.pm" + "test/perl/DataNode.pm" + "test/perl/TimescaleNode.pm")))))))) From 7d616226f17cdaf429b5551d6168e21a577763b7 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Thu, 2 Feb 2023 15:18:55 +0100 Subject: [PATCH 5/6] hdf5-glicid is no more useful --- glicid/packages/glicid.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 4b7d413..2185290 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -216,16 +216,17 @@ )) -(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))))) +; no more useful +;(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-motif (package From 3e8c3840c848f35d228d3a962f03a2c6f2028c1c Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Fri, 3 Feb 2023 10:59:23 +0100 Subject: [PATCH 6/6] updating timescaledb --- glicid/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glicid/packages/databases.scm b/glicid/packages/databases.scm index b5e60c1..46448b1 100644 --- a/glicid/packages/databases.scm +++ b/glicid/packages/databases.scm @@ -8,14 +8,14 @@ (package (inherit gnu:timescaledb) (name "timescaledb") - (version "2.9.1") + (version "2.9.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/timescale/timescaledb") (commit version))) (file-name (git-file-name name version)) - (sha256 (base32 "1gxmq6hglz4simmsp5ypa2dav3nhvf8bsdp4raq0fr4673255xby")) + (sha256 (base32 "0siijqypx53lkb19y6zz7bx1bnbhk40b5ky5l74ckhv80nlffzfy")) (modules '((guix build utils))) (snippet '(begin