diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-26 13:51:26 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-26 13:51:26 +0200 |
| commit | a167873c67a17df8175f896750de2d905d0fae04 (patch) | |
| tree | e84bd2845b5456ef67e7337f54bdb3cc2e5b7512 /gnu/local.mk | |
| parent | 7c3bea7e6299e1026c7964c83986a6b6c220879a (diff) | |
| parent | 7c7323e432620a42f896056f076020a748c1fd6d (diff) | |
| download | patches-a167873c67a17df8175f896750de2d905d0fae04.tar patches-a167873c67a17df8175f896750de2d905d0fae04.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 8cd855ad25..5b915317d9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -322,6 +322,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/ocaml.scm \ %D%/packages/ocr.scm \ %D%/packages/onc-rpc.scm \ + %D%/packages/opencl.scm \ %D%/packages/openbox.scm \ %D%/packages/openldap.scm \ %D%/packages/openstack.scm \ @@ -471,6 +472,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/desktop.scm \ %D%/services/dict.scm \ %D%/services/dns.scm \ + %D%/services/authentication.scm \ %D%/services/games.scm \ %D%/services/kerberos.scm \ %D%/services/lirc.scm \ @@ -637,6 +639,7 @@ dist_patch_DATA = \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ + %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/doxygen-gcc-ice.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ @@ -803,6 +806,7 @@ dist_patch_DATA = \ %D%/packages/patches/jacal-fix-texinfo.patch \ %D%/packages/patches/jamvm-arm.patch \ %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ + %D%/packages/patches/java-commons-collections-fix-java8.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ %D%/packages/patches/java-simple-xml-fix-tests.patch \ @@ -960,6 +964,7 @@ dist_patch_DATA = \ %D%/packages/patches/nvi-assume-preserve-path.patch \ %D%/packages/patches/nvi-dbpagesize-binpower.patch \ %D%/packages/patches/nvi-db4.patch \ + %D%/packages/patches/nyx-show-header-stats-with-python3.patch \ %D%/packages/patches/ocaml-bisect-fix-camlp4-in-another-directory.patch \ %D%/packages/patches/ocaml-bitstring-fix-configure.patch \ %D%/packages/patches/ocaml-CVE-2015-8869.patch \ |