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>
* gnu/packages/djvu.scm (didjvu): Update to 0.11.0.
[arguments] <tests?, test-backend, test-flags>: Enable and provide
options to run unittest.
[phases]{configure}: Don't delete it.
{disable-failing-test}: Rework some problematic tests to be skipped.
[inputs]: Remove python-wrapper; add python-py3exiv2 and
python-xmp-toolkit.
[native-inputs]: Add boost and tzdata-for-tests.
Change-Id: I5132056c26a6f53229ddaf095b49427ec2ad6930
Signed-off-by: Rutherther <rutherther@ditigal.xyz>
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
Until now users would have to cargo cult or inspect the private
%default-modules variable of (guix build-systems gnu) to discover which
modules to include when extending the used modules via the #:modules argument.
The renaming was automated via the command:
$ git grep -l %gnu-build-system-modules
| xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i
* guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to...
(%default-gnu-imported-modules): ... this.
(%default-modules): Rename to...
(%default-gnu-modules): ... this. Export.
(dist-package, gnu-build, gnu-cross-build): Adjust accordingly.
Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee
* gnu/packages/djvu.scm (pdf2djvu)[tests]: Set to #f.
[test-target]: Delete argument.
[native-inputs]: Use new style. Delete python-2 and python2-nose.
[inputs]: Use new style.
* gnu/packages/djvu.scm (didjvu)[source]: Switch to a Python 3 compatible
fork.
[native-inputs, inputs]: Move below arguments field. Use new style. Replace
the Python 2 inputs by their Python 3 equivalents.
* gnu/packages/djvu.scm (ocrodjvu)[source]: Update URL to Python 3 fork.
[inputs]: Use new style. Remove python2-subprocess32. Replace all other
Python 2 inputs by their Python 3 equivalent. Add python-future and
python-regex.
[arguments]: Use gexps, and adjust accordingly, using this-package-input and
search-input-file.
This change was automated via the following command:
$ git ls-files | xargs sed -i 's/,qtbase)/,qtbase-5)/g'
$ git ls-files | xargs sed -i 's/inherit qtbase)/inherit qtbase-5)/g'
$ git ls-files | xargs sed -i 's/package-version qtbase)/package-version qtbase-5)/g'
$ git checkout etc # to clear some spurious changes
This is done so the qtbase package can be upgraded to version 6 in the
following commit.
* gnu/packages/djvu.scm (djvulibre): Update to 3.5.28.
[native-inputs]: Add autoconf, automake, and libtool to bootstrap.
[inputs]: Add zlib.
[arguments]: Rename 'reproducible phase to 'make-reproducible and run it
after bootstrapping.
* gnu/packages/djvu.scm (djview): Update to 4.11.
[source]: Use GIT-FETCH and add a FILE-NAME.
[native-inputs]: Add autoconf, automake, and libtool.
[arguments]: Add a ‘make-files-writable’ phase.
Nicolas Graves