diff options
| author | Leo Famulari <leo@famulari.name> | 2017-03-27 21:19:38 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-03-27 21:19:38 -0400 |
| commit | c17383f400d3b942c22ec46b556cad8ca3a2fce1 (patch) | |
| tree | f430fdc7b6e41a652b4a0dbdd08050f586e4b24d /gnu/local.mk | |
| parent | b1a8fd2d2cf6bf1b20ba8d26ca6f9a7caef60cbc (diff) | |
| parent | 7aeb4ffa5828206f89ec62226863c27f7c1c028d (diff) | |
| download | guix-c17383f400d3b942c22ec46b556cad8ca3a2fce1.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 02758dd7e1..f69946ba14 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -12,6 +12,7 @@ # Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com> # Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> # Copyright © 2017 Clément Lassieur <clement@lassieur.org> +# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> # # This file is part of GNU Guix. # @@ -424,6 +425,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/nfs.scm \ %D%/services/shepherd.scm \ %D%/services/herd.scm \ + %D%/services/pm.scm \ %D%/services/sddm.scm \ %D%/services/spice.scm \ %D%/services/ssh.scm \ @@ -464,6 +466,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/install.scm \ %D%/tests/mail.scm \ %D%/tests/messaging.scm \ + %D%/tests/networking.scm \ %D%/tests/ssh.scm \ %D%/tests/web.scm @@ -685,6 +688,7 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-dns-tests.patch \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libextractor-ffmpeg-3.patch \ + %D%/packages/patches/libgit2-use-after-free.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ %D%/packages/patches/liboop-mips64-deplibs-fix.patch \ |