gnu: artanis: Update to 0.4.1.
* gnu/packages/guile-xyz.scm (artanis): Update to 0.4.1. [inputs]: Add nss; move guile-json-1 and guile-redis from here... [propagated-inputs]: ...to here; add guile-readline. [arguments]: Add phase "patch-references-to-libnss".master
parent
fe338d7f00
commit
1a37fd1e72
|
@ -73,6 +73,7 @@
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages networking)
|
#:use-module (gnu packages networking)
|
||||||
#:use-module (gnu packages noweb)
|
#:use-module (gnu packages noweb)
|
||||||
|
#:use-module (gnu packages nss)
|
||||||
#:use-module (gnu packages password-utils)
|
#:use-module (gnu packages password-utils)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
|
@ -99,22 +100,16 @@
|
||||||
#:use-module ((srfi srfi-1) #:select (alist-delete)))
|
#:use-module ((srfi srfi-1) #:select (alist-delete)))
|
||||||
|
|
||||||
(define-public artanis
|
(define-public artanis
|
||||||
(let ((release "0.3.1")
|
|
||||||
(revision 0))
|
|
||||||
(package
|
(package
|
||||||
(name "artanis")
|
(name "artanis")
|
||||||
(version (if (zero? revision)
|
(version "0.4.1")
|
||||||
release
|
|
||||||
(string-append release "-"
|
|
||||||
(number->string revision))))
|
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/artanis/artanis-"
|
(uri (string-append "mirror://gnu/artanis/artanis-"
|
||||||
release ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0hqr5m3mb558bdhkc2sadmd9cbrhp3y525wx7cwirgy6i0zmay68"))
|
"0nnmdfx5xwcc3kck64var7msz7g3qk817d7bv9l159nkmic0v9w4"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
'(begin
|
'(begin
|
||||||
|
@ -145,14 +140,19 @@
|
||||||
""))
|
""))
|
||||||
#t))))
|
#t))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
(inputs
|
||||||
|
`(("guile" ,guile-2.2)
|
||||||
|
("nss" ,nss)))
|
||||||
;; FIXME the bundled csv contains one more exported procedure
|
;; FIXME the bundled csv contains one more exported procedure
|
||||||
;; (sxml->csv-string) than guile-csv. The author is maintainer of both
|
;; (sxml->csv-string) than guile-csv. The author is maintainer of both
|
||||||
;; projects.
|
;; projects.
|
||||||
;; TODO: Add guile-dbi and guile-dbd optional dependencies.
|
;; TODO: Add guile-dbi and guile-dbd optional dependencies.
|
||||||
(inputs `(("guile" ,guile-2.2)
|
(propagated-inputs
|
||||||
("guile-json" ,guile-json-1)
|
`(("guile-json" ,guile-json-1)
|
||||||
|
("guile-readline" ,guile-readline)
|
||||||
("guile-redis" ,guile-redis)))
|
("guile-redis" ,guile-redis)))
|
||||||
(native-inputs `(("bash" ,bash) ;for the `source' builtin
|
(native-inputs
|
||||||
|
`(("bash" ,bash) ;for the `source' builtin
|
||||||
("pkgconfig" ,pkg-config)
|
("pkgconfig" ,pkg-config)
|
||||||
("util-linux" ,util-linux))) ;for the `script' command
|
("util-linux" ,util-linux))) ;for the `script' command
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -174,6 +174,15 @@
|
||||||
(string-append "\""
|
(string-append "\""
|
||||||
(assoc-ref outputs "out")
|
(assoc-ref outputs "out")
|
||||||
"/share/guile/site/2.2\"")))))
|
"/share/guile/site/2.2\"")))))
|
||||||
|
(add-after 'unpack 'patch-reference-to-libnss
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(substitute* "artanis/security/nss.scm"
|
||||||
|
(("ffi-binding \"libnss3\"")
|
||||||
|
(string-append
|
||||||
|
"ffi-binding \""
|
||||||
|
(assoc-ref inputs "nss") "/lib/nss/libnss3.so"
|
||||||
|
"\"")))
|
||||||
|
#t))
|
||||||
(add-before 'install 'substitute-root-dir
|
(add-before 'install 'substitute-root-dir
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let ((out (assoc-ref outputs "out")))
|
(let ((out (assoc-ref outputs "out")))
|
||||||
|
@ -205,7 +214,7 @@ provides several tools for web development: database access, templating
|
||||||
frameworks, session management, URL-remapping for RESTful, page caching, and
|
frameworks, session management, URL-remapping for RESTful, page caching, and
|
||||||
more.")
|
more.")
|
||||||
(home-page "https://www.gnu.org/software/artanis/")
|
(home-page "https://www.gnu.org/software/artanis/")
|
||||||
(license (list license:gpl3+ license:lgpl3+))))) ;dual license
|
(license (list license:gpl3+ license:lgpl3+)))) ;dual license
|
||||||
|
|
||||||
;; There has not been any release yet.
|
;; There has not been any release yet.
|
||||||
(define-public guildhall
|
(define-public guildhall
|
||||||
|
|
Reference in New Issue