diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-03-02 10:37:28 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-03-02 10:55:08 +0000 |
| commit | 7df09ee0ab3e7962ef27859ce87e06a323059284 (patch) | |
| tree | d81334f742ddcb9a1ee63961ca6410922980af1c /gnu/packages/matrix.scm | |
| parent | 2ac51ec99b58b50c08ba719a8c7e9dba0330b065 (diff) | |
| parent | af95f2d8f98eb2c8c64954bb2fd0b70838899174 (diff) | |
Merge remote-tracking branch 'savannah/master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/autotools.scm
gnu/packages/cmake.scm
gnu/packages/gnuzilla.scm
gnu/packages/haskell.scm
gnu/packages/pdf.scm
gnu/packages/python-xyz.scm
gnu/packages/samba.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/wxwidgets.scm
Diffstat (limited to 'gnu/packages/matrix.scm')
| -rw-r--r-- | gnu/packages/matrix.scm | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 2642de2438..7086482ef8 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages xml) #:use-module (guix build-system python) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages)) @@ -248,20 +249,28 @@ fledged batteries-included asyncio layer using aiohttp.") "16ask8v00654q307c55q5gnm8hrj40gibpab5zl52v4i0bgl9j68")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'downgrade-appdirs-requirement - (lambda _ - (substitute* "setup.py" - ;; FIXME: Remove this once appdirs is updated. - ;; Upgrading python-appdirs requires rebuilting 3000+ packages, - ;; when 1.4.4 is a simple maintenance fix from 1.4.3. - (("appdirs >= 1.4.4") "appdirs >= 1.4.3")))) - (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" "tests"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'downgrade-appdirs-requirement + (lambda _ + (substitute* "setup.py" + ;; FIXME: Remove this once appdirs is updated. + ;; Upgrading python-appdirs requires rebuilting 3000+ packages, + ;; when 1.4.4 is a simple maintenance fix from 1.4.3. + (("appdirs >= 1.4.4") "appdirs >= 1.4.3")))) + (add-after 'install 'install-doc + (lambda _ + (with-directory-excursion "docs/man" + (let ((man (string-append #$output "/share/man"))) + (install-file "panctl.1" (string-append man "/man1")) + (install-file "pantalaimon.5" (string-append man "/man5")) + (install-file "pantalaimon.8" (string-append man "/man8")))))) + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "tests"))))))) (native-inputs (list python-aioresponses python-faker |