From patchwork Mon Sep 27 18:20:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pinoaffe X-Patchwork-Id: 33362 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 88F4D27BBE1; Mon, 27 Sep 2021 19:21:16 +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 71B4F27BBE3 for ; Mon, 27 Sep 2021 19:21:14 +0100 (BST) Received: from localhost ([::1]:53158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUvFZ-0007BU-9R for patchwork@mira.cbaines.net; Mon, 27 Sep 2021 14:21:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUvFN-0007BJ-UM for guix-patches@gnu.org; Mon, 27 Sep 2021 14:21:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59470) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUvFN-0000wV-NE for guix-patches@gnu.org; Mon, 27 Sep 2021 14:21:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUvFN-0000Mb-JT for guix-patches@gnu.org; Mon, 27 Sep 2021 14:21:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50755] [PATCH v3] import: Generate list of importers based on available modules References: <87tuibh43w.fsf@airmail.cc> In-Reply-To: <87tuibh43w.fsf@airmail.cc> Resent-From: pinoaffe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Sep 2021 18:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50755 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50755@debbugs.gnu.org Received: via spool by 50755-submit@debbugs.gnu.org id=B50755.16327668351358 (code B ref 50755); Mon, 27 Sep 2021 18:21:01 +0000 Received: (at 50755) by debbugs.gnu.org; 27 Sep 2021 18:20:35 +0000 Received: from localhost ([127.0.0.1]:42783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUvEx-0000Lq-L3 for submit@debbugs.gnu.org; Mon, 27 Sep 2021 14:20:35 -0400 Received: from mail.cock.li ([37.120.193.124]:43050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUvEs-0000LY-7c for 50755@debbugs.gnu.org; Mon, 27 Sep 2021 14:20:33 -0400 From: pinoaffe DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=airmail.cc; s=mail; t=1632766822; bh=wAZuqm6NApV/cFKbYkCeVhCaWyrdq9jEF3rHi2dqRQQ=; h=From:To:Subject:Subject:Date:From; b=IIWqIXnh1Y3DFFTeHOQ3m67aoMUHl8yDrhyLZURxCCX/BV138aXKZYxreCc9lv3Qu pvCWRKbIpyz4rhOAZRFLRw4/lFIJqCE9hRymBhUHBSeu1+7d/5yRBG5DRcxzXm40fP uf1W9LuwcHBJIo4+h6gzc3tsEY4DATpmJmvJzEfQfqiODMJVrZTcWlNBeM4NPigSaH oEMCR9ZF2xTEif4q4ppsHGgEM6q7UnXZIiXgiVob/ySmDmif6S48/iuSArT0sweozZ DvX+dS+J8d6F5HT2ja8DIAsdQhKD8v+V+N5WeSXbqtUcg0lMnpB33vwf5uRQk49Xry pS0T0qgPo8WcA== Date: Mon, 27 Sep 2021 20:20:21 +0200 Message-ID: <87mtnxswwq.fsf@airmail.cc> MIME-Version: 1.0 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 User-agent: mu4e 1.4.15; emacs 27.2 * guix/scripts/import.scm (importers): Generate a list of all importers by looping over available guile modules, allowing for extensibility. --- guix/scripts/import.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm index 40fa6759ae..71ee8cc00b 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,15 @@ rather than \\n." ;;; Entry point. ;;; -(define importers '("gnu" "pypi" "cpan" "hackage" "stackage" "egg" "elpa" - "gem" "go" "cran" "crate" "texlive" "json" "opam" - "minetest")) +(define importers (delete-duplicates + (filter-map (lambda (module) + (match (module-name module) + (`(guix scripts import ,importer) + (symbol->string importer)) + ( #t #f))) + (all-modules (map (lambda (entry) + `(,entry . "guix/scripts/import")) + %load-path))))) (define (resolve-importer name) (let ((module (resolve-interface