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

[Mark H. Weaver]

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

commit c0d7c1244a031c94062762db991b7ba7dc34b583
Merge: e5bbfc7 f274f07
Author: Mark H Weaver <address@hidden>
Date:   Tue May 29 21:20:47 2018 -0400

    Merge branch 'master' into core-updates

 CODE-OF-CONDUCT                                |  111 ++-
 gnu/local.mk                                   |    1 +
 gnu/packages/admin.scm                         |    4 +-
 gnu/packages/algebra.scm                       |    5 +-
 gnu/packages/engineering.scm                   |    1 +
 gnu/packages/file-systems.scm                  |   10 +-
 gnu/packages/freedesktop.scm                   |    4 +-
 gnu/packages/game-development.scm              |    4 +-
 gnu/packages/golang.scm                        |  150 ++++
 gnu/packages/machine-learning.scm              |  123 ++-
 gnu/packages/mail.scm                          |    4 +-
 gnu/packages/maths.scm                         |    4 +-
 gnu/packages/mpd.scm                           |    4 +-
 gnu/packages/networking.scm                    |    4 +-
 gnu/packages/patches/swig-octave-patches.patch | 1119 ++++++++++++++++++++++++
 gnu/packages/swig.scm                          |    5 +-
 gnu/packages/version-control.scm               |    6 +-
 gnu/system/vm.scm                              |    1 -
 18 files changed, 1457 insertions(+), 103 deletions(-)

diff --cc gnu/packages/machine-learning.scm
index fb511b4,e135ee0..e6f7a18
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@@ -408,9 -410,20 +410,21 @@@ sample proximities between pairs of cas
                                     (and skipping? (not skip-next?)))
                             (display line out))
                           (loop (read-line in 'concat) skip-next?)))))))
-            (for-each delete-ifdefs (find-files "src/shogun/kernel/"
-                                                "^Kernel\\.(cpp|h)"))
+            (for-each delete-ifdefs
+                      (append
+                       (find-files "src/shogun/classifier/mkl"
+                                   "^MKLClassification\\.cpp")
+                       (find-files "src/shogun/classifier/svm"
+                                   "^SVMLightOneClass\\.(cpp|h)")
+                       (find-files "src/shogun/multiclass"
+                                   "^ScatterSVM\\.(cpp|h)")
+                       (find-files "src/shogun/kernel/"
+                                   
"^(Kernel|CombinedKernel|ProductKernel)\\.(cpp|h)")
+                       (find-files "src/shogun/regression/svr"
+                                   "^(MKLRegression|SVRLight)\\.(cpp|h)")
+                       (find-files "src/shogun/transfer/domain_adaptation"
 -                                  "^DomainAdaptationSVM\\.(cpp|h)")))))))
++                                  "^DomainAdaptationSVM\\.(cpp|h)")))
 +           #t))))
      (build-system cmake-build-system)
      (arguments
       '(#:tests? #f ;no check target