summary refs log tree commit diff
path: root/gnu-system.am
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2016-01-19 00:18:37 -0500
committerMark H Weaver <mhw@netris.org>2016-01-19 00:18:37 -0500
commitafe9f409491a055e5d058c8f747e80d1506391e5 (patch)
tree3b3747c9d2df32019a46b283b94f0a7af05ebf1d /gnu-system.am
parentbb8afbf5a1fbc85f700c0e07ce5581637e3674dc (diff)
parent1348185ac2bb48b373495830267cff8ddc6b1fa5 (diff)
downloadguix-afe9f409491a055e5d058c8f747e80d1506391e5.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
-rw-r--r--gnu-system.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am
index a40576583f..9c87ac89da 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -80,6 +80,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/databases.scm			\
   gnu/packages/datamash.scm			\
   gnu/packages/datastructures.scm		\
+  gnu/packages/dav.scm				\
   gnu/packages/dc.scm				\
   gnu/packages/debug.scm			\
   gnu/packages/dejagnu.scm			\
@@ -89,6 +90,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/djvu.scm				\
   gnu/packages/dns.scm				\
   gnu/packages/docbook.scm			\
+  gnu/packages/docker.scm			\
   gnu/packages/doxygen.scm			\
   gnu/packages/dunst.scm			\
   gnu/packages/dvtm.scm				\
@@ -417,7 +419,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/avidemux-install-to-lib.patch		\
   gnu/packages/patches/avrdude-fix-libusb.patch			\
   gnu/packages/patches/bash-completion-directories.patch	\
-  gnu/packages/patches/bowtie-fix-makefile.patch		\
   gnu/packages/patches/bigloo-gc-shebangs.patch			\
   gnu/packages/patches/binutils-ld-new-dtags.patch		\
   gnu/packages/patches/binutils-loongson-workaround.patch	\