[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into staging
|
From: |
Marius Bakke |
|
Subject: |
02/02: Merge branch 'master' into staging |
|
Date: |
Tue, 26 Jun 2018 07:55:54 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit a167873c67a17df8175f896750de2d905d0fae04
Merge: 7c3bea7 7c7323e
Author: Marius Bakke <address@hidden>
Date: Tue Jun 26 13:51:26 2018 +0200
Merge branch 'master' into staging
build-aux/build-self.scm | 17 +-
doc/contributing.fr.texi | 29 +-
doc/guix.fr.texi | 1646 +-
doc/guix.texi | 70 +-
gnu/local.mk | 5 +
gnu/packages/admin.scm | 34 +-
gnu/packages/algebra.scm | 10 +-
gnu/packages/animation.scm | 8 +-
gnu/packages/audio.scm | 35 +-
gnu/packages/backup.scm | 59 +-
gnu/packages/bioinformatics.scm | 22 +-
gnu/packages/bootloaders.scm | 2 +-
gnu/packages/busybox.scm | 20 +-
gnu/packages/compression.scm | 65 +-
gnu/packages/cups.scm | 75 +-
gnu/packages/dns.scm | 17 +-
gnu/packages/electronics.scm | 5 +-
gnu/packages/emacs.scm | 100 +-
gnu/packages/fltk.scm | 19 +-
gnu/packages/fonts.scm | 8 +-
gnu/packages/fpga.scm | 4 +-
gnu/packages/games.scm | 7 +-
gnu/packages/gimp.scm | 14 +-
gnu/packages/gnome.scm | 18 +-
gnu/packages/golang.scm | 10 +-
gnu/packages/gps.scm | 2 +-
gnu/packages/gtk.scm | 43 +-
gnu/packages/guile.scm | 11 +-
gnu/packages/irc.scm | 40 +-
gnu/packages/java.scm | 42 +-
gnu/packages/linux.scm | 20 +-
gnu/packages/lisp.scm | 7 +-
gnu/packages/logging.scm | 2 +-
gnu/packages/mail.scm | 48 +-
gnu/packages/maven.scm | 16 +
gnu/packages/music.scm | 151 +-
gnu/packages/node.scm | 15 +-
gnu/packages/opencl.scm | 120 +
gnu/packages/parallel.scm | 22 +-
.../dovecot-trees-support-dovecot-2.3.patch | 60 +
.../java-commons-collections-fix-java8.patch | 299 +
.../nyx-show-header-stats-with-python3.patch | 70 +
gnu/packages/pdf.scm | 4 +-
gnu/packages/perl-web.scm | 4 +-
gnu/packages/python-crypto.scm | 6 +-
gnu/packages/python-web.scm | 8 +-
gnu/packages/python.scm | 46 +-
gnu/packages/rdf.scm | 8 +-
gnu/packages/ruby.scm | 8 +-
gnu/packages/scheme.scm | 80 +-
gnu/packages/sdl.scm | 4 +-
gnu/packages/search.scm | 36 +-
gnu/packages/security-token.scm | 31 +-
gnu/packages/selinux.scm | 5 +-
gnu/packages/ssh.scm | 44 +-
gnu/packages/suckless.scm | 5 +-
gnu/packages/syndication.scm | 6 +-
gnu/packages/tls.scm | 4 +-
gnu/packages/tor.scm | 87 +-
gnu/packages/version-control.scm | 51 +-
gnu/packages/video.scm | 103 +-
gnu/packages/virtualization.scm | 53 +-
gnu/packages/vpn.scm | 11 +-
gnu/packages/web.scm | 60 +-
gnu/packages/wine.scm | 6 +-
gnu/packages/xfig.scm | 7 +-
gnu/packages/zile.scm | 9 +-
gnu/services/authentication.scm | 41 +
gnu/services/cuirass.scm | 5 +-
gnu/services/cups.scm | 5 +-
gnu/services/sound.scm | 34 +-
gnu/system.scm | 34 +-
guix/scripts/pack.scm | 174 +-
guix/scripts/system.scm | 5 +-
nix/local.mk | 1 -
po/doc/guix-manual.fr.po | 14906 ++++++++++---------
po/guix/fr.po | 1376 +-
po/packages/fr.po | 9059 ++++++-----
tests/system.scm | 23 +
79 files changed, 16985 insertions(+), 12631 deletions(-)
diff --cc gnu/local.mk
index 8cd855a,66f802a..5b91531
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -801,8 -804,8 +804,9 @@@ dist_patch_DATA =
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/jacal-fix-texinfo.patch \
+ %D%/packages/patches/jamvm-arm.patch \
%D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch
\
+ %D%/packages/patches/java-commons-collections-fix-java8.patch \
%D%/packages/patches/java-jeromq-fix-tests.patch \
%D%/packages/patches/java-powermock-fix-java-files.patch \
%D%/packages/patches/java-simple-xml-fix-tests.patch \