amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

import: pypi: Resolve unzip package if needed.

Browse source 
Fixes #1066.

* guix/import/pypi.scm (unzip-command): New variable.
(guess-requirements): Use unzip-command.

Change-Id: I1b6b85d0a22836bad77d6c5d050ccf639118d21a
Reviewed-by: zimoun, ngraves
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
This commit is contained in:
Romain GARBAGE 2025-07-09 12:22:38 +02:00 • committed by Sharlatan Hellseher
parent 5556329c17
commit 0ff24b4037
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
1 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
guix/import/pypi.scm
View file

@ -43,9 +43,12 @@
#:autoload (gcrypt hash) (port-sha256)
#:autoload (guix base16) (base16-string->bytevector)
#:autoload (guix base32) (bytevector->nix-base32-string)
#:use-module (guix derivations)
#:use-module (guix gexp)
#:autoload (guix http-client) (http-fetch)
#:use-module (guix utils)
#:use-module (guix memoization)
#:use-module (guix monads)
#:use-module (guix diagnostics)
#:use-module (guix i18n)
#:use-module ((guix ui) #:select (display-hint))
@ -54,12 +57,14 @@
. hyphen-package-name->name+version)
find-files
invoke
call-with-temporary-output-file))
call-with-temporary-output-file
which))
#:use-module (guix import utils)
#:use-module (guix import json)
#:use-module (json)
#:use-module (guix build toml)
#:use-module (guix packages)
#:use-module (guix store)
#:use-module (guix upstream)
#:use-module ((guix licenses) #:prefix license:)
#:export (%pypi-base-url
@ -260,6 +265,26 @@ the input field."
(any (cut string-contains-ci name <>)
'("test" "dev")))
;; Adapted from SVN-COMMAND defined in (guix import texlive).
(define (unzip-command . args)
"Execute \"unzip\" command with arguments ARGS, provided as strings, and
return its output as a string. Raise an error if the command execution did
not succeed."
(define unzip
;; Resolve this variable lazily so that (gnu packages ...) does not end up
;; in the closure of this module.
(module-ref (resolve-interface '(gnu packages compression))
'unzip))
(let ((unzip-cmd
(or (which "unzip")
(with-store store
(run-with-store store
(mlet* %store-monad
((drv (lower-object unzip))
(built (built-derivations (list drv))))
(return (string-append (derivation->output-path drv) "/bin/unzip"))))))))
(system* (string-append unzip-cmd (string-join args " " 'prefix)))))
(define (parse-requires.txt requires.txt)
"Given REQUIRES.TXT, a path to a Setuptools requires.txt file, return a list
of lists of requirements.
@ -371,7 +396,7 @@ be extracted in a temporary directory."
(if (zero?
(parameterize ((current-error-port (%make-void-port "rw+"))
(current-output-port (%make-void-port "rw+")))
(system* "unzip" wheel-archive "-d" dir metadata)))
(unzip-command wheel-archive "-d" dir metadata)))
(parse-wheel-metadata (string-append dir "/" metadata))
(begin
(warning
@ -431,7 +456,7 @@ no requires.txt file found.~%"))
(parameterize ((current-error-port (%make-void-port "rw+"))
(current-output-port (%make-void-port "rw+")))
(if (string=? "zip" (file-extension source-url))
(invoke "unzip" archive "-d" dir)
(unzip-command archive "-d" dir)
(invoke "tar" "xf" archive "-C" dir)))
(list (guess-requirements-from-pyproject.toml dir)
(guess-requirements-from-requires.txt dir))))