diff options
| author | Marius Bakke <[email protected]> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/check.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/check.scm')
| -rw-r--r-- | gnu/packages/check.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4e82da869e..739870dc77 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -431,6 +431,7 @@ a multi-paradigm automated test framework for C++ and Objective-C.") (uri (git-reference (url "git://git.liw.fi/cmdtest/") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1yhcwsqcpckkq5kw3h07k0xg6infyiyzq9ni3nqphrzxis7hxjf1")))) @@ -697,8 +698,8 @@ generation.") (license license:bsd-3))) (define-public googletest-1.8 - (package/inherit - googletest + (package + (inherit googletest) (version "1.8.1") (source (origin (method git-fetch) @@ -1144,8 +1145,8 @@ contacting the real http server.") ;; python-bleach 3.1.0 requires this ancient version of pytest-runner. ;; Remove once no longer needed. (define-public python-pytest-runner-2 - (package/inherit - python-pytest-runner + (package + (inherit python-pytest-runner) (version "2.12.2") (source (origin (method url-fetch) |