diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
| commit | 64de896a71a9ba3091259834077d54c0146bdab6 (patch) | |
| tree | da58cc584fcc42a2b04f692aa3b1ada4c8949f5e /Makefile.am | |
| parent | 5247aab8d6a18a4081ab7caeddb4fc083bca1f6b (diff) | |
| parent | 6bfcb729268e0d20c6ae78224aef0eaad2ee2e74 (diff) | |
| download | guix-64de896a71a9ba3091259834077d54c0146bdab6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index af6ea7f4ea..2d175053bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -98,6 +98,7 @@ MODULES = \ guix/self.scm \ guix/upstream.scm \ guix/licenses.scm \ + guix/lint.scm \ guix/glob.scm \ guix/git.scm \ guix/graph.scm \ @@ -125,6 +126,7 @@ MODULES = \ guix/build-system/guile.scm \ guix/build-system/haskell.scm \ guix/build-system/linux-module.scm \ + guix/build-system/node.scm \ guix/build-system/perl.scm \ guix/build-system/python.scm \ guix/build-system/ocaml.scm \ @@ -170,6 +172,7 @@ MODULES = \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ guix/build/guile-build-system.scm \ + guix/build/node-build-system.scm \ guix/build/perl-build-system.scm \ guix/build/python-build-system.scm \ guix/build/ocaml-build-system.scm \ @@ -182,6 +185,7 @@ MODULES = \ guix/build/haskell-build-system.scm \ guix/build/linux-module-build-system.scm \ guix/build/store-copy.scm \ + guix/build/json.scm \ guix/build/utils.scm \ guix/build/union.scm \ guix/build/profiles.scm \ @@ -303,11 +307,11 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ - gnu/packages/aux-files/linux-libre/5.1-arm.conf \ - gnu/packages/aux-files/linux-libre/5.1-arm-veyron.conf \ - gnu/packages/aux-files/linux-libre/5.1-arm64.conf \ - gnu/packages/aux-files/linux-libre/5.1-i686.conf \ - gnu/packages/aux-files/linux-libre/5.1-x86_64.conf \ + gnu/packages/aux-files/linux-libre/5.2-arm.conf \ + gnu/packages/aux-files/linux-libre/5.2-arm-veyron.conf \ + gnu/packages/aux-files/linux-libre/5.2-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.2-i686.conf \ + gnu/packages/aux-files/linux-libre/5.2-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.19-arm.conf \ gnu/packages/aux-files/linux-libre/4.19-arm64.conf \ gnu/packages/aux-files/linux-libre/4.19-i686.conf \ |