diff mbox series

[bug#51108] import: pypi: Support 'input-changes'.

Message ID b0e9d12e4b2f560c8d3f20d863ef30907291ec49.1633774845.git.public@yoctocell.xyz
State Accepted
Headers show
Series [bug#51108] import: pypi: Support 'input-changes'. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Xinglu Chen Oct. 9, 2021, 10:21 a.m. UTC 
* guix/import/pypi.scm (latest-release): Specify the ‘input-changes’ field.
---
 guix/import/pypi.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


base-commit: fd8ea9abf5b4ded096b7ccadb5e36fde4bac0867

Comments

Ludovic Courtès Oct. 15, 2021, 9:22 p.m. UTC | #1 
Hi,

Xinglu Chen <public@yoctocell.xyz> skribis:

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

[...]

> +              (input-changes
> +               (changed-inputs name
> +                               (pypi->guix-package pypi-name)))))))))

This was bogus (it passes the package name of instead of the package
itself).  I fixed it and pushed as
50d2900e7621aed7aea99884b6d9b41c389167d9.  It works with:

  ./pre-inst-env guix refresh python-notebook -u

Let me know if anything’s amiss!

Thanks,
Ludo’.
diff mbox series

Patch

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index b7859c8341..52835cf44d 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -532,7 +532,8 @@  (define pypi-package?
 (define (latest-release package)
   "Return an <upstream-source> for the latest release of PACKAGE."
   (let* ((pypi-name    (guix-package->pypi-name package))
-         (pypi-package (pypi-fetch pypi-name)))
+         (pypi-package (pypi-fetch pypi-name))
+         (name (package-name package)))
     (and pypi-package
          (guard (c ((missing-source-error? c) #f))
            (let* ((info    (pypi-project-info pypi-package))
@@ -540,9 +541,12 @@  (define (latest-release package)
                   (url     (distribution-url
                             (latest-source-release pypi-package))))
              (upstream-source
-              (package (package-name package))
+              (package name)
               (version version)
-              (urls (list url))))))))
+              (urls (list url))
+              (input-changes
+               (changed-inputs name
+                               (pypi->guix-package pypi-name)))))))))
 
 (define %pypi-updater
   (upstream-updater