diff options
| author | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
| commit | b029be2ee0f81cdcbc14240ff426408085ab0a40 (patch) | |
| tree | ed6d0e1bfdadfd28e1eb804e43763b793baa0b42 /gnu/local.mk | |
| parent | bc55f3091bac4677df0cf020381c554921fea179 (diff) | |
| parent | ffb381856d0c6cc1a557b789f6b377cfa17002a0 (diff) | |
| download | guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gpodder.scm
gnu/packages/music.scm
gnu/packages/patches/glibc-bootstrap-system.patch
gnu/packages/python-xyz.scm
gnu/packages/shells.scm
gnu/packages/statistics.scm
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 20f0b8f081..812c997e04 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -451,6 +451,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/php.scm \ %D%/packages/piet.scm \ %D%/packages/pkg-config.scm \ + %D%/packages/plan9.scm \ %D%/packages/plotutils.scm \ %D%/packages/poedit.scm \ %D%/packages/polkit.scm \ @@ -559,6 +560,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/tmux.scm \ %D%/packages/tor.scm \ %D%/packages/tv.scm \ + %D%/packages/uglifyjs.scm \ %D%/packages/uml.scm \ %D%/packages/unicode.scm \ %D%/packages/unrtf.scm \ @@ -994,6 +996,7 @@ dist_patch_DATA = \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/erlang-man-path.patch \ + %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ %D%/packages/patches/evolution-CVE-2020-11879.patch \ @@ -1257,6 +1260,7 @@ dist_patch_DATA = \ %D%/packages/patches/jfsutils-gcc-compat.patch \ %D%/packages/patches/jfsutils-include-systypes.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ + %D%/packages/patches/julia-tracker-16-compat.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libblockdev-glib-compat.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ @@ -1389,6 +1393,7 @@ dist_patch_DATA = \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/mailutils-fix-uninitialized-variable.patch \ %D%/packages/patches/make-impure-dirs.patch \ + %D%/packages/patches/marble-qt-add-qt-headers.patch \ %D%/packages/patches/mariadb-CVE-2021-27928.patch \ %D%/packages/patches/mariadb-cmake-compat.patch \ %D%/packages/patches/mars-install.patch \ |