diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/web.scm | 105 |
1 files changed, 52 insertions, 53 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ad5ec0aba7..b7be06cd7b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4824,8 +4824,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") license:freebsd-doc)))) ; documentation (define-public guix-data-service - (let ((commit "68850065d79ba05dad7201c3ed22f5e2e32680b7") - (revision "41")) + (let ((commit "1c7539418743e0dfe3a9cad22c414fd732daef8f") + (revision "42")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4837,64 +4837,63 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "0y7a9jbbkzhlhmn639kgmzlkw927w4nrsafm1sj51mrblr5qk4lq")))) + "1gp4mhjssxky0jjjz916rfgz4w2f327wfd5ixb6lb00ydlfh5mws")))) (build-system gnu-build-system) (arguments - '(#:modules ((guix build utils) + (list + #:modules '((guix build utils) (guix build gnu-build-system) (ice-9 ftw) (ice-9 match) (ice-9 rdelim) (ice-9 popen)) - #:test-target "check-with-tmp-database" - #:phases - (modify-phases %standard-phases - (add-before 'build 'set-GUILE_AUTO_COMPILE - (lambda _ - ;; To avoid warnings relating to 'guild'. - (setenv "GUILE_AUTO_COMPILE" "0") - #t)) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (guile (assoc-ref inputs "guile")) - (guile-effective-version - (read-line - (open-pipe* OPEN_READ - (string-append guile "/bin/guile") - "-c" "(display (effective-version))"))) - (scm (string-append out "/share/guile/site/" - guile-effective-version)) - (go (string-append out "/lib/guile/" - guile-effective-version - "/site-ccache"))) - (for-each - (lambda (file) - (simple-format (current-error-port) - "wrapping: ~A\n" - (string-append bin "/" file)) - (wrap-program (string-append bin "/" file) - `("PATH" ":" prefix - ,(cons* - bin - (map (lambda (input) - (string-append - (assoc-ref inputs input) - "/bin")) - '("ephemeralpg" - "util-linux" - "postgresql")))) - `("GUILE_LOAD_PATH" ":" prefix - (,scm ,(getenv "GUILE_LOAD_PATH"))) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))) - (scandir bin - (match-lambda - ((or "." "..") #f) - (_ #t)))) - #t))) - (delete 'strip)))) ; As the .go files aren't compatible + #:test-target "check-with-tmp-database" + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'set-GUILE_AUTO_COMPILE + (lambda _ + ;; To avoid warnings relating to 'guild'. + (setenv "GUILE_AUTO_COMPILE" "0"))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (guile (assoc-ref inputs "guile")) + (guile-effective-version + (read-line + (open-pipe* OPEN_READ + (string-append guile "/bin/guile") + "-c" "(display (effective-version))"))) + (scm (string-append out "/share/guile/site/" + guile-effective-version)) + (go (string-append out "/lib/guile/" + guile-effective-version + "/site-ccache"))) + (for-each + (lambda (file) + (simple-format (current-error-port) + "wrapping: ~A\n" + (string-append bin "/" file)) + (wrap-program (string-append bin "/" file) + `("PATH" ":" prefix + ,(cons* + bin + (map (lambda (input) + (string-append + (assoc-ref inputs input) + "/bin")) + '("ephemeralpg" + "util-linux" + "postgresql")))) + `("GUILE_LOAD_PATH" ":" prefix + (,scm ,(getenv "GUILE_LOAD_PATH"))) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix + (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))) + (scandir bin + (match-lambda + ((or "." "..") #f) + (_ #t))))))) + (delete 'strip)))) ; As the .go files aren't compatible (inputs (list ephemeralpg util-linux |