diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-05 00:03:36 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-11 12:18:35 -0500 |
| commit | ccebbaa5170dc250ceb8810d1baa331a7f0b9952 (patch) | |
| tree | 684d93b381bfe8c84375e6d94ecd1153ed0d8109 /gnu/packages/package-management.scm | |
| parent | e30cce86a140fb3f682210db3ab283db54b9813b (diff) | |
| download | guix-patches-ccebbaa5170dc250ceb8810d1baa331a7f0b9952.tar guix-patches-ccebbaa5170dc250ceb8810d1baa331a7f0b9952.tar.gz | |
gnu: conan: Update to 1.42.0.
* gnu/packages/package-management.scm (conan): Update to 1.42.0.
[phases]{relax-requirements}: Relax the Jinja2 requirement.
[native-inputs]: Remove obsolete comment about CMake.
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c15c1c1c6d..77db63ab45 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1048,7 +1048,7 @@ written entirely in Python.") (define-public conan (package (name "conan") - (version "1.40.2") + (version "1.42.0") (source (origin (method git-fetch) ;no tests in PyPI archive @@ -1058,7 +1058,7 @@ written entirely in Python.") (file-name (git-file-name name version)) (sha256 (base32 - "0hp8qs54l4cw043f1kycjwgdr7f388lsyxqcbzfaayr6xg1d3dw0")))) + "153npvj81m1c33gfcv2nry7xhyikxnhjns7lvs525f1x20ck6asg")))) (build-system python-build-system) (arguments `(#:phases @@ -1067,7 +1067,9 @@ written entirely in Python.") (lambda _ (substitute* "conans/requirements.txt" (("node-semver==0.6.1") - "node-semver>=0.6.1")))) + "node-semver>=0.6.1") + (("Jinja2>=2.9, <3") + "Jinja2>=2.9")))) (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (let ((coreutils (assoc-ref inputs "coreutils"))) @@ -1172,7 +1174,7 @@ written entirely in Python.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("cmake" ,cmake) ;requires cmake >= 3.17 + ("cmake" ,cmake) ("git" ,git-minimal) ("meson" ,meson) ("ninja",ninja) |