From a66e0cbedda4927d9546829e162d08d03bb667da Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Wed, 22 Mar 2023 14:49:00 +0200
Subject: bh20-seq-resource: Add version without profile collisions.

* gn/packages/bioinformatics.scm (bh20-seq-resource-for-service): New
variable.
* gn/services/bh20-seq-resource-container.scm
(covid19-pubseq-configuration): Use it by default.
---
 gn/services/bh20-seq-resource-container.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gn/services/bh20-seq-resource-container.scm')

diff --git a/gn/services/bh20-seq-resource-container.scm b/gn/services/bh20-seq-resource-container.scm
index cb77cdb..9eae2fc 100644
--- a/gn/services/bh20-seq-resource-container.scm
+++ b/gn/services/bh20-seq-resource-container.scm
@@ -14,7 +14,7 @@
   make-covid19-pubseq-configuration
   covid19-pubseq-configuration?
   (package          covid19-pubseq-configuration-package    ; package
-                    (default bh20-seq-resource))
+                    (default bh20-seq-resource-for-service))
   (deploy-directory covid19-pubseq-deploy-directory         ; string
                     (default "/srv/http"))
   (port             covid19-pubseq-configuration-port       ; string
-- 
cgit v1.2.3


From ac4a32b4699321edf0bb232aad89c4b35645c042 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Wed, 22 Mar 2023 15:36:04 +0200
Subject: bh20-seq-resource-container.scm updates

---
 gn/services/bh20-seq-resource-container.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'gn/services/bh20-seq-resource-container.scm')

diff --git a/gn/services/bh20-seq-resource-container.scm b/gn/services/bh20-seq-resource-container.scm
index 9eae2fc..e0eccf7 100644
--- a/gn/services/bh20-seq-resource-container.scm
+++ b/gn/services/bh20-seq-resource-container.scm
@@ -5,6 +5,7 @@
              (guix modules)
              ((guix packages) #:select (package-source))
              (guix records)
+             (guix build-system python) ; for python-version from guix/build/python-build-system.scm
              (ice-9 match))
 (use-service-modules shepherd)
 (use-package-modules compression python python-web)
@@ -58,9 +59,10 @@
                           #:directory #$deploy-directory
                           #:log-file "/var/log/covid19-pubseq.log"
                           #:environment-variables
+                          ;(let (pyversion (python-version (@ (gnu packages python) python)))
                           '("TMPDIR=/export/tmp"
-                            ;; TODO: Don't hardcode python version!
-                            "PYTHONPATH=/run/current-system/profile/lib/python3.8/site-packages")
+                            "PYTHONPATH=/run/current-system/profile/lib/python3.9/site-packages")
+                          ;  (string-append "PYTHONPATH=/run/current-system/profile/lib/python" pyversion "/site-packages")))
                           ;#:mappings
                           ;(list (file-system-mapping
                           ;        (source "/export/tmp")
@@ -68,7 +70,7 @@
                           ;        (writable? #t))
                           ;      (file-system-mapping
                           ;        ;; TODO: Don't hardcode python version!
-                          ;        (source "/run/current-system/profile/lib/python3.8/site-packages")
+                          ;        (source "/run/current-system/profile/lib/python3.9/site-packages")
                           ;        (target source)))
                           ))
                (stop  #~(make-kill-destructor))))))))
@@ -104,3 +106,5 @@
   (packages '())
 
   (services (list (service covid19-pubseq-service-type))))
+
+;; guix system container /home/shepherd/guix-bioinformatics/gn/services/bh20-seq-resource-container.scm --share=/export/tmp=/export/tmp --network
-- 
cgit v1.2.3