diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-05-11 13:37:47 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-05-11 13:37:47 -0400 |
| commit | 9f5e79675367aedd6be89e07edbc08a6e3695fab (patch) | |
| tree | 2679dfc572b7173ba6fe52611047a47283af119d /gnu/local.mk | |
| parent | e2b89203db6c2056c9658be40ab1be471769d9eb (diff) | |
| parent | cf60e76a9503156a8c1047fa446525b28842f7e8 (diff) | |
| download | guix-9f5e79675367aedd6be89e07edbc08a6e3695fab.tar guix-9f5e79675367aedd6be89e07edbc08a6e3695fab.tar.gz | |
Merge branch 'master' into gnome-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 183ddb8354..688632928f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -108,6 +108,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/enchant.scm \ gnu/packages/engineering.scm \ gnu/packages/enlightenment.scm \ + gnu/packages/entr.scm \ gnu/packages/fcitx.scm \ gnu/packages/feh.scm \ gnu/packages/figlet.scm \ @@ -708,18 +709,6 @@ dist_patch_DATA = \ gnu/packages/patches/python-paste-remove-timing-test.patch \ gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch \ - gnu/packages/patches/qemu-CVE-2015-8558.patch \ - gnu/packages/patches/qemu-CVE-2015-8567.patch \ - gnu/packages/patches/qemu-CVE-2015-8613.patch \ - gnu/packages/patches/qemu-CVE-2015-8619.patch \ - gnu/packages/patches/qemu-CVE-2015-8701.patch \ - gnu/packages/patches/qemu-CVE-2015-8743.patch \ - gnu/packages/patches/qemu-CVE-2016-1568.patch \ - gnu/packages/patches/qemu-CVE-2016-1922.patch \ - gnu/packages/patches/qemu-CVE-2016-1981.patch \ - gnu/packages/patches/qemu-CVE-2016-2197.patch \ - gnu/packages/patches/qemu-usb-ehci-oob-read.patch \ - gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch \ gnu/packages/patches/qt4-ldflags.patch \ gnu/packages/patches/ratpoison-shell.patch \ gnu/packages/patches/readline-link-ncurses.patch \ |