diff mbox series

[bug#52586] import: elpa: Support ‘upstream-name’ property.

Message ID e48b9facb53a4e9853fbdc4520c93ec6d42ef1ec.1639774501.git.public@yoctocell.xyz
State Accepted
Headers show
Series [bug#52586] import: elpa: Support ‘upstream-name’ property. | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Xinglu Chen Dec. 17, 2021, 8:55 p.m. UTC 
* guix/import/elpa.scm: (guix-package->elpa-name): New procedure.
  (latest-release): Use it.
* tests/elpa.scm ("guix-package->elpa-name: without 'upstream-name' property")
  ("guix-package->elpa-name: with 'upstream-name' property"): Test it.
---
 guix/import/elpa.scm | 15 ++++++++++-----
 tests/elpa.scm       | 12 ++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)


base-commit: d627fbad8f4e157103251b07d7543dd2f5647cea

Comments

Ludovic Courtès Dec. 18, 2021, 8 p.m. UTC | #1 
Hi,

Xinglu Chen <public@yoctocell.xyz> skribis:

> * guix/import/elpa.scm: (guix-package->elpa-name): New procedure.
>   (latest-release): Use it.
> * tests/elpa.scm ("guix-package->elpa-name: without 'upstream-name' property")
>   ("guix-package->elpa-name: with 'upstream-name' property"): Test it.

Applied, thanks!

Ludo’.
diff mbox series

Patch

diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index dd539cd945..edabb88b7a 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -46,6 +46,7 @@  (define-module (guix import elpa)
   #:use-module (guix packages)
   #:use-module ((guix utils) #:select (call-with-temporary-output-file))
   #:export (elpa->guix-package
+            guix-package->elpa-name
             %elpa-updater
             elpa-recursive-import))
 
@@ -412,13 +413,17 @@  (define* (elpa->guix-package name #:key (repo 'gnu) version)
 ;;; Updates.
 ;;;
 
+(define (guix-package->elpa-name package)
+  "Given a Guix package, PACKAGE, return the upstream name on ELPA."
+  (or (and=> (package-properties package)
+             (cut assq-ref <> 'upstream-name))
+      (if (string-prefix? "emacs-" (package-name package))
+          (string-drop (package-name package) 6)
+          (package-name package))))
+
 (define (latest-release package)
   "Return an <upstream-release> for the latest release of PACKAGE."
-  (define name
-    (if (string-prefix? "emacs-" (package-name package))
-        (string-drop (package-name package) 6)
-        (package-name package)))
-
+  (define name (guix-package->elpa-name package))
   (define repo 'gnu)
 
   (match (elpa-package-info name repo)
diff --git a/tests/elpa.scm b/tests/elpa.scm
index 01ef948b2e..1efdf2457f 100644
--- a/tests/elpa.scm
+++ b/tests/elpa.scm
@@ -2,6 +2,7 @@ 
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,6 +21,7 @@ 
 
 (define-module (test-elpa)
   #:use-module (guix import elpa)
+  #:use-module (guix tests)
   #:use-module (guix tests http)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-64)
@@ -71,6 +73,16 @@  (define (eval-test-with-elpa pkg)
 (test-assert "elpa->guix-package test 1"
   (eval-test-with-elpa "auctex"))
 
+(test-equal "guix-package->elpa-name: without 'upstream-name' property"
+  "auctex"
+  (guix-package->elpa-name (dummy-package "emacs-auctex")))
+
+(test-equal "guix-package->elpa-name: with 'upstream-name' property"
+  "project"
+  (guix-package->elpa-name
+   (dummy-package "emacs-fake-name"
+     (properties '((upstream-name . "project"))))))
+
 (test-end "elpa")
 
 ;; Local Variables: