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/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
Rationale: Decoupling helps us moving the package, and not worry about
inheriting package updates.
* gnu/packages/python-xyz.scm (python2-cffi)
[inherit]: Drop it.
[source]: Decrease version to 1.15.1, which is the last supported
version for Python2. The former build fails with 1.17.0.
[build-system, arguments]: Migrate to pyproject-build-system.
[name, home-page, synopsis, description, license]: Set them
explicitely.
Change-Id: Iea81e4fd3896da044a97043e2d80f5f43b28f50e
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Signed-off-by: Rutherther <rutherther@ditigal.xyz>
This is needed by Pypy 3.
* gnu/packages/libffi.scm (python2-cffi): New variable.
Fixes: #3183
Change-Id: I01f022c28c1a3b801b4a374bd8c52de4a8442d8a
Reviewed-by: Danny Milosavljevic <dannym@scratchpost.org>
This reverts commit a7db92d9b3, this time with
the more careful command, to avoid a world rebuild:
grep -rl --exclude-dir=build --exclude-dir=patches --exclude=ld-wrapper.in \
--exclude=sitecustomize.py --exclude=guix-emacs.el maxim.cournoyer@gmail.com |
xargs sed -i 's/maxim.cournoyer@gmail.com/maxim@guixotic.coop/g'
Change-Id: I0871f5cf9ace79e34e78e24154d0da6ea95a3a91
The change was automated via:
git grep -l maxim.cournoyer@gmail.com |
xargs sed -i 's/maxim.cournoyer@gmail.com/maxim@guixotic.coop/g'
* .mailmap: New entry.
Change-Id: Iaa88b1e51c94159c49138fb43910badb990eb169
* gnu/packages/libffi.scm (libffi) [arguments]: When building for
x86_64-linux, also use "CFLAGS=-g -O2 -Wno-implicit-function-declaration".
Change-Id: I21af1acdc550c83e63241811a6586598f187b2ef
* gnu/packages/libffi.scm: Add python-build and pyproject
modules. Select just pypi-uri symbol from python module.
(python-cffi): Fix indenation and adjust order of fileds.
[build-system]: Swap to pyproject-build-system.
[arguments]<test-flags>: Move tests directories and deselcect options
here.
<phases>: Use default 'check phase. Add 'set-gcc phase.
[native-inputs]: Add python-setuptools and python-wheel.
Change-Id: I0baa120ac86ef1c1e90cf44a4d439d874b8920b5
* gnu/packages/libffi.scm (libffi)[arguments]: When building for the 64bit
Hurd, or cross-building, add "CFLAGS" to #:configure-flags to disable breaking
warning.
Change-Id: I05bf3f460f3e292626de1894b7a3cf381cb07702
* gnu/packages/libffi.scm (ruby-ffi): Update to 1.15.5.
[arguments]: Remove custom 'do-not-depend-on-ccache phase. Adjust custom
'remove-git-ls-files phase to changes in the code. Remove trailing #t
from phases.
* gnu/packages/haskell.scm (ghc-7, ghc-8.0, ghc-8.4)[inputs]: Change from
LIBFFI to LIBFFI-SANS-STATIC-TRAMPOLINES.
* gnu/packages/libffi.scm (libffi-sans-static-trampolines): New variable.
As explained in bug 45252, this is the right way to invoke it.
Efraim has confirmed that it is OK to make this change on master branch for
the generic powerpc case, even though it will in theory cause rebuilds on that
architecture, since in practice it isn't actually being used yet.
* gnu/packages/libffi.scm (arguments): Change the invocation of the "patch"
tool in the case where the %current-target-system or %current-system begins
with "powerpc", so that we invoke it using --force instead of --batch.
As explained in bug 45252, this is the right way to invoke it.
* gnu/packages/libffi.scm (arguments): Change the invocation of the "patch"
tool in the case where the %current-target-system or %current-system begins
with "powerpc64le", so that we invoke it using --force instead of --batch.
Fixes <https://bugs.gnu.org/45252>.
* gnu/packages/patches/libffi-float128-powerpc64le.patch: Import patch file
from <https://github.com/libffi/libffi/pull/561.patch>.
* gnu/packages/libffi.scm (libffi)[arguments]: Apply patch conditionally for
powerpc64le-* systems in a phase.
[inputs]: Add patch as input conditionally for powerpc64le-* systems.
* gnu/local.mk (dist_patch_DATA): Add patch file to build system.
Signed-off-by: Chris Marusich <cmmarusich@gmail.com>
