From 50d2900e7621aed7aea99884b6d9b41c389167d9 Mon Sep 17 00:00:00 2001
From: Xinglu Chen <public@yoctocell.xyz>
Date: Sat, 9 Oct 2021 12:21:15 +0200
Subject: import: pypi: Support 'input-changes'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* guix/import/pypi.scm (latest-release): Specify the ‘input-changes’ field.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/import/pypi.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'guix/import')

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index b7859c8341..56854ff96c 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com>
-;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@@ -540,9 +540,12 @@ (define (latest-release package)
                   (url     (distribution-url
                             (latest-source-release pypi-package))))
              (upstream-source
+              (urls (list url))
+              (input-changes
+               (changed-inputs package
+                               (pypi->guix-package pypi-name)))
               (package (package-name package))
-              (version version)
-              (urls (list url))))))))
+              (version version)))))))
 
 (define %pypi-updater
   (upstream-updater
-- 
cgit v1.2.3


From 7770016402ef7864cc8e0a88c0428848f3ea7678 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 15 Oct 2021 23:05:16 +0200
Subject: import: pypi: Remove leftover 'pk' call.

This is a followup to 7b75f90c5b0da896c486cae23d19d43e2a03bb56.

* guix/import/pypi.scm (make-pypi-sexp)[maybe-upstream-name]: Remove
leftover 'pk' call.
---
 guix/import/pypi.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'guix/import')

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 56854ff96c..f908136481 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -426,7 +426,7 @@ (define (make-pypi-sexp name version source-url wheel-url home-page synopsis
   "Return the `package' s-expression for a python package with the given NAME,
 VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
   (define (maybe-upstream-name name)
-    (if (string-match ".*\\-[0-9]+" (pk name))
+    (if (string-match ".*\\-[0-9]+" name)
         `((properties ,`'(("upstream-name" . ,name))))
         '()))
   
-- 
cgit v1.2.3