aboutsummaryrefslogtreecommitdiff
path: root/gnu-system.am
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-09-13 19:48:47 -0400
committerMark H Weaver <mhw@netris.org>2014-09-13 19:48:47 -0400
commit9fac9e3be3925713c20f1d5ff8b35353af10baa2 (patch)
tree9add6e882007184cc420b2e26d620de0982d934a /gnu-system.am
parent9d77da2a47ddb707edcbd1ca17f5c0ac3c068b04 (diff)
parentd7ab698a620873c11103fa2bd082884f0198723a (diff)
downloadguix-9fac9e3be3925713c20f1d5ff8b35353af10baa2.tar
guix-9fac9e3be3925713c20f1d5ff8b35353af10baa2.tar.gz
Merge branch 'master' into core-updates
Conflicts: gnu-system.am
Diffstat (limited to 'gnu-system.am')
-rw-r--r--gnu-system.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/gnu-system.am b/gnu-system.am
index dbdaf53d6f..93afd9fb50 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -320,6 +320,7 @@ dist_patch_DATA = \
gnu/packages/patches/doxygen-test.patch \
gnu/packages/patches/doxygen-tmake.patch \
gnu/packages/patches/emacs-configure-sh.patch \
+ gnu/packages/patches/eudev-rules-directory.patch \
gnu/packages/patches/file-CVE-2014-3587.patch \
gnu/packages/patches/findutils-absolute-paths.patch \
gnu/packages/patches/flashrom-use-libftdi1.patch \