From patchwork Tue Aug 31 18:17:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 32446 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 2770E27BBE1; Tue, 31 Aug 2021 19:19:14 +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 64F7C27BBE3 for ; Tue, 31 Aug 2021 19:19:12 +0100 (BST) Received: from localhost ([::1]:33122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mL8Ln-0000xT-Ah for patchwork@mira.cbaines.net; Tue, 31 Aug 2021 14:19:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mL8Le-0000wF-Rk for guix-patches@gnu.org; Tue, 31 Aug 2021 14:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52048) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mL8Le-0002Dl-Kd for guix-patches@gnu.org; Tue, 31 Aug 2021 14:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mL8Le-0001Xg-4d for guix-patches@gnu.org; Tue, 31 Aug 2021 14:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50304] [PATCH] import: elpa: Support NonGNU ELPA. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 18:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50304 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50304@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16304338975866 (code B ref -1); Tue, 31 Aug 2021 18:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Aug 2021 18:18:17 +0000 Received: from localhost ([127.0.0.1]:35361 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mL8Kp-0001WT-H3 for submit@debbugs.gnu.org; Tue, 31 Aug 2021 14:18:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:35620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mL8Kk-0001WH-Ds for submit@debbugs.gnu.org; Tue, 31 Aug 2021 14:18:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mL8Kk-0000JM-6R for guix-patches@gnu.org; Tue, 31 Aug 2021 14:18:06 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:56974 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mL8Ki-0001MA-4h for guix-patches@gnu.org; Tue, 31 Aug 2021 14:18:05 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1630433873; bh=mPwS5shdPFrG4lmrCN9teQ1fxgeLX79g6JqSV4oQgtM=; h=From:To:Subject:Date; b=W0+5L4lkLhWyEYFWkqJ2wA8G6WWSxYK8HRncgYo6xIo3XWQRvML54mNSgh0QDqYDG NmY+pk5rOv1dQ03kpzPPxSP85BfR2ajtqWxW+FFWReWLhGGWvhpYNsUouylrHo1osl YTHgr6V+dCLv9qrCgpXlE9///TCeZlTKeAblp4K4= Message-Id: Date: Tue, 31 Aug 2021 20:17:52 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 30 X-Spam_score: 3.0 X-Spam_bar: +++ X-Spam_report: (3.0 / 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, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=1.598, PDS_OTHER_BAD_TLD=1.999, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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/import/elpa.scm (elpa-url): Add NonGNU ELPA URL. * doc/guix.texi (Invoking guix import): Document it. --- doc/guix.texi | 4 ++++ guix/import/elpa.scm | 2 ++ 2 files changed, 6 insertions(+) base-commit: cc71a54e9f900e905192f794c7bc5346c445e651 diff --git a/doc/guix.texi b/doc/guix.texi index 6620f882f5..80fa7366d0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11605,6 +11605,10 @@ contained in the GnuPG keyring at @code{emacs} package (@pxref{Package Installation, ELPA package signatures,, emacs, The GNU Emacs Manual}). +@item +@uref{https://elpa.nongnu.org/nongnu/, NonGNU}, selected by the +@code{nongnu} identifier. + @item @uref{https://stable.melpa.org/packages, MELPA-Stable}, selected by the @code{melpa-stable} identifier. diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index c0dc5acf51..fb59acc9e3 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,6 +81,7 @@ NAMES (strings)." (let ((elpa-archives '((gnu . "https://elpa.gnu.org/packages") (gnu/http . "http://elpa.gnu.org/packages") ;for testing + (nongnu . "https://elpa.nongnu.org/nongnu") (melpa-stable . "https://stable.melpa.org/packages") (melpa . "https://melpa.org/packages")))) (assq-ref elpa-archives repo)))