TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: conan: Update to 1.47.0 and relax PyYAML requirement.

Browse source 
* gnu/packages/package-management.scm (conan): Update to 1.47.0.
[phases]{check}: Skip the test_apt_check test.
{relax-requirements}: Drop upper bound on PyYAML.
This commit is contained in:
Maxim Cournoyer 2022-04-19 11:28:07 -04:00
parent d95db23cb1
commit 046e5f0d04
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/package-management.scm
View file

@ -18,7 +18,7 @@
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;;
@ -1112,7 +1112,7 @@ (define-public conda
(define-public conan
(package
(name "conan")
(version "1.42.0")
(version "1.47.0")
(source
(origin
(method git-fetch) ;no tests in PyPI archive
@ -1122,7 +1122,7 @@ (define-public conan
(file-name (git-file-name name version))
(sha256
(base32
"153npvj81m1c33gfcv2nry7xhyikxnhjns7lvs525f1x20ck6asg"))))
"1zs2xb22rsy5fsc0fd7c95vrx1mfz7vasyg1lqkzyfimvn5zah6n"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -1133,7 +1133,9 @@ (define-public conan
(("node-semver==0.6.1")
"node-semver>=0.6.1")
(("Jinja2>=2.9, <3")
"Jinja2>=2.9"))))
"Jinja2>=2.9")
(("PyYAML>=3.11, <6.0")
"PyYAML"))))
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((coreutils (assoc-ref inputs "coreutils")))
@ -1189,6 +1191,8 @@ (define system ,(or (%current-target-system)
;; This one fails for unknown reasons (see:
;; https://github.com/conan-io/conan/issues/9671).
"and not test_build "
;; This test expects the 'apt' command to be available.
"and not test_apt_check "
(if (not (string-prefix? "x86_64" system))
;; These tests either assume the machine is
;; x86_64, or require a cross-compiler to target