[PATCH] gnu: Add markdown.

[PATCH] gnu: Add markdown.

[Mathieu Lirzin]

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

Hello Guix!

This patch adds Markdown. I don't know if 'textutils.scm' is the right
place for it and since it's the first time i play with
`trivial-build-system', comments and/or advices are welcomed.

--
Mathieu Lirzin


[-- Attachment #2: 0001-gnu-Add-markdown.patch --]
[-- Type: text/x-diff, Size: 3199 bytes --]

From eec846d938b35b7a286660257d4f878723ad9da7 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@openmailbox.org>
Date: Thu, 30 Apr 2015 22:26:57 +0200
Subject: [PATCH] gnu: Add markdown.

* gnu/packages/textutils.scm (markdown): New variable.
---
 gnu/packages/textutils.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 08b1b64..296c816 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -23,8 +24,11 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system trivial)
   #:use-module (gnu packages autotools)
-  #:use-module (gnu packages python))
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages zip))
 
 (define-public recode
   (package
@@ -155,3 +159,44 @@ encoding, supporting Unicode version 7.0.")
      "libgtextutils is a text utilities library used by the fastx toolkit from
 the Hannon Lab.")
     (license license:agpl3+)))
+
+(define-public markdown
+  (package
+    (name "markdown")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://daringfireball.net/projects/downloads/"
+             (string-capitalize name) "_" version ".zip"))
+       (sha256
+        (base32 "0dq1pj91pvlwkv0jwcgdfpv6gvnxzrk3s8mnh7imamcclnvfj835"))))
+    (build-system trivial-build-system)
+    (arguments
+     '(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (let ((source (assoc-ref %build-inputs "source"))
+               (out    (assoc-ref %outputs "out"))
+               (unzip  (string-append (assoc-ref %build-inputs "unzip")
+                                     "/bin/unzip")))
+           (mkdir-p out)
+           (with-directory-excursion out
+             (system* unzip source)
+             (mkdir "bin")
+             (mkdir-p "share/doc")
+             (rename-file  "Markdown_1.0.1/Markdown.pl" "bin/markdown")
+             (rename-file  "Markdown_1.0.1/Markdown Readme.text"
+                           "share/doc/README")
+             (delete-file-recursively "Markdown_1.0.1"))))))
+    (native-inputs `(("unzip" ,unzip)))
+    (inputs `(("perl" ,perl)))
+    (home-page "http://daringfireball.net/projects/markdown")
+    (synopsis "Text-to-HTML conversion tool")
+    (description
+     "Markdown is a text-to-HTML conversion tool for web writers.  It allows
+you to write using an easy-to-read, easy-to-write plain text format, then
+convert it to structurally valid XHTML (or HTML).")
+    (license license:non-copyleft)))
-- 
2.2.1

Re: [PATCH] gnu: Add markdown.

[Ludovic Courtès]

Hi, Mathieu!

Mathieu Lirzin <mthl@openmailbox.org> skribis:

> From eec846d938b35b7a286660257d4f878723ad9da7 Mon Sep 17 00:00:00 2001
> From: Mathieu Lirzin <mthl@openmailbox.org>
> Date: Thu, 30 Apr 2015 22:26:57 +0200
> Subject: [PATCH] gnu: Add markdown.
>
> * gnu/packages/textutils.scm (markdown): New variable.

LGTM!  Some comments below:

> +         (use-modules (guix build utils))
> +         (let ((source (assoc-ref %build-inputs "source"))
> +               (out    (assoc-ref %outputs "out"))
> +               (unzip  (string-append (assoc-ref %build-inputs "unzip")
> +                                     "/bin/unzip")))
> +           (mkdir-p out)
> +           (with-directory-excursion out
> +             (system* unzip source)
> +             (mkdir "bin")
> +             (mkdir-p "share/doc")
> +             (rename-file  "Markdown_1.0.1/Markdown.pl" "bin/markdown")

I suspect you also need a call like:

  (patch-shebang "bin/markdown"
                 (list (string-append (assoc-ref %build-inputs "perl")
                                      "/bin")))

so that the #! line in bin/markdown refers to the right Perl.

> +    (license license:non-copyleft)))

‘non-copyleft’ is a procedure so it should be:

  (license (license:non-copyleft "http://url-of-the-license-text"))

Could you send an updated patch?

Thanks!

Ludo’.

Re: [PATCH] gnu: Add markdown.

[Mathieu Lirzin]

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

ludo@gnu.org (Ludovic Courtès) writes:

> Hi, Mathieu!

Hi Ludo!

> I suspect you also need a call like:
>
>   (patch-shebang "bin/markdown"
>                  (list (string-append (assoc-ref %build-inputs "perl")
>                                       "/bin")))
>
> so that the #! line in bin/markdown refers to the right Perl.

Done!

> ‘non-copyleft’ is a procedure so it should be:
>
>   (license (license:non-copyleft "http://url-of-the-license-text"))

Done! I have used the file:// URI notation.

Thanks for the review,

--
Mathieu Lirzin


[-- Attachment #2: 0001-gnu-Add-markdown.patch --]
[-- Type: text/x-diff, Size: 3440 bytes --]

From 3d16d81abef2ea9ce6139b36cb8713b84a66453e Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@openmailbox.org>
Date: Thu, 30 Apr 2015 22:26:57 +0200
Subject: [PATCH] gnu: Add markdown.

* gnu/packages/textutils.scm (markdown): New variable.
---
 gnu/packages/textutils.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 08b1b64..325386d 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -23,8 +24,11 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system trivial)
   #:use-module (gnu packages autotools)
-  #:use-module (gnu packages python))
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages zip))
 
 (define-public recode
   (package
@@ -155,3 +159,47 @@ encoding, supporting Unicode version 7.0.")
      "libgtextutils is a text utilities library used by the fastx toolkit from
 the Hannon Lab.")
     (license license:agpl3+)))
+
+(define-public markdown
+  (package
+    (name "markdown")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://daringfireball.net/projects/downloads/"
+             (string-capitalize name) "_" version ".zip"))
+       (sha256
+        (base32 "0dq1pj91pvlwkv0jwcgdfpv6gvnxzrk3s8mnh7imamcclnvfj835"))))
+    (build-system trivial-build-system)
+    (arguments
+     '(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (let ((source (assoc-ref %build-inputs "source"))
+               (out    (assoc-ref %outputs "out"))
+               (perlbd (string-append (assoc-ref %build-inputs "perl") "/bin"))
+               (unzip  (string-append (assoc-ref %build-inputs "unzip")
+                                      "/bin/unzip")))
+           (mkdir-p out)
+           (with-directory-excursion out
+             (system* unzip source)
+             (mkdir "bin")
+             (mkdir-p "share/doc")
+             (rename-file "Markdown_1.0.1/Markdown.pl" "bin/markdown")
+             (rename-file "Markdown_1.0.1/Markdown Readme.text"
+                          "share/doc/README")
+             (patch-shebang "bin/markdown" (list perlbd))
+             (delete-file-recursively "Markdown_1.0.1"))))))
+    (native-inputs `(("unzip" ,unzip)))
+    (inputs `(("perl" ,perl)))
+    (home-page "http://daringfireball.net/projects/markdown")
+    (synopsis "Text-to-HTML conversion tool")
+    (description
+     "Markdown is a text-to-HTML conversion tool for web writers.  It allows
+you to write using an easy-to-read, easy-to-write plain text format, then
+convert it to structurally valid XHTML (or HTML).")
+    (license (license:non-copyleft "file://License.text"
+                                   "See License.text in the distribution."))))
-- 
2.2.1

Re: [PATCH] gnu: Add markdown.

[Ludovic Courtès]

Mathieu Lirzin <mthl@openmailbox.org> skribis:

> From 3d16d81abef2ea9ce6139b36cb8713b84a66453e Mon Sep 17 00:00:00 2001
> From: Mathieu Lirzin <mthl@openmailbox.org>
> Date: Thu, 30 Apr 2015 22:26:57 +0200
> Subject: [PATCH] gnu: Add markdown.
>
> * gnu/packages/textutils.scm (markdown): New variable.

Applied, thanks!

Ludo'.