HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gnu: ledger: Update to 3.1.3.
[jackhill/guix/guix.git] / gnu / local.mk
diff --git a/gnu/local.mk b/gnu/local.mk
index 594755f..31e07de 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -10,7 +10,7 @@
 # Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
 # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 # Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
-# Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+# Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
 # Copyright © 2016, 2017 Jan Nieuwenhuizen <janneke@gnu.org>
 # Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 # Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
@@ -46,6 +46,7 @@ GNU_SYSTEM_MODULES =                          \
   %D%/bootloader/grub.scm                       \
   %D%/bootloader/extlinux.scm                   \
   %D%/bootloader/u-boot.scm                     \
+  %D%/bootloader/depthcharge.scm                \
   %D%/ci.scm                                   \
   %D%/packages.scm                             \
   %D%/packages/abduco.scm                      \
@@ -212,6 +213,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/gobby.scm                       \
   %D%/packages/golang.scm                      \
   %D%/packages/gperf.scm                       \
+  %D%/packages/gpodder.scm                     \
   %D%/packages/gprolog.scm                     \
   %D%/packages/gps.scm                         \
   %D%/packages/graph.scm                       \
@@ -229,6 +231,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/gxmessage.scm                   \
   %D%/packages/hardware.scm                    \
   %D%/packages/haskell.scm                     \
+  %D%/packages/haskell-apps.scm                        \
   %D%/packages/haskell-check.scm               \
   %D%/packages/haskell-crypto.scm              \
   %D%/packages/haskell-web.scm                 \
@@ -340,6 +343,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/ninja.scm                       \
   %D%/packages/node.scm                                \
   %D%/packages/noweb.scm                       \
+  %D%/packages/nss.scm                         \
   %D%/packages/ntp.scm                         \
   %D%/packages/nutrition.scm                   \
   %D%/packages/nvi.scm                         \
@@ -364,6 +368,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/perl-check.scm                  \
   %D%/packages/perl-compression.scm            \
   %D%/packages/perl-web.scm                    \
+  %D%/packages/perl6.scm                       \
   %D%/packages/photo.scm                       \
   %D%/packages/phabricator.scm                         \
   %D%/packages/php.scm                         \
@@ -536,6 +541,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/system/accounts.scm                      \
   %D%/system/file-systems.scm                  \
   %D%/system/install.scm                       \
+  %D%/system/keyboard.scm                      \
   %D%/system/linux-container.scm               \
   %D%/system/linux-initrd.scm                  \
   %D%/system/locale.scm                                \
@@ -580,9 +586,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/tests/virtualization.scm                 \
   %D%/tests/web.scm
 
-if ENABLE_INSTALLER
-
-GNU_SYSTEM_MODULES +=                           \
+INSTALLER_MODULES =                             \
   %D%/installer.scm                            \
   %D%/installer/connman.scm                    \
   %D%/installer/final.scm                      \
@@ -614,13 +618,19 @@ GNU_SYSTEM_MODULES +=                           \
   %D%/installer/newt/welcome.scm               \
   %D%/installer/newt/wifi.scm  
 
+# Always ship the installer modules but compile them only when
+# ENABLE_INSTALLER is true.
+if ENABLE_INSTALLER
+GNU_SYSTEM_MODULES += $(INSTALLER_MODULES)
+elif !ENABLE_INSTALLER
+MODULES_NOT_COMPILED += $(INSTALLER_MODULES)
+endif
+
 installerdir = $(guilemoduledir)/%D%/installer
 dist_installer_DATA =                          \
   %D%/installer/aux-files/logo.txt             \
   %D%/installer/aux-files/SUPPORTED
 
-endif ENABLE_INSTALLER
-
 # Modules that do not need to be compiled.
 MODULES_NOT_COMPILED +=                                \
   %D%/build/shepherd.scm                       \
@@ -726,6 +736,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/doc++-segfault-fix.patch                        \
   %D%/packages/patches/docker-engine-test-noinstall.patch      \
   %D%/packages/patches/docker-fix-tests.patch                  \
+  %D%/packages/patches/docker-use-fewer-modprobes.patch                \
   %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
   %D%/packages/patches/doxygen-test.patch                      \
   %D%/packages/patches/dvd+rw-tools-add-include.patch          \
@@ -741,6 +752,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/emacs-source-date-epoch.patch           \
   %D%/packages/patches/emacs-realgud-fix-configure-ac.patch    \
   %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch       \
+  %D%/packages/patches/emacs-zones-called-interactively.patch  \
   %D%/packages/patches/enlightenment-fix-setuid-path.patch     \
   %D%/packages/patches/erlang-man-path.patch                   \
   %D%/packages/patches/eudev-rules-directory.patch             \
@@ -873,6 +885,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch       \
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
   %D%/packages/patches/gtk2-theme-paths.patch                  \
+  %D%/packages/patches/gtk3-fix-deprecation-macro-use.patch    \
   %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch       \
   %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
   %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
@@ -944,7 +957,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/laby-make-install.patch                 \
   %D%/packages/patches/ldc-bootstrap-disable-tests.patch       \
   %D%/packages/patches/ldc-disable-phobos-tests.patch          \
-  %D%/packages/patches/ledger-fix-uninitialized.patch          \
   %D%/packages/patches/liba52-enable-pic.patch                 \
   %D%/packages/patches/liba52-link-with-libm.patch             \
   %D%/packages/patches/liba52-set-soname.patch                 \
@@ -1079,6 +1091,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/ngircd-handle-zombies.patch             \
   %D%/packages/patches/nss-increase-test-timeout.patch         \
   %D%/packages/patches/nss-pkgconfig.patch                     \
+  %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch             \
   %D%/packages/patches/nvi-assume-preserve-path.patch          \
   %D%/packages/patches/nvi-dbpagesize-binpower.patch           \
   %D%/packages/patches/nvi-db4.patch                           \
@@ -1214,7 +1227,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/readline-6.2-CVE-2014-2524.patch                \
   %D%/packages/patches/red-eclipse-remove-gamma-name-hack.patch        \
   %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch     \
-  %D%/packages/patches/reptyr-fix-gcc-7.patch                  \
   %D%/packages/patches/ripperx-missing-file.patch              \
   %D%/packages/patches/rpcbind-CVE-2017-8779.patch             \
   %D%/packages/patches/rtags-separate-rct.patch                        \
jackhill's copy of GNU Guix: https://guix.gnu.org/