From 9d9e64508186e5f9efbe45302134cd709b25e47b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 4 Nov 2012 21:44:42 +0100 Subject: distro: Go for one module per package. The alternative, which was to use one module per category, would probably not scale well. First, because many packages could fall into several categories (does GnuTLS go into "networking", "security", or "libraries"?). Second, because that could easily lead to circular dependencies among modules ("security" and "networking" depend on each other, etc.) * distro/packages/databases.scm: Rename to... * distro/packages/recutils.scm: ... this. * distro/packages/typesetting.scm: Rename to... * distro/packages/lout.scm: ... this. * Makefile.am (MODULES): Adjust accordingly. * po/POTFILES.in: Likewise. --- Makefile.am | 4 +- distro/packages/databases.scm | 60 ------------------ distro/packages/lout.scm | 127 +++++++++++++++++++++++++++++++++++++ distro/packages/recutils.scm | 52 ++++++++++++++++ distro/packages/typesetting.scm | 135 ---------------------------------------- po/POTFILES.in | 4 +- 6 files changed, 183 insertions(+), 199 deletions(-) delete mode 100644 distro/packages/databases.scm create mode 100644 distro/packages/lout.scm create mode 100644 distro/packages/recutils.scm delete mode 100644 distro/packages/typesetting.scm diff --git a/Makefile.am b/Makefile.am index 8403081cb7..9b0240a95f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,10 +43,10 @@ MODULES = \ guix.scm \ distro.scm \ distro/packages/base.scm \ - distro/packages/databases.scm \ distro/packages/guile.scm \ distro/packages/ld-wrapper.scm \ - distro/packages/typesetting.scm + distro/packages/lout.scm \ + distro/packages/recutils.scm GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go diff --git a/distro/packages/databases.scm b/distro/packages/databases.scm deleted file mode 100644 index c1dc9260a9..0000000000 --- a/distro/packages/databases.scm +++ /dev/null @@ -1,60 +0,0 @@ -;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- -;;; Copyright (C) 2012 Ludovic Courtès -;;; -;;; This file is part of Guix. -;;; -;;; 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. -;;; -;;; 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 Guix. If not, see . - -(define-module (distro packages databases) - #:use-module (distro) - #:use-module (guix packages) - #:use-module (guix http) - #:use-module (guix utils) - #:use-module (guix build-system gnu)) - -;;; Commentary: -;;; -;;; Database management software and related packages. -;;; -;;; Code: - -(define-public recutils - (package - (name "recutils") - (version "1.5") - (source (origin - (method http-fetch) - (uri (string-append "http://ftp.gnu.org/gnu/recutils/recutils-" - version ".tar.gz")) - (sha256 - (base32 - "1v2xzwwwhc5j5kmvg4sv6baxjpsfqh8ln7ilv4mgb1408rs7xmky")))) - (build-system gnu-build-system) - (inputs `(("curl" ,(nixpkgs-derivation "curl")) - ("emacs" ,(nixpkgs-derivation "emacs")) - ("check" ,(nixpkgs-derivation "check")) - ("bc" ,(nixpkgs-derivation "bc")) - ("patch/gets" - ,(search-patch "diffutils-gets-undeclared.patch")))) - (arguments `(#:patches (list (assoc-ref %build-inputs "patch/gets")))) - (synopsis "GNU recutils, tools and libraries to access human-editable, -text-based databases") - (description - "GNU recutils is a set of tools and libraries to access human-editable, -text-based databases called recfiles. The data is stored as a sequence of -records, each record containing an arbitrary number of named fields.") - (license "GPLv3+") - (home-page "http://www.gnu.org/software/recutils/"))) - -;;; databases.scm ends here diff --git a/distro/packages/lout.scm b/distro/packages/lout.scm new file mode 100644 index 0000000000..3045afa3ab --- /dev/null +++ b/distro/packages/lout.scm @@ -0,0 +1,127 @@ +;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- +;;; Copyright (C) 2012 Ludovic Courtès +;;; +;;; This file is part of Guix. +;;; +;;; 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. +;;; +;;; 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 Guix. If not, see . + +(define-module (distro packages lout) + #:use-module (guix packages) + #:use-module (guix http) + #:use-module (guix utils) + #:use-module (guix build-system gnu)) + +(define-public lout + ;; This one is a bit tricky, because it doesn't follow the GNU Build System + ;; rules. Instead, it has a makefile that has to be patched to set the + ;; prefix, etc., and it has no makefile rules to build its doc. + (let ((configure-phase + '(lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (substitute* "makefile" + (("^PREFIX[[:blank:]]*=.*$") + (string-append "PREFIX = " out "\n")) + (("^LOUTLIBDIR[[:blank:]]*=.*$") + (string-append "LOUTLIBDIR = " out "/lib/lout\n")) + (("^LOUTDOCDIR[[:blank:]]*=.*$") + (string-append "LOUTDOCDIR = " doc "/doc/lout\n")) + (("^MANDIR[[:blank:]]*=.*$") + (string-append "MANDIR = " out "/man\n"))) + (mkdir out) + (mkdir (string-append out "/bin")) + (mkdir (string-append out "/lib")) + (mkdir (string-append out "/man")) + (mkdir-p (string-append doc "/doc/lout"))))) + (install-man-phase + '(lambda* (#:key outputs #:allow-other-keys) + (zero? (system* "make" "installman")))) + (doc-phase + '(lambda* (#:key outputs #:allow-other-keys) + (define out + (assoc-ref outputs "doc")) + + (setenv "PATH" + (string-append (assoc-ref outputs "out") + "/bin:" (getenv "PATH"))) + (chdir "doc") + (every (lambda (doc) + (format #t "doc: building `~a'...~%" doc) + (with-directory-excursion doc + (let ((file (string-append out "/doc/lout/" + doc ".ps"))) + (and (or (file-exists? "outfile.ps") + (zero? (system* "lout" "-r4" "-o" + "outfile.ps" "all"))) + (begin + (copy-file "outfile.ps" file) + #t) + (zero? (system* "ps2pdf" + "-dPDFSETTINGS=/prepress" + "-sPAPERSIZE=a4" + file + (string-append out "/doc/lout/" + doc ".pdf"))))))) + '("design" "expert" "slides" "user"))))) + (package + (name "lout") + (version "3.39") + (source (origin + (method http-fetch) + ;; FIXME: `http-get' doesn't follow redirects, hence the URL. + (uri (string-append + "http://download-mirror.savannah.gnu.org/releases/lout/lout-" + version ".tar.gz")) + (sha256 + (base32 + "12gkyqrn0kaa8xq7sc7v3wm407pz2fxg9ngc75aybhi5z825b9vq")))) + (build-system gnu-build-system) ; actually, just a makefile + (outputs '("out" "doc")) + (inputs `(("ghostscript" ,(nixpkgs-derivation "ghostscript")))) + (arguments `(#:modules ((guix build utils) + (guix build gnu-build-system) + (srfi srfi-1)) ; we need SRFI-1 + #:tests? #f ; no "check" target + + ;; Customize the build phases. + #:phases (alist-replace + 'configure ,configure-phase + + (alist-cons-after + 'install 'install-man-pages + ,install-man-phase + + (alist-cons-after + 'install 'install-doc + ,doc-phase + %standard-phases))))) + (synopsis "Lout, a document layout system similar in style to LaTeX") + (description +"The Lout document formatting system is now reads a high-level description of +a document similar in style to LaTeX and produces a PostScript or plain text +output file. + +Lout offers an unprecedented range of advanced features, including optimal +paragraph and page breaking, automatic hyphenation, PostScript EPS file +inclusion and generation, equation formatting, tables, diagrams, rotation and +scaling, sorted indexes, bibliographic databases, running headers and +odd-even pages, automatic cross referencing, multilingual documents including +hyphenation (most European languages are supported), formatting of computer +programs, and much more, all ready to use. Furthermore, Lout is easily +extended with definitions which are very much easier to write than troff of +TeX macros because Lout is a high-level, purely functional language, the +outcome of an eight-year research project that went back to the +beginning.") + (license "GPLv3+") + (home-page "http://savannah.nongnu.org/projects/lout/")))) diff --git a/distro/packages/recutils.scm b/distro/packages/recutils.scm new file mode 100644 index 0000000000..6221ee07c9 --- /dev/null +++ b/distro/packages/recutils.scm @@ -0,0 +1,52 @@ +;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- +;;; Copyright (C) 2012 Ludovic Courtès +;;; +;;; This file is part of Guix. +;;; +;;; 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. +;;; +;;; 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 Guix. If not, see . + +(define-module (distro packages recutils) + #:use-module (distro) + #:use-module (guix packages) + #:use-module (guix http) + #:use-module (guix utils) + #:use-module (guix build-system gnu)) + +(define-public recutils + (package + (name "recutils") + (version "1.5") + (source (origin + (method http-fetch) + (uri (string-append "http://ftp.gnu.org/gnu/recutils/recutils-" + version ".tar.gz")) + (sha256 + (base32 + "1v2xzwwwhc5j5kmvg4sv6baxjpsfqh8ln7ilv4mgb1408rs7xmky")))) + (build-system gnu-build-system) + (inputs `(("curl" ,(nixpkgs-derivation "curl")) + ("emacs" ,(nixpkgs-derivation "emacs")) + ("check" ,(nixpkgs-derivation "check")) + ("bc" ,(nixpkgs-derivation "bc")) + ("patch/gets" + ,(search-patch "diffutils-gets-undeclared.patch")))) + (arguments `(#:patches (list (assoc-ref %build-inputs "patch/gets")))) + (synopsis "GNU recutils, tools and libraries to access human-editable, +text-based databases") + (description + "GNU recutils is a set of tools and libraries to access human-editable, +text-based databases called recfiles. The data is stored as a sequence of +records, each record containing an arbitrary number of named fields.") + (license "GPLv3+") + (home-page "http://www.gnu.org/software/recutils/"))) diff --git a/distro/packages/typesetting.scm b/distro/packages/typesetting.scm deleted file mode 100644 index 25d8e6119e..0000000000 --- a/distro/packages/typesetting.scm +++ /dev/null @@ -1,135 +0,0 @@ -;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- -;;; Copyright (C) 2012 Ludovic Courtès -;;; -;;; This file is part of Guix. -;;; -;;; 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. -;;; -;;; 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 Guix. If not, see . - -(define-module (distro packages typesetting) - #:use-module (guix packages) - #:use-module (guix http) - #:use-module (guix utils) - #:use-module (guix build-system gnu)) - -;;; Commentary: -;;; -;;; Typesetting-related packages. -;;; -;;; Code: - -(define-public lout - ;; This one is a bit tricky, because it doesn't follow the GNU Build System - ;; rules. Instead, it has a makefile that has to be patched to set the - ;; prefix, etc., and it has no makefile rules to build its doc. - (let ((configure-phase - '(lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (substitute* "makefile" - (("^PREFIX[[:blank:]]*=.*$") - (string-append "PREFIX = " out "\n")) - (("^LOUTLIBDIR[[:blank:]]*=.*$") - (string-append "LOUTLIBDIR = " out "/lib/lout\n")) - (("^LOUTDOCDIR[[:blank:]]*=.*$") - (string-append "LOUTDOCDIR = " doc "/doc/lout\n")) - (("^MANDIR[[:blank:]]*=.*$") - (string-append "MANDIR = " out "/man\n"))) - (mkdir out) - (mkdir (string-append out "/bin")) - (mkdir (string-append out "/lib")) - (mkdir (string-append out "/man")) - (mkdir-p (string-append doc "/doc/lout"))))) - (install-man-phase - '(lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "make" "installman")))) - (doc-phase - '(lambda* (#:key outputs #:allow-other-keys) - (define out - (assoc-ref outputs "doc")) - - (setenv "PATH" - (string-append (assoc-ref outputs "out") - "/bin:" (getenv "PATH"))) - (chdir "doc") - (every (lambda (doc) - (format #t "doc: building `~a'...~%" doc) - (with-directory-excursion doc - (let ((file (string-append out "/doc/lout/" - doc ".ps"))) - (and (or (file-exists? "outfile.ps") - (zero? (system* "lout" "-r4" "-o" - "outfile.ps" "all"))) - (begin - (copy-file "outfile.ps" file) - #t) - (zero? (system* "ps2pdf" - "-dPDFSETTINGS=/prepress" - "-sPAPERSIZE=a4" - file - (string-append out "/doc/lout/" - doc ".pdf"))))))) - '("design" "expert" "slides" "user"))))) - (package - (name "lout") - (version "3.39") - (source (origin - (method http-fetch) - ;; FIXME: `http-get' doesn't follow redirects, hence the URL. - (uri (string-append - "http://download-mirror.savannah.gnu.org/releases/lout/lout-" - version ".tar.gz")) - (sha256 - (base32 - "12gkyqrn0kaa8xq7sc7v3wm407pz2fxg9ngc75aybhi5z825b9vq")))) - (build-system gnu-build-system) ; actually, just a makefile - (outputs '("out" "doc")) - (inputs `(("ghostscript" ,(nixpkgs-derivation "ghostscript")))) - (arguments `(#:modules ((guix build utils) - (guix build gnu-build-system) - (srfi srfi-1)) ; we need SRFI-1 - #:tests? #f ; no "check" target - - ;; Customize the build phases. - #:phases (alist-replace - 'configure ,configure-phase - - (alist-cons-after - 'install 'install-man-pages - ,install-man-phase - - (alist-cons-after - 'install 'install-doc - ,doc-phase - %standard-phases))))) - (synopsis "Lout, a document layout system similar in style to LaTeX") - (description -"The Lout document formatting system is now reads a high-level description of -a document similar in style to LaTeX and produces a PostScript or plain text -output file. - -Lout offers an unprecedented range of advanced features, including optimal -paragraph and page breaking, automatic hyphenation, PostScript EPS file -inclusion and generation, equation formatting, tables, diagrams, rotation and -scaling, sorted indexes, bibliographic databases, running headers and -odd-even pages, automatic cross referencing, multilingual documents including -hyphenation (most European languages are supported), formatting of computer -programs, and much more, all ready to use. Furthermore, Lout is easily -extended with definitions which are very much easier to write than troff of -TeX macros because Lout is a high-level, purely functional language, the -outcome of an eight-year research project that went back to the -beginning.") - (license "GPLv3+") - (home-page "http://savannah.nongnu.org/projects/lout/")))) - -;;; typesetting.scm ends here diff --git a/po/POTFILES.in b/po/POTFILES.in index 887b7106ee..fcc84f32f0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,9 +1,9 @@ # List of source files which contain translatable strings. distro.scm distro/packages/base.scm -distro/packages/databases.scm distro/packages/guile.scm -distro/packages/typesetting.scm +distro/packages/lout.scm +distro/packages/recutils.scm guix/ui.scm guix-build.in guix-download.in -- cgit 1.4.1