From 7aa37aa033f33246f69c9dd8a58506b0977fba61 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 15 Mar 2018 12:09:21 +0100 Subject: gnu: cunit: Replace bootstrap phase. * gnu/packages/check.scm (cunit)[arguments]: Replace bootstrap phase. --- gnu/packages/check.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 73d3efd9e1..baebcb9b77 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 ng0 -;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Marius Bakke ;;; Copyright © 2017 Ludovic Courtès ;;; Copyright © 2018 Fis Trivial @@ -104,9 +104,11 @@ source code editors and IDEs.") (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + ;; XXX: The "bootstrap" phase detects the "bootstrap" + ;; script, but fails to execute it, so we bootstrap + ;; manually. + (replace 'bootstrap + (lambda _ (invoke "autoreconf" "-vfi")))))) (native-inputs `(("automake" ,automake) ("autoconf" ,autoconf) -- cgit v1.2.3 From e3cfef22c4a18cacf33356a70788503fd689b96d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 27 Mar 2018 20:14:05 -0400 Subject: gnu: Use invoke and return #t from all builders. * gnu/packages/admin.scm, gnu/packages/android.scm, gnu/packages/audio.scm, gnu/packages/avr.scm, gnu/packages/base.scm, gnu/packages/bioinformatics.scm, gnu/packages/certs.scm, gnu/packages/check.scm, gnu/packages/code.scm, gnu/packages/commencement.scm, gnu/packages/dictionaries.scm, gnu/packages/docbook.scm, gnu/packages/emacs.scm, gnu/packages/embedded.scm, gnu/packages/fonts.scm, gnu/packages/games.scm, gnu/packages/gnome.scm, gnu/packages/gnu-doc.scm, gnu/packages/guile.scm, gnu/packages/hurd.scm, gnu/packages/javascript.scm, gnu/packages/libreoffice.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm, gnu/packages/lxde.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/pkg-config.scm, gnu/packages/qt.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/sdl.scm, gnu/packages/statistics.scm, gnu/packages/syncthing.scm, gnu/packages/tex.scm, gnu/packages/web.scm, gnu/packages/wine.scm, gnu/packages/xfce.scm: In the builders of packages using 'trivial-build-system', use invoke where appropriate, raise exceptions on errors, and otherwise return #t. --- gnu/packages/check.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 1fe13127d2..9d3d036725 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -187,13 +187,13 @@ supervised tests.") (incdir (string-append output "/include")) (docdir (string-append output "/share/doc/catch-" ,version))) - (begin - (for-each mkdir-p (list incdir docdir)) - (install-file (string-append source - "/single_include/catch.hpp") - incdir) - (copy-recursively (string-append source "/docs") - docdir)))))) + (for-each mkdir-p (list incdir docdir)) + (install-file (string-append source + "/single_include/catch.hpp") + incdir) + (copy-recursively (string-append source "/docs") + docdir) + #t)))) (home-page "http://catch-lib.net/") (synopsis "Automated test framework for C++ and Objective-C") (description -- cgit v1.2.3 From b19a960f5fc0e98efd64828a0818be0724e5f3a6 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 28 Mar 2018 19:51:21 +0530 Subject: gnu: python-hypothesis: Update to 3.52.0. * gnu/packages/check.scm (python-hypothesis): Update to 3.52.0. [propagated-inputs]: Add python-attrs and python-coverage. [home-page]: Update URI. * gnu/packages/python.scm (python-attrs-bootstrap, python2-attrs-bootstrap): New variables. --- gnu/packages/check.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9d3d036725..e99d44a56a 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2018 Arun Isaac ;;; Copyright © 2017 Frederick M. Muriithi ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Kei Kebreau @@ -1358,23 +1358,26 @@ normally the case.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "3.1.0") + (version "3.52.0") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "0qyqq9akm4vshhn8cngjc1qykcvsn7cz6dlm6njfsgpbraqrmbbw")))) + "0g54cypfi5qj6cgxfr7l1nb41r1cqhhngx4qxn4ga9h720rcsbr8")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) ("python-pytest" ,python-pytest-bootstrap))) + (propagated-inputs + `(("python-attrs" ,python-attrs-bootstrap) + ("python-coverage" ,python-coverage))) (synopsis "Library for property based testing") (description "Hypothesis is a library for testing your Python code against a much larger range of examples than you would ever want to write by hand. It’s based on the Haskell library, Quickcheck, and is designed to integrate seamlessly into your existing Python unit testing work flow.") - (home-page "https://github.com/DRMacIver/hypothesis") + (home-page "https://github.com/HypothesisWorks/hypothesis-python") (license license:mpl2.0) (properties `((python2-variant . ,(delay python2-hypothesis)))))) -- cgit v1.2.3 From 7ad5c6dd78d74771d11b176913dc76735d44cb84 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 28 Mar 2018 21:46:23 +0530 Subject: gnu: python-pytest: Update to 3.5.0. * gnu/packages/python.scm (python-six): Replace system* with invoke. (python-six-bootstrap, python2-six-bootstrap, python2-funcsigs-bootstrap): New variables. (python-more-itertools)[propagated-inputs]: Replace python-six with python-six-bootstrap. * gnu/packages/check.scm (python-pytest): Update to 3.5.0. [propagated-inputs]: Add python-attrs-bootstrap, python-more-itertools-bootstrap, python-pluggy and python-six-bootstrap. [properties]: Add python2-variant. (python2-pytest)[propagated-inputs]: Add python2-funcsigs. (python-pytest-bootstrap)[properties]: Add python2-variant. (python2-pytest-bootstrap)[propagated-inputs]: Add python2-funcsigs-bootstrap. --- gnu/packages/check.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e99d44a56a..c214f8bf8e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -597,14 +597,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.2.3") + (version "3.5.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "0g6w86ks73fnrnsyib9ii2rbyx830vn7aglsjqz9v1n2xwbndyi7")))) + "1q832zd07zak2lyxbycxjydh0jp7y3hvawjqzlvra6aghz8r3r7s")))) (build-system python-build-system) (arguments `(#:phases @@ -622,7 +622,11 @@ standard library.") line))) #t))))) (propagated-inputs - `(("python-py" ,python-py))) + `(("python-attrs" ,python-attrs-bootstrap) + ("python-more-itertools" ,python-more-itertools) + ("python-pluggy" ,python-pluggy) + ("python-py" ,python-py) + ("python-six" ,python-six-bootstrap))) (native-inputs `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. ("bash" ,bash) @@ -636,20 +640,33 @@ standard library.") "Pytest is a testing tool that provides auto-discovery of test modules and functions, detailed info on failing assert statements, modular fixtures, and many external plugins.") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-pytest)))))) (define-public python2-pytest - (package-with-python2 python-pytest)) + (let ((pytest (package-with-python2 + (strip-python2-variant python-pytest)))) + (package + (inherit pytest) + (propagated-inputs + `(("python2-funcsigs" ,python2-funcsigs) + ,@(package-propagated-inputs pytest)))))) (define-public python-pytest-bootstrap (package - (inherit python-pytest) + (inherit (strip-python2-variant python-pytest)) (name "python-pytest-bootstrap") (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) - (arguments `(#:tests? #f)))) + (arguments `(#:tests? #f)) + (properties `((python2-variant . ,(delay python2-pytest-bootstrap)))))) (define-public python2-pytest-bootstrap - (package-with-python2 python-pytest-bootstrap)) + (let ((pytest (package-with-python2 + (strip-python2-variant python-pytest-bootstrap)))) + (package (inherit pytest) + (propagated-inputs + `(("python2-funcsigs" ,python2-funcsigs-bootstrap) + ,@(package-propagated-inputs pytest)))))) (define-public python-pytest-cov (package -- cgit v1.2.3 From 8cb3a0cf0aa40fb157474b95413e89635e10c466 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 2 May 2018 21:27:51 +0200 Subject: gnu: znc: Update to 1.7.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (znc): Update to 1.7.0. [native-inputs]: Replace GOOGLETEST source input with a newer git checkout. [arguments]: Adjust the ‘unpack-googletest’ phase accordingly. Add ‘--with-gmock=...’ to #:configure-flags. --- gnu/packages/check.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index ce46e34bfb..712e470fea 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -394,6 +394,8 @@ test coverage and has a web user interface that will refresh automatically.") (home-page "https://github.com/smartystreets/goconvey") (license license:expat))) +;; XXX When updating, check whether ZNC's GOOGLETEST-SOURCES can be +;; switched back to simply using (PACKAGE-SOURCE ...). (define-public googletest (package (name "googletest") -- cgit v1.2.3 From 56e72c0084f14c854502df4cbe69406a3a214416 Mon Sep 17 00:00:00 2001 From: Fis Trivial Date: Mon, 28 May 2018 08:08:33 +0000 Subject: gnu: Add catch-framework2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/check.scm (catch-framework2): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/check.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 712e470fea..b9c10e5df2 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -161,6 +161,8 @@ supervised tests.") (base32 "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix")))))) +;; When dependent packages upgraded to use newer version of catch, this one should +;; be removed. (define-public catch-framework (package (name "catch") @@ -199,6 +201,24 @@ supervised tests.") multi-paradigm automated test framework for C++ and Objective-C.") (license license:boost1.0))) +(define-public catch-framework2 + (package + (name "catch2") + (version "1.12.2") + (home-page "https://github.com/catchorg/Catch2") + (source (origin + (method url-fetch) + (uri (string-append home-page "/archive/v" version ".tar.gz")) + (sha256 + (base32 + "0g2ysxc6adqca5wh7nsicnxb9wkxg75cd5izjsl39rcj0v903gr7")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system cmake-build-system) + (synopsis "Automated test framework for C++ and Objective-C") + (description "Catch2 stands for C++ Automated Test Cases in Headers and is +a multi-paradigm automated test framework for C++ and Objective-C.") + (license license:boost1.0))) + (define-public cmdtest (package (name "cmdtest") -- cgit v1.2.3