[PATCH 1/2] distro: Add Indent.

[PATCH 1/2] distro: Add Indent.

[Andreas Enge]

[-- Attachment #1.1: Type: text/plain, Size: 97 bytes --]

Two patches, one adding Indent to the distribution, one adding it as an 
input to flex.

Andreas

[-- Attachment #1.2: Type: text/html, Size: 1017 bytes --]

[-- Attachment #2: 0001-distro-Add-Indent.patch --]
[-- Type: text/x-patch, Size: 2991 bytes --]

From 007af4bba02cb2f294e4b1c13c45534fea1f68fa Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Thu, 17 Jan 2013 21:15:09 +0100
Subject: [PATCH 1/2] distro: Add Indent.

* distro/packages/indent.scm: New file.
* Makefile.am (MODULES): Add it.
---
 Makefile.am                |    1 +
 distro/packages/indent.scm |   44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 distro/packages/indent.scm

diff --git a/Makefile.am b/Makefile.am
index beba7df..745d847 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,6 +77,7 @@ MODULES =					\
   distro/packages/help2man.scm			\
   distro/packages/icu4c.scm			\
   distro/packages/idutils.scm			\
+  distro/packages/indent.scm			\
   distro/packages/ld-wrapper.scm		\
   distro/packages/less.scm			\
   distro/packages/libffi.scm			\
diff --git a/distro/packages/indent.scm b/distro/packages/indent.scm
new file mode 100644
index 0000000..d69a42f
--- /dev/null
+++ b/distro/packages/indent.scm
@@ -0,0 +1,44 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (distro packages indent)
+  #:use-module (distro)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public indent
+  (package
+   (name "indent")
+   (version "2.2.10")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://gnu/indent/indent-" version
+                                ".tar.gz"))
+            (sha256 (base32
+                     "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa"))))
+   (build-system gnu-build-system)
+   (synopsis "GNU Indent, a program for code indentation and formatting")
+   (description
+    "GNU Indent can be used to make code easier to read. It can also convert
+from one style of writing C to another. Indent understands a substantial
+amount about the syntax of C, but it also attempts to cope with incomplete
+and misformed syntax. The GNU style of indenting is the default.")
+   (license gpl3+)
+   (home-page "http://www.gnu.org/software/indent/")))
-- 
1.7.10.4


[-- Attachment #3: 0002-distro-flex-Add-dependency-on-Indent.patch --]
[-- Type: text/x-patch, Size: 1270 bytes --]

From b7c7f1cfdfff2e1612861883ee7d3bcf8c831ac6 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Thu, 17 Jan 2013 21:20:59 +0100
Subject: [PATCH 2/2] distro: flex: Add dependency on Indent.

* distro/packages/flex.scm (flex): Add Indent as input.
---
 distro/packages/flex.scm |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/distro/packages/flex.scm b/distro/packages/flex.scm
index bbfb7f0..2cfdbfe 100644
--- a/distro/packages/flex.scm
+++ b/distro/packages/flex.scm
@@ -23,7 +23,8 @@
   #:use-module (guix build-system gnu)
   #:use-module (distro)
   #:use-module (distro packages m4)
-  #:use-module (distro packages bison))
+  #:use-module (distro packages bison)
+  #:use-module (distro packages indent))
 
 (define-public flex
   (package
@@ -40,7 +41,8 @@
     (arguments
      '(#:patches (list (assoc-ref %build-inputs "patch/bison-tests"))))
     (inputs `(("patch/bison-tests" ,(search-patch "flex-bison-tests.patch"))
-              ("bison" ,bison)))
+              ("bison" ,bison)
+              ("indent" ,indent)))
     (propagated-inputs `(("m4" ,m4)))
     (home-page "http://flex.sourceforge.net/")
     (synopsis "A fast lexical analyser generator")
-- 
1.7.10.4

Re: [PATCH 1/2] distro: Add Indent.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> Two patches, one adding Indent to the distribution, one adding it as an 
> input to flex.

Looks good to me.  So if it builds, please commit!

Ludo’.

Re: [PATCH 1/2] distro: Add Indent.

[Andreas Enge]

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

Am Donnerstag, 17. Januar 2013 schrieb Ludovic Courtès:
> Andreas Enge <andreas@enge.fr> skribis:
> > Two patches, one adding Indent to the distribution, one adding it as
> > an input to flex.
> Looks good to me.  So if it builds, please commit!

Thanks, pushed; I always build the packages before proposing a patch.

Andreas

[-- Attachment #2: Type: text/html, Size: 2145 bytes --]