Ludovic Courtès
274da61d51
gnu: Add perl-dbi and perl-dbd-sqlite.
...
* gnu/packages/databases.scm (perl-dbi, perl-dbd-sqlite): New variable.
2014-09-28 00:41:39 +02:00
Ludovic Courtès
a0efb39ad4
gnu: mit-scheme: Rename top-level helper.
...
Suggested by Mark H. Weaver.
* gnu/packages/scheme.scm (source-directory): Rename to...
(mit-scheme-source-directory): ... this.
2014-09-27 23:59:30 +02:00
Andreas Enge
319e2d1736
gnu: Add graphite2.
...
* gnu/packages/fontutils.scm (graphite2): New variable.
2014-09-27 23:48:30 +02:00
Andreas Enge
68dddcad62
gnu: mit-scheme: Delete more dangling symlinks for non-x86 systems.
...
* gnu/packages/scheme.scm (mit-scheme): Delete more dangling symlinks for
non-x86 systems.
2014-09-27 20:04:43 +02:00
Andreas Enge
ecb26c101e
gnu: mit-scheme: Fix source file name for mips64el.
...
* gnu/packages/scheme.scm (mit-scheme): Fix source file name for
architectures other than x86_64 and i686.
2014-09-27 19:36:57 +02:00
Andreas Enge
dc47939172
gnu: phonon: Update to 4.8.0.
...
* gnu/packages/kde.scm (phonon): Update to 4.8.0.
2014-09-27 17:50:14 +02:00
Andreas Enge
6c4a2884b6
gnu: mit-scheme: Update to 9.2.
...
* gnu/packages/scheme.scm (mit-scheme): Update to 9.2.
2014-09-27 16:51:44 +02:00
Andreas Enge
17b9d16fa2
gnu: libxscrnsaver: Propagate input scrnsaverproto.
...
* gnu/packages/xorg.scm (libxscrnsaver): Propagate input scrnsaverproto,
since scrnsaver.h from libxscrnsaver includes saver.h from scrnsaverproto.
2014-09-27 15:49:06 +02:00
Andreas Enge
38877bf346
gnu: help2man: Update to 1.46.3.
...
* gnu/packages/man.scm (help2man): Update to 1.46.3.
2014-09-27 12:31:37 +02:00
Andreas Enge
237c048609
gnu: gcl: Update to 2.6.11.
...
* gnu/packages/lisp.scm (gcl): Update to 2.6.11.
2014-09-27 12:13:53 +02:00
Andreas Enge
483ca9d88d
gnu: parallel: Update to 20140922.
...
* gnu/packages/parallel.scm (parallel): Update to 20140922.
2014-09-27 12:08:21 +02:00
Andreas Enge
5520c94c94
gnu: libidn: Update to 1.29.
...
* gnu/packages/libidn.scm (libidn): Update to 1.29.
2014-09-27 11:30:33 +02:00
Andreas Enge
53f896f23f
gnu: rcs: Update to 5.9.3.
...
* gnu/packages/version-control.scm (rcs): Update to 5.9.3.
2014-09-27 11:27:47 +02:00
Federico Beffa
f36afe4d05
gnu: maxima: Install .el files in the right place, and help find Gnuplot.
...
* gnu/packages/maths.scm (maxima): Remove Tcl from 'inputs'. Add
'post-install' phase.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-27 11:22:58 +02:00
Andreas Enge
dd0b0e681b
gnu: ucommon: Update to 6.1.11.
...
* gnu/packages/telephony.scm (ucommon): Update to 6.1.11.
2014-09-27 10:25:22 +02:00
Andreas Enge
05681d7388
gnu: libassuan: Update to 2.1.2.
...
* gnu/packages/gnupg.scm (libassuan): Update to 2.1.2.
2014-09-27 09:17:56 +02:00
Ludovic Courtès
b5c5d763ca
Merge branch 'bash-cve-2014-6271'
2014-09-26 09:49:09 +02:00
Alex Kost
223ecaba7f
gnu: Add scrot.
...
* gnu/packages/scrot.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
2014-09-26 09:23:11 +04:00
Alex Kost
f7d28082bb
gnu: Add giblib.
...
* gnu/packages/image.scm (giblib): New variable.
2014-09-26 09:23:10 +04:00
Alex Kost
76d88cfa57
gnu: Add imlib2.
...
* gnu/packages/image.scm (imlib2): New variable.
2014-09-26 09:23:10 +04:00
David Thompson
fddb640971
gnu: libtoxcore: Update to 1.0.0.
...
* gnu/packages/crypto.scm (libsodium): Update version and change home-page.
2014-09-24 17:17:24 -04:00
Ludovic Courtès
c1fe82d586
gnu: bash: Apply patch series up to 25 [CVE-2014-6271].
...
* gnu/packages/bash.scm (patch-url, bash-patch): New procedures.
(patch-series): New macro.
(%patch-series-4.3): New variable.
(download-patches): New procedure.
(bash): Change version to include the patch level; pass
%PATCH-SERIES-4.3 in the origin.
2014-09-24 19:19:03 +02:00
Ludovic Courtès
ce517b20d4
gnu: bootstrap: Correctly handle patches that are origins.
...
* gnu/packages/bootstrap.scm (bootstrap-origin): Rewrite the patches of
SOURCES that are also origins.
2014-09-24 19:08:54 +02:00
Ludovic Courtès
8689901f95
Introduce the 'GUIX_PACKAGE_PATH' environment variable.
...
* gnu/packages.scm (%package-module-path): Honor $GUIX_PACKAGE_PATH.
* test-env.in: Unset 'GUIX_PACKAGE_PATH'.
* tests/guix-package.sh: Test it.
* doc/guix.texi (Package Modules): Document it.
2014-09-24 14:06:09 +02:00
Ludovic Courtès
c107b54108
packages: Add '%package-module-search-path'.
...
* gnu/packages.scm (%package-module-path): New variable.
(all-package-modules): New procedure.
(fold-packages): Use it instead of 'package-modules'.
2014-09-24 14:06:08 +02:00
Ludovic Courtès
84836a5733
packages: Generalize package module search.
...
* gnu/packages.scm (%distro-root-directory): New variable.
(%distro-module-directory): Remove.
(package-files): Rename to...
(scheme-files): ... this. Return absolute file names, not stripped.
(file-name->module-name): New procedure.
(package-modules): Add 'directory' and 'sub-directory' parameters.
Rewrite accordingly.
(fold-packages): Adjust 'package-modules' call accordingly.
2014-09-24 10:23:27 +02:00
Federico Beffa
df354a771d
gnu: maxima: Update to 5.34.1 and add dependencies.
...
* gnu/packages/maths.scm (maxima): Update to 5.34.1 which fixes a bug in
the plotting capabilities present in the previous version. Add Gnuplot
and Tcl/Tk to 'inputs'.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-24 09:35:44 +02:00
Mark H Weaver
b5b73a8269
Use #:prefix instead of #:renamer with 'symbol-prefix-proc'.
...
* gnu/packages/abiword.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm,
gnu/packages/backup.scm, gnu/packages/bittorrent.scm,
gnu/packages/boost.scm, gnu/packages/compression.scm,
gnu/packages/cryptsetup.scm, gnu/packages/curl.scm,
gnu/packages/cyrus-sasl.scm, gnu/packages/dc.scm, gnu/packages/emacs.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/geeqie.scm,
gnu/packages/ghostscript.scm, gnu/packages/gimp.scm,
gnu/packages/gkrellm.scm, gnu/packages/gl.scm, gnu/packages/glib.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gnutls.scm, gnu/packages/gnuzilla.scm, gnu/packages/gsasl.scm,
gnu/packages/gtk.scm, gnu/packages/gv.scm, gnu/packages/image.scm,
gnu/packages/indent.scm, gnu/packages/inkscape.scm,
gnu/packages/lesstif.scm, gnu/packages/links.scm, gnu/packages/lisp.scm,
gnu/packages/lsh.scm, gnu/packages/lsof.scm, gnu/packages/maths.scm,
gnu/packages/mp3.scm, gnu/packages/openssl.scm, gnu/packages/ots.scm,
gnu/packages/pciutils.scm, gnu/packages/pcre.scm, gnu/packages/pdf.scm,
gnu/packages/pulseaudio.scm, gnu/packages/python.scm, gnu/packages/slim.scm,
gnu/packages/ssh.scm, gnu/packages/texlive.scm, gnu/packages/vim.scm,
gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wv.scm,
gnu/packages/xiph.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm,
gnu/packages/yasm.scm, gnu/packages/zip.scm,
guix/build/cmake-build-system.scm, guix/build/perl-build-system.scm,
guix/build/python-build-system.scm, guix/download.scm: Replaces uses of
#:renamer and 'symbol-prefix-proc' with #:prefix.
2014-09-23 18:52:29 -04:00
Mark H Weaver
c3f16c554e
gnu: gtk+: Disable tests on mips64el-linux.
...
* gnu/packages/gtk.scm (gtk+): Disable tests on mips64el-linux.
2014-09-23 18:52:27 -04:00
Ludovic Courtès
99462faca0
gnu: gtk+: Remove dependency on Xorg server on mips64el-linux.
...
Reported by Mark H. Weaver.
* gnu/packages/gtk.scm (gtk+)[native-inputs]: Remove XORG-SERVER on
mips64el-linux.
2014-09-23 18:52:26 -04:00
Ludovic Courtès
4627a46470
services: Add 'bitlbee-service'.
...
* gnu/services/networking.scm (bitlbee-service): New procedure.
* doc/guix.texi (Networking Services): Document it.
2014-09-23 23:46:01 +02:00
Ludovic Courtès
b5d9beaa1a
gnu: xf86-input-synaptics: Allow building with libc 2.20.
...
* gnu/packages/patches/xf86-input-synaptics-glibc-2.20.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-input-synaptics): Use it. Improve
synopsis and description.
2014-09-23 22:49:42 +02:00
Ludovic Courtès
c9d39df937
gnu: node: Add 'which' as an input.
...
* gnu/packages/node.scm (node)[native-inputs]: Add WHICH.
2014-09-23 15:30:13 +02:00
Ludovic Courtès
969b662128
gnu: xorg: Remove xf86-input-vmmouse.
...
* gnu/packages/xorg.scm (xf86-input-vmmouse): Remove. This driver
implement the mouse protocol of a proprietary emulator.
* gnu/services/xorg.scm (xorg-start-command): Remove reference.
2014-09-23 15:13:46 +02:00
Ludovic Courtès
3b0273885b
gnu: linux-libre: Work around GCC 4.8.3 ICE.
...
* gnu/packages/linux.scm (linux-libre)[inputs]: New field.
2014-09-23 10:12:17 +02:00
Ludovic Courtès
4b164c4532
system: Add Patch to '%base-packages'.
...
* gnu/system.scm (%base-packages): Add PATCH.
2014-09-22 23:11:33 +02:00
Ludovic Courtès
f07aa672fd
Merge branch 'core-updates'
2014-09-22 23:06:33 +02:00
Ludovic Courtès
52ac153e2a
linux-initrd: Adjust VM code and doc to new 'base-initrd' signature.
...
This fixes regressions introduced in de1c158
("system: Add support for
boot-time mapped devices.").
* doc/guix.texi (Initial RAM Disk): Adjust example with custom use of
'base-initrd'. Document #:mapped-devices parameter of 'base-initrd'.
* gnu/system/vm.scm (system-disk-image, system-qemu-image,
virtualized-operating-system): Adjust call to 'base-initrd' to new
signature.
2014-09-22 21:29:41 +02:00
Ludovic Courtès
cb150ca34f
gnu: perl-tk: Build sequentially.
...
Fixes <http://bugs.gnu.org/18262 >.
* gnu/packages/tcl.scm (perl-tk)[arguments]: Add #:parallel-build? #f.
2014-09-22 14:27:46 +02:00
Ludovic Courtès
de1c158f32
system: Add support for boot-time mapped devices.
...
* gnu/build/linux-boot.scm (boot-system): Add #:pre-mount parameter and
honor it.
* gnu/system/linux-initrd.scm (base-initrd): Add #:mapped-devices
parameter. Add 'device-mapping-commands' variable, and use it to
build the #:pre-mount argument of 'boot-system'.
* gnu/system.scm (mapped-device-user,
operating-system-user-mapped-devices,
operating-system-boot-mapped-devices): New procedures.
(device-mapping-services): Use 'operating-system-user-mapped-devices'
instead of 'operating-system-mapped-devices'.
(operating-system-initrd-file): Call the initrd with #:mapped-devices.
2014-09-22 11:20:41 +02:00
Ludovic Courtès
e2b464b7f4
activation: Ensure existing user accounts have the right settings.
...
* gnu/build/activation.scm (modify-user, ensure-user): New procedures.
(activate-users+groups): Systematically call 'ensure-user'.
2014-09-22 10:10:08 +02:00
Ludovic Courtès
5f36ea03ad
gnu: valgrind: Update to 3.10.0.
...
* gnu/packages/valgrind.scm (valgrind): Update to 3.10.0.
* gnu/packages/patches/valgrind-glibc.patch: Remove.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
2014-09-22 10:07:52 +02:00
Ludovic Courtès
cc7f4e0589
gnu: duplicity: Add dependency on util-linux.
...
* gnu/packages/backup.scm (duplicity)[native-inputs]: Add util-linux.
2014-09-20 23:38:16 +02:00
Ludovic Courtès
a69bc0103d
gnu: ots: Build sequentially.
...
* gnu/packages/ots.scm (ots)[arguments]: New field.
2014-09-20 23:14:48 +02:00
Ludovic Courtès
573a35541f
gnu: Add sound-theme-freedesktop.
...
Suggested by Federico Beffa <beffa@ieee.org>.
* gnu/packages/libcanberra.scm (sound-theme-freedesktop): New variable.
2014-09-20 15:10:11 +02:00
Ludovic Courtès
571a0310ff
gnu: libcanberra: Add dependency on PulseAudio and eudev.
...
* gnu/packages/libcanberra.scm (libcanberra): Add PulseAudio and eudev
as inputs.
2014-09-20 15:02:45 +02:00
Ludovic Courtès
0a9e9a6311
gnu: emacs: Switch to GTK+ 3.
...
Suggested by Federico Beffa <beffa@ieee.org>.
* gnu/packages/emacs.scm (emacs): Switch to GTK+ 3.
2014-09-20 14:49:20 +02:00
Ludovic Courtès
dd68dd137a
gnu: cyrus-sasl: Build sequentially.
...
* gnu/packages/cyrus-sasl.scm (cyrus-sasl)[arguments]: Pass
#:parallel-build?.
2014-09-20 14:15:17 +02:00
Ludovic Courtès
4359378a2c
linux-boot: Ask fsck for a progress bar.
...
* gnu/build/file-systems.scm (check-file-system): Pass '-C 0' to FSCK.
Suggested by Mark H. Weaver.
2014-09-19 21:51:36 +02:00
Ludovic Courtès
f75426d5b4
gnu: guile-charting: Update to 0.2.0.
...
* gnu/packages/guile.scm (guile-charting): Update to 0.2.0. Remove
now-unnecessary cruft from 'snippet'. Modify 'godir' in Makefile.in.
2014-09-19 17:23:17 +02:00
Ludovic Courtès
a9eef4d2e5
system: Fix value of 'EUDEV_RULES_DIRECTORY'.
...
* gnu/services/base.scm (udev-service): Append "/lib/udev/rules.d" to
EUDEV_RULES_DIRECTORY.
2014-09-19 17:23:17 +02:00
Alex Kost
516e93f8a6
gnu: Fix typos.
...
* gnu/packages/cdrom.scm (cdparanoia): Double space in description.
* gnu/packages/maths.scm (hdf5): Double space in synopsis.
2014-09-19 15:31:19 +04:00
Jason Self
49e4bca583
gnu: linux-libre: Update to 3.16.3.
...
* gnu/packages/linux.scm (linux-libre): Update to version 3.16.3.
2014-09-18 16:18:14 -07:00
Ludovic Courtès
7f28bf9a43
system: Add udev rule for /dev/kvm.
...
* gnu/services/base.scm (kvm-udev-rule): New procedure.
(udev-service): Use it, and add it to RULES.
(guix-build-accounts): Add "kvm" to the 'supplementary-groups' field.
* gnu/system/shadow.scm (%base-groups): Add "kvm".
2014-09-18 23:23:46 +02:00
Ludovic Courtès
6c1df0819c
linux-initrd: Remove now obsolete #:guile-modules-in-chroot? parameter.
...
* gnu/build/linux-boot.scm (boot-system): Remove
#:guile-modules-in-chroot? and related code.
* gnu/system/linux-initrd.scm (base-initrd): Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Remove
#:guile-modules-in-chroot? argument in 'base-initrd' call.
2014-09-18 23:05:22 +02:00
Ludovic Courtès
2a13d05e45
system: Add support for swap devices.
...
* gnu/services/base.scm (swap-service): New procedure.
* gnu/system.scm (<operating-system>)[swap-devices]: New field.
(swap-services): New procedure.
(essential-services): Use it.
2014-09-18 22:52:01 +02:00
Ludovic Courtès
722554a306
system: Define 'device-mapping-kind', and add a 'close' procedure.
...
* gnu/system/file-systems.scm (<mapped-device-type>): New record type.
(<mapped-device>)[command]: Remove field.
[type]: New field.
* gnu/services/base.scm (device-mapping-service): Rename 'command'
parameter to 'open'. Add 'close' parameter and honor it.
* gnu/system.scm (luks-device-mapping): Rename to...
(open-luks-device): ... this.
(close-luks-device): New procedure.
(luks-device-mapping): New variable.
(device-mapping-services): Get the type of MD, and pass its 'open' and
'close' fields to 'device-mapping-service'.
2014-09-18 19:18:39 +02:00
Ludovic Courtès
2f7a10db6d
gnu: skribilo: Make sure Guile-Reader is in the search path.
...
Reported by Luis Souto Graña <luissoutobueu@gmail.com>.
* gnu/packages/skribilo.scm (skribilo)[arguments]: Add #:phases.
2014-09-18 11:22:01 +02:00
Ludovic Courtès
6904ecce5f
gnu: gcc-4.8.3: Add patch for PR61801.
...
* gnu/packages/patches/gcc-fix-pr61801.patch: New file.
* gnu/packages/gcc.scm (gcc-4.8): Use it.
* gnu-system.am (dist_patch_DATA): Add it.
2014-09-17 17:17:43 +02:00
Ludovic Courtès
c8bf8b2f88
gnu: libcanberra: Update URL.
...
Reported by Federico Beffa <beffa@ieee.org>.
* gnu/packages/libcanberra.scm (libcanberra)[source]: Update URI.
2014-09-17 11:09:22 +02:00
Ludovic Courtès
f02f65efb4
services: dhcp-client: Start 'dhclient' in "no wait" mode.
...
* gnu/services/networking.scm (dhcp-client-service): Pass '-nw' to
'dhclient'.
2014-09-17 09:27:07 +02:00
Ludovic Courtès
6a3f4c74fd
services: file-system: Change directory to root before unmounting.
...
* gnu/services/base.scm (file-system-service)[stop]: Add 'chdir' call.
2014-09-17 09:20:38 +02:00
Ludovic Courtès
d656c14ec9
services: user-processes: Wait for complete process termination.
...
* gnu/services/base.scm (user-processes-service): Add 'wait' loop.
2014-09-17 09:19:48 +02:00
Ludovic Courtès
66d5d8c072
services: udev: Make non-respawnable.
...
* gnu/services/base.scm (udev-service): Add 'respawn?' field.
2014-09-17 08:59:13 +02:00
Ludovic Courtès
bebc8681c2
services: Change default 'stop' value to #~(const #f).
...
* gnu/services.scm (<service>)[stop]: Change default value.
2014-09-17 07:50:11 +02:00
Ludovic Courtès
e617a86137
system: Add "input" to '%base-groups'.
...
* gnu/system/shadow.scm (%base-groups): Add "input" group.
2014-09-16 22:43:55 +02:00
Ludovic Courtès
64a4a21e86
gnu: guile-charting: Modules correctly installed, guile-cairo propagated.
...
* gnu/packages/guile.scm (guile-charting): Patch Makefile.in files to
install to guile/site/2.0. Move GUILE-CAIRO to 'propagated-inputs'.
2014-09-16 17:49:57 +02:00
Ludovic Courtès
3f9d63df13
gnu: pulseaudio: Disable Console-Kit support by default.
...
This prevented PulseAudio from starting on systems without Console-Kit.
* gnu/packages/pulseaudio.scm (pulseaudio)[source]: Add snippet.
2014-09-15 23:58:39 +02:00
Ludovic Courtès
a34cedc45e
gnu: Add OPAM.
...
* gnu/packages/ocaml.scm (opam): New variable.
2014-09-15 23:58:39 +02:00
Andreas Enge
6b8e828577
gnu: Add arb.
...
* gnu/packages/algebra.scm (arb): New variable.
2014-09-15 16:26:30 +02:00
Ludovic Courtès
2274b8163a
gnu: mupdf: Adjust synopsis.
...
* gnu/packages/pdf.scm (mupdf): Remove article from synopsis.
2014-09-15 09:06:42 +02:00
Marek Benc
c0b390ed72
gnu: Add mupdf.
...
* gnu/packages/pdf.scm (mupdf): New variable.
* gnu/packages/patches/mupdf-buildsystem-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Added the above patch.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-15 09:04:19 +02:00
Marek Benc
38c55e5c8e
gnu: Add openjpeg.
...
* gnu/packages/image.scm (openjpeg): New variable.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-15 09:00:12 +02:00
Marek Benc
8d9872b539
gnu: Add jbig2dec
...
* gnu/packages/image.scm (jbig2dec): New variable.
* gnu/packages/patches/jbig2dec-ignore-testtest.patch: New file.
* gnu-system.am (dist_patch_DATA): Added the above patch.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-15 08:54:02 +02:00
Ludovic Courtès
a023cca8d9
services: Add 'dhcp-client-service'.
...
* gnu/services/networking.scm (dhcp-client-service): New procedure.
* doc/guix.texi (Networking Services): Document it.
2014-09-14 23:49:02 +02:00
Ludovic Courtès
150d8e6414
services: static-networking-service: Wait for udev, except for loopback.
...
Reported by DusXMT on #guix.
* gnu/services/networking.scm (static-networking-service): Add
'requirement' field. Change 'documentation' to be a string literal.
2014-09-14 23:49:02 +02:00
Mark H Weaver
9fac9e3be3
Merge branch 'master' into core-updates
...
Conflicts:
gnu-system.am
2014-09-13 19:48:47 -04:00
Andreas Enge
d7ab698a62
gnu: Add flint.
...
* gnu/packages/algebra.scm (flint): New variable.
2014-09-13 18:55:21 +02:00
Ludovic Courtès
9e771e3bb6
gnu: Adjust synopses as recommended by 'guix lint'.
...
Remove leading articles and trailing periods in package synopses.
2014-09-13 15:50:30 +02:00
Ludovic Courtès
c5779c931b
gnu: Synchronize GNU package descriptions with upstream.
...
These are mostly two-space-after-end-of-sentence-period changes
resulting from commit 3a09e1d2
.
2014-09-13 15:36:07 +02:00
Ludovic Courtès
8a7330fd76
system: Use eudev instead of udev by default.
...
* gnu/system.scm (%base-packages): Change 'udev' to 'eudev'.
* gnu/services/base.scm (udev-service): Change #:udev to default to
'eudev'.
2014-09-13 10:54:47 +02:00
Ludovic Courtès
66a99a0676
services: udev: Allow the use of eudev.
...
* gnu/services/base.scm (udev-service): Adjust 'start' method to support
eudev in addition to udev.
2014-09-13 10:53:47 +02:00
Ludovic Courtès
ba544e78dc
system: Add Diffutils to '%base-packages'.
...
* gnu/system.scm (%base-packages): Add DIFFUTILS.
2014-09-13 10:52:21 +02:00
Ludovic Courtès
52bd573421
system: Add FUSE and ALSA udev rules by default.
...
* gnu/services/base.scm (%base-services): Pass FUSE and ALSA-UTILS to
'udev-service'.
2014-09-13 10:50:26 +02:00
Ludovic Courtès
c19ce3a711
gnu: eudev: Honor $EUDEV_RULES_DIRECTORY.
...
* gnu/packages/patches/eudev-rules-directory.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/linux.scm (eudev): Use it.
2014-09-13 10:47:58 +02:00
Ludovic Courtès
dc2d59afa9
gnu: eudev: Build with libkmod support.
...
* gnu/packages/linux.scm (eudev)[arguments]: New field.
2014-09-13 10:46:10 +02:00
Ludovic Courtès
9a4efac9ef
gnu: fuse: Install udev rules in lib/udev/rules.d.
...
* gnu/packages/linux.scm (fuse): Change UDEV_RULES_PATH suffix to
/lib/udev/rules.d.
2014-09-13 10:34:50 +02:00
Ludovic Courtès
b0e652d836
Revert "gnu: util-linux: Don't install 'logger'."
...
This reverts commit c9a8ad8477
.
2014-09-12 22:19:33 +02:00
Ludovic Courtès
9d77da2a47
gnu: util-linux: Don't install 'logger'.
...
* gnu/packages/linux.scm (util-linux)[source]: Add 'snippet'.
2014-09-12 22:18:44 +02:00
Ludovic Courtès
7fa715e783
gnu: Add eudev.
...
* gnu/packages/linux.scm (eudev): New variable.
2014-09-12 22:13:52 +02:00
Ludovic Courtès
c9a8ad8477
gnu: util-linux: Don't install 'logger'.
...
* gnu/packages/linux.scm (util-linux)[source]: Add 'snippet'.
2014-09-12 22:13:52 +02:00
Ludovic Courtès
6d49355d8b
activation: Honor $GUIX_NEW_SYSTEM for use by 'guix system reconfigure'.
...
* gnu/build/activation.scm (activate-current-system): Honor
$GUIX_NEW_SYSTEM by default.
* guix/scripts/system.scm (switch-to-system): Set $GUIX_NEW_SYSTEM
before loading SCRIPT.
2014-09-12 22:13:52 +02:00
Ludovic Courtès
ddfc2fd8e0
gnu: e2fsprogs: Build with --disable-blkid.
...
* gnu/packages/linux.scm (e2fsprogs)[arguments]: Pass --disable-blkid.
2014-09-12 22:13:52 +02:00
Ludovic Courtès
a68c69675f
system: Add more common tools to '%base-packages'.
...
* gnu/system.scm (%base-packages): Add gawk, tar, gzip, bzip2, xz, lzip,
and wireless-tools.
2014-09-12 22:13:49 +02:00
Ludovic Courtès
07b08343d7
system: Produce a basic /etc/nsswitch.conf to honor /etc/hosts.
...
* gnu/system.scm (etc-directory): Produce nsswitch.conf.
2014-09-12 09:55:25 +02:00
Ludovic Courtès
7d6a52c0dc
system: Fix the default /etc/hosts.
...
* gnu/system.scm (default-/etc/hosts): Fix the alias/address order.
Add ::1.
2014-09-12 09:52:05 +02:00
Mark H Weaver
66ea98e321
Merge branch 'master' into core-updates
...
Conflicts:
gnu/packages/image.scm
2014-09-11 18:26:28 -04:00
Ludovic Courtès
5dae0186de
system: Add support for Linux-style mapped devices.
...
* gnu/system/file-systems.scm (<mapped-device>): New record type.
* gnu/system.scm (<operating-system>)[mapped-devices]: New field.
(luks-device-mapping): New procedure.
(other-file-system-services)[device-mappings, requirements]: New
procedures. Pass #:requirements to 'file-system-service'.
(device-mapping-services): New procedure.
(essential-services): Use it. Append its result to the return value.
(operating-system-initrd-file): Add comment.
* gnu/services/base.scm (file-system-service): Add #:requirements
parameter and honor it.
(device-mapping-service): New procedure.
* gnu/system/linux-initrd.scm (base-initrd): Add comment.
2014-09-12 00:14:52 +02:00
Ludovic Courtès
ee7bae3bbd
activation: Set the permissions of /etc/sudoers to 440.
...
* gnu/build/activation.scm (activate-etc): Move 'rm-f' to a local
'define'. When TARGET is "sudoers", make it 440.
2014-09-12 00:14:52 +02:00
Ludovic Courtès
c851400bee
system: Add '\w' to the default PS1.
...
* gnu/system.scm (etc-directory)[bashrc]: Add '\w' to PS1.
2014-09-12 00:14:52 +02:00
Ludovic Courtès
ee248b6a70
activation: Make the /bin/sh symlink at activation time.
...
* gnu/build/install.scm (directives): Remove "/bin/sh".
* gnu/build/activation.scm (activate-/bin/sh): New procedure.
* gnu/system.scm (operating-system-activation-script): Use it.
2014-09-12 00:14:52 +02:00
Ludovic Courtès
ecd06ca9fa
services: udev: Allow for additional udev rules.
...
* gnu/services/base.scm (udev-rules-union): New procedure.
(udev-service): Add #:rules parameter. Call 'udev-rules-union' and
create udev.conf. Set $UDEV_CONFIG_FILE before spawning udevd.
2014-09-12 00:14:52 +02:00
Ludovic Courtès
c65e183403
system: Add 'hosts-file' field.
...
* gnu/system.scm (<operating-system>)[hosts-file]: New field.
(default-/etc/hosts): New procedure.
(etc-directory): Add #:hosts-file parameter and honor it.
(operating-system-etc-directory): Build /etc/hosts, and pass
it as #:hosts-file to 'etc-directory'.
2014-09-12 00:14:52 +02:00
Ludovic Courtès
f9d53de105
system: Add default PAM entries for xlock and xscreensaver.
...
* gnu/system/linux.scm (base-pam-services): Add "xlock" and
"xscreensaver".
2014-09-12 00:14:52 +02:00
Ludovic Courtès
c6a0536d08
activation: Make sure /etc/sudoers & co. are regular files.
...
Before that, 'sudo' would exit with:
sudo: /etc/sudoers is not a regular file
sudo: no valid sudoers sources found, quitting
* gnu/build/activation.scm (activate-etc): Check if SOURCE matches
'file-is-directory?'. If not, use 'copy-file' instead of 'symlink'.
2014-09-12 00:14:52 +02:00
Ludovic Courtès
286cacaded
activation: Remove outdated comment.
...
* gnu/build/activation.scm (activate-etc): Remove outdated comment.
2014-09-12 00:14:52 +02:00
Ludovic Courtès
095f4deb4b
activation: Factorize the link-or-copy trick.
...
* gnu/build/activation.scm (link-or-copy): New procedure.
(activate-setuid-programs): Use it.
2014-09-12 00:14:52 +02:00
Kevin Lemonnier
f489668723
gnu: Add weechat
...
* gnu/packages/weechat.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
Signed-off-by: Eric Bavier <bavier@member.fsf.org>
2014-09-11 17:14:24 -05:00
Andreas Enge
66fdf54587
gnu: glpk: Update to 4.55.
...
* gnu/packages/maths.scm (glpk): Update to 4.55.
2014-09-11 16:43:08 +02:00
Andreas Enge
9493176ad7
gnu: global: Update to 6.3.2.
...
* gnu/packages/global.scm (global): Update to 6.3.2.
2014-09-11 15:32:09 +02:00
Andreas Enge
d5b888fa2d
gnu: freeipmi: Update to 1.4.5.
...
* gnu/packages/freeipmi.scm (freeipmi): Update to 1.4.5.
2014-09-11 15:25:46 +02:00
Kevin Lemonnier
c361d075d3
gnu: Have lua-5.1 compile a .so
...
* gnu/packages/patches/lua51-liblua-so.patch: New file
* gnu/packages/lua.scm: Use of lua51-liblua-so.patch in lua-5.1
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-11 11:59:15 +02:00
Ludovic Courtès
275a77113c
gnu: lzip: Update to 1.16.
...
* gnu/packages/compression.scm (lzip): Update to 1.16.
2014-09-11 09:51:39 +02:00
Ludovic Courtès
f2817d4303
gnu: lvm2: Programs such as 'dmsetup' now have a correct RUNPATH.
...
* gnu/packages/linux.scm (alsa-utils): Add comment.
(lvm2): Add LDFLAGS as a configure flag.
2014-09-10 22:59:27 +02:00
Ludovic Courtès
a4888e2e0f
install: Gracefully handle corner cases with 'guix system init foo /'.
...
* gnu/build/install.scm (evaluate-populate-directive): Wrap body in
"catch 'system-error", and report clear errors. In the symlink case,
retry up EEXIST.
(populate-root-file-system): Remove /var/guix/profiles/system-1-link
before attempting to create it.
2014-09-10 21:39:47 +02:00
Ludovic Courtès
6bb08d056e
gnu: wv: Fix URL.
...
Reported by Marek Benc.
* gnu/packages/wv.scm (wv): Change URL to mirror://. Also replace one
NAME occurrence in the URL with 'wvware'.
2014-09-09 17:18:04 +02:00
Ludovic Courtès
df5ce088f2
system: Export '%setuid-programs'.
...
* gnu/system.scm: Export '%setuid-programs', as documented in the
manual.
2014-09-09 17:12:33 +02:00
Ludovic Courtès
757d5ff306
gnu: libwmf: Use a mirror:// URL.
...
* gnu/packages/image.scm (libwmf): Use a mirror://sourceforge URL.
2014-09-09 15:35:00 +02:00
Ludovic Courtès
a3c4aa1b70
gnu: abiword: Use 'wv', not 'wvware'.
...
* gnu/packages/abiword.scm: Change 'wvware' to 'wv'.
2014-09-09 15:33:57 +02:00
Marek Benc
698d228001
gnu: Add AbiWord.
...
* gnu/packages/patches/abiword-explictly-cast-bools.patch New file.
* gnu/packages/patches/abiword-link-plugins-against-backend.patch: New file.
* gnu/packages/patches/abiword-no-include-glib-internal-headers.patch: New file.
* gnu/packages/patches/abiword-pass-no-undefined-to-linker.patch
* gnu/packages/patches/abiword-use-proper-png-api.patch: New file.
* gnu/packages/patches/abiword-wmf-version-lookup-fix.patch: New file.
* gnu/packages/abiword.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add abiword.scm.
(dist_patch_DATA): Add the 6 patches for abiword.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-09 13:55:20 +02:00
Marek Benc
52910ded6c
gnu: Add ots.
...
* gnu/packages/patches/ots-no-include-missing-file.patch: New file.
* gnu/packages/ots.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add ots.scm.
(dist_patch_DATA): Add ots-no-include-missing-file.patch.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-09 13:40:04 +02:00
Marek Benc
1deac3440c
gnu: Add Enchant.
...
* gnu/packages/enchant.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-09 13:34:22 +02:00
Marek Benc
9ffbe2b7d5
gnu: Add wv.
...
* gnu/packages/wv.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-09 11:58:35 +02:00
Marek Benc
efa77baf26
gnu: Add libwmf.
...
* gnu/packages/image.scm (libwmf): New variable.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-09 11:48:44 +02:00
Marek Benc
b005157c9b
gnu: Add GNU FriBidi.
...
* gnu/packages/fribidi.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-09 11:41:55 +02:00
Kevin Lemonnier
cf31157fb2
gnu: Add zsh.
...
* gnu/packages/zsh.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-09 09:50:19 +02:00
Ludovic Courtès
42d10464be
linux-initrd: Store Linux modules in a normal store directory.
...
* gnu/system/linux-initrd.scm (expression->initrd): Remove #:linux and
#:linux-modules parameters. Remove call to
'float-linux-module-directory'.
(base-initrd): Add call to 'float-linux-module-directory'. Use it in
#:linux-modules argument in the gexp. Remove #:linux and
#:linux-modules arguments to 'expression->initrd'.
* gnu/build/linux-initrd.scm (build-initrd): Remove
#:linux-module-directory parameter. Don't create 'modules'
sub-directory.
* gnu/build/linux-boot.scm (boot-system): Mentin that LINUX-MODULES is a
list of absolute file names. Don't prepend "/modules/" to
LINUX-MODULES.
* doc/guix.texi (Initial RAM Disk): Adjust accordingly.
2014-09-08 23:47:29 +02:00
Ludovic Courtès
df650fa84e
linux-initrd: Remove #:to-copy argument of 'expression->initrd'.
...
* gnu/system/linux-initrd.scm (expression->initrd): Remove #:to-copy
parameter. Remove 'graph-files', and adjust #:references-graphs
arguments to just list INIT.
(base-initrd): Remove #:to-copy argument.
* doc/guix.texi (Initial RAM Disk): Adjust accordingly.
2014-09-08 23:47:28 +02:00
Ludovic Courtès
1621cf97aa
linux-initrd: Move initrd creation code to (guix build linux-initrd).
...
* gnu/build/linux-initrd.scm (cache-compiled-file-name,
compile-to-cache, build-initrd): New procedures.
* gnu/system/linux-initrd.scm (expression->initrd)[builder]: Remove code
now moved above. Use 'build-initrd'.
2014-09-08 23:47:28 +02:00
Ludovic Courtès
70608adb4a
linux-initrd: Copy all the script's closure to the initrd.
...
* gnu/system/linux-initrd.scm (expression->initrd): Remove calls to
'imported-modules' and 'compiled-modules'. Use 'gexp->script' with
EXP. Add the result to TO-COPY. Make /init a symlink to that script,
and copy its closure into the "contents" directory. Add fake
/proc/self/exe symlink.
* gnu/build/linux-boot.scm (load-linux-module*): Add comment about mmap.
* gnu/system/vm.scm (system-qemu-image/shared-store-script): Add "-m
256". This turns out to be needed for initrds containing things like
e2fsck and several modules; with the default of 128 MiB, loading
libahci.ko may fail with -1.
2014-09-08 23:47:28 +02:00
Ludovic Courtès
c2619e10ea
gnu: Add GNU direvent.
...
* gnu/packages/admin.scm (direvent): New variable.
2014-09-08 23:47:28 +02:00
Ludovic Courtès
c4492a16ea
gnu: Add testdisk.
...
* gnu/packages/admin.scm (testdisk): New variable.
2014-09-08 23:47:28 +02:00
Ludovic Courtès
813caa0a66
gnu: youtube-dl: Update to 2014.09.06.
...
* gnu/packages/video.scm (youtube-dl): Update to 2014.09.06.
2014-09-08 23:47:28 +02:00
Mark H Weaver
da5538ef44
gnu: libunistring: Update to 0.9.4.
...
* gnu/packages/libunistring.scm (libunistring): Update to 0.9.4.
2014-09-08 12:40:28 -04:00
Ludovic Courtès
db60b1d9ff
gnu: Add tdb.
...
* gnu/packages/databases.scm (tdb): New variable.
2014-09-08 18:00:03 +02:00
Ludovic Courtès
5f96f303eb
gnu: Consolidate databases in (gnu packages databases).
...
* gnu/packages/databases.scm: New file, with the contents of the
following deleted files.
* gnu/packages/mysql.scm, gnu/packages/postgresql.scm,
gnu/packages/recutils.scm, gnu/packages/sqlite.scm,
gnu/packages/bdb.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly.
* gnu/packages/apl.scm, gnu/packages/dc.scm, gnu/packages/games.scm,
gnu/packages/gnunet.scm, gnu/packages/linux.scm, gnu/packages/mail.scm,
gnu/packages/mpd.scm, gnu/packages/nvi.scm, gnu/packages/openldap.scm,
gnu/packages/package-management.scm, gnu/packages/python.scm,
gnu/packages/qt.scm, gnu/packages/rdf.scm,
gnu/packages/version-control.scm: Adjust to new module name.
2014-09-08 17:48:57 +02:00
Ludovic Courtès
971863fb45
gnu: Remove extra import in (gnu packages admin).
...
* gnu/packages/admin.scm: Remove duplicate use of (gnu packages base).
2014-09-08 17:48:55 +02:00
Mark H Weaver
39ccbfad1c
gnu: glibc: Update to 2.20.
...
* gnu/packages/patches/glibc-CVE-2014-5119.patch: Remove.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/base.scm (glibc): Update to 2.20. Remove patch.
Raise minimum linux version to 2.6.32.
2014-09-08 11:27:05 -04:00
Mark H Weaver
e759c0a38c
Merge branch 'master' into core-updates
2014-09-08 11:00:06 -04:00
Ludovic Courtès
84da4ad4b0
linux-initrd: Build cpio archives without '--no-absolute-filenames'.
...
* gnu/build/linux-initrd.scm (write-cpio-archive): Remove
'--no-absolute-filenames'.
2014-09-08 00:03:38 +02:00
Jason Self
e46db7728d
gnu: linux-libre: Update to 3.16.2.
...
* gnu/packages/linux.scm (linux-libre): Update to version 3.16.2.
2014-09-06 19:52:38 -07:00
Ludovic Courtès
49fa9381b8
linux-initrd: Populate the initrd's store with complete closures.
...
* gnu/system/linux-initrd.scm (expression->initrd): Add 'graph-files'.
Use (guix build store-copy) and 'populate-store' instead of local
hack. Pass #:references-graphs to 'gexp->derivation'.
2014-09-06 23:42:56 +02:00
Ludovic Courtès
1456cff18f
gnu: unionfs-fuse/static: Remove store references from the executable.
...
* gnu/packages/linux.scm (unionfs-fuse/static)[arguments]: Add #:phases.
2014-09-06 23:42:56 +02:00
Ludovic Courtès
b53833b2ef
gexp: Allow use of high-level objects in #:references-graphs.
...
* guix/gexp.scm (lower-reference-graphs): New procedure.
(gexp->derivation)[graphs-file-names]: New procedure.
Use 'lower-reference-graphs', and augment #:inputs argument as a
function of #:references-graphs.
* doc/guix.texi (G-Expressions): Adjust 'gexp->derivation' documentation
accordingly.
* tests/gexp.scm ("gexp->derivation, store copy"): Remove reference to
TWO in BUILD-DRV. Use TWO directly in #:references-graphs argument.
("gexp->derivation #:references-graphs"): New test.
* gnu/system/vm.scm (qemu-image): Remove variable 'graph'; use INPUTS as
the #:references-graphs argument to
'expression->derivation-in-linux-vm'.
2014-09-06 23:42:56 +02:00
Jason Self
108293c5ea
gnu: linux-libre: Revert to 3.16.1.
...
* gnu/packages/linux.scm (linux-libre): Revert to version 3.16.1.
2014-09-06 09:33:41 -07:00
Jason Self
8dd09fad52
gnu: linux-libre: Update to 3.16.2.
...
* gnu/packages/linux.scm (linux-libre): Update to version 3.16.2.
2014-09-06 09:19:08 -07:00
David Thompson
9dd6078d3b
gnu: Add python-sphinx.
...
* gnu/packages/python.scm (python-sphinx, python2-sphinx): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
fb35b7c088
gnu: Add python-pygments.
...
* gnu/packages/python.scm (python-pygments, python2-pygments): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
3580ab8be2
gnu: Add python-docutils.
...
* gnu/packages/python.scm (python-docutils, python2-docutils): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
fe34f0d152
gnu: Add python-jinja2.
...
* gnu/packages/python.scm (python-jinja2, python2-jinja2): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
8176d4d55b
gnu: Add python-markupsafe.
...
* gnu/packages/python.scm (python-markupsafe, python2-markupsafe): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
5731cae394
gnu: Add python-virtualenv.
...
* gnu/packages/python.scm (python-virtualenv, python2-virtualenv): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
ec5dbb5c30
gnu: Add python-itsdangerous.
...
* gnu/packages/python.scm (python-itsdangerous, python2-itsdangerous): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
2cec1f6f56
gnu: Add python-oauthlib.
...
* gnu/packages/python.scm (python-oauthlib, python2-oauthlib): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
6d45fef43e
gnu: Add python-pyjwt.
...
* gnu/packages/python.scm (python-pyjwt, python2-pyjwt): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
041358fb01
gnu: Add python-discover.
...
* gnu/packages/python.scm (python-discover, python2-discover): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
243a009ada
gnu: Add python-coverage.
...
* gnu/packages/python.scm (python-coverage, python2-coverage): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
b24a0c00e4
gnu: Add python-testrepository.
...
* gnu/packages/python.scm (python-testrepository, python2-testrepository): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
cd49454b7b
gnu: Add python-fixtures.
...
* gnu/packages/python.scm (python-fixtures, python2-fixtures): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
070ab0588c
gnu: Add python-subunit.
...
* gnu/packages/python.scm (python-subunit, python2-subunit): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
dac79ecc51
gnu: Add python-testresources.
...
* gnu/packages/python.scm (python-testresources, python2-testresources): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
5bf3afea68
gnu: Add python-testscenarios.
...
* gnu/packages/python.scm (python-testscenarios, python2-testscenarios): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
d8fa80e13f
gnu: Add python-testtools.
...
* gnu/packages/python.scm (python-testtools, python2-testtools): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
84d2401728
gnu: Add python-scripttest.
...
* gnu/packages/python.scm (python-scriptest, python2-scripttest): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
855d4761a5
gnu: Add python-pytest.
...
* gnu/packages/python.scm (python-pytest, python2-pytest): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
542ad60fbc
gnu: Add python-py.
...
* gnu/packages/python.scm (python-py, python2-py): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
6cd9c35637
gnu: Add python-unittest2.
...
* gnu/packages/python.scm (python-unittest2, python2-unittest2): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
4435427e6d
gnu: Add python-nose.
...
* gnu/packages/python.scm (python-nose, python2-nose): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
c15a5c0eac
gnu: Add python-extras.
...
* gnu/packages/python.scm (python-extras, python2-extras): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
56ea0efd72
gnu: Add python-mimeparse.
...
* gnu/packages/python.scm (python-mimeparse, python2-mimeparse): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
850189b839
gnu: Add python-unidecode.
...
* gnu/packages/python.scm (python-unidecode, python2-unidecode): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
864b5211cd
gnu: Add python-jsonschema.
...
* gnu/packages/python.scm (python-jsonschema, python2-jsonschema): New
variables.
2014-09-05 23:31:20 -04:00
David Thompson
e6cfbd364a
gnu: Add python2-requests.
...
* gnu/packages/python.scm (python2-requests): New variable.
2014-09-05 23:31:20 -04:00
David Thompson
3a1f9a68e5
gnu: Add python-certifi.
...
* gnu/packages/python.scm (python-certifi, python2-certifi): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
d5f89b22d8
gnu: Add python-pyld.
...
* gnu/packages/python.scm (python-pyld, python2-pyld): New variables.
2014-09-05 23:31:20 -04:00
David Thompson
c7303d3cef
gnu: Add python-exif-read.
...
* gnu/packages/python.scm (python-exif-read, python2-exif-read): New
variables.
2014-09-05 23:31:20 -04:00
Ludovic Courtès
6fd1a79674
vm: Move store copy handling to (guix build store-copy).
...
* gnu/build/vm.scm (read-reference-graph, populate-store): Move to...
* guix/build/store-copy.scm: ... here. New file.
* Makefile.am (MODULES): Add it.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Adjust default
#:modules values accordingly.
* tests/gexp.scm ("gexp->derivation, store copy"): New test.
2014-09-04 23:24:54 +02:00
Ludovic Courtès
b21a1c5a18
linux-initrd: Move Linux module tree flattening to another derivation.
...
* gnu/system/linux-initrd.scm (expression->initrd)[string->regexp]:
Remove.
Use 'flat-linux-module-directory'. Remove the equivalent logic from
'builder'.
(flat-linux-module-directory): New procedure.
2014-09-04 22:51:04 +02:00
Ludovic Courtès
a423555d3c
gnu: datamash: Fix license.
...
* gnu/packages/datamash.scm (datamash)[license]: Change to GPL3+.
2014-09-03 15:43:07 +02:00
Ludovic Courtès
fbb3555809
linux-initrd: Factorize cpio archive creation.
...
* gnu/build/linux-initrd.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* gnu/system/linux-initrd.scm (expression->initrd): Use (gnu build
linux-initrd) and 'write-cpio-archive' instead of the inlined code.
2014-09-03 15:43:07 +02:00
Ludovic Courtès
e2f4b305d0
Move part of (gnu build linux-boot) to (gnu build file-systems).
...
* gnu/build/linux-boot.scm (%ext2-endianness, %ext2-sblock-magic,
%ext2-sblock-creator-os, %ext2-sblock-uuid, %ext2-sblock-volume-name,
read-ext2-superblock, ext2-superblock-uuid,
ext2-superblock-volume-name, disk-partitions,
partition-label-predicate, find-partition-by-label,
canonicalize-device-spec, MS_RDONLY, MS_NOSUID, MS_NODEV, MS_NOEXEC,
MS_BIND, MS_MOVE, bind-mount, check-file-system,
mount-flags->bit-mask, mount-file-system): Move to...
* gnu/build/file-systems.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* gnu/services/base.scm: Use (gnu build file-systems).
* gnu/services/dmd.scm (dmd-configuration-file): Likewise.
* gnu/system.scm (operating-system-activation-script): Likewise.
* gnu/system/linux-initrd.scm (base-initrd): Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Likewise.
2014-09-03 15:43:07 +02:00
Ludovic Courtès
8a9e21d1f7
Rename (gnu build linux-initrd) to (gnu build linux-boot).
...
* gnu/build/linux-initrd.scm: Rename to...
* gnu/build/linux-boot.scm: ... this.
* gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly.
* gnu/build/activation.scm, gnu/build/vm.scm, gnu/services/base.scm,
gnu/services/dmd.scm, gnu/system.scm, gnu/system/linux-initrd.scm,
gnu/system/vm.scm: Adjust accordingly.
2014-09-03 15:43:07 +02:00
Ludovic Courtès
548f7a8fa2
Move operating system helpers from (guix build …) to (gnu build …).
...
* guix/build/activation.scm, guix/build/install.scm,
guix/build/linux-initrd.scm, guix/build/vm.scm: Move to...
* gnu/build: ... here.
* Makefile.am (MODULES): Remove the above guix/build/ files.
* gnu-system.am (GNU_SYSTEM_MODULES): Add the above gnu/build/ files
here.
* gnu/services/base.scm, gnu/services/dmd.scm, gnu/system.scm,
gnu/system/linux-initrd.scm, gnu/system/vm.scm,
guix/scripts/system.scm: Adjust to the new module names.
2014-09-03 15:43:07 +02:00
David Thompson
52bd0810a8
gnu: Add postgresql.
...
* gnu/packages/postgresql.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
2014-09-03 07:47:47 -04:00
Cyril Roelandt
5e3b388b51
Move specification->package to gnu/packages.scm.
...
* guix/scripts/build.scm (specification->package): Move from here...
* gnu/packages.scm: ... to here.
2014-09-03 02:07:07 +02:00
Marek Benc
bf2a56f8ec
gnu: Add nvi.
...
* gnu/packages/nvi.scm: New file.
* gnu/packages/patches/nvi-assume-preserve-path.patch: New file.
* gnu-system.am: Add them.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-02 21:32:30 +02:00
Ludovic Courtès
8b8ea80781
gnu: ucommon: Update to 6.1.10.
...
* gnu/packages/telephony.scm (ucommon): Update to 6.1.10.
2014-09-02 00:01:38 +02:00
Ludovic Courtès
86da684c3d
gnu: libtasn1: Update to 4.1.
...
* gnu/packages/gnutls.scm (libtasn1): Update to 4.1.
2014-09-02 00:01:11 +02:00
Ludovic Courtès
f0214ece31
gnu: datamash: Update to 1.0.6.
...
* gnu/packages/datamash.scm (datamash): Update to 1.0.6.
2014-09-01 23:57:05 +02:00
Ludovic Courtès
7239e41196
gnu: parallel: Update to 20140822.
...
* gnu/packages/parallel.scm (parallel): Update to 20140822.
2014-09-01 23:56:01 +02:00
Ludovic Courtès
5c97df3ae6
gnu: help2man: Update to 1.46.1.
...
* gnu/packages/man.scm (help2man): Update to 1.46.1.
2014-09-01 23:55:23 +02:00
Ludovic Courtès
d474d5d0c6
gnu: gcc-toolchain: Inherit GCC's search path specifications.
...
Reported by Federico Beffa <beffa@ieee.org>.
* gnu/packages/commencement.scm (gcc-toolchain): Add
'native-search-paths' and 'search-paths' fields.
2014-08-31 22:18:47 +02:00
Mark H Weaver
6646747c02
gnu: gawk: Patch /usr/bin/file in extension/configure on MIPS.
...
* gnu/packages/gawk.scm (gawk): When building for MIPS, patch /usr/bin/file in
extension/configure.
2014-08-29 18:31:57 -04:00
Ludovic Courtès
00b7776c0d
gnu: Add nss-mdns.
...
* gnu/packages/avahi.scm (nss-mdns): New variable.
2014-08-29 14:13:26 +02:00
Mark H Weaver
b5ef82e064
gnu: Add missing import to (gnu packages base).
...
* gnu/packages/base.scm: Import (gnu packages base).
2014-08-28 15:34:17 -04:00
Mark H Weaver
c00a9fbfef
Merge branch 'master' into core-updates
...
Conflicts:
gnu/packages/base.scm
2014-08-28 14:22:15 -04:00
John Darrington
ba5324c30e
gnu: Add perl-archive-zip.
...
* gnu/packages/perl.scm (perl-archive-zip): New variable.
2014-08-28 18:56:16 +02:00
John Darrington
b1da9f82a8
gnu: Add bison-2.7
...
* gnu/packages/bison.scm (bison-2.7): New variable.
Bison 3.x and 2.x are incompatible. Some programs require 2.x
2014-08-28 18:56:13 +02:00
Ludovic Courtès
c23372131d
gnu: libwebsockets: Update to 1.3.
...
* gnu/packages/web.scm (libwebsockets): Update to 1.3. Switch to
CMAKE-BUILD-SYSTEM. Remove #:phases parameter and add #:tests?.
Remove AUTOCONF, AUTOMAKE, and LIBTOOL from 'native-inputs'.
2014-08-28 11:38:12 +02:00
Ludovic Courtès
12507a3ee6
gnu: Add Guile-Charting.
...
* gnu/packages/guile.scm (guile-charting): New variable.
2014-08-28 10:09:28 +02:00
Ludovic Courtès
49710cea4c
gnu: guile-cairo: Propagate Cairo.
...
* gnu/packages/gtk.scm (guile-cairo): Move CAIRO to 'propagated-inputs'.
2014-08-28 10:06:48 +02:00
Ludovic Courtès
bdb36958fb
gnu: Split (gnu packages base), adding (gnu packages commencement).
...
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-28 09:21:54 +02:00
Alex Kost
18311966d1
gnu: Add unclutter.
...
* gnu/packages/unclutter.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
2014-08-27 15:52:25 +04:00
Mark H Weaver
f5beb0caf3
gnu: glibc: Fix CVE-2014-5119.
...
* gnu/packages/patches/glibc-CVE-2014-5119.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/base.scm (glibc): Add the patch.
2014-08-26 16:04:16 -04:00
Mark H Weaver
48abd13021
gnu: file: Update to 5.19; add fix for CVE-2014-3587.
...
* gnu/packages/patches/file-CVE-2014-3587.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/file.scm (file): Update to 5.19. Add patch.
2014-08-26 12:05:37 -04:00
Ludovic Courtès
bcac69f674
gnu: libgcrypt: Update to 1.6.2.
...
* gnu/packages/gnupg.scm (libgcrypt): Update to 1.6.2.
2014-08-24 14:38:07 +02:00
Mark H Weaver
bc0506f5b7
gnu: libgcrypt: Update to 1.6.2.
...
* gnu/packages/gnupg.scm (libgcrypt): Update to 1.6.2.
2014-08-23 20:48:28 -04:00
Mark H Weaver
c198872b99
gnu: Rely on 'file' implicit input and 'patch-usr-bin-file'.
...
* gnu/packages/admin.scm (sudo):
* gnu/packages/gawk.scm (gawk): Remove workaround on MIPS.
* gnu/packages/mcrypt.scm (mcrypt, libmhash):
* gnu/packages/file.scm (file): Remove 'file' from native-inputs.
* gnu/packages/mc.scm (mc):
* gnu/packages/pretty-print.scm (a2ps, trueprint, source-highlight):
* gnu/packages/image.scm (libtiff): Remove 'file' from native-inputs.
Remove 'patch-configure' phase.
2014-08-23 20:48:21 -04:00
Mark H Weaver
8f5708c1d8
gnu: bootstrap: Add 'file' to %boot0-inputs and %final-inputs.
...
* gnu/packages/base.scm (file-boot0): New variable.
(%boot0-inputs): Add 'file-boot0'.
(%final-inputs): Add 'file' to list of packages to 'finalize'.
2014-08-23 20:48:12 -04:00
Mark H Weaver
ce3e35ed6a
Merge branch 'master' into core-updates
2014-08-23 20:43:51 -04:00
Mark H Weaver
f0dafadcfc
gnu: libgc-7.2: Update to 7.2f.
...
* gnu/packages/bdw-gc.scm (libgc-7.2): Update to 7.2f.
2014-08-23 20:34:23 -04:00
Mark H Weaver
460f97f8fd
gnu: libgcrypt-1.5: Update to 1.5.4.
...
* gnu/packages/gnupg.scm (libgcrypt-1.5): Update to 1.5.4.
2014-08-23 20:34:17 -04:00
Mark H Weaver
fa5731baab
Revert "gnu: Add 'file' as a native-input on MIPS for some packages."
...
This reverts commit c3114b7567
.
2014-08-21 21:49:36 -04:00
Mark H Weaver
c3114b7567
gnu: Add 'file' as a native-input on MIPS for some packages.
...
* gnu/packages/admin.scm (sudo):
gnu/packages/gawk.scm (gawk): Add 'file' as a native input on MIPS.
Remove earlier workaround on MIPS.
* gnu/packages/libffi.scm (libffi):
gnu/packages/bdw-gc.scm (libatomic-ops, libgc): Add 'file' as a
native input on MIPS.
2014-08-20 12:16:13 -04:00
Jason Self
cc69516cdd
gnu: ffmpeg: Update to 2.3.3.
...
* gnu/packages/video.scm (ffmpeg): Update to version 2.3.3.
2014-08-20 09:06:25 -07:00
Alex Kost
4ea444198d
Move 'check-package-freshness' from 'guix package' to 'packages'.
...
* guix/scripts/package.scm (%sigint-prompt, call-with-sigint-handler)
(waiting, ftp-open*, check-package-freshness): Move to...
* gnu/packages.scm: ... here.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-08-20 10:55:29 +02:00
Mark H Weaver
06a70dbec1
gnu: gnutls: Update to 3.2.16.
...
* gnu/packages/gnutls.scm (gnutls): Update to 3.2.16. Remove
-DENABLE_RSA_EXPORT workaround.
2014-08-20 04:06:23 -04:00
Mark H Weaver
647cfda83b
Merge branch 'master' into core-updates
2014-08-20 03:17:56 -04:00
Mark H Weaver
cba95006a6
gnu: guile-2.0: Make 'bash' an input unconditionally.
...
* gnu/packages/guile.scm (guile-2.0): Make 'bash' an input
unconditionally.
2014-08-20 01:44:50 -04:00
Mark H Weaver
785c33e3af
gnu: libffi: Update to 3.1.
...
* gnu/packages/patches/libffi-mips-n32-fix.patch: Remove.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/libffi.scm (libffi): Update to 3.1. Remove patch.
2014-08-20 01:43:05 -04:00
Mark H Weaver
a23276cd8b
gnu: libgc: Update to 7.4.2.
...
* gnu/packages/bdw-gc.scm (libgc): Update to 7.4.2.
2014-08-20 01:30:51 -04:00
Mark H Weaver
8174e9b7ae
gnu: libatomic-ops: Update to 7.4.2.
...
* gnu/packages/bdw-gc.scm (libatomic-ops): Update to 7.4.2.
2014-08-20 01:29:42 -04:00
Alex Kost
b211a66163
packages: Remove dead code.
...
* gnu/packages.scm (_): Remove.
Remove an extra space.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-08-19 23:07:48 +02:00
Ludovic Courtès
65f88b2085
gnu: lightning: Update to 2.0.5.
...
* gnu/packages/lightning.scm (lightning): Update to 2.0.5.
2014-08-17 11:59:47 +02:00
David Thompson
cdf2b28654
gnu: guile-json: Update to 0.4.0.
...
* gnu/packages/guile.scm (guile-json): Update to 0.4.0.
2014-08-16 19:30:26 -04:00
Mark H Weaver
f798837f9e
gnu: apr: Disable parallel tests.
...
* gnu/packages/apr.scm (apr): Disable parallel tests.
2014-08-16 12:54:32 -04:00
Mark H Weaver
975071449c
gnu: apr-util: Update to 1.5.3.
...
* gnu/packages/apr.scm (apr-util): Update to 1.5.3.
2014-08-16 12:36:13 -04:00
Mark H Weaver
d7b4677f79
gnu: apr: Update to 1.5.1.
...
* gnu/packages/apr.scm (apr): Update to 1.5.1.
2014-08-16 12:36:09 -04:00
Eric Bavier
ffbf749e6a
gnu: texi2html: Fix tests in the absense of gettext.
...
* gnu/packages/patches/texi2html-i18n.patch: New patch.
* gnu/packages/texinfo.scm (texi2html)[source]: Use it.
* gnu-system.am (dist_patch_DATA): Add it.
2014-08-16 11:07:03 -05:00
Mark H Weaver
cb8b285adf
gnu: subversion: Update to 1.7.18.
...
* gnu/packages/version-control.scm (subversion): Update to 1.7.18.
2014-08-16 02:25:01 -04:00
Ludovic Courtès
6f22f3c954
linux-initrd: Load fscache.ko before the 9p modules.
...
* gnu/system/linux-initrd.scm (base-initrd)[virtio-9p-modules]: Add
"fscache.ko", required by Linux-libre 3.16.
2014-08-15 16:26:28 +02:00
Mark H Weaver
ae2189a9f2
gnu: Fix synopses for emacs-wget and fetchmail.
...
* gnu/packages/emacs.scm (emacs-wget): Improve synopsis.
* gnu/packages/mail.scm (fetchmail): Fix typo in synopsis.
2014-08-15 02:12:21 -04:00
Mark H Weaver
89925972fb
gnu: Add emacs-wget.
...
* gnu/packages/emacs.scm (emacs-wget): New variable.
2014-08-14 23:53:18 -04:00
Mark H Weaver
18d2621008
gnu: Add emacs-w3m.
...
* gnu/packages/emacs.scm (emacs-w3m): New variable.
2014-08-14 23:53:15 -04:00
Mark H Weaver
fe4163f351
gnu: Add paredit.
...
* gnu/packages/emacs.scm (paredit): New variable.
2014-08-14 23:53:13 -04:00
Mark H Weaver
9a4c971521
gnu: Add magit.
...
* gnu/packages/emacs.scm (magit): New variable.
2014-08-14 23:53:10 -04:00
Jason Self
74dde9e919
gnu: linux-libre: Update to 3.16.1.
...
* gnu/packages/linux.scm (linux-libre): Update to version 3.16.1.
2014-08-14 10:57:29 -07:00
Mark H Weaver
87eabd5ca7
gnu: apl: Update to 1.4, add sqlite support.
...
* gnu/packages/apl.scm (apl): Update to 1.4. Add 'sqlite' as an input.
Pass --with-sqlite3 to configure.
2014-08-14 13:47:53 -04:00
Mark H Weaver
93c5b1fe1f
gnu: mysql: Update to 5.1.73.
...
* gnu/packages/mysql.scm (mysql): Update to 5.1.73. Update source URI.
2014-08-14 13:29:59 -04:00
Mark H Weaver
e6a83df11b
gnu: gpgme: Update to 1.5.1.
...
* gnu/packages/gnupg.scm (gpgme): Update to 1.5.1. Pass "GPG=gpg2"
to 'make'.
2014-08-14 10:03:57 -04:00
Ludovic Courtès
66269d4786
gnu: lvm2: Upgrade, use udev, improve synopsis and description.
...
* gnu/packages/linux.scm (lvm2): New variable.
* gnu/packages/lvm.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove it.
* gnu/packages/cryptsetup.scm: Adjust accordingly.
2014-08-14 00:34:47 +02:00
Mark H Weaver
2f7f32003f
system: grub: Change the default default-entry to 0.
...
* gnu/system/grub.scm (<grub-configuration>)[default-entry]: Change the
default to 0.
2014-08-13 12:56:25 -04:00
Mark H Weaver
e69a4dd047
gnu: gnupg: Update to 2.0.26.
...
* gnu/packages/gnupg.scm (gnupg): Update to 2.0.26.
2014-08-13 02:48:31 -04:00
Guy Grant
d41bb065c8
gnu: Add terminus-font.
...
* gnu/packages/fonts.scm (terminus-font): New variable.
2014-08-12 23:19:10 -04:00
Eric Bavier
b36fcf9550
gnu: Add detox.
...
* gnu/packages/admin.scm (detox): New variable.
2014-08-12 13:36:35 -05:00
Ludovic Courtès
d759cf6774
gnu: texi2html: Remove dependency on Gettext.
...
Partly fixes <http://bugs.gnu.org/18247 >.
* gnu/packages/texinfo.scm (texi2html)[source]: Add 'snippet' field.
2014-08-12 15:46:21 +02:00
Eric Bavier
51152cd125
gnu: Add orpheus.
...
* gnu/packages/orpheus.scm: New file.
* gnu/packages/patches/orpheus-cast-errors-and-includes.patch: New patch.
* gnu-system.am (GNU_SYSTEM_MODULES): Add file.
(dist_patch_DATA): Add patch.
2014-08-12 00:28:39 -05:00
Taylan Ulrich Bayirli/Kammer
4a3e602c72
gnu: Add emacs-no-x-toolkit.
...
* gnu/packages/emacs.scm (emacs-no-x-toolkit): New variable.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-08-11 23:01:46 +02:00
Ludovic Courtès
29fce8b6eb
system: Use (guix profiles) to build the system profile.
...
* gnu/system.scm (union): Remove.
(operating-system-profile): Use 'profile-derivation' and related
procedures instead of 'union'.
2014-08-11 23:01:46 +02:00
Eric Bavier
c5d8376843
gnu: Add texi2html.
...
* gnu/packages/texinfo.scm (texi2html): New variable.
* gnu/packages/patches/texi2html-document-encoding.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
2014-08-11 12:22:53 -05:00