From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drsui-0001Nh-LX for guix-patches@gnu.org; Tue, 12 Sep 2017 17:40:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drsuh-0002lG-B1 for guix-patches@gnu.org; Tue, 12 Sep 2017 17:40:12 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:56061) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1drsuh-0002l4-7s for guix-patches@gnu.org; Tue, 12 Sep 2017 17:40:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1drsug-0003we-Vo for guix-patches@gnu.org; Tue, 12 Sep 2017 17:40:11 -0400 Subject: [bug#28177] [PATCH 12/12] gnu: Add ikiwiki. Resent-Message-ID: From: Christopher Baines Date: Tue, 12 Sep 2017 22:39:04 +0100 Message-Id: <20170912213904.24503-12-mail@cbaines.net> In-Reply-To: <20170912213904.24503-1-mail@cbaines.net> References: <20170912213904.24503-1-mail@cbaines.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28177@debbugs.gnu.org * gnu/packages/web.scm (ikiwiki): New variable. --- gnu/packages/web.scm | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 393e36e16..72892ffe2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -76,9 +76,11 @@ #:use-module (gnu packages java) #:use-module (gnu packages javascript) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) #:use-module (gnu packages lua) + #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) #:use-module (gnu packages base) #:use-module (gnu packages perl) @@ -92,7 +94,8 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) - #:use-module (gnu packages statistics)) + #:use-module (gnu packages statistics) + #:use-module (gnu packages version-control)) (define-public httpd (package @@ -4069,6 +4072,74 @@ parse both valid and invalid web content. It is developed as part of the NetSurf project.") (license l:expat))) +(define-public ikiwiki + (package + (name "ikiwiki") + (version "3.20170111") + (source + (origin + (method url-fetch) + (uri (string-append "http://snapshot.debian.org/archive/debian/" + "20170111T215449Z/pool/main/i/ikiwiki/ikiwiki_" + version ".tar.xz")) + (sha256 + (base32 + "00d7yzv426fvqbhvzyafddv7fa6b4j2647b0wi371wd5yjj9j3sz")))) + (build-system perl-build-system) + (arguments + `(;; Image tests fail + ;; + ;; Test Summary Report + ;; ------------------- + ;; t/img.t (Wstat: 2304 Tests: 62 Failed: 9) + ;; Failed tests: 21, 27-28, 30-35 + ;; Non-zero exit status: 9 + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-programs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/")) + (path (getenv "PERL5LIB"))) + (for-each (lambda (file) + (wrap-program file + `("PERL5LIB" ":" prefix (,path)))) + (find-files bin)) + #t)))))) + (native-inputs + `(("which" ,which) + ("perl-html-tagset" ,perl-html-tagset) + ("perl-timedate" ,perl-timedate) + ("perl-xml-sax" ,perl-xml-sax) + ("perl-xml-simple" ,perl-xml-simple) + ("gettext" ,gettext-minimal) + ("subversion" ,subversion) + ("git" ,git) + ("bazaar" ,bazaar) + ("cvs" ,cvs) + ("mercurial" ,mercurial))) + (inputs + `(("python" ,python-wrapper) + ("perl-cgi-session" ,perl-cgi-session) + ("perl-cgi-simple" ,perl-cgi-simple) + ("perl-json" ,perl-json) + ("perl-image-magick" ,perl-image-magick) + ("perl-uri" ,perl-uri) + ("perl-html-parser" ,perl-html-parser) + ("perl-uri" ,perl-uri) + ("perl-text-markdown-discount" ,perl-text-markdown-discount) + ("perl-html-scrubber" ,perl-html-scrubber) + ("perl-html-template" ,perl-html-template) + ("perl-yaml-libyaml" ,perl-yaml-libyaml))) + (home-page "https://ikiwiki.info/") + (synopsis "Wiki compiler, capable of generating HTML") + (description + "Ikiwiki is a wiki compiler, capable of generating a static set of web +pages, but also incorporating dynamic features like a web based editor and +commenting.") + (license l:gpl2+))) + (define-public libwapcaplet (package (name "libwapcaplet") -- 2.14.1