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 e10d7ec..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>
@@ -66,6 +67,7 @@ GNU_SYSTEM_MODULES =                          \
   %D%/packages/autotools.scm                   \
   %D%/packages/avahi.scm                       \
   %D%/packages/avr.scm                         \
+  %D%/packages/axoloti.scm                     \
   %D%/packages/backup.scm                      \
   %D%/packages/base.scm                                \
   %D%/packages/bash.scm                                \
@@ -87,6 +89,7 @@ GNU_SYSTEM_MODULES =                          \
   %D%/packages/check.scm                       \
   %D%/packages/chez.scm                                \
   %D%/packages/ci.scm                          \
+  %D%/packages/cinnamon.scm                    \
   %D%/packages/cmake.scm                       \
   %D%/packages/cobol.scm                       \
   %D%/packages/code.scm                                \
@@ -198,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                                \
@@ -382,6 +387,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/suckless.scm                    \
   %D%/packages/swig.scm                                \
   %D%/packages/sync.scm                        \
+  %D%/packages/syncthing.scm                   \
   %D%/packages/synergy.scm                     \
   %D%/packages/syndication.scm                 \
   %D%/packages/task-management.scm             \
@@ -458,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                         \
@@ -543,7 +550,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/binutils-ld-new-dtags.patch             \
   %D%/packages/patches/binutils-loongson-workaround.patch      \
   %D%/packages/patches/blast+-fix-makefile.patch               \
-  %D%/packages/patches/bluez-CVE-2017-1000250.patch            \
   %D%/packages/patches/byobu-writable-status.patch             \
   %D%/packages/patches/cairo-CVE-2016-9082.patch                       \
   %D%/packages/patches/calibre-no-updates-dialog.patch         \
@@ -577,6 +583,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/crawl-upgrade-saves.patch               \
   %D%/packages/patches/crda-optional-gcrypt.patch              \
   %D%/packages/patches/crossmap-allow-system-pysam.patch       \
+  %D%/packages/patches/crypto++-fix-dos-in-asn.1-decoders.patch \
   %D%/packages/patches/clucene-contribs-lib.patch               \
   %D%/packages/patches/cube-nocheck.patch                      \
   %D%/packages/patches/cursynth-wave-rand.patch                        \
@@ -602,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              \
@@ -631,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            \
@@ -640,11 +650,8 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/gcc-6-cross-environment-variables.patch \
   %D%/packages/patches/gcr-disable-failing-tests.patch         \
   %D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch      \
-  %D%/packages/patches/gdk-pixbuf-list-dir.patch               \
-  %D%/packages/patches/gd-fix-gd2-read-test.patch              \
   %D%/packages/patches/gd-fix-tests-on-i686.patch              \
   %D%/packages/patches/gd-freetype-test-failure.patch          \
-  %D%/packages/patches/gd-php-73968-Fix-109-XBM-reading.patch          \
   %D%/packages/patches/gegl-CVE-2012-4433.patch                        \
   %D%/packages/patches/gemma-intel-compat.patch                        \
   %D%/packages/patches/geoclue-config.patch                    \
@@ -666,6 +673,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/glibc-CVE-2017-1000366-pt1.patch                \
   %D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch                \
   %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch                \
+  %D%/packages/patches/glibc-CVE-2017-15670-15671.patch                \
   %D%/packages/patches/glibc-bootstrap-system.patch            \
   %D%/packages/patches/glibc-ldd-x86_64.patch                  \
   %D%/packages/patches/glibc-locales.patch                     \
@@ -734,12 +742,14 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/hydra-disable-darcs-test.patch          \
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch    \
   %D%/packages/patches/icu4c-CVE-2017-7867-CVE-2017-7868.patch \
+  %D%/packages/patches/icu4c-CVE-2017-14952.patch              \
   %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch                      \
   %D%/packages/patches/ilmbase-fix-tests.patch                 \
   %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            \
@@ -759,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                 \
@@ -776,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       \
@@ -797,7 +807,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/libmad-armv7-thumb-pt2.patch            \
   %D%/packages/patches/libmad-frame-length.patch               \
   %D%/packages/patches/libmad-mips-newgcc.patch                        \
-  %D%/packages/patches/libmwaw-CVE-2017-9433.patch             \
   %D%/packages/patches/libsndfile-armhf-type-checks.patch      \
   %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch        \
   %D%/packages/patches/libsndfile-CVE-2017-8362.patch          \
@@ -816,8 +825,12 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/libtool-skip-tests2.patch               \
   %D%/packages/patches/libunistring-gnulib-multi-core.patch    \
   %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/libvpx-CVE-2016-2818.patch              \
   %D%/packages/patches/libxcb-python-3.5-compat.patch          \
+  %D%/packages/patches/libxfont-CVE-2017-13720.patch           \
+  %D%/packages/patches/libxfont-CVE-2017-13722.patch           \
   %D%/packages/patches/libxml2-CVE-2016-4658.patch             \
   %D%/packages/patches/libxml2-CVE-2016-5131.patch             \
   %D%/packages/patches/libxml2-CVE-2017-0663.patch             \
@@ -866,6 +879,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch                \
   %D%/packages/patches/mpc123-initialize-ao.patch              \
   %D%/packages/patches/module-init-tools-moduledir.patch       \
+  %D%/packages/patches/mongodb-support-unknown-linux-distributions.patch       \
   %D%/packages/patches/mozjs17-aarch64-support.patch           \
   %D%/packages/patches/mozjs24-aarch64-support.patch           \
   %D%/packages/patches/mozjs38-pkg-config-version.patch                \
@@ -874,8 +888,11 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/mozjs38-version-detection.patch         \
   %D%/packages/patches/mumps-build-parallelism.patch           \
   %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch     \
+  %D%/packages/patches/mupdf-CVE-2017-14685.patch              \
+  %D%/packages/patches/mupdf-CVE-2017-14686.patch              \
+  %D%/packages/patches/mupdf-CVE-2017-14687.patch              \
+  %D%/packages/patches/mupdf-CVE-2017-15587.patch              \
   %D%/packages/patches/mupen64plus-ui-console-notice.patch     \
-  %D%/packages/patches/musl-CVE-2016-8859.patch                        \
   %D%/packages/patches/mutt-store-references.patch             \
   %D%/packages/patches/ncurses-CVE-2017-10684-10685.patch      \
   %D%/packages/patches/net-tools-bitrot.patch                  \
@@ -952,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    \
@@ -978,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 \
@@ -993,6 +1014,10 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
   %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          \
@@ -1058,6 +1083,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/ttf2eot-cstddef.patch                   \
   %D%/packages/patches/ttfautohint-source-date-epoch.patch     \
   %D%/packages/patches/tophat-build-with-later-seqan.patch     \
+  %D%/packages/patches/totem-meson-easy-codec.patch            \
   %D%/packages/patches/tuxpaint-stamps-path.patch              \
   %D%/packages/patches/unrtf-CVE-2016-10091.patch              \
   %D%/packages/patches/unzip-CVE-2014-8139.patch               \
@@ -1088,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                    \
@@ -1101,6 +1124,11 @@ dist_patch_DATA =                                                \
   %D%/packages/patches/wordnet-CVE-2008-2149.patch                     \
   %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch                 \
   %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch                 \
+  %D%/packages/patches/wpa-supplicant-CVE-2017-13082.patch     \
+  %D%/packages/patches/wpa-supplicant-fix-key-reuse.patch      \
+  %D%/packages/patches/wpa-supplicant-fix-zeroed-keys.patch    \
+  %D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch    \
+  %D%/packages/patches/wpa-supplicant-krack-followups.patch    \
   %D%/packages/patches/xcb-proto-python3-print.patch           \
   %D%/packages/patches/xcb-proto-python3-whitespace.patch      \
   %D%/packages/patches/xdotool-fix-makefile.patch               \
jackhill's copy of GNU Guix: https://guix.gnu.org/