~ruther/guix-local

40b0c9bd — Nicolas Graves 7 months ago
gnu: python-pyzstd: Migrate to (json).

* gnu/packages/python-compression.scm (python-pyzstd)[arguments]
<#:configure-flags>: Migrate syntax to (json).

Change-Id: I4da32b265c2a2f529b357e5bed1ad41e72b5cce7
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
dd84b1ab — Nicolas Graves 7 months ago
gnu: python-clarabel: Extend with (pyproject-guile-json).

* gnu/packages/python-xyz.scm (python-clarabel)[arguments]
<#:phases>: Extend with (pyproject-guile-json).

Change-Id: I258bc867cc4269779ccf886601a00323b8f80083
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
c9935003 — Nicolas Graves 7 months ago
gnu: maturin: Extend with (pyproject-guile-json).

* gnu/packages/rust-apps.scm (maturin)[arguments]: Improve style. Use
G-expressions.
<#:phases>: Extend with (pyproject-guile-json).

Change-Id: I524df3f97274b309b6736f58925f0b5f27497151
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
ef6c524f — Nicolas Graves 7 months ago
gnu: python-tokenizers: Extend with (pyproject-guile-json).

* gnu/packages/machine-learning.scm (python-tokenizers)[arguments]
<#:phases>: Extend with (pyproject-guile-json).

Change-Id: Idae6f4609393ec1a612b7710dc60c6b7bd8c79a6
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2df24899 — Nicolas Graves 7 months ago
gnu: onnxruntime: Extend with (pyproject-guile-json).

* gnu/packages/machine-learning.scm (onnxruntime)[arguments]
<#:phases>: Extend with (pyproject-guile-json).

Change-Id: Ib498a4697642d59784cf699230478ba23fb41ff6
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
ffd53a77 — Nicolas Graves 7 months ago
gnu: python-rpds-py: Extend with (pyproject-guile-json).

* gnu/packages/python-xyz.scm (python-rpds-py)[arguments]
<#:phases>: Extend with (pyproject-guile-json).

Change-Id: I39ba227211450ae8de98c76af12102f8972c9020
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
dce4929c — Nicolas Graves 7 months ago
gnu: python-libcst: Extend with (pyproject-guile-json).

* gnu/packages/python-xyz.scm (python-libcst)[arguments]
<#:phases>: Extend with (pyproject-guile-json).

Change-Id: I4301b1ce3054497a6d4cf1660987605398070d88
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
12dd89da — Nicolas Graves 7 months ago
gnu: python-tiktoken: Extend with (pyproject-guile-json).

* gnu/packages/python-xyz.scm (python-tiktoken)[arguments]
<#:phases>: Extend with (pyproject-guile-json).

Change-Id: I94c11b8e85c41f8da8158d691114952df823d8de
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
759c416b — Nicolas Graves 7 months ago
gnu: python-pydantic-core: Extend with (pyproject-guile-json).

* gnu/packages/python-xyz.scm (python-pydantic-core)[arguments]
<#:phases>: Extend with (pyproject-guile-json).

Change-Id: Ifa061c9408a6f67988c3fcdc24123fd295a85261
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
32305c05 — Nicolas Graves 7 months ago
gnu: python-orjson: Extend with (pyproject-guile-json).

* gnu/packages/python-xyz.scm (python-orjson)[arguments]
<#:phases>: Extend with (pyproject-guile-json).

Change-Id: If76da1021cd035828bf5c365c01ac0f94e96d2c1
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
545f8fad — Nicolas Graves 7 months ago
gnu: maturin: Improve style.

* gnu/packages/rust-apps.scm (maturin)[arguments]: Improve style.
<#:phases>: Use G-expressions.

Change-Id: Icf2fd08db952c5dbd71a2c8cbb8b153d21aff61c
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
c71655af — Nicolas Graves 7 months ago
gnu: lensfun: Extend with (pyproject-guile-json).

* gnu/packages/python-xyz.scm (lensfun)[arguments]
<#:phases>: Extend with (pyproject-guile-json).

Change-Id: I3303e58cec378a70b0ab42fa8096625460e1b2ca
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
096733b9 — Nicolas Graves 7 months ago
gnu: python-streamtracer: Extend with (pyproject-guile-json).

* gnu/packages/python-xyz.scm (python-steamtracer)[arguments]
<#:phases>: Extend with (pyproject-guile-json).

Change-Id: I968fd19a792bc09635a4bb991e4db8eb789523c9
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
b2ffcdf2 — Nicolas Graves 7 months ago
build-system: cargo: Pass features to manifest-targets.

* guix/build/cargo-build-system.scm (manifest-targets): Pass features to
manifest-targets.

Change-Id: Id1a11d75d16389b92124fc49d2102d6aec935f64
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
32f9304e — Nicolas Graves 7 months ago
build-system: cargo: Migrate to `cargo metadata`.

cargo read-manifest complains about its deprecation. The replacement
is cargo metadata --no-deps --format-version 1, see
https://github.com/rust-lang/cargo/issues/13629#cargo-read-manifest

* guix/build/cargo-build-system.scm (manifest-targets): Refresh using
`cargo metadata`.
(has-executable-target?): Refresh accordingly.

Change-Id: I4cd4881d37523a7ac1f70e68df457ceb9075c1c3
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
b186b25a — Efraim Flashner 7 months ago
build-system: cargo: Migrate to (json).

Fixes guix/guix#2620.

* guix/build-system/cargo.scm (%cargo-build-system-modules): Remove
(guix build json).
(cargo-guile-json): New procedure.
(cargo-build, cargo-cross-build): Add guile-json extension.
* guix/build/cargo-build-system.scm (manifest-targets): Adjust to using
(json).

Change-Id: I832a5555e63520241d3a4c4ccd2dcf860573dbab

Change-Id: I545f72b00f17e88ad19fe33870785367cac63ac4
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
108ff867 — Nicolas Graves 7 months ago
build-system: pyproject: Migrate to (json).

Since (json) is imported in Guix, we remove gradually the old (guix
build json) module.

* guix/build-system/pyproject.scm (%pyproject-build-system-modules):
Remove (guix build json).
(pyproject-guile-json): New procedure.
(pyproject-build): Add guile-json extension, fix configure-flags
argument.

* guix/build/pyproject-build-system.scm (build): Refresh procedure
replacing (guix build json) procedures with (json) ones.

Change-Id: I3aede51f971b27104340816b60cf53174a9bd332
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
dec3b249 — Nicolas Graves 7 months ago
build-system: pyproject: Handle multiprocessing in the entry point.

Fixes guix/guix#1089.

According to the multiprocessing documentation, the entry point should
be protected by using `if __name__ == '__main__':`, see
https://docs.python.org/3/library/multiprocessing.html#multiprocessing-programming

Note that this is not the standard implementation highlighted in
https://packaging.python.org/en/latest/specifications/entry-points/#use-for-scripts
but it will fix scripts using the standard lib multiprocessing and it
should not harm any other script.

 guix/build/pyproject-build-system (create-entrypoints)
[create-script]: Wrap execution line with `if __name__ == '__main__':`

Change-Id: I450eb380cc4f613468395afd4b4eb52673d2ab1a
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
27ba3604 — Nicolas Graves 7 months ago
build-system: pyproject: Add -sP flags for entry-point wrapper.

Fixes guix/guix#1118.

-P: prevents adding current working directory or script's directory to
the search path for modules.

-s: Prevent USER site-packages
directory (~/.local/lib/pythonX.Y[t]/site-packages) from being
included in the search path for modules.

* guix/build/pyproject-build-system (create-entrypoints)
[create-script]: Add -sP flags, improve pythonic style.

Change-Id: Iabc7bb59bf08be1e0c662a069a30ae17a53c7fd5
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
62ea5f58 — Nicolas Graves 7 months ago
build-system: pyproject: Normalize entry point import.

The standard is using from instead of import and it indeed allows to
avoid some side-effects in some cases, see
https://packaging.python.org/en/latest/specifications/entry-points/#use-for-scripts

* guix/build/pyproject-build-system (create-entrypoints)
[create-script]: Add -sP flags, improve pythonic style.

* gnu/packages/video.scm (python-yewtube)[arguments]<#:phases>: Remove
phase 'patch-script.

Change-Id: I995454c774666ed474b2418c18ec36c4f53bf015
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Next