me/guix
Archived
1
0
Fork 0
Code Activity

gnu: python-flit-core: Propagate python-tomli instead of python-toml.

Browse source 
Flit Core apparently requires tomli at runtime rather than toml.  This means
we must build a toml-less python-flit-core first, for bootstrapping purposes.

* gnu/packages/python-build.scm (python-flit-core-bootstrap): New variable.
(python-flit-core): Inherit from the above, replacing the propagated
python-toml by python-tomli.
(python-tomli): Adjust accordingly.
This commit is contained in:
Maxim Cournoyer 2021-12-20 12:30:52 -05:00
parent 0be45b28a9
commit 3b3fb28086
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/python-build.scm
View file

@ -163,7 +163,7 @@ Python file, so it can be easily copied into your project.")
(invoke "pip" "--no-cache-dir" "--no-input" (invoke "pip" "--no-cache-dir" "--no-input"
"install" "--no-deps" "--prefix" out whl))))))) "install" "--no-deps" "--prefix" out whl)))))))
(native-inputs (native-inputs
`(("python-flit-core" ,python-flit-core) `(("python-flit-core-bootstrap" ,python-flit-core-bootstrap)
("python-pypa-build" ,python-pypa-build) ("python-pypa-build" ,python-pypa-build)
("python-six", python-six-bootstrap))) ("python-six", python-six-bootstrap)))
(home-page "https://github.com/hukkin/tomli") (home-page "https://github.com/hukkin/tomli")
@ -347,9 +347,10 @@ a light weight, fully compliant, self-contained package allowing PEP 517
compatible build front-ends to build Poetry managed projects.") compatible build front-ends to build Poetry managed projects.")
(license license:expat))) (license license:expat)))
(define-public python-flit-core ;;; This package exists to bootstrap python-tomli.
(define-public python-flit-core-bootstrap
(package (package
(name "python-flit-core") (name "python-flit-core-bootstrap")
(version "3.5.1") (version "3.5.1")
(source (source
(origin (origin
@ -387,3 +388,10 @@ compatible build front-ends to build Poetry managed projects.")
backend for packages using Flit. The only public interface is the API backend for packages using Flit. The only public interface is the API
specified by PEP 517, @code{flit_core.buildapi}.") specified by PEP 517, @code{flit_core.buildapi}.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-flit-core
(package/inherit python-flit-core-bootstrap
(name "python-flit-core")
(propagated-inputs
(modify-inputs (package-propagated-inputs python-flit-core-bootstrap)
(replace "python-toml" python-tomli)))))