From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:50563) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgZMO-0002SW-C3 for guix-patches@gnu.org; Thu, 27 Jun 2019 14:43:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgZMN-0000xK-5P for guix-patches@gnu.org; Thu, 27 Jun 2019 14:43:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54353) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hgZMN-0000x8-1i for guix-patches@gnu.org; Thu, 27 Jun 2019 14:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hgZMM-00043J-Ua for guix-patches@gnu.org; Thu, 27 Jun 2019 14:43:02 -0400 Subject: [bug#36404] [PATCH 4/6] Export the (gnu machine) interface. Resent-Message-ID: From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) References: <87o92ianbj.fsf@sdf.lonestar.org> <87imsqan66.fsf@sdf.lonestar.org> <87ef3ean4i.fsf_-_@sdf.lonestar.org> <87a7e2an3h.fsf_-_@sdf.lonestar.org> Date: Thu, 27 Jun 2019 14:40:57 -0400 In-Reply-To: <87a7e2an3h.fsf_-_@sdf.lonestar.org> (Jakob L. Kreuze's message of "Thu, 27 Jun 2019 14:40:18 -0400") Message-ID: <875zoqan2e.fsf_-_@sdf.lonestar.org> MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36404@debbugs.gnu.org This is so machine declarations can have a simple (use-modules (gnu)) rather than having to import the machine module explicitly. 2019-06-26 Jakob L. Kreuze * gnu.scm (%public-modules): Add '(gnu machine)'. * gnu.scm (use-machine-modules): New macro. --- gnu.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu.scm b/gnu.scm index 2c29b6dc3f..fa643a5b92 100644 --- a/gnu.scm +++ b/gnu.scm @@ -27,7 +27,8 @@ #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu services) - #:export (use-package-modules + #:export (use-machine-modules + use-package-modules use-service-modules use-system-modules)) @@ -45,6 +46,7 @@ (gnu system file-systems) (gnu bootloader) (gnu bootloader grub) + (gnu machine) (gnu system keyboard) (gnu system pam) (gnu system shadow) ; 'user-account' @@ -142,6 +144,10 @@ Try adding @code{(use-service-modules ~a)}.") (current-source-location)) hint))) +(define-syntax-rule (use-machine-modules module ...) + (try-use-modules package-module-hint + (gnu machine module) ...)) + (define-syntax-rule (use-package-modules module ...) (try-use-modules package-module-hint (gnu packages module) ...)) -- 2.22.0