HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gnu: Move web packages from haskell to haskell-web.
[jackhill/guix/guix.git] / gnu / local.mk
diff --git a/gnu/local.mk b/gnu/local.mk
index f318bcd..969b5c2 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -11,6 +11,7 @@
 # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 # Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com>
 # Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+# Copyright © 2016, 2017 Jan Nieuwenhuizen <janneke@gnu.org>
 # Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 # Copyright © 2017 Clément Lassieur <clement@lassieur.org>
 # Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -200,6 +201,8 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/gv.scm                          \
   %D%/packages/gxmessage.scm                   \
   %D%/packages/haskell.scm                     \
+  %D%/packages/haskell-check.scm               \
+  %D%/packages/haskell-web.scm                 \
   %D%/packages/ham-radio.scm                   \
   %D%/packages/hexedit.scm                     \
   %D%/packages/hugs.scm                                \
@@ -461,6 +464,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/services/spice.scm                               \
   %D%/services/ssh.scm                         \
   %D%/services/sysctl.scm                      \
+  %D%/services/telephony.scm                   \
   %D%/services/version-control.scm              \
   %D%/services/vpn.scm                         \
   %D%/services/web.scm                         \
@@ -605,6 +609,8 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/eudev-rules-directory.patch             \
   %D%/packages/patches/evilwm-lost-focus-bug.patch             \
   %D%/packages/patches/exim-CVE-2017-1000369.patch             \
+  %D%/packages/patches/exiv2-CVE-2017-14860.patch              \
+  %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch  \
   %D%/packages/patches/fastcap-mulGlobal.patch                 \
   %D%/packages/patches/fastcap-mulSetup.patch                  \
   %D%/packages/patches/fasthenry-spAllocate.patch              \
@@ -634,6 +640,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gcc-cross-environment-variables.patch   \
   %D%/packages/patches/gcc-libvtv-runpath.patch                        \
   %D%/packages/patches/gcc-strmov-store-file-names.patch       \
+  %D%/packages/patches/gcc-4-compile-with-gcc-5.patch           \
   %D%/packages/patches/gcc-4.6-gnu-inline.patch                        \
   %D%/packages/patches/gcc-4.9.3-mingw-gthr-default.patch      \
   %D%/packages/patches/gcc-5.0-libvtv-runpath.patch            \
@@ -742,6 +749,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/intltool-perl-compatibility.patch       \
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch        \
   %D%/packages/patches/jacal-fix-texinfo.patch                 \
+  %D%/packages/patches/java-powermock-fix-java-files.patch             \
   %D%/packages/patches/jbig2dec-ignore-testtest.patch          \
   %D%/packages/patches/jbig2dec-CVE-2016-9601.patch            \
   %D%/packages/patches/jbig2dec-CVE-2017-7885.patch            \
@@ -761,6 +769,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch       \
   %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch     \
   %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch    \
+  %D%/packages/patches/ktexteditor-5.39.0-autotests-dependencies.patch \
   %D%/packages/patches/laby-make-install.patch                 \
   %D%/packages/patches/lcms-CVE-2016-10165.patch               \
   %D%/packages/patches/ldc-disable-tests.patch                 \
@@ -778,7 +787,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/libcroco-CVE-2017-7960.patch            \
   %D%/packages/patches/libcroco-CVE-2017-7961.patch            \
   %D%/packages/patches/libdrm-symbol-check.patch               \
-  %D%/packages/patches/libetonyek-build-with-mdds-1.2.patch     \
   %D%/packages/patches/libevent-dns-tests.patch                        \
   %D%/packages/patches/libevent-2.0-CVE-2016-10195.patch       \
   %D%/packages/patches/libevent-2.0-CVE-2016-10196.patch       \
@@ -819,7 +827,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/libusb-0.1-disable-tests.patch          \
   %D%/packages/patches/libusb-for-axoloti.patch                        \
   %D%/packages/patches/libvirt-CVE-2017-1000256.patch          \
-  %D%/packages/patches/libvisio-fix-tests.patch                        \
   %D%/packages/patches/libvpx-CVE-2016-2818.patch              \
   %D%/packages/patches/libxcb-python-3.5-compat.patch          \
   %D%/packages/patches/libxfont-CVE-2017-13720.patch           \
@@ -962,6 +969,9 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/procmail-ambiguous-getline-debian.patch  \
   %D%/packages/patches/procmail-CVE-2014-3618.patch            \
   %D%/packages/patches/proot-test-fhs.patch                    \
+  %D%/packages/patches/psm-arch.patch                          \
+  %D%/packages/patches/psm-ldflags.patch                       \
+  %D%/packages/patches/psm-repro.patch                         \
   %D%/packages/patches/pt-scotch-build-parallelism.patch       \
   %D%/packages/patches/pulseaudio-fix-mult-test.patch          \
   %D%/packages/patches/pulseaudio-longer-test-timeout.patch    \
@@ -988,6 +998,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/python-genshi-isstring-helper.patch     \
   %D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch     \
   %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
+  %D%/packages/patches/python-networkx2-reproducible-build.patch       \
   %D%/packages/patches/python-nose-timer-drop-ordereddict.patch \
   %D%/packages/patches/python-parse-too-many-fields.patch      \
   %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
@@ -1004,6 +1015,9 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
   %D%/packages/patches/python2-subprocess32-disable-input-test.patch   \
   %D%/packages/patches/python2-unittest2-remove-argparse.patch \
+  %D%/packages/patches/qemu-CVE-2017-15038.patch               \
+  %D%/packages/patches/qemu-CVE-2017-15268.patch               \
+  %D%/packages/patches/qemu-CVE-2017-15289.patch               \
   %D%/packages/patches/qt4-ldflags.patch                       \
   %D%/packages/patches/qtscript-disable-tests.patch            \
   %D%/packages/patches/quagga-reproducible-build.patch          \
@@ -1100,9 +1114,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/vte-CVE-2012-2738-pt1.patch                     \
   %D%/packages/patches/vte-CVE-2012-2738-pt2.patch                     \
   %D%/packages/patches/weechat-python.patch                    \
-  %D%/packages/patches/wget-CVE-2017-6508.patch                        \
-  %D%/packages/patches/wget-fix-504-test-timeout.patch                 \
-  %D%/packages/patches/wget-perl-5.26.patch                    \
   %D%/packages/patches/wicd-bitrate-none-fix.patch             \
   %D%/packages/patches/wicd-get-selected-profile-fix.patch     \
   %D%/packages/patches/wicd-urwid-1.3.patch                    \
jackhill's copy of GNU Guix: https://guix.gnu.org/