diff options
author | 宋文武 <iyzsong@gmail.com> | 2015-10-30 20:50:26 +0800 |
---|---|---|
committer | 宋文武 <iyzsong@gmail.com> | 2015-10-30 20:50:26 +0800 |
commit | eed588d9976367cac020d20de9a99d4bce0058b3 (patch) | |
tree | 449db39e73ec90151ec279ed1b403b189cabc2a0 /gnu-system.am | |
parent | 9fa8f436696598e783407b16f0e459791fdd9970 (diff) | |
parent | b90e7e5d49e951a24f58d3cd29d37127982ef240 (diff) | |
download | gnu-guix-eed588d9976367cac020d20de9a99d4bce0058b3.tar gnu-guix-eed588d9976367cac020d20de9a99d4bce0058b3.tar.gz |
Merge branch 'master' into dbus-update
Diffstat (limited to 'gnu-system.am')
-rw-r--r-- | gnu-system.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index 13eede8bf6..0ee4eebeef 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -121,7 +121,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/gcc.scm \ gnu/packages/gd.scm \ gnu/packages/gdb.scm \ - gnu/packages/gdbm.scm \ gnu/packages/geeqie.scm \ gnu/packages/gettext.scm \ gnu/packages/ghostscript.scm \ @@ -693,6 +692,7 @@ dist_patch_DATA = \ gnu/packages/patches/xf86-video-trident-remove-mibstore.patch \ gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \ gnu/packages/patches/xfce4-panel-plugins.patch \ + gnu/packages/patches/xfce4-session-fix-xflock4.patch \ gnu/packages/patches/xfce4-settings-defaults.patch \ gnu/packages/patches/xmodmap-asprintf.patch \ gnu/packages/patches/zathura-plugindir-environment-variable.patch |