guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into core-updates


From: Marius Bakke
Subject: 01/01: Merge branch 'master' into core-updates
Date: Sat, 24 Feb 2018 15:55:57 -0500 (EST)

mbakke pushed a commit to branch core-updates
in repository guix.

commit e58bf025df9ea1450e94fb63e87afc1fa5afd182
Merge: 9102ce1 e8ee100
Author: Marius Bakke <address@hidden>
Date:   Sat Feb 24 21:49:30 2018 +0100

    Merge branch 'master' into core-updates

 doc/guix.texi                                      |  105 +-
 etc/guix-install.sh                                |    4 +
 gnu/local.mk                                       |   17 +-
 gnu/packages/admin.scm                             |    3 +-
 gnu/packages/audio.scm                             |    2 +
 gnu/packages/benchmark.scm                         |    4 +-
 gnu/packages/bioinformatics.scm                    |    4 +-
 gnu/packages/bootloaders.scm                       |   18 +-
 gnu/packages/calendar.scm                          |   10 +-
 gnu/packages/cook.scm                              |   37 +-
 gnu/packages/cran.scm                              |    4 +-
 gnu/packages/crypto.scm                            |   47 +
 gnu/packages/debug.scm                             |    2 +-
 gnu/packages/django.scm                            |   24 +-
 gnu/packages/ebook.scm                             |   16 +-
 gnu/packages/elf.scm                               |    2 +-
 gnu/packages/emacs.scm                             |   66 ++
 gnu/packages/emulators.scm                         | 1111 ++++++++++++++++++++
 gnu/packages/fonts.scm                             |    6 +-
 gnu/packages/fontutils.scm                         |    8 +
 gnu/packages/games.scm                             |  923 +---------------
 gnu/packages/geo.scm                               |  114 +-
 gnu/packages/gettext.scm                           |    2 +-
 gnu/packages/gl.scm                                |    6 +-
 gnu/packages/gnome.scm                             |    4 +-
 gnu/packages/gnupg.scm                             |    4 +-
 gnu/packages/image.scm                             |   23 +-
 gnu/packages/imagemagick.scm                       |    4 +-
 gnu/packages/ldc.scm                               |  126 ++-
 gnu/packages/license.scm                           |  160 +++
 gnu/packages/linux.scm                             |   37 +-
 gnu/packages/lout.scm                              |  147 ++-
 gnu/packages/mail.scm                              |    4 +-
 gnu/packages/maths.scm                             |   28 +-
 gnu/packages/mpd.scm                               |   22 +-
 gnu/packages/musl.scm                              |    7 +-
 gnu/packages/networking.scm                        |   12 +-
 gnu/packages/package-management.scm                |    2 +-
 gnu/packages/parallel.scm                          |    4 +-
 gnu/packages/password-utils.scm                    |    5 +-
 gnu/packages/patches/freetype-CVE-2018-6942.patch  |   31 +
 gnu/packages/patches/htop-fix-process-tree.patch   |   99 ++
 .../patches/ldc-1.1.0-disable-dmd-tests.patch      |   35 -
 .../patches/ldc-1.1.0-disable-phobos-tests.patch   |  414 --------
 .../patches/ldc-1.7.0-disable-phobos-tests.patch   |   88 ++
 ...sts.patch => ldc-bootstrap-disable-tests.patch} |   18 +-
 .../patches/optipng-CVE-2017-1000229.patch         |   22 -
 .../patches/password-store-gnupg-compat.patch      |   28 +
 gnu/packages/patches/qemu-CVE-2017-15038.patch     |   51 -
 gnu/packages/patches/qemu-CVE-2017-15289.patch     |   66 --
 gnu/packages/patches/wavpack-CVE-2018-7253.patch   |   29 +
 gnu/packages/patches/wavpack-CVE-2018-7254.patch   |   62 ++
 gnu/packages/perl-check.scm                        |   73 ++
 gnu/packages/perl.scm                              |  411 ++++++++
 gnu/packages/photo.scm                             |    4 +-
 gnu/packages/pumpio.scm                            |    7 +-
 gnu/packages/python-crypto.scm                     |   12 +-
 gnu/packages/python.scm                            |    4 +-
 gnu/packages/rrdtool.scm                           |    2 +-
 gnu/packages/samba.scm                             |    4 +-
 gnu/packages/scheme.scm                            |   47 +-
 gnu/packages/security-token.scm                    |    6 +-
 gnu/packages/skarnet.scm                           |   90 +-
 gnu/packages/slang.scm                             |   10 +-
 gnu/packages/statistics.scm                        |   39 +-
 gnu/packages/tls.scm                               |    4 +-
 gnu/packages/upnp.scm                              |    4 +-
 gnu/packages/version-control.scm                   |   35 +-
 gnu/packages/video.scm                             |   19 +-
 gnu/packages/virtualization.scm                    |    6 +-
 gnu/packages/vulkan.scm                            |   15 +-
 gnu/packages/web.scm                               |    8 +-
 gnu/packages/wm.scm                                |   55 +-
 gnu/packages/wxwidgets.scm                         |   36 +
 gnu/packages/xorg.scm                              |    4 +-
 gnu/services/certbot.scm                           |  137 ++-
 gnu/services/xorg.scm                              |    9 +-
 guix/scripts/environment.scm                       |   22 +-
 tests/guix-environment.sh                          |    9 +
 79 files changed, 3141 insertions(+), 1998 deletions(-)

diff --cc gnu/local.mk
index 82ae783,a10f315..6cc73cb
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -800,9 -804,9 +804,8 @@@ dist_patch_DATA =                                  
        
    %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch    \
    %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch   \
    %D%/packages/patches/laby-make-install.patch                        \
-   %D%/packages/patches/ldc-disable-tests.patch                        \
-   %D%/packages/patches/ldc-1.1.0-disable-dmd-tests.patch      \
-   %D%/packages/patches/ldc-1.1.0-disable-phobos-tests.patch   \
 -  %D%/packages/patches/lcms-CVE-2016-10165.patch              \
+   %D%/packages/patches/ldc-bootstrap-disable-tests.patch      \
+   %D%/packages/patches/ldc-1.7.0-disable-phobos-tests.patch   \
    %D%/packages/patches/ledger-fix-uninitialized.patch         \
    %D%/packages/patches/ledger-revert-boost-python-fix.patch   \
    %D%/packages/patches/liba52-enable-pic.patch                        \
diff --cc gnu/packages/elf.scm
index f11cab7,8fb568b..7ec1898
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@@ -127,17 -127,17 +127,17 @@@ Executable and Linkable Format (@dfn{EL
           '()))
      (arguments
       (if (string-prefix? "arm" (or (%current-target-system) 
(%current-system)))
 -         `(#:phases (alist-cons-after
 -                     'unpack 'patch/rework-for-arm
 -                     (lambda* (#:key inputs #:allow-other-keys)
 -                       (let ((patch-file
 -                              (assoc-ref inputs "patch/rework-for-arm")))
 -                         (zero? (system* "patch" "--force" "-p1"
 -                                         "--input" patch-file))))
 -                     %standard-phases))
 +         `(#:phases (modify-phases %standard-phases
 +                      (add-after 'unpack 'patch/rework-for-arm
 +                        (lambda* (#:key inputs #:allow-other-keys)
 +                          (let ((patch-file
 +                                 (assoc-ref inputs "patch/rework-for-arm")))
 +                            (invoke "patch" "--force" "-p1"
 +                                    "--input" patch-file)
 +                            #t)))))
           '()))
  
-     (home-page "http://nixos.org/patchelf.html";)
+     (home-page "https://nixos.org/patchelf.html";)
      (synopsis "Modify the dynamic linker and RPATH of ELF executables")
      (description
       "PatchELF allows the ELF \"interpreter\" and RPATH of an ELF binary to be



reply via email to

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