summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-07-03 01:22:52 +0200
committerMarius Bakke <mbakke@fastmail.com>2017-07-04 02:52:25 +0200
commit029933cf79daf9faed9160f58f390c3e7384a33e (patch)
treebf6306c6de60e74142b1262c286fb451e8eaa917
parent295f32f34b45d4df6c06d241d0ac1572ff5ed4cc (diff)
gnu: python-cffi: Update to 1.10.0.
* gnu/packages/python.scm (python-cffi): Update to 1.10.0. [arguments]<#:phases>: Patch distutils.ccompiler call to use "gcc". Patch another hard-coded cc invocation. Adjust `py.test` invocation per README.
-rw-r--r--gnu/packages/python.scm17
1 files changed, 14 insertions, 3 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a55cdafa259..d1902231b73 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4763,13 +4763,13 @@ a front-end for C compilers or analysis tools.")
4763(define-public python-cffi 4763(define-public python-cffi
4764 (package 4764 (package
4765 (name "python-cffi") 4765 (name "python-cffi")
4766 (version "1.4.2") 4766 (version "1.10.0")
4767 (source 4767 (source
4768 (origin 4768 (origin
4769 (method url-fetch) 4769 (method url-fetch)
4770 (uri (pypi-uri "cffi" version)) 4770 (uri (pypi-uri "cffi" version))
4771 (sha256 4771 (sha256
4772 (base32 "161rj52rzi3880lij17d6i9kvgkiwjilrqjs8405k8sf6ryif7cg")))) 4772 (base32 "1mffyilq4qycm8gs4wkgb18rnqil8a9blqq77chdlshzxc8jkc5k"))))
4773 (build-system python-build-system) 4773 (build-system python-build-system)
4774 (outputs '("out" "doc")) 4774 (outputs '("out" "doc"))
4775 (inputs 4775 (inputs
@@ -4794,7 +4794,18 @@ a front-end for C compilers or analysis tools.")
4794 (getenv "PYTHONPATH") 4794 (getenv "PYTHONPATH")
4795 ":" (getcwd) "/build/" 4795 ":" (getcwd) "/build/"
4796 (car (scandir "build" (cut string-prefix? "lib." <>))))) 4796 (car (scandir "build" (cut string-prefix? "lib." <>)))))
4797 (zero? (system* "py.test" "-v")))) 4797
4798 ;; XXX The "normal" approach of setting CC and friends does
4799 ;; not work here. Is this the correct way of doing things?
4800 (substitute* "testing/embedding/test_basic.py"
4801 (("c = distutils\\.ccompiler\\.new_compiler\\(\\)")
4802 (string-append "c = distutils.ccompiler.new_compiler();"
4803 "c.set_executables(compiler='gcc',"
4804 "compiler_so='gcc',linker_exe='gcc',"
4805 "linker_so='gcc -shared')")))
4806 (substitute* "testing/cffi0/test_ownlib.py"
4807 (("'cc testownlib") "'gcc testownlib"))
4808 (zero? (system* "py.test" "-v" "c/" "testing/"))))
4798 (add-after 'install 'install-doc 4809 (add-after 'install 'install-doc
4799 (lambda* (#:key outputs #:allow-other-keys) 4810 (lambda* (#:key outputs #:allow-other-keys)
4800 (let* ((data (string-append (assoc-ref outputs "doc") "/share")) 4811 (let* ((data (string-append (assoc-ref outputs "doc") "/share"))