From e36058634d1754ab6d69f01a448efd691c2a1637 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 12:47:38 +0200 Subject: gnu: python-hdf4: Use INVOKE. * gnu/packages/python.scm (python-hdf4)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6927924a68..b8521fa0e4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -767,8 +767,8 @@ and verifies that it matches the intended target hostname.") (setenv "PYTHONPATH" (string-append (getcwd) ":" (getenv "PYTHONPATH"))) - (and (zero? (system* "./runexamples.sh")) - (zero? (system* "nosetests" "-v")))))))) + (invoke "./runexamples.sh") + (invoke "nosetests" "-v")))))) (home-page "https://github.com/fhs/python-hdf4") (synopsis "Python interface to the NCSA HDF4 library") (description -- cgit v1.3 From a1d6610e84f4ff61913e1e861093b38c2beb9614 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 12:58:02 +0200 Subject: gnu: python-rencode: Update to 1.0.5. * gnu/packages/python.scm (python-rencode): Update to 1.0.5. [arguments]: Add a 'delete-bogus-test' phase. --- gnu/packages/python.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b8521fa0e4..64ee4e028e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12456,15 +12456,24 @@ library.") (define-public python-rencode (package (name "python-rencode") - (version "1.0.3") + (version "1.0.5") (source (origin (method url-fetch) (uri (pypi-uri "rencode" version)) (sha256 (base32 - "08if5yax1xn5yfp8p3765ccjmfcv9di7i4m5jckgnwvdsgznwkbj")))) + "0mzwdq1is7kyyr32i5k4iz6g5xxdvmiyc132jnc60p9m6lnwjrpv")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'delete-bogus-test + ;; This test requires /home/aresch/Downloads, which is not provided by + ;; the build environment. + (lambda _ + (delete-file "rencode/t.py") + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("python-cython" ,python-cython))) (home-page "https://github.com/aresch/rencode") -- cgit v1.3 From 41e551b2d3ea24ffd96023d1b6c3648de3aac90d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 14:00:53 +0200 Subject: gnu: python-pyparsing: Update home page. * gnu/packages/python.scm (python-pyparsing)[home-page]: Update. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 64ee4e028e..a11c7e315e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3382,7 +3382,7 @@ library, libgit2 implements Git plumbing.") (list "docs" "htmldoc" "examples") (list doc html-doc examples)) #t)))))) - (home-page "http://pyparsing.wikispaces.com") + (home-page "https://github.com/pyparsing/pyparsing") (synopsis "Python parsing class library") (description "The pyparsing module is an alternative approach to creating and -- cgit v1.3 From 199d72e32759b0b0a0514d1bb667f0f1f2a6cbb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 14:26:30 +0200 Subject: gnu: python-pyparsing: Update to 2.2.1. * gnu/packages/python.scm (python-pyparsing): Update to 2.2.1. [source]: Use PYPI-URI. --- gnu/packages/python.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a11c7e315e..26829f050e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3350,16 +3350,13 @@ library, libgit2 implements Git plumbing.") (define-public python-pyparsing (package (name "python-pyparsing") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/pyparsing/pyparsing" - "/pyparsing-" version - "/pyparsing-" version ".tar.gz")) + (uri (pypi-uri "pyparsing" version)) (sha256 - (base32 - "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8")))) + (base32 "06dgd0iilvf8m0ssmfpcbh8l6jf0zkp8adbb84llksg17crfx4zl")))) (build-system python-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.3 From 3715e79ec8a310a0a957105b57d58b178f2f9d1a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 20:10:13 +0200 Subject: gnu: python-marshmallow: Update to 3.0.0b14. * gnu/packages/python.scm (python-marshmallow): Update to 3.0.0b14. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 26829f050e..30bde632fb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12179,14 +12179,14 @@ address is valid and really exists.") (define-public python-marshmallow (package (name "python-marshmallow") - (version "3.0.0b3") + (version "3.0.0b14") (source (origin (method url-fetch) (uri (pypi-uri "marshmallow" version)) (sha256 (base32 - "07mcrij1yvk85lvgx44wwr9pc80xryghvlgayb057g1cazcypysd")))) + "1digk3f5cfk7wmlka65mc7bzsd96pbsgcsvp6pimd5b4ff9zb5p3")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) -- cgit v1.3 From 68cbec027e8e48f1047b7cb1bfdd9b0dd65937ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 23:58:51 +0200 Subject: gnu: python-decorator: Update to 4.3.0. * gnu/packages/python.scm (python-decorator): Update to 4.3.0. [arguments]: Run the test suite. --- gnu/packages/python.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 30bde632fb..0bd8086473 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4340,15 +4340,14 @@ PNG, PostScript, PDF, and SVG file output.") (define-public python-decorator (package (name "python-decorator") - (version "4.2.1") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "decorator" version)) (sha256 - (base32 "03iaf116rm3w8b4agb8hzf6z9331mrvi4khfxq35zkx17sgxsikx")))) + (base32 "0308djallnh00v112y5b7nadl657ysmkp6vc8xn51d6yzc9zm7n3")))) (build-system python-build-system) - (arguments '(#:tests? #f)) ; no test target (home-page "https://pypi.python.org/pypi/decorator/") (synopsis "Python module to simplify usage of decorators") (description -- cgit v1.3 From dd29bd4ebcbfcdcb4c62e2c6c5cf4fd54c74af3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:12:59 +0200 Subject: gnu: python-networkx: Update to 2.2. * gnu/packages/python.scm (python-networkx): Update to 2.2. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0bd8086473..69d87c6e17 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5194,15 +5194,15 @@ interfaces in an easy and portable manner.") (define-public python-networkx (package (name "python-networkx") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) (uri (pypi-uri "networkx" version ".zip")) (sha256 - (base32 "1ccb8mfz4m821k9y0cigkbq42q2sbb4dj5fbjshp0awp32j2q9v4")))) + (base32 "12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5")))) (build-system python-build-system) - ;; python-decorator is needed at runtime + ;; python-decorator is needed at runtime. (propagated-inputs `(("python-decorator" ,python-decorator))) (native-inputs -- cgit v1.3 From cd8aa06093f6491edc17b65608d1f528742f11a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:15:18 +0200 Subject: gnu: python-networkx: Use HTTPS home page. * gnu/packages/python.scm (python-networkx)[home-page]: Use HTTPS. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 69d87c6e17..ea641b8213 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5208,7 +5208,7 @@ interfaces in an easy and portable manner.") (native-inputs `(("python-nose" ,python-nose) ("unzip" ,unzip))) - (home-page "http://networkx.github.io/") + (home-page "https://networkx.github.io/") (synopsis "Python module for creating and manipulating graphs and networks") (description "NetworkX is a Python package for the creation, manipulation, and study -- cgit v1.3 From bbc69023d86f5bd4ffec994453e5bdfbf5c429f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:13:01 +0200 Subject: gnu: Add python-semantic-version. * gnu/packages/python.scm (python-semantic-version) (python2-semantic-version): New public variables. --- gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ea641b8213..86ce70254d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -907,6 +907,34 @@ API for locking files.") (define-public python2-lockfile (package-with-python2 python-lockfile)) +(define-public python-semantic-version + (package + (name "python-semantic-version") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "semantic_version" version)) + (sha256 + (base32 + "1h2l9xyg1zzsda6kjcmfcgycbvrafwci283vcr1v5sbk01l2hhra")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; PyPI tarball lacks tests + (home-page "https://github.com/rbarrois/python-semanticversion") + (synopsis "Semantic versioning module for Python") + (description + "The @code{semantic_version} class is a small library for handling +@uref{https://semver.org/, semantic versioning} (@dfn{SemVer}) in Python. + +It can compare versions, generate a new version that represents a bump in one of +the version levels, and check whether any given string is a proper semantic +version identifier.") + (license license:bsd-3))) + +(define-public python2-semantic-version + (package-with-python2 python-semantic-version)) + (define-public python-setuptools (package (name "python-setuptools") -- cgit v1.3 From 06e6b17bd7ab0258536c62c3639fba38134d84ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:14:58 +0200 Subject: gnu: python-pexpect: Use INVOKE. * gnu/packages/python.scm (python-pexpect)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 86ce70254d..5c6c79da88 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4550,7 +4550,7 @@ displayed.") ;; Why does it not work? Delete for now. (delete-file "tests/test_socket.py") #t)) - (replace 'check (lambda _ (zero? (system* "nosetests" "-v"))))))) + (replace 'check (lambda _ (invoke "nosetests" "-v")))))) (native-inputs `(("python-nose" ,python-nose) ("python-pytest" ,python-pytest) -- cgit v1.3 From b733dbc0fb5bd1648f1fdce6471f048886e69e73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:15:37 +0200 Subject: gnu: python-setproctitle: Use INVOKE. * gnu/packages/python.scm (python-setproctitle)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5c6c79da88..4703d95a2d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10482,7 +10482,7 @@ theme for the Sphinx documentation system. It's the default theme of Sphinx.") (setenv "CC" "gcc") ;; No need to extend PYTHONPATH to find the built package, since ;; the Makefile will build anyway - (zero? (system* "make" "check"))))))) + (invoke "make" "check")))))) (native-inputs `(("procps" ,procps))) ; required for tests (home-page -- cgit v1.3 From 402561ccefd5367ec878461cc088b533993ba0b7 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 4 Oct 2018 15:48:04 +1000 Subject: gnu: python2-backports-functools-lru-cache: Update to 1.5. * gnu/packages/python.scm (python2-backports-functools-lru-cache): Update to 1.5. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4703d95a2d..6a2bd6e8f5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11418,7 +11418,7 @@ editors.") (define-public python2-backports-functools-lru-cache (package (name "python2-backports-functools-lru-cache") - (version "1.3") + (version "1.5") (source (origin (method url-fetch) @@ -11426,7 +11426,7 @@ editors.") (uri (pypi-uri "backports.functools_lru_cache" version)) (sha256 (base32 - "158ysf2hb0q4p4695abfiym9x1ywg0dgh8a3apd7gqaaxjy22jj4")))) + "06jgv8gib4fhky0p5cmxdghvsgjyzcdgk48k8pxb1ccf11znk64x")))) (build-system python-build-system) (native-inputs `(("python2-setuptools-scm" ,python2-setuptools-scm))) -- cgit v1.3 From fd15eb286e9b2effaf19a65e17e9e0e6d19b2111 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Oct 2018 20:44:56 +0300 Subject: gnu: python-more-itertools: Fix building on 32-bit architectures. * gnu/packages/python.scm (python-more-itertools)[arguments]: Add a custom phase to prevent overflowing on 32-bit architectures. --- gnu/packages/python.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d63e263e3c..1667f4801b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -142,7 +142,8 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (guix build-system trivial) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26)) (define-public python-2.7 (package @@ -13550,6 +13551,20 @@ file system events on Linux.") (base32 "17h3na0rdh8xq30w4b9pizgkdxmm51896bxw600x84jflg9vaxn4")))) (build-system python-build-system) + (arguments + `(,@(if (any (cute string-prefix? <> (or (%current-system) + (%current-target-system))) + '("armhf" "i686")) + '(#:phases + (modify-phases %standard-phases + ;; This is required for 32-bit hardware. + ;; TODO: Try to remove this when upgrading. + (add-after 'unpack 'patch-test + (lambda _ + (substitute* "more_itertools/tests/test_more.py" + (("10 \\*\\* 10") "9 ** 9")) + #t)))) + '()))) (propagated-inputs `(("python-six" ,python-six-bootstrap))) (home-page "https://github.com/erikrose/more-itertools") -- cgit v1.3 From 3c4d307e8697c36ebb9df939a5d2f0d905cc5474 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Oct 2018 23:19:20 -0400 Subject: gnu: python-icalendar: Update to 4.0.2. * gnu/packages/python.scm (python-icalendar: Update to 4.0.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6a2bd6e8f5..35262a2c77 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7576,13 +7576,13 @@ minimal and fast API targeting the following uses: (define-public python-icalendar (package (name "python-icalendar") - (version "4.0.1") + (version "4.0.2") (source (origin (method url-fetch) (uri (pypi-uri "icalendar" version)) (sha256 (base32 - "139y79y6ijl39m5bj771r43vpah9s4ly7d1k76la6hrx7l144ak8")))) + "13003kw2vbas1ha146vv3x2rdg9k7w38rdzxj63vi1i67jgjldl0")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) -- cgit v1.3 From d7814696b884a7c5e4a58f539ece53f4998689a3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Oct 2018 23:38:01 -0400 Subject: gnu: python-configargparse: Use pypi-uri. * gnu/packages/python.scm (python-configargparse, python2-configargparse)[source]: Use pypi-uri. --- gnu/packages/python.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 35262a2c77..29371d0494 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7353,9 +7353,7 @@ config files.") (version "0.12.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.io/packages/source/C/ConfigArgParse/" - "ConfigArgParse-" version ".tar.gz")) + (uri (pypi-uri "ConfigArgParse" version)) (sha256 (base32 "0fgkiqh6r3rbkdq3k8c48m85g52k96686rw3a6jg4lcncrkpvk98")))) -- cgit v1.3 From 0731fc1ce7f397724708f4956e6bdeb9c01c6762 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Aug 2018 00:05:07 -0400 Subject: gnu: python-mimeparse: Update to 1.6.0. * gnu/packages/python.scm (python-mimeparse): Update to 1.6.0. [phases]: Enable tests with a custom check phase. --- gnu/packages/python.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 29371d0494..8261fefd93 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1699,7 +1699,7 @@ software.") (define-public python-mimeparse (package (name "python-mimeparse") - (version "0.1.4") + (version "1.6.0") (source (origin (method url-fetch) @@ -1708,10 +1708,14 @@ software.") version ".tar.gz")) (sha256 (base32 - "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w")))) + "0y2g6cl660bpz11srgqyvvm8gmywpgyx8g0xfvbiyr0af0yv1r3n")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; no setup.py test command + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "./mimeparse_test.py")))))) (home-page "https://github.com/dbtsai/python-mimeparse") (synopsis "Python library for parsing MIME types") -- cgit v1.3 From fb3ff265cd8c6b4c6160f94240dc8932097e637b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Oct 2018 11:17:26 +0300 Subject: gnu: python-icalendar: Update to 4.0.3. * gnu/packages/python.scm (python-icalendar): Update to 4.0.3. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1667f4801b..2e88b0bc51 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7475,13 +7475,13 @@ minimal and fast API targeting the following uses: (define-public python-icalendar (package (name "python-icalendar") - (version "4.0.1") + (version "4.0.3") (source (origin (method url-fetch) (uri (pypi-uri "icalendar" version)) (sha256 (base32 - "139y79y6ijl39m5bj771r43vpah9s4ly7d1k76la6hrx7l144ak8")))) + "0mk3dk1dxkcm46jy48v27j2w2349iv4sbimqj1yb5js43mx49hh7")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) -- cgit v1.3 From 90aeaee861845142843a0f988fa4ff016c723cdb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Oct 2018 16:47:05 +0200 Subject: gnu: python: Fix CVE-2018-14647. * gnu/packages/patches/python-CVE-2018-14647.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/python.scm (python-3/fixed): New variable. (python-3.6)[replacement]: New field. (python-minimal, python-debug, wrap-python3): Use PACKAGE/INHERIT instead of standard inheritance. --- gnu/local.mk | 1 + gnu/packages/patches/python-CVE-2018-14647.patch | 61 ++++++++++++++++++++++++ gnu/packages/python.scm | 26 ++++++++-- 3 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/python-CVE-2018-14647.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu/local.mk b/gnu/local.mk index b8248e8da0..d30bbedee6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1076,6 +1076,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-deterministic-build-info.patch \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ + %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-fix-tests.patch \ diff --git a/gnu/packages/patches/python-CVE-2018-14647.patch b/gnu/packages/patches/python-CVE-2018-14647.patch new file mode 100644 index 0000000000..24f8d21820 --- /dev/null +++ b/gnu/packages/patches/python-CVE-2018-14647.patch @@ -0,0 +1,61 @@ +Fix CVE-2018-14647: +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14647 +https://bugs.python.org/issue34623 + +Taken from upstream: +https://github.com/python/cpython/commit/f7666e828cc3d5873136473ea36ba2013d624fa1 + +diff --git Include/pyexpat.h Include/pyexpat.h +index 44259bf6d7..07020b5dc9 100644 +--- Include/pyexpat.h ++++ Include/pyexpat.h +@@ -3,7 +3,7 @@ + + /* note: you must import expat.h before importing this module! */ + +-#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0" ++#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.1" + #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" + + struct PyExpat_CAPI +@@ -48,6 +48,8 @@ struct PyExpat_CAPI + enum XML_Status (*SetEncoding)(XML_Parser parser, const XML_Char *encoding); + int (*DefaultUnknownEncodingHandler)( + void *encodingHandlerData, const XML_Char *name, XML_Encoding *info); ++ /* might be none for expat < 2.1.0 */ ++ int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt); + /* always add new stuff to the end! */ + }; + +diff --git Modules/_elementtree.c Modules/_elementtree.c +index 707ab2912b..53f05f937f 100644 +--- Modules/_elementtree.c ++++ Modules/_elementtree.c +@@ -3261,6 +3261,11 @@ _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *html, + PyErr_NoMemory(); + return -1; + } ++ /* expat < 2.1.0 has no XML_SetHashSalt() */ ++ if (EXPAT(SetHashSalt) != NULL) { ++ EXPAT(SetHashSalt)(self->parser, ++ (unsigned long)_Py_HashSecret.expat.hashsalt); ++ } + + if (target) { + Py_INCREF(target); +diff --git Modules/pyexpat.c Modules/pyexpat.c +index 47c3e86c20..aa21d93c11 100644 +--- Modules/pyexpat.c ++++ Modules/pyexpat.c +@@ -1887,6 +1887,11 @@ MODULE_INITFUNC(void) + capi.SetStartDoctypeDeclHandler = XML_SetStartDoctypeDeclHandler; + capi.SetEncoding = XML_SetEncoding; + capi.DefaultUnknownEncodingHandler = PyUnknownEncodingHandler; ++#if XML_COMBINED_VERSION >= 20100 ++ capi.SetHashSalt = XML_SetHashSalt; ++#else ++ capi.SetHashSalt = NULL; ++#endif + + /* export using capsule */ + capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL); diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8261fefd93..3e39866087 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -357,6 +357,7 @@ data types.") (package (inherit python-2) (name "python") (version "3.6.5") + (replacement python-3/fixed) (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -456,6 +457,24 @@ data types.") ;; Current 3.x version. (define-public python-3 python-3.6) +(define python-3/fixed + (package + (inherit python-3) + (source (origin + (inherit (package-source python-3)) + (patches (append (origin-patches (package-source python-3)) + (search-patches "python-CVE-2018-14647.patch"))))) + (arguments + (substitute-keyword-arguments (package-arguments python-3) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'delete-broken-test + (lambda _ + ;; Delete test which fails on recent kernels: + ;; . + (delete-file "Lib/test/test_socket.py") + #t)))))))) + ;; Current major version. (define-public python python-3) @@ -474,7 +493,7 @@ data types.") ("zlib" ,zlib))))) (define-public python-minimal - (package (inherit python) + (package/inherit python (name "python-minimal") (outputs '("out")) @@ -486,8 +505,7 @@ data types.") ("zlib" ,zlib))))) (define-public python-debug - (package - (inherit python) + (package/inherit python (name "python-debug") (outputs '("out" "debug")) (build-system gnu-build-system) @@ -506,7 +524,7 @@ for more information."))) (define* (wrap-python3 python #:optional (name (string-append (package-name python) "-wrapper"))) - (package (inherit python) + (package/inherit python (name name) (source #f) (build-system trivial-build-system) -- cgit v1.3 From a55ebe2e3a7b438b4eec06c594440d3a0fb06a25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Oct 2018 18:50:47 +0200 Subject: gnu: python2: Add upstream security fixes. This addresses CVE-2018-{1060,1061,14647,1000802}. * gnu/packages/patches/python2-CVE-2018-1000802.patch, gnu/packages/patches/python2-CVE-2018-1060.patch, gnu/packages/patches/python2-CVE-2018-1061.patch, gnu/packages/patches/python2-CVE-2018-14647.patch: New files. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/python.scm (python-2/fixed): New variable. (python-2.7)[replacement]: New field. (python2-minimal): Use PACKAGE/INHERIT. --- gnu/local.mk | 4 ++ .../patches/python2-CVE-2018-1000802.patch | 47 +++++++++++++++++ gnu/packages/patches/python2-CVE-2018-1060.patch | 20 +++++++ gnu/packages/patches/python2-CVE-2018-1061.patch | 20 +++++++ gnu/packages/patches/python2-CVE-2018-14647.patch | 61 ++++++++++++++++++++++ gnu/packages/python.scm | 15 +++++- 6 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python2-CVE-2018-1000802.patch create mode 100644 gnu/packages/patches/python2-CVE-2018-1060.patch create mode 100644 gnu/packages/patches/python2-CVE-2018-1061.patch create mode 100644 gnu/packages/patches/python2-CVE-2018-14647.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu/local.mk b/gnu/local.mk index d30bbedee6..402505e229 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1068,6 +1068,10 @@ dist_patch_DATA = \ %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ %D%/packages/patches/pyqt-configure.patch \ %D%/packages/patches/pyqt-public-sip.patch \ + %D%/packages/patches/python2-CVE-2018-1060.patch \ + %D%/packages/patches/python2-CVE-2018-1061.patch \ + %D%/packages/patches/python2-CVE-2018-14647.patch \ + %D%/packages/patches/python2-CVE-2018-1000802.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ %D%/packages/patches/python-2.7-adjust-tests.patch \ %D%/packages/patches/python-2.7-search-paths.patch \ diff --git a/gnu/packages/patches/python2-CVE-2018-1000802.patch b/gnu/packages/patches/python2-CVE-2018-1000802.patch new file mode 100644 index 0000000000..0d5bc77c84 --- /dev/null +++ b/gnu/packages/patches/python2-CVE-2018-1000802.patch @@ -0,0 +1,47 @@ +Fix CVE-2018-1000802: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000802 + +Taken from upstream commit (sans NEWS): +https://github.com/python/cpython/commit/d8b103b8b3ef9644805341216963a64098642435 + +diff --git a/Lib/shutil.py b/Lib/shutil.py +index 3462f7c5e9..0ab1a06f52 100644 +--- a/Lib/shutil.py ++++ b/Lib/shutil.py +@@ -413,17 +413,21 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0, + + return archive_name + +-def _call_external_zip(base_dir, zip_filename, verbose=False, dry_run=False): ++def _call_external_zip(base_dir, zip_filename, verbose, dry_run, logger): + # XXX see if we want to keep an external call here + if verbose: + zipoptions = "-r" + else: + zipoptions = "-rq" +- from distutils.errors import DistutilsExecError +- from distutils.spawn import spawn ++ cmd = ["zip", zipoptions, zip_filename, base_dir] ++ if logger is not None: ++ logger.info(' '.join(cmd)) ++ if dry_run: ++ return ++ import subprocess + try: +- spawn(["zip", zipoptions, zip_filename, base_dir], dry_run=dry_run) +- except DistutilsExecError: ++ subprocess.check_call(cmd) ++ except subprocess.CalledProcessError: + # XXX really should distinguish between "couldn't find + # external 'zip' command" and "zip failed". + raise ExecError, \ +@@ -458,7 +462,7 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None): + zipfile = None + + if zipfile is None: +- _call_external_zip(base_dir, zip_filename, verbose, dry_run) ++ _call_external_zip(base_dir, zip_filename, verbose, dry_run, logger) + else: + if logger is not None: + logger.info("creating '%s' and adding '%s' to it", diff --git a/gnu/packages/patches/python2-CVE-2018-1060.patch b/gnu/packages/patches/python2-CVE-2018-1060.patch new file mode 100644 index 0000000000..5eb7ccfbc9 --- /dev/null +++ b/gnu/packages/patches/python2-CVE-2018-1060.patch @@ -0,0 +1,20 @@ +Fix CVE-2018-1060: +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1060 + +Taken from upstream commit (sans test and NEWS): +https://github.com/python/cpython/commit/e052d40cea15f582b50947f7d906b39744dc62a2 + +diff --git a/Lib/poplib.py b/Lib/poplib.py +index b91e5f72d2ca..a238510b38fc 100644 +--- a/Lib/poplib.py ++++ b/Lib/poplib.py +@@ -274,7 +274,7 @@ def rpop(self, user): + return self._shortcmd('RPOP %s' % user) + + +- timestamp = re.compile(r'\+OK.*(<[^>]+>)') ++ timestamp = re.compile(br'\+OK.[^<]*(<.*>)') + + def apop(self, user, secret): + """Authorisation + diff --git a/gnu/packages/patches/python2-CVE-2018-1061.patch b/gnu/packages/patches/python2-CVE-2018-1061.patch new file mode 100644 index 0000000000..6caab24b4d --- /dev/null +++ b/gnu/packages/patches/python2-CVE-2018-1061.patch @@ -0,0 +1,20 @@ +Fix CVE-2018-1061: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1061 + +Taken from upstream commit (sans test and NEWS): +https://github.com/python/cpython/commit/e052d40cea15f582b50947f7d906b39744dc62a2 + +diff --git a/Lib/difflib.py b/Lib/difflib.py +index 1c6fbdbedcb7..788a92df3f89 100644 +--- a/Lib/difflib.py ++++ b/Lib/difflib.py +@@ -1103,7 +1103,7 @@ def _qformat(self, aline, bline, atags, btags): + + import re + +-def IS_LINE_JUNK(line, pat=re.compile(r"\s*#?\s*$").match): ++def IS_LINE_JUNK(line, pat=re.compile(r"\s*(?:#\s*)?$").match): + r""" + Return 1 for ignorable line: iff `line` is blank or contains a single '#'. + diff --git a/gnu/packages/patches/python2-CVE-2018-14647.patch b/gnu/packages/patches/python2-CVE-2018-14647.patch new file mode 100644 index 0000000000..6226b06aca --- /dev/null +++ b/gnu/packages/patches/python2-CVE-2018-14647.patch @@ -0,0 +1,61 @@ +Fix CVE-2018-14647: +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14647 +https://bugs.python.org/issue34623 + +Taken from upstream: +https://github.com/python/cpython/commit/18b20bad75b4ff0486940fba4ec680e96e70f3a2 + +diff --git a/Include/pyexpat.h b/Include/pyexpat.h +index 5340ef5fa3..3fc5fa54da 100644 +--- a/Include/pyexpat.h ++++ b/Include/pyexpat.h +@@ -3,7 +3,7 @@ + + /* note: you must import expat.h before importing this module! */ + +-#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0" ++#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.1" + #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" + + struct PyExpat_CAPI +@@ -43,6 +43,8 @@ struct PyExpat_CAPI + XML_Parser parser, XML_UnknownEncodingHandler handler, + void *encodingHandlerData); + void (*SetUserData)(XML_Parser parser, void *userData); ++ /* might be none for expat < 2.1.0 */ ++ int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt); + /* always add new stuff to the end! */ + }; + +diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c +index f7f992dd3a..b38e0ab329 100644 +--- a/Modules/_elementtree.c ++++ b/Modules/_elementtree.c +@@ -2574,6 +2574,11 @@ xmlparser(PyObject* self_, PyObject* args, PyObject* kw) + PyErr_NoMemory(); + return NULL; + } ++ /* expat < 2.1.0 has no XML_SetHashSalt() */ ++ if (EXPAT(SetHashSalt) != NULL) { ++ EXPAT(SetHashSalt)(self->parser, ++ (unsigned long)_Py_HashSecret.prefix); ++ } + + ALLOC(sizeof(XMLParserObject), "create expatparser"); + +diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c +index 2b4d31293c..1f8c0d70a5 100644 +--- a/Modules/pyexpat.c ++++ b/Modules/pyexpat.c +@@ -2042,6 +2042,11 @@ MODULE_INITFUNC(void) + capi.SetProcessingInstructionHandler = XML_SetProcessingInstructionHandler; + capi.SetUnknownEncodingHandler = XML_SetUnknownEncodingHandler; + capi.SetUserData = XML_SetUserData; ++#if XML_COMBINED_VERSION >= 20100 ++ capi.SetHashSalt = XML_SetHashSalt; ++#else ++ capi.SetHashSalt = NULL; ++#endif + + /* export using capsule */ + capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL); diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3e39866087..e3a04b0344 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -148,6 +148,7 @@ (package (name "python2") (version "2.7.14") + (replacement python-2/fixed) (source (origin (method url-fetch) @@ -344,6 +345,18 @@ data types.") ;; Current 2.x version. (define-public python-2 python-2.7) +(define python-2/fixed + (package + (inherit python-2) + (source (origin + (inherit (package-source python-2)) + (patches (append + (origin-patches (package-source python-2)) + (search-patches "python2-CVE-2018-1060.patch" + "python2-CVE-2018-1061.patch" + "python2-CVE-2018-14647.patch" + "python2-CVE-2018-1000802.patch"))))))) + (define-public python2-called-python ;; Both 2.x and 3.x used to be called "python". In commit ;; a7714d42de2c3082f3609d1e63c83d703fb39cf9 (March 2018), we renamed the @@ -482,7 +495,7 @@ data types.") ;; Python (Tk -> libxcb -> Python.) (define-public python2-minimal - (package (inherit python-2) + (package/inherit python-2 (name "python2-minimal") (outputs '("out")) -- cgit v1.3 From 16f14f63db7a370d3917cf9c7d7e3735b0f59855 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Oct 2018 20:53:24 +0200 Subject: gnu: Python: Adjust grafts for core-updates merge. This adjust the grafts from a55ebe2e3a7b438b4eec06c594440d3a0fb06a25 and 90aeaee861845142843a0f988fa4ff016c723cdb to apply to Python 2.7.15 and 3.7.0. * gnu/packages/patches/python2-CVE-2018-1060.patch, gnu/packages/patches/python2-CVE-2018-1061.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/python.scm (python-2/fixed): Remove patches that are already present in 2.7.15. (python-3/fixed): Remove obsolete phase. --- gnu/local.mk | 2 -- gnu/packages/patches/python2-CVE-2018-1060.patch | 20 -------------------- gnu/packages/patches/python2-CVE-2018-1061.patch | 20 -------------------- gnu/packages/python.scm | 16 ++-------------- 4 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/python2-CVE-2018-1060.patch delete mode 100644 gnu/packages/patches/python2-CVE-2018-1061.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 1181210da5..8d4d0d26ea 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1068,8 +1068,6 @@ dist_patch_DATA = \ %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ %D%/packages/patches/pyqt-configure.patch \ %D%/packages/patches/pyqt-public-sip.patch \ - %D%/packages/patches/python2-CVE-2018-1060.patch \ - %D%/packages/patches/python2-CVE-2018-1061.patch \ %D%/packages/patches/python2-CVE-2018-14647.patch \ %D%/packages/patches/python2-CVE-2018-1000802.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ diff --git a/gnu/packages/patches/python2-CVE-2018-1060.patch b/gnu/packages/patches/python2-CVE-2018-1060.patch deleted file mode 100644 index 5eb7ccfbc9..0000000000 --- a/gnu/packages/patches/python2-CVE-2018-1060.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix CVE-2018-1060: -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1060 - -Taken from upstream commit (sans test and NEWS): -https://github.com/python/cpython/commit/e052d40cea15f582b50947f7d906b39744dc62a2 - -diff --git a/Lib/poplib.py b/Lib/poplib.py -index b91e5f72d2ca..a238510b38fc 100644 ---- a/Lib/poplib.py -+++ b/Lib/poplib.py -@@ -274,7 +274,7 @@ def rpop(self, user): - return self._shortcmd('RPOP %s' % user) - - -- timestamp = re.compile(r'\+OK.*(<[^>]+>)') -+ timestamp = re.compile(br'\+OK.[^<]*(<.*>)') - - def apop(self, user, secret): - """Authorisation - diff --git a/gnu/packages/patches/python2-CVE-2018-1061.patch b/gnu/packages/patches/python2-CVE-2018-1061.patch deleted file mode 100644 index 6caab24b4d..0000000000 --- a/gnu/packages/patches/python2-CVE-2018-1061.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix CVE-2018-1061: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1061 - -Taken from upstream commit (sans test and NEWS): -https://github.com/python/cpython/commit/e052d40cea15f582b50947f7d906b39744dc62a2 - -diff --git a/Lib/difflib.py b/Lib/difflib.py -index 1c6fbdbedcb7..788a92df3f89 100644 ---- a/Lib/difflib.py -+++ b/Lib/difflib.py -@@ -1103,7 +1103,7 @@ def _qformat(self, aline, bline, atags, btags): - - import re - --def IS_LINE_JUNK(line, pat=re.compile(r"\s*#?\s*$").match): -+def IS_LINE_JUNK(line, pat=re.compile(r"\s*(?:#\s*)?$").match): - r""" - Return 1 for ignorable line: iff `line` is blank or contains a single '#'. - diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 39ec96fd66..63cf440014 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -323,9 +323,7 @@ data types.") (inherit (package-source python-2)) (patches (append (origin-patches (package-source python-2)) - (search-patches "python2-CVE-2018-1060.patch" - "python2-CVE-2018-1061.patch" - "python2-CVE-2018-14647.patch" + (search-patches "python2-CVE-2018-14647.patch" "python2-CVE-2018-1000802.patch"))))))) (define-public python2-called-python @@ -419,17 +417,7 @@ data types.") (source (origin (inherit (package-source python-3)) (patches (append (origin-patches (package-source python-3)) - (search-patches "python-CVE-2018-14647.patch"))))) - (arguments - (substitute-keyword-arguments (package-arguments python-3) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'delete-broken-test - (lambda _ - ;; Delete test which fails on recent kernels: - ;; . - (delete-file "Lib/test/test_socket.py") - #t)))))))) + (search-patches "python-CVE-2018-14647.patch"))))))) ;; Current major version. (define-public python python-3) -- cgit v1.3 From 5fb543b3f7bf79208178429d38f2da047fc744c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Oct 2018 21:12:05 +0300 Subject: gnu: python-fonttools: Update to 3.30.0. * gnu/packages/python.scm (python-fonttools): Update to 3.30.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 63cf440014..56923c31c2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6072,13 +6072,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "0vsvjhidpb5kywpjgz1j3fywzkddxkb0afqai18qa3h6lqjyxwpb")))) + "1i6229ylm12klljqfg643rikzpcslqrj56qf4cydr0w1n4cnbs4m")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.3 From 1febc93f9b13155be7a212fcaf93d5dd181c8aea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Oct 2018 21:21:14 +0300 Subject: Revert "gnu: python-fonttools: Update to 3.30.0." This reverts commit 5fb543b3f7bf79208178429d38f2da047fc744c0. python2-fonttools has 2700 dependants, only the python3 version is failing. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 56923c31c2..63cf440014 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6072,13 +6072,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.30.0") + (version "3.28.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "1i6229ylm12klljqfg643rikzpcslqrj56qf4cydr0w1n4cnbs4m")))) + "0vsvjhidpb5kywpjgz1j3fywzkddxkb0afqai18qa3h6lqjyxwpb")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.3 From 227da3a4c5e8420927c1f69c6c87d7d2a62040fe Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 20 Oct 2018 18:24:23 +0300 Subject: gnu: python-glances: Update to 3.0.2. * gnu/packages/python.scm (python-glances): Update to 3.0.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e3a04b0344..29ce213afb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10246,14 +10246,14 @@ functionality in the command line.") (define-public python-glances (package (name "python-glances") - (version "2.7.1") + (version "3.0.2") (source (origin (method url-fetch) (uri (pypi-uri "Glances" version)) (sha256 (base32 - "11jbq40g8alsbirnd4kiagznqg270247i0m8qhi48ldf2i5xppxg")))) + "09fxysfp1n16csqvzvawy74qm6a94nvwjf3vcf5gkqp4i6k4vjjy")))) (build-system python-build-system) (propagated-inputs `(("python-psutil" ,python-psutil))) -- cgit v1.3 From e381ae317c054a8ac52037c3f0df72ca3c96b91f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Oct 2018 21:29:51 +0200 Subject: gnu: python2-bz2file: Inherit arguments from python-bzfile. * gnu/packages/python.scm (python-bz2file)[properties]: Remove field. (python2-bz2file): Use PACKAGE-WITH-PYTHON2. --- gnu/packages/python.scm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 63cf440014..c2987207f4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8806,23 +8806,10 @@ LDFLAGS and parse the output to build extensions with setup.py.") files. It contains a drop-in replacement for the I/O interface in the standard library's @code{bz2} module, including features from the latest development version of CPython that are not available in older releases.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-bz2file)))))) + (license license:asl2.0))) (define-public python2-bz2file - (let ((base (package-with-python2 - (strip-python2-variant python-bz2file)))) - (package - (inherit base) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - ;; 'python setup.py test' does not work as of 0.98. - ;; There is only the one test file, so we run it directly. - (replace 'check - (lambda _ (zero? (system* "python" - "test_bz2file.py")))))))))) + (package-with-python2 python-bz2file)) (define-public python-future (package -- cgit v1.3