[bug#57668] [PATCH 1/2] gnu: Add txt2tags.

[bug#57668] [PATCH 1/2] gnu: Add txt2tags.

[kiasoc5 via Guix-patches via]

* gnu/packages/textutils.scm (txt2tags): New variable.
---
 gnu/packages/textutils.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 7898d520f0..dd57a6fd8a 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -68,6 +68,7 @@ (define-module (gnu packages textutils)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-check)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages ruby)
@@ -1502,3 +1503,20 @@ (define-public ack
 easily specify file types, match highlighting, Perl-Compatible Regular
 Expressions, and being faster to type than grep.")
     (license license:artistic2.0)))
+
+(define-public txt2tags
+  (package
+   (name "txt2tags")
+   (version "3.7")
+   (source (origin
+            (method url-fetch)
+            (uri (pypi-uri "txt2tags" version))
+            (sha256
+             (base32
+              "12hpnvdy7dgarq6ini9jp7dp2zcmvpax04zbl3jb84kd423r75i7"))))
+   (build-system python-build-system)
+   (native-inputs (list python-tox))
+   (home-page "https://txt2tags.org")
+   (synopsis "Convert between markup languages")
+   (description "txt2tags is a document generator. It reads a text file with minimal markup and converts it to multiple formats.")
+   (license license:gpl2)))

base-commit: b45a44eaad890f31d9418dbb8cb14e3ee1d83c19
-- 
2.37.2

[bug#57668] [PATCH 2/2] gnu: Add grml-zsh-config.

[kiasoc5 via Guix-patches via]

* gnu/packages/shellutils.scm (grml-zsh-config): New variable.
---
 gnu/packages/shellutils.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 110cbe9fda..0698c25598 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -38,6 +38,7 @@ (define-module (gnu packages shellutils)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system python)
@@ -56,6 +57,7 @@ (define-module (gnu packages shellutils)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages shells)
+  #:use-module (gnu packages textutils)
   #:use-module (gnu packages tmux)
   #:use-module (gnu packages vim))
 
@@ -677,3 +679,35 @@ (define-public grc
 @end example
 ")
     (license license:gpl2)))
+
+(define-public grml-zsh-config
+  (package
+   (name "grml-zsh-config")
+   (version "0.19.3")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append
+                  "https://deb.grml.org/pool/main/g/grml-etc-core/grml-etc-core_"
+                  version ".tar.gz"))
+            (sha256
+             (base32
+              "05fri77028znjnvmh8mz3424rn8ilysj7hn8br2hk1qwkp4zzwp9"))))
+   (build-system copy-build-system)
+   (arguments
+    (list
+     #:phases
+     #~(modify-phases
+	%standard-phases
+	(add-before 'install 'make-doc
+		    (lambda _ (with-directory-excursion "doc" (invoke "make")))))
+     #:install-plan
+     #~'(("etc/skel/.zshrc"  "etc/skel/.zshrc")
+	 ("etc/zsh/keephack" "etc/zsh/keephack")
+	 ("etc/zsh/zshrc"    "etc/zsh/zshrc")
+	 ("doc/grmlzshrc.5"  "share/man/man5/grmlzshrc.5"))))
+   (native-inputs (list txt2tags))
+   (home-page "https://grml.org/zsh/")
+   (synopsis "grml's zsh configuration")
+   (description "This package provides an interactive setup for zsh preconfigured
+by the Grml project.")
+   (license license:gpl2)))

base-commit: b45a44eaad890f31d9418dbb8cb14e3ee1d83c19
prerequisite-patch-id: be0e6a7e441cb8ecb5efd53732b4830b3b64a29f
-- 
2.37.2

bug#57668: [PATCH 1/2] gnu: Add txt2tags.

[Christopher Baines]

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


kiasoc5 via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/textutils.scm (txt2tags): New variable.
> ---
>  gnu/packages/textutils.scm | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)

I fixed the issues raised by guix lint about tab characters and the line
length, and pushed this to master as
25d88eb9f3e22816180c099502a3a919bbe602f6.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]