This is done to allow imagemagick (not /stable variant) to be updated more
freely.
* gnu/packages/inkscape.scm (inkscape/stable)
[arguments]: Use gexps. Add #:disallowed-references argument to guard against
referring to imagemagick/stable. Add #:configure-flags argument.
[inputs]: Remove imagemagick.
[native-inputs]: Relpace imagemagick with imagemagick/stable.
* gnu/packages/inkscape.scm (inkscape): Use gexps. Clear WITH_IMAGE_MAGICK
configure flag.
[inputs]: Add imagemagick.
Fixes: https://issues.guix.gnu.org/47479
Change-Id: Ifc812d2fc1eba5d2b45c3d7519ae38ac0294bd0a
Reported-by: Maxime Devos <maximedevos@telenet.be>
Also actually honor #:disallowed-references when cross-compiling.
* guix/build-system/cmake.scm (cmake-build): Add #:allowed-references keyword,
and pass it to gexp->derivation.
(cmake-cross-build): Likewise. Also pass disallowed-references to
gexp->derivation which had apparently been forgotten.
Change-Id: I1e9861295359b090bd5407c5f76afddf890e36bf
Once <https://issues.guix.gnu.org/47475> (‘Closure of bandage is way too
large’) has been fixed, the variant will probably be usable.
* gnu/packages/bioinformatics.scm (bandage):
[arguments]<#:disallowed-references>: Once the issue
has been fixed, prevent the imagemagick/stable package from ending up in the
closure.
[native-inputs]: Note that 'imagemagick/stable' cannot be used yet.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Ie13100eb424b14971055ff91db49bc7029cb6168
As the store item does not retain a reference to imagemagick,
it should be safe to use the 'imagemagick/stable' variant.
* gnu/packages/sphinx.scm (python-sphinx)
[arguments] Add #:disallowed-references to make sure no references to
imagemagick are retained.
[native-inputs]: Use 'imagemagick/stable' instead of 'imagemagick' and explain
why that's a safe thing to do.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I04bdc94e012f3fcb30c4ec113a0ae2e9d9373210
* gnu/packages/aux-files/python/sitecustomize.py: normalize sys.prefix to deal
with situations where it contains "../", as can happen in relocatable packs.
Change-Id: Ibfe13d7c2a14beaa199f599e64bc0b7bfb500fe8
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
While Python build was reproducible on a single machine, once multiple file
systems entered the picture, it was no longer true. The solution adopted by
the upstream (and Debian) was cherry-picked.
More info: <https://github.com/python/cpython/pull/8226>.
* gnu/packages/python.scm (python-3.10) [source]: Apply reproducibility patch.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I0273dc0f8511a7acdcc2b462a26cc29a9756c801
This is a follow-up commit to a869f4bef3 ("packages: Repack patched source
archives via zstd by default.").
* guix/packages.scm (patch-and-repack): Do not have xz fallback into the zstd
variable, which is confusing and caused the extension selection to be wrong
when the xz fallback was used. Refine how PATH is set to avoid duplicates.
Change-Id: I580deba4de822eccf5f6fe53355b8ba57178c166
Since PACKAGE-NAMES->PACKAGE-INPUTS is used by both the go and crate
importers, give the crate importer a copy of the original so it
continues to use old-style inputs until it is updated.
* guix/import/utils.scm (package-names->package-inputs)[make-input]:
Return new-style package inputs.
(maybe-inputs): Wrap PACKAGE-INPUTS in 'list' instead of 'quasiquote'.
* guix/import/crate.scm (package-names->package-inputs): New variable.
* tests/go.scm ("go-module->guix-package"): Adjust to new-style package
inputs.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This way, overriding the 'detection of 'build' isn't needed anymore.
* gnu/packages/dbm.scm (bdb-snippet): New procedure.
(bdb-4.8)[source]: Add the snippet.
[arguments]: Copy "config.sub"," "config.guess" and "install-sh" in a new
'boostrap phase', this time from automake. Move macros from aclocal_java
to aclocal. Move configure flags to #:configure-flags. Remove 'configure'
phase, instead add a pre-configure phase for adjusting Makefile.in and use
'#:out-of-source' to perform an out-of-source build. Run "s_config" to fix up
the version numbers.
(bdb-5.3)[source]: Inherit from bdb-4.8's source, to get the snippet.
(bdb-6)[source]: Likewise, and be careful to not add a patch.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I03aa7ed4afda15d970856efed9f14fd851ee7634
* guix/build/gnu-build-system.scm (compress-documentation)
[maybe-compress]: Expand regex to include man sections with alphabetic
suffixes.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
* gnu/packages/xorg.scm (libxres): Update to 1.2.2.
[source]: Fix uri due to release of xz archive.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
* gnu/packages/xorg.scm (xset): Update to 1.2.5.
[source]: Fix uri due to release of xz archive.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
* gnu/packages/xorg.scm (xprop): Update to 1.2.6.
[source]: Fix uri due to release of xz archive.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
