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 /Makefile.am | |
| parent | b1a8fd2d2cf6bf1b20ba8d26ca6f9a7caef60cbc (diff) | |
| parent | 7aeb4ffa5828206f89ec62226863c27f7c1c028d (diff) | |
| download | guix-c17383f400d3b942c22ec46b556cad8ca3a2fce1.tar guix-c17383f400d3b942c22ec46b556cad8ca3a2fce1.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 91b5f64e4c..c713d9a3f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -129,7 +129,6 @@ MODULES = \ guix/import/cabal.scm \ guix/import/cran.scm \ guix/import/hackage.scm \ - guix/import/stackage.scm \ guix/import/elpa.scm \ guix/scripts.scm \ guix/scripts/download.scm \ @@ -168,15 +167,16 @@ if HAVE_GUILE_JSON MODULES += \ guix/docker.scm \ + guix/import/cpan.scm \ + guix/import/crate.scm \ + guix/import/gem.scm \ guix/import/github.scm \ guix/import/json.scm \ - guix/import/crate.scm \ - guix/scripts/import/crate.scm \ guix/import/pypi.scm \ - guix/scripts/import/pypi.scm \ - guix/import/cpan.scm \ + guix/import/stackage.scm \ + guix/scripts/import/crate.scm \ guix/scripts/import/gem.scm \ - guix/import/gem.scm + guix/scripts/import/pypi.scm endif |