From patchwork Thu Sep 23 12:24:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pinoaffe X-Patchwork-Id: 33259 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0B0B127BBE3; Thu, 23 Sep 2021 13:28:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CA22F27BBE1 for ; Thu, 23 Sep 2021 13:28:27 +0100 (BST) Received: from localhost ([::1]:45862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTNpy-0004yS-Om for patchwork@mira.cbaines.net; Thu, 23 Sep 2021 08:28:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTNmi-00025C-Ls for guix-patches@gnu.org; Thu, 23 Sep 2021 08:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTNmg-0002Iy-UJ for guix-patches@gnu.org; Thu, 23 Sep 2021 08:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mTNmg-0002nu-KP for guix-patches@gnu.org; Thu, 23 Sep 2021 08:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50755] [PATCH] import: Generate list of importers based on available modules Resent-From: pinoaffe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Sep 2021 12:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50755 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50755@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163239987210725 (code B ref -1); Thu, 23 Sep 2021 12:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Sep 2021 12:24:32 +0000 Received: from localhost ([127.0.0.1]:52909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTNmC-0002mv-Bs for submit@debbugs.gnu.org; Thu, 23 Sep 2021 08:24:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:45028) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTNmA-0002ml-Tl for submit@debbugs.gnu.org; Thu, 23 Sep 2021 08:24:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTNmA-0001ez-Ix for guix-patches@gnu.org; Thu, 23 Sep 2021 08:24:30 -0400 Received: from mail.cock.li ([37.120.193.124]:47924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTNm6-0001e9-Tp for guix-patches@gnu.org; Thu, 23 Sep 2021 08:24:29 -0400 User-agent: mu4e 1.4.15; emacs 27.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=airmail.cc; s=mail; t=1632399860; bh=fy/v8WNTiBQXJDhlTdyH3sx7QTLo8hXvfkNnYaPKwPc=; h=From:To:Subject:Date:From; b=1SvPExn4vCuv2lvdfiFm/7QcDCKHDOfZyDO9NLwP3+qU/duSkrPfL3FKWxfvvAEkf NoIVcE/tyRMxFLTyxj1Y9rO9WUFS6oii6DT3HFFYAv/nfJpuyl4z7fxdI8bZ5m4nPX U3ZFgUUwbUEIoK6KWgD9im0FfGmo3kJvFo2EjrTlgMUulRZkOLPp1BjpEn7Op+OzlL 1Qjnv1eZjm2Di3n8FZuNlr+tc2Y2Ijs7263ElcbfQHG8KnL0/zbOu/7zGolZGQxWc7 BGt3BGtudhwO2W/cxDP0iGYpDSmO/y92G4EHtgBMFLsPE8BlPQFezhzBpANiRoCEW6 RTtjp2HC2q+pQ== From: pinoaffe Date: Thu, 23 Sep 2021 14:24:19 +0200 Message-ID: <87tuibh43w.fsf@airmail.cc> MIME-Version: 1.0 Received-SPF: pass client-ip=37.120.193.124; envelope-from=pinoaffe@airmail.cc; helo=mail.cock.li X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/import.scm (importers): Generate a list of all importers by looping over available guile modules, allowing for extensibility. --- guix/scripts/import.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm index 40fa6759ae..44cbaf13d6 100644 --- a/guix/scripts/import.scm +++ b/guix/scripts/import.scm @@ -23,6 +23,7 @@ (define-module (guix scripts import) #:use-module (guix ui) + #:use-module (guix discovery) #:use-module (guix scripts) #:use-module (guix utils) #:use-module (srfi srfi-1) @@ -78,9 +79,11 @@ rather than \\n." ;;; Entry point. ;;; -(define importers '("gnu" "pypi" "cpan" "hackage" "stackage" "egg" "elpa" - "gem" "go" "cran" "crate" "texlive" "json" "opam" - "minetest")) +(define importers (map (lambda (module) + (symbol->string (caddr (module-name module)))) + (all-modules (map (lambda (entry) + `(,entry . "guix/import")) + %load-path)))) (define (resolve-importer name) (let ((module (resolve-interface