From 0d6c5e0ba1bd6800712e79964f7b9f5c6043f249 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sat, 11 Feb 2023 22:44:27 -0500 Subject: gnu: Remove and deprecate tidy for tidy-html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- gnu/packages/web.scm | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 861f3e0419..cc206722a9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -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") -- cgit v1.2.3 From 949160f521aac01a4edd57cbf8814cf40241ae58 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 7 Jan 2023 22:32:25 +0400 Subject: gnu: Add kiln. * gnu/packages/web.scm (kiln): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/web.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cc206722a9..4ec7dc8555 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8169,6 +8169,48 @@ (define-public gmid @end itemize") (license license:isc))) +(define-public kiln + (package + (name "kiln") + (version "0.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~adnano/kiln") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lvzv46hn80gffw47mcc28iahwqng7pvg500s9jlrq6mhr4k5ih4")))) + (build-system go-build-system) + (arguments + (list + #:import-path "git.sr.ht/~adnano/kiln" + #:install-source? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-man + (lambda _ + (let ((man1 (string-append #$output "/share/man/man1"))) + (system (string-append + "scdoc" + "< src/git.sr.ht/~adnano/kiln/docs/kiln.1.scd" + "> kiln.1")) + (install-file "kiln.1" man1))))))) + (native-inputs + (list scdoc)) + (propagated-inputs + (list go-github-com-google-shlex + go-github-com-pelletier-go-toml + go-gopkg-in-yaml-v3)) + (home-page "https://kiln.adnano.co/") + (synopsis "Simple static site generator") + (description + "Kiln takes a different approach to building static sites. +Instead of packing all functionality into kiln itself, the core is lightweight +and can be extended with the use of external commands.") + (license license:expat))) + (define-public siege (package (name "siege") -- cgit v1.2.3 From 076fa659efc6521def67d2d1040cd5d81fc1ce7d Mon Sep 17 00:00:00 2001 From: Evgeny Pisemsky Date: Sat, 25 Feb 2023 17:55:10 +0300 Subject: gnu: cat-avatar-generator: Update to 1-1.9360ea3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (cat-avatar-generator): Update to 1-1.9360ea3. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 74 +++++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 36 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4ec7dc8555..a10861bbfe 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7648,47 +7648,49 @@ (define-public geomyidae (license license:expat))) (define-public cat-avatar-generator - (package - (name "cat-avatar-generator") - (version "1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://framagit.org/Deevad/cat-avatar-generator.git") - (commit "71c0c662742cafe8afd2d2d50ec84243113e35ad"))) - (file-name (string-append name "-" version)) - (sha256 - (base32 - "0s7b5whqsmfa57prbgl66ym551kg6ly0z14h5dgrlx4lqm70y2yw")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils) - (srfi srfi-1) - (srfi srfi-26)) - - (let ((source (assoc-ref %build-inputs "source")) - (php-dir (string-append %output "/share/web/" ,name "/"))) - ;; The cache directory must not be in the store, but in a writable - ;; location. The webserver will give us this location. - (copy-recursively source php-dir) - (substitute* (string-append php-dir "/cat-avatar-generator.php") - (("\\$cachepath = .*") - "if(isset($_SERVER['CACHE_DIR'])) + (let ((commit "9360ea33f79d1dad3e43494b09878b5e3f6b41fa") + (revision "1")) + (package + (name "cat-avatar-generator") + (version (git-version "1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/Deevad/cat-avatar-generator.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0js4grqzsm4gvmcbmxv7zw4samfzi6nk4mn977ddcvla9g222rkm")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils) + (srfi srfi-1) + (srfi srfi-26)) + (let ((source (assoc-ref %build-inputs "source")) + (php-dir (string-append %output "/share/web/" ,name))) + (install-file (string-append source "/cat-avatar-generator.php") php-dir) + (copy-recursively (string-append source "/avatars") (string-append php-dir "/avatars")) + ;; The cache directory must not be in the store, but in a writable + ;; location. The webserver will give us this location. + (substitute* (string-append php-dir "/cat-avatar-generator.php") + (("\\$cachepath = .*") + "if(isset($_SERVER['CACHE_DIR'])) $cachepath = $_SERVER['CACHE_DIR']; else die('You need to set the CACHE_DIR variable first.');")) - #t)))) - (home-page "https://framagit.org/Deevad/cat-avatar-generator") - (synopsis "Random avatar generator") - (description "Cat avatar generator is a generator of cat pictures optimised + #t)))) + (home-page "https://framagit.org/Deevad/cat-avatar-generator") + (synopsis "Random avatar generator") + (description "Cat avatar generator is a generator of cat pictures optimised to generate random avatars, or defined avatar from a \"seed\". This is a derivation by David Revoy from the original MonsterID by Andreas Gohr.") - ;; expat for the code, CC-BY 4.0 for the artwork - (license (list license:expat - license:cc-by4.0)))) + ;; expat for the code, CC-BY 4.0 for the artwork + (license (list license:expat + license:cc-by4.0))))) (define-public nghttp2 (package -- cgit v1.2.3 From 34fed18169a5eae3169ff5fd2c43fe3af79e3b70 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 8 Mar 2023 14:09:11 +0000 Subject: gnu: Add tissue. * gnu/packages/web.scm (tissue): New variable. --- gnu/packages/web.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a10861bbfe..7b05a99752 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016, 2023 Clément Lassieur ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2016–2022 Arun Isaac +;;; Copyright © 2016–2023 Arun Isaac ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert @@ -184,6 +184,7 @@ (define-module (gnu packages web) #:use-module (gnu packages readline) #:use-module (gnu packages search) #:use-module (gnu packages serialization) + #:use-module (gnu packages skribilo) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) @@ -7981,6 +7982,60 @@ (define-public buku-run "This package provides a rofi frontend for the buku bookmark manager.") (license license:gpl3+))) +(define-public tissue + (package + (name "tissue") + (version "0.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://tissue.systemreboot.net/releases/tissue-" + version ".tar.lz")) + (sha256 + (base32 + "0vsybgnzv8nnwf58pnxrs4101xczl8jvxd1wzmk4vmdyrp8a2kkm")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags #~(list (string-append "prefix=" #$output)) + #:modules `(((guix build guile-build-system) + #:select (target-guile-effective-version)) + (guix build gnu-build-system) + (guix build utils)) + #:phases + (with-imported-modules '((guix build guile-build-system)) + #~(modify-phases %standard-phases + (replace 'patch-source-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "bin/tissue" + (("^exec guile") + (string-append "exec " + (search-input-file inputs "/bin/guile")))))) + (delete 'configure) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (effective-version (target-guile-effective-version))) + (wrap-program (string-append out "/bin/tissue") + `("GUILE_LOAD_PATH" prefix + (,(string-append out "/share/guile/site/" effective-version) + ,(getenv "GUILE_LOAD_PATH"))) + `("GUILE_LOAD_COMPILED_PATH" prefix + (,(string-append out "/lib/guile/" + effective-version "/site-ccache") + ,(getenv "GUILE_LOAD_COMPILED_PATH"))))))))))) + (inputs (list bash-minimal guile-3.0 guile-filesystem guile-git guile-xapian)) + (native-inputs (list lzip)) + (propagated-inputs (list skribilo)) + (home-page "https://tissue.systemreboot.net") + (synopsis "Text based project information management system") + (description "tissue is an issue tracker and project information +management system built on plain text files and git. It is specifically +intended for small free software projects. It features a static site +generator to build a project website and a powerful search interface to search +through project issues and documentation. The search interface is built on +the Xapian search engine library, and is available both as a command-line +program and as a web server.") + (license license:gpl3+))) + (define-public anonip (package (name "anonip") -- cgit v1.2.3