diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-06-10 02:57:50 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-06-10 02:57:50 +0200 |
| commit | ea45e2c500c7ed5b22ea5c21516db40dfd8fbd0b (patch) | |
| tree | c743e4905419232e6a342694760bf446cd41b5d4 /gnu/local.mk | |
| parent | 202342fdda708d8e4554e0514a58849584eddbd0 (diff) | |
| parent | 8caf5bac4c89512793276054770386c343c73e7b (diff) | |
| download | guix-ea45e2c500c7ed5b22ea5c21516db40dfd8fbd0b.tar guix-ea45e2c500c7ed5b22ea5c21516db40dfd8fbd0b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d99c4d215b..ae64f244f0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -256,7 +256,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/man.scm \ %D%/packages/mail.scm \ %D%/packages/make-bootstrap.scm \ - %D%/packages/markdown.scm \ + %D%/packages/markup.scm \ %D%/packages/marst.scm \ %D%/packages/mate.scm \ %D%/packages/maths.scm \ @@ -504,7 +504,6 @@ dist_patch_DATA = \ %D%/packages/patches/agg-am_c_prototype.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ - %D%/packages/patches/artanis-fix-Makefile.in.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ @@ -945,6 +944,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/rapicorn-isnan.patch \ + %D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/ratpoison-shell.patch \ %D%/packages/patches/rcs-5.9.4-noreturn.patch \ %D%/packages/patches/readline-link-ncurses.patch \ |