diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-08-04 13:41:27 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-08-04 13:41:27 +0200 |
| commit | f35d3132654bd1be5c7453f9eb43eb6e9de85a15 (patch) | |
| tree | f62c3a069153d1612a5c270e991eebe43c4f5cae /gnu/local.mk | |
| parent | 1dff73acf908125b292de2ab2fc5b25155ad77d8 (diff) | |
| parent | e920037793faeebf8fb2a918b50a1751b125a0af (diff) | |
| download | guix-f35d3132654bd1be5c7453f9eb43eb6e9de85a15.tar guix-f35d3132654bd1be5c7453f9eb43eb6e9de85a15.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index eb3b0dcd3b..ca15f3096d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -597,6 +597,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/mail.scm \ %D%/tests/messaging.scm \ %D%/tests/networking.scm \ + %D%/tests/reconfigure.scm \ %D%/tests/rsync.scm \ %D%/tests/security-token.scm \ %D%/tests/singularity.scm \ @@ -756,6 +757,7 @@ dist_patch_DATA = \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/diffutils-getopt.patch \ + %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ @@ -1042,6 +1044,7 @@ dist_patch_DATA = \ %D%/packages/patches/libutils-add-includes.patch \ %D%/packages/patches/libutils-remove-damaging-includes.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ + %D%/packages/patches/libvirt-remove-ATTRIBUTE_UNUSED.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-use-after-free-in-postproc.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ @@ -1162,6 +1165,7 @@ dist_patch_DATA = \ %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ + %D%/packages/patches/pcre2-fix-jit_match-crash.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ |