From 15756a7a12891ee973671611fb0ab62fafcc444e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 12 Jan 2014 22:44:39 +0100 Subject: gnu: Add Aspell dictionaries. * gnu/packages/aspell.scm (aspell-dictionary): New procedure. (aspell-dict-en, aspell-dict-eo, aspell-dict-es, aspell-dict-fr): New variables. --- gnu/packages/aspell.scm | 73 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index c1db358a3b..122daa7136 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2014 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,7 +21,8 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix licenses) - #:use-module (gnu packages perl)) + #:use-module (gnu packages perl) + #:use-module (gnu packages which)) (define-public aspell (package @@ -45,3 +46,71 @@ a standalone program. Notable features of Aspell include its full support of documents written in the UTF-8 encoding and its ability to use multiple dictionaries, including personal ones.") (license lgpl2.1+))) + + +;;; +;;; Dictionaries. +;;; +;;; Use 'export ASPELL_CONF="dict-dir $HOME/.guix-profile/lib/aspell"' to use them. +;;; + +(define* (aspell-dictionary dict-name full-name + #:key version sha256 (prefix "aspell6-")) + (package + (name (string-append "aspell-dict-" dict-name)) + (version version) + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/aspell/dict/" dict-name + "/" prefix dict-name "-" + version ".tar.bz2")) + (sha256 sha256))) + (build-system gnu-build-system) + (arguments + `(#:phases (alist-replace + 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (zero? (system* "./configure")))) + %standard-phases) + #:make-flags (let ((out (assoc-ref %outputs "out"))) + (list (string-append "dictdir=" out "/lib/aspell") + (string-append "datadir=" out "/lib/aspell"))) + #:tests? #f)) + (native-inputs `(("aspell" ,aspell) + ("which" ,which))) + (synopsis (string-append full-name " dictionary for GNU Aspell")) ; XXX: i18n + (description + "This package provides a dictionary for the GNU Aspell spell checker.") + (license gpl2+) + (home-page "http://aspell.net/"))) + + +(define-public aspell-dict-en + (aspell-dictionary "en" "English" + #:version "7.1-0" + #:sha256 + (base32 + "02ldfiny4iakgfgy4sdrzjqdzi7l1rmb6y30lv31kfy5x31g77gz"))) + +(define-public aspell-dict-eo + (aspell-dictionary "eo" "Esperanto" + #:version "2.1.20000225a-2" + #:sha256 + (base32 + "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"))) + +(define-public aspell-dict-es + (aspell-dictionary "es" "Spanish" + #:version "1.11-2" + #:sha256 + (base32 + "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"))) + +(define-public aspell-dict-fr + (aspell-dictionary "fr" "French" + #:version "0.50-3" + #:prefix "aspell-" + #:sha256 + (base32 + "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"))) -- cgit v1.2.3 From d50f242d508c256cf943d1d5207faaceab3ec8bb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jan 2014 00:37:16 +0100 Subject: gnu: guile-ssh: Remove now unneeded cruft. * gnu/packages/ssh.scm (guile-ssh): Remove libssh version hack from 'autoreconf' phase. --- gnu/packages/ssh.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 2197388902..5d21eeeb01 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -199,12 +199,6 @@ Additionally, various channel-specific options can be negotiated.") '(#:phases (alist-cons-before 'configure 'autoreconf (lambda* (#:key inputs #:allow-other-keys) - ;; The 'configure' script would want libssh 0.5.4, but that - ;; doesn't exist. - (substitute* "configure.ac" - (("0\\.5\\.4") - "0.5.3")) - (substitute* "src/Makefile.am" (("-lssh_threads" match) (string-append "-L" (assoc-ref inputs "libssh") -- cgit v1.2.3 From 40d806afae296c22a4e5abf48f1c2f0a709c21b1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jan 2014 18:47:31 +0100 Subject: gnu: Add GnuPG's pinentry. * gnu/packages/gnupg.scm (pinentry): New variable. --- gnu/packages/gnupg.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index ad666cc365..ed5209edc4 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; ;;; This file is part of GNU Guix. @@ -27,6 +27,10 @@ #:use-module (gnu packages readline) #:use-module ((gnu packages compression) #:renamer (symbol-prefix-proc 'guix:)) + #:use-module (gnu packages gtk) + #:use-module (gnu packages glib) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages ncurses) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -393,3 +397,28 @@ including tools for signing keys, keyring analysis, and party preparation. ;; http://packages.debian.org/changelogs/pool/main/s/signing-party/current/copyright (license gpl2) (home-page "http://pgp-tools.alioth.debian.org/"))) + +(define-public pinentry + (package + (name "pinentry") + (version "0.8.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/pinentry/pinentry-" + version ".tar.bz2")) + (sha256 + (base32 + "1bd047crf7xb8g61mval8v6qww98rddlsw2dz6j8h8qbnl4hp2sn")))) + (build-system gnu-build-system) + (inputs + `(("ncurses" ,ncurses) + ("gtk+" ,gtk+-2) + ("glib" ,glib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://gnupg.org/aegypten2/") + (synopsis "GnuPG's interface to passphrase input") + (description + "Pinentry provides a console and a GTK+ GUI that allows users to +enter a passphrase when `gpg' or `gpg2' is run and needs it.") + (license gpl2+))) -- cgit v1.2.3 From 6869e5c90c3d7861150dba96fc97ee87892da83f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jan 2014 18:47:59 +0100 Subject: gnu: Add aumix. * gnu/packages/linux.scm (aumix): New variable. --- gnu/packages/linux.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 826a5d7a73..5e80a5837d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; Copyright © 2012 Nikita Karetnikov ;;; ;;; This file is part of GNU Guix. @@ -819,3 +819,24 @@ an interactive mode where the user can experiment various power management settings for cases where the operating system has not enabled these settings.") (license gpl2))) + +(define-public aumix + (package + (name "aumix") + (version "2.9.1") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.jpj.net/~trevor/aumix/releases/aumix-" + version ".tar.bz2")) + (sha256 + (base32 + "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj")))) + (build-system gnu-build-system) + (inputs `(("ncurses" ,ncurses))) + (home-page "http://www.jpj.net/~trevor/aumix.html") + (synopsis "Audio mixer for X and the console") + (description + "Aumix adjusts an audio mixer from X, the console, a terminal, +the command line or a script.") + (license gpl2+))) -- cgit v1.2.3 From 3e424f2541fc4c9ff972f3d0009266280dd6b5de Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jan 2014 18:53:26 +0100 Subject: gnu: Add libtirpc. * gnu/packages/onc-rpc.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 3 ++- gnu/packages/onc-rpc.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/onc-rpc.scm (limited to 'gnu/packages') diff --git a/gnu-system.am b/gnu-system.am index fbf61d6ec1..52d1ff8044 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013 Ludovic Courtès +# Copyright © 2012, 2013, 2014 Ludovic Courtès # Copyright © 2013 Andreas Enge # Copyright © 2013 Mark H Weaver # @@ -145,6 +145,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/ocaml.scm \ gnu/packages/ocrad.scm \ gnu/packages/oggvorbis.scm \ + gnu/packages/onc-rpc.scm \ gnu/packages/openldap.scm \ gnu/packages/openssl.scm \ gnu/packages/package-management.scm \ diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm new file mode 100644 index 0000000000..8861b0e8db --- /dev/null +++ b/gnu/packages/onc-rpc.scm @@ -0,0 +1,55 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 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 onc-rpc) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu)) + +(define-public libtirpc + (package + (name "libtirpc") + (version "0.2.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libtirpc/" + version "/libtirpc-" + version ".tar.bz2")) + (sha256 + (base32 + "18a337wa4amf0k21wnimp3yzs5l3cxqndz4x3x8bm993zhfy5hs5")))) + (build-system gnu-build-system) + (arguments + '(;; Doesn't work with GNU GSS. + #:configure-flags '("--disable-gssapi") + + #:phases (alist-cons-after + 'unpack 'remote-dangling-symlink + (lambda _ + ;; Remote the dangling symlinks since it breaks the + ;; 'patch-source-shebangs' file tree traversal. + (delete-file "INSTALL")) + %standard-phases))) + (home-page "http://sourceforge.net/projects/libtirpc/") + (synopsis "Transport-independent Sun/ONC RPC implementation") + (description + "This package provides a library that implements the Sun/ONC RPC (remote +procedure calls) protocol in a transport-independent manner. It supports both +IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).") + (license bsd-3))) -- cgit v1.2.3 From c73d4c9276ea15b326923e46ca8eb02f410fa45c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jan 2014 21:27:57 +0100 Subject: gnu: Add ISC's DHCP implementation. * gnu/packages/system.scm (isc-dhcp): New variable. --- gnu/packages/system.scm | 87 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/system.scm b/gnu/packages/system.scm index 536234f4aa..9b263a0b1b 100644 --- a/gnu/packages/system.scm +++ b/gnu/packages/system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; ;;; This file is part of GNU Guix. @@ -25,10 +25,12 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages ncurses) #:use-module (gnu packages linux) #:use-module (gnu packages guile) #:use-module (gnu packages gettext) + #:use-module (gnu packages perl) #:use-module ((gnu packages base) #:select (tar)) #:use-module ((gnu packages compression) @@ -343,3 +345,86 @@ would need and has several interesting built-in capabilities.") "GNU Alive sends periodic pings to a server, generally to keep a connection alive.") (license gpl3+))) + +(define-public isc-dhcp + (package + (name "isc-dhcp") + (version "4.3.0a1") + (source (origin + (method url-fetch) + (uri (string-append "http://ftp.isc.org/isc/dhcp/" + version "/dhcp-" version ".tar.gz")) + (sha256 + (base32 + "0001n26m4488nl95h53wg60sywbli4d246vz2h8lpv70jlrq9q1p")))) + (build-system gnu-build-system) + (arguments + '(#:phases (alist-cons-after + 'configure 'post-configure + (lambda* (#:key outputs #:allow-other-keys) + ;; Point to the right client script, which will be + ;; installed in a later phase. + (substitute* "includes/dhcpd.h" + (("#define[[:blank:]]+_PATH_DHCLIENT_SCRIPT.*") + (let ((out (assoc-ref outputs "out"))) + (string-append "#define _PATH_DHCLIENT_SCRIPT \"" + out "/libexec/dhclient-script" + "\"\n")))) + + ;; During the 'build' phase, 'bind.tar.gz' is extracted, so + ;; we must patch shebangs in there and make sure the right + ;; shell is used. + (with-directory-excursion "bind" + (substitute* "Makefile" + (("\\./configure") + (let ((sh (which "sh"))) + (string-append "./configure CONFIG_SHELL=" + sh " SHELL=" sh)))) + + (system* "tar" "xf" "bind.tar.gz") + (for-each patch-shebang + (find-files "bind-9.9.5b1" ".*")) + (zero? (system* "tar" "cf" "bind.tar.gz" + "bind-9.9.5b1")))) + (alist-cons-after + 'install 'post-install + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Install the dhclient script for GNU/Linux and make sure + ;; if finds all the programs it needs. + (let* ((out (assoc-ref outputs "out")) + (libexec (string-append out "/libexec")) + (coreutils (assoc-ref inputs "coreutils")) + (net-tools (assoc-ref inputs "net-tools")) + (sed (assoc-ref inputs "sed"))) + (substitute* "client/scripts/linux" + (("/sbin/ip") + (string-append (assoc-ref inputs "iproute") + "/sbin/ip"))) + + (mkdir-p libexec) + (copy-file "client/scripts/linux" + (string-append libexec "/dhclient-script")) + + (wrap-program (string-append libexec "/dhclient-script") + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin:" + dir "/sbin")) + (list net-tools coreutils sed)))))) + %standard-phases)))) + + (native-inputs `(("perl" ,perl))) + + ;; Even Coreutils and sed are needed here in case we're cross-compiling. + (inputs `(("coreutils" ,coreutils) + ("sed" ,sed) + ("net-tools" ,net-tools) + ("iproute" ,iproute))) + + (home-page "http://www.isc.org/products/DHCP/") + (synopsis "Dynamic Host Configuration Protocol (DHCP) tools") + (description + "ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a +reference implementation of all aspects of DHCP, through a suite of DHCP +tools: server, client, and relay agent.") + (license (bsd-style "http://www.isc.org/sw/dhcp/dhcp-copyright.php")))) -- cgit v1.2.3 From 4aeea896f8de7c1643c9462b2080ff84314afc79 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jan 2014 21:32:39 +0100 Subject: gnu: Rename (gnu packages system) to (gnu packages admin). * gnu/packages/system.scm: Rename to... * gnu/packages/admin.scm: ... this. Adjust module name accordingly. * gnu-system.am (GNU_SYSTEM_MODULES): Update. --- gnu-system.am | 2 +- gnu/packages/admin.scm | 430 ++++++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/system.scm | 430 ------------------------------------------------ 3 files changed, 431 insertions(+), 431 deletions(-) create mode 100644 gnu/packages/admin.scm delete mode 100644 gnu/packages/system.scm (limited to 'gnu/packages') diff --git a/gnu-system.am b/gnu-system.am index 52d1ff8044..0ac867fc42 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -25,6 +25,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages.scm \ gnu/packages/acct.scm \ gnu/packages/acl.scm \ + gnu/packages/admin.scm \ gnu/packages/algebra.scm \ gnu/packages/apl.scm \ gnu/packages/apr.scm \ @@ -181,7 +182,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/sqlite.scm \ gnu/packages/ssh.scm \ gnu/packages/swig.scm \ - gnu/packages/system.scm \ gnu/packages/tcl.scm \ gnu/packages/tcsh.scm \ gnu/packages/texinfo.scm \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm new file mode 100644 index 0000000000..59516c7101 --- /dev/null +++ b/gnu/packages/admin.scm @@ -0,0 +1,430 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2013 Cyril Roelandt +;;; +;;; 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 admin) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) + #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages linux) + #:use-module (gnu packages guile) + #:use-module (gnu packages gettext) + #:use-module (gnu packages perl) + #:use-module ((gnu packages base) + #:select (tar)) + #:use-module ((gnu packages compression) + #:select (gzip)) + #:use-module (gnu packages pkg-config)) + +(define-public dmd + (package + (name "dmd") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "ftp://alpha.gnu.org/gnu/dmd/dmd-" + version ".tar.gz")) + (sha256 + (base32 + "07mddw0p62fcphwjzgb6rfa0pjz5sy6jzbha0sm2vc3rqf459jxg")) + (patches (list (search-patch "dmd-getpw.patch"))))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--localstatedir=/var"))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("guile" ,guile-2.0))) + (synopsis "Daemon managing daemons") + (description + "GNU DMD is a daemon-managing daemon, meaning that it manages the +execution of system services, replacing similar functionality found in +typical init systems. It provides dependency-handling through a convenient +interface and is based on GNU Guile.") + (license gpl3+) + (home-page "http://www.gnu.org/software/dmd/"))) + +(define-public dfc + (package + (name "dfc") + (version "3.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "http://projects.gw-computing.net/attachments/download/78/dfc-" + version ".tar.gz")) + (sha256 + (base32 + "1b4hfqv23l87cb37fxwzfk2sgspkyxpr3ig2hsd23hr6mm982j7z")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) ; There are no tests. + (native-inputs `(("gettext" ,gnu-gettext))) + (home-page "http://projects.gw-computing.net/projects/dfc") + (synopsis "Display file system space usage using graphs and colors") + (description + "dfc (df color) is a modern version of df. It uses colors, draws pretty +graphs and can export its output to different formats.") + (license bsd-3))) + +(define-public htop + (package + (name "htop") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/htop/" + version "/htop-" version ".tar.gz")) + (sha256 + (base32 + "18fqrhvnm7h4c3939av8lpiwrwxbyw6hcly0jvq0vkjf0ixnaq7f")))) + (build-system gnu-build-system) + (inputs + `(("ncurses" ,ncurses))) + (home-page "http://htop.sourceforge.net/") + (synopsis "Interactive process viewer") + (description + "This is htop, an interactive process viewer. It is a text-mode +application (for console or X terminals) and requires ncurses.") + (license gpl2))) + +(define-public pies + (package + (name "pies") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/pies/pies-" + version ".tar.bz2")) + (sha256 + (base32 + "18w0dbg77i56cx1bwa789w0qi3l4xkkbascxcv2b6gbm0zmjg1g6")))) + (build-system gnu-build-system) + (home-page "http://www.gnu.org/software/pies/") + (synopsis "Program invocation and execution supervisor") + (description + "GNU pies is a program that supervises the invocation and execution of +other programs. It reads the list of programs to be started from its +configuration file, executes them, and then monitors their status, +re-executing them as necessary.") + (license gpl3+))) + +(define-public inetutils + (package + (name "inetutils") + (version "1.9.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/inetutils/inetutils-" + version ".tar.gz")) + (sha256 + (base32 + "0azzg6njgq79byl6960kb0wihfhhzf49snslhxgvi30ribgfpa82")) + (patches + (list (search-patch "diffutils-gets-undeclared.patch"))))) + (build-system gnu-build-system) + (arguments `(;; FIXME: `tftp.sh' relies on `netstat' from utils-linux, + ;; which is currently missing. + #:tests? #f)) + (inputs `(("ncurses" ,ncurses))) + (home-page "http://www.gnu.org/software/inetutils/") + (synopsis "Basic networking utilities") + (description + "Inetutils is a collection of common network programs, such as an ftp +client and server, a telnet client and server, and an rsh client and server.") + (license gpl3+))) + +(define-public shadow + (package + (name "shadow") + (version "4.1.5.1") + (source (origin + (method url-fetch) + (uri (string-append + "http://pkg-shadow.alioth.debian.org/releases/shadow-" + version ".tar.bz2")) + (sha256 + (base32 + "1yvqx57vzih0jdy3grir8vfbkxp0cl0myql37bnmi2yn90vk6cma")))) + (build-system gnu-build-system) + (arguments + '(;; Assume System V `setpgrp (void)', which is the default on GNU + ;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.) + #:configure-flags '("--with-libpam" "ac_cv_func_setpgrp_void=yes") + + #:phases (alist-cons-before + 'build 'set-nscd-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Use the right file name for nscd. + (let ((libc (assoc-ref inputs "libc"))) + (substitute* "lib/nscd.c" + (("/usr/sbin/nscd") + (string-append libc "/sbin/nscd"))))) + (alist-cons-after + 'install 'remove-groups + (lambda* (#:key outputs #:allow-other-keys) + ;; Remove `groups', which is already provided by Coreutils. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man1"))) + (delete-file (string-append bin "/groups")) + (for-each delete-file (find-files man "^groups\\.")) + #t)) + %standard-phases)))) + + (inputs (if (string-suffix? "-linux" + (or (%current-target-system) + (%current-system))) + `(("linux-pam" ,linux-pam)) + '())) + (home-page "http://pkg-shadow.alioth.debian.org/") + (synopsis "Authentication-related tools such as passwd, su, and login") + (description + "Shadow provides a number of authentication-related tools, including: +login, passwd, su, groupadd, and useradd.") + + ;; The `vipw' program is GPLv2+. + ;; libmisc/salt.c is public domain. + (license bsd-3))) + +(define-public mingetty + (package + (name "mingetty") + (version "1.08") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/mingetty/mingetty-" + version ".tar.gz")) + (sha256 + (base32 + "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g")))) + (build-system gnu-build-system) + (arguments + `(#:phases (alist-replace 'configure + (lambda* (#:key inputs outputs + #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man8 (string-append + out "/share/man/man8")) + (sbin (string-append out "/sbin")) + (shadow (assoc-ref inputs "shadow")) + (login (string-append shadow + "/bin/login"))) + (substitute* "Makefile" + (("^SBINDIR.*") + (string-append "SBINDIR = " out + "/sbin\n")) + (("^MANDIR.*") + (string-append "MANDIR = " out + "/share/man/man8\n"))) + + ;; Pick the right 'login' by default. + (substitute* "mingetty.c" + (("\"/bin/login\"") + (string-append "\"" login "\""))) + + (mkdir-p sbin) + (mkdir-p man8))) + %standard-phases) + #:tests? #f)) ; no tests + (inputs `(("shadow" ,shadow))) + + (home-page "http://sourceforge.net/projects/mingetty") + (synopsis "Getty for the text console") + (description + "Small console getty that is started on the Linux text console, +asks for a login name and then transfers over to 'login'. It is extended to +allow automatic login and starting any app.") + (license gpl2+))) + +(define-public net-base + (package + (name "net-base") + (version "5.1") + (source (origin + (method url-fetch) + (uri (string-append + "http://ftp.de.debian.org/debian/pool/main/n/netbase/netbase_" + version ".tar.gz")) + (sha256 + (base32 + "17l8xk2x632id5f9x9v5fs9wqc650hldd2lf3dh90r1zisj1ya8d")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils) + (srfi srfi-26)) + + (let* ((source (assoc-ref %build-inputs "source")) + (tar (assoc-ref %build-inputs "tar")) + (gzip (assoc-ref %build-inputs "gzip")) + (output (assoc-ref %outputs "out")) + (etc (string-append output "/etc"))) + (setenv "PATH" (string-append gzip "/bin")) + (system* (string-append tar "/bin/tar") "xvf" + source) + (chdir ,(string-append "netbase-" version)) + (mkdir-p etc) + (for-each copy-file + '("etc-services" "etc-protocols" "etc-rpc") + (map (cut string-append etc "/" <>) + '("services" "protocols" "rpc"))) + #t)))) + (native-inputs `(("tar" ,tar) + ("gzip" ,gzip))) + (synopsis "IANA protocol, port, and RPC number assignments") + (description + "This package provides the /etc/services, /etc/protocols, and /etc/rpc +files, which contain information about the IANA-assigned port, protocol, and +ONC RPC numbers") + (home-page "http://packages.debian.org/sid/netbase") + (license gpl2))) + +(define-public netcat + (package + (name "netcat") + (version "0.7.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/netcat/netcat-" + version ".tar.bz2")) + (sha256 + (base32 + "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm")))) + (build-system gnu-build-system) + (home-page "http://netcat.sourceforge.net") + (synopsis "Read and write data over TCP/IP") + (description + "Netcat is a featured networking utility which reads and writes data +across network connections, using the TCP/IP protocol. It is designed to be a +reliable \"back-end\" tool that can be used directly or easily driven by other +programs and scripts. At the same time, it is a feature-rich network debugging +and exploration tool, since it can create almost any kind of connection you +would need and has several interesting built-in capabilities.") + (license gpl2+))) + +(define-public alive + (package + (name "alive") + (version "2.0.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/alive/alive-" + version ".tar.xz")) + (sha256 + (base32 + "1vrzg51ai68x9yld7vbgl58sxaw5qpx8rbakwcxn4cqq6vpxj38j")))) + (build-system gnu-build-system) + (arguments '(#:configure-flags '("alive_cv_nice_ping=yes"))) + (inputs `(("guile" ,guile-2.0) + ("inetutils" ,inetutils))) + (home-page "http://www.gnu.org/software/alive/") + (synopsis "Autologin and keep-alive daemon") + (description + "GNU Alive sends periodic pings to a server, generally to keep a +connection alive.") + (license gpl3+))) + +(define-public isc-dhcp + (package + (name "isc-dhcp") + (version "4.3.0a1") + (source (origin + (method url-fetch) + (uri (string-append "http://ftp.isc.org/isc/dhcp/" + version "/dhcp-" version ".tar.gz")) + (sha256 + (base32 + "0001n26m4488nl95h53wg60sywbli4d246vz2h8lpv70jlrq9q1p")))) + (build-system gnu-build-system) + (arguments + '(#:phases (alist-cons-after + 'configure 'post-configure + (lambda* (#:key outputs #:allow-other-keys) + ;; Point to the right client script, which will be + ;; installed in a later phase. + (substitute* "includes/dhcpd.h" + (("#define[[:blank:]]+_PATH_DHCLIENT_SCRIPT.*") + (let ((out (assoc-ref outputs "out"))) + (string-append "#define _PATH_DHCLIENT_SCRIPT \"" + out "/libexec/dhclient-script" + "\"\n")))) + + ;; During the 'build' phase, 'bind.tar.gz' is extracted, so + ;; we must patch shebangs in there and make sure the right + ;; shell is used. + (with-directory-excursion "bind" + (substitute* "Makefile" + (("\\./configure") + (let ((sh (which "sh"))) + (string-append "./configure CONFIG_SHELL=" + sh " SHELL=" sh)))) + + (system* "tar" "xf" "bind.tar.gz") + (for-each patch-shebang + (find-files "bind-9.9.5b1" ".*")) + (zero? (system* "tar" "cf" "bind.tar.gz" + "bind-9.9.5b1")))) + (alist-cons-after + 'install 'post-install + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Install the dhclient script for GNU/Linux and make sure + ;; if finds all the programs it needs. + (let* ((out (assoc-ref outputs "out")) + (libexec (string-append out "/libexec")) + (coreutils (assoc-ref inputs "coreutils")) + (net-tools (assoc-ref inputs "net-tools")) + (sed (assoc-ref inputs "sed"))) + (substitute* "client/scripts/linux" + (("/sbin/ip") + (string-append (assoc-ref inputs "iproute") + "/sbin/ip"))) + + (mkdir-p libexec) + (copy-file "client/scripts/linux" + (string-append libexec "/dhclient-script")) + + (wrap-program (string-append libexec "/dhclient-script") + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin:" + dir "/sbin")) + (list net-tools coreutils sed)))))) + %standard-phases)))) + + (native-inputs `(("perl" ,perl))) + + ;; Even Coreutils and sed are needed here in case we're cross-compiling. + (inputs `(("coreutils" ,coreutils) + ("sed" ,sed) + ("net-tools" ,net-tools) + ("iproute" ,iproute))) + + (home-page "http://www.isc.org/products/DHCP/") + (synopsis "Dynamic Host Configuration Protocol (DHCP) tools") + (description + "ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a +reference implementation of all aspects of DHCP, through a suite of DHCP +tools: server, client, and relay agent.") + (license (bsd-style "http://www.isc.org/sw/dhcp/dhcp-copyright.php")))) diff --git a/gnu/packages/system.scm b/gnu/packages/system.scm deleted file mode 100644 index 9b263a0b1b..0000000000 --- a/gnu/packages/system.scm +++ /dev/null @@ -1,430 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès -;;; Copyright © 2013 Cyril Roelandt -;;; -;;; 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 system) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial) - #:use-module (gnu packages) - #:use-module (gnu packages base) - #:use-module (gnu packages ncurses) - #:use-module (gnu packages linux) - #:use-module (gnu packages guile) - #:use-module (gnu packages gettext) - #:use-module (gnu packages perl) - #:use-module ((gnu packages base) - #:select (tar)) - #:use-module ((gnu packages compression) - #:select (gzip)) - #:use-module (gnu packages pkg-config)) - -(define-public dmd - (package - (name "dmd") - (version "0.1") - (source (origin - (method url-fetch) - (uri (string-append "ftp://alpha.gnu.org/gnu/dmd/dmd-" - version ".tar.gz")) - (sha256 - (base32 - "07mddw0p62fcphwjzgb6rfa0pjz5sy6jzbha0sm2vc3rqf459jxg")) - (patches (list (search-patch "dmd-getpw.patch"))))) - (build-system gnu-build-system) - (arguments - '(#:configure-flags '("--localstatedir=/var"))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.0))) - (synopsis "Daemon managing daemons") - (description - "GNU DMD is a daemon-managing daemon, meaning that it manages the -execution of system services, replacing similar functionality found in -typical init systems. It provides dependency-handling through a convenient -interface and is based on GNU Guile.") - (license gpl3+) - (home-page "http://www.gnu.org/software/dmd/"))) - -(define-public dfc - (package - (name "dfc") - (version "3.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "http://projects.gw-computing.net/attachments/download/78/dfc-" - version ".tar.gz")) - (sha256 - (base32 - "1b4hfqv23l87cb37fxwzfk2sgspkyxpr3ig2hsd23hr6mm982j7z")))) - (build-system cmake-build-system) - (arguments '(#:tests? #f)) ; There are no tests. - (native-inputs `(("gettext" ,gnu-gettext))) - (home-page "http://projects.gw-computing.net/projects/dfc") - (synopsis "Display file system space usage using graphs and colors") - (description - "dfc (df color) is a modern version of df. It uses colors, draws pretty -graphs and can export its output to different formats.") - (license bsd-3))) - -(define-public htop - (package - (name "htop") - (version "1.0.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/htop/" - version "/htop-" version ".tar.gz")) - (sha256 - (base32 - "18fqrhvnm7h4c3939av8lpiwrwxbyw6hcly0jvq0vkjf0ixnaq7f")))) - (build-system gnu-build-system) - (inputs - `(("ncurses" ,ncurses))) - (home-page "http://htop.sourceforge.net/") - (synopsis "Interactive process viewer") - (description - "This is htop, an interactive process viewer. It is a text-mode -application (for console or X terminals) and requires ncurses.") - (license gpl2))) - -(define-public pies - (package - (name "pies") - (version "1.2") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/pies/pies-" - version ".tar.bz2")) - (sha256 - (base32 - "18w0dbg77i56cx1bwa789w0qi3l4xkkbascxcv2b6gbm0zmjg1g6")))) - (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/pies/") - (synopsis "Program invocation and execution supervisor") - (description - "GNU pies is a program that supervises the invocation and execution of -other programs. It reads the list of programs to be started from its -configuration file, executes them, and then monitors their status, -re-executing them as necessary.") - (license gpl3+))) - -(define-public inetutils - (package - (name "inetutils") - (version "1.9.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/inetutils/inetutils-" - version ".tar.gz")) - (sha256 - (base32 - "0azzg6njgq79byl6960kb0wihfhhzf49snslhxgvi30ribgfpa82")) - (patches - (list (search-patch "diffutils-gets-undeclared.patch"))))) - (build-system gnu-build-system) - (arguments `(;; FIXME: `tftp.sh' relies on `netstat' from utils-linux, - ;; which is currently missing. - #:tests? #f)) - (inputs `(("ncurses" ,ncurses))) - (home-page "http://www.gnu.org/software/inetutils/") - (synopsis "Basic networking utilities") - (description - "Inetutils is a collection of common network programs, such as an ftp -client and server, a telnet client and server, and an rsh client and server.") - (license gpl3+))) - -(define-public shadow - (package - (name "shadow") - (version "4.1.5.1") - (source (origin - (method url-fetch) - (uri (string-append - "http://pkg-shadow.alioth.debian.org/releases/shadow-" - version ".tar.bz2")) - (sha256 - (base32 - "1yvqx57vzih0jdy3grir8vfbkxp0cl0myql37bnmi2yn90vk6cma")))) - (build-system gnu-build-system) - (arguments - '(;; Assume System V `setpgrp (void)', which is the default on GNU - ;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.) - #:configure-flags '("--with-libpam" "ac_cv_func_setpgrp_void=yes") - - #:phases (alist-cons-before - 'build 'set-nscd-file-name - (lambda* (#:key inputs #:allow-other-keys) - ;; Use the right file name for nscd. - (let ((libc (assoc-ref inputs "libc"))) - (substitute* "lib/nscd.c" - (("/usr/sbin/nscd") - (string-append libc "/sbin/nscd"))))) - (alist-cons-after - 'install 'remove-groups - (lambda* (#:key outputs #:allow-other-keys) - ;; Remove `groups', which is already provided by Coreutils. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (man (string-append out "/share/man/man1"))) - (delete-file (string-append bin "/groups")) - (for-each delete-file (find-files man "^groups\\.")) - #t)) - %standard-phases)))) - - (inputs (if (string-suffix? "-linux" - (or (%current-target-system) - (%current-system))) - `(("linux-pam" ,linux-pam)) - '())) - (home-page "http://pkg-shadow.alioth.debian.org/") - (synopsis "Authentication-related tools such as passwd, su, and login") - (description - "Shadow provides a number of authentication-related tools, including: -login, passwd, su, groupadd, and useradd.") - - ;; The `vipw' program is GPLv2+. - ;; libmisc/salt.c is public domain. - (license bsd-3))) - -(define-public mingetty - (package - (name "mingetty") - (version "1.08") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/mingetty/mingetty-" - version ".tar.gz")) - (sha256 - (base32 - "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g")))) - (build-system gnu-build-system) - (arguments - `(#:phases (alist-replace 'configure - (lambda* (#:key inputs outputs - #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man8 (string-append - out "/share/man/man8")) - (sbin (string-append out "/sbin")) - (shadow (assoc-ref inputs "shadow")) - (login (string-append shadow - "/bin/login"))) - (substitute* "Makefile" - (("^SBINDIR.*") - (string-append "SBINDIR = " out - "/sbin\n")) - (("^MANDIR.*") - (string-append "MANDIR = " out - "/share/man/man8\n"))) - - ;; Pick the right 'login' by default. - (substitute* "mingetty.c" - (("\"/bin/login\"") - (string-append "\"" login "\""))) - - (mkdir-p sbin) - (mkdir-p man8))) - %standard-phases) - #:tests? #f)) ; no tests - (inputs `(("shadow" ,shadow))) - - (home-page "http://sourceforge.net/projects/mingetty") - (synopsis "Getty for the text console") - (description - "Small console getty that is started on the Linux text console, -asks for a login name and then transfers over to 'login'. It is extended to -allow automatic login and starting any app.") - (license gpl2+))) - -(define-public net-base - (package - (name "net-base") - (version "5.1") - (source (origin - (method url-fetch) - (uri (string-append - "http://ftp.de.debian.org/debian/pool/main/n/netbase/netbase_" - version ".tar.gz")) - (sha256 - (base32 - "17l8xk2x632id5f9x9v5fs9wqc650hldd2lf3dh90r1zisj1ya8d")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let* ((source (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (gzip (assoc-ref %build-inputs "gzip")) - (output (assoc-ref %outputs "out")) - (etc (string-append output "/etc"))) - (setenv "PATH" (string-append gzip "/bin")) - (system* (string-append tar "/bin/tar") "xvf" - source) - (chdir ,(string-append "netbase-" version)) - (mkdir-p etc) - (for-each copy-file - '("etc-services" "etc-protocols" "etc-rpc") - (map (cut string-append etc "/" <>) - '("services" "protocols" "rpc"))) - #t)))) - (native-inputs `(("tar" ,tar) - ("gzip" ,gzip))) - (synopsis "IANA protocol, port, and RPC number assignments") - (description - "This package provides the /etc/services, /etc/protocols, and /etc/rpc -files, which contain information about the IANA-assigned port, protocol, and -ONC RPC numbers") - (home-page "http://packages.debian.org/sid/netbase") - (license gpl2))) - -(define-public netcat - (package - (name "netcat") - (version "0.7.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/netcat/netcat-" - version ".tar.bz2")) - (sha256 - (base32 - "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm")))) - (build-system gnu-build-system) - (home-page "http://netcat.sourceforge.net") - (synopsis "Read and write data over TCP/IP") - (description - "Netcat is a featured networking utility which reads and writes data -across network connections, using the TCP/IP protocol. It is designed to be a -reliable \"back-end\" tool that can be used directly or easily driven by other -programs and scripts. At the same time, it is a feature-rich network debugging -and exploration tool, since it can create almost any kind of connection you -would need and has several interesting built-in capabilities.") - (license gpl2+))) - -(define-public alive - (package - (name "alive") - (version "2.0.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/alive/alive-" - version ".tar.xz")) - (sha256 - (base32 - "1vrzg51ai68x9yld7vbgl58sxaw5qpx8rbakwcxn4cqq6vpxj38j")))) - (build-system gnu-build-system) - (arguments '(#:configure-flags '("alive_cv_nice_ping=yes"))) - (inputs `(("guile" ,guile-2.0) - ("inetutils" ,inetutils))) - (home-page "http://www.gnu.org/software/alive/") - (synopsis "Autologin and keep-alive daemon") - (description - "GNU Alive sends periodic pings to a server, generally to keep a -connection alive.") - (license gpl3+))) - -(define-public isc-dhcp - (package - (name "isc-dhcp") - (version "4.3.0a1") - (source (origin - (method url-fetch) - (uri (string-append "http://ftp.isc.org/isc/dhcp/" - version "/dhcp-" version ".tar.gz")) - (sha256 - (base32 - "0001n26m4488nl95h53wg60sywbli4d246vz2h8lpv70jlrq9q1p")))) - (build-system gnu-build-system) - (arguments - '(#:phases (alist-cons-after - 'configure 'post-configure - (lambda* (#:key outputs #:allow-other-keys) - ;; Point to the right client script, which will be - ;; installed in a later phase. - (substitute* "includes/dhcpd.h" - (("#define[[:blank:]]+_PATH_DHCLIENT_SCRIPT.*") - (let ((out (assoc-ref outputs "out"))) - (string-append "#define _PATH_DHCLIENT_SCRIPT \"" - out "/libexec/dhclient-script" - "\"\n")))) - - ;; During the 'build' phase, 'bind.tar.gz' is extracted, so - ;; we must patch shebangs in there and make sure the right - ;; shell is used. - (with-directory-excursion "bind" - (substitute* "Makefile" - (("\\./configure") - (let ((sh (which "sh"))) - (string-append "./configure CONFIG_SHELL=" - sh " SHELL=" sh)))) - - (system* "tar" "xf" "bind.tar.gz") - (for-each patch-shebang - (find-files "bind-9.9.5b1" ".*")) - (zero? (system* "tar" "cf" "bind.tar.gz" - "bind-9.9.5b1")))) - (alist-cons-after - 'install 'post-install - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Install the dhclient script for GNU/Linux and make sure - ;; if finds all the programs it needs. - (let* ((out (assoc-ref outputs "out")) - (libexec (string-append out "/libexec")) - (coreutils (assoc-ref inputs "coreutils")) - (net-tools (assoc-ref inputs "net-tools")) - (sed (assoc-ref inputs "sed"))) - (substitute* "client/scripts/linux" - (("/sbin/ip") - (string-append (assoc-ref inputs "iproute") - "/sbin/ip"))) - - (mkdir-p libexec) - (copy-file "client/scripts/linux" - (string-append libexec "/dhclient-script")) - - (wrap-program (string-append libexec "/dhclient-script") - `("PATH" ":" prefix - ,(map (lambda (dir) - (string-append dir "/bin:" - dir "/sbin")) - (list net-tools coreutils sed)))))) - %standard-phases)))) - - (native-inputs `(("perl" ,perl))) - - ;; Even Coreutils and sed are needed here in case we're cross-compiling. - (inputs `(("coreutils" ,coreutils) - ("sed" ,sed) - ("net-tools" ,net-tools) - ("iproute" ,iproute))) - - (home-page "http://www.isc.org/products/DHCP/") - (synopsis "Dynamic Host Configuration Protocol (DHCP) tools") - (description - "ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a -reference implementation of all aspects of DHCP, through a suite of DHCP -tools: server, client, and relay agent.") - (license (bsd-style "http://www.isc.org/sw/dhcp/dhcp-copyright.php")))) -- cgit v1.2.3 From 9de46ffb1ca6190811aabaeeca7a75bbbd372c2b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jan 2014 23:21:47 +0100 Subject: gnu: Changes references to (gnu packages admin). * gnu/packages/version-control.scm, gnu/packages/vim.scm, gnu/system.scm, gnu/system/dmd.scm, gnu/system/shadow.scm, gnu/system/vm.scm: Change references to (gnu packages system) to (gnu packages admin). This is a followup to commit 4aeea89. --- gnu/packages/version-control.scm | 2 +- gnu/packages/vim.scm | 2 +- gnu/system.scm | 4 ++-- gnu/system/dmd.scm | 2 +- gnu/system/shadow.scm | 2 +- gnu/system/vm.scm | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 82ccc1fd28..8c371c780b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -35,7 +35,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages sqlite) - #:use-module (gnu packages system) + #:use-module (gnu packages admin) #:use-module (gnu packages xml) #:use-module (gnu packages emacs) #:use-module (gnu packages compression) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 0b532ae4e2..4d05567a22 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -25,7 +25,7 @@ #:use-module (gnu packages gawk) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) - #:use-module (gnu packages system) ; For GNU hostname + #:use-module (gnu packages admin) ; For GNU hostname #:use-module (gnu packages tcsh)) (define-public vim diff --git a/gnu/system.scm b/gnu/system.scm index 0516112553..6fd753f8fd 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -25,7 +25,7 @@ #:use-module (gnu packages linux-initrd) #:use-module (gnu packages base) #:use-module (gnu packages bash) - #:use-module (gnu packages system) + #:use-module (gnu packages admin) #:use-module (gnu packages package-management) #:use-module (gnu system dmd) #:use-module (gnu system grub) @@ -288,7 +288,7 @@ alias ll='ls -l' (append-map service-pam-services services)))) (bash-file (package-file bash "bin/bash")) - (dmd-file (package-file (@ (gnu packages system) dmd) "bin/dmd")) + (dmd-file (package-file (@ (gnu packages admin) dmd) "bin/dmd")) (accounts -> (cons (user-account (name "root") (password "") diff --git a/gnu/system/dmd.scm b/gnu/system/dmd.scm index 7cd5f05f78..2143b00426 100644 --- a/gnu/system/dmd.scm +++ b/gnu/system/dmd.scm @@ -23,7 +23,7 @@ #:use-module (guix records) #:use-module ((gnu packages base) #:select (glibc-final)) - #:use-module ((gnu packages system) + #:use-module ((gnu packages admin) #:select (mingetty inetutils shadow)) #:use-module ((gnu packages package-management) #:select (guix)) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index ca24c3df2b..2a85a20ebb 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -21,7 +21,7 @@ #:use-module (guix records) #:use-module (guix packages) #:use-module (guix monads) - #:use-module ((gnu packages system) + #:use-module ((gnu packages admin) #:select (shadow)) #:use-module (gnu packages bash) #:use-module (srfi srfi-1) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 5932a22b99..e75c09d859 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -39,7 +39,7 @@ #:use-module (gnu packages package-management) #:use-module ((gnu packages make-bootstrap) #:select (%guile-static-stripped)) - #:use-module (gnu packages system) + #:use-module (gnu packages admin) #:use-module (gnu system shadow) #:use-module (gnu system linux) -- cgit v1.2.3 From 8f0fd238d4ff64c3c2a0a05f7b82d3abd067a3ea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 14 Jan 2014 00:14:12 +0100 Subject: gnu: Add mpc123. * gnu/packages/mp3.scm (libmpcdec, mpc123): New variables. --- gnu/packages/mp3.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index a8eeb952b9..73cbf40fac 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages oggvorbis) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages gettext) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -266,3 +267,64 @@ a few mouse clicks to convert an entire album. It supports CDDB lookups for album and track information.") (license license:gpl2) (home-page "http://sourceforge.net/projects/ripperx/"))) + +(define-public libmpcdec + (package + (name "libmpcdec") + (version "1.2.6") + (source (origin + (method url-fetch) + (uri (string-append + "http://files.musepack.net/source/libmpcdec-" + version ".tar.bz2")) + (sha256 + (base32 + "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab")))) + (build-system gnu-build-system) + (synopsis "Decoding library for the Musepack audio format") + (description + "This library supports decoding of the Musepack (MPC) audio compression +format.") + (license license:bsd-3) + (home-page "http://musepack.net"))) + +(define-public mpc123 + (package + (name "mpc123") + (version "0.2.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/mpc123/version%20" + version "/mpc123-" version ".tar.gz")) + (sha256 + (base32 + "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1")))) + (build-system gnu-build-system) + (arguments + '(#:phases (alist-replace + 'configure + (lambda _ + (substitute* "Makefile" + (("CC[[:blank:]]*:=.*") + "CC := gcc\n"))) + (alist-replace + 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (copy-file "mpc123" (string-append bin "/mpc123")))) + %standard-phases)) + #:tests? #f)) + + (native-inputs + `(("gettext" ,gnu-gettext))) + (inputs + `(("libao" ,ao) + ("libmpcdec" ,libmpcdec))) + (home-page "http://mpc123.sourceforge.net/") + (synopsis "Audio player for Musepack-formatted files") + (description + "mpc123 is a command-line player for files in the Musepack audio +compression format (.mpc files.)") + (license license:gpl2+))) -- cgit v1.2.3 From 9927622f3fddd475a4bd84cf4b3c1d45f2f111e1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 14 Jan 2014 09:11:13 +0100 Subject: gnu: inetutils: Upgrade to 1.9.2. * gnu/packages/admin.scm (inetutils): Upgrade to 1.9.2. Add Readline as an input. --- gnu/packages/admin.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 59516c7101..7d8b1c3b4a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages ncurses) + #:use-module (gnu packages readline) #:use-module (gnu packages linux) #:use-module (gnu packages guile) #:use-module (gnu packages gettext) @@ -132,21 +133,20 @@ re-executing them as necessary.") (define-public inetutils (package (name "inetutils") - (version "1.9.1") + (version "1.9.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/inetutils/inetutils-" version ".tar.gz")) (sha256 (base32 - "0azzg6njgq79byl6960kb0wihfhhzf49snslhxgvi30ribgfpa82")) - (patches - (list (search-patch "diffutils-gets-undeclared.patch"))))) + "04wrm0v7l4890mmbaawd6wjwdv08bkglgqhpz0q4dkb0l50fl8q4")))) (build-system gnu-build-system) (arguments `(;; FIXME: `tftp.sh' relies on `netstat' from utils-linux, ;; which is currently missing. #:tests? #f)) - (inputs `(("ncurses" ,ncurses))) + (inputs `(("ncurses" ,ncurses) + ("readline" ,readline))) ; for 'ftp' (home-page "http://www.gnu.org/software/inetutils/") (synopsis "Basic networking utilities") (description -- cgit v1.2.3 From 16f68e48402e35acc840777b439dc46bfab28658 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2014 00:15:55 +0100 Subject: gnu: Add Taylor UUCP. * gnu/packages/uucp.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + gnu/packages/uucp.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 gnu/packages/uucp.scm (limited to 'gnu/packages') diff --git a/gnu-system.am b/gnu-system.am index 0ac867fc42..360630823e 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -189,6 +189,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/time.scm \ gnu/packages/tmux.scm \ gnu/packages/tor.scm \ + gnu/packages/uucp.scm \ gnu/packages/unrtf.scm \ gnu/packages/valgrind.scm \ gnu/packages/version-control.scm \ diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm new file mode 100644 index 0000000000..b412bed9d9 --- /dev/null +++ b/gnu/packages/uucp.scm @@ -0,0 +1,56 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 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 uucp) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu)) + +(define-public uucp + (package + (name "uucp") + (version "1.07") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/uucp/uucp-" + version ".tar.gz")) + (sha256 + (base32 + "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306")))) + (build-system gnu-build-system) + (arguments + '(#:phases (alist-replace + 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; The old 'configure' script doesn't support the arguments + ;; that we pass by default. + (setenv "CONFIG_SHELL" (which "sh")) + (let ((out (assoc-ref outputs "out"))) + (zero? (system* "./configure" + (string-append "--prefix=" out) + (string-append "--infodir=" out + "/share/info"))))) + %standard-phases))) + (home-page "http://www.gnu.org/software/uucp/uucp.html") + (synopsis "UUCP protocol implementation") + (description + "Taylor UUCP is the GNU implementation of UUCP (Unix-to-Unix Copy), a +set of utilities for remotely transferring files, email and net news +between computers.") + (license gpl2+))) -- cgit v1.2.3 From da923d11d2c760f41a23fa7f1a079b93413f0ca4 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 15 Jan 2014 15:11:57 +0100 Subject: gnu: valgrind: Update to 2.9.0. * gnu/packages/valgrind.scm (valgrind): Update to 2.9.0. --- gnu/packages/valgrind.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm index 8eb5a48190..183adb0271 100644 --- a/gnu/packages/valgrind.scm +++ b/gnu/packages/valgrind.scm @@ -28,14 +28,14 @@ (define-public valgrind (package (name "valgrind") - (version "3.8.1") + (version "3.9.0") (source (origin (method url-fetch) (uri (string-append "http://valgrind.org/downloads/valgrind-" version ".tar.bz2")) (sha256 (base32 - "1nsqk70ry3221sd62s4f0njcrncppszs4xxjcak13lxyfq2y0fs7")) + "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6")) (patches (list (search-patch "valgrind-glibc.patch"))))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 2a5e15c6e1c2ea0847e720df92df9570087673cf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2014 13:06:50 +0100 Subject: gnu: git: 'git-submodule' works even if Perl is not in $PATH. * gnu/packages/version-control.scm (git): Add 'native-inputs' field; move Gettext there from 'inputs'. In 'split' phase, wrap the 'git-submodule' script. --- gnu/packages/version-control.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8c371c780b..3d69eee5cd 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2014 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; ;;; This file is part of GNU Guix. @@ -83,10 +83,12 @@ as well as the classic centralized workflow.") (base32 "156bwqqgaw65rsvbb4wih5jfg94bxyf6p16mdwf0ky3f4ln55s2i")))) (build-system gnu-build-system) + (native-inputs + `(("native-perl" ,perl) + ("gettext" ,gnu-gettext))) (inputs `(("curl" ,curl) ("expat" ,expat) - ("gettext" ,gnu-gettext) ("openssl" ,openssl) ("perl" ,perl) ("python" ,python-2) ; CAVEAT: incompatible with python-3 according to INSTALL @@ -136,7 +138,9 @@ as well as the classic centralized workflow.") (git-cit (string-append out "/libexec/git-core/git-citool")) (git-cit* (string-append gui "/libexec/git-core/git-citool")) (git-svn (string-append out "/libexec/git-core/git-svn")) - (git-svn* (string-append svn "/libexec/git-core/git-svn"))) + (git-svn* (string-append svn "/libexec/git-core/git-svn")) + (git-sm (string-append out + "/libexec/git-core/git-submodule"))) (mkdir-p (string-append gui "/bin")) (mkdir-p (string-append gui "/libexec/git-core")) (mkdir-p (string-append svn "/libexec/git-core")) @@ -163,6 +167,12 @@ as well as the classic centralized workflow.") (,(string-append (assoc-ref inputs "subversion") "/lib")))) + ;; Tell 'git-submodule' where Perl is. + (wrap-program git-sm + `("PATH" ":" prefix + (,(string-append (assoc-ref inputs "perl") + "/bin")))) + ;; Tell 'git' to look for core programs in the user's profile. ;; This allows user to install other outputs of this package and ;; have them transparently taken into account. There's a -- cgit v1.2.3 From e7d6f7bfa05a56f2dd1473715f9fea1b5030d529 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 15 Jan 2014 18:50:10 +0100 Subject: gnu: pspp: Upgrade to 0.8.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (pspp): Update to 0.8.2. * gnu/packages/patches/pspp-tests.patch: Deleted. * gnu-system.am: Removed pspp-tests.patch from the manifest. Signed-off-by: Ludovic Courtès --- gnu-system.am | 1 - gnu/packages/maths.scm | 5 ++--- gnu/packages/patches/pspp-tests.patch | 13 ------------- 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 gnu/packages/patches/pspp-tests.patch (limited to 'gnu/packages') diff --git a/gnu-system.am b/gnu-system.am index 360630823e..6ed6371d8b 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -276,7 +276,6 @@ dist_patch_DATA = \ gnu/packages/patches/perl-no-sys-dirs.patch \ gnu/packages/patches/plotutils-libpng-jmpbuf.patch \ gnu/packages/patches/procps-make-3.82.patch \ - gnu/packages/patches/pspp-tests.patch \ gnu/packages/patches/pulseaudio-test-timeouts.patch \ gnu/packages/patches/pulseaudio-volume-test.patch \ gnu/packages/patches/python-fix-dbm.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d46fd160ad..640d502783 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -125,7 +125,7 @@ LP/MIP solver is included in the package.") (define-public pspp (package (name "pspp") - (version "0.8.1") + (version "0.8.2") (source (origin (method url-fetch) @@ -133,8 +133,7 @@ LP/MIP solver is included in the package.") version ".tar.gz")) (sha256 (base32 - "0qhxsdbwxd3cn1shc13wxvx2lg32lp4z6sz24kv3jz7p5xfi8j7x")) - (patches (list (search-patch "pspp-tests.patch"))))) + "1w7h3dglgx0jlq1wb605b8pgfsk2vr1q2q2rj7bsajh9ihbcsixr")))) (build-system gnu-build-system) (inputs `(("cairo" ,cairo) diff --git a/gnu/packages/patches/pspp-tests.patch b/gnu/packages/patches/pspp-tests.patch deleted file mode 100644 index 3e61b68804..0000000000 --- a/gnu/packages/patches/pspp-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/output/render-test.c b/tests/output/render-test.c -index 5f4c1da..e9df96c 100644 ---- a/tests/output/render-test.c -+++ b/tests/output/render-test.c -@@ -142,7 +142,7 @@ configure_drivers (int width, int length) - string_map_insert (&options, "left-margin", "0"); - string_map_insert (&options, "right-margin", "0"); - string_map_insert_nocopy (&options, xstrdup ("paper-size"), -- xasprintf ("%dx%dpt", width * 5, length * 8)); -+ xasprintf ("%dx%dpt", width * 5, length * 16)); - driver = output_driver_create (&options); - if (driver == NULL) - exit (EXIT_FAILURE); -- cgit v1.2.3 From 9208d0c1a0ac673b383565f7bfb9040161f28b10 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Jan 2014 22:47:55 +0100 Subject: gnu: Add libexif, libgphoto2, and gphoto2. * gnu/packages/photo.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + gnu/packages/photo.scm | 121 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 gnu/packages/photo.scm (limited to 'gnu/packages') diff --git a/gnu-system.am b/gnu-system.am index 6ed6371d8b..43f95b3d23 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -156,6 +156,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/pdf.scm \ gnu/packages/pem.scm \ gnu/packages/perl.scm \ + gnu/packages/photo.scm \ gnu/packages/pkg-config.scm \ gnu/packages/plotutils.scm \ gnu/packages/popt.scm \ diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm new file mode 100644 index 0000000000..8bc2079f4c --- /dev/null +++ b/gnu/packages/photo.scm @@ -0,0 +1,121 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 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 photo) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages libusb) + #:use-module (gnu packages autotools) + #:use-module (gnu packages readline) + #:use-module (gnu packages popt) + #:use-module ((gnu packages base) #:select (tzdata))) + +(define-public libexif + (package + (name "libexif") + (version "0.6.21") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libexif/libexif-" + version ".tar.bz2")) + (sha256 + (base32 + "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n")))) + (build-system gnu-build-system) + (home-page "http://libexif.sourceforge.net/") + (synopsis "Read and manipulate EXIF data in digital photographs") + (description + "The libexif C library allows applications to read, edit, and save EXIF +data as produced by digital cameras.") + (license lgpl2.1+))) + +(define-public libgphoto2 + (package + (name "libgphoto2") + (version "2.5.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/gphoto/libgphoto2-" + version ".tar.bz2")) + (sha256 + (base32 + "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3")))) + (build-system gnu-build-system) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(;; ("libjpeg-turbo" ,libjpeg-turbo) + ("libtool" ,libtool) + ("libusb" ,libusb))) + (propagated-inputs + `(;; The .pc refers to libexif. + ("libexif" ,libexif))) + (home-page "http://www.gphoto.org/proj/libgphoto2/") + (synopsis "Accessing digital cameras") + (description + "This is the library backend for gphoto2. It contains the code for PTP, +MTP, and other vendor specific protocols for controlling and transferring data +from digital cameras.") + + ;; 'COPYING' says LGPLv2.1+, but in practices files are under LGPLv2+. + (license lgpl2.1+))) + +(define-public gphoto2 + (package + (name "gphoto2") + (version "2.5.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/gphoto/gphoto2-" + version ".tar.bz2")) + (sha256 + (base32 + "16c8k1cxfypg7v5h8xi87grclw7a5ayaamn548ys3zkj727r5fcf")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("readline" ,readline) + ;; ("libjpeg-turbo" ,libjpeg-turbo) + ("popt" ,popt) + ("libexif" ,libexif) + ("libgphoto2" ,libgphoto2))) + (arguments + '(#:phases (alist-cons-before + 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "tests/data" "\\.param$") + (("/usr/bin/env") + (which "env")))) + %standard-phases) + + ;; FIXME: There are 2 test failures, most likely related to the build + ;; environment. + #:tests? #f)) + + (home-page "http://www.gphoto.org/") + (synopsis "Command-line tools to access digital cameras") + (description + "Gphoto2 is a set of command line utilities for manipulating a large +number of different digital cameras. Through libgphoto2, it supports PTP, +MTP, and much more.") + + ;; Files are typically under LGPLv2+, but 'COPYING' says GPLv2+. + (license gpl2+))) -- cgit v1.2.3 From c915b404b2550418af197504622480dee79812f4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jan 2014 23:47:31 +0100 Subject: gnu: Add DocBook DTD and XSL style sheets. * gnu/packages/docbook.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + gnu/packages/docbook.scm | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 gnu/packages/docbook.scm (limited to 'gnu/packages') diff --git a/gnu-system.am b/gnu-system.am index 43f95b3d23..47995b5cbe 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -54,6 +54,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/cyrus-sasl.scm \ gnu/packages/dejagnu.scm \ gnu/packages/ddrescue.scm \ + gnu/packages/docbook.scm \ gnu/packages/dwm.scm \ gnu/packages/ed.scm \ gnu/packages/elf.scm \ diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm new file mode 100644 index 0000000000..f6d20097e4 --- /dev/null +++ b/gnu/packages/docbook.scm @@ -0,0 +1,100 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 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 docbook) + #:use-module (gnu packages) + #:use-module (gnu packages compression) + #:use-module ((gnu packages base) + #:select (tar)) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system trivial) + #:autoload (gnu packages zip) (unzip)) + +(define-public docbook-xml + (package + (name "docbook-xml") + (version "4.5") + (source (origin + (method url-fetch) + (uri (string-append "http://www.docbook.org/xml/" version + "/docbook-xml-" version ".zip")) + (sha256 + (base32 + "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf")))) + (build-system trivial-build-system) + (arguments + '(#:builder (begin + (use-modules (guix build utils)) + + (let* ((unzip + (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip")) + (source (assoc-ref %build-inputs "source")) + (out (assoc-ref %outputs "out")) + (dtd (string-append out "/xml/dtd/docbook"))) + (mkdir-p dtd) + (with-directory-excursion dtd + (system* unzip source)))) + #:modules ((guix build utils)))) + (native-inputs `(("unzip" ,unzip))) + (home-page "http://docbook.org") + (synopsis "DocBook XML DTDs for document authoring") + (description + "DocBook is general purpose XML and SGML document type particularly well +suited to books and papers about computer hardware and software (though it is +by no means limited to these applications.) This package provides XML DTDs.") + (license (x11-style "" "See file headers.")))) + +(define-public docbook-xsl + (package + (name "docbook-xsl") + (version "1.72.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/docbook/docbook-xsl-" + version ".tar.bz2")) + (sha256 + (base32 + "1cnrfgqz8pc9wnlgqjch2338ad7jki6d4h6b2fhaxn1a2201df5k")))) + (build-system trivial-build-system) + (arguments + `(#:builder (begin + (use-modules (guix build utils)) + + (let* ((bzip2 (assoc-ref %build-inputs "bzip2")) + (tar (assoc-ref %build-inputs "tar")) + (source (assoc-ref %build-inputs "source")) + (out (assoc-ref %outputs "out")) + (xsl (string-append out "/xml/xsl"))) + (setenv "PATH" (string-append bzip2 "/bin")) + (system* (string-append tar "/bin/tar") "xvf" source) + + (mkdir-p xsl) + (copy-recursively (string-append ,name "-" ,version) + (string-append xsl "/" ,name + "-" ,version)))) + #:modules ((guix build utils)))) + (native-inputs `(("bzip2" ,bzip2) + ("tar" ,tar))) + (home-page "http://docbook.org") + (synopsis "DocBook XSL style sheets for document authoring") + (description + "This package provides XSL style sheets for DocBook.") + (license (x11-style "" "See 'COPYING' file.")))) -- cgit v1.2.3 From 10b4d0f6ff7585158bce489b358a27bce5e6f5a8 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 18 Jan 2014 14:15:39 +0100 Subject: gnu: gl: Correct copyright notice. * gnu/packages/gl.scm: Add copyright notice for mesa, moved here from module xorg in commit 200726e. --- gnu/packages/gl.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index ee8aed9284..65b9fbc666 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Guy Grant ;;; ;;; This file is part of GNU Guix. -- cgit v1.2.3 From 8bb1699bd515b5c1445c5643284b350eb3157d1f Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 18 Jan 2014 15:14:00 +0100 Subject: gnu: mesa: Propagate input. * gnu/packages/gl.scm (mesa): Propagate input libx11. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 65b9fbc666..796f7f0211 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -139,12 +139,12 @@ Polygon meshes, and Extruded polygon meshes") (propagated-inputs `(("glproto" ,glproto) ("libdrm" ,libdrm-2.4.33) + ("libx11" ,libx11) ("libxdamage" ,libxdamage) ("libxxf86vm" ,libxxf86vm))) (inputs `(("dri2proto" ,dri2proto) ("expat" ,expat) - ("libx11" ,libx11) ("libxfixes" ,libxfixes) ("libxml2" ,libxml2) ("makedepend" ,makedepend))) -- cgit v1.2.3 From 00585a55822be497acde19c4d0bfd3857e52cc4f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 20 Jan 2014 01:06:22 +0100 Subject: gnu: glib: Upgrade to 2.39.1. * gnu/packages/glib.scm (glib): Upgrade to 2.39.1. Run tests sequentially. * gnu/packages/patches/glib-tests-desktop.patch: Adjust for 2.39.1. Add hunk for gsettings.c. --- gnu/packages/glib.scm | 12 ++++++---- gnu/packages/patches/glib-tests-desktop.patch | 32 ++++++++++++++++++++------- 2 files changed, 32 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 6fc283467c..0560915b24 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2014 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; @@ -106,14 +106,14 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.38.0") + (version "2.39.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0cpzqadqk6z6bmb79p04pykxc8x57rvshh33414cnk41bvgaf4vm")) + (base32 "0lqi6z47068vgh91fm59jn0kq969wf3g2q8k4m33jsb0amprg36h")) (patches (list (search-patch "glib-tests-homedir.patch") (search-patch "glib-tests-desktop.patch") (search-patch "glib-tests-prlimit.patch") @@ -155,7 +155,11 @@ shared NFS home directories.") ;; Note: `--docdir' and `--htmldir' are not honored, so work around it. #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") - "/share/gtk-doc")))) + "/share/gtk-doc")) + + ;; In 'gio/tests', 'gdbus-test-codegen-generated.h' is #included in a + ;; file that gets compiled possibly before it has been fully generated. + #:parallel-tests? #f)) (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME") (description "GLib provides data structure handling for C, portability wrappers, diff --git a/gnu/packages/patches/glib-tests-desktop.patch b/gnu/packages/patches/glib-tests-desktop.patch index 0824e68963..efa877c59e 100644 --- a/gnu/packages/patches/glib-tests-desktop.patch +++ b/gnu/packages/patches/glib-tests-desktop.patch @@ -38,12 +38,13 @@ database, the `update-desktop-database' program, which we don't provide. return g_test_run (); } ---- glib-2.37.1/gio/tests/desktop-app-info.c 2013-06-07 23:46:28.000000000 +0200 -+++ glib-2.37.1/gio/tests/desktop-app-info.c 2013-06-07 23:46:32.000000000 +0200 -@@ -385,6 +385,7 @@ main (int argc, + +--- glib-2.39.1/gio/tests/desktop-app-info.c 2013-06-07 23:46:28.000000000 +0200 ++++ glib-2.39.1/gio/tests/desktop-app-info.c 2013-06-07 23:46:32.000000000 +0200 +@@ -699,6 +699,7 @@ main (int argc, g_setenv ("XDG_DATA_HOME", basedir, TRUE); cleanup_subdirs (basedir); - + + return 0; g_test_add_func ("/desktop-app-info/delete", test_delete); g_test_add_func ("/desktop-app-info/default", test_default); @@ -54,9 +55,9 @@ database, the `update-desktop-database' program, which we don't provide. The hunk below removes tests that depend on `gdbus-testserver.py', because that script depends on python-gobject. ---- glib-2.38.0.orig/gio/tests/Makefile.in 2013-09-23 23:07:46.000000000 +0200 -+++ glib-2.38.0/gio/tests/Makefile.in 2013-09-30 21:55:35.000000000 +0200 -@@ -172,19 +172,12 @@ +--- glib-2.39.1/gio/tests/Makefile.in 2014-01-20 00:18:16.000000000 +0100 ++++ glib-2.39.1/gio/tests/Makefile.in 2014-01-20 00:18:47.000000000 +0100 +@@ -171,20 +171,13 @@ check_PROGRAMS = $(am__EXEEXT_14) @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@ gdbus-auth \ @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@ gdbus-bz627724 \ @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@ gdbus-close-pending \ @@ -72,10 +73,11 @@ because that script depends on python-gobject. @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@ gdbus-proxy-threads \ -@HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@ gdbus-proxy-well-known-name \ @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@ gdbus-test-codegen \ + @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@ gdbus-test-codegen-old \ -@HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@ gdbus-threading \ @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@ gmenumodel \ @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@ $(NULL) - + The test below depends on the availability /etc/passwd to dbus-daemon. @@ -105,3 +107,17 @@ The test dbus-appinfo is dropped as it hangs indefinitely since 2.37.5, see session_bus_up (); + +The test below fails for unknown reasons (!). + +--- glib-2.39.1/gio/tests/gsettings.c.orig 2014-01-20 00:45:04.000000000 +0100 ++++ glib-2.39.1/gio/tests/gsettings.c 2014-01-20 00:45:10.000000000 +0100 +@@ -2489,7 +2489,6 @@ main (int argc, char *argv[]) + g_test_add_func ("/gsettings/range/subprocess/high", test_range_high); + g_test_add_func ("/gsettings/range/subprocess/low", test_range_low); + g_test_add_func ("/gsettings/list-items", test_list_items); +- g_test_add_func ("/gsettings/list-schemas", test_list_schemas); + g_test_add_func ("/gsettings/mapped", test_get_mapped); + g_test_add_func ("/gsettings/get-range", test_get_range); + g_test_add_func ("/gsettings/schema-source", test_schema_source); + -- cgit v1.2.3 From a869565b983a76796cb45209f508901048a0fef3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jan 2014 00:21:19 +0100 Subject: gnu: Add GNU V.E.R.A. * gnu/packages/dictionaries.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + gnu/packages/dictionaries.scm | 78 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 gnu/packages/dictionaries.scm (limited to 'gnu/packages') diff --git a/gnu-system.am b/gnu-system.am index 47995b5cbe..d60371bcbf 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -54,6 +54,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/cyrus-sasl.scm \ gnu/packages/dejagnu.scm \ gnu/packages/ddrescue.scm \ + gnu/packages/dictionaries.scm \ gnu/packages/docbook.scm \ gnu/packages/dwm.scm \ gnu/packages/ed.scm \ diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm new file mode 100644 index 0000000000..4520c2149f --- /dev/null +++ b/gnu/packages/dictionaries.scm @@ -0,0 +1,78 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 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 dictionaries) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system trivial) + #:use-module (gnu packages base) + #:use-module (gnu packages texinfo) + #:use-module ((gnu packages compression) + #:select (gzip))) + +(define-public vera + (package + (name "vera") + (version "1.21a") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/vera/vera-" version + ".tar.gz")) + (sha256 + (base32 + "09qz1g8js8qw735wmd8kraqbk1d1997v3px2lcc58frf1r66bp8f")))) + (build-system trivial-build-system) + (arguments + `(#:builder (begin + (use-modules (guix build utils)) + + (let* ((out (assoc-ref %outputs "out")) + (info (string-append out "/share/info")) + (html (string-append out "/share/html")) + (source (assoc-ref %build-inputs "source")) + (tar (assoc-ref %build-inputs "tar")) + (gz (assoc-ref %build-inputs "gzip")) + (texi (assoc-ref %build-inputs "texinfo"))) + (setenv "PATH" (string-append gz "/bin")) + (system* (string-append tar "/bin/tar") "xvf" source) + + (chdir (string-append "vera-" ,version)) + (mkdir-p info) + (mkdir-p html) + + ;; XXX: Use '--force' because the document is unhappy + ;; with Texinfo 5 (yes, documents can be unhappy.) + (and (zero? + (system* (string-append texi "/bin/makeinfo") + "vera.texi" "--force" "-o" + (string-append info "/vera.info"))) + (zero? + (system* (string-append texi "/bin/makeinfo") + "vera.texi" "--force" "--html" "-o" + (string-append html "/vera.html")))))) + #:modules ((guix build utils)))) + (native-inputs `(("texinfo" ,texinfo) + ("tar" ,tar) + ("gzip" ,gzip))) + (home-page "http://savannah.gnu.org/projects/vera/") + (synopsis "List of acronyms") + (description + "V.E.R.A. (Virtual Entity of Relevant Acronyms) is a list of computing +acronyms distributed as an info document.") + (license fdl1.3+))) -- cgit v1.2.3 From e67f55516142699e45f354bb575c65a71a95742f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jan 2014 00:22:16 +0100 Subject: gnu: gnubik: Synchornize synopsis and description. * gnu/packages/games.scm (gnubik): Synchornize synopsis and description. --- gnu/packages/games.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0f5ae4174d..46fbd21805 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -86,10 +86,11 @@ representation of the playing board.") (native-inputs `(("gettext" ,gnu-gettext) ("pkg-config" ,pkg-config))) (home-page "https://www.gnu.org/software/gnubik/") - (synopsis "3d Rubik's cube game.") - (description "GNUbik is a puzzle game in which you must manipulate a cube to make + (synopsis "3d Rubik's cube game") + (description + "GNUbik is a puzzle game in which you must manipulate a cube to make each of its faces have a uniform color. The game is customizable, allowing you to set the size of the cube (the default is 3x3) or to change the colors. -You may even apply photos to the faces instead of colors. The game is + You may even apply photos to the faces instead of colors. The game is scriptable with Guile.") (license gpl3+))) -- cgit v1.2.3 From 463d6dac7debf38887a8a73fbd54d3ccb545e8e7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jan 2014 00:25:43 +0100 Subject: gnu: isc-dhcp: Fix license. * gnu/packages/admin.scm (isc-dhcp): Change license to ISC. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7d8b1c3b4a..dfbf20d56f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -427,4 +427,4 @@ connection alive.") "ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a reference implementation of all aspects of DHCP, through a suite of DHCP tools: server, client, and relay agent.") - (license (bsd-style "http://www.isc.org/sw/dhcp/dhcp-copyright.php")))) + (license isc))) -- cgit v1.2.3 From 6596ac398784c5d0961779b0c2ead3f4bc44118a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jan 2014 23:15:07 +0100 Subject: gnu: libgc: Explicitly mark license as 'x11-style'. * gnu/packages/bdw-gc.scm (libgc)[license]: Use 'x11-style'. --- gnu/packages/bdw-gc.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 7cce9671d1..f2d3119fef 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -59,6 +59,5 @@ Alternatively, the garbage collector may be used as a leak detector for C or C++ programs, though that is not its primary goal.") (home-page "http://www.hpl.hp.com/personal/Hans_Boehm/gc/") - ;; permissive X11-style license: - ;; http://www.hpl.hp.com/personal/Hans_Boehm/gc/license.txt - (license x11))) + (license + (x11-style "http://www.hpl.hp.com/personal/Hans_Boehm/gc/license.txt")))) -- cgit v1.2.3 From ad7583f6f55486636dbadd716e493ddadac255d2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jan 2014 23:44:20 +0100 Subject: gnu: Add libatomic_ops 7.4.0 and libgc 7.4.0. * gnu/packages/bdw-gc.scm (libatomic-ops, libgc-7.4): New variables. --- gnu/packages/bdw-gc.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index f2d3119fef..b223721520 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +20,8 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (gnu packages pkg-config)) (define-public libgc (package @@ -61,3 +62,47 @@ C or C++ programs, though that is not its primary goal.") (license (x11-style "http://www.hpl.hp.com/personal/Hans_Boehm/gc/license.txt")))) + +(define-public libatomic-ops + (package + (name "libatomic-ops") + (version "7.4.0") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/libatomic_ops-" + version ".tar.gz")) + (sha256 + (base32 + "0njv3n63zw6v45k68z6dz14g2hpk5p230ncwmdfkglsljb1cqx98")))) + (build-system gnu-build-system) + (outputs '("out" "debug")) + (synopsis "Accessing hardware atomic memory update operations") + (description + "This C library provides semi-portable access to hardware-provided atomic +memory update operations on a number architectures. These might allow you to +write code that does more interesting things in signal handlers, write +lock-free code, experiment with thread programming paradigms, etc.") + (home-page "http://www.hpl.hp.com/research/linux/atomic_ops/") + + ;; Some source files are X11-style, others are GPLv2+. + (license gpl2+))) + +(define-public libgc-7.4 + (package (inherit libgc) + (version "7.4.0") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-" + version ".tar.gz")) + (sha256 + (base32 + "10z2nph62ilab063wygg2lv0jxlsbcf2az9w1lx01jzqj5lzry31")))) + + ;; New dependencies. + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libatomic-ops" ,libatomic-ops))) + + ;; 'USE_LIBC_PRIVATES' is now the default. + (arguments '()))) -- cgit v1.2.3 From 32795fcffbf4078de2aec97f4dd2dcb9bcc55c8f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jan 2014 23:45:44 +0100 Subject: gnu: guile-2.0: Switch to libgc 7.4.0. * gnu/packages/guile.scm (guile-2.0): Use LIBGC-7.4. (guile-2.0/fixed): Keep using LIBGC. --- gnu/packages/guile.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 40d9ae7df8..1f423256f2 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +35,9 @@ #:use-module (gnu packages which) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix utils) + #:use-module (ice-9 match)) ;;; Commentary: ;;; @@ -134,7 +136,7 @@ without requiring the source code to be rewritten.") ;; The headers and/or `guile-2.0.pc' refer to these packages, so they ;; must be propagated. - ("bdw-gc" ,libgc) + ("bdw-gc" ,libgc-7.4) ("gmp" ,gmp))) (self-native-input? #t) @@ -177,7 +179,15 @@ without requiring the source code to be rewritten.") (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) + (location (source-properties->location (current-source-location))) + + ;; Keep using the stable libgc. + (propagated-inputs (map (match-lambda + (("bdw-gc" _) + `("bdw-gc" ,libgc)) + (x x)) + (package-propagated-inputs guile-2.0))))) ;;; -- cgit v1.2.3 From 997ef1df51267cfca6cbe94d4ef603df6067b4f0 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Wed, 22 Jan 2014 18:00:09 +0100 Subject: gnu: sqlite: Upgrade to 3.8.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/sqlite.scm (sqlite): Upgrade to 3.8.2. Signed-off-by: Ludovic Courtès --- gnu/packages/sqlite.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index ae083cd74f..f688e137d5 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -26,7 +26,7 @@ (define-public sqlite (package (name "sqlite") - (version "3.7.15.2") + (version "3.8.2") (source (origin (method url-fetch) ;; TODO: Download from sqlite.org once this bug : @@ -34,10 +34,10 @@ ;; has been fixed. (uri (string-append "mirror://sourceforge/sqlite.mirror/SQLite%20" - version "/sqlite-autoconf-3071502.tar.gz")) + version "/sqlite-autoconf-3080200.tar.gz")) (sha256 (base32 - "135s6r5z12q56brywpxnraqbqm7bdkxs76v7dygqgjpnjyvicbbq")))) + "14pg9zlwbwsj5w7f3qr25d3nniyv82gmczwlvpj0i0ic1431v1d0")))) (build-system gnu-build-system) (home-page "http://www.sqlite.org/") (synopsis "The SQLite database management system") -- cgit v1.2.3 From 54ff0b7dd7e68fa50dbea7a2d335c98fc60057d4 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 23 Jan 2014 19:05:09 +0100 Subject: gnu: Rename (gnu packages oggvorbis) to (gnu packages xiph). * gnu/packages/oggvorbis.scm: Rename this ... * gnu/packages/xiph.scm: ... to this. Adjust module name accordingly. * gnu-system.am (GNU_SYSTEM_MODULES): Update. * gnu/packages/{gnunet.scm, libcanberra.scm, mp3.scm, pulseaudio.scm, sdl.scm, video.scm}: Use new module name. --- gnu-system.am | 2 +- gnu/packages/gnunet.scm | 2 +- gnu/packages/libcanberra.scm | 4 +- gnu/packages/mp3.scm | 4 +- gnu/packages/oggvorbis.scm | 280 ------------------------------------------- gnu/packages/pulseaudio.scm | 14 +-- gnu/packages/sdl.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/xiph.scm | 280 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 295 insertions(+), 295 deletions(-) delete mode 100644 gnu/packages/oggvorbis.scm create mode 100644 gnu/packages/xiph.scm (limited to 'gnu/packages') diff --git a/gnu-system.am b/gnu-system.am index d60371bcbf..31d664e116 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -147,7 +147,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/noweb.scm \ gnu/packages/ocaml.scm \ gnu/packages/ocrad.scm \ - gnu/packages/oggvorbis.scm \ gnu/packages/onc-rpc.scm \ gnu/packages/openldap.scm \ gnu/packages/openssl.scm \ @@ -205,6 +204,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/wget.scm \ gnu/packages/which.scm \ gnu/packages/wordnet.scm \ + gnu/packages/xiph.scm \ gnu/packages/xlockmore.scm \ gnu/packages/xml.scm \ gnu/packages/xnee.scm \ diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index df5b1e337c..52a434a61c 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -28,10 +28,10 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages libjpeg) #:use-module (gnu packages libtiff) - #:use-module (gnu packages oggvorbis) #:use-module (gnu packages openssl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages video) + #:use-module (gnu packages xiph) #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:)) #:use-module (guix packages) diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index dacbe31a31..1106a8aa83 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -25,8 +25,8 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages linux) - #:use-module (gnu packages oggvorbis) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xiph)) (define-public libcanberra (package diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 73cbf40fac..7e324703a6 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -23,13 +23,13 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages cdrom) #:use-module (gnu packages compression) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) - #:use-module (gnu packages oggvorbis) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages gettext) + #:use-module (gnu packages xiph) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) diff --git a/gnu/packages/oggvorbis.scm b/gnu/packages/oggvorbis.scm deleted file mode 100644 index 0bce731f45..0000000000 --- a/gnu/packages/oggvorbis.scm +++ /dev/null @@ -1,280 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2013 David Thompson -;;; -;;; 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 oggvorbis) - #:use-module (gnu packages) - #:use-module (gnu packages bison) - #:use-module (gnu packages compression) - #:use-module (gnu packages curl) - #:use-module (gnu packages libpng) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python) - #:use-module (gnu packages linux) - #:use-module (gnu packages pulseaudio) - #:use-module ((guix licenses) - #:renamer (symbol-prefix-proc 'license:)) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:export (libogg - libvorbis - libtheora - speex - ao - flac - libkate - vorbis-tools)) - -(define libogg - (package - (name "libogg") - (version "1.3.0") - (source (origin - (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/ogg/libogg-" - version ".tar.xz")) - (sha256 - (base32 - "0jy79ffkl34vycnwfsj4svqsdg1lwy2l1rr49y8r4d44kh12a5r3")))) - (build-system gnu-build-system) - (synopsis "libogg, a library for manipulating the ogg multimedia format") - (description - "The libogg library allows to manipulate the ogg multimedia container -format, which encapsulates raw compressed data and allows the interleaving of -audio and video data. In addition to encapsulation and interleaving of -multiple data streams, ogg provides packet framing, error detection, and -periodic timestamps for seeking.") - (license (license:bsd-style "file://COPYING" - "See COPYING in the distribution.")) - (home-page "http://xiph.org/ogg/"))) - -(define libvorbis - (package - (name "libvorbis") - (version "1.3.3") - (source (origin - (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/vorbis/libvorbis-" - version ".tar.xz")) - (sha256 - (base32 - "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43")))) - (build-system gnu-build-system) - (propagated-inputs `(("libogg" ,libogg))) - (arguments `(#:configure-flags '("LDFLAGS=-lm"))) - (synopsis "libvorbis, a library implementing the vorbis audio format") - (description - "The libvorbis library implements the ogg vorbis audio format, -a fully open, non-proprietary, patent-and-royalty-free, general-purpose -compressed audio format for mid to high quality (8kHz-48.0kHz, 16+ bit, -polyphonic) audio and music at fixed and variable bitrates from 16 to -128 kbps/channel.") - (license (license:bsd-style "file://COPYING" - "See COPYING in the distribution.")) - (home-page "http://xiph.org/vorbis/"))) - -(define libtheora - (package - (name "libtheora") - (version "1.1.1") - (source (origin - (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/theora/libtheora-" - version ".tar.xz")) - (sha256 - (base32 - "0q8wark9ribij57dciym5vdikg2464p8q2mgqvfb78ksjh4s8vgk")) - (patches (list (search-patch "libtheora-config-guess.patch"))))) - (build-system gnu-build-system) - (inputs `(("libvorbis" ,libvorbis))) - ;; The .pc files refer to libogg. - (propagated-inputs `(("libogg" ,libogg))) - (synopsis "Library implementing the Theora video format") - (description - "The libtheora library implements the ogg theora video format, -a fully open, non-proprietary, patent-and-royalty-free, general-purpose -compressed video format.") - (license license:bsd-3) - (home-page "http://xiph.org/theora/"))) - -(define speex - (package - (name "speex") - (version "1.2rc1") - (source - (origin - (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/speex/speex-" - version ".tar.gz")) - (sha256 - (base32 - "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl")))) - (build-system gnu-build-system) - (inputs `(("libogg" ,libogg))) - (home-page "https://gnu.org/software/speex") - (synopsis "Library for patent-free audio compression format") - (description - "GNU Speex is a patent-free audio compression codec specially designed -for speech. It is well-adapted to internet applications, such as VoIP. It -features compression of different bands in the same bitstream, intensity -stereo encoding, and voice activity detection.") - ;; 'src/getopt.c' is under LGPLv2+ - (license (license:bsd-style "file://COPYING" - "See COPYING in the distribution.")))) - -(define ao - (package - (name "ao") - (version "1.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/ao/libao-" - version ".tar.gz")) - (sha256 - (base32 - "1m0v2y6bhr4iwsgdkc7b3y0qgpvpv1ifbxsy8n8ahsvjn6wmppi9")))) - (build-system gnu-build-system) - ;; FIXME: Add further backends, see the summary printed after configure. - ;; XXX: Should back-ends be pushed to different outputs? For instance, - ;; "out" would include only the ALSA back-end, while "pulse" would - ;; contains 'lib/ao/plugins-4/libpulse.*'. - (inputs `(("pkg-config" ,pkg-config) - ("alsa-lib" ,alsa-lib) - ("pulseaudio" ,pulseaudio))) - (synopsis "Cross platform audio library") - (description - "Libao is a cross-platform audio library that allows programs to -output audio using a simple API on a wide variety of platforms. -It currently supports: -Null output (handy for testing without a sound device), -WAV files, -AU files, -RAW files, -OSS (Open Sound System, used on Linux and FreeBSD), -ALSA (Advanced Linux Sound Architecture), -aRts (Analog RealTime Synth, used by KDE), -PulseAudio (next generation GNOME sound server), -esd (EsounD or Enlightened Sound Daemon), -Mac OS X, -Windows (98 and later), -AIX, -Sun/NetBSD/OpenBSD, -IRIX, -NAS (Network Audio Server), -RoarAudio (Modern, multi-OS, networked Sound System), -OpenBSD's sndio.") - (license license:gpl2+) - (home-page "http://www.xiph.org/ao/"))) - -(define flac - (package - (name "flac") - (version "1.2.1") - (source (origin - (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/flac/flac-" - version ".tar.gz")) - (sha256 - (base32 - "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn")) - (patches - (list (search-patch "flac-fix-memcmp-not-declared.patch"))))) - (build-system gnu-build-system) - (arguments - `(#:parallel-tests? #f)) - ;; FIXME: configure also looks for xmms, input could be added once it exists - (inputs `(("libogg" ,libogg))) - (synopsis "flac free lossless audio codec") - (description -"FLAC stands for Free Lossless Audio Codec, an audio format that is lossless, -meaning that audio is compressed in FLAC without any loss in quality.") - (license (license:bsd-style "file://COPYING" - "See COPYING in the distribution.")) ; and LGPL and GPL - (home-page "http://xiph.org/flac/"))) - -(define libkate - (package - (name "libkate") - (version "0.4.1") - (source (origin - (method url-fetch) - (uri (string-append "http://libkate.googlecode.com/files/libkate-" - version ".tar.gz")) - (sha256 - (base32 - "0s3vr2nxfxlf1k75iqpp4l78yf4gil3f0v778kvlngbchvaq23n4")))) - (build-system gnu-build-system) - ;; FIXME: Add optional inputs doxygen (for documentation) and liboggz - (inputs `(("bison" ,bison) - ("libogg" ,libogg) - ("libpng" ,libpng) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("zlib" ,zlib))) - (synopsis "kate, a karaoke and text codec for embedding in ogg") - (description - "Kate is an overlay codec, originally designed for karaoke and text, -that can be multiplixed in Ogg. Text and images can be carried by a Kate -stream, and animated. Most of the time, this would be multiplexed with -audio/video to carry subtitles, song lyrics (with or without karaoke data), -etc., but doesn't have to be. - -Series of curves (splines, segments, etc.) may be attached to various -properties (text position, font size, etc.) to create animated overlays. -This allows scrolling or fading text to be defined. This can even be used -to draw arbitrary shapes, so hand drawing can also be represented by a -Kate stream.") - (license license:bsd-3) - (home-page "http://code.google.com/p/libkate/"))) - -(define vorbis-tools - (package - (name "vorbis-tools") - (version "1.4.0") - (source (origin - (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/vorbis/vorbis-tools-" - version ".tar.gz")) - (sha256 - (base32 - "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3")))) - (build-system gnu-build-system) - (inputs `(("ao" ,ao) - ("curl" ,curl) - ("flac" ,flac) - ("libkate" ,libkate) - ("libogg" ,libogg) - ("libvorbis" ,libvorbis) - ("pkg-config" ,pkg-config) - ("speex" ,speex))) - (synopsis "ogg vorbis tools") - (description - "Ogg vorbis is a non-proprietary, patent-and-royalty-free, -general-purpose compressed audio format. - -The package vorbis-tools contains -ogg123, an ogg vorbis command line audio player; -oggenc, the ogg vorbis encoder; -oggdec, a simple, portable command line decoder (to wav and raw); -ogginfo, to obtain information (tags, bitrate, length, etc.) about - an ogg vorbis file.") - (license license:gpl2) - (home-page "http://xiph.org/vorbis/"))) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 91bbe2d77a..8bf48c2a89 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -23,18 +23,18 @@ #:renamer (symbol-prefix-proc 'l:)) #:use-module (guix build-system gnu) #:use-module (gnu packages) - #:use-module (gnu packages linux) - #:use-module (gnu packages oggvorbis) - #:use-module (gnu packages pkg-config) + #:use-module (gnu packages algebra) + #:use-module ((gnu packages autotools) #:select (libtool)) #:use-module (gnu packages avahi) + #:use-module (gnu packages check) + #:use-module (gnu packages gdbm) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) - #:use-module (gnu packages algebra) - #:use-module ((gnu packages autotools) #:select (libtool)) - #:use-module (gnu packages gdbm) + #:use-module (gnu packages linux) #:use-module (gnu packages m4) - #:use-module (gnu packages check) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xiph) #:export (libsndfile libsamplerate json-c diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 86b403503b..25ae1b0721 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -28,10 +28,10 @@ #:use-module (gnu packages libtiff) #:use-module (gnu packages linux) #:use-module (gnu packages mp3) - #:use-module (gnu packages oggvorbis) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages gl) + #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:export (sdl sdl2 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b1d1270c05..8e4315a880 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -25,11 +25,11 @@ #:use-module (gnu packages compression) #:use-module (gnu packages elf) #:use-module (gnu packages fontutils) - #:use-module (gnu packages oggvorbis) #:use-module (gnu packages openssl) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages xiph) #:use-module (gnu packages yasm)) (define-public ffmpeg diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm new file mode 100644 index 0000000000..6bd6658035 --- /dev/null +++ b/gnu/packages/xiph.scm @@ -0,0 +1,280 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Andreas Enge +;;; Copyright © 2013 Nikita Karetnikov +;;; Copyright © 2013 David Thompson +;;; +;;; 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 xiph) + #:use-module (gnu packages) + #:use-module (gnu packages bison) + #:use-module (gnu packages compression) + #:use-module (gnu packages curl) + #:use-module (gnu packages libpng) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages linux) + #:use-module (gnu packages pulseaudio) + #:use-module ((guix licenses) + #:renamer (symbol-prefix-proc 'license:)) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:export (libogg + libvorbis + libtheora + speex + ao + flac + libkate + vorbis-tools)) + +(define libogg + (package + (name "libogg") + (version "1.3.0") + (source (origin + (method url-fetch) + (uri (string-append "http://downloads.xiph.org/releases/ogg/libogg-" + version ".tar.xz")) + (sha256 + (base32 + "0jy79ffkl34vycnwfsj4svqsdg1lwy2l1rr49y8r4d44kh12a5r3")))) + (build-system gnu-build-system) + (synopsis "libogg, a library for manipulating the ogg multimedia format") + (description + "The libogg library allows to manipulate the ogg multimedia container +format, which encapsulates raw compressed data and allows the interleaving of +audio and video data. In addition to encapsulation and interleaving of +multiple data streams, ogg provides packet framing, error detection, and +periodic timestamps for seeking.") + (license (license:bsd-style "file://COPYING" + "See COPYING in the distribution.")) + (home-page "http://xiph.org/ogg/"))) + +(define libvorbis + (package + (name "libvorbis") + (version "1.3.3") + (source (origin + (method url-fetch) + (uri (string-append "http://downloads.xiph.org/releases/vorbis/libvorbis-" + version ".tar.xz")) + (sha256 + (base32 + "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43")))) + (build-system gnu-build-system) + (propagated-inputs `(("libogg" ,libogg))) + (arguments `(#:configure-flags '("LDFLAGS=-lm"))) + (synopsis "libvorbis, a library implementing the vorbis audio format") + (description + "The libvorbis library implements the ogg vorbis audio format, +a fully open, non-proprietary, patent-and-royalty-free, general-purpose +compressed audio format for mid to high quality (8kHz-48.0kHz, 16+ bit, +polyphonic) audio and music at fixed and variable bitrates from 16 to +128 kbps/channel.") + (license (license:bsd-style "file://COPYING" + "See COPYING in the distribution.")) + (home-page "http://xiph.org/vorbis/"))) + +(define libtheora + (package + (name "libtheora") + (version "1.1.1") + (source (origin + (method url-fetch) + (uri (string-append "http://downloads.xiph.org/releases/theora/libtheora-" + version ".tar.xz")) + (sha256 + (base32 + "0q8wark9ribij57dciym5vdikg2464p8q2mgqvfb78ksjh4s8vgk")) + (patches (list (search-patch "libtheora-config-guess.patch"))))) + (build-system gnu-build-system) + (inputs `(("libvorbis" ,libvorbis))) + ;; The .pc files refer to libogg. + (propagated-inputs `(("libogg" ,libogg))) + (synopsis "Library implementing the Theora video format") + (description + "The libtheora library implements the ogg theora video format, +a fully open, non-proprietary, patent-and-royalty-free, general-purpose +compressed video format.") + (license license:bsd-3) + (home-page "http://xiph.org/theora/"))) + +(define speex + (package + (name "speex") + (version "1.2rc1") + (source + (origin + (method url-fetch) + (uri (string-append "http://downloads.xiph.org/releases/speex/speex-" + version ".tar.gz")) + (sha256 + (base32 + "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl")))) + (build-system gnu-build-system) + (inputs `(("libogg" ,libogg))) + (home-page "https://gnu.org/software/speex") + (synopsis "Library for patent-free audio compression format") + (description + "GNU Speex is a patent-free audio compression codec specially designed +for speech. It is well-adapted to internet applications, such as VoIP. It +features compression of different bands in the same bitstream, intensity +stereo encoding, and voice activity detection.") + ;; 'src/getopt.c' is under LGPLv2+ + (license (license:bsd-style "file://COPYING" + "See COPYING in the distribution.")))) + +(define ao + (package + (name "ao") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "http://downloads.xiph.org/releases/ao/libao-" + version ".tar.gz")) + (sha256 + (base32 + "1m0v2y6bhr4iwsgdkc7b3y0qgpvpv1ifbxsy8n8ahsvjn6wmppi9")))) + (build-system gnu-build-system) + ;; FIXME: Add further backends, see the summary printed after configure. + ;; XXX: Should back-ends be pushed to different outputs? For instance, + ;; "out" would include only the ALSA back-end, while "pulse" would + ;; contain 'lib/ao/plugins-4/libpulse.*'. + (inputs `(("pkg-config" ,pkg-config) + ("alsa-lib" ,alsa-lib) + ("pulseaudio" ,pulseaudio))) + (synopsis "Cross platform audio library") + (description + "Libao is a cross-platform audio library that allows programs to +output audio using a simple API on a wide variety of platforms. +It currently supports: +Null output (handy for testing without a sound device), +WAV files, +AU files, +RAW files, +OSS (Open Sound System, used on Linux and FreeBSD), +ALSA (Advanced Linux Sound Architecture), +aRts (Analog RealTime Synth, used by KDE), +PulseAudio (next generation GNOME sound server), +esd (EsounD or Enlightened Sound Daemon), +Mac OS X, +Windows (98 and later), +AIX, +Sun/NetBSD/OpenBSD, +IRIX, +NAS (Network Audio Server), +RoarAudio (Modern, multi-OS, networked Sound System), +OpenBSD's sndio.") + (license license:gpl2+) + (home-page "http://www.xiph.org/ao/"))) + +(define flac + (package + (name "flac") + (version "1.2.1") + (source (origin + (method url-fetch) + (uri (string-append "http://downloads.xiph.org/releases/flac/flac-" + version ".tar.gz")) + (sha256 + (base32 + "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn")) + (patches + (list (search-patch "flac-fix-memcmp-not-declared.patch"))))) + (build-system gnu-build-system) + (arguments + `(#:parallel-tests? #f)) + ;; FIXME: configure also looks for xmms, input could be added once it exists + (inputs `(("libogg" ,libogg))) + (synopsis "flac free lossless audio codec") + (description +"FLAC stands for Free Lossless Audio Codec, an audio format that is lossless, +meaning that audio is compressed in FLAC without any loss in quality.") + (license (license:bsd-style "file://COPYING" + "See COPYING in the distribution.")) ; and LGPL and GPL + (home-page "http://xiph.org/flac/"))) + +(define libkate + (package + (name "libkate") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri (string-append "http://libkate.googlecode.com/files/libkate-" + version ".tar.gz")) + (sha256 + (base32 + "0s3vr2nxfxlf1k75iqpp4l78yf4gil3f0v778kvlngbchvaq23n4")))) + (build-system gnu-build-system) + ;; FIXME: Add optional inputs doxygen (for documentation) and liboggz + (inputs `(("bison" ,bison) + ("libogg" ,libogg) + ("libpng" ,libpng) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("zlib" ,zlib))) + (synopsis "kate, a karaoke and text codec for embedding in ogg") + (description + "Kate is an overlay codec, originally designed for karaoke and text, +that can be multiplixed in Ogg. Text and images can be carried by a Kate +stream, and animated. Most of the time, this would be multiplexed with +audio/video to carry subtitles, song lyrics (with or without karaoke data), +etc., but doesn't have to be. + +Series of curves (splines, segments, etc.) may be attached to various +properties (text position, font size, etc.) to create animated overlays. +This allows scrolling or fading text to be defined. This can even be used +to draw arbitrary shapes, so hand drawing can also be represented by a +Kate stream.") + (license license:bsd-3) + (home-page "http://code.google.com/p/libkate/"))) + +(define vorbis-tools + (package + (name "vorbis-tools") + (version "1.4.0") + (source (origin + (method url-fetch) + (uri (string-append "http://downloads.xiph.org/releases/vorbis/vorbis-tools-" + version ".tar.gz")) + (sha256 + (base32 + "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3")))) + (build-system gnu-build-system) + (inputs `(("ao" ,ao) + ("curl" ,curl) + ("flac" ,flac) + ("libkate" ,libkate) + ("libogg" ,libogg) + ("libvorbis" ,libvorbis) + ("pkg-config" ,pkg-config) + ("speex" ,speex))) + (synopsis "ogg vorbis tools") + (description + "Ogg vorbis is a non-proprietary, patent-and-royalty-free, +general-purpose compressed audio format. + +The package vorbis-tools contains +ogg123, an ogg vorbis command line audio player; +oggenc, the ogg vorbis encoder; +oggdec, a simple, portable command line decoder (to wav and raw); +ogginfo, to obtain information (tags, bitrate, length, etc.) about + an ogg vorbis file.") + (license license:gpl2) + (home-page "http://xiph.org/vorbis/"))) -- cgit v1.2.3 From a7f904fd6336b9acf8bc77c1ef3bb2483de2d2bd Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Thu, 23 Jan 2014 19:38:39 +0100 Subject: gnu: Add Opus 1.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xiph.scm (opus): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xiph.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 6bd6658035..0e8cb5fafc 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2013 David Thompson +;;; Copyright © 2014 Sree Harsha Totakura ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,8 @@ ao flac libkate - vorbis-tools)) + vorbis-tools + opus)) (define libogg (package @@ -278,3 +280,26 @@ ogginfo, to obtain information (tags, bitrate, length, etc.) about an ogg vorbis file.") (license license:gpl2) (home-page "http://xiph.org/vorbis/"))) + +(define opus + (package + (name "opus") + (version "1.1") + (source (origin + (method url-fetch) + (uri (string-append + "http://downloads.xiph.org/releases/opus/opus-" version + ".tar.gz")) + (sha256 + (base32 + "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr")))) + (build-system gnu-build-system) + (synopsis "highly versatile audio codec") + (description + "Opus is a totally open, royalty-free, highly versatile audio codec. Opus +is unmatched for interactive speech and music transmission over the Internet, +but is also intended for storage and streaming applications. It is +standardized by the Internet Engineering Task Force (IETF) as RFC 6716 which +incorporated technology from Skype's SILK codec and Xiph.Org's CELT codec.") + (license license:bsd-3) + (home-page "http://www.opus-codec.org/"))) -- cgit v1.2.3 From e816b348786cb65e57bfca08de9a5d926a7d46c1 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 24 Jan 2014 22:22:42 +0100 Subject: gnu: ffmpeg: Add input opus. * gnu/packages/video.scm (ffmpeg): Add input opus. --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8e4315a880..8d02825c51 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -47,6 +47,7 @@ (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) + ("opus" ,opus) ("libtheora" ,libtheora) ("libvorbis" ,libvorbis) ("patchelf" ,patchelf) @@ -107,7 +108,6 @@ ;; --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no] ;; --enable-libopencv enable video filtering via libopencv [no] ;; --enable-libopenjpeg enable JPEG 2000 de/encoding via OpenJPEG [no] -;; --enable-libopus enable Opus decoding via libopus [no] ;; --enable-libpulse enable Pulseaudio input via libpulse [no] ;; --enable-libquvi enable quvi input via libquvi [no] ;; --enable-librtmp enable RTMP[E] support via librtmp [no] @@ -142,6 +142,7 @@ "--enable-fontconfig" ;; "--enable-gnutls" ; causes test failures "--enable-libfreetype" + "--enable-libopus" "--enable-libspeex" "--enable-libtheora" "--enable-libvorbis" -- cgit v1.2.3 From 93e48d19c7561d9dc487c7e4bc423a72b149685d Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 24 Jan 2014 22:40:44 +0100 Subject: gnu: ffmpeg: Update to 2.1.3. * gnu/packages/video.scm (ffmpeg): Update to 2.1.3. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8d02825c51..369f29f7ac 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Andreas Enge +;;; Copyright © 2013, 2014 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,14 +35,14 @@ (define-public ffmpeg (package (name "ffmpeg") - (version "2.1.1") + (version "2.1.3") (source (origin (method url-fetch) (uri (string-append "http://www.ffmpeg.org/releases/ffmpeg-" version ".tar.bz2")) (sha256 (base32 - "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy")))) + "18qkdpka94rp44x17q7d2bvmw26spxf41c69nvzy31szsdzjwcqx")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) -- cgit v1.2.3 From b5d4a8113353cda2f3e569e5b326e7301c2512bd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Jan 2014 18:19:46 +0100 Subject: wget: Upgrade to 1.15. * gnu/packages/wget.scm (wget): Upgrade to 1.15. Remove Gettext from 'inputs'. Move Perl to 'native-inputs'. --- gnu/packages/wget.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 0d34a27c14..fb5fbf6343 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov +;;; Copyright © 2014 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,7 +19,6 @@ (define-module (gnu packages wget) #:use-module (guix licenses) - #:use-module (gnu packages gettext) #:use-module (gnu packages gnutls) #:use-module (gnu packages perl) #:use-module (guix packages) @@ -28,7 +28,7 @@ (define-public wget (package (name "wget") - (version "1.14") + (version "1.15") (source (origin (method url-fetch) @@ -36,12 +36,12 @@ version ".tar.xz")) (sha256 (base32 - "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p")))) + "1yw0sk4mrs7bvga3c79rkbhxivmw8cs3b5wq3cglp1f9ai1mz2ni")))) (build-system gnu-build-system) (inputs - `(("gnutls" ,gnutls) - ("perl" ,perl) - ("gettext" ,gnu-gettext))) + `(("gnutls" ,gnutls))) + (native-inputs + `(("perl" ,perl))) (home-page "http://www.gnu.org/software/wget/") (synopsis "Non-interactive command-line utility for downloading files") (description -- cgit v1.2.3 From 28fb9101d940fee615f46fbf6c61299a64ae28c6 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Fri, 24 Jan 2014 18:36:34 +0100 Subject: gnu: Add ncdc-1.18.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dc.scm : New module. * gnu-system.am (GNU_SYSTEM_MODULES): Add module. Signed-off-by: Ludovic Courtès --- gnu-system.am | 1 + gnu/packages/dc.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 gnu/packages/dc.scm (limited to 'gnu/packages') diff --git a/gnu-system.am b/gnu-system.am index 31d664e116..3112dc48aa 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -52,6 +52,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/cryptsetup.scm \ gnu/packages/curl.scm \ gnu/packages/cyrus-sasl.scm \ + gnu/packages/dc.scm \ gnu/packages/dejagnu.scm \ gnu/packages/ddrescue.scm \ gnu/packages/dictionaries.scm \ diff --git a/gnu/packages/dc.scm b/gnu/packages/dc.scm new file mode 100644 index 0000000000..75ed5f4af7 --- /dev/null +++ b/gnu/packages/dc.scm @@ -0,0 +1,60 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 Sree Harsha Totakura +;;; +;;; 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 dc) + #:use-module (gnu packages) + #:use-module (gnu packages compression) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnutls) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages sqlite) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) + #:renamer (symbol-prefix-proc 'license:))) + +(define-public ncdc + (package + (name "ncdc") + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://dev.yorhel.nl/download/ncdc-" version + ".tar.gz")) + (sha256 (base32 + "11c6z9c3vv2vg01q02r53m28q3cx6x66j1l63f1mbk1crlqpf9fc")))) + (build-system gnu-build-system) + (inputs + `(("bzip2" ,bzip2) + ("glib" ,glib) + ("gnutls" ,gnutls) + ("ncurses" ,ncurses) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://dev.yorhel.nl/ncdc") + (synopsis + "Lightweight direct connect client with a friendly ncurses interface") + (description + "Ncdc is a client for the Direct Connect peer-to-peer protocol implemented +using ncurses. It is known for its smaller footprint and ease of use.") + (license license:x11))) -- cgit v1.2.3 From 513e1950fbc1e8cc53cb9d2626aaf7c88f4a2fe4 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Sat, 25 Jan 2014 01:51:29 +0100 Subject: gnu: Add Corkscrew 2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (corkscrew): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ssh.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 5d21eeeb01..7589408e47 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -238,3 +238,46 @@ programs written in GNU Guile interpreter. It is a wrapper to the underlying libssh library.") (home-page "https://github.com/artyom-poptsov/libguile-ssh") (license license:gpl3+))) + +(define-public corkscrew + (package + (name "corkscrew") + (version "2.0") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.agroman.net/corkscrew/corkscrew-" + version ".tar.gz")) + (sha256 (base32 + "1gmhas4va6gd70i2x2mpxpwpgww6413mji29mg282jms3jscn3qd")))) + (build-system gnu-build-system) + (arguments + ;; Replace configure phase as the ./configure script does not link + ;; CONFIG_SHELL and SHELL passed as parameters + '(#:phases + (alist-replace + 'configure + (lambda* (#:key outputs inputs system target + #:allow-other-keys #:rest args) + (let* ((configure (assoc-ref %standard-phases 'configure)) + (prefix (assoc-ref outputs "out")) + (bash (which "bash")) + ;; Set --build and --host flags as the provided config.guess + ;; is not able to detect them + (flags `(,(string-append "--prefix=" prefix) + ,(string-append "--build=" system) + ,(string-append "--host=" + (or target system))))) + (setenv "CONFIG_SHELL" bash) + (zero? (apply system* bash + (string-append "." "/configure") + flags)))) + %standard-phases))) + (home-page "http://www.agroman.net/corkscrew") + (synopsis "A tool for tunneling SSH through HTTP proxies") + (description + "Corkscrew allows creating TCP tunnels through HTTP proxies. WARNING: +At the moment only plain text authentication is supported, should you require +to use it with your HTTP proxy. Digest based authentication may be supported +in future and NTLM based authentication is most likey never be supported.") + (license license:gpl2+))) -- cgit v1.2.3 From 4f3a10d59d9dcf14881d9ea1f25c5d94e3d381b1 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 25 Jan 2014 09:17:39 +0100 Subject: gnu: ncdu: New module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ncdu.scm: New file * gnu-system.am: New file ncdu.scm Signed-off-by: Ludovic Courtès --- gnu-system.am | 1 + gnu/packages/ncdu.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 gnu/packages/ncdu.scm (limited to 'gnu/packages') diff --git a/gnu-system.am b/gnu-system.am index 3112dc48aa..ea537f04fa 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -142,6 +142,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/mtools.scm \ gnu/packages/mysql.scm \ gnu/packages/nano.scm \ + gnu/packages/ncdu.scm \ gnu/packages/ncurses.scm \ gnu/packages/netpbm.scm \ gnu/packages/nettle.scm \ diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm new file mode 100644 index 0000000000..7052567530 --- /dev/null +++ b/gnu/packages/ncdu.scm @@ -0,0 +1,48 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 John Darrington +;;; +;;; 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 ncdu) + #:use-module (gnu packages) + #:use-module (gnu packages ncurses) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu)) + +(define-public ncdu + (package + (name "ncdu") + (version "1.10") + (source (origin + (method url-fetch) + (uri (string-append "http://dev.yorhel.nl/download/ncdu-" + version ".tar.gz")) + (sha256 + (base32 + "0rqc5wpqcbfqpcwxgh3jxwa0yw2py0hv0acpsf0a9g6v9144m6gm")))) + (inputs + `(("ncurses" ,ncurses))) + (build-system gnu-build-system) + (synopsis "Ncurses based disk usage analyzer") + (description "A disk usage analyzer with an ncurses interface, aimed to be +run on a remote server where you don't have an entire gaphical setup, but have +to do with a simple SSH connection. ncdu aims to be fast, simple and easy to +use, and should be able to run in any minimal POSIX-like environment with +ncurses installed.") + (license (x11-style "http://g.blicky.net/ncdu.git/plain/COPYING?id=v1.10")) + (home-page "http://dev.yorhel.nl/ncdu"))) -- cgit v1.2.3 From 3c9aa5c12d0522069555952af9670f1b7c4b5a85 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 25 Jan 2014 08:01:25 +0100 Subject: gnu: libxft: Propagate input. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xorg.scm (libxft): Propagate input libxrender. Signed-off-by: Ludovic Courtès --- gnu/packages/xorg.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index dfdd82c8b8..6c17170eef 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1257,10 +1257,12 @@ tracking.") (base32 "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz")))) (build-system gnu-build-system) + (propagated-inputs + ;; xft.pc refers to 'xrender'. + `(("libxrender" ,libxrender))) (inputs `(("libx11" ,libx11) ("xproto" ,xproto) - ("libxrender" ,libxrender) ("freetype" ,freetype) ("fontconfig" ,fontconfig))) (native-inputs -- cgit v1.2.3 From b6cbb314d9fb31b60a73644c260091c27ac52563 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 25 Jan 2014 09:27:14 +0100 Subject: gnu: fltk: New module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fltk.scm: New file * gnu-system.am: New file fltk.scm Signed-off-by: Ludovic Courtès --- gnu-system.am | 1 + gnu/packages/fltk.scm | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 gnu/packages/fltk.scm (limited to 'gnu/packages') diff --git a/gnu-system.am b/gnu-system.am index ea537f04fa..a49b482549 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -64,6 +64,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/fdisk.scm \ gnu/packages/file.scm \ gnu/packages/flex.scm \ + gnu/packages/fltk.scm \ gnu/packages/fonts.scm \ gnu/packages/fontutils.scm \ gnu/packages/freeipmi.scm \ diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm new file mode 100644 index 0000000000..4c8fc3f2c7 --- /dev/null +++ b/gnu/packages/fltk.scm @@ -0,0 +1,63 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 John Darrington +;;; +;;; 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 fltk) + #:use-module (guix licenses) + #:use-module (gnu packages xorg) + #:use-module (gnu packages gl) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu)) + +(define-public fltk + (package + (name "fltk") + (version "1.3.2") + (source + (origin + (method url-fetch) + (uri (string-append "http://fltk.org/pub/fltk/" version "/fltk-" version "-source.tar.gz")) + (sha256 + (base32 + "1974brlk723095vf8z72kazq1cbqr9a51kq6b0xda6zkjkgl8q0p")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("mesa" ,mesa))) + (arguments + `(#:phases + (alist-replace + 'check + (lambda* (#:key inputs #:allow-other-keys) #t) ;; fltk does not have a + ;; check target + (alist-replace + 'configure + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure))) + (substitute* "makeinclude.in" + (("/bin/sh") (which "sh"))) + (apply configure args))) + %standard-phases)))) + (home-page "https://www.fltk.org") + (synopsis "3D C++ GUI library") + (description "FLTK is a C++ GUI toolkit providing modern GUI functionality without the +bloat. It supports 3D graphics via OpenGL and its built-in GLUT emulation. +FLTK is designed to be small and modular enough to be statically linked, but +works fine as a shared library. FLTK also includes an excellent UI builder +called FLUID that can be used to create applications in minutes.") + (license lgpl2.0))) ; plus certain additional permissions -- cgit v1.2.3