From 71d99ba0dd27e751a16af9fa95f767adfee8f9be Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 3 Feb 2023 18:20:38 +0100 Subject: [PATCH 1/3] add gromacs+cuda --- glicid/packages/chemistry.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/glicid/packages/chemistry.scm b/glicid/packages/chemistry.scm index e7071cb..66c1673 100644 --- a/glicid/packages/chemistry.scm +++ b/glicid/packages/chemistry.scm @@ -28,6 +28,7 @@ (define-public gromacs+cuda (package (inherit gromacs) + (name "gromacs+cuda") (arguments (list #:configure-flags #~(list "-DGMX_DEVELOPER_BUILD=on" ; Needed to run tests From 0940dfcae0d58056e93f7d30bd32e26e7cabbbad Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 3 Feb 2023 18:44:01 +0100 Subject: [PATCH 2/3] =?UTF-8?q?add=20tricks=20for=20suid=20fping=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- glicid/packages/monitoring.scm | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/glicid/packages/monitoring.scm b/glicid/packages/monitoring.scm index 8974d04..82c00d5 100644 --- a/glicid/packages/monitoring.scm +++ b/glicid/packages/monitoring.scm @@ -19,7 +19,15 @@ (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy")) -)))) + (modules '((guix build utils))) + (snippet + '(substitute* '("src/zabbix_proxy/proxy.c" + "src/zabbix_server/server.c") + ;; 'fping' must be setuid, so look for it in the usual location. + (("/usr/sbin/fping6?") + "/run/setuid-programs/fping"))))) + +)) (define-public zabbix-agent2 @@ -35,7 +43,15 @@ (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy")) -)))) + (modules '((guix build utils))) + (snippet + '(substitute* '("src/zabbix_proxy/proxy.c" + "src/zabbix_server/server.c") + ;; 'fping' must be setuid, so look for it in the usual location. + (("/usr/sbin/fping6?") + "/run/setuid-programs/fping"))))) + +)) (define-public zabbix-server @@ -51,8 +67,16 @@ (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy")) + (modules '((guix build utils))) + (snippet + '(substitute* '("src/zabbix_proxy/proxy.c" + "src/zabbix_server/server.c") + ;; 'fping' must be setuid, so look for it in the usual location. + (("/usr/sbin/fping6?") + "/run/setuid-programs/fping"))))) + ) ) -) -) + + From 21c86aace5c34a21dc95c864c3c1a96d84531a06 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 3 Feb 2023 18:59:48 +0100 Subject: [PATCH 3/3] comment out for the moment --- glicid/packages/chemistry.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/glicid/packages/chemistry.scm b/glicid/packages/chemistry.scm index 66c1673..3f7c6bf 100644 --- a/glicid/packages/chemistry.scm +++ b/glicid/packages/chemistry.scm @@ -1,9 +1,8 @@ +#! + (define-module (glicid packages chemistry) #:use-module (guix packages) #:use-module (guix download) - -#:use-module (guix packages) -#:use-module (guix download) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix build-system cmake) @@ -23,7 +22,8 @@ #:use-module (gnu packages sphinx) #:use-module (gnu packages check) #:use-module (gnu packages gcc) -#:use-module (non-free cuda)) +#:use-module (non-free cuda) +) (define-public gromacs+cuda (package @@ -78,3 +78,4 @@ (append cuda hwloc)))) ) +!# \ No newline at end of file