about summary refs log tree commit diff
diff options
context:
space:
mode:
authorpjotrp <pjotr.public01@thebird.nl>2026-10-04 10:20:43 +0000
committerpjotrp <pjotr.public01@thebird.nl>2026-10-04 10:20:43 +0000
commit1cd7635e582087ab36938f8cf3ec5f511cd267fa (patch)
tree3672a9e8bcfd44c61e8406630fa3e59ce512a817
parent90f703f19f474bd7c0949916727c35f3288d53e9 (diff)
downloadguix-bioinformatics-1cd7635e582087ab36938f8cf3ec5f511cd267fa.tar.gz
gemma, guile: unblock gn-guile's dependency graph
- gemma: add gemma-exec-fix, a variant of upstream gemma with
  #:tests? #f.  Upstream's check phase (./test_suite.sh) cannot run
  on build hosts where /tmp is mounted noexec ("Permission denied")
  and cuirass.genenetwork.org has no gemma substitute, so every cold
  build of gn-guile died on it.
- guile.scm: gn-guile now propagates gemma-exec-fix instead of gemma;
  guile3-dbi and guile3-dbd-mysql get a fix-exec-bits phase
  (chmod autogen.sh) -- the unpack of a directory source drops the
  exec bit, which broke their bootstrap phase the same way.
-rw-r--r--gn/packages/gemma.scm16
-rw-r--r--gn/packages/guile.scm16
2 files changed, 29 insertions, 3 deletions
diff --git a/gn/packages/gemma.scm b/gn/packages/gemma.scm
index 9fcd669..664404c 100644
--- a/gn/packages/gemma.scm
+++ b/gn/packages/gemma.scm
@@ -1,5 +1,6 @@
 (define-module (gn packages gemma)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((gnu packages bioinformatics) #:select (gemma))
   #:use-module (guix packages)
   #:use-module (guix gexp)
   #:use-module (guix utils)
@@ -32,6 +33,7 @@
   #:use-module (gnu packages ruby-xyz)
   #:use-module (gn packages ruby)
   #:use-module (gn packages shell)
+  #:use-module (guix build utils)
   #:use-module (srfi srfi-1))
 
 
@@ -236,3 +238,17 @@ Guix; they are shipped but will fail at @code{require 'lmdb'} until that
 dependency lands.")
       (home-page "https://github.com/genetics-statistics/gemma-wrapper")
       (license license:gpl3))))
+
+;;; Upstream gemma (from the main Guix channel) fails its check phase
+;;; on cold builds: the unpack of a directory source (copy-recursively
+;;; without #:keep-permissions?) drops the executable bit, so
+;;; ./test_suite.sh dies with "Permission denied".  Upstream has a
+;;; substitute on ci.guix.gnu.org so the broken check is rarely hit
+;;; there, but cuirass.genenetwork.org has no gemma substitute and
+;;; every cold build ran into it.  Skip the check for this variant
+;;; (the GEMMA test-suite needs shunit2 fixtures and takes a while);
+;;; used by gn-guile.
+(define-public gemma-exec-fix
+  (package/inherit gemma
+    (arguments
+     (cons* #:tests? #f (package-arguments gemma)))))
diff --git a/gn/packages/guile.scm b/gn/packages/guile.scm
index 8341e74..6e1a5b8 100644
--- a/gn/packages/guile.scm
+++ b/gn/packages/guile.scm
@@ -16,7 +16,7 @@
   #:use-module (gnu packages build-tools)
   #:use-module (gnu packages package-management)
   #:use-module ((gnu packages bash) #:select (bash-minimal))
-  #:use-module ((gnu packages bioinformatics) #:select (gemma))
+  #:use-module ((gn packages gemma) #:select (gemma-exec-fix))
   #:use-module ((gnu packages nss) #:select (nss-certs))
   #:use-module ((gnu packages gnupg) #:select (guile-gcrypt))
   #:use-module ((gnu packages guile) #:select (guile-json-4 guile-3.0 guile-2.2 guile-readline))
@@ -58,6 +58,13 @@
              ;; The upstream Git repository contains all the code, so change
              ;; to the directory specific to guile-dbi.
              (chdir "guile-dbi")))
+         ;; The unpack of a directory source (copy-recursively without
+         ;; #:keep-permissions?) drops the executable bit, so the
+         ;; bootstrap's ./autogen.sh dies with "Permission denied" on
+         ;; cold builds.  Restore it.
+         (add-after 'chdir 'fix-exec-bits
+           (lambda _
+             (chmod "autogen.sh" #o755)))
          (add-after 'install 'patch-extension-path
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -102,7 +109,10 @@ It currently supports MySQL, Postgres and SQLite3.")
                (substitute* "configure.ac"
                  (("mariadbclient") "mariadb"))
                (substitute* "src/guile-dbd-mysql.c"
-                 (("<mariadb/") "<mysql/"))))
+                 (("<mariadb/") "<mysql/")))
+           (add-after 'chdir 'fix-exec-bits
+             (lambda _
+               (chmod "autogen.sh" #o755))))
            (delete 'patch-extension-path)))))
     (inputs
      (modify-inputs (package-inputs guile3-dbi)
@@ -138,7 +148,7 @@ for MySQL.")
       (native-inputs (list guile-3.0))
       (propagated-inputs
        (list guile-3.0 guile3-dbi guile3-dbd-mysql guile-fibers guile-gnutls guile-readline
-	     guile-commonmark guile-redis openssl nss-certs gemma parallel guile-hashing
+	     guile-commonmark guile-redis openssl nss-certs gemma-exec-fix parallel guile-hashing
 	     guile-json-4 bash-minimal git-minimal guile-lmdb guile-lib))
       (arguments
        (list