| Age | Commit message (Collapse) | Author |
|
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>
|
|
* guix/build/pyproject-build-system.scm
(keywords->alist, guile->python-keywords): Add procedures.
(check): Convert keyword alist before writing it.
* guix/build-system/pyproject.scm (%default-pytest-guix-options):
Add some python kwargs in a guile format.
* gnu/packages/aux-files/python/pytest_guix.py
(pytest_addoption): Handle python kwargs when some are provided.
Change-Id: Ie35e9b300acda830f35b6b754e8ccc07ad730faa
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
|
|
* guix/build/pyproject-build-system.scm (check):
Pass pytest-guix-options to python through a hidden json file.
* guix/build-system/pyproject.scm
(%default-pytest-guix-options): Add variable.
(pyproject-build): Use it.
* gnu/packages/aux-files/python/pytest_guix.py:
Import pytest-guix-options from guile through a hidden json file.
Change-Id: Ice2ea72452c335b900bc354a04bd9657dc03d7d4
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
|
|
This commit includes squashed changes from
https://codeberg.org/guix/guix/pulls/7220 and
https://codeberg.org/guix/guix/pulls/7338.
* gnu/packages/aux-files/python/pytest_guix.py: New file.
* Makefile.am: Record it.
* guix/build/pyproject-build-system.scm (check): Preload pytest_guix
plugin when available.
* guix/build-system/pyproject.scm (default-pytest-guix-plugin): New
package, generated from pytest_guix.py.
(lower): Add python-pytest-guix argument, and inject it if
python-pytest is in the native-inputs.
Change-Id: I13263b461e9962aad340347657b9c9685db63927
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
|
|
* guix/build-system/python.scm (strip-python2-variant): Remove variable.
Fixes: guix/guix#5398
Change-Id: Ice537cbbecdc04cafcd5f1260a27a5f3a631df58
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
|
|
* guix/build-system/pyproject.scm (%pyproject-build-system-modules):
Replace %python-build-system-modules by %default-gnu-imported-modules.
Change-Id: Ifee0564b61d15a022dc22afe437567d86034c81b
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
|
|
Previously we would accept the #:test-directory argument but ignore the value.
* guix/build-system/r.scm (r-build): Set default value for TEST-DIRECTORY
field.
* guix/build/r-build-system.scm (patch-tests): Use value of TEST-DIRECTORY
argument.
Change-Id: If435577bc0e90ede360ee281ee5bc27fa1b0b3f0
|
|
* guix/build/renpy-build-system.scm (enable-bytecode-determinism): New
variable.
(%standard-phases): Replace python:enable-bytecode-determinism with
own variant.
* guix/build-system/renpy.scm (%renpy-build-system-modules):
Drop (guix build python-build-system).
Fixes: guix/guix#7426 (“Migrate `renpy-build-system' to pyproject”)
|
|
Like gnu-build, this is important as otherwise the builder script can end up
using grafted outputs, which is wrong as grafting should happen after
building.
This addresses an issue with the go-github-com-quic-go-qpack package where the
builder used the grafted specification-qifs, rather than the normal
derivation/output.
* guix/build-system/go.scm (go-build): Call gexp->derivation with #:graft? #f.
Fixes: guix/guix#6820
Change-Id: I7e02ecc3b16d112cc00140653e0528f5d6681bac
|
|
* guix/build-system/gnu.scm (package-with-explicit-inputs/deprecated): In
the field value bodies of inherited packages, use the field name to refer to
the inherited value.
(package-with-explicit-inputs*)[add-explicit-inputs]: Likewise.
(package-with-extra-configure-variable): Likewise.
(static-package): Likewise.
(dist-package): Likewise.
(package-with-restricted-references): Likewise.
Change-Id: I62a95563cbdd48170a674b4995585c8778808b8c
|
|
With the next commit, ‘inputs’ is bound within the body of the ‘inputs’ field,
which would shadow the ‘inputs’ parameter of ‘package-with-explicit-inputs*’.
* guix/build-system/gnu.scm (package-with-explicit-inputs*): Rename ‘inputs’
parameter to ‘explicit-inputs’ to avoid name class in ‘add-explicit-inputs’.
Change-Id: I5aa70504cc6ffc856728c6e1a715ef68d9ebd7d9
|
|
Simply switch to the style that is used in other build-systems.
* guix/build-system/clojure.scm
(%default-clojure): Move from here…
(default-clojure): …to here.
(%default-jdk): Move from here…
(default-jdk): …to here.
(%default-zip): Move from here…
(default-zip): …to here.
Change-Id: Ic31ba1365a6a80e5fa319096bf833d9cf684b3ac
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
|
|
* doc/contributing.texi (Python Moduels): Drop mention of
python-toolchain.
* guix/build-system/pyproject.scm: Likewise.
Fixes: guix/guix#5841
Change-Id: I39a1ec7ce6da2e5f3298323b36070c3e3b197669
|
|
* guix/build-system/r.scm (r-build): Pass TEST-DIRECTORY and SKIPPED-TESTS.
* guix/build/r-build-system.scm (patch-tests): New procedure.
(%standard-phases): Add it.
Change-Id: I7abcd25260f5f55a342899371f4276306c911abe
|
|
* guix/build-system/emacs.scm (emacs-build): Pass #:substitutable? flag to
builder.
Change-Id: I54c40c5ba37344e8115e124fa5bfe25cdff3b169
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
|
|
* guix/build-system/channel.scm (build-channels): Pass #:system to
‘channel-instances->derivation’.
(channel-build-system): Pass #:system to ‘arguments’.
Reported-by: Rutherther <rutherther@ditigal.xyz>
Change-Id: I989d110a0386d933ec5c40f7dd1ba03a37b31e5b
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merges: #5930
|
|
* guix/build-system/go.scm (default-gccgo): Use gccgo-15.
Change-Id: I39129d6de51f62ea8b95cb534ffba095fe926efd
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
|
|
* guix/build-system/go.scm (go-target): Add case for hurd.
Change-Id: Ib2ec622d8dd4795afd3b8164ab5e910bbadb563b
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
|
|
* guix/build-system/r.scm (bioconductor-uri): Accept optional RELEASE
argument, defaulting to %BIOCONDUCTOR-VERSION from (guix import cran).
(default-bioc-version): New procedure.
Change-Id: I5949cd5c01120a2cdeccb522c2d7b2ebb64cb362
|
|
* guix/build-system/cmake.scm (make-toolchain-alist): New procedure.
(make-cmake-toolchain): New procedure.
(cmake-cross-build): Replace cross configure-flags with CMAKE_TOOLCHAIN_FILE
Change-Id: Id754f5d7612b03aca18e1238c12a2b6b13f64381
Signed-off-by: Greg Hogan <code@greghogan.com>
|
|
* guix/build-system/cmake.scm (cmake-system-processor-for-target): New procedure.
Change-Id: I98277ed07c09bd41495782179494865c4c8458e8
Signed-off-by: Greg Hogan <code@greghogan.com>
|
|
* guix/build-system/cmake.scm (cmake-system-name-for-target): Use match
instead of cond.
Change-Id: I57ebd07406693b19c83b6d1d643146adca4f8797
Signed-off-by: Greg Hogan <code@greghogan.com>
|
|
* guix/build-system/python.scm (package-with-explicit-python): Accept
pyproject-build-system resolved lazily.
Change-Id: I6e4186b8a7d2ec17afbf6af7d0f9e709cc55e14b
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Signed-off-by: Rutherther <rutherther@ditigal.xyz>
|
|
* guix/build-system/meson.scm (make-machine-alist): Add kernel value.
Change-Id: I29b67d2ed28b693db524c798786c39e705619897
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
|
|
* guix/build-system/meson.scm (make-cross-file): Add triplet and file
extension to the cross file.
Change-Id: Ie8ba187687670ec483cf4555a832590ec3ee8809
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
|
|
Meson is warning that the pkgconfig entry is deprecated.
DEPRECATION: "pkgconfig" entry is deprecated and should be replaced by "pkg-config".
* guix/build-system/meson.scm (make-binaries-alist): Replace deprecated 'pkgconfig with 'pkg-config.
Change-Id: Ic7f2ce5503661ad163c4cfe9cd307ff6175134ff
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
|
|
* guix/build-system/meson.scm (make-binaries-alist): Add windres when
compiling for mingw.
Change-Id: I7f1f34cd5129918f4aba0baf1d2742e0bfbbb751
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
|
|
* guix/build-system/cargo.scm (cargo-cross-build): Use the defined
cargo-guile-json as the guile-json implementation.
Reported-by: Christopher Baines <mail@cbaines.net>
Change-Id: I270024c07eb8fff452b7671d7d45fbe37300f54d
|
|
* guix/build/renpy-build-system.scm (start-xorg-server, check): New variables.
(%standard-phases): Adjust accordingly.
* guix/build-system/renpy.scm (renpy-build): Support #:tests? and #:test-flags.
|
|
The change was automated via:
git grep -l goodoldpaul@autistici.org |
xargs sed -i 's/goodoldpaul@autistici.org/therewasa@fishinthecalculator.me/g'
* .mailmap: New entry.
Change-Id: I1629388334695d221647afe6a14faf61af5fe0d6
Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop>
|
|
* guix/build-system/r.scm (bioconductor-uri): Update to 3.22.
* guix/import/cran.scm (%bioconductor-version): Set to 3.22.
Change-Id: I53c6b0d1ddc37faad90492103b7d02c210f945d7
|
|
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>
|
|
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>
|
|
* guix/build/renpy-build-system.scm: Use (json) rather than (guix build json).
(install, install-desktop-file): Replace ‘read-json’ with ‘json->scm’.
* guix/build-system/renpy.scm (default-guile-json): New variable.
(%renpy-build-system-modules): Adjust accordingly.
(renpy-build): Add guile-json argument and use it as extension.
Fixes guix/guix#2618.
|
|
Fixes guix/guix#2617.
* guix/build-system/elm.scm (%elm-build-system-modules)
(%elm-default-modules): Remove (guix build json).
(default-guile-json): New procedure.
(elm-build): Add guile-json extension.
* guix/build/elm-build-system.scm (stage, make-offline-registry-file)
(read-offline-registry, find-indirect-dependencies)
(patch-application-dependencies, configure): Refresh procedures
replacing (guix build json) procedures with (json) ones.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
|
|
* gnu/packages/luanti.scm (minetest-game): Rename package to luanti-minetest-game.
(luanti): Update reference to luanti-minetest-game.
* guix/build-system/luanti.scm (standard-luanti-packages): Update input name to luanti-minetest-game.
Change-Id: If1ad595040c59f5cd3014db0039980e45f6a92fb
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
|
|
* doc/guix.texi: Document mix-build-system and its most common keyword
arguments.
* gnu/build-system/mix.scm: Update links to documentation without hard
coding an Elixir version.
Change-Id: I68eb76efaaf5639f0eac2d9b674cdb05008e15a4
Reviewed-by: Hartmut Goebel <h.goebel@crazy-compilers.com>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
|
|
* guix/build-system/hare.scm: New file.
* guix/build/hare-build-system.scm: New file.
* Makefile.am (MODULES): Add above new files.
Change-Id: I5b760410f6cd2ede28b84e8d2db363ff968f16f6
Signed-off-by: jgart <jgart@dismail.de>
|
|
This reverts commit 11cf5b2fe4882f123cd5e9eb385a773703dfe872.
|
|
This module has been included in Guile as (system vm elf) since around version
2.1.
* guix/elf.scm: Delete file.
* CODEOWNERS: De-register module.
* Makefile.am (MODULES): Likewise.
* etc/teams.scm (core): Likewise.
* gnu/build/linux-modules.scm: Adjust imports.
* gnu/packages/gnuzilla.scm (icecat-minimal) [modules]: Likewise.
* gnu/packages/librewolf.scm (librewolf): Likewise.
* gnu/packages/sequoia.scm (sequoia): Likewise.
* gnu/packages/tor-browsers.scm (make-torbrowser): Likewise.
* gnu/packages/version-control.scm (hg-commitsigs): Likewise.
* guix/build/debug-link.scm: Likewise.
* guix/build/gnu-build-system.scm: Likewise.
* guix/build/gremlin.scm: Likewise.
* guix/build/meson-build-system.scm: Likewise.
* guix/grafts.scm (graft-derivation/shallow): Likewise.
* guix/scripts/pack.scm (wrapped-package): Likewise.
* tests/debug-link.scm: ("elf-debuglink", "set-debuglink-crc"): Likewise.
* tests/gremlin.scm: Likewise.
* guix/build-system/gnu.scm (%default-gnu-imported-modules): Remove (guix elf).
Change-Id: I86ac4237fdd820a6b54dc0fe7a7d10403a290ef9
|
|
Build phases that are not replaced when making the builder can depend on these
inputs, which is the case for example with linux-libre-arm64-mnt-reform.
* guix/build-system/linux-module.scm (make-linux-module-builder): Include
inputs from inherited package.
Change-Id: I1a0377b3baea4f2f7028474e48dad0e27e6bc828
|
|
* guix/build-system/qt.scm (qt-build): Wrap inner `qt-build' call with
`with-build-variables'.
Change-Id: Ic8448ca48844a9907fd37fafb1557a37b9e39cba
|
|
* guix/build-system/mix.scm (mix-build): Add test-flags keyword
argument and pass it on.
* guix/build/mix-build-system.scm (check): Add test-flags keyword
argument and pass it to Mix.
Change-Id: Ib8243aaaf7a7d02df993cee44f33b36566049e83
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
|
This reverts commit a7db92d9b389cbe565395523882c34c6eff2c21a, 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
|
|
This reverts commit d0d87a744d724b7e7d5ac013c586039652087bb3. Oops! This
caused a world rebuild.
Change-Id: I25fff644b2b61d0ee93d69b457b04c72b5b74d15
|
|
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
|
|
* guix/build-system.scm (@*): New macro for runtime module resolution.
* guix/build-system/agda.scm (default-agda): Use @* instead of
resolve-interface and module-ref.
* guix/build-system/android-ndk.scm (default-android-build,
default-android-googletest): Likewise.
* guix/build-system/ant.scm (default-jdk, default-ant, default-zip):
Likewise.
* guix/build-system/cargo.scm (default-rust): Likewise.
* guix/build-system/chicken.scm (default-chicken): Likewise.
* guix/build-system/composer.scm (default-php,
default-composer-classloader): Likewise.
* guix/build-system/dub.scm (default-ldc, default-dub,
default-pkg-config, default-ld-gold-wrapper): Likewise.
* guix/build-system/elm.scm (default-elm, default-elm-core,
default-elm-json): Likewise.
* guix/build-system/emacs.scm (default-emacs): Likewise.
* guix/build-system/glib-or-gtk.scm (default-glib): Likewise.
* guix/build-system/go.scm (default-go, default-gccgo, make-go-std):
Likewise.
* guix/build-system/haskell.scm (default-haskell): Likewise.
* guix/build-system/julia.scm (default-julia): Likewise.
* guix/build-system/linux-module.scm (default-linux): Likewise.
* guix/build-system/luanti.scm (default-optipng, default-luanti,
default-luanti-game, default-xvfb-run): Likewise. Remove otherwise
unused individual plugin accessor functions.
* guix/build-system/maven.scm (default-maven, default-jdk,
default-maven-plugins): Likewise. Remove otherwise unused individual
plugin accessor functions.
* guix/build-system/meson.scm (default-ninja, default-meson):
Likewise.
* guix/build-system/minify.scm (default-esbuild): Use @* instead of
resolve-interface and module-ref.
* guix/build-system/mix.scm (default-elixir-hex,
default-rebar3, default-elixir): Likewise.
* guix/build-system/node.scm (default-node): Likewise.
* guix/build-system/ocaml.scm (default-ocaml, default-findlib,
default-dune-build-system, default-ocaml4.07,
default-ocaml4.07-findlib ,default-ocaml4.07-dune, default-ocaml4.09,
default-ocaml4.09-findlib, default-ocaml4.09-dune, default-ocaml5.0,
default-ocaml5.0-findlib, default-ocaml5.0-dune): Likewise.
* guix/build-system/perl.scm (default-perl): Likewise.
* guix/build-system/pyproject.scm (default-python): Likewise.
* guix/build-system/qt.scm (default-qtbase): Likewise.
* guix/build-system/r.scm (default-r): Likewise.
* guix/build-system/rakudo.scm (default-rakudo, default-prove6,
default-zef): Likewise.
* guix/build-system/rebar.scm (default-rebar3, default-erlang):
Likewise.
* guix/build-system/renpy.scm (default-renpy): Likewise.
* guix/build-system/ruby.scm (default-ruby): Likewise.
* guix/build-system/scons.scm (default-scons): Likewise.
* guix/build-system/texlive.scm (default-texlive-bin,
texlive-latex-bin): Likewise.
* guix/build-system/tree-sitter.scm (default-guile-json,
default-node, default-tree-sitter, default-tree-sitter-cli): Likewise.
* guix/build-system/vim.scm (default-vim, default-neovim): Likewise.
* guix/build-system/zig.scm (default-zig): Likewise.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
|
Some arguments used for lower but not for the builder were passed as
arguments to the builders. Remove this ambiguity.
* guix/build-system/rakudo.scm (lower)[private-keywords]: Add keywords
with-prove6? and with-zed?,...
(rakudo-build): ... removed from here.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
|
* guix/build-system/android-ndk.scm (default-android-build,
default-android-googletest): Add and export variables.
(lower): Add their respective keywords.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
|
* guix/build-system/tree-sitter.scm (default-node,
default-tree-sitter, default-tree-sitter-cli): Add and export variables.
(lower): Add their respective keywords.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|