diff options
| -rw-r--r-- | gn/packages/guile.scm | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/gn/packages/guile.scm b/gn/packages/guile.scm index 8d5f2b9..30f9b10 100644 --- a/gn/packages/guile.scm +++ b/gn/packages/guile.scm @@ -19,7 +19,7 @@ #:use-module ((gnu packages bioinformatics) #:select (gemma)) #:use-module ((gnu packages certs) #:select (nss-certs)) #:use-module ((gnu packages guile) #:select (guile-json-4 guile-3.0 guile-2.2 guile-readline)) - #:use-module ((gnu packages guile-xyz) #:select (guile-dbi guile-dbd-mysql guile-fibers guile-redis guile-hashing guile-commonmark)) + #:use-module ((gnu packages guile-xyz) #:select (guile-dbi guile-dbd-mysql guile-fibers guile-redis guile-hashing guile-commonmark guile-lmdb guile-lib)) #:use-module ((gnu packages parallel) #:select (parallel)) #:use-module ((gnu packages perl) #:select (perl)) #:use-module ((gnu packages tls) #:select (guile-gnutls openssl))) @@ -119,7 +119,7 @@ for MySQL.") (license license:gpl2+))) (define-public gn-guile - (let ((commit "99cf7800246f6af0df8407f7595641933891ad85") + (let ((commit "169d26710c978484f8e9464a95be6eaa47fa704e") (revision "0")) (package (name "gn-guile") @@ -132,13 +132,13 @@ for MySQL.") (file-name (string-append name "-" version)) (sha256 (base32 - "0sxg3cd69g2sik1x4di20b4da2qn64d82ikmfkas5w2x1nq3r6pj")))) + "10f6icsg9ifyvmg544xqb1ggzzvd4hdbbni7vhlz9xj5vyf9bih2")))) (build-system guile-build-system) (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-json-4 bash-minimal git-minimal)) + guile-json-4 bash-minimal git-minimal guile-lmdb guile-lib)) (arguments (list #:not-compiled-file-regexp "(guix|guix/.*)[.]scm$" @@ -171,6 +171,8 @@ for MySQL.") (guile-redis #$(this-package-input "guile-redis")) (guile-hashing #$(this-package-input "guile-hashing")) (guile-json-4 #$(this-package-input "guile-json")) + (guile-lmdb #$(this-package-input "guile-lmdb")) + (guile-lib #$(this-package-input "guile-lib")) (out #$output) (bin (string-append out "/bin")) (effective (read @@ -186,6 +188,8 @@ for MySQL.") (scm-dir (string-append "/share/guile/site/" effective)) (guile-inputs (list guile3-dbi guile3-dbd-mysql + guile-lmdb + guile-lib guile-fibers guile-gnutls guile-readline @@ -203,18 +207,28 @@ for MySQL.") (cons* out guile-inputs)))) (mkdir-p "bin") (copy-file "gn-guile.sh" "bin/gn-guile") + (copy-file "scripts/lmdb-publishdata-export.scm" + "bin/lmdb-publishdata-export") (substitute* "bin/gn-guile" - (("@SHELL@") bash) - (("guile") guile) - (("web/webserver.scm") webserver)) + (("@SHELL@") bash) + (("guile") guile) + (("web/webserver.scm") webserver)) (chmod "bin/gn-guile" #o755) + (chmod "bin/lmdb-publishdata-export" #o755) (install-file "bin/gn-guile" bin) + (install-file "bin/lmdb-publishdata-export" bin) (wrap-script - (string-append out "/bin/gn-guile") - `("PATH" ":" prefix ,path) - `("GUILE_AUTO_COMPILE" ":" = ("0")) - `("GUILE_LOAD_PATH" ":" prefix ,scm-path) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix ,go-path)))))))) + (string-append out "/bin/gn-guile") + `("PATH" ":" prefix ,path) + `("GUILE_AUTO_COMPILE" ":" = ("0")) + `("GUILE_LOAD_PATH" ":" prefix ,scm-path) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix ,go-path)) + (wrap-program + (string-append out "/bin/lmdb-publishdata-export") + `("PATH" ":" prefix ,path) + `("GUILE_AUTO_COMPILE" ":" = ("0")) + `("GUILE_LOAD_PATH" ":" prefix ,scm-path) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix ,go-path)))))))) (home-page "https://git.genenetwork.com/gn-guile") (synopsis "Next generation GN code in guile") (description "Use of guile.") |