diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-03-04 23:27:24 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-03-04 23:27:24 +0100 |
| commit | 81eec00cb221231123b74d14245ef7caa9d89ff6 (patch) | |
| tree | 3beeb77c5535038dc75db843dd88a1775fb541bb /Makefile.am | |
| parent | 8689a1908a8353b80ed1fcbb81feddc5eb799f24 (diff) | |
| parent | 2a1e82bb5c2ae28b0018aa765cff6733136b3f70 (diff) | |
| download | patches-81eec00cb221231123b74d14245ef7caa9d89ff6.tar patches-81eec00cb221231123b74d14245ef7caa9d89ff6.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
Makefile.am
guix/scripts/gc.scm
guix/scripts/package.scm
guix/ui.scm
tests/guix-package.sh
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index d87e6e0572..c9dcc4a356 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,12 +39,14 @@ MODULES = \ guix/licenses.scm \ guix/build-system.scm \ guix/build-system/gnu.scm \ + guix/build-system/perl.scm \ guix/build-system/trivial.scm \ guix/ftp-client.scm \ guix/store.scm \ guix/ui.scm \ guix/build/download.scm \ guix/build/gnu-build-system.scm \ + guix/build/perl-build-system.scm \ guix/build/utils.scm \ guix/build/union.scm \ guix/packages.scm \ @@ -99,6 +101,7 @@ MODULES = \ gnu/packages/ld-wrapper.scm \ gnu/packages/less.scm \ gnu/packages/libapr.scm \ + gnu/packages/libdaemon.scm \ gnu/packages/libevent.scm \ gnu/packages/libffi.scm \ gnu/packages/libidn.scm \ @@ -158,6 +161,7 @@ MODULES = \ gnu/packages/tmux.scm \ gnu/packages/tor.scm \ gnu/packages/vim.scm \ + gnu/packages/vpn.scm \ gnu/packages/wdiff.scm \ gnu/packages/wget.scm \ gnu/packages/which.scm \ @@ -216,7 +220,8 @@ dist_patch_DATA = \ gnu/packages/patches/shishi-gets-undeclared.patch \ gnu/packages/patches/tar-gets-undeclared.patch \ gnu/packages/patches/tcsh-fix-autotest.patch \ - gnu/packages/patches/teckit-cstdio.patch + gnu/packages/patches/teckit-cstdio.patch \ + gnu/packages/patches/vpnc-script.patch bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux |