[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Wed, 25 Apr 2018 10:00:34 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit a9fe3882b9400d6a49ca95e136e78477b3e81a07
Merge: 68c4759 0afeda6
Author: Marius Bakke <address@hidden>
Date: Wed Apr 25 15:53:41 2018 +0200
Merge branch 'master' into staging
.gitignore | 17 +
Makefile.am | 10 +-
build-aux/test-env.in | 14 +-
configure.ac | 4 +
doc/contributing.fr.texi | 505 +
doc/{guix.texi => guix.fr.texi} | 14523 +++---
doc/guix.texi | 45 +
doc/local.mk | 53 +-
gnu/local.mk | 1 -
gnu/packages/admin.scm | 130 +-
gnu/packages/android.scm | 4 +-
gnu/packages/audio.scm | 5 +-
gnu/packages/benchmark.scm | 4 +-
gnu/packages/bioconductor.scm | 259 +
gnu/packages/bioinformatics.scm | 52 +-
gnu/packages/bittorrent.scm | 6 +-
gnu/packages/bootloaders.scm | 3 -
gnu/packages/build-tools.scm | 43 +
gnu/packages/cdrom.scm | 2 +-
gnu/packages/cran.scm | 338 +-
gnu/packages/curl.scm | 50 +
gnu/packages/databases.scm | 4 +-
gnu/packages/dictionaries.scm | 17 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/education.scm | 43 +-
gnu/packages/electronics.scm | 20 +-
gnu/packages/emacs.scm | 595 +-
gnu/packages/emulators.scm | 42 +-
gnu/packages/engineering.scm | 21 +-
gnu/packages/games.scm | 55 +
gnu/packages/geo.scm | 8 +-
gnu/packages/gnome.scm | 38 +-
gnu/packages/gnunet.scm | 2 +-
gnu/packages/golang.scm | 619 +-
gnu/packages/graph.scm | 11 +-
gnu/packages/graphics.scm | 4 +-
gnu/packages/gstreamer.scm | 2 +-
gnu/packages/guile.scm | 48 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 32 +-
gnu/packages/java.scm | 44 +
gnu/packages/linux.scm | 62 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/messaging.scm | 126 +-
gnu/packages/mp3.scm | 4 +-
gnu/packages/music.scm | 22 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/node.scm | 4 +-
gnu/packages/package-management.scm | 15 +-
gnu/packages/parallel.scm | 6 +-
gnu/packages/password-utils.scm | 31 -
.../patches/ceph-skip-collect-sys-info-test.patch | 11 +-
gnu/packages/patches/freeimage-unbundle.patch | 18 +-
.../patches/libmygpo-qt-fix-jsoncreatortest.patch | 41 -
gnu/packages/perl-check.scm | 29 +
gnu/packages/perl.scm | 100 +-
gnu/packages/photo.scm | 12 +-
gnu/packages/pure.scm | 5 +-
gnu/packages/python-crypto.scm | 62 +
gnu/packages/python-web.scm | 22 +
gnu/packages/python.scm | 24 +-
gnu/packages/qt.scm | 14 +-
gnu/packages/ruby.scm | 16 +-
gnu/packages/rust.scm | 171 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/scheme.scm | 4 +-
gnu/packages/serialization.scm | 8 +-
gnu/packages/shells.scm | 8 +-
gnu/packages/spice.scm | 4 +-
gnu/packages/ssh.scm | 16 +-
gnu/packages/statistics.scm | 117 +-
gnu/packages/storage.scm | 4 +-
gnu/packages/syncthing.scm | 571 +-
gnu/packages/texinfo.scm | 5 +-
gnu/packages/text-editors.scm | 94 +-
gnu/packages/tls.scm | 33 +-
gnu/packages/upnp.scm | 6 +-
gnu/packages/version-control.scm | 64 +-
gnu/packages/video.scm | 51 +-
gnu/packages/virtualization.scm | 65 +-
gnu/packages/vpn.scm | 36 +
gnu/packages/vulkan.scm | 5 +-
gnu/packages/web-browsers.scm | 4 +-
gnu/packages/web.scm | 20 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wm.scm | 33 +-
gnu/packages/xdisorg.scm | 8 +-
gnu/packages/xfig.scm | 6 +-
gnu/packages/xml.scm | 6 +-
gnu/packages/xorg.scm | 4 +-
gnu/services/networking.scm | 78 +
gnu/tests/base.scm | 9 +-
gnu/tests/networking.scm | 97 +-
guix/build-system/emacs.scm | 6 +-
guix/build/emacs-build-system.scm | 93 +-
guix/build/emacs-utils.scm | 14 +-
guix/download.scm | 8 +-
nix/nix-daemon/nix-daemon.cc | 10 +-
po/doc/contributing.fr.po | 1220 +
po/doc/contributing.pot | 962 +
po/doc/guix.fr.po | 42145 +++++++++++++++++
po/doc/guix.pot | 46344 +++++++++++++++++++
po/doc/local.mk | 77 +
po/guix/fr.po | 37 +-
po/packages/es.po | 1430 +-
tests/guix-daemon.sh | 14 +
108 files changed, 102626 insertions(+), 9590 deletions(-)