diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-09-08 12:11:32 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-08 12:11:32 +0200 |
commit | 8ce3104e0e290b603599ec2e1b86bb82497c2665 (patch) | |
tree | 9b099435ac4d3aa05439be277a32e19337c07c7a /gnu-system.am | |
parent | 3409bc0188feb4b00cdd5ec7acc357faa6cad698 (diff) | |
parent | 6bf25b7b0554e8b569bc4938c4833491aedc742f (diff) | |
download | gnu-guix-8ce3104e0e290b603599ec2e1b86bb82497c2665.tar gnu-guix-8ce3104e0e290b603599ec2e1b86bb82497c2665.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 920e1383f7..a5000bcdfe 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -176,6 +176,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/xml.scm \ gnu/packages/xnee.scm \ gnu/packages/xorg.scm \ + gnu/packages/yasm.scm \ gnu/packages/zile.scm \ gnu/packages/zip.scm \ gnu/system/vm.scm @@ -207,6 +208,7 @@ dist_patch_DATA = \ gnu/packages/patches/guile-default-utf8.patch \ gnu/packages/patches/guile-linux-syscalls.patch \ gnu/packages/patches/guile-relocatable.patch \ + gnu/packages/patches/hop-bigloo-4.0b.patch \ gnu/packages/patches/libevent-dns-tests.patch \ gnu/packages/patches/libtool-skip-tests.patch \ gnu/packages/patches/m4-gets-undeclared.patch \ |