From: Christopher Baines <mail@cbaines.net>
To: 28127@debbugs.gnu.org
Subject: [bug#28127] [PATCH 2/2] web: Add NGinx documentation.
Date: Thu, 17 Aug 2017 19:44:04 +0100 [thread overview]
Message-ID: <20170817184404.18517-2-mail@cbaines.net> (raw)
In-Reply-To: <20170817184404.18517-1-mail@cbaines.net>
* gnu/packages/web.scm (nginx): Add comment about deleting the documentation.
(nginx-xslscript): New variable.
(nginx-docs): New variable.
---
gnu/packages/web.scm | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 98 insertions(+)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 6eb9833f2..5e58ad3f8 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -43,6 +43,7 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix cvs-download)
+ #:use-module (guix hg-download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
@@ -134,6 +135,8 @@ and its related documentation.")
(define-public nginx
(package
(name "nginx")
+ ;; Consider updating the nginx-docs package if the nginx package is
+ ;; updated.
(version "1.12.1")
(source (origin
(method url-fetch)
@@ -212,6 +215,101 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
;; except for two source files which are bsd-4 licensed.
(license (list l:bsd-2 l:expat l:bsd-3 l:bsd-4))))
+(define nginx-xslscript
+ (let ((revision 11)
+ (changeset "01dc9ba12e1b"))
+ (package
+ (name "nginx-xslscript")
+ (version
+ (simple-format #f "2014-03-31-~A-~A" revision changeset))
+ (source (origin
+ (method hg-fetch)
+ (uri (hg-reference
+ (url "http://hg.nginx.org/xslscript")
+ (changeset changeset)))
+ (file-name (string-append name "-" version))
+ (sha256
+ (base32
+ "0am8zvdx3jmiwkg5q07qjaw5r26r4i2v5i4yr8a1k0jgib6ii08g"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:tests? #f ; No test suite
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'build)
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out-bin (string-append
+ (assoc-ref outputs "out")
+ "/bin")))
+ (mkdir-p out-bin)
+ (copy-file "xslscript.pl"
+ (string-append
+ out-bin
+ "/xslscript.pl"))
+ #t))))))
+ (home-page "http://hg.nginx.org/xslscript")
+ (synopsis "XSLScript with NGinx specific modifications")
+ (description
+ "XSLScript is a terse notation for writing complex XSLT stylesheets.
+This is modified version, specifically intended for use with the NGinx
+documentation.")
+ (license l:bsd-2))))
+
+(define-public nginx-docs
+ ;; This documentation should be relevant for nginx-1.12.0
+ (let ((revision 1961)
+ (changeset "dd4b6c564e10"))
+ (package
+ (name "nginx-docs")
+ (version
+ (simple-format #f "2017-04-12-~A-~A" revision changeset))
+ (source
+ (origin (method hg-fetch)
+ (uri (hg-reference
+ (url "http://hg.nginx.org/nginx.org")
+ (changeset changeset)))
+ (file-name (string-append name "-" version))
+ (sha256
+ (base32
+ "0rycfnnm2xkm777769h1zib428q45j64mx8nzzfzs4v07jbfc8m5"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:tests? #f ; No test suite
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'build
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((output (assoc-ref outputs "out")))
+ (substitute* "umasked.sh"
+ ((" /bin/sh") (string-append " " (which "sh"))))
+ ;; The documentation includes a banner, which makes sense on
+ ;; the NGinx website, but doesn't make much sense when
+ ;; viewing locally. Therefore, modify the CSS to remove the
+ ;; banner.
+ (substitute* "xslt/style.xslt"
+ (("#banner \\{ background: black;")
+ "#banner { background: black;
+ display: none;"))
+ (zero? (system* "make")))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((output (assoc-ref outputs "out")))
+ (mkdir-p output)
+ (copy-recursively "libxslt" output)
+ #t))))))
+ (native-inputs
+ `(("libxml2" ,libxml2)
+ ("libxslt" ,libxslt)
+ ("nginx-xslscript" ,nginx-xslscript)))
+ (home-page "https://nginx.org")
+ (synopsis "Documentation for NGinx")
+ (description
+ "The documentation for the NGinx web server.")
+ (license l:bsd-2))))
+
(define-public fcgi
(package
(name "fcgi")
--
2.14.1
next prev parent reply other threads:[~2017-08-17 18:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-17 18:42 [bug#28127] [PATCH] Add documentation for NGinx Christopher Baines
2017-08-17 18:44 ` [bug#28127] [PATCH 1/2] perl: Add perl-parse-recdescent Christopher Baines
2017-08-17 18:44 ` Christopher Baines [this message]
2017-10-04 14:48 ` [bug#28127] [PATCH 2/2] web: Add NGinx documentation Ludovic Courtès
2017-10-05 20:43 ` Christopher Baines
2017-10-04 14:45 ` [bug#28127] [PATCH 1/2] perl: Add perl-parse-recdescent Ludovic Courtès
2017-10-05 20:40 ` Christopher Baines
2017-10-05 20:40 ` Christopher Baines
2017-10-05 20:40 ` [bug#28127] [PATCH 2/2] web: Add nginx-documentation Christopher Baines
2017-10-07 20:31 ` Ludovic Courtès
2017-10-08 13:38 ` bug#28127: " Christopher Baines
2017-10-07 20:30 ` [bug#28127] [PATCH 1/2] perl: Add perl-parse-recdescent Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170817184404.18517-2-mail@cbaines.net \
--to=mail@cbaines.net \
--cc=28127@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).