mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: Remove and deprecate tidy for tidy-html
* gnu/packages/web.scm (tidy): Change to deprecated alias for tidy-html * gnu/packages/pumpio.scm (pumpa): Use tidy-html instead of tidy and correct header name. * gnu/packages/markup.scm (hoedown): * gnu/packages/photo.scm (enblend-enfuse): * gnu/packages/php.scm (php): * gnu/packages/python-xyz.scm (python-pytidylib): Use tidy-html instead of tidy. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
a6194d1f35
commit
0d6c5e0ba1
6 changed files with 10 additions and 39 deletions
|
@ -73,7 +73,7 @@ (define-public hoedown
|
|||
#:test-target "test"))
|
||||
(native-inputs
|
||||
`(("python" ,python-2)
|
||||
("tidy" ,tidy)))
|
||||
("tidy" ,tidy-html)))
|
||||
(synopsis "Markdown processing library")
|
||||
(description "Hoedown is a standards compliant, fast, secure markdown
|
||||
processing library written in C.")
|
||||
|
|
|
@ -383,7 +383,7 @@ (define-public enblend-enfuse
|
|||
imagemagick
|
||||
libxml2
|
||||
texlive-tiny
|
||||
tidy
|
||||
tidy-html
|
||||
transfig))
|
||||
(inputs
|
||||
(list boost
|
||||
|
|
|
@ -416,7 +416,7 @@ (define-public php
|
|||
("postgresql" ,postgresql)
|
||||
("readline" ,readline)
|
||||
("sqlite" ,sqlite)
|
||||
("tidy" ,tidy)
|
||||
("tidy" ,tidy-html)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
|
|
@ -47,6 +47,8 @@ (define-public pumpa
|
|||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(substitute* "src/util.cpp"
|
||||
(("buffio\\.h") "tidybuffio.h"))
|
||||
;; Fix dependency tests.
|
||||
(substitute* "pumpa.pro"
|
||||
(("/usr/include/tidy\\.h")
|
||||
|
@ -59,7 +61,7 @@ (define-public pumpa
|
|||
(invoke "qmake" prefix))
|
||||
#t)))))
|
||||
(inputs
|
||||
(list aspell qtbase-5 tidy))
|
||||
(list aspell qtbase-5 tidy-html))
|
||||
(synopsis "Qt-based pump.io client")
|
||||
(description "Pumpa is a simple pump.io client written in C++ and Qt.")
|
||||
(home-page "https://pumpa.branchable.com/")
|
||||
|
|
|
@ -27219,7 +27219,7 @@ (define-public python-pytidylib
|
|||
(("ctypes\\.util\\.find_library\\('tidy'\\)")
|
||||
(format #f "'~a'" libtidy)))
|
||||
#t))))))
|
||||
(inputs (list tidy))
|
||||
(inputs (list tidy-html))
|
||||
(home-page "https://github.com/countergram/pytidylib")
|
||||
(synopsis "Python wrapper for HTML Tidy library")
|
||||
(description
|
||||
|
|
|
@ -1718,40 +1718,6 @@ (define-public libpsl
|
|||
UTS#46.")
|
||||
(license license: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")))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"14dsnmirjcrvwsffqp3as70qr6bbfaig2fv3zvs5g7005jrsbvpb"))
|
||||
(patches (search-patches "tidy-CVE-2015-5522+5523.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(replace '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")
|
||||
(invoke "autoreconf" "-vfi"))))))
|
||||
(native-inputs
|
||||
(list automake autoconf 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 "https://tidy.sourceforge.net/")
|
||||
(license (license:x11-style "file:///include/tidy.h"))))
|
||||
|
||||
(define-public esbuild
|
||||
(package
|
||||
(name "esbuild")
|
||||
|
@ -6204,6 +6170,9 @@ (define-public tidy-html
|
|||
functions of Tidy.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public tidy
|
||||
(deprecated-package "tidy" tidy-html))
|
||||
|
||||
(define-public hiawatha
|
||||
(package
|
||||
(name "hiawatha")
|
||||
|
|
Loading…
Reference in a new issue