guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/63: Merge branch 'master' into core-updates


From: Mark H. Weaver
Subject: 02/63: Merge branch 'master' into core-updates
Date: Thu, 4 Aug 2016 07:44:54 +0000 (UTC)

mhw pushed a commit to branch core-updates-2016-08-01
in repository guix.

commit 7575655212ecfbcd1f04e429c8a7a41f8720d027
Merge: 5d4c90a 5f01078
Author: Ludovic Court├Ęs <address@hidden>
Date:   Wed Jul 20 11:42:02 2016 +0200

    Merge branch 'master' into core-updates

 .dir-locals.el                                     |    3 +
 .gitignore                                         |    1 +
 .mailmap                                           |    6 +-
 HACKING                                            |    4 +
 Makefile.am                                        |    2 +
 THANKS                                             |    1 +
 config-daemon.ac                                   |    4 +-
 configure.ac                                       |   11 +
 doc/guix.texi                                      |  189 +++++-
 emacs/guix-devel.el                                |    2 +
 etc/guix-daemon.service.in                         |    1 +
 gnu/local.mk                                       |   15 +-
 gnu/packages/admin.scm                             |   57 +-
 gnu/packages/algebra.scm                           |    4 +-
 gnu/packages/backup.scm                            |    9 +-
 gnu/packages/bioinformatics.scm                    |  636 ++++++++++++++++++--
 gnu/packages/bittorrent.scm                        |    4 +-
 gnu/packages/busybox.scm                           |   67 +--
 gnu/packages/ccache.scm                            |   11 +-
 gnu/packages/cdrom.scm                             |    6 +-
 gnu/packages/compression.scm                       |   37 ++
 gnu/packages/conkeror.scm                          |   11 +-
 gnu/packages/crypto.scm                            |   90 ++-
 gnu/packages/databases.scm                         |    2 +-
 gnu/packages/datastructures.scm                    |   22 +
 gnu/packages/disk.scm                              |   46 +-
 gnu/packages/documentation.scm                     |   38 ++
 gnu/packages/ebook.scm                             |    4 +-
 gnu/packages/emacs.scm                             |  535 +++++++++++++++-
 gnu/packages/engineering.scm                       |   27 +-
 gnu/packages/enlightenment.scm                     |   17 +-
 gnu/packages/flashing-tools.scm                    |    5 +-
 gnu/packages/fonts.scm                             |    9 +-
 gnu/packages/freedesktop.scm                       |    6 +-
 gnu/packages/games.scm                             |   38 +-
 gnu/packages/gd.scm                                |   11 +-
 gnu/packages/geeqie.scm                            |   36 +-
 gnu/packages/gimp.scm                              |    1 +
 gnu/packages/gl.scm                                |   61 +-
 gnu/packages/gnunet.scm                            |   12 +-
 gnu/packages/gnupg.scm                             |   24 +-
 gnu/packages/golang.scm                            |  185 ++++++
 gnu/packages/graphics.scm                          |   28 +-
 gnu/packages/grub.scm                              |   25 +-
 gnu/packages/gstreamer.scm                         |   24 +-
 gnu/packages/imagemagick.scm                       |    4 +-
 gnu/packages/irc.scm                               |    6 +-
 gnu/packages/julia.scm                             |    3 +
 gnu/packages/kde.scm                               |    5 +-
 gnu/packages/libreoffice.scm                       |   12 +-
 gnu/packages/libusb.scm                            |   13 +-
 gnu/packages/linux.scm                             |  150 +++--
 gnu/packages/lisp.scm                              |    2 +-
 gnu/packages/llvm.scm                              |   90 ++-
 gnu/packages/logging.scm                           |   45 +-
 gnu/packages/lsh.scm                               |  159 -----
 gnu/packages/lxde.scm                              |   17 +-
 gnu/packages/mail.scm                              |   46 +-
 gnu/packages/man.scm                               |   12 +-
 gnu/packages/markdown.scm                          |    5 +-
 gnu/packages/maths.scm                             |   30 +-
 gnu/packages/messaging.scm                         |    4 +-
 gnu/packages/mpd.scm                               |    4 +-
 gnu/packages/music.scm                             |   71 +++
 gnu/packages/networking.scm                        |    2 +-
 gnu/packages/ninja.scm                             |    7 +-
 gnu/packages/node.scm                              |   19 +-
 gnu/packages/openstack.scm                         |    4 +-
 gnu/packages/owncloud.scm                          |   17 +-
 gnu/packages/package-management.scm                |    7 +-
 gnu/packages/parallel.scm                          |    4 +-
 gnu/packages/patches/avrdude-fix-libusb.patch      |  256 --------
 .../patches/clang-3.8-libc-search-path.patch       |   69 +++
 gnu/packages/patches/gd-CVE-2016-5766.patch        |   81 +++
 gnu/packages/patches/gd-CVE-2016-6128.patch        |  253 ++++++++
 gnu/packages/patches/gd-CVE-2016-6132.patch        |   55 ++
 gnu/packages/patches/gd-CVE-2016-6214.patch        |   66 ++
 gnu/packages/patches/gd-fix-test-on-i686.patch     |   34 ++
 gnu/packages/patches/gimp-CVE-2016-4994.patch      |   96 +++
 gnu/packages/patches/khmer-use-libraries.patch     |   16 +
 gnu/packages/patches/libmtp-devices.patch          |  554 -----------------
 gnu/packages/patches/ninja-tests.patch             |   34 +-
 gnu/packages/patches/openimageio-boost-1.60.patch  |   47 --
 .../python-dendropy-exclude-failing-tests.patch    |   21 +
 gnu/packages/patches/sudo-CVE-2015-5602.patch      |  372 ------------
 gnu/packages/pdf.scm                               |   42 +-
 gnu/packages/perl.scm                              |  308 +++++++++-
 gnu/packages/pumpio.scm                            |    1 -
 gnu/packages/python.scm                            |  257 +++++---
 gnu/packages/qt.scm                                |   87 ++-
 gnu/packages/readline.scm                          |   28 +
 gnu/packages/samba.scm                             |   18 +-
 gnu/packages/scheme.scm                            |    4 +-
 gnu/packages/screen.scm                            |   36 +-
 gnu/packages/smalltalk.scm                         |   15 +-
 gnu/packages/ssh.scm                               |  162 ++++-
 gnu/packages/stalonetray.scm                       |    7 +-
 gnu/packages/statistics.scm                        |  150 ++++-
 gnu/packages/tls.scm                               |    2 +-
 gnu/packages/tmux.scm                              |   38 ++
 gnu/packages/version-control.scm                   |   14 +-
 gnu/packages/video.scm                             |   70 ++-
 gnu/packages/web.scm                               |    4 +-
 gnu/packages/wm.scm                                |    1 -
 gnu/packages/xdisorg.scm                           |   31 +-
 gnu/packages/xfce.scm                              |   34 ++
 gnu/packages/xml.scm                               |    9 +-
 gnu/services.scm                                   |  102 ++--
 gnu/services/avahi.scm                             |   12 +-
 gnu/services/base.scm                              |  264 +++++---
 gnu/services/dbus.scm                              |   44 +-
 gnu/services/desktop.scm                           |   67 ++-
 gnu/services/networking.scm                        |   54 +-
 gnu/services/shepherd.scm                          |   45 +-
 gnu/services/ssh.scm                               |   97 ++-
 gnu/services/web.scm                               |    3 +-
 gnu/services/xorg.scm                              |   42 +-
 gnu/system.scm                                     |   10 +-
 gnu/system/install.scm                             |  119 ++--
 gnu/system/linux-container.scm                     |   49 +-
 gnu/system/linux-initrd.scm                        |  172 +++---
 gnu/system/locale.scm                              |    8 +-
 gnu/system/mapped-devices.scm                      |   34 +-
 gnu/system/pam.scm                                 |   61 ++
 gnu/system/shadow.scm                              |   47 +-
 gnu/system/vm.scm                                  |  166 +++--
 gnu/tests.scm                                      |  183 +++---
 gnu/tests/base.scm                                 |  468 +++++++++-----
 gnu/tests/install.scm                              |  246 +++++---
 guix/build/download.scm                            |   14 +-
 guix/build/svn.scm                                 |   21 +-
 guix/config.scm.in                                 |    6 +-
 guix/cvs-download.scm                              |   20 +-
 guix/download.scm                                  |   96 ++-
 guix/gexp.scm                                      |  188 +++---
 guix/git-download.scm                              |   36 +-
 guix/hg-download.scm                               |   22 +-
 guix/import/cpan.scm                               |   13 +-
 guix/packages.scm                                  |  209 ++++---
 guix/profiles.scm                                  |  422 ++++++-------
 guix/records.scm                                   |   19 +-
 guix/scripts/challenge.scm                         |   40 +-
 guix/scripts/gc.scm                                |    7 +-
 guix/scripts/lint.scm                              |   17 +-
 guix/scripts/publish.scm                           |  169 +++++-
 guix/scripts/substitute.scm                        |    3 +-
 guix/scripts/system.scm                            |    2 +-
 guix/store.scm                                     |    2 +-
 guix/svn-download.scm                              |   26 +-
 guix/zlib.scm                                      |  234 +++++++
 m4/guix.m4                                         |   11 +
 tests/cpan.scm                                     |   11 +
 tests/gexp.scm                                     |  100 ++-
 tests/grafts.scm                                   |   16 +-
 tests/lint.scm                                     |   52 +-
 tests/packages.scm                                 |    1 -
 tests/publish.scm                                  |   59 +-
 tests/records.scm                                  |   29 +-
 tests/system.scm                                   |   43 ++
 tests/zlib.scm                                     |   63 ++
 160 files changed, 7031 insertions(+), 3550 deletions(-)

diff --cc doc/guix.texi
index 7204f2e,7ea9ddf..318e6cb
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@@ -7494,7 -7563,43 +7563,42 @@@ created by @command{guix archive --gene
  archive}).  If that is not the case, the service will fail to start.
  @end deffn
  
+ @anchor{rngd-service}
+ @deffn {Scheme Procedure} rngd-service [#:rng-tools @var{rng-tools}] @
+             [#:device "/dev/hwrng"]
+ Return a service that runs the @command{rngd} program from @var{rng-tools}
+ to add @var{device} to the kernel's entropy pool.  The service will fail if
+ @var{device} does not exist.
+ @end deffn
+ 
+ @anchor{pam-limits-service}
+ @cindex session limits
+ @cindex ulimit
+ @cindex priority
+ @deffn {Scheme Procedure} pam-limits-service [#:limits @var{limits}]
+ 
+ Return a service that installs a configuration file for the
+ @uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html,
+ @code{pam_limits} module}.  The procedure optionally takes a list of
+ @code{pam-limits-entry} values, which can be used to specify
+ @code{ulimit} limits and nice priority limits to user sessions.
+ 
+ The following limits definition sets two hard and soft limits for all
+ login sessions of users in the @code{realtime} group:
+ 
+ @example
+ (pam-limits-service
+  (list
+   (pam-limits-entry "@@realtime" 'both 'rtprio 99)
+   (pam-limits-entry "@@realtime" 'both 'memlock 'unlimited)))
+ @end example
+ 
+ The first entry increases the maximum realtime priority for
+ non-privileged processes; the second entry lifts any restriction of the
+ maximum address space that can be locked in memory.  These settings are
+ commonly used for real-time audio systems.
+ @end deffn
  
 -
  @node Scheduled Job Execution
  @subsubsection Scheduled Job Execution
  
diff --cc gnu/local.mk
index ce4cdf6,5e32d87..29e1e84
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -438,10 -438,8 +438,9 @@@ dist_patch_DATA =                                 
        
    %D%/packages/patches/audacity-fix-ffmpeg-binding.patch      \
    %D%/packages/patches/automake-skip-amhello-tests.patch      \
    %D%/packages/patches/automake-regexp-syntax.patch           \
 +  %D%/packages/patches/automake-test-gzip-warning.patch               \
    %D%/packages/patches/avahi-localstatedir.patch              \
    %D%/packages/patches/avidemux-install-to-lib.patch          \
-   %D%/packages/patches/avrdude-fix-libusb.patch                       \
    %D%/packages/patches/awesome-reproducible-png.patch         \
    %D%/packages/patches/bash-completion-directories.patch      \
    %D%/packages/patches/beets-image-test-failure.patch         \
@@@ -515,11 -520,15 +520,12 @@@
    %D%/packages/patches/geoclue-config.patch                   \
    %D%/packages/patches/ghostscript-CVE-2015-3228.patch                \
    %D%/packages/patches/ghostscript-runpath.patch              \
+   %D%/packages/patches/gimp-CVE-2016-4994.patch                       \
    %D%/packages/patches/glib-networking-ssl-cert-file.patch    \
    %D%/packages/patches/glib-tests-timer.patch                 \
 -  %D%/packages/patches/glibc-CVE-2015-7547.patch              \
    %D%/packages/patches/glibc-bootstrap-system.patch           \
 -  %D%/packages/patches/glibc-hurd-extern-inline.patch         \
    %D%/packages/patches/glibc-ldd-x86_64.patch                 \
    %D%/packages/patches/glibc-locales.patch                    \
 -  %D%/packages/patches/glibc-locale-incompatibility.patch     \
    %D%/packages/patches/glibc-o-largefile.patch                        \
    %D%/packages/patches/glibc-versioned-locpath.patch          \
    %D%/packages/patches/gmp-arm-asm-nothumb.patch              \
diff --cc gnu/packages/gnupg.scm
index 2ef2410,f26574c..2b4ce71
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@@ -58,9 -57,9 +58,9 @@@
                            version ".tar.bz2"))
        (sha256
         (base32
 -        "0kdq2cbnk84fr4jqcv689rlxpbyl6bda2cn6y3ll19v3mlydpnxp"))))
 +        "0ywxwswizmkyciy480kzczxn6nhbgzf3z8my4nk43nvv67k4x87j"))))
      (build-system gnu-build-system)
-     (home-page "http://gnupg.org";)
+     (home-page "https://gnupg.org";)
      (synopsis "Library of error values for GnuPG components")
      (description
       "Libgpg-error is a small library that defines common error values
diff --cc gnu/packages/web.scm
index 19870ef,5502a0f..ea1a30a
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -83,9 -83,8 +83,9 @@@
                                   version ".tar.bz2"))
               (sha256
                (base32
-                "0hrpy6gjwma0kba7p7m61vwh82qcnkf08123lrwpg257m93hnrmc"))))
+                "0n2yx3gjlpr4kgqx845fj6amnmg25r2l6a7rzab5hxnpmar985hc"))))
      (build-system gnu-build-system)
 +    (native-inputs `(("pcre" ,pcre "bin")))       ;for 'pcre-config'
      (inputs `(("apr" ,apr)
                ("apr-util" ,apr-util)
                ("openssl" ,openssl)
diff --cc gnu/system/shadow.scm
index f09e8c2,593117e..c394890
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@@ -132,11 -133,18 +133,12 @@@
  (define (default-skeletons)
    "Return the default skeleton files for /etc/skel.  These files are copied by
  'useradd' in the home directory of newly created user accounts."
 -  (define fonts.conf-content
 -    ;; SXML for ~/.config/fontconfig/fonts.conf.  This works around the fact
 -    ;; that Fontconfig currently does not such this directory by default,
 -    ;; thereby ignoring fonts installed system-wide (FIXME).
 -    `(fontconfig (dir "/run/current-system/profile/share/fonts")))
 -
    (define copy-guile-wm
-     #~(begin
-         (use-modules (guix build utils))
-         (copy-file (car (find-files #$guile-wm "wm-init-sample.scm"))
-                    #$output)))
+     (with-imported-modules '((guix build utils))
+       #~(begin
+           (use-modules (guix build utils))
+           (copy-file (car (find-files #$guile-wm "wm-init-sample.scm"))
+                      #$output))))
  
    (let ((profile (plain-file "bash_profile" "\
  # Honor per-interactive-shell startup file
diff --cc gnu/tests/base.scm
index 4fe7798,a6278b2..479403e
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@@ -64,34 -70,35 +70,33 @@@
  using COMMAND, a gexp that evaluates to a list of strings.  Compare some
  properties of running system to what's declared in OS, an <operating-system>."
    (define test
-     #~(begin
-         (use-modules (gnu build marionette)
-                      (srfi srfi-1)
-                      (srfi srfi-26)
-                      (srfi srfi-64)
-                      (ice-9 match))
- 
-         (define marionette
-           (make-marionette #$command))
- 
-         (mkdir #$output)
-         (chdir #$output)
- 
-         (test-begin "basic")
- 
-         (test-assert "uname"
-           (match (marionette-eval '(uname) marionette)
-             (#("Linux" host-name version _ architecture)
-              (and (string=? host-name
-                             #$(operating-system-host-name os))
-                   (string-prefix? #$(package-version
-                                      (operating-system-kernel os))
-                                   version)
-                   (string-prefix? architecture %host-type)))))
- 
-         (test-assert "shell and user commands"
-           ;; Is everything in $PATH?
-           (zero? (marionette-eval '(system "
+     (with-imported-modules '((gnu build marionette))
+       #~(begin
+           (use-modules (gnu build marionette)
 -                       (srfi srfi-1)
 -                       (srfi srfi-26)
+                        (srfi srfi-64)
+                        (ice-9 match))
+ 
+           (define marionette
+             (make-marionette #$command))
+ 
+           (mkdir #$output)
+           (chdir #$output)
+ 
 -          (test-begin "basic")
++          (test-begin "mcron")
+ 
+           (test-assert "uname"
+             (match (marionette-eval '(uname) marionette)
+               (#("Linux" host-name version _ architecture)
+                (and (string=? host-name
+                               #$(operating-system-host-name os))
+                     (string-prefix? #$(package-version
+                                        (operating-system-kernel os))
+                                     version)
+                     (string-prefix? architecture %host-type)))))
+ 
+           (test-assert "shell and user commands"
+             ;; Is everything in $PATH?
+             (zero? (marionette-eval '(system "
  . /etc/profile
  set -e -x
  guix --version



reply via email to

[Prev in Thread] Current Thread [Next in Thread]