Merge branch 'master' into core-updates
authorLudovic Courtès <ludo@gnu.org>
Mon, 27 Jun 2016 07:30:01 +0000 (09:30 +0200)
committerLudovic Courtès <ludo@gnu.org>
Mon, 27 Jun 2016 07:30:01 +0000 (09:30 +0200)
commit01497dfe6c0a2ce69287d0fd0008747965a000df
treef7f6f53baf6e81a8bce26144c550da3bf4b9df5c
parent74c8b174e8015de753ba5cab44f76f944e6fd4ba
Merge branch 'master' into core-updates
72 files changed:
Makefile.am
build-aux/hydra/evaluate.scm
build-aux/hydra/gnu-system.scm
build-aux/run-system-tests.scm
build-aux/test-env.in
doc/guix.texi
gnu/build/vm.scm
gnu/local.mk
gnu/packages.scm
gnu/packages/admin.scm
gnu/packages/algebra.scm
gnu/packages/assembly.scm [new file with mode: 0644]
gnu/packages/bioinformatics.scm
gnu/packages/crypto.scm
gnu/packages/dav.scm
gnu/packages/debug.scm
gnu/packages/dictionaries.scm
gnu/packages/emacs.scm
gnu/packages/enlightenment.scm
gnu/packages/erlang.scm [new file with mode: 0644]
gnu/packages/game-development.scm
gnu/packages/games.scm
gnu/packages/gnome.scm
gnu/packages/gnuzilla.scm
gnu/packages/gstreamer.scm
gnu/packages/guile.scm
gnu/packages/haskell.scm
gnu/packages/imagemagick.scm
gnu/packages/java.scm
gnu/packages/kodi.scm
gnu/packages/lightning.scm [deleted file]
gnu/packages/linux.scm
gnu/packages/music.scm
gnu/packages/package-management.scm
gnu/packages/password-utils.scm
gnu/packages/patches/beets-image-test-failure.patch [new file with mode: 0644]
gnu/packages/patches/hydra-automake-1.15.patch
gnu/packages/patches/nasm-no-ps-pdf.patch [new file with mode: 0644]
gnu/packages/patches/ruby-puma-ignore-broken-test.patch [new file with mode: 0644]
gnu/packages/perl.scm
gnu/packages/python.scm
gnu/packages/ruby.scm
gnu/packages/scheme.scm
gnu/packages/screen.scm
gnu/packages/serialization.scm
gnu/packages/statistics.scm
gnu/packages/tex.scm
gnu/packages/version-control.scm
gnu/packages/video.scm
gnu/packages/web.scm
gnu/packages/xorg.scm
gnu/packages/yasm.scm [deleted file]
gnu/services.scm
gnu/services/mcron.scm [new file with mode: 0644]
gnu/system/install.scm
gnu/tests.scm
gnu/tests/base.scm
gnu/tests/install.scm [new file with mode: 0644]
guix/build-system/python.scm
guix/build/bournish.scm
guix/build/emacs-build-system.scm
guix/config.scm.in
guix/gexp.scm
guix/import/pypi.scm
guix/scripts/substitute.scm
guix/store.scm
guix/utils.scm
nix/libstore/globals.cc
nix/local.mk
po/guix/fr.po
tests/containers.scm
tests/packages.scm