diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-07-29 14:18:07 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-07-29 14:18:07 -0400 |
| commit | 0bab3af0786ffd4caec05a29d7281ac5e5c18b6b (patch) | |
| tree | d83fd52d0cb72b3a9c21642583d804c8c1865646 /gnu/local.mk | |
| parent | 49d725a108dc33f4eb72faff7cf138c5dd8c64f4 (diff) | |
| parent | 682a7d23385f709a680049a823bb84e45c922b3c (diff) | |
| download | guix-0bab3af0786ffd4caec05a29d7281ac5e5c18b6b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 91e90706c2..84e1d77f66 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -103,6 +103,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/dvtm.scm \ %D%/packages/ebook.scm \ %D%/packages/ed.scm \ + %D%/packages/education.scm \ %D%/packages/elf.scm \ %D%/packages/emacs.scm \ %D%/packages/enchant.scm \ @@ -316,6 +317,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/slim.scm \ %D%/packages/smalltalk.scm \ %D%/packages/speech.scm \ + %D%/packages/spice.scm \ %D%/packages/ssh.scm \ %D%/packages/stalonetray.scm \ %D%/packages/statistics.scm \ @@ -513,11 +515,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-cross-environment-variables.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ %D%/packages/patches/gcc-5.0-libvtv-runpath.patch \ - %D%/packages/patches/gd-CVE-2016-5766.patch \ - %D%/packages/patches/gd-CVE-2016-6128.patch \ - %D%/packages/patches/gd-CVE-2016-6132.patch \ - %D%/packages/patches/gd-CVE-2016-6214.patch \ - %D%/packages/patches/gd-fix-test-on-i686.patch \ + %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gegl-CVE-2012-4433.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghostscript-CVE-2015-3228.patch \ |