guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into staging


From: guix-commits
Subject: 01/01: Merge branch 'master' into staging
Date: Tue, 23 Apr 2019 13:54:16 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit 37da4fbe1562583589eeddb4be8e11bece80fd35
Merge: 73326e7 e01bd1a
Author: Marius Bakke <address@hidden>
Date:   Tue Apr 23 19:43:59 2019 +0200

    Merge branch 'master' into staging

 Makefile.am                                        |    10 +
 build-aux/build-self.scm                           |     7 +-
 build-aux/compile-all.scm                          |    17 +-
 configure.ac                                       |     8 -
 doc/contributing.de.texi                           |   757 +-
 doc/guix.de.texi                                   |  8194 ++--
 doc/guix.texi                                      |    25 +-
 gnu/build/vm.scm                                   |    24 +
 gnu/installer.scm                                  |    14 +
 gnu/installer/final.scm                            |     8 +-
 gnu/installer/keymap.scm                           |     8 +-
 gnu/installer/newt/final.scm                       |     9 +-
 gnu/installer/newt/keymap.scm                      |    32 +-
 gnu/installer/newt/locale.scm                      |    30 +-
 gnu/installer/newt/page.scm                        |     7 +-
 gnu/installer/newt/timezone.scm                    |     5 +-
 gnu/installer/services.scm                         |    51 +-
 gnu/installer/steps.scm                            |    26 +-
 gnu/installer/utils.scm                            |    14 +-
 gnu/local.mk                                       |     7 +-
 gnu/packages/admin.scm                             |    17 +-
 gnu/packages/astronomy.scm                         |    10 +-
 gnu/packages/audio.scm                             |    40 +-
 gnu/packages/bioinformatics.scm                    |    25 +-
 gnu/packages/bootloaders.scm                       |     3 +-
 gnu/packages/cpp.scm                               |     9 +-
 gnu/packages/cran.scm                              |    86 +-
 gnu/packages/cups.scm                              |     4 +-
 gnu/packages/databases.scm                         |    18 +-
 gnu/packages/dictionaries.scm                      |    15 +-
 gnu/packages/dns.scm                               |     4 +-
 gnu/packages/elf.scm                               |     8 +-
 gnu/packages/emacs-xyz.scm                         |     6 +-
 gnu/packages/fpga.scm                              |     6 +-
 gnu/packages/game-development.scm                  |     4 +-
 gnu/packages/games.scm                             |   139 +-
 gnu/packages/gnupg.scm                             |    13 +-
 gnu/packages/guile-xyz.scm                         |   124 +-
 gnu/packages/haskell.scm                           |     7 +-
 gnu/packages/ibus.scm                              |    37 +-
 gnu/packages/image.scm                             |    45 +-
 gnu/packages/libedit.scm                           |     9 +-
 gnu/packages/libreoffice.scm                       |    20 +-
 gnu/packages/linux.scm                             |    20 +-
 gnu/packages/mail.scm                              |    80 +-
 gnu/packages/maths.scm                             |    14 +-
 gnu/packages/mtools.scm                            |    22 +-
 gnu/packages/music.scm                             |    59 +-
 gnu/packages/nano.scm                              |     6 +-
 gnu/packages/ocaml.scm                             |     4 +-
 gnu/packages/package-management.scm                |     9 +-
 gnu/packages/parallel.scm                          |     4 +-
 gnu/packages/password-utils.scm                    |    70 +-
 .../patches/grub-efi-fat-serial-number.patch       |    27 +
 ...tch => linkchecker-tests-require-network.patch} |     0
 .../patches/mtools-mformat-uninitialized.patch     |    20 +
 ...patch => ocaml-dose3-add-unix-dependency.patch} |     0
 gnu/packages/patches/openssh-CVE-2018-20685.patch  |    44 -
 gnu/packages/perl.scm                              |    15 +-
 gnu/packages/python-crypto.scm                     |     4 +-
 gnu/packages/python-web.scm                        |     8 +-
 gnu/packages/python-xyz.scm                        |   117 +-
 gnu/packages/security-token.scm                    |     4 +-
 gnu/packages/shellutils.scm                        |    11 +-
 gnu/packages/ssh.scm                               |     5 +-
 gnu/packages/statistics.scm                        |     4 +-
 gnu/packages/sync.scm                              |     4 +-
 gnu/packages/textutils.scm                         |     2 +-
 gnu/packages/valgrind.scm                          |    15 +
 gnu/packages/version-control.scm                   |    26 +
 gnu/packages/video.scm                             |    10 +-
 gnu/packages/vulkan.scm                            |    68 +-
 gnu/packages/web.scm                               |     3 +-
 gnu/packages/wm.scm                                |     4 +-
 gnu/packages/xdisorg.scm                           |     4 +-
 gnu/packages/xml.scm                               |     4 +-
 gnu/packages/xorg.scm                              |    14 +-
 gnu/services/authentication.scm                    |    14 +-
 gnu/services/shepherd.scm                          |    26 +-
 gnu/system.scm                                     |     2 +-
 gnu/system/install.scm                             |     6 +
 gnu/system/linux-container.scm                     |     3 +-
 gnu/system/shadow.scm                              |     5 +-
 guix/build/guile-build-system.scm                  |    98 +-
 guix/channels.scm                                  |     1 +
 guix/config.scm.in                                 |     4 -
 guix/scripts/build.scm                             |   107 +-
 guix/scripts/lint.scm                              |    10 +-
 guix/scripts/pull.scm                              |   102 +-
 guix/self.scm                                      |     4 -
 po/doc/guix-manual.de.po                           | 38024 ++++++++++---------
 po/guix/POTFILES.in                                |     2 +
 po/guix/de.po                                      |  1938 +-
 tests/guix-build.sh                                |     7 +
 94 files changed, 28475 insertions(+), 22481 deletions(-)

diff --cc gnu/local.mk
index 5c03066,7073181..43175b2
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1074,7 -1078,7 +1075,8 @@@ dist_patch_DATA =                               
                
    %D%/packages/patches/mozjs38-tracelogger.patch              \
    %D%/packages/patches/mozjs38-version-detection.patch                \
    %D%/packages/patches/mrrescue-support-love-11.patch         \
 +  
%D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \
+   %D%/packages/patches/mtools-mformat-uninitialized.patch     \
    %D%/packages/patches/mumble-1.2.19-abs.patch                        \
    %D%/packages/patches/mumps-build-parallelism.patch          \
    %D%/packages/patches/mupen64plus-ui-console-notice.patch    \
diff --cc gnu/packages/valgrind.scm
index 9952fa1,14f45db..f1584c8
--- a/gnu/packages/valgrind.scm
+++ b/gnu/packages/valgrind.scm
@@@ -78,4 -79,23 +78,19 @@@
  tools.  There are Valgrind tools that can automatically detect many memory
  management and threading bugs, and profile your programs in detail.  You can
  also use Valgrind to build new tools.")
 -    (license gpl2+)
 -
 -    ;; Building VEX on mips64el-linux fails with "opcode not supported on this
 -    ;; processor: mips3".
 -    (supported-systems (delete "mips64el-linux" %supported-systems))))
 +    (license gpl2+)))
+ 
+ (define-public valgrind-3.15
+   (package
+     (inherit valgrind)
+     (version "3.15.0")
+     (source (origin
+               (method url-fetch)
+               (uri (list (string-append "http://www.valgrind.org/downloads";
+                                         "/valgrind-" version ".tar.bz2")
+                          (string-append "ftp://sourceware.org/pub/valgrind";
+                                         "/valgrind-" version ".tar.bz2")))
+               (sha256
+                (base32
+                 "1ccawxrni8brcvwhygy12iprkvz409hbr9xkk1bd03gnm2fplz21"))
+               (patches (search-patches "valgrind-enable-arm.patch"))))))



reply via email to

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