Age | Commit message (Collapse) | Author |
|
This is a followup to commit 506eb97de7041f6bcb6e841201c01e88bedfc9d9.
Feedparser dropped support for Python 2 in version 6.0.0. The latest
release that works with Python 2 is 5.2.1.
* gnu/packages/web.scm (python2-feedparser): Revert back to version 5.2.1.
|
|
This allows importing packages with complicated version specific dependency
chains without the package symbol names colliding.
* doc/guix.texi (Invoking guix import): Document the --pin-versions option.
Mention that a specific version can be imported. Remove the experimental
warning.
* guix/import/go.scm (go-module->guix-package-name)[version]: Add optional
argument. Rewrite the character translation in terms of string-map.
(go-module->guix-package): Conditionally use dependencies whose symbol include
their version, based no the value of the PIN-VERSIONS? argument.
* guix/import/utils.scm (package->definition): Add a new case where the full
version string is appended to the package symbol.
* guix/scripts/import.scm (guix-import): Correctly print forms starting
with '(define-public [...]'.
* guix/scripts/import/go.scm (guix-import-go): Conditionally include the
version in the package symbols defined.
|
|
The ability to pin versions is handy when having to deal to packages that
bootstrap themselves through a chain of former versions. Not using pinned
versions in these case could introduce dependency cycles.
* guix/build-system/go.scm (guix)
(%go-version-rx): Rename to...
(%go-pseudo-version-rx): ... this. Simplify the regular expression, which in
turns makes it more robust.
* guix/build-system/go.scm (go-version->git-ref): Adjust following the above
rename.
(go-pseudo-version?): New predicate.
(go-module-latest-version): Rename to ...
(go-module-version-string): ... this. Rename goproxy-url argument to just
goproxy. Add a VERSION keyword argument, update docstring and adjust to have
it used.
(go-module-available-versions): New procedure.
(%go.mod-require-directive-rx): Document regexp.
(parse-go.mod): Harmonize the way dependencies are recorded to a list of lists
rather than a list of pairs, as done for other importers. Rewrite to directly pass
multiple values rather than a record object. Filter the replaced modules in a
functional style.
(go-module->guix-package): Add docstring.
[version, pin-versions?]: New arguments. Rename the GOPROXY-URL argument to
GOPROXY. Adjust to the new returned value of fetch-go.mod, which is a string.
Fail when the provided version doesn't exist. Return a list dependencies and
their versions when in pinned versions mode, else just the dependencies.
(go-module-recursive-import)[version, pin-versions?]: New arguments.
Honor the new arguments and guard against network errors.
* guix/scripts/import/go.scm (%default-options): Register a default value for
the goproxy argument.
(show-help): Document that a version can be specified. Remove the --version
argument and add a --pin-versions argument.
(%options)[version]: Remove option.
[pin-versions]: Add option.
(guix-import-go): Adjust so the version provided from the module name is
honored, along the new pin-versions? argument.
* tests/go.scm: Adjust and add new tests.
|
|
* guix/import/go.scm (%strict-tokenizer?): Set parameter to #t.
(go-path-escape): Redefine to prevent inlining.
(http-get*): Replace by ...
(http-fetch*): this ...
(json-fetch*): New procedure.
(go.pkg.dev-info): Use http-fetch*.
(go-package-licenses): Rewrite in terms of go.pkg.dev-info.
(go-package-description): Likewise.
(go-package-synopsis): Likewise.
(fetch-go.mod): Use the memoized http-fetch*.
(parse-go.mod): Adjust to receive content as a string.
(fetch-module-meta-data): Adjust to use http-fetch*.
(go-module->guix-package): Adjust to the modified fetch-go.mod return value.
[inputs]: Use propagated inputs, which is the most common situations for Go
libraries.
[description]: Beautify description.
[licenses]: Do no check for #f. The result of the license parsing is always a
list.
* tests/go.scm: Adjust following above changes.
|
|
* guix/import/utils.scm (maybe-inputs)[type]: New argument. Update docstring.
The argument is used to derive the input field name to use.
(maybe-native-inputs): Adjust to use the above.
(maybe-propagated-inputs): New procedure.
|
|
Otherwise, the shell tries to perform pattern-matching based on the "?"
character.
Reported by nij in #guix.
* doc/guix.texi (Binary Installation): Add quotes around OPENPGP-SIGNING-KEY-URL.
|
|
* gnu/packages/qt.scm (python2-sip): Delete variable.
|
|
* gnu/packages/qt.scm (python2-pyqt): Remove variable.
|
|
* gnu/packages/qt.scm (python2-pyqtwebengine): Remove variable.
|
|
* gnu/packages/ebook.scm (calibre): Update to 5.14.0.
[source]: Adjust the snippet to preserve some files used by the HTML reader.
[native-inputs]: Add python-pyqt-builder. Replace python2-flake8 with
python-flake8.
[inputs]: Remove chmlib, js-mathjax, python-chardet, and python-sip. Add
python-cchardet, python-speechd, python-zeroconf, python-py7zr, python-pychm,
python-pycryptodome, libjpeg, and libjxr. Replace all Python 2 dependencies
with their Python 3 equivalents.
[arguments]: Build with the default Python and adjust custom phases accordingly.
Adjust the 'configure' phase to changes in how Calibre uses SIP, and patch
lookup paths for libjpeg and libjxr.
Rename the 'build-extra' phase to 'install-rapydscript', and run it after the
'install' phase. Adjust it for Calibre 5.14.0.
* gnu/packages/patches/calibre-no-updates-dialog.patch,
gnu/packages/patches/calibre-remove-test-sqlite.patch,
gnu/packages/patches/calibre-remove-test-unrar.patch: Adjust patches for Calibre
5.14.0.
|
|
* gnu/packages/python-web.scm (python-html5lib)[propagated-inputs]: Add
python-chardet.
|
|
* gnu/packages/freedesktop.scm (python-cchardet): New variable.
|
|
* gnu/packages/ebook.scm (python-pychm): New variable.
|
|
* gnu/packages/web.scm (python-feedparser): Update to 6.0.2.
|
|
* gnu/packages/python-xyz.scm (python-markdown): Update to 3.3.4.
|
|
* gnu/packages/python-compression.scm (python-py7zr): New variable.
|
|
* gnu/packages/python-compression.scm (python-bcj-cffi): New variable.
|
|
* gnu/packages/python-compression.scm (python-pyzstd): New variable.
|
|
* gnu/packages/python-compression.scm (python-zstandard): Update to 0.15.2.
|
|
* gnu/packages/python-compression.scm (python-ppmd-cffi): New variable.
|
|
* gnu/packages/python-compression.scm (python-multivolumefile): New
variable.
|
|
* gnu/packages/python-check.scm (python-pyannotate): New variable.
|
|
* gnu/packages/python-xyz.scm (python-zeroconf): New variable.
|
|
* gnu/packages/python-xyz.scm (python-ifaddr): New variable.
|
|
* gnu/packages/qt.scm (python-pyqt)
[source]: Remove pyqt-public-sip.patch.
[propagated-inputs]: Add python-pyqt5-sip.
* gnu/packages/patches/pyqt-public-sip.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
|
|
* gnu/packages/qt.scm (python-pyqt5-sip): New variable.
|
|
* gnu/packages/qt.scm (python-pyqt-builder): New variable.
|
|
* gnu/packages/qt.scm (python-sip): Update to 5.5.0.
(python-sip-4): New variable. Rename the old python-sip to python-sip-4.
(python2-sip): Inherit from python-sip-4.
* gnu/packages/maths.scm (veusz)[native-inputs]: Use python-sip-4.
* gnu/packages/pdf.scm (python-poppler-qt5): Use python-sip-4.
* gnu/packages/geo.scm (qgis)[arguments]: Fix build for python-sip@5.
|
|
The original commit was made mistakenly; I forgot to look at all of our
Git repos, including maintenance.git, when checking for recent activity.
This reverts commit 94521669ed23096f930be68efc691ccb793cc76f.
|
|
* gnu/packages/games.scm (freeciv): Update to 2.6.4.
|
|
* gnu/packages/messaging.scm (pidgin): Update to 2.14.3.
[arguments]: Add an 'eat-leftovers phase.
|
|
* gnu/packages/astronomy.scm (stellarium): Update to 0.21.0.
|
|
* gnu/packages/ruby.scm (ruby-rexml): Update to 3.2.5.
|
|
* gnu/packages/libreoffice.scm (libmwaw): Update to 0.3.18.
|
|
* gnu/packages/python-xyz.scm (python-yamllint): Update to 1.26.1.
|
|
* gnu/packages/package-management.scm (guix): Update to 2d73086.
|
|
This avoids the situation where error messages would unintentionally go
to stderr and be wrongfully interpreted as a reply by the daemon.
Fixes <https://bugs.gnu.org/46362>.
This is a followup to ee3226e9d54891c7e696912245e4904435be191c.
* guix/scripts/substitute.scm (display-narinfo-data): Add 'port'
parameter and honor it.
(process-query): Likewise.
(process-substitution): Likewise.
(%error-to-file-descriptor-4?, with-redirected-error-port): Remove.
(%reply-file-descriptor): New variable.
(guix-substitute): Remove use of 'with-redirected-error-port'. Define
'reply-port' and pass it to 'process-query' and 'process-substitution'.
* nix/libstore/build.cc (SubstitutionGoal::handleChildOutput): Swap
'builderOut' and 'fromAgent'.
* nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter):
Likewise.
* tests/substitute.scm <top level>: Set '%reply-file-descriptor'
rather than '%error-to-file-descriptor-4?'.
|
|
* gnu/packages/boost.scm (boost-mpi): New variable.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
|
* gnu/packages/guile-xyz.scm (guile-cv)[propagated-inputs]: Change from
guile-lib to guile2.2-lib.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
|
* gnu/packages/networking.scm (speedtest-cli): Update to 2.1.3.
|
|
* gnu/packages/antivirus.scm (clamav): Update to 0.103.2.
|
|
* gnu/packages/cpp.scm (xsimd): Update to 7.4.10.
|
|
* gnu/packages/dns.scm (dnsmasq): Update to 2.85.
|
|
* gnu/packages/tex.scm: New variable.
|
|
* gnu/packages/ci.scm (cuirass)[arguments]: Disable tests on aarch64.
|
|
* gnu/packages/gcc.scm (gcc-10): Update to 10.3.0.
|
|
* gnu/packages/ci.scm (cuirass): Update to 1.0.0-9.d601fe0.
|
|
* gnu/services/ci.scm: New file.
* gnu/tests/ci.scm: New file.
* doc/guix.texi (Laminar): Document the Laminar service.
|
|
* gnu/packages/ci.scm (laminar): New variable.
|
|
* gnu/packages/package-management.scm (guix-build-coordinator): Update to
0-24.6fb5eaf.
|