After this commit, when both modules are imported:
- if pyproject is imported before, the warning is 'pypi-uri' is
deprecated, use '(@ (guix build-system pyproject) pypi-uri)' instead
- if python is imported before, the warning is `pypi-uri' imported from
both (guix build-system python) and (guix build-system pyproject)
This seems convenient enough to warn for deprecation in the short term,
while avoiding any breaking changes.
* guix/build-system/pyproject.scm (pypi-uri): Move the procedure from
(guix build-system python) here.
* guix/build-system/python (pypi-uri): Drop definition, import it
from (guix build-system pyproject) and deprecate it.
* gnu/packages/openldap.scm: Reorder modules to get the right warning.
* gnu/packages/pypy.scm: Likewise.
* gnu/packages/*.scm : Drop module (guix build-system python).
* tests/import/pypi.scm: Likewise.
Merges: https://codeberg.org/guix/guix/pulls/7448
Change-Id: Ib42f53bc545052eb7918a25afe9db6d5fc2cb834
Reviewed-by: Nguyễn Gia Phong <cnx@loang.net>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
This commit was made by running this command:
sed -e's/modify-inputs (package-\([a-z-]*\)inputs [a-zA-Z0-9-]\+)/modify-inputs \1inputs/g' -i gnu/packages/*.scm
… and then reverting individual hunks where the change would trigger unbound
variable warnings or other issues (such as ‘native-inputs’ is bound in the
body of the ‘inputs’ field, but it refers to the ‘native-inputs’ thunk defined
just above).
Change-Id: I6d94819f2809313fa1fbefc61897502ee7d66fab
This commit was made by running this command:
sed -e's/substitute-keyword-arguments (package-arguments [a-zA-Z0-9-]\+)/substitute-keyword-arguments arguments/g' -i gnu/packages/*.scm
… and then:
1. reverting changes from ‘gnu/packages/rust.scm’ and
‘gnu/packages/java.scm’ since they would incur derivation changes and/or
breakage;
2. reverting the change for ‘gcc-final’ in ‘gnu/packages/commencement.scm’;
3. reverting the change for ‘onnx-optimizer’, ‘openquest’, and ‘certbot’,
which use ‘substitute-keyword-arguments’ for arguments that are not
inherited (and thus ‘arguments’ would be unbound);
4. reverting the change for ‘insight-toolkit-legacy’ and ‘wine64-staging’
which make bogus assumptions about inherited arguments.
Change-Id: I122a7cf517b6b63cae38944b5d33ade4b1f5a89c
* gnu/packages/monitoring.scm (aw-watcher-window-wayland): New variable.
* gnu/packages/rust-crates.scm: Record aw-watcher-window-wayland cargo-inputs.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
* gnu/packages/monitoring.scm (aw-server-rust): New variable.
* gnu/packages/rust-crates.scm: Record aw-server-rust cargo-inputs.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This is an intermediate Python module communicating with Zabbix API via
HTTP, the best place is (gnu packages python-web).
* gnu/packages/monitoring.scm (python-pyzabbix): Move from here ...
* gnu/packages/python-web.scm: ... to here.
Change-Id: I7ef6b03b6f33310b2470b4adaf60be87dec19f6b
* gnu/packages/monitoring.scm (python-pyzabbix): Update to 1.3.1.
[build-system]: Switch to pyproject-build-system.
[arguments] <test-flags>: Provide path to tests.
<phases>: Drop all.
[native-inputs]: Add python-setuptools.
Change-Id: If55f0330217fd3416d0a3318eaaa6734b14dafca
The collectd build [has been broken since September
16th](https://ci.guix.gnu.org/build/14313836/details).
* gnu/packages/monitoring.scm (collectd): Fix the build.
[inputs]: Add zlib.
[#:configure-flags]: Treat use of deprecated declarations as warnings.
Change-Id: I5b3f8883179256fa5aeef2f450793dfce4e28bfa
* gnu/packages/python-xyz.scm (glances): Move from here ...
* gnu/packages/monitoring.scm: ... to here.
Change-Id: Ifa7c9e448c914fed63533db7cdfe2236c6315553
Use ‘define-deprecated-package’ instead of (define x (deprecated-package …))
throughout gnu/packages/*.scm.
Change-Id: I4e176da9ac660327489dab256ca4d12c4e78fe8d
* gnu/packages/monitoring.scm (fatrace): Update to 0.19.1.
[arguments]<#:phases>: Use gexps.
[arguments]<#:phases>: Do not delete check.
[arguments]<#:tests?>: Set to #f.
Change-Id: I835241873553d9f057b8abeb10e89f20660d2b31
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
* gnu/packages/django.scm (python-django-4.2): Rename to...
(python-django): ...this instead of defining the latter as the former.
* gnu/packages/maths.scm (python-mathics-django)[propagated-inputs],
gnu/packages/monitoring.scm (graphite-web)[propagated-inputs]:
Use python-django instead of python-django-4.2.
Change-Id: I9dd9d86d4f9af5c6ee66fd57949ad565a6657062
* gnu/packages/monitoring.scm (graphite-web): Update to 1.1.10-2.49c28e2.
Change-Id: I10355a9b398b42bab04963608ed43d21a7df6fe6
Signed-off-by: Steve George <steve@futurile.net>
* gnu/packages/monitoring.scm (python-rrdtool): New variable.
Change-Id: Ifcfcaf745b88016ee2a4f260f0b9bbb77adcbcca
Signed-off-by: Steve George <steve@futurile.net>
* gnu/packages/monitoring.scm (python-carbon): Update to 1.1.10.
Change-Id: I5a6af8a2ab1f2f8a87883f5be7f74b642ee6669e
Signed-off-by: Steve George <steve@futurile.net>
* gnu/packages/monitoring.scm (python-statsd): Update to 4.0.1.
[build-system]: Swap to pyproject-build-system.
[arguments] <test-flags>: Provide path to unit tests.
[native-inputs]: Remove python-mock and python-nose; add python-pytest,
python-setuptools, and python-wheel.
Change-Id: I0d1c97ab2c4de76969d4da6c3af032dc0271ba0b
Also adds python-setuptools and python-wheel to relevant packages,
either to native-inputs or to propagated inputs if the pkg_resources
Python module is loaded at runtime.
* guix/build-system/pyproject.scm (default-python): Default to
python-sans-pip-wrapper.
Change-Id: I2d986c2225114f54459dd6bb360913106e52cdf4