Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Sun, 23 Dec 2018 22:26:04 +0000 (23:26 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Sun, 23 Dec 2018 22:26:04 +0000 (23:26 +0100)
1  2 
doc/guix.texi
gnu/local.mk
gnu/packages/emacs.scm
gnu/packages/games.scm
gnu/packages/gnuzilla.scm
gnu/packages/linux.scm
gnu/packages/maths.scm

diff --cc doc/guix.texi
Simple merge
diff --cc 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                \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge