diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-01-11 09:38:49 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-11 09:38:49 -0500 |
| commit | 77448857311318fc9cd866afcb85ca98fccdb25b (patch) | |
| tree | efed3a71d1f7b2c2cc292e7e4ba1884c4d26a9e4 /gnu-system.am | |
| parent | 62c155c0bcbc0d71b1bc35e966193b6e8de03246 (diff) | |
| parent | 0009ed71ad288358cbc7828954b5e1a3f18fd525 (diff) | |
| download | guix-77448857311318fc9cd866afcb85ca98fccdb25b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu-system.am b/gnu-system.am index a00b83dbf4..70e347d2c0 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -191,6 +191,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/ncurses.scm \ gnu/packages/netpbm.scm \ gnu/packages/nettle.scm \ + gnu/packages/ninja.scm \ gnu/packages/node.scm \ gnu/packages/noweb.scm \ gnu/packages/ntp.scm \ @@ -422,6 +423,7 @@ dist_patch_DATA = \ gnu/packages/patches/mupdf-buildsystem-fix.patch \ gnu/packages/patches/mutt-CVE-2014-9116.patch \ gnu/packages/patches/net-tools-bitrot.patch \ + gnu/packages/patches/nss-pkgconfig.patch \ gnu/packages/patches/nvi-assume-preserve-path.patch \ gnu/packages/patches/orpheus-cast-errors-and-includes.patch \ gnu/packages/patches/ots-no-include-missing-file.patch \ |