From 3ee5a7d86a5497ef444533df8763f41e24f9bf61 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 31 Mar 2013 12:39:25 +0200 Subject: gnu: perl-xml-parser: Fix URL. * gnu/packages/xml.scm (perl-xml-parser): Fix URL. --- gnu/packages/xml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b3c5f7d512..b5c40bef98 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -99,7 +99,7 @@ based on libxml for XML parsing, tree manipulation and XPath support.") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-" + "mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From adb5f46940aec2a58446c647487998beaa31f412 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Apr 2013 10:59:27 +0200 Subject: gnu: Add libphidget. * gnu/packages/libphidget.scm: New file. * Makefile.am (MODULES): Add it. --- Makefile.am | 1 + gnu/packages/libphidget.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 gnu/packages/libphidget.scm (limited to 'gnu') diff --git a/Makefile.am b/Makefile.am index 41ef50318c..74977c5cf7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -113,6 +113,7 @@ MODULES = \ gnu/packages/libffi.scm \ gnu/packages/libidn.scm \ gnu/packages/libjpeg.scm \ + gnu/packages/libphidget.scm \ gnu/packages/libpng.scm \ gnu/packages/libsigsegv.scm \ gnu/packages/libtiff.scm \ diff --git a/gnu/packages/libphidget.scm b/gnu/packages/libphidget.scm new file mode 100644 index 0000000000..0f4ae5f965 --- /dev/null +++ b/gnu/packages/libphidget.scm @@ -0,0 +1,42 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Ludovic Courtès +;;; +;;; 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 . + +(define-module (gnu packages libphidget) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (guix licenses) + #:use-module (gnu packages libusb)) + +(define-public libphidget + (package + (name "libphidget") + (version "2.1.8.20130320") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.phidgets.com/downloads/libraries/libphidget_" + version ".tar.gz")) + (sha256 + (base32 "09ibrz1df5ajqcm9vmx6zw8qama2rzf0961yhmmfsy629qfhyrk0")))) + (build-system gnu-build-system) + (inputs `(("libusb" ,libusb))) + (home-page "http://www.phidgets.com/") + (license lgpl3+) + (synopsis "C library to manipulate Phidgets") + (description synopsis))) -- cgit v1.2.3 From cf53ecf514301d3ffdfc33dea057b057ffb132d6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Apr 2013 14:44:40 +0200 Subject: gnu: bigloo: Add dependencies on Avahi and libphidget. * gnu/packages/scheme.scm (bigloo): Add Avahi and libphidget as inputs, and pkg-config as a native input. --- gnu/packages/scheme.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 59e1da22ac..4b42f8c53c 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -28,6 +28,9 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages patchelf) #:use-module (gnu packages which) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages avahi) + #:use-module (gnu packages libphidget) #:use-module (ice-9 match)) (define-public mit-scheme @@ -161,7 +164,13 @@ development cycle.") %standard-phases))))) (inputs `(("emacs" ,emacs) - ("patch/shebangs" ,(search-patch "bigloo-gc-shebangs.patch")))) + ("patch/shebangs" ,(search-patch "bigloo-gc-shebangs.patch")) + + ;; Optional APIs for which Bigloo has bindings. + ("avahi" ,avahi) + ("libphidget" ,libphidget))) + (native-inputs + `(("pkg-config" ,pkg-config))) (propagated-inputs `(("gmp" ,gmp))) ; bigloo.h refers to gmp.h (home-page "http://www-sop.inria.fr/indes/fp/Bigloo/") -- cgit v1.2.3 From 4f7d8d7ee4c3a2f92cd12d7e1e2a03725f406012 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Sat, 6 Apr 2013 00:28:39 +0200 Subject: gnu: Python: fix the compilation of some modules from the standard library. This commit enables the bz2, dbm, readline, ssl and zlib modules. * gnu/packages/gdbm.scm: Enable the compatibility mode. * gnu/packages/python.scm: Enable a few modules from the standard library. * gnu/packages/patches/python-fix-dbm.patch: New file. * Makefile.am: Add it. --- Makefile.am | 1 + gnu/packages/gdbm.scm | 1 + gnu/packages/patches/python-fix-dbm.patch | 20 +++++++++++++++++++ gnu/packages/python.scm | 33 ++++++++++++++++++++++++++++--- 4 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/python-fix-dbm.patch (limited to 'gnu') diff --git a/Makefile.am b/Makefile.am index 136c01bf3f..91de488380 100644 --- a/Makefile.am +++ b/Makefile.am @@ -229,6 +229,7 @@ dist_patch_DATA = \ gnu/packages/patches/make-impure-dirs.patch \ gnu/packages/patches/mcron-install.patch \ gnu/packages/patches/perl-no-sys-dirs.patch \ + gnu/packages/patches/python-fix-dbm.patch \ gnu/packages/patches/procps-make-3.82.patch \ gnu/packages/patches/qemu-multiple-smb-shares.patch \ gnu/packages/patches/readline-link-ncurses.patch \ diff --git a/gnu/packages/gdbm.scm b/gnu/packages/gdbm.scm index 588b732b02..76733dba65 100644 --- a/gnu/packages/gdbm.scm +++ b/gnu/packages/gdbm.scm @@ -34,6 +34,7 @@ (sha256 (base32 "0h9lfzdjc2yl849y0byg51h6xfjg0y7vg9jnsw3gpfwlbd617y13")))) + (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/gdbm/") (synopsis "GNU dbm key/value database library") diff --git a/gnu/packages/patches/python-fix-dbm.patch b/gnu/packages/patches/python-fix-dbm.patch new file mode 100644 index 0000000000..29e4521f3f --- /dev/null +++ b/gnu/packages/patches/python-fix-dbm.patch @@ -0,0 +1,20 @@ +This patch allows the dbm module to be built using the compatibility mode of +gdbm. It will not be needed any more with Python 2.7.4. +--- setup.py 2013-04-06 00:53:37.000000000 +0200 ++++ setup.py.new 2013-04-06 19:55:05.000000000 +0200 +@@ -1158,10 +1158,14 @@ + for cand in dbm_order: + if cand == "ndbm": + if find_file("ndbm.h", inc_dirs, []) is not None: +- # Some systems have -lndbm, others don't ++ # Some systems have -lndbm, some have -lgdbm_compat, ++ # others have no particular linker flags. + if self.compiler.find_library_file(lib_dirs, + 'ndbm'): + ndbm_libs = ['ndbm'] ++ elif self.compiler.find_library_file(lib_dirs, ++ 'gdbm_compat'): ++ ndbm_libs = ['gdbm_compat'] + else: + ndbm_libs = [] + print "building dbm using ndbm" diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 52b11e4197..3f941642fc 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -19,7 +19,10 @@ (define-module (gnu packages python) #:use-module ((guix licenses) #:select (psfl)) + #:use-module (gnu packages) #:use-module (gnu packages compression) + #:use-module (gnu packages gdbm) + #:use-module (gnu packages readline) #:use-module (gnu packages openssl) #:use-module (guix packages) #:use-module (guix download) @@ -38,11 +41,35 @@ (base32 "11f9aw855lrmknr6c82gm1ijr3n0smc6idyp94y7774yivjnplv1")))) (build-system gnu-build-system) - (arguments `(#:tests? #f)) ; XXX: some tests fail + (arguments + `(#:tests? #f ; XXX: some tests fail + #:patches (list (assoc-ref %build-inputs "patch-dbm")) + #:patch-flags '("-p0") + #:configure-flags + (let ((bz2 (assoc-ref %build-inputs "bzip2")) + (gdbm (assoc-ref %build-inputs "gdbm")) + (openssl (assoc-ref %build-inputs "openssl")) + (readline (assoc-ref %build-inputs "readline")) + (zlib (assoc-ref %build-inputs "zlib"))) + (list (string-append "CPPFLAGS=" + "-I" bz2 "/include " + "-I" gdbm "/include " + "-I" openssl "/include " + "-I" readline "/include " + "-I" zlib "/include") + (string-append "LDFLAGS=" + "-L" bz2 "/lib " + "-L" gdbm "/lib " + "-L" openssl "/lib " + "-L" readline "/lib " + "-L" zlib "/lib"))))) (inputs - `(("zlib" ,zlib) + `(("bzip2" ,bzip2) + ("gdbm" ,gdbm) ("openssl" ,openssl) - ("bzip2" ,bzip2))) + ("readline" ,readline) + ("zlib" ,zlib) + ("patch-dbm" ,(search-patch "python-fix-dbm.patch")))) (home-page "http://python.org") (synopsis "Python, a high-level dynamically-typed programming language") -- cgit v1.2.3 From cbca6eb55298a7205ca3533957ff2e3857140f40 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Fri, 5 Apr 2013 23:08:44 +0000 Subject: gnu: shishi: Update to 1.0.2. * gnu/packages/shishi.scm (shishi): Update to 1.0.2. * gnu/packages/patches/shishi-gets-undeclared.patch: Remove it. * Makefile.am (dist_patch_DATA): Adjust accordingly. --- Makefile.am | 1 - gnu/packages/patches/shishi-gets-undeclared.patch | 71 ----------------------- gnu/packages/shishi.scm | 46 +++++---------- 3 files changed, 16 insertions(+), 102 deletions(-) delete mode 100644 gnu/packages/patches/shishi-gets-undeclared.patch (limited to 'gnu') diff --git a/Makefile.am b/Makefile.am index 91de488380..a8bd2f8daf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -233,7 +233,6 @@ dist_patch_DATA = \ gnu/packages/patches/procps-make-3.82.patch \ gnu/packages/patches/qemu-multiple-smb-shares.patch \ gnu/packages/patches/readline-link-ncurses.patch \ - gnu/packages/patches/shishi-gets-undeclared.patch \ gnu/packages/patches/tar-gets-undeclared.patch \ gnu/packages/patches/tcsh-fix-autotest.patch \ gnu/packages/patches/teckit-cstdio.patch \ diff --git a/gnu/packages/patches/shishi-gets-undeclared.patch b/gnu/packages/patches/shishi-gets-undeclared.patch deleted file mode 100644 index a3d6d0cca2..0000000000 --- a/gnu/packages/patches/shishi-gets-undeclared.patch +++ /dev/null @@ -1,71 +0,0 @@ -This patch is needed to allow builds with newer versions of -the GNU libc (2.16+). - - -commit 66712c23388e93e5c518ebc8515140fa0c807348 -Author: Eric Blake -Date: Thu Mar 29 13:30:41 2012 -0600 - - stdio: don't assume gets any more - - Gnulib intentionally does not have a gets module, and now that C11 - and glibc have dropped it, we should be more proactive about warning - any user on a platform that still has a declaration of this dangerous - interface. - - * m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets - support. - * modules/stdio (Makefile.am): Likewise. - * lib/stdio-read.c (gets): Likewise. - * tests/test-stdio-c++.cc: Likewise. - * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment. - * lib/stdio.in.h (gets): Make warning occur in more places. - * doc/posix-functions/gets.texi (gets): Update documentation. - Reported by Christer Solskogen. - - Signed-off-by: Eric Blake - -diff --git a/gl/stdio.in.h b/gl/stdio.in.h -index aa7b599..c377b6e 100644 ---- a/gl/stdio.in.h -+++ b/gl/stdio.in.h -@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - -@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " - # endif - #endif - --/* Some people would argue that sprintf should be handled like gets -- (for example, OpenBSD issues a link warning for both functions), -- since both can cause security holes due to buffer overruns. -+/* Some people would argue that all sprintf uses should be warned about -+ (for example, OpenBSD issues a link warning for it), -+ since it can cause security holes due to buffer overruns. - However, we believe that sprintf can be used safely, and is more - efficient than snprintf in those safe cases; and as proof of our - belief, we use sprintf in several gnulib modules. So this header diff --git a/gnu/packages/shishi.scm b/gnu/packages/shishi.scm index 1590221496..767037a580 100644 --- a/gnu/packages/shishi.scm +++ b/gnu/packages/shishi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Nikita Karetnikov +;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2012 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. @@ -18,12 +18,11 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages shishi) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (gnu packages) #:use-module (gnu packages gnutls) #:use-module (gnu packages gnupg) - #:use-module ((gnu packages compression) - #:renamer (symbol-prefix-proc 'guix:)) + #:use-module (gnu packages compression) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -31,41 +30,28 @@ (define-public shishi (package (name "shishi") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) - (uri (string-append - "mirror://gnu/shishi/shishi-" - version - ".tar.gz")) + (uri (string-append "mirror://gnu/shishi/shishi-" + version ".tar.gz")) (sha256 (base32 - "13c6w9rpaqb3am65nrn86byvmll5r78pld2vb0i68491vww4fzlx")))) + "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d")))) (build-system gnu-build-system) - (arguments - `(#:make-flags - '("CPPFLAGS=-DMAX_ERROR_DESCRIPTION_SIZE=ASN1_MAX_ERROR_DESCRIPTION_SIZE") - #:patches (list (assoc-ref %build-inputs - "patch/gets")))) (inputs `(("gnutls" ,gnutls) - ("zlib" ,guix:zlib) + ("zlib" ,zlib) ("libgcrypt" ,libgcrypt) - ("libtasn1" ,libtasn1) - ("patch/gets" ,(search-patch "shishi-gets-undeclared.patch")))) + ("libtasn1" ,libtasn1))) (home-page "http://www.gnu.org/software/shishi/") (synopsis - "GNU Shishi, free implementation of the Kerberos 5 network security system") + "GNU Shishi, an implementation of the Kerberos 5 network security system") (description - " GNU Shishi is an implementation of the Kerberos 5 network - authentication system, as specified in RFC 4120. Shishi can be - used to authenticate users in distributed systems. - - Shishi contains a library (`libshishi') that can be used by - application developers to add support for Kerberos 5. Shishi - contains a command line utility (1shishi') that is used by - users to acquire and manage tickets (and more). The server - side, a Key Distribution Center, is implemented by `shishid'. -") - (license gpl3+))) ; some files are under GPLv2+ + "Shishi contains a library ('libshishi') that can be used by application +developers to add support for Kerberos 5. Shishi contains a command line +utility ('shishi') that is used by users to acquire and manage tickets (and +more). The server side, a Key Distribution Center (KDC), is implemented by +'shishid', and support X.509 authenticated TLS via GnuTLS.") + (license gpl3+))) -- cgit v1.2.3 From 04fd96cac33fa7557e574e54575252564ba27111 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 14 Apr 2013 16:56:08 +0200 Subject: utils: Add `fold2'. * gnu/packages.scm (fold2): Remove. * guix/utils.scm (fold2): New procedure. Generalization of the above to one and two lists. * tests/utils.scm ("fold2, 1 list", "fold2, 2 lists"): New tests. --- gnu/packages.scm | 8 -------- guix/utils.scm | 29 ++++++++++++++++++++++++++++- tests/utils.scm | 25 +++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages.scm b/gnu/packages.scm index b639541788..f4d93a789d 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -110,14 +110,6 @@ (false-if-exception (resolve-interface name)))) (package-files))) -(define (fold2 f seed1 seed2 lst) - (if (null? lst) - (values seed1 seed2) - (call-with-values - (lambda () (f (car lst) seed1 seed2)) - (lambda (seed1 seed2) - (fold2 f seed1 seed2 (cdr lst)))))) - (define (fold-packages proc init) "Call (PROC PACKAGE RESULT) for each available package, using INIT as the initial value of RESULT. It is guaranteed to never traverse the diff --git a/guix/utils.scm b/guix/utils.scm index d7c37e37d1..f13e585e2b 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -59,7 +59,8 @@ %current-system version-compare version>? - package-name->name+version)) + package-name->name+version + fold2)) ;;; @@ -463,6 +464,32 @@ introduce the version part." ((head tail ...) (loop tail (cons head prefix)))))) +(define fold2 + (case-lambda + ((proc seed1 seed2 lst) + "Like `fold', but with a single list and two seeds." + (let loop ((result1 seed1) + (result2 seed2) + (lst lst)) + (if (null? lst) + (values result1 result2) + (call-with-values + (lambda () (proc (car lst) result1 result2)) + (lambda (result1 result2) + (loop result1 result2 (cdr lst))))))) + ((proc seed1 seed2 lst1 lst2) + "Like `fold', but with a two lists and two seeds." + (let loop ((result1 seed1) + (result2 seed2) + (lst1 lst1) + (lst2 lst2)) + (if (or (null? lst1) (null? lst2)) + (values result1 result2) + (call-with-values + (lambda () (proc (car lst1) (car lst2) result1 result2)) + (lambda (result1 result2) + (fold2 proc result1 result2 (cdr lst1) (cdr lst2))))))))) + ;;; ;;; Source location. diff --git a/tests/utils.scm b/tests/utils.scm index bcdd120a74..fa7d7b03fd 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -64,6 +64,31 @@ ("nixpkgs" "1.0pre22125_a28fe19") ("gtk2" "2.38.0")))) +(test-equal "fold2, 1 list" + (list (reverse (iota 5)) + (map - (reverse (iota 5)))) + (call-with-values + (lambda () + (fold2 (lambda (i r1 r2) + (values (cons i r1) + (cons (- i) r2))) + '() '() + (iota 5))) + list)) + +(test-equal "fold2, 2 lists" + (list (reverse '((a . 0) (b . 1) (c . 2) (d . 3))) + (reverse '((a . 0) (b . -1) (c . -2) (d . -3)))) + (call-with-values + (lambda () + (fold2 (lambda (k v r1 r2) + (values (alist-cons k v r1) + (alist-cons k (- v) r2))) + '() '() + '(a b c d) + '(0 1 2 3))) + list)) + (test-assert "define-record-type*" (begin (define-record-type* foo make-foo -- cgit v1.2.3 From 63b7c6c1f82486604abd6e3b6a6e14643d1f6621 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 14 Apr 2013 17:17:19 +0200 Subject: gnu: automake: Restore shebangs on files that end up in user tarballs. * gnu/packages/autotools.scm (automake): Add `unpatch-shebangs' phase. --- gnu/packages/autotools.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index bc4dddc01f..51aadbf0ec 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -151,6 +151,11 @@ exec ~a --no-auto-compile \"$0\" \"$@\" ,(search-patch "automake-skip-amhello-tests.patch")))) (arguments '(#:patches (list (assoc-ref %build-inputs "patch/skip-amhello")) + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1) + (srfi srfi-26) + (rnrs io ports)) #:phases (alist-cons-before 'patch-source-shebangs 'patch-tests-shebangs (lambda _ @@ -163,7 +168,35 @@ exec ~a --no-auto-compile \"$0\" \"$@\" ;; that occur during the test suite. (setenv "SHELL" sh) (setenv "CONFIG_SHELL" sh))) - %standard-phases))) + + ;; Files like `install-sh', `mdate.sh', etc. must use + ;; #!/bin/sh, otherwise users could leak erroneous shebangs + ;; in the wild. See for an + ;; example. + (alist-cons-after + 'install 'unpatch-shebangs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/share"))) + (define (starts-with-shebang? file) + (equal? (call-with-input-file file + (lambda (p) + (list (get-u8 p) (get-u8 p)))) + (map char->integer '(#\# #\!)))) + + (for-each (lambda (file) + (when (and (starts-with-shebang? file) + (executable-file? file)) + (format #t "restoring shebang on `~a'~%" + file) + (substitute* file + (("^#!.*/bin/sh") + "#!/bin/sh") + (("^#!.*/bin/env(.*)$" _ args) + (string-append "#!/usr/bin/env" + args))))) + (find-files dir ".*")))) + %standard-phases)))) (home-page "http://www.gnu.org/software/automake/") (synopsis "GNU Automake, a GNU standard-compliant makefile generator") -- cgit v1.2.3 From 0160536dcb5399ad7d80b10e064df5c95f3adb4f Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Mon, 15 Apr 2013 22:02:47 +0200 Subject: gnu: Python: bump to version 2.7.4. * gnu/packages/python.scm: bump to version 2.7.4, remove references to python-fix-dbm.patch. * Makefile.am: remove references to python-fix-dbm.patch * gnu/packages/patches/python-fix-dbm.patch: remove it. --- Makefile.am | 1 - gnu/packages/patches/python-fix-dbm.patch | 20 -------------------- gnu/packages/python.scm | 9 +++------ 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 gnu/packages/patches/python-fix-dbm.patch (limited to 'gnu') diff --git a/Makefile.am b/Makefile.am index 930ea6ce72..df0a5138dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -229,7 +229,6 @@ dist_patch_DATA = \ gnu/packages/patches/make-impure-dirs.patch \ gnu/packages/patches/mcron-install.patch \ gnu/packages/patches/perl-no-sys-dirs.patch \ - gnu/packages/patches/python-fix-dbm.patch \ gnu/packages/patches/procps-make-3.82.patch \ gnu/packages/patches/qemu-multiple-smb-shares.patch \ gnu/packages/patches/readline-link-ncurses.patch \ diff --git a/gnu/packages/patches/python-fix-dbm.patch b/gnu/packages/patches/python-fix-dbm.patch deleted file mode 100644 index 29e4521f3f..0000000000 --- a/gnu/packages/patches/python-fix-dbm.patch +++ /dev/null @@ -1,20 +0,0 @@ -This patch allows the dbm module to be built using the compatibility mode of -gdbm. It will not be needed any more with Python 2.7.4. ---- setup.py 2013-04-06 00:53:37.000000000 +0200 -+++ setup.py.new 2013-04-06 19:55:05.000000000 +0200 -@@ -1158,10 +1158,14 @@ - for cand in dbm_order: - if cand == "ndbm": - if find_file("ndbm.h", inc_dirs, []) is not None: -- # Some systems have -lndbm, others don't -+ # Some systems have -lndbm, some have -lgdbm_compat, -+ # others have no particular linker flags. - if self.compiler.find_library_file(lib_dirs, - 'ndbm'): - ndbm_libs = ['ndbm'] -+ elif self.compiler.find_library_file(lib_dirs, -+ 'gdbm_compat'): -+ ndbm_libs = ['gdbm_compat'] - else: - ndbm_libs = [] - print "building dbm using ndbm" diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3f941642fc..8b4515930e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -31,7 +31,7 @@ (define-public python (package (name "python") - (version "2.7.3") + (version "2.7.4") (source (origin (method url-fetch) @@ -39,12 +39,10 @@ version "/Python-" version ".tar.xz")) (sha256 (base32 - "11f9aw855lrmknr6c82gm1ijr3n0smc6idyp94y7774yivjnplv1")))) + "0bdn4dylm92n2dsvqvjfyask9jbz88aan5hi4lgkawkxs2v6wqmn")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; XXX: some tests fail - #:patches (list (assoc-ref %build-inputs "patch-dbm")) - #:patch-flags '("-p0") #:configure-flags (let ((bz2 (assoc-ref %build-inputs "bzip2")) (gdbm (assoc-ref %build-inputs "gdbm")) @@ -68,8 +66,7 @@ ("gdbm" ,gdbm) ("openssl" ,openssl) ("readline" ,readline) - ("zlib" ,zlib) - ("patch-dbm" ,(search-patch "python-fix-dbm.patch")))) + ("zlib" ,zlib))) (home-page "http://python.org") (synopsis "Python, a high-level dynamically-typed programming language") -- cgit v1.2.3 From f50d2669e3e624365221cc81918ba55fdce94107 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Apr 2013 18:04:25 +0200 Subject: gnu: Use synopses from the Womb. * gnu/packages/algebra.scm, gnu/packages/aspell.scm, gnu/packages/autotools.scm, gnu/packages/base.scm, gnu/packages/bash.scm, gnu/packages/bison.scm, gnu/packages/cdrom.scm, gnu/packages/cflow.scm, gnu/packages/compression.scm, gnu/packages/cpio.scm, gnu/packages/cppi.scm, gnu/packages/ddrescue.scm, gnu/packages/dejagnu.scm, gnu/packages/ed.scm, gnu/packages/emacs.scm, gnu/packages/fdisk.scm, gnu/packages/gawk.scm, gnu/packages/gcc.scm, packages/gcc.scm, b/gnu/packages/gcc.scm, 4b982 100644 s/gcc.scm, s/gcc.scm, @@ %standard-phases))))) `((gcc-libc . ,(assoc-ref inputs "libc")))) The GNU Compiler Collection") GNU Compiler Collection") n ompiler Collection includes compiler front ends for C, C++, tran, OpenMP for C/C++/Fortran, Java, and Ada, as well as gnu/packages/gdb.scm, gnu/packages/gettext.scm, gnu/packages/ghostscript.scm, gnu/packages/glib.scm, gnu/packages/global.scm, gnu/packages/gnupg.scm, gnu/packages/gnutls.scm, gnu/packages/gperf.scm, gnu/packages/gprolog.scm, gnu/packages/groff.scm, gnu/packages/grub.scm, gnu/packages/gsasl.scm, gnu/packages/guile.scm, gnu/packages/help2man.scm, gnu/packages/idutils.scm, gnu/packages/indent.scm, gnu/packages/less.scm, gnu/packages/libidn.scm, gnu/packages/libsigsegv.scm, gnu/packages/libunistring.scm, gnu/packages/linux.scm, gnu/packages/lsh.scm, gnu/packages/m4.scm, gnu/packages/mailutils.scm, gnu/packages/multiprecision.scm, gnu/packages/nano.scm, gnu/packages/ncurses.scm, gnu/packages/nettle.scm, gnu/packages/oggvorbis.scm, gnu/packages/parted.scm, gnu/packages/pth.scm, gnu/packages/readline.scm, gnu/packages/recutils.scm, gnu/packages/scheme.scm, gnu/packages/screen.scm, gnu/packages/shishi.scm, gnu/packages/smalltalk.scm, gnu/packages/system.scm, gnu/packages/texinfo.scm, gnu/packages/time.scm, gnu/packages/wdiff.scm, gnu/packages/wget.scm, gnu/packages/which.scm: Use synopses from the Womb. --- gnu/packages/algebra.scm | 4 ++-- gnu/packages/aspell.scm | 3 +-- gnu/packages/autotools.scm | 8 +++----- gnu/packages/base.scm | 25 ++++++++++--------------- gnu/packages/bash.scm | 2 +- gnu/packages/bison.scm | 3 +-- gnu/packages/cdrom.scm | 4 ++-- gnu/packages/cflow.scm | 2 +- gnu/packages/compression.scm | 2 +- gnu/packages/cpio.scm | 5 ++--- gnu/packages/cppi.scm | 2 +- gnu/packages/ddrescue.scm | 2 +- gnu/packages/dejagnu.scm | 2 +- gnu/packages/ed.scm | 3 +-- gnu/packages/emacs.scm | 3 +-- gnu/packages/fdisk.scm | 5 ++--- gnu/packages/gawk.scm | 2 +- gnu/packages/gcc.scm | 2 +- gnu/packages/gdb.scm | 2 +- gnu/packages/gettext.scm | 3 +-- gnu/packages/ghostscript.scm | 2 +- gnu/packages/glib.scm | 2 +- gnu/packages/global.scm | 2 +- gnu/packages/gnupg.scm | 6 ++---- gnu/packages/gnutls.scm | 4 ++-- gnu/packages/gperf.scm | 3 +-- gnu/packages/gprolog.scm | 6 ++---- gnu/packages/groff.scm | 2 +- gnu/packages/grub.scm | 3 +-- gnu/packages/gsasl.scm | 4 ++-- gnu/packages/guile.scm | 10 ++++------ gnu/packages/help2man.scm | 2 +- gnu/packages/idutils.scm | 2 +- gnu/packages/indent.scm | 2 +- gnu/packages/less.scm | 6 ++---- gnu/packages/libidn.scm | 2 +- gnu/packages/libsigsegv.scm | 2 +- gnu/packages/libunistring.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/lsh.scm | 3 +-- gnu/packages/m4.scm | 2 +- gnu/packages/mailutils.scm | 2 +- gnu/packages/multiprecision.scm | 8 +++----- gnu/packages/nano.scm | 5 ++--- gnu/packages/ncurses.scm | 3 +-- gnu/packages/nettle.scm | 2 +- gnu/packages/oggvorbis.scm | 3 +-- gnu/packages/parted.scm | 5 ++--- gnu/packages/pth.scm | 2 +- gnu/packages/readline.scm | 2 +- gnu/packages/recutils.scm | 3 +-- gnu/packages/scheme.scm | 2 +- gnu/packages/screen.scm | 2 +- gnu/packages/shishi.scm | 3 +-- gnu/packages/smalltalk.scm | 3 +-- gnu/packages/system.scm | 6 ++---- gnu/packages/texinfo.scm | 2 +- gnu/packages/time.scm | 4 +--- gnu/packages/wdiff.scm | 5 ++--- gnu/packages/wget.scm | 3 +-- gnu/packages/which.scm | 3 +-- gnu/packages/zile.scm | 2 +- 62 files changed, 91 insertions(+), 132 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 8d51c16814..87f7d0e9d7 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -92,7 +92,7 @@ solve the shortest vector problem.") "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5")))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/gsl/") - (synopsis "The GNU Scientific Library, a large numerical library") + (synopsis "Numerical library for C and C++") (description "The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers. It is free software under the GNU General @@ -177,7 +177,7 @@ PARI is also available as a C library to allow for faster computations.") (string-append "--prefix=" out))))) %standard-phases))) (home-page "http://www.gnu.org/software/bc/") - (synopsis "GNU software calculator") + (synopsis "Arbitrary precision numeric processing language") (description "bc is an arbitrary precision numeric processing language. Syntax is similar to C, but differs in many substantial areas. It supports diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index ca0218d814..0b8d761266 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -38,8 +38,7 @@ (build-system gnu-build-system) (inputs `(("perl" ,perl))) (home-page "http://aspell.net/") - (synopsis - "GNU Aspell, A spell checker for many languages") + (synopsis "Spell checker") (description "GNU Aspell is a free spell checker designed to eventually replace Ispell. It can either be used as a library or as an independent spell diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 51aadbf0ec..4af6d2a6cf 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -50,8 +50,7 @@ (arguments `(#:tests? #f)) (home-page "http://www.gnu.org/software/autoconf/") - (synopsis - "GNU Autoconf, a part of the GNU Build System") + (synopsis "Create source code configuration scripts") (description "GNU Autoconf is an extensible package of M4 macros that produce shell scripts to automatically configure software source code @@ -198,8 +197,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\" (find-files dir ".*")))) %standard-phases)))) (home-page "http://www.gnu.org/software/automake/") - (synopsis - "GNU Automake, a GNU standard-compliant makefile generator") + (synopsis "Making GNU standards-compliant Makefiles") (description "GNU Automake is a tool for automatically generating `Makefile.in' files compliant with the GNU Coding @@ -253,7 +251,7 @@ Standards. Automake requires the use of Autoconf.") %standard-phases))) (inputs `(("patch/skip-tests" ,(search-patch "libtool-skip-tests.patch")))) - (synopsis "GNU Libtool, a generic library support script") + (synopsis "Generic shared library support tools") (description "GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries behind a consistent, portable interface. diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 92b94dc035..1eaa4fb860 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -61,7 +61,7 @@ ,(string-append "--with-gawk=" ; for illustration purposes (assoc-ref %build-inputs "gawk"))))) (inputs `(("gawk" ,gawk))) - (synopsis "GNU Hello") + (synopsis "Hello, GNU world: An example GNU package") (description "Yeah...") (home-page "http://www.gnu.org/software/hello/") (license gpl3+))) @@ -78,7 +78,7 @@ (base32 "1qbjb1l7f9blckc5pqy8jlf6482hpx4awn2acmhyf5mv9wfq03p7")))) (build-system gnu-build-system) - (synopsis "GNU implementation of the Unix grep command") + (synopsis "Print lines matching a pattern") (description "The grep command searches one or more input files for lines containing a match to a specified pattern. By default, grep prints the matching @@ -98,7 +98,7 @@ lines.") (base32 "13wlsb4sf5d5a82xjhxqmdvrrn36rmw5f0pl9qyb9zkvldnb7hra")))) (build-system gnu-build-system) - (synopsis "GNU sed, a batch stream editor") + (synopsis "Stream editor") (arguments `(#:phases (alist-cons-before 'patch-source-shebangs 'patch-test-suite @@ -134,7 +134,7 @@ substituting multiple occurrences of a string within a file.") (inputs `(("patch/gets" ,(search-patch "tar-gets-undeclared.patch")))) (arguments `(#:patches (list (assoc-ref %build-inputs "patch/gets")))) - (synopsis "GNU implementation of the `tar' archiver") + (synopsis "Managing tar archives") (description "The Tar program provides the ability to create tar archives, as well as various other kinds of manipulation. For example, you can use Tar on @@ -167,7 +167,7 @@ files (as archives).") ;; TODO: When cross-compiling, add this: ;; '(#:configure-flags '("ac_cv_func_strnlen_working=yes")) ) - (synopsis "GNU Patch, a program to apply differences to files") + (synopsis "Apply differences to originals, with optional backups") (description "GNU Patch takes a patch file containing a difference listing produced by the diff program and applies those differences to one or more original files, @@ -190,7 +190,7 @@ producing patched versions.") (inputs `(("patch/gets" ,(search-patch "diffutils-gets-undeclared.patch")))) (arguments `(#:patches (list (assoc-ref %build-inputs "patch/gets")))) - (synopsis "Programs to find differences among text files") + (synopsis "Comparing and merging files") (description "GNU Diffutils is a package of several programs related to finding differences between files. @@ -243,8 +243,7 @@ You can use the sdiff command to merge two files interactively.") ;; `(#:configure-flags '("gl_cv_func_wcwidth_works=yes") ;; ,@(arguments cross-system)) ) - (synopsis "Basic directory searching utilities of the GNU operating -system") + (synopsis "Operating on files matching given criteria") (description "The GNU Find Utilities are the basic directory searching utilities of the GNU operating system. These programs are typically used in conjunction @@ -291,9 +290,7 @@ The tools supplied with this package are: (("#!/bin/sh") (format #f "#!~a/bin/bash" bash))))) %standard-phases))) - (synopsis - "The basic file, shell and text manipulation utilities of the GNU -operating system") + (synopsis "Core GNU utilities (file, text, shell)") (description "The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which @@ -327,8 +324,7 @@ are expected to exist on every operating system.") (format #f "default_shell[] = \"~a/bin/bash\";\n" bash))))) %standard-phases))) - (synopsis "GNU Make, a program controlling the generation of non-source -files from sources") + (synopsis "Remake files automatically") (description "Make is a tool which controls the generation of executables and other non-source files of a program from the program's source files. @@ -370,8 +366,7 @@ that it is possible to use Make to build and install the program.") ;; Don't search under /usr/lib & co. "--with-lib-path=/no-ld-lib-path"))) - (synopsis "GNU Binutils, tools for manipulating binaries (linker, -assembler, etc.)") + (synopsis "Binary utilities: bfd gas gprof ld") (description "The GNU Binutils are a collection of binary tools. The main ones are `ld' (the GNU linker) and `as' (the GNU assembler). They also include the diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index d74315ad18..7caa26f36c 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -76,7 +76,7 @@ #:phases (alist-cons-after 'install 'post-install ,post-install-phase %standard-phases))) - (synopsis "GNU Bourne-Again Shell") + (synopsis "The GNU Bourne-Again SHell") (description "Bash is the shell, or command language interpreter, that will appear in the GNU operating system. Bash is an sh-compatible shell that incorporates diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 95ffb17522..11483b1434 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -40,8 +40,7 @@ (inputs `(("perl" ,perl))) (propagated-inputs `(("m4" ,m4))) (home-page "http://www.gnu.org/software/bison/") - (synopsis - "GNU Bison, a Yacc-compatible parser generator") + (synopsis "Parser generator") (description "Bison is a general-purpose parser generator that converts an annotated context-free grammar into an LALR(1) or GLR parser for diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 225ed2fa9c..ccab52fc56 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -78,7 +78,7 @@ caching facility provided by the library.") ("pkg-config" ,pkg-config) ("libcddb" ,libcddb))) (home-page "http://www.gnu.org/software/libcdio/") - (synopsis "A library for OS-independent CD-ROM and CD image access") + (synopsis "CD Input and Control library") (description "GNU libcdio is a library for OS-idependent CD-ROM and CD image access. It includes a library for working with ISO-9660 filesystems (libiso9660), as @@ -104,7 +104,7 @@ well as utility programs such as an audio CD player and an extractor.") ("zlib" ,zlib) ("libcdio" ,libcdio))) (home-page "http://www.gnu.org/software/xorriso/") - (synopsis "An ISO 9660 Rock Ridge file system manipulator") + (synopsis "Create, manipulate, burn ISO-9660 filesystems") (description "GNU xorriso copies file objects from POSIX compliant filesystems into Rock Ridge enhanced ISO 9660 filesystems and allows session-wise manipulation diff --git a/gnu/packages/cflow.scm b/gnu/packages/cflow.scm index bb000ddc59..caf690bc4c 100644 --- a/gnu/packages/cflow.scm +++ b/gnu/packages/cflow.scm @@ -36,7 +36,7 @@ "1jkbq97ajcf834z68hbn3xfhiz921zhn39gklml1racf0kb3jzh3")))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/cflow/") - (synopsis "A tool to analyze the control flow of C programs") + (synopsis "Create a graph of control flow within a program") (description "GNU cflow analyzes a collection of C source files and prints a graph, charting control flow within the program. diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 086900990b..89cb014a3c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -73,7 +73,7 @@ in compression.") (base32 "18rm80kar7n016g8bsyy1a3zk50i2826xdgs874yh64rzj7nxmdm")))) (build-system gnu-build-system) - (synopsis "Gzip, the GNU zip compression program") + (synopsis "General file (de)compression (using lzw)") (arguments ;; FIXME: The test suite wants `less', and optionally Perl. '(#:tests? #f)) diff --git a/gnu/packages/cpio.scm b/gnu/packages/cpio.scm index 711d64d7af..8512499b7b 100644 --- a/gnu/packages/cpio.scm +++ b/gnu/packages/cpio.scm @@ -42,8 +42,7 @@ (inputs `(("patch/gets" ,(search-patch "cpio-gets-undeclared.patch")))) (home-page "https://www.gnu.org/software/cpio/") - (synopsis - "A program to create or extract from cpio archives") + (synopsis "Manage cpio and tar file archives") (description "GNU Cpio copies files into or out of a cpio or tar archive. The archive can be another file on the disk, a magnetic tape, or a pipe. @@ -55,4 +54,4 @@ default, cpio creates binary format archives, for compatibility with older cpio programs. When extracting from archives, cpio automatically recognizes which kind of archive it is reading and can read archives created on machines with a different byte-order.") - (license gpl3+))) \ No newline at end of file + (license gpl3+))) diff --git a/gnu/packages/cppi.scm b/gnu/packages/cppi.scm index 53f24698fc..d28fc40173 100644 --- a/gnu/packages/cppi.scm +++ b/gnu/packages/cppi.scm @@ -35,7 +35,7 @@ "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j")))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/cppi/") - (synopsis "A cpp directive indenter") + (synopsis "Indent C preprocessor directives to reflect nesting and more") (description "GNU cppi indents C preprocessor directives to reflect their nesting and ensure that there is exactly one space character between each #if, #elif, diff --git a/gnu/packages/ddrescue.scm b/gnu/packages/ddrescue.scm index 0d5533d423..5c653af6db 100644 --- a/gnu/packages/ddrescue.scm +++ b/gnu/packages/ddrescue.scm @@ -37,7 +37,7 @@ (build-system gnu-build-system) (home-page "http://www.gnu.org/software/ddrescue/ddrescue.html") - (synopsis "GNU Ddrescue, a data recovery tool") + (synopsis "Data recovery utility") (description "GNU Ddrescue is a data recovery tool. It copies data from one file or block device (e.g., hard disk, CD-ROM) to another, trying hard to diff --git a/gnu/packages/dejagnu.scm b/gnu/packages/dejagnu.scm index 1efc7c78e7..999d976ec7 100644 --- a/gnu/packages/dejagnu.scm +++ b/gnu/packages/dejagnu.scm @@ -75,7 +75,7 @@ %standard-phases)))) (home-page "http://www.gnu.org/software/dejagnu/") - (synopsis "The DejaGNU testing framework") + (synopsis "GNU software testing framework") (description "DejaGnu is a framework for testing other programs. Its purpose is to provide a single front end for all tests. Think of it as a diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm index de76bee38d..0f387be797 100644 --- a/gnu/packages/ed.scm +++ b/gnu/packages/ed.scm @@ -43,8 +43,7 @@ (("/bin/sh") (which "sh")))) %standard-phases))) (home-page "http://www.gnu.org/software/ed/") - (synopsis - "GNU ed, an implementation of the standard Unix editor") + (synopsis "Line-oriented text editor") (description "GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files, both diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9a107967a3..250fcf2401 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -74,8 +74,7 @@ ("patch/epaths" ,(search-patch "emacs-configure-sh.patch")) )) (home-page "http://www.gnu.org/software/emacs/") - (synopsis - "GNU Emacs 24, the extensible, customizable text editor") + (synopsis "The extensible, customizable, self-documenting text editor") (description "GNU Emacs is an extensible, customizable text editor—and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp diff --git a/gnu/packages/fdisk.scm b/gnu/packages/fdisk.scm index 5cf02a9014..6248feb98b 100644 --- a/gnu/packages/fdisk.scm +++ b/gnu/packages/fdisk.scm @@ -46,9 +46,8 @@ ("util-linux" ,util-linux) ("parted" ,parted))) (home-page "https://www.gnu.org/software/fdisk/") - (synopsis - "GNU Fdisk, a command-line disk partitioning tool") + (synopsis "Low-level disk partitioning and formatting") (description "GNU Fdisk provides alternatives to util-linux fdisk and util-linux cfdisk. It uses GNU Parted.") - (license gpl3+))) \ No newline at end of file + (license gpl3+))) diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 5279544db9..15ff2a4401 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -51,7 +51,7 @@ %standard-phases))) (inputs `(("libsigsegv" ,libsigsegv))) (home-page "http://www.gnu.org/software/gawk/") - (synopsis "GNU implementation of the Awk programming language") + (synopsis "A text scanning and processing language") (description "Many computer users need to manipulate text files: extract and then operate on data from parts of certain lines while discarding the rest, make diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 116c1859a9..164b982ab1 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -132,7 +132,7 @@ %standard-phases))))) (properties `((gcc-libc . ,(assoc-ref inputs "libc")))) - (synopsis "The GNU Compiler Collection") + (synopsis "GNU Compiler Collection") (description "The GNU Compiler Collection includes compiler front ends for C, C++, Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well as diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 71a85a431b..95f542c707 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -57,7 +57,7 @@ ("texinfo" ,texinfo) ("dejagnu" ,dejagnu))) (home-page "http://www.gnu.org/software/gdb/") - (synopsis "GDB, the GNU Project debugger") + (synopsis "The GNU debugger") (description "GDB, the GNU Project debugger, allows you to see what is going on `inside' another program while it executes -- or what another diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index e85b8f69c3..29ea54924a 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -56,8 +56,7 @@ ,(search-patch "gettext-gets-undeclared.patch")))) (home-page "http://www.gnu.org/software/gettext/") - (synopsis - "GNU gettext, a well integrated set of translation tools and documentation") + (synopsis "Tools and documentation for translation") (description "Usually, programs are written and documented in English, and use English at execution time for interacting with users. Using a common diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 835ed475cc..2c58bca0bd 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -163,7 +163,7 @@ printing, and psresize, for adjusting page sizes.") (apply install args) (system* "make" "install-so"))) %standard-phases))))) - (synopsis "GNU Ghostscript, an interpreter for the PostScript language and for PDF") + (synopsis "PostScript and PDF interpreter") (description "GNU Ghostscript is an interpreter for PostScript and Portable Document Format (PDF) files. diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index fdcc9bdc31..d594a1b068 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -120,7 +120,7 @@ shared NFS home directories.") #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") "/share/gtk-doc")))) - (synopsis "C library that provides core application building blocks") + (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME") (description "GLib provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, diff --git a/gnu/packages/global.scm b/gnu/packages/global.scm index 6ef36d5aea..6ad79d1283 100644 --- a/gnu/packages/global.scm +++ b/gnu/packages/global.scm @@ -44,7 +44,7 @@ (list (string-append "--with-ncurses=" (assoc-ref %build-inputs "ncurses"))))) (home-page "http://www.gnu.org/software/global/") - (synopsis "GNU GLOBAL source code tag system") + (synopsis "Cross-environment source code tag system") (description "GNU GLOBAL is a source code tagging system that works the same way across diverse environments (Emacs, vi, less, Bash, web browser, etc). diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 1810b65fe8..f96071e072 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -69,8 +69,7 @@ Daemon and possibly more in the future.") (propagated-inputs `(("libgpg-error" ,libgpg-error))) (home-page "http://gnupg.org/") - (synopsis - "GNU Libgcrypt, a general-pupose cryptographic library") + (synopsis "Cryptographic function library") (description "GNU Libgcrypt is a general purpose cryptographic library based on the code from GnuPG. It provides functions for all @@ -166,8 +165,7 @@ specifications are building blocks of S/MIME and TLS.") (apply configure args))) %standard-phases))) (home-page "http://gnupg.org/") - (synopsis - "GNU Privacy Guard (GnuPG), GNU Project's implementation of the OpenPGP standard") + (synopsis "GNU Privacy Guard") (description "GnuPG is the GNU project's complete and free implementation of the OpenPGP standard as defined by RFC4880. GnuPG allows to diff --git a/gnu/packages/gnutls.scm b/gnu/packages/gnutls.scm index dc571adc60..e817198db3 100644 --- a/gnu/packages/gnutls.scm +++ b/gnu/packages/gnutls.scm @@ -42,7 +42,7 @@ "0gvgndypwicchf7m660zh7jdgmkfj9g9xavpcc08pyd0120y0bk7")))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/libtasn1/") - (synopsis "GNU Libtasn1, an ASN.1 library") + (synopsis "ASN.1 library") (description "Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some other packages. The goal of this implementation is to be highly @@ -73,7 +73,7 @@ portable, and only require an ANSI C89 platform.") ("nettle" ,nettle) ("which" ,which))) (home-page "http://www.gnu.org/software/gnutls/") - (synopsis "The GNU Transport Layer Security Library") + (synopsis "Transport layer security library") (description "GnuTLS is a project that aims to develop a library which provides a secure layer, over a reliable transport layer. Currently the GnuTLS diff --git a/gnu/packages/gperf.scm b/gnu/packages/gperf.scm index 2425756f1b..3a9d2d97d8 100644 --- a/gnu/packages/gperf.scm +++ b/gnu/packages/gperf.scm @@ -37,8 +37,7 @@ (build-system gnu-build-system) (arguments '(#:parallel-tests? #f)) (home-page "http://www.gnu.org/software/gperf/") - (synopsis - "GNU gperf, a perfect hash function generator") + (synopsis "Perfect hash function generator") (description "GNU gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in diff --git a/gnu/packages/gprolog.scm b/gnu/packages/gprolog.scm index ba84d9a836..c362a7bc11 100644 --- a/gnu/packages/gprolog.scm +++ b/gnu/packages/gprolog.scm @@ -45,9 +45,7 @@ (("= /bin/sh") (string-append "= " (which "sh"))))) %standard-phases))) (home-page "https://www.gnu.org/software/gprolog/") - (synopsis - "GNU Prolog, a free Prolog compiler with constraint solving over -finite domains") + (synopsis "Prolog compiler") (description "GNU Prolog is a free Prolog compiler with constraint solving over finite domains developed by Daniel Diaz. @@ -69,4 +67,4 @@ interface, sockets). GNU Prolog also includes an efficient constraint solver over finite domains. This opens contraint logic programming to the user combining the power of constraint programming to the declarativity of logic programming.") - (license (list gpl2+ lgpl3+)))) \ No newline at end of file + (license (list gpl2+ lgpl3+)))) diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index dce87dde1e..5265faeee5 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -45,7 +45,7 @@ ("perl" ,perl) ("psutils" ,psutils) ("texinfo" ,texinfo))) - (synopsis "GNU Troff text formatting system") + (synopsis "Typesetting from plain text mixed with formatting commands") (description "GNU Troff (Groff) is a software typesetting package which reads plain text mixed with formatting commands and produces formatted output.") diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm index ee52a6110a..af9c135f2d 100644 --- a/gnu/packages/grub.scm +++ b/gnu/packages/grub.scm @@ -73,8 +73,7 @@ ("qemu" ,qemu) ("xorriso" ,xorriso))) (home-page "http://www.gnu.org/software/grub/") - (synopsis - "GNU GRUB, the Grand Unified Boot Loader (2.x beta)") + (synopsis "GRand unified boot loader") (description "GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand Unified Bootloader, which was originally designed and implemented by Erich diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 832ae0c2ff..fb5712a7b0 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -61,7 +61,7 @@ ("shishi" ,shishi) ("zlib" ,guix:zlib) )) - (synopsis "GNU GSS (Generic Security Service), a free implementatio of RFC 2743/2744") + (synopsis "Generic Security Service library") (description "GNU GSS is an implementation of the Generic Security Service Application Program Interface (GSS-API). GSS-API is used by network servers to provide @@ -87,7 +87,7 @@ SMTP/IMAP servers. GSS consists of a library and a manual.") ("gss" ,gss) ("zlib" ,guix:zlib) )) - (synopsis "GNU SASL, an implementation of the Simple Authentication and Security Layer framework") + (synopsis "Simple Authentication and Security Layer library") (description "GNU SASL is an implementation of the Simple Authentication and Security Layer framework and a few common SASL mechanisms. SASL is used by network diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 58e7c2910c..763584d7dc 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -88,7 +88,7 @@ ;; When cross-compiling, a native version of Guile itself is needed. (self-native-input? #t) - (synopsis "GNU Guile 1.8, an embeddable Scheme interpreter") + (synopsis "Scheme implementation intended especially for extensions") (description "GNU Guile 1.8 is an interpreter for the Scheme programming language, packaged as a library that can be embedded into programs to make them @@ -137,7 +137,7 @@ extensible. It supports many SRFIs.") (string-append bash "/bin/bash"))))) %standard-phases))) - (synopsis "GNU Guile 2.0, an embeddable Scheme implementation") + (synopsis "Scheme implementation intended especially for extensions") (description "GNU Guile is an implementation of the Scheme programming language, with support for many SRFIs, packaged for use in a wide variety of environments. @@ -231,8 +231,7 @@ many readers as needed).") out))))) %standard-phases))) (home-page "http://www.gnu.org/software/guile-ncurses/") - (synopsis - "GNU Guile-Ncurses, Scheme interface to the NCurses libraries") + (synopsis "Guile bindings to ncurses") (description "GNU Guile-Ncurses is a library for the Guile Scheme interpreter that provides functions for creating text user interfaces. The text user interface @@ -258,8 +257,7 @@ menu.") `(("ed" ,ed) ("which" ,which) ("guile" ,guile-1.8) ("patch/install" ,(search-patch "mcron-install.patch")))) (home-page "http://www.gnu.org/software/mcron/") - (synopsis - "GNU mcron, a flexible implementation of `cron' in Guile") + (synopsis "Run jobs at scheduled times") (description "The GNU package mcron (Mellor's cron) is a 100% compatible replacement for Vixie cron. It is written in pure Guile, and allows configuration files diff --git a/gnu/packages/help2man.scm b/gnu/packages/help2man.scm index 0acd39a524..1dd0d71d91 100644 --- a/gnu/packages/help2man.scm +++ b/gnu/packages/help2man.scm @@ -45,7 +45,7 @@ ;; ("gettext" ,gettext) )) (home-page "http://www.gnu.org/software/help2man/") - (synopsis "GNU help2man generates man pages from `--help' output") + (synopsis "Automatically generate man pages from program --help") (description "help2man produces simple manual pages from the ‘--help’ and ‘--version’ output of other commands.") diff --git a/gnu/packages/idutils.scm b/gnu/packages/idutils.scm index 775de18c5c..728bdeb51a 100644 --- a/gnu/packages/idutils.scm +++ b/gnu/packages/idutils.scm @@ -42,7 +42,7 @@ ,(search-patch "diffutils-gets-undeclared.patch")))) (arguments `(#:patches (list (assoc-ref %build-inputs "patch/gets")))) (home-page "http://www.gnu.org/software/idutils/") - (synopsis "GNU Idutils, a text searching utility") + (synopsis "Identifier database utilities") (description "An \"ID database\" is a binary file containing a list of file names, a list of tokens, and a sparse matrix indicating which diff --git a/gnu/packages/indent.scm b/gnu/packages/indent.scm index c70a790e62..6789908a8d 100644 --- a/gnu/packages/indent.scm +++ b/gnu/packages/indent.scm @@ -34,7 +34,7 @@ (sha256 (base32 "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa")))) (build-system gnu-build-system) - (synopsis "GNU Indent, a program for code indentation and formatting") + (synopsis "Code reformatter") (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 diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm index 63a3d98a9b..ced14704ff 100644 --- a/gnu/packages/less.scm +++ b/gnu/packages/less.scm @@ -38,9 +38,7 @@ (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (home-page "https://www.gnu.org/software/less/") - (synopsis - "GNU less is a program similar to more, but which allows backward -movement in the file as well as forward movement") + (synopsis "Paginator for terminals") (description "GNU less is a program similar to more, but which allows backward movement in the file as well as forward movement. Also, less does not @@ -48,4 +46,4 @@ have to read the entire input file before starting, so with large input files it starts up faster than text editors like vi. Less uses termcap (or terminfo on some systems), so it can run on a variety of terminals. There is even limited support for hardcopy terminals.") - (license gpl3+))) ; some files are under GPLv2+ \ No newline at end of file + (license gpl3+))) ; some files are under GPLv2+ diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index b49a2018ca..dcb0872f30 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -35,7 +35,7 @@ "0g657kv60rh486m7bwyp5k24ljmym4wnb8nmk6d3i3qgr1qlqbqa")))) (build-system gnu-build-system) ;; FIXME: No Java and C# libraries are currently built. - (synopsis "GNU Libidn, a library to encode and decode internationalised domain names") + (synopsis "Internationalized string processing library") (description "GNU Libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications. Libidn's purpose is to encode and decode diff --git a/gnu/packages/libsigsegv.scm b/gnu/packages/libsigsegv.scm index d73056892c..12cb4ba3b4 100644 --- a/gnu/packages/libsigsegv.scm +++ b/gnu/packages/libsigsegv.scm @@ -35,7 +35,7 @@ (base32 "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44")))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/libsigsegv/") - (synopsis "GNU libsigsegv, a library to handle page faults in user mode") + (synopsis "Library for handling page faults") (description "GNU libsigsegv is a library for handling page faults in user mode. A page fault occurs when a program tries to access to a region of memory that is diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm index 92241d891b..2dbfee70f1 100644 --- a/gnu/packages/libunistring.scm +++ b/gnu/packages/libunistring.scm @@ -36,7 +36,7 @@ "18q620269xzpw39dwvr9zpilnl2dkw5z5kz3mxaadnpv4k3kw3b1")))) (propagated-inputs '()) ; FIXME: add libiconv when !glibc (build-system gnu-build-system) - (synopsis "GNU Libunistring, a Unicode string library") + (synopsis "C library for manipulating Unicode strings") (description "This library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard. diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b97315580b..ca4ca563a3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -186,7 +186,7 @@ 'install ,install-phase (alist-delete 'configure %standard-phases))) #:tests? #f)) - (synopsis "GNU Linux-Libre kernel") + (synopsis "100% free redistribution of a cleaned Linux kernel") (description "Linux-Libre operating system kernel.") (license gpl2) (home-page "http://www.gnu.org/software/linux-libre/")))) diff --git a/gnu/packages/lsh.scm b/gnu/packages/lsh.scm index 5b3e9a7e0b..c031b287a1 100644 --- a/gnu/packages/lsh.scm +++ b/gnu/packages/lsh.scm @@ -117,8 +117,7 @@ (which "cat")))) %standard-phases))) (home-page "http://www.lysator.liu.se/~nisse/lsh/") - (synopsis - "GNU lsh, a GPL'd implementation of the SSH protocol") + (synopsis "GNU implementation of the Secure Shell (ssh) protocols") (description "lsh is a free implementation (in the GNU sense) of the ssh version 2 protocol, currently being standardised by the IETF diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm index eb114c7514..0be1824382 100644 --- a/gnu/packages/m4.scm +++ b/gnu/packages/m4.scm @@ -61,7 +61,7 @@ ("patch/readlink-EINVAL" ,(search-patch "m4-readlink-EINVAL.patch")) ("patch/gets" ,(search-patch "m4-gets-undeclared.patch")))) - (synopsis "GNU M4, a macro processor") + (synopsis "Macro processor") (description "GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible although it has some extensions (for example, diff --git a/gnu/packages/mailutils.scm b/gnu/packages/mailutils.scm index d9f26323e8..15ca939e66 100644 --- a/gnu/packages/mailutils.scm +++ b/gnu/packages/mailutils.scm @@ -82,7 +82,7 @@ ("patch/gets-undeclared" ,(search-patch "m4-gets-undeclared.patch")))) (home-page "http://www.gnu.org/software/mailutils/") - (synopsis "A rich and powerful protocol-independent mail framework") + (synopsis "Utilities and library for reading and serving mail") (description "GNU Mailutils is a rich and powerful protocol-independent mail framework. It contains a series of useful mail libraries, clients, and diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 7778552b40..a6130dccfa 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -46,7 +46,7 @@ ;; sub-architectures. "--enable-fat" "--enable-cxx"))) - (synopsis "GMP, the GNU multiple precision arithmetic library") + (synopsis "Multiple-precision arithmetic library") (description "GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers. There is no @@ -82,8 +82,7 @@ faster algorithms.") "0ym1ylcq803n52qrggxqmkz66gbn8ncc3ybawal31v5y5p1srma9")))) (build-system gnu-build-system) (propagated-inputs `(("gmp" ,gmp))) ; refers to - (synopsis "GNU MPFR, a library for multiple-precision floating-point -arithmetic") + (synopsis "C library for arbitrary precision floating-point arithmetic") (description "The GNU MPFR library is a C library for multiple-precision floating-point computations with correct rounding. MPFR is based on the GMP @@ -109,8 +108,7 @@ double-precision floating-point arithmetic (53-bit mantissa).") (build-system gnu-build-system) (propagated-inputs `(("gmp" ,gmp) ; refers to both ("mpfr" ,mpfr))) - (synopsis "GNU MPC, a library for multiprecision complex arithmetic -with exact rounding") + (synopsis "C library for arbitrary precision complex arithmetic") (description "GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result. It extends diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 09fbe7f168..00cdd6debb 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -42,11 +42,10 @@ `(("gettext" ,guix:gettext) ("ncurses" ,ncurses))) (home-page "http://www.nano-editor.org/") - (synopsis - "A small, user-friendly console text editor") + (synopsis "A small, user-friendly console text editor") (description "GNU nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from The University of Washington. It aims to emulate Pico as closely as possible and perhaps include extra functionality.") - (license gpl3+))) ; some files are under GPLv2+ \ No newline at end of file + (license gpl3+))) ; some files are under GPLv2+ diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index f790e6e38f..5199ec7c23 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -107,8 +107,7 @@ ,configure-phase %standard-phases))))) (self-native-input? #t) - (synopsis - "GNU Ncurses, a free software emulation of curses in SVR4 and more") + (synopsis "Terminal emulation (termcap, terminfo) library") (description "The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0, and more. It uses Terminfo format, supports pads diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index 6a0b6ef40a..3ea4eb79e1 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -39,7 +39,7 @@ (inputs `(("m4" ,m4))) (propagated-inputs `(("gmp" ,gmp))) (home-page "http://www.lysator.liu.se/~nisse/nettle/") - (synopsis "GNU Nettle, a cryptographic library") + (synopsis "C library for low-level crytographic functionality") (description "Nettle is a cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented diff --git a/gnu/packages/oggvorbis.scm b/gnu/packages/oggvorbis.scm index 636bf44106..888e5715f2 100644 --- a/gnu/packages/oggvorbis.scm +++ b/gnu/packages/oggvorbis.scm @@ -94,8 +94,7 @@ polyphonic) audio and music at fixed and variable bitrates from 16 to (build-system gnu-build-system) (inputs `(("libogg" ,libogg))) (home-page "https://gnu.org/software/speex") - (synopsis - "GNU Speex, a patent-free voice codec") + (synopsis "Library for patent-free audio compression format") (description "GNU Speex is a patent-free voice codec. It is designed to compress voice at bitrates in the 2--45 kbps range. Possible diff --git a/gnu/packages/parted.scm b/gnu/packages/parted.scm index b99c52e457..1f266c9035 100644 --- a/gnu/packages/parted.scm +++ b/gnu/packages/parted.scm @@ -58,8 +58,7 @@ ("readline" ,readline) ("util-linux" ,util-linux))) (home-page "http://www.gnu.org/software/parted/") - (synopsis - "GNU Parted, a tool to manipulate partitions") + (synopsis "Disk partition editor") (description "GNU Parted is an industrial-strength package for creating, destroying, resizing, checking and copying partitions, and the file systems on them. This @@ -68,4 +67,4 @@ usage, copying data on hard disks and disk imaging. It contains a library, libparted, and a command-line frontend, parted, which also serves as a sample implementation and script backend.") - (license gpl3+))) \ No newline at end of file + (license gpl3+))) diff --git a/gnu/packages/pth.scm b/gnu/packages/pth.scm index b0d5092cb0..c3f572574e 100644 --- a/gnu/packages/pth.scm +++ b/gnu/packages/pth.scm @@ -37,7 +37,7 @@ (build-system gnu-build-system) (arguments '(#:parallel-build? #f)) (home-page "http://www.gnu.org/software/pth") - (synopsis "The GNU Portable Threads library") + (synopsis "Portable thread library") (description "Pth is a very portable POSIX/ANSI-C based library for Unix platforms which provides non-preemptive priority-based scheduling for diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index e73b293ba3..8857666fcc 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -62,7 +62,7 @@ 'install 'post-install ,post-install-phase %standard-phases))) - (synopsis "GNU Readline, a library for interactive line editing") + (synopsis "Edit command lines while typing, with history support") (description "The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in. diff --git a/gnu/packages/recutils.scm b/gnu/packages/recutils.scm index fecb209deb..7b4828995e 100644 --- a/gnu/packages/recutils.scm +++ b/gnu/packages/recutils.scm @@ -46,8 +46,7 @@ ("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") + (synopsis "Manipulate plain text files as 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 diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 4b42f8c53c..49b6df9b0d 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -102,7 +102,7 @@ (base32 "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j")))))))) (home-page "http://www.gnu.org/software/mit-scheme/") - (synopsis "MIT/GNU Scheme, a native code Scheme compiler") + (synopsis "Scheme implementation with integrated editor and debugger") (description "MIT/GNU Scheme is an implementation of the Scheme programming language, providing an interpreter, compiler, source-code debugger, diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index ea1c21716a..5bace12070 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -40,7 +40,7 @@ `(("ncurses", ncurses) ("perl" ,perl))) (home-page "http://www.gnu.org/software/screen/") - (synopsis "GNU Screen, a terminal multiplexer") + (synopsis "Full-screen window manager providing multiple terminals") (description "GNU screen is a full-screen window manager that multiplexes a physical terminal between several processes, typically interactive shells. Each virtual diff --git a/gnu/packages/shishi.scm b/gnu/packages/shishi.scm index 767037a580..0a49f47ded 100644 --- a/gnu/packages/shishi.scm +++ b/gnu/packages/shishi.scm @@ -46,8 +46,7 @@ ("libgcrypt" ,libgcrypt) ("libtasn1" ,libtasn1))) (home-page "http://www.gnu.org/software/shishi/") - (synopsis - "GNU Shishi, an implementation of the Kerberos 5 network security system") + (synopsis "Implementation of the Kerberos 5 network security system") (description "Shishi contains a library ('libshishi') that can be used by application developers to add support for Kerberos 5. Shishi contains a command line diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 233068509d..1b4a3289ac 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -47,8 +47,7 @@ (("@LIBC_SO_DIR@") (string-append libc "/lib"))))) %standard-phases))) (home-page "https://www.gnu.org/software/smalltalk/") - (synopsis - "GNU Smalltalk, a free implementation of the Smalltalk-80 language") + (synopsis "Smalltalk environment") (description "GNU Smalltalk is a free implementation of the Smalltalk-80 language. diff --git a/gnu/packages/system.scm b/gnu/packages/system.scm index 1eddd6de86..5bd8cbe881 100644 --- a/gnu/packages/system.scm +++ b/gnu/packages/system.scm @@ -38,8 +38,7 @@ "18w0dbg77i56cx1bwa789w0qi3l4xkkbascxcv2b6gbm0zmjg1g6")))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/pies/") - (synopsis - "GNU Pies, a program invocation and execution supervisor") + (synopsis "Program invocation and execution supervisor") (description "The name Pies (pronounced \"p-yes\") stands for Program Invocation and Execution Supervisor. This utility starts and controls execution of @@ -81,8 +80,7 @@ it can replace the inetd utility!") (inputs `(("patch/gets" ,(search-patch "diffutils-gets-undeclared.patch")) ("ncurses" ,ncurses))) (home-page "http://www.gnu.org/software/inetutils/") - (synopsis - "GNU Inetutils, a collection of common network programs") + (synopsis "Basic networking utilities") (description "The GNU network utilities suite provides the following tools: ftp(d), hostname, ifconfig, inetd, logger, ping, rcp, rexec(d), diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 4194f48ffe..b418acf35d 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -42,7 +42,7 @@ ;; TODO: Remove Perl from here when 'patch-shebang' DTRT with /usr/bin/env. (propagated-inputs `(("perl" ,perl))) ; yuck! (home-page "http://www.gnu.org/software/texinfo/") - (synopsis "GNU Texinfo, the GNU documentation system") + (synopsis "The GNU documentation format") (description "Texinfo is the official documentation format of the GNU project. It was invented by Richard Stallman and Bob Chassell many years diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index cfb3261f94..8d55905eec 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -49,9 +49,7 @@ (string-append "--prefix=" out))))) %standard-phases))) (home-page "http://www.gnu.org/software/time/") - (synopsis - "GNU Time, a tool that runs programs and summarizes the system -resources they use") + (synopsis "Run a command, then display its resource usage") (description "The 'time' command runs another program, then displays information about the resources used by that program, collected by the system while diff --git a/gnu/packages/wdiff.scm b/gnu/packages/wdiff.scm index 02d536c7de..b9fccb97db 100644 --- a/gnu/packages/wdiff.scm +++ b/gnu/packages/wdiff.scm @@ -48,8 +48,7 @@ (inputs `(("screen" ,screen) ("which" ,which))) (home-page "https://www.gnu.org/software/wdiff/") - (synopsis - "GNU Wdiff, a tool for comparing files on a word by word basis") + (synopsis "Word difference finder") (description "GNU Wdiff is a front end to 'diff' for comparing files on a word per word basis. A word is anything between whitespace. This is useful for @@ -58,4 +57,4 @@ paragraphs have been refilled. It works by creating two temporary files, one word per line, and then executes 'diff' on these files. It collects the 'diff' output and uses it to produce a nicer display of word differences between the original files.") - (license gpl3+))) \ No newline at end of file + (license gpl3+))) diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index ea31a1e70d..0436c0d8c3 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -51,8 +51,7 @@ '("doc/texi2pod.pl" "tests/run-px"))) %standard-phases))) (home-page "http://www.gnu.org/software/wget/") - (synopsis - "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP") + (synopsis "Non-interactive command-line utility for downloading files") (description "GNU Wget is a free software package for retrieving files using HTTP, HTTPS and FTP, the most widely-used Internet protocols. It is a diff --git a/gnu/packages/which.scm b/gnu/packages/which.scm index aa5330cad7..27d8094b00 100644 --- a/gnu/packages/which.scm +++ b/gnu/packages/which.scm @@ -36,8 +36,7 @@ "1y2p50zadb36izzh2zw4dm5hvdiydqf3qa88l8kav20dcmfbc5yl")))) (build-system gnu-build-system) (home-page "https://gnu.org/software/which/") - (synopsis - "GNU Which shows the full path of (shell) commands") + (synopsis "Find full path of shell commands") (description "GNU Which takes one or more arguments. For each of its arguments it prints to stdout the full path of the executables that would have diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm index b5366c046f..6e540ccfab 100644 --- a/gnu/packages/zile.scm +++ b/gnu/packages/zile.scm @@ -45,7 +45,7 @@ ("perl" ,perl) ("help2man" ,help2man))) (home-page "http://www.gnu.org/software/zile/") - (synopsis "GNU Zile, a lightweight Emacs clone") + (synopsis "Zile is lossy Emacs, a lightweight Emacs clone") (description "GNU Zile, which is a lightweight Emacs clone. Zile is short for Zile Is Lossy Emacs. Zile has been written to be as -- cgit v1.2.3 From f7758740eda6b866233333a766e29183d16fe154 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 20 Apr 2013 11:44:42 +0200 Subject: gnu: gdbm, nano: Synchronize synopses. * gnu/packages/gdbm.scm, gnu/packages/nano.scm: Synchronize synopses with the Womb. --- gnu/packages/gdbm.scm | 3 ++- gnu/packages/nano.scm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gdbm.scm b/gnu/packages/gdbm.scm index 76733dba65..6159cc25da 100644 --- a/gnu/packages/gdbm.scm +++ b/gnu/packages/gdbm.scm @@ -37,7 +37,8 @@ (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/gdbm/") - (synopsis "GNU dbm key/value database library") + (synopsis + "Hash library of database functions compatible with traditional dbm") (description "GNU dbm (or GDBM, for short) is a library of database functions that use extensible hashing and work similar to the standard UNIX dbm. diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 00cdd6debb..f80400d88b 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -42,7 +42,7 @@ `(("gettext" ,guix:gettext) ("ncurses" ,ncurses))) (home-page "http://www.nano-editor.org/") - (synopsis "A small, user-friendly console text editor") + (synopsis "Small, user-friendly console text editor") (description "GNU nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from The University of -- cgit v1.2.3 From c6d7e299ae0acb14c76465c7036fdbddf2ef495e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 20 Apr 2013 17:47:59 +0200 Subject: gnu: Add GCC 4.8.0 and Binutils 2.23.2. * gnu/packages/base.scm (binutils-2.23, ld-wrapper-2.23, gcc-4.8): New variables. --- gnu/packages/base.scm | 43 ++++++++++++++++++++++++++++++++++++++++++- gnu/packages/gcc.scm | 3 ++- 2 files changed, 44 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1eaa4fb860..3597e6fad1 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -18,7 +18,8 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages base) - #:use-module (guix licenses) + #:use-module ((guix licenses) + #:select (gpl3+ lgpl2.0+)) #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages bash) @@ -374,6 +375,17 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.") (license gpl3+) (home-page "http://www.gnu.org/software/binutils/"))) +(define-public binutils-2.23 + (package (inherit binutils) + (version "2.23.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/binutils/binutils-" + version ".tar.bz2")) + (sha256 + (base32 + "15qhbkz3r266xaa52slh857qn3abw7rb2x2jnhpfrafpzrb4x4gy")))))) + (define-public glibc (package (name "glibc") @@ -928,6 +940,35 @@ store.") ,@(fold alist-delete (package-inputs ld-wrapper-boot3) '("guile" "bash")))))) +(define-public ld-wrapper-2.23 ; TODO: remove when Binutils is updated + (package (inherit ld-wrapper) + (inputs `(("binutils" ,binutils-2.23) + ,@(alist-delete "binutils" (package-inputs ld-wrapper)))))) + +(define-public gcc-4.8 + ;; FIXME: Move to gcc.scm when Binutils is updated. + (package (inherit gcc-4.7) + (version "4.8.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gcc/gcc-" + version "/gcc-" version ".tar.bz2")) + (sha256 + (base32 + "0b6cp9d1sas3vq6dj3zrgd134p9b569fqhbixb9cl7mp698zwdxh")))) + (inputs `(("gmp" ,gmp) + ("mpfr" ,mpfr) + ("mpc" ,mpc) + ("isl" ,isl) + ("cloog" ,cloog) + ("zlib" ,(@ (gnu packages compression) zlib)) + + ;; With ld from Binutils 2.22, we get the following error while + ;; linking gcov: + ;; ld: gcov: hidden symbol `__deregister_frame_info' in /nix/store/47myfniw4x7kfc601d7q1yvz5mixlr00-gcc-4.7.2/lib/gcc/x86_64-unknown-linux-gnu/4.7.2/libgcc_eh.a(unwind-dw2-fde-dip.o) is referenced by DSO + ;; See . + ("ld-wrapper" ,ld-wrapper-2.23))))) + (define-public %final-inputs ;; Final derivations used as implicit inputs by `gnu-build-system'. (let ((finalize (cut package-with-explicit-inputs <> %boot4-inputs diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 164b982ab1..a784118dd6 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -17,7 +17,8 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages gcc) - #:use-module (guix licenses) + #:use-module ((guix licenses) + #:select (gpl3+ gpl2+ lgpl2.1+ lgpl2.0+)) #:use-module (gnu packages) #:use-module (gnu packages bootstrap) #:use-module (gnu packages compression) -- cgit v1.2.3 From 98eb8cbe8d0bdebde0e151bfb309aa27abaef4d7 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Sun, 21 Apr 2013 08:08:40 +0000 Subject: ui: Add a 'define-diagnostic' macro. * guix/ui.scm (define-diagnostic): New macro, which is based on the previous version of 'warning'. (warning, leave): Redefine using 'define-diagnostic'. (report-error): New macro. (install-locale): Use 'warning' instead of 'format'. (call-with-error-handling): Adjust 'leave'. * gnu/packages.scm (package-files): Use 'warning' instead of 'format'. * guix/gnu-maintenance.scm (http-fetch): Use 'warning' and 'leave'. * guix/scripts/build.scm (derivations-from-package-expressions, guix-build): Adjust 'leave'. * guix/scripts/download.scm (guix-download): Adjust 'leave'. * guix/scripts/gc.scm (size->number, %options): Adjust 'leave'. * guix/scripts/package.scm (roll-back, guix-package): Adjust 'leave'. * po/POTFILES.in: Add 'guix/gnu-maintenance.scm'. --- gnu/packages.scm | 6 ++-- guix/gnu-maintenance.scm | 12 +++---- guix/scripts/build.scm | 14 ++++---- guix/scripts/download.scm | 4 +-- guix/scripts/gc.scm | 7 ++-- guix/scripts/package.scm | 5 ++- guix/ui.scm | 82 +++++++++++++++++++++++------------------------ po/POTFILES.in | 1 + 8 files changed, 65 insertions(+), 66 deletions(-) (limited to 'gnu') diff --git a/gnu/packages.scm b/gnu/packages.scm index f4d93a789d..e9f2540b91 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -19,6 +19,7 @@ (define-module (gnu packages) #:use-module (guix packages) + #:use-module (guix ui) #:use-module (guix utils) #:use-module (ice-9 ftw) #:use-module (ice-9 vlist) @@ -90,9 +91,8 @@ result) (const #f) ; skip (lambda (path stat errno result) - (format (current-error-port) - (_ "warning: cannot access `~a': ~a~%") - path (strerror errno)) + (warning (_ "cannot access `~a': ~a~%") + path (strerror errno)) result) '() %distro-module-directory diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 89e7f25589..0dc2fab092 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -29,6 +29,7 @@ #:use-module (srfi srfi-26) #:use-module (system foreign) #:use-module (guix ftp-client) + #:use-module (guix ui) #:use-module (guix utils) #:use-module (guix packages) #:export (gnu-package-name @@ -84,12 +85,11 @@ ;; (see ). ;; Since users may still be using these versions, warn them and ;; bail out. - (format (current-error-port) - "warning: using Guile ~a, ~a ~s encoding~%" - (version) - "which does not support HTTP" - (response-transfer-encoding resp)) - (error "download failed; use a newer Guile" + (warning (_ "using Guile ~a, ~a ~s encoding~%") + (version) + "which does not support HTTP" + (response-transfer-encoding resp)) + (leave (_ "download failed; use a newer Guile~%") uri resp))) ((string? data) ; old `http-get' returns a string (open-input-string data)) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index f296f3031f..0bf154dd41 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -43,12 +43,11 @@ When SOURCE? is true, return the derivations of the package sources." (let ((p (read/eval-package-expression str))) (if source? - (let ((source (package-source p)) - (loc (package-location p))) + (let ((source (package-source p))) (if source (package-source-derivation (%store) source) - (leave (_ "~a: error: package `~a' has no source~%") - (location->string loc) (package-name p)))) + (leave (_ "package `~a' has no source~%") + (package-name p)))) (package-derivation (%store) p system)))) @@ -169,7 +168,9 @@ Build the given PACKAGE-OR-DERIVATION and return their output paths.\n")) (add-indirect-root (%store) root)) ((paths ...) (fold (lambda (path count) - (let ((root (string-append root "-" (number->string count)))) + (let ((root (string-append root + "-" + (number->string count)))) (symlink path root) (add-indirect-root (%store) root)) (+ 1 count)) @@ -177,8 +178,7 @@ Build the given PACKAGE-OR-DERIVATION and return their output paths.\n")) paths)))) (lambda args (leave (_ "failed to create GC root `~a': ~a~%") - root (strerror (system-error-errno args))) - (exit 1))))) + root (strerror (system-error-errno args))))))) (define newest-available-packages (memoize find-newest-available-packages)) diff --git a/guix/scripts/download.scm b/guix/scripts/download.scm index 7c00312c74..c5c56c5054 100644 --- a/guix/scripts/download.scm +++ b/guix/scripts/download.scm @@ -114,7 +114,7 @@ and the hash of its contents.\n")) (store (open-connection)) (arg (assq-ref opts 'argument)) (uri (or (string->uri arg) - (leave (_ "guix-download: ~a: failed to parse URI~%") + (leave (_ "~a: failed to parse URI~%") arg))) (path (case (uri-scheme uri) ((file) @@ -127,7 +127,7 @@ and the hash of its contents.\n")) (basename (uri-path uri)))))) (hash (call-with-input-file (or path - (leave (_ "guix-download: ~a: download failed~%") + (leave (_ "~a: download failed~%") arg)) (compose sha256 get-bytevector-all))) (fmt (assq-ref opts 'format))) diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm index 3d918923f8..7625bc46e6 100644 --- a/guix/scripts/gc.scm +++ b/guix/scripts/gc.scm @@ -87,9 +87,8 @@ interpreted." ("TB" (expt 10 12)) ("" 1) (_ - (leave (_ "error: unknown unit: ~a~%") unit) - (exit 1)))) - (leave (_ "error: invalid number: ~a") numstr)))) + (leave (_ "unknown unit: ~a~%") unit)))) + (leave (_ "invalid number: ~a~%") numstr)))) (define %options ;; Specification of the command-line options. @@ -110,7 +109,7 @@ interpreted." (let ((amount (size->number arg))) (if arg (alist-cons 'min-freed amount result) - (leave (_ "error: invalid amount of storage: ~a~%") + (leave (_ "invalid amount of storage: ~a~%") arg)))) (#f result))))) (option '(#\d "delete") #f #f diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 4295abaf57..c5656efc14 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -208,7 +208,7 @@ all of PACKAGES, a list of name/version/output/path/deps tuples." (switch-symlinks profile previous-profile)) (cond ((not (file-exists? profile)) ; invalid profile - (leave (_ "error: profile `~a' does not exist~%") + (leave (_ "profile `~a' does not exist~%") profile)) ((zero? number) ; empty profile (format (current-error-port) @@ -477,8 +477,7 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n")) (define (ensure-output p sub-drv) (if (member sub-drv (package-outputs p)) p - (leave (_ "~a: error: package `~a' lacks output `~a'~%") - (location->string (package-location p)) + (leave (_ "package `~a' lacks output `~a'~%") (package-full-name p) sub-drv))) diff --git a/guix/ui.scm b/guix/ui.scm index 938b5d259c..e42c331ed6 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013 Ludovic Courtès ;;; Copyright © 2013 Mark H Weaver +;;; Copyright © 2013 Nikita Karetnikov ;;; ;;; This file is part of GNU Guix. ;;; @@ -70,9 +71,8 @@ (lambda _ (setlocale LC_ALL "")) (lambda args - (format (current-error-port) - (_ "warning: failed to install locale: ~a~%") - (strerror (system-error-errno args)))))) + (warning (_ "failed to install locale: ~a~%") + (strerror (system-error-errno args)))))) (define (initialize-guix) "Perform the usual initialization for stand-alone Guix commands." @@ -81,12 +81,6 @@ (setvbuf (current-output-port) _IOLBF) (setvbuf (current-error-port) _IOLBF)) -(define-syntax-rule (leave fmt args ...) - "Format FMT and ARGS to the error port and exit." - (begin - (format (current-error-port) fmt args ...) - (exit 1))) - (define* (show-version-and-exit #:optional (command (car (command-line)))) "Display version information for COMMAND and `(exit 0)'." (simple-format #t "~a (~a) ~a~%" @@ -111,16 +105,16 @@ General help using GNU software: ")) (file (location-file location)) (line (location-line location)) (column (location-column location))) - (leave (_ "~a:~a:~a: error: package `~a' has an invalid input: ~s~%") + (leave (_ "~a:~a:~a: package `~a' has an invalid input: ~s~%") file line column (package-full-name package) input))) ((nix-connection-error? c) - (leave (_ "error: failed to connect to `~a': ~a~%") + (leave (_ "failed to connect to `~a': ~a~%") (nix-connection-error-file c) (strerror (nix-connection-error-code c)))) ((nix-protocol-error? c) ;; FIXME: Server-provided error messages aren't i18n'd. - (leave (_ "error: build failed: ~a~%") + (leave (_ "build failed: ~a~%") (nix-protocol-error-message c)))) (thunk))) @@ -375,35 +369,41 @@ WIDTH columns." (define guix-warning-port (make-parameter (current-warning-port))) -(define-syntax warning - (lambda (s) - "Emit a warming. The macro assumes that `_' is bound to `gettext'." - ;; All this just to preserve `-Wformat' warnings. Too much? - - (define (augmented-format-string fmt) - (string-append "~:[~*~;guix ~a: ~]~a" (syntax->datum fmt))) - - (define prefix - #'(_ "warning: ")) - - (syntax-case s (N_ _) ; these are literals, yeah... - ((warning (_ fmt) args ...) - (string? (syntax->datum #'fmt)) - (with-syntax ((fmt* (augmented-format-string #'fmt)) - (prefix prefix)) - #'(format (guix-warning-port) (gettext fmt*) - (program-name) (program-name) prefix - args ...))) - ((warning (N_ singular plural n) args ...) - (and (string? (syntax->datum #'singular)) - (string? (syntax->datum #'plural))) - (with-syntax ((s (augmented-format-string #'singular)) - (p (augmented-format-string #'plural)) - (b prefix)) - #'(format (guix-warning-port) - (ngettext s p n %gettext-domain) - (program-name) (program-name) b - args ...)))))) +(define-syntax-rule (define-diagnostic name prefix) + "Create a diagnostic macro (i.e., NAME), which will prepend PREFIX to all +messages." + (define-syntax name + (lambda (x) + (define (augmented-format-string fmt) + (string-append "~:[~*~;guix ~a: ~]~a" (syntax->datum fmt))) + + (syntax-case x (N_ _) ; these are literals, yeah... + ((name (_ fmt) args (... ...)) + (string? (syntax->datum #'fmt)) + (with-syntax ((fmt* (augmented-format-string #'fmt)) + (prefix (datum->syntax x prefix))) + #'(format (guix-warning-port) (gettext fmt*) + (program-name) (program-name) prefix + args (... ...)))) + ((name (N_ singular plural n) args (... ...)) + (and (string? (syntax->datum #'singular)) + (string? (syntax->datum #'plural))) + (with-syntax ((s (augmented-format-string #'singular)) + (p (augmented-format-string #'plural)) + (prefix (datum->syntax x prefix))) + #'(format (guix-warning-port) + (ngettext s p n %gettext-domain) + (program-name) (program-name) prefix + args (... ...)))))))) + +(define-diagnostic warning "warning: ") ; emit a warning + +(define-diagnostic report-error "error: ") +(define-syntax-rule (leave args ...) + "Emit an error message and exit." + (begin + (report-error args ...) + (exit 1))) (define (guix-main arg0 . args) (initialize-guix) diff --git a/po/POTFILES.in b/po/POTFILES.in index bdb894db20..528e7a6aa7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -9,4 +9,5 @@ guix/scripts/download.scm guix/scripts/package.scm guix/scripts/gc.scm guix/scripts/pull.scm +guix/gnu-maintenance.scm guix/ui.scm -- cgit v1.2.3 From fcdf58c46ceca31145ae817b7dee820ecf864b8f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 21 Apr 2013 11:18:22 +0200 Subject: gnu: guile: Update to 2.0.9. * gnu/packages/guile.scm (guile-2.0): Update to 2.0.9. (guile-2.0/fixed): Keep at 2.0.7. --- gnu/packages/guile.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 763584d7dc..e0896ec6e8 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -99,14 +99,14 @@ extensible. It supports many SRFIs.") (define-public guile-2.0 (package (name "guile") - (version "2.0.7") + (version "2.0.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "0f53pxkia4v17n0avwqlcjpy0n89hkazm2xsa6p84lv8k6k8y9vg")))) + "0nw9y8vjyz4r61v06p9msks5lm58pd91irmzg4k487vmv743h2pp")))) (build-system gnu-build-system) (native-inputs `(("pkgconfig" ,pkg-config))) (inputs `(("libffi" ,libffi) @@ -151,7 +151,15 @@ call interface, and powerful string processing.") (define-public guile-2.0/fixed ;; A package of Guile 2.0 that's rarely changed. It is the one used ;; in the `base' module, and thus changing it entails a full rebuild. - guile-2.0) + (package (inherit guile-2.0) + (version "2.0.7") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/guile/guile-" version + ".tar.xz")) + (sha256 + (base32 + "0f53pxkia4v17n0avwqlcjpy0n89hkazm2xsa6p84lv8k6k8y9vg")))))) ;;; -- cgit v1.2.3 From 6ed80bed48208d4a6e7a8aa394689b7274bace87 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Apr 2013 02:54:56 -0400 Subject: gnu: gprolog: Update to 1.4.3 and download from GNU mirrors * gnu/packages/gprolog.scm (gprolog): Update to 1.4.3. Download from GNU mirrors. --- gnu/packages/gprolog.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gprolog.scm b/gnu/packages/gprolog.scm index c362a7bc11..7f7cbe0178 100644 --- a/gnu/packages/gprolog.scm +++ b/gnu/packages/gprolog.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov +;;; Copyright © 2013 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,15 +26,15 @@ (define-public gprolog (package (name "gprolog") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) - (uri (string-append "http://www.gprolog.org/gprolog-" - version ".tar.gz")) + (uri (string-append "mirror://gnu/gprolog/gprolog-" version + ".tar.gz")) (sha256 (base32 - "0y25c2gwz41i6g28qyfjklrmanzgk0c8cr4jn2s7s8qgd9dnm1fm")))) + "16yl6q9ydx9d8lphg9xkk53l1m0fq0kpvrhry8njsxhhncazm4j2")))) (build-system gnu-build-system) (arguments `(#:phases (alist-cons-before -- cgit v1.2.3 From 2306f7ab4bab7bf916bc7997a4aae48008690135 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Apr 2013 22:41:17 -0400 Subject: gnu: groff: Update to 1.22.2. * gnu/packages/groff.scm (groff): Update to 1.22.2. --- gnu/packages/groff.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index 5265faeee5..0bdb67f0bb 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -31,13 +31,13 @@ (define-public groff (package (name "groff") - (version "1.22.1") + (version "1.22.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/groff/groff-" version ".tar.gz")) (sha256 (base32 - "1kihja9sj182pqms8lah2nn3y96rqccws7w04f7f7wpy84vs5bvn")))) + "0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd6821q")))) (build-system gnu-build-system) (inputs `(("bison" ,bison) ("ghostscript" ,ghostscript) -- cgit v1.2.3 From 693b57e41c9e472f712495a99fc43bfde1dd02c2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Apr 2013 22:52:35 -0400 Subject: gnu: smalltalk: Update to 3.2.5. * gnu/packages/smalltalk.scm (smalltalk): Update to 3.2.5. --- gnu/packages/smalltalk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 1b4a3289ac..976e526a7b 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -26,7 +26,7 @@ (define-public smalltalk (package (name "smalltalk") - (version "3.2.4") + (version "3.2.5") (source (origin (method url-fetch) @@ -34,7 +34,7 @@ version ".tar.xz")) (sha256 (base32 - "1bdhbppjv1fswh4ls9q90zix38l1hg9qd4c4bz1pbg1af991xq3a")))) + "1k2ssrapfzhngc7bg1zrnd9n2vyxp9c9m70byvsma6wapbvib6l1")))) (build-system gnu-build-system) (inputs `(("zip" ,zip))) (arguments -- cgit v1.2.3 From 19c9664d9350afddb34fb9ea339ad243a5246718 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Apr 2013 22:56:01 -0400 Subject: gnu: xorriso: Update to 1.2.8. * gnu/packages/cdrom.scm (xorriso): Update to 1.2.8. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index ccab52fc56..4f721ba624 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -88,14 +88,14 @@ well as utility programs such as an audio CD player and an extractor.") (define-public xorriso (package (name "xorriso") - (version "1.2.4") + (version "1.2.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/xorriso/xorriso-" version ".tar.gz")) (sha256 (base32 - "1b2xh2x9fz4ihwfrmjzhbkfsrwi9c3zpmchgk7hqlkydzfgydwz8")))) + "1h3w9ymhsi0wghcnl7mmlml40rm4yill1c75g90xc7r1a2g8k1mn")))) (build-system gnu-build-system) (inputs `(("acl" ,acl) -- cgit v1.2.3 From 867b14108d4ee1313c02d29283fb0aa22c60e806 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 24 Apr 2013 17:13:21 -0400 Subject: gnu: hop: Update hash to match hop-2.4.0.tar.gz, which was modified in place. * gnu/packages/scheme.scm (hop): Update the hash. --- gnu/packages/scheme.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 49b6df9b0d..5eebb58379 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -197,7 +197,7 @@ between Scheme and C# programs.") version ".tar.gz")) (sha256 (base32 - "04fhy5jp9lq12fmdqfjzj1w32f7nxc80fagbj7pfci7xh86nm2c5")))) + "1v2r4ga58kk1sx0frn8qa8ccmjpic9csqzpk499wc95y9c4b1wy3")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 825d0ebc5bce008c58e9525eda071cd1880ffb0c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Apr 2013 00:06:19 +0200 Subject: gnu: libtasn1: Update to 3.3. * gnu/packages/gnutls.scm (libtasn1): Update to 3.3. --- gnu/packages/gnutls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnutls.scm b/gnu/packages/gnutls.scm index e817198db3..77eb30c3dd 100644 --- a/gnu/packages/gnutls.scm +++ b/gnu/packages/gnutls.scm @@ -31,7 +31,7 @@ (define-public libtasn1 (package (name "libtasn1") - (version "3.2") + (version "3.3") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.gz")) (sha256 (base32 - "0gvgndypwicchf7m660zh7jdgmkfj9g9xavpcc08pyd0120y0bk7")))) + "1h1sz5py8zlg4yczybr6wa925pyadvjcxrdmhilwaqqgs4n2lrcj")))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/libtasn1/") (synopsis "ASN.1 library") -- cgit v1.2.3 From f6f207b80317634cf832b229160e9036dd75be1b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Apr 2013 00:06:39 +0200 Subject: gnu: nettle: Update to 2.7. * gnu/packages/nettle.scm (nettle): Update to 2.7. --- gnu/packages/nettle.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index 3ea4eb79e1..e4dbadecce 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -27,14 +27,14 @@ (define-public nettle (package (name "nettle") - (version "2.6") + (version "2.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nettle/nettle-" version ".tar.gz")) (sha256 (base32 - "0mminj3fg0vba8qx4q6dbf0xz6fskamli7z2r8rci5xrcd7n5pv0")))) + "1mnl5i1136p47lrklm0mhnnv3gjakza385zvxz12qf057h9ym562")))) (build-system gnu-build-system) (inputs `(("m4" ,m4))) (propagated-inputs `(("gmp" ,gmp))) -- cgit v1.2.3 From 9e623d068dc5ed9c9e0ac5bdf2dce1d6b78ed6ac Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Apr 2013 00:10:15 +0200 Subject: gnu: wdiff: Update to 1.2.1. * gnu/packages/wdiff.scm (wdiff): Update to 1.2.1. Add Texinfo as an input. --- gnu/packages/wdiff.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wdiff.scm b/gnu/packages/wdiff.scm index b9fccb97db..6aa6b2a67a 100644 --- a/gnu/packages/wdiff.scm +++ b/gnu/packages/wdiff.scm @@ -21,13 +21,14 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (gnu packages texinfo) #:use-module (gnu packages screen) #:use-module (gnu packages which)) (define-public wdiff (package (name "wdiff") - (version "1.1.2") + (version "1.2.1") (source (origin (method url-fetch) @@ -35,7 +36,7 @@ version ".tar.gz")) (sha256 (base32 - "0q78y5awvjjmsvizqilbpwany62shlmlq2ayxkjbygmdafpk1k8j")))) + "1gb5hpiyikada9bwz63q3g96zs383iskiir0xsqynqnvq1vd4n41")))) (build-system gnu-build-system) (arguments `(#:phases (alist-cons-before @@ -46,7 +47,10 @@ (string-append "#!" (which "sh"))))) %standard-phases))) (inputs `(("screen" ,screen) - ("which" ,which))) + ("which" ,which) + + ;; For some reason wdiff.info gets rebuilt. + ("texinfo" ,texinfo))) (home-page "https://www.gnu.org/software/wdiff/") (synopsis "Word difference finder") (description -- cgit v1.2.3 From 6c211361fecc1979b71043155fe826fda0d71f93 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Apr 2013 23:07:59 +0200 Subject: gnu: ed: Update to 1.8. * gnu/packages/ed.scm (ed): Update to 1.8. --- gnu/packages/ed.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm index 0f387be797..e9ded33dd8 100644 --- a/gnu/packages/ed.scm +++ b/gnu/packages/ed.scm @@ -26,14 +26,14 @@ (define-public ed (package (name "ed") - (version "1.6") + (version "1.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ed/ed-" version ".tar.gz")) (sha256 (base32 - "0rcay0wci2kiwil2h505b674cblmn4nq8pqw9g9pgqmaqjq6f711")))) + "0wvj190ky5i0gm0pilx9k75l6alyc6h5s14fm3dbk90y7g9kihb4")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("CC=gcc") -- cgit v1.2.3 From acfc0df5cee7a05b8bfc64282d64000481421b13 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Apr 2013 23:18:20 +0200 Subject: gnu: nano: Update to 2.3.2. * gnu/packages/nano.scm (nano): Update to 2.3.2. --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index f80400d88b..6ded15df2a 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -28,7 +28,7 @@ (define-public nano (package (name "nano") - (version "2.2.6") + (version "2.3.2") (source (origin (method url-fetch) @@ -36,7 +36,7 @@ version ".tar.gz")) (sha256 (base32 - "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y")))) + "1s3b21h5p7r8xafw0gahswj16ai6k2vnjhmd15b491hl0x494c7z")))) (build-system gnu-build-system) (inputs `(("gettext" ,guix:gettext) -- cgit v1.2.3 From 777fabf096fff03eb4886f1e9ef7d02d9a4c65b1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Apr 2013 23:19:52 +0200 Subject: gnu: dejagnu: Update to 1.5.1. * gnu/packages/dejagnu.scm (dejagnu): Update to 1.5.1. --- gnu/packages/dejagnu.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dejagnu.scm b/gnu/packages/dejagnu.scm index 999d976ec7..3318c81726 100644 --- a/gnu/packages/dejagnu.scm +++ b/gnu/packages/dejagnu.scm @@ -26,7 +26,7 @@ (define-public dejagnu (package (name "dejagnu") - (version "1.5") + (version "1.5.1") (source (origin (method url-fetch) @@ -34,7 +34,7 @@ version ".tar.gz")) (sha256 (base32 - "1nx3x3h96a82q92q108q71giv2nz9xmbbn2nrlr3wvvs6l45id68")))) + "1lik8h4qi7x0mhsi8xmj91an1yb63rjbk6v4xrmzgiy5lk8lgrv0")))) (build-system gnu-build-system) (inputs `(("expect" ,expect))) (arguments -- cgit v1.2.3 From 2b6bdf7eb3c95716ac107ea6caea2e0b7077ae77 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Apr 2013 23:21:49 +0200 Subject: gnu: libgcrypt: Update to 1.5.2. * gnu/packages/gnupg.scm (libgcrypt): Update to 1.5.2. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index f96071e072..2a610af2ed 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -57,14 +57,14 @@ Daemon and possibly more in the future.") (define-public libgcrypt (package (name "libgcrypt") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" version ".tar.bz2")) (sha256 (base32 - "09z5zbxhvg6c7n8qcm8h9ygr28qli2n83hfq1f69jsg711cb37md")))) + "0gwnzqd64cpwdmk93nll54nidsr74jpimxzj4p4z7502ylwl66p4")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error" ,libgpg-error))) -- cgit v1.2.3