me
/
guix
Archived
1
0
Fork 0
Code

gnu: conan: Do not hard-code package versions. 

* gnu/packages/package-management.scm (conan) [arguments]: Add #:modules
argument.  Avoid hard-coding package versions in configure-tests phase.
master
Maxim Cournoyer 2023-03-31 09:48:51 -04:00
parent 11956155e5
commit b8152d668d
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/package-management.scm
View File

@ -1151,6 +1151,9 @@ written entirely in Python.")
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list (list
#:modules '((guix build python-build-system)
(guix build utils)
(ice-9 format))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
@ -1175,22 +1178,26 @@ written entirely in Python.")
"@pytest.mark.tool(\"cmake\")")))) "@pytest.mark.tool(\"cmake\")"))))
(add-before 'check 'configure-tests (add-before 'check 'configure-tests
(lambda _ (lambda _
(call-with-output-file "conans/test/conftest_user.py" (let* ((cmake-version #$(version-major+minor
(lambda (port) (package-version cmake)))
(format port "\ (pkg-config-version #$(version-major+minor
(package-version pkg-config))))
(call-with-output-file "conans/test/conftest_user.py"
(lambda (port)
(format port "\
tools_locations = { tools_locations = {
'apt_get': {'disabled': True}, 'apt_get': {'disabled': True},
'bazel': {'disabled': True}, 'bazel': {'disabled': True},
'cmake': {'default': '3.25', 'cmake': {'default': '~a',
'3.15': {'disabled': True}, '3.15': {'disabled': True},
'3.16': {'disabled': True}, '3.16': {'disabled': True},
'3.17': {'disabled': True}, '3.17': {'disabled': True},
'3.19': {'disabled': True}, '3.19': {'disabled': True},
'3.25': {}}, '~:*~a': {}},
'pkg_config': {'exe': 'pkg-config', 'pkg_config': {'exe': 'pkg-config',
'default': '0.29', 'default': '~a',
'0.29': {}}, '~:*~a': {}},
'svn': {'disabled': True}}~%"))))) 'svn': {'disabled': True}}~%" cmake-version pkg-config-version))))))
(add-before 'check 'set-home (add-before 'check 'set-home
(lambda _ (lambda _
(setenv "HOME" "/tmp"))) (setenv "HOME" "/tmp")))