[PATCH] gnu: Add tidy.

[PATCH] gnu: Add tidy.

[David Thompson]

[-- Attachment #1: Type: text/plain, Size: 58 bytes --]

Thanks to Mark for adding the cvs-fetch download method!


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-tidy.patch --]
[-- Type: text/x-diff, Size: 2370 bytes --]

From 0e93fe70c5c512a8d2badb4c710d4ebe772829b9 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Fri, 6 Feb 2015 21:14:11 -0500
Subject: [PATCH] gnu: Add tidy.

* gnu/packages/web.scm (tidy): New variable.
---
 gnu/packages/web.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 2574752..0e3bf14 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -27,6 +27,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix cvs-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system cmake)
@@ -288,6 +289,41 @@ domains (UTF-8 and IDNA2008 Punycode), is thread-safe, and handles IDNA2008
 UTS#46")
     (license l:x11)))
 
+(define-public tidy
+  (package
+    (name "tidy")
+    (version "20091223")
+    (source (origin
+              (method cvs-fetch)
+              (uri (cvs-reference
+                    (root-directory
+                     ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy")
+                    (module "tidy")
+                    (revision "2009-12-23")))
+              (sha256
+               (base32
+                "14dsnmirjcrvwsffqp3as70qr6bbfaig2fv3zvs5g7005jrsbvpb"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-cons-before
+                 'configure 'bootstrap
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   ;; configure.in and Makefile.am aren't in the root of the
+                   ;; source tree.
+                   (copy-recursively "build/gnuauto" ".")
+                   (setenv "AUTOMAKE" "automake --foreign")
+                   (zero? (system* "autoreconf" "-vfi")))
+                 %standard-phases)))
+    (native-inputs
+     `(("automake" ,automake)
+       ("autoconf" ,autoconf)
+       ("libtool" ,libtool)))
+    (synopsis "HTML validator and tidier")
+    (description "HTML Tidy is a command-line tool and C library that can be
+used to validate and fix HTML data.")
+    (home-page "http://tidy.sourceforge.net/")
+    (license (l:x11-style "file:///include/tidy.h"))))
+
 (define-public perl-html-tagset
   (package
     (name "perl-html-tagset")
-- 
2.1.4


[-- Attachment #3: Type: text/plain, Size: 136 bytes --]


-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH] gnu: Add tidy.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> From 0e93fe70c5c512a8d2badb4c710d4ebe772829b9 Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Fri, 6 Feb 2015 21:14:11 -0500
> Subject: [PATCH] gnu: Add tidy.
>
> * gnu/packages/web.scm (tidy): New variable.

LGTM!

Ludo’.

Re: [PATCH] gnu: Add tidy.

[Mark H Weaver]

David Thompson <dthompson2@worcester.edu> writes:

> +(define-public tidy
> +  (package
> +    (name "tidy")
> +    (version "20091223")
> +    (source (origin
> +              (method cvs-fetch)
> +              (uri (cvs-reference
> +                    (root-directory
> +                     ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy")
> +                    (module "tidy")
> +                    (revision "2009-12-23")))
> +              (sha256
> +               (base32
> +                "14dsnmirjcrvwsffqp3as70qr6bbfaig2fv3zvs5g7005jrsbvpb"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     '(#:phases (alist-cons-before
> +                 'configure 'bootstrap

Please do (alist-cons-after 'unpack ...) instead.  The reason is that we
need this to happen before the 'patch-/usr/bin/file' phase and other
similar passes that fix up 'configure', otherwise things are likely to
break on MIPS and ARM.

Looks good to me otherwise.

     Thanks!
       Mark

Re: [PATCH] gnu: Add tidy.

[David Thompson]

Mark H Weaver <mhw@netris.org> writes:

> Please do (alist-cons-after 'unpack ...) instead.  The reason is that we
> need this to happen before the 'patch-/usr/bin/file' phase and other
> similar passes that fix up 'configure', otherwise things are likely to
> break on MIPS and ARM.

Thanks for the explanation.  I have already pushed this patch, so I just
pushed another commit that makes this adjustment.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate