HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' into staging
[jackhill/guix/guix.git] / gnu / local.mk
diff --git a/gnu/local.mk b/gnu/local.mk
index 24aaf94..66a4bc0 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -140,6 +140,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/enlightenment.scm               \
   %D%/packages/entr.scm                                \
   %D%/packages/erlang.scm                      \
+  %D%/packages/fabric-management.scm           \
   %D%/packages/fcitx.scm                       \
   %D%/packages/figlet.scm                      \
   %D%/packages/file.scm                                \
@@ -325,6 +326,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/plotutils.scm                   \
   %D%/packages/polkit.scm                      \
   %D%/packages/popt.scm                                \
+  %D%/packages/profiling.scm                   \
   %D%/packages/pth.scm                         \
   %D%/packages/pulseaudio.scm                  \
   %D%/packages/pumpio.scm                      \
@@ -451,6 +453,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/services/shepherd.scm                    \
   %D%/services/herd.scm                                \
   %D%/services/pm.scm                          \
+  %D%/services/rsync.scm                       \
   %D%/services/sddm.scm                                \
   %D%/services/spice.scm                               \
   %D%/services/ssh.scm                         \
@@ -497,7 +500,9 @@ GNU_SYSTEM_MODULES =                                \
   %D%/tests/mail.scm                           \
   %D%/tests/messaging.scm                      \
   %D%/tests/networking.scm                     \
+  %D%/tests/rsync.scm                          \
   %D%/tests/ssh.scm                            \
+  %D%/tests/version-control.scm                        \
   %D%/tests/virtualization.scm                 \
   %D%/tests/web.scm
 
@@ -538,7 +543,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         \
@@ -550,12 +554,12 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/ceph-disable-unittest-throttle.patch    \
   %D%/packages/patches/ceph-skip-collect-sys-info-test.patch   \
   %D%/packages/patches/ceph-skip-unittest_blockdev.patch       \
-  %D%/packages/patches/python-acme-dont-use-openssl-rand.patch \
   %D%/packages/patches/chicken-CVE-2017-6949.patch             \
   %D%/packages/patches/chicken-CVE-2017-11343.patch            \
   %D%/packages/patches/chmlib-inttypes.patch                   \
   %D%/packages/patches/clang-libc-search-path.patch            \
   %D%/packages/patches/clang-3.8-libc-search-path.patch                \
+  %D%/packages/patches/clisp-remove-failing-test.patch         \
   %D%/packages/patches/clucene-pkgconfig.patch                 \
   %D%/packages/patches/clx-remove-demo.patch                   \
   %D%/packages/patches/cmake-fix-tests.patch                   \
@@ -573,7 +577,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/crda-optional-gcrypt.patch              \
   %D%/packages/patches/crossmap-allow-system-pysam.patch       \
   %D%/packages/patches/clucene-contribs-lib.patch               \
-  %D%/packages/patches/curl-bounds-check.patch                 \
+  %D%/packages/patches/cube-nocheck.patch                      \
   %D%/packages/patches/cursynth-wave-rand.patch                        \
   %D%/packages/patches/cvs-2017-12836.patch                    \
   %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch          \
@@ -586,7 +590,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/doc++-segfault-fix.patch                        \
   %D%/packages/patches/doxygen-test.patch                      \
   %D%/packages/patches/dvd+rw-tools-add-include.patch          \
-  %D%/packages/patches/e2fsprogs-32bit-quota-warnings.patch    \
   %D%/packages/patches/elfutils-tests-ptrace.patch             \
   %D%/packages/patches/elixir-disable-failing-tests.patch      \
   %D%/packages/patches/einstein-build.patch                    \
@@ -594,7 +597,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/emacs-fix-scheme-indent-function.patch  \
   %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch    \
   %D%/packages/patches/emacs-source-date-epoch.patch           \
-  %D%/packages/patches/emacs-unsafe-enriched-mode-translations.patch   \
   %D%/packages/patches/erlang-man-path.patch                   \
   %D%/packages/patches/eudev-rules-directory.patch             \
   %D%/packages/patches/evilwm-lost-focus-bug.patch             \
@@ -615,7 +617,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/flint-ldconfig.patch                    \
   %D%/packages/patches/fltk-shared-lib-defines.patch           \
   %D%/packages/patches/fltk-xfont-on-demand.patch              \
-  %D%/packages/patches/fontforge-svg-modtime.patch             \
   %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch    \
   %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch    \
   %D%/packages/patches/freeimage-CVE-2015-0852.patch           \
@@ -686,6 +687,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch      \
   %D%/packages/patches/graphicsmagick-CVE-2017-14042.patch     \
   %D%/packages/patches/graphicsmagick-CVE-2017-14165.patch     \
+  %D%/packages/patches/graphicsmagick-CVE-2017-14649.patch     \
   %D%/packages/patches/graphite2-ffloat-store.patch            \
   %D%/packages/patches/grep-gnulib-lock.patch                   \
   %D%/packages/patches/grep-timing-sensitive-test.patch                \
@@ -808,7 +810,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/libtirpc-CVE-2017-8779.patch            \
   %D%/packages/patches/libtorrent-rasterbar-boost-compat.patch \
   %D%/packages/patches/libtool-skip-tests2.patch               \
-  %D%/packages/patches/libunwind-CVE-2015-3239.patch           \
   %D%/packages/patches/libunistring-gnulib-multi-core.patch    \
   %D%/packages/patches/libusb-0.1-disable-tests.patch          \
   %D%/packages/patches/libvpx-CVE-2016-2818.patch              \
@@ -893,17 +894,12 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/ocaml-CVE-2015-8869.patch               \
   %D%/packages/patches/ocaml-Add-a-.file-directive.patch       \
   %D%/packages/patches/ocaml-findlib-make-install.patch        \
+  %D%/packages/patches/ocaml-graph-honor-source-date-epoch.patch       \
   %D%/packages/patches/omake-fix-non-determinism.patch \
   %D%/packages/patches/ola-readdir-r.patch                     \
   %D%/packages/patches/openscenegraph-ffmpeg3.patch             \
   %D%/packages/patches/openexr-missing-samples.patch           \
   %D%/packages/patches/openfoam-4.1-cleanup.patch                      \
-  %D%/packages/patches/openjpeg-CVE-2017-12982.patch           \
-  %D%/packages/patches/openjpeg-CVE-2017-14040.patch           \
-  %D%/packages/patches/openjpeg-CVE-2017-14041.patch           \
-  %D%/packages/patches/openjpeg-CVE-2017-14151.patch           \
-  %D%/packages/patches/openjpeg-CVE-2017-14152.patch           \
-  %D%/packages/patches/openjpeg-CVE-2017-14164.patch           \
   %D%/packages/patches/openldap-CVE-2017-9287.patch            \
   %D%/packages/patches/openocd-nrf52.patch                     \
   %D%/packages/patches/openssl-runpath.patch                   \
@@ -978,6 +974,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-nose-timer-drop-ordereddict.patch \
   %D%/packages/patches/python-parse-too-many-fields.patch      \
   %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
   %D%/packages/patches/python-statsmodels-fix-tests.patch      \
@@ -992,8 +989,6 @@ 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/qemu-CVE-2017-13711.patch               \
-  %D%/packages/patches/qemu-CVE-2017-14167.patch               \
   %D%/packages/patches/qt4-ldflags.patch                       \
   %D%/packages/patches/qtscript-disable-tests.patch            \
   %D%/packages/patches/quagga-reproducible-build.patch          \
@@ -1118,8 +1113,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/xinetd-fix-fd-leak.patch                        \
   %D%/packages/patches/xinetd-CVE-2013-4342.patch              \
   %D%/packages/patches/xmodmap-asprintf.patch                  \
-  %D%/packages/patches/xorg-server-CVE-2017-10971.patch                \
-  %D%/packages/patches/xorg-server-CVE-2017-10972.patch        \
   %D%/packages/patches/libyaml-CVE-2014-9130.patch             \
   %D%/packages/patches/zathura-plugindir-environment-variable.patch    \
   %D%/packages/patches/zziplib-CVE-2017-5974.patch             \
jackhill's copy of GNU Guix: https://guix.gnu.org/