me
/
guix
Archived
1
0
Fork 0
Code

gnu: conan: Use gexps and remove input labels. 

* gnu/packages/package-management.scm (conan) [arguments]: Use gexps.  Use
search-input-file in patch-paths phase.
[native-inputs]: Remove labels.
master
Maxim Cournoyer 2023-03-30 08:23:40 -04:00
parent 113146d31c
commit 57c3662ddd
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1150,8 +1150,9 @@ written entirely in Python.")
"1jjrinz5wkcxfvwdpldrv4h7vacdyz88cc4af5vi3sdnjra0i0m5")))) "1jjrinz5wkcxfvwdpldrv4h7vacdyz88cc4af5vi3sdnjra0i0m5"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements (add-after 'unpack 'relax-requirements
(lambda _ (lambda _
(substitute* "conans/requirements.txt" (substitute* "conans/requirements.txt"
@ -1163,25 +1164,24 @@ written entirely in Python.")
"PyYAML")))) "PyYAML"))))
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((coreutils (assoc-ref inputs "coreutils")))
;; It seems that PATH is manipulated, as printenv is not found ;; It seems that PATH is manipulated, as printenv is not found
;; during tests. Patch in its exact location. ;; during tests. Patch in its exact location.
(substitute* "conan/tools/env/environment.py" (substitute* "conan/tools/env/environment.py"
(("printenv") (("printenv")
(string-append coreutils "/bin/printenv"))) (search-input-file inputs "bin/printenv")))
(substitute* "conans/client/envvars/environment.py" (substitute* "conans/client/envvars/environment.py"
(("#!/usr/bin/env") (("#!/usr/bin/env")
(string-append "#!" coreutils "/bin/env")))))) (string-append "#!" (search-input-file inputs "bin/env"))))))
(add-before 'check 'set-home (add-before 'check 'set-home
(lambda _ (lambda _
(setenv "HOME" "/tmp"))) (setenv "HOME" "/tmp")))
(replace 'check (replace 'check
(lambda* (#:key tests? outputs #:allow-other-keys) (lambda* (#:key tests? outputs #:allow-other-keys)
(define system ,(or (%current-target-system) (define system #$(or (%current-target-system)
(%current-system))) (%current-system)))
(when tests? (when tests?
(setenv "PATH" (string-append (getenv "PATH") ":" (setenv "PATH" (string-append (getenv "PATH") ":"
(assoc-ref outputs "out") "/bin")) #$output "/bin"))
(invoke "python" "-m" "pytest" (invoke "python" "-m" "pytest"
"-n" "auto" ;parallelize tests "-n" "auto" ;parallelize tests
"-m" "not slow and not tool_svn" "-m" "not slow and not tool_svn"
@ -1266,20 +1266,20 @@ written entirely in Python.")
(inputs (inputs
(list coreutils)) ;for printenv (list coreutils)) ;for printenv
(native-inputs (native-inputs
`(("autoconf" ,autoconf) (list autoconf
("automake" ,automake) automake
("cmake" ,cmake) cmake
("git" ,git-minimal) git-minimal
("meson" ,meson) meson
("ninja",ninja) ninja
("pkg-config" ,pkg-config) pkg-config
("python-bottle" ,python-bottle) python-bottle
("python-mock" ,python-mock) python-mock
("python-parameterized" ,python-parameterized) python-parameterized
("python-pytest" ,python-pytest) python-pytest
("python-pytest-xdist" ,python-pytest-xdist) python-pytest-xdist
("python-webtest" ,python-webtest) python-webtest
("which" ,which))) which))
(home-page "https://conan.io") (home-page "https://conan.io")
(synopsis "Decentralized C/C++ package manager") (synopsis "Decentralized C/C++ package manager")
(description "Conan is a package manager for C and C++ developers that (description "Conan is a package manager for C and C++ developers that