From 9de33cc726cb4d050ea722ec6a8ceb7613d676a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 14:45:38 +0100 Subject: gnu: ruby-ffi: Update to 1.9.22. * gnu/packages/libffi.scm (ruby-ffi): Update to 1.9.22. --- gnu/packages/libffi.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libffi.scm') diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 948dabb41e..e5e4023450 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -152,13 +153,13 @@ conversions for values passed between the two languages.") (define-public ruby-ffi (package (name "ruby-ffi") - (version "1.9.18") + (version "1.9.22") (source (origin (method url-fetch) (uri (rubygems-uri "ffi" version)) (sha256 (base32 - "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0")))) + "17lvnpmllg4mlzf25lxbmfzk4l6rsddlxwwdkbs4d9v5gv154529")))) (build-system ruby-build-system) ;; FIXME: Before running tests the build system attempts to build libffi ;; from sources. -- cgit v1.2.3 From b737530569844d1538a45f209460fedc0edf7497 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 14:12:20 +0100 Subject: gnu: python-cffi: Update to 1.11.4. * gnu/packages/libffi.scm (python-cffi): Update to 1.11.4. --- gnu/packages/libffi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libffi.scm') diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index e5e4023450..e5e93eb916 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -80,13 +80,13 @@ conversions for values passed between the two languages.") (define-public python-cffi (package (name "python-cffi") - (version "1.11.2") + (version "1.11.4") (source (origin (method url-fetch) (uri (pypi-uri "cffi" version)) (sha256 - (base32 "19h0wwz9cww74gw8cyq0izj8zkhjyzjw2d3ks1c3f1y4q28xv1xb")))) + (base32 "07fiy4wqg8g08x38r04ydjr8n6g0g74gb8si8b6jhymijalq746z")))) (build-system python-build-system) (outputs '("out" "doc")) (inputs -- cgit v1.2.3 From fc38e317cde56897b575c5af2d7787d889323193 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 14:36:48 +0100 Subject: gnu: python-cffi: Update phase style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libffi.scm (python-cffi)[arguments]: Substitute INVOKE for SYSTEM*, end phases with #t, and remove unneeded bits from the ‘install-doc’ phase. --- gnu/packages/libffi.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/libffi.scm') diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index e5e93eb916..dd6b2237f9 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -122,7 +122,8 @@ conversions for values passed between the two languages.") "linker_so='gcc -shared')"))) (substitute* "testing/cffi0/test_ownlib.py" (("'cc testownlib") "'gcc testownlib")) - (zero? (system* "py.test" "-v" "c/" "testing/")))) + (invoke "py.test" "-v" "c/" "testing/") + #t)) (add-before 'check 'disable-failing-test ;; This is assumed to be a libffi issue: ;; https://bitbucket.org/cffi/cffi/issues/312/tests-failed-with-armv8 @@ -131,15 +132,14 @@ conversions for values passed between the two languages.") (("ret.left") "ownlib.left")) #t)) (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((data (string-append (assoc-ref outputs "doc") "/share")) - (doc (string-append data "/doc/" ,name "-" ,version)) + (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) + (let* ((doc (string-append (assoc-ref outputs "doc") + "/share/doc/" ,name "-" ,version)) (html (string-append doc "/html"))) (with-directory-excursion "doc" - (system* "make" "html") + (apply invoke "make" "html" make-flags) (mkdir-p html) (copy-recursively "build/html" html)) - (copy-file "LICENSE" (string-append doc "/LICENSE")) #t)))))) (home-page "https://cffi.readthedocs.org") (synopsis "Foreign function interface for Python") -- cgit v1.2.3