unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] gnu: pypi importer: Remove python-setuptools and hint on how to re-add it.
@ 2016-08-16 18:13 Danny Milosavljevic
  2016-08-16 19:21 ` ng0
  2016-08-16 19:59 ` Leo Famulari
  0 siblings, 2 replies; 5+ messages in thread
From: Danny Milosavljevic @ 2016-08-16 18:13 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

gnu: pypi importer: Remove python-setuptools and hint on how to re-add it.

* guix/import/pypi.scm (make-pypi-sexp): Modified.
---
 guix/import/pypi.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-pypi-importer-Remove-python-setuptools-and-hint-.patch --]
[-- Type: text/x-patch; name="0001-gnu-pypi-importer-Remove-python-setuptools-and-hint-.patch", Size: 1152 bytes --]

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 343445a..d177d33 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -233,7 +233,7 @@ name/variable pairs describing the required inputs of this package."
   (sort
     (map (lambda (input)
            (list input (list 'unquote (string->symbol input))))
-         (append '("python-setuptools")
+         (append ;'("python-setuptools")
                  ;; Argparse has been part of Python since 2.7.
                  (remove (cut string=? "python-argparse" <>)
                          (guess-requirements source-url wheel-url tarball))))
@@ -271,7 +271,8 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
              (home-page ,home-page)
              (synopsis ,synopsis)
              (description ,description)
-             (license ,(license->symbol license)))))))
+             (license ,(license->symbol license))
+             (properties `((python2-variant . ,(delay python2-foobar)))))))))
 
 (define (pypi->guix-package package-name)
   "Fetch the metadata for PACKAGE-NAME from pypi.python.org, and return the

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-08-16 20:00 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-16 18:13 [PATCH] gnu: pypi importer: Remove python-setuptools and hint on how to re-add it Danny Milosavljevic
2016-08-16 19:21 ` ng0
2016-08-16 19:39   ` Danny Milosavljevic
2016-08-16 19:42     ` Pjotr Prins
2016-08-16 19:59 ` Leo Famulari

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).