Merge branch 'master' into core-updates

 Conflicts:
	gnu/packages/admin.scm
	gnu/packages/commencement.scm
	gnu/packages/guile.scm
	gnu/packages/linux.scm
	gnu/packages/package-management.scm
	gnu/packages/pulseaudio.scm
	gnu/packages/web.scm

1 files changed, 2 insertions, 2 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index 46e29365674..9d62bec7200 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -25,7 +25,7 @@
 # Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 # Copyright © 2019 Evan Straw <evan.straw99@gmail.com>
 # Copyright © 2019 Brett Gilio <brettg@gnu.org>
-# Copyright © 2019 Amin Bandali <mab@gnu.org>
+# Copyright © 2019 Amin Bandali <bandali@gnu.org>
 # Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
 # Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 #
@@ -138,6 +138,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/cups.scm                         \
   %D%/packages/curl.scm                         \
   %D%/packages/cvassistant.scm                  \
+  %D%/packages/cybersecurity.scm                \
   %D%/packages/cyrus-sasl.scm                   \
   %D%/packages/databases.scm                    \
   %D%/packages/datamash.scm                     \
@@ -1019,7 +1020,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/gtksourceview-2-add-default-directory.patch \
   %D%/packages/patches/gzdoom-search-in-installed-share.patch   \
   %D%/packages/patches/gzdoom-find-system-libgme.patch  \
-  %D%/packages/patches/hash-extender-test-suite.patch           \
   %D%/packages/patches/haskell-mode-unused-variables.patch      \
   %D%/packages/patches/haskell-mode-make-check.patch            \
   %D%/packages/patches/hdf4-architectures.patch                 \