From 89618fa8b8d303a41591e52c7d8cabe3aa8f635d Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 31 Oct 2017 16:00:03 +0000 Subject: build: Conditionally build json importer. * Makefile.am (MODULES): Add guix/scripts/import/json.scm when HAVE_GUILE_JSON. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index fd6f9729c9..41fb9ba388 100644 --- a/Makefile.am +++ b/Makefile.am @@ -180,7 +180,6 @@ MODULES = \ guix/scripts/import/gnu.scm \ guix/scripts/import/nix.scm \ guix/scripts/import/hackage.scm \ - guix/scripts/import/json.scm \ guix/scripts/import/elpa.scm \ guix/scripts/import/texlive.scm \ guix/scripts/environment.scm \ @@ -208,6 +207,7 @@ MODULES += \ guix/import/stackage.scm \ guix/scripts/import/crate.scm \ guix/scripts/import/gem.scm \ + guix/scripts/import/json.scm \ guix/scripts/import/pypi.scm \ guix/scripts/import/stackage.scm -- cgit v1.2.3 From 37eed374d92e0fbb29701b072c3a39433fbba16d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 8 Nov 2017 10:13:45 +0100 Subject: ui: Introduce (guix i18n). * guix/ui.scm (G_, N_, _P, %gettext-domain, %package-text-domain): Move to... * guix/i18n.scm: ... here. New file. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 41fb9ba388..7ad95cec75 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,6 +103,7 @@ MODULES = \ guix/store.scm \ guix/cvs-download.scm \ guix/svn-download.scm \ + guix/i18n.scm \ guix/ui.scm \ guix/build/ant-build-system.scm \ guix/build/download.scm \ -- cgit v1.2.3 From cfbe7b7f4ccdb61534b47d91fe8e43db2ee1737d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 7 Nov 2017 18:01:37 +0100 Subject: gnu: linux: Add linux-libre arm kernel. * Makefile.am (AUX_FILES): Add arm config file. * gnu/packages/aux-files/linux-libre/4.13-arm.conf: New file. * gnu/packages/linux.scm (%intel-compatible-systems): Rename to %linux-compatible-systems and add "armhf-linux". (linux-libre): Adapt consequently. The config file for arm is taken from debian armmp kernel. It's a generic firmware for ARMv7 multiplatform compatible SoCs. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 7ad95cec75..5b492147d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -236,6 +236,7 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm # Auxiliary files for packages. AUX_FILES = \ gnu/packages/aux-files/emacs/guix-emacs.el \ + gnu/packages/aux-files/linux-libre/4.13-arm.conf \ gnu/packages/aux-files/linux-libre/4.13-i686.conf \ gnu/packages/aux-files/linux-libre/4.13-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.9-i686.conf \ -- cgit v1.2.3 From c114c9c5d813b61f47f092489ca7ee7893936abc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 15 Nov 2017 11:17:44 -0500 Subject: gnu: linux-libre: Update to 4.14. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.14. (%linux-libre-hash): Update hash. * gnu/packages/aux-files/linux-libre/4.13-arm.conf, gnu/packages/aux-files/linux-libre/4.13-i686.conf, gnu/packages/aux-files/linux-libre/4.13-x86_64.conf: Delete files. * gnu/packages/aux-files/linux-libre/4.14-arm.conf, gnu/packages/aux-files/linux-libre/4.14-i686.conf, gnu/packages/aux-files/linux-libre/4.14-x86_64.conf: New files. * Makefile.am (AUX_FILES): Update accordingly. --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 5b492147d0..925dd0a25a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -236,9 +236,9 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm # Auxiliary files for packages. AUX_FILES = \ gnu/packages/aux-files/emacs/guix-emacs.el \ - gnu/packages/aux-files/linux-libre/4.13-arm.conf \ - gnu/packages/aux-files/linux-libre/4.13-i686.conf \ - gnu/packages/aux-files/linux-libre/4.13-x86_64.conf \ + gnu/packages/aux-files/linux-libre/4.14-arm.conf \ + gnu/packages/aux-files/linux-libre/4.14-i686.conf \ + gnu/packages/aux-files/linux-libre/4.14-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.9-i686.conf \ gnu/packages/aux-files/linux-libre/4.9-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.4-i686.conf \ -- cgit v1.2.3