diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-03-20 00:49:05 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-03-20 00:49:05 -0400 |
| commit | 647888845c0d7b9ea1b51a3e3492d4d2382f4468 (patch) | |
| tree | be34c5ec88db452c63253dc4a15f9f4cf199b1e6 /gnu/local.mk | |
| parent | fe15613cdf8623574ce64c05416dd3fab41eef86 (diff) | |
| parent | c657716ede8932da356635802534aa13205a6ecd (diff) | |
| download | gnu-guix-647888845c0d7b9ea1b51a3e3492d4d2382f4468.tar gnu-guix-647888845c0d7b9ea1b51a3e3492d4d2382f4468.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index a03b482df2..bc30cbae2a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -411,6 +411,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/tcl.scm \ %D%/packages/telephony.scm \ %D%/packages/terminals.scm \ + %D%/packages/terraform.scm \ %D%/packages/texinfo.scm \ %D%/packages/tex.scm \ %D%/packages/textutils.scm \ @@ -787,6 +788,7 @@ dist_patch_DATA = \ %D%/packages/patches/jacal-fix-texinfo.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 \ %D%/packages/patches/java-xerces-bootclasspath.patch \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ @@ -858,7 +860,6 @@ dist_patch_DATA = \ %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ %D%/packages/patches/libtheora-config-guess.patch \ - %D%/packages/patches/libtirpc-missing-headers.patch \ %D%/packages/patches/libtiff-CVE-2017-9935.patch \ %D%/packages/patches/libtiff-CVE-2017-18013.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ |