[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/03: Merge branch 'master' into staging |
|
Date: |
Sun, 23 Dec 2018 17:38:21 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 02bf685d00238f74d28211e71d22a03f58e962cd
Merge: 472c36b 8f2253a
Author: Marius Bakke <address@hidden>
Date: Sun Dec 23 23:26:04 2018 +0100
Merge branch 'master' into staging
doc/guix.texi | 4 +-
gnu/local.mk | 2 -
gnu/packages/conkeror.scm | 83 ---------------------------
gnu/packages/datamash.scm | 7 +--
gnu/packages/emacs.scm | 4 +-
gnu/packages/entr.scm | 2 +-
gnu/packages/games.scm | 2 +-
gnu/packages/gnuzilla.scm | 5 ++
gnu/packages/image-processing.scm | 5 +-
gnu/packages/linux.scm | 16 +++---
gnu/packages/mail.scm | 25 ++++----
gnu/packages/maths.scm | 34 ++++++-----
gnu/packages/patches/datamash-arm-tests.patch | 71 -----------------------
gnu/packages/serialization.scm | 20 ++++++-
gnu/packages/textutils.scm | 33 ++++++++---
gnu/packages/web-browsers.scm | 18 ++++--
gnu/services/admin.scm | 2 +-
guix/scripts/offload.scm | 2 +-
18 files changed, 117 insertions(+), 218 deletions(-)
diff --cc gnu/local.mk
index 3e205a8,0a945e4..713050b
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -648,7 -649,7 +647,6 @@@ dist_patch_DATA =
%D%/packages/patches/cube-nocheck.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-2017-12836.patch \
- %D%/packages/patches/datamash-arm-tests.patch \
- %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \