diff options
author | Mark H Weaver <mhw@netris.org> | 2015-07-19 18:12:34 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-07-19 18:12:34 -0400 |
commit | 1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f (patch) | |
tree | 4b650999e49a6f4d3dd116fab3f9ee8222247e07 /gnu-system.am | |
parent | aa27987f71cb8afa698ede551e20b1248f160113 (diff) | |
parent | 50c7a1e297bff0935674b4f30e854a8889becfdd (diff) | |
download | guix-1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f.tar guix-1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
-rw-r--r-- | gnu-system.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu-system.am b/gnu-system.am index 4c2d5cc90c..f67e0776c8 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -193,6 +193,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/lsh.scm \ gnu/packages/lsof.scm \ gnu/packages/lua.scm \ + gnu/packages/lxde.scm \ gnu/packages/lxqt.scm \ gnu/packages/lynx.scm \ gnu/packages/m4.scm \ @@ -410,6 +411,7 @@ dist_patch_DATA = \ gnu/packages/patches/cpio-fix-symlink-bad-length-test.patch \ gnu/packages/patches/cpio-gets-undeclared.patch \ gnu/packages/patches/cpufrequtils-fix-aclocal.patch \ + gnu/packages/patches/crda-optional-gcrypt.patch \ gnu/packages/patches/crossmap-allow-system-pysam.patch \ gnu/packages/patches/cssc-gets-undeclared.patch \ gnu/packages/patches/cssc-missing-include.patch \ |