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/embedded.scm (mbed-tools)[arguments]<#:phases>: Drop
them, they are not required anymore.
Change-Id: I470d9ecae2e86defcb144f8c759fd7db819f44f0
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
* gnu/packages/embedded.scm (python-cmsis-pack-manager)[arguments]: In
the prepare-cargo-build-system phase, add prepare-rust-crates phase from
cargo-build-system.
Change-Id: Id9cfe39f0210c976dbcfc93ca1c27601e0435b15
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/embedded.scm (ebusd): Update to 26.1. Use GEXPs.
[arguments]<#:phases>: Set the proper path to the installed configuration in
the "patch" phase. Update the ebusd configuration installation path in
"install-config" phase.
[native-inputs]: Update "config" input: use the latest commit from the
upstream as the upstream has migrated from the old CSV configuration format to
TypeSpec format. Change the installation file name to "ebusd-configuration".
Change-Id: I61b18bfe812511c41ea11829db2034ae68bab058
* gnu/packages/embedded.scm (make-propeller-binutils)[arguments]: Simplify by
only using SUBSTITUTE-KEYWORD-ARGUMENTS.
Fixes <https://codeberg.org/guix/guix/issues/6533>.
Change-Id: If955af9d4c10790b767dc9e18b80ea718f33e859
* gnu/packages/embedded.scm (python-psptool): Update to 3.1.
[source]: Switch to git-fetch.
<snippet>: Drop it as no longer required.
[build-system]: Switch to pyproject-build-system.
[arguments] <test-backend>: Use 'unittest.
[native-inputs]: Add python-psptrace-bootstrap and python-setuptools.
Change-Id: Iadf37adc484d2b19db710e0110343e965b5e2e08
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/gcc.scm (gcc-4.7): Rename to gcc-base.
(gcc-4.7): New package, inherit from gcc-base.
[source]: Add snippet to fix building with newer glibc.
[arguments]: Add phase to adjust the C++ include path when not
cross-building.
[supported-systems]: Update supported systems.
(gcc-4.8, gcc-4.9, gcc-6): Inherit from gcc-base.
(base-gcc)[supported-systems]: Remove field.
* gnu/packages/embedded.scm (make-propeller-gcc-4): Inherit from
gcc-base.
Change-Id: I843049420e2afcf1ea342e87eaa9ac46576e4307
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
* gnu/packages/embedded.scm (ebusd): Update to 25.1.
[arguments]<#:phases>[patch]: Make it find the local configs.
Change-Id: Id862e3139b9590846eac0c8f4bbc156ef84b15d6
Since recently there has been a change to gdb package that introduced
configure-flags, three gdb packages broke, since they assumed there are no
configure-flags in gdb. That means they produced the same gdb as gdb-14.
This patche fixes that by ensuring configure-flags are appended to original package.
* gnu/packages/embedded.scm (make-gdb-arm-none-eabi)[arguments]: Append
configure-flags to original flags.
* gnu/packages/gdb.scm (gdb-multiarch)[arguments]: Likewise.
* gnu/packages/gdb.scm (avr-gdb)[arguments]: Likewise.
Signed-off-by: Janneke Nieuwenhuizen <janneke@gnu.org>
Change-Id: Ia8748b86dc72197bd4eef307d091b6af44fc5611
The nano variant for was not nano. It was just a copy of the original
one with different name. This meant there were no _nano.a files present
at all, and the flags were the same, not producing a smaller library.
* gnu/packages/embedded.scm (make-base-newlib-arm-none-eabi-7-2018-q2-update):
Rename variable from make-newlib-arm-none-eabi-7-2018-q2-update.
* gnu/packages/embedded.scm (make-newlib-nano-arm-none-eabi-7-2018-q2-update):
Add variable.
* gnu/packages/embedded.scm (make-newlib-arm-none-eabi-7-2018-q2-update):
Inherit from make-base-newlib-arm-none-eabi-7-2018-q2-update.
Change-Id: I01517ed860dfb2b6a9c7e912fd724832f5a0500a
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
The arm-none-eabi nano toolchain had same libstdc++ as the non-nano variant.
The libstdc++ should be compiled with -fno-exceptions to make a nano
toolchain.
Additionally, since the "_nano.a" variants were not present, it was impossible
to compile C++ programs with libstdc++ using --specs=nano.specs,
since libstdc++_nano.a was not found.
The `--with-target-subdir="."` flag is a preparation for gcc-12 introduction
since the libstdc++ doesn't build without that, failing on GCC_NO_EXECUTABLES
error in configure stage. I have not been able to find out another workaround.
* gnu/packages/embedded.scm (make-libstdc++-arm-none-eabi):
[arguments]<#:make-flags>: Add CFLAGS and CXXFLAGS.
[arguments]<#:configure-flags>: Add --with-target-subdir.
* gnu/packages/embedded.scm (make-libstdc++-nano-arm-none-eabi): Add variable.
Change-Id: I06a507fef07352a4ec80d84e4d97065343fc2295
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
The libstdc++ made for arm-none-eabi puts the contents
into "lib" folder, but that's unexpected when the resulting
toolchain is a cross toolchain.
The folder should be "arm-none-eabi/lib", that's the path
added to CROSS_C_LIBRARY_PATH
* gnu/packages/embedded.scm (make-libstdc++-arm-none-eabi):
[arguments]<#:configure-flags>: Point --libdir to arm-none-eabi/lib.
[arguments]<#:strip-directories>: Set to arm-none-eabi/lib.
Change-Id: Ia8b867a1c6ebeedeae9564e0a6a1e0401b35bd5b
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This fixes native-search-paths of arm-none-eabi toolchains
The toolchains CROSS_CPLUS_INCLUDE_PATH had C include directory
first, and the C++ as second. Since <cstdlib> does #include_next <stdlib.h>,
the toolchains could not build anything using <cstdlib>. The C include
has to come later than C++ one. This is already fixed in xgcc search-path.
* gnu/packages/embedded.scm (make-gcc-arm-none-eabi-4.9,
make-gcc-arm-none-eabi-7-2018-q2-update): [native-search-paths]: Put C include
path as last.
Change-Id: Ib7e36e57e510ac87960375cad40ff0b9e749101c
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This is the result of applying ‘guix style -S arguments’ and making
small adjustments.
* gnu/packages/base.scm (binutils)[arguments]: Use gexps.
(binutils-2.33, binutils-gold): Likewise.
* gnu/packages/commencement.scm (binutils-mesboot0, binutils-mesboot1)
(binutils-boot0, binutils-final): Likewise.
* gnu/packages/cross-base.scm (cross-binutils*): Adjust accordingly.
* gnu/packages/embedded.scm (make-propeller-binutils): Use gexps.
* gnu/packages/make-bootstrap.scm (%binutils-static): Use gexps.
Change-Id: I59cbe29760784b09e6d4e80beca9153cb9b495a7
* gnu/packages/embedded.scm (sdcc): Update to 4.4.0.
* gnu/packages/patches/sdcc-disable-non-free-code.patch: Update to match new
version.
Change-Id: Ie35c590a7f3004bc9f081d99b7ce019ac66cf3c0
Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
This can in some cases hide the real error with errors such as:
error: base:which: unbound variable
* gnu/packages/embedded.scm (openocd) [native-inputs]: Replace base:which with
which.
(binutils-vc4): Likewise.
(python-libmpsse): Likewise.
* gnu/packages/embedded.scm (sdcc): Update to 4.3.0.
* gnu/packages/patches/sdcc-disable-non-free-code.patch: Update to match new
version.
Signed-off-by: Christopher Baines <mail@cbaines.net>
* gnu/packages/embedded.scm (sdcc)[source]<snippet>: Use gexp; drop
trailing #t.
[arguments]: Use gexps.
<#:phases>: Drop trailing #t from phase.
Signed-off-by: Christopher Baines <mail@cbaines.net>
