Ludovic Courtès
da86e90efe
gexp: Add 'sexp->gexp'.
...
* guix/gexp.scm (sexp->gexp): New procedure.
* tests/gexp.scm ("sexp->gexp"): New test.
2021-03-30 22:48:44 +02:00
Ludovic Courtès
4f5f1d98ef
packages: Default origin 'patch-flags' is a gexp.
...
Using a gexp instead of a list means that 'gexp->sexp' & co. do not need
to scan that list for file-like objects.
* guix/packages.scm (<origin>)[patch-flags]: Default to
%DEFAULT-PATCH-FLAGS.
(%default-patch-flags): New variable.
(patch-and-repack): #:flags defaults to %DEFAULT-PATCH-FLAGS.
(origin->derivation): Don't expect FLAGS to be a list.
2021-03-30 22:48:44 +02:00
Ludovic Courtès
9e5812ac59
packages: Core procedures are written in monadic style.
...
This plays better with the functional object cache, which is no longer
lost across calls to procedures created by 'store-lift'.
* guix/packages.scm (input-graft, input-cross-graft): Remove 'store'
parameter. Return a monadic procedure.
(bag-grafts): Remove 'store' parameter and turn into a monadic
procedure.
(graft-derivation*): New procedure.
(cached): Remove clause to match syntax without (=> CACHE).
(package-grafts): Define using 'store-lower'.
(package-grafts*): New procedure, from former 'package-grafts'. Remove
'store' parameter and turn into a monadic procedure.
(package->derivation): Rewrite using 'mcached' and a monadic variant of
the former 'package-derivation' procedure.
(package->cross-derivation): Likewise.
(package-derivation, package-cross-derivation): Rewrite in terms of
'store-lower'.
(%graft-cache): Remove.
2021-03-30 22:48:43 +02:00
Ludovic Courtès
37c32caf2c
packages: Simplify patch instantiation.
...
* guix/packages.scm (patch-and-repack)[instantiate-patch]: Use
'local-file' instead of 'interned-file'. When PATCH is a struct, return
it. Use 'let' instead of 'mlet'.
2021-03-30 22:48:43 +02:00
Ludovic Courtès
ba41f87ec7
packages: Turn 'bag->derivation' into a monadic procedure.
...
* guix/packages.scm (bag->derivation): Turn into a monadic procedure by
remove 'store' parameter and removing the call to 'store-lower'.
(bag->cross-derivation): Likewise.
(bag->derivation*): New procedure.
(package-derivation, package-cross-derivation): Use it instead of
'bag->derivation'.
* tests/packages.scm ("bag->derivation"): Change to monadic style.
("bag->derivation, cross-compilation"): Likewise.
2021-03-30 22:48:43 +02:00
Ludovic Courtès
7d873f194c
build-system: Rewrite using gexps.
...
* guix/packages.scm (expand-input): Remove 'store', 'system', and
'cross-system' parameters; add #:native?. Rewrite to return
name/gexp-input tuples.
(bag->derivation): Adjust accordingly. Lower (bag-build bag).
(bag->cross-derivation): Ditto. Instead of #:native-drvs and
#:target-drvs, pass #:build-inputs, #:host-inputs, and #:target-inputs.
(%derivation-cache): Remove.
* gnu/packages/bootstrap.scm (raw-build): Turn into a monadic procedure.
* gnu/packages/commencement.scm (glibc-final)[arguments]: Use
'gexp-input' for the #:allowed-references argument.
* guix/build-system/cmake.scm (cmake-build): Remove 'store' parameter.
Switch to the use of gexps and 'gexp->derivation'.
(lower): Remove #:source from 'private-keywords'.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build, lower):
Likewise.
* guix/build-system/font.scm (font-build): Likewise.
* guix/build-system/gnu.scm (gnu-build): Likewise, and remove
'canonicalize-reference'.
(gnu-cross-build): Likewise, and expect #:build-inputs, #:host-inputs,
and #:target-inputs instead of #:native-drvs and #:target-drvs.
(lower): Likewise.
* guix/build-system/perl.scm (perl-build, lower): Likewise.
* guix/build-system/python.scm (python-build, lower): Likewise.
* guix/build-system/ruby.scm (ruby-build, lower): Likewise.
* guix/build-system/waf.scm (waf-build, lower): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Remove.
(trivial-build): Remove 'store' parameter, change to gexps.
(trivial-cross-build): Ditto, and change to #:build-inputs & co.
* guix/build-system/cargo.scm (cargo-build): Change to 'gexp->derivation'.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/dune.scm (dune-build): Likewise.
* guix/build-system/guile.scm (guile-build, guile-cross-build):
Likewise.
* guix/build-system/meson.scm (meson-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/scons.scm (scons-build): Likewise.
* guix/build-system/texlive.scm (texlive-build): Likewise.
* guix/build-system/android-ndk.scm (android-ndk-build): Likewise.
* guix/build-system/ant.scm (ant-build): Likewise.
* guix/build-system/asdf.scm (asdf-build/source, asdf-build): Likewise.
* guix/build-system/chicken.scm (chicken-build): Likewise.
* guix/build-system/clojure.scm (clojure-build): Likewise.
(source->output-path, maybe-guile->guile): Remove.
* guix/build-system/dub.scm (dub-build): Likewise.
* guix/build-system/emacs.scm (emacs-build): Likewise.
* guix/build-system/go.scm (go-build): Likewise.
* guix/build-system/haskell.scm (haskell-build): Likewise.
* guix/build-system/julia.scm (julia-build): Likewise.
* guix/build-system/linux-module.scm (linux-module-build)
(linux-module-build-cross): Likewise.
* guix/build-system/maven.scm (maven-build): Likewise.
* guix/build-system/minify.scm (minify-build): Likewise.
* guix/build-system/node.scm (node-build): Likewise.
* guix/build-system/qt.scm (qt-build, qt-cross-build): Likewise.
* guix/build-system/r.scm (r-build): Likewise.
* guix/build-system/rakudo.scm (rakudo-build): Likewise.
* guix/build-system/renpy.scm (renpy-build): Likewise.
* tests/builders.scm ("gnu-build"): Call 'store-lower' on 'gnu-build'.
Pass #:source parameter.
* tests/packages.scm ("search paths"): Use 'abort-to-prompt' instead of
a normal return from the 'build' method.
("package->bag, sensitivity to %current-target-system"): Change 'build'
to match the new build system signature.
squash! build-system: Rewrite using gexps.
squash! build-system: Rewrite using gexps.
2021-03-30 22:48:43 +02:00
Ludovic Courtès
a76b6f8120
gexp: Optimize 'with-build-variables'.
...
* guix/gexp.scm (input-tuples->gexp, outputs->gexp): New procedures.
(with-build-variables): Use it.
2021-03-30 22:48:43 +02:00
Ludovic Courtès
789babb761
gexp: Add 'with-build-variables'.
...
* guix/gexp.scm (with-build-variables): New procedure.
2021-03-30 22:48:43 +02:00
Maxim Cournoyer
cea364e7ff
gnu: nettle: Update to 3.7.2.
...
* gnu/packages/nettle.scm (nettle): Update to 3.7.2.
2021-03-30 12:07:15 -04:00
Simon Tournier
00c67375b1
gnu: zstd: Fix tests on 32-bit architectures.
...
* gnu/packages/compression.scm (zstd)[arguments]<#:phases>: Add
'fix-tests-32bit.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-30 00:57:26 +02:00
Léo Le Bouter
b20b45c6ce
gnu: gd: Patch away recent pkg-config files change that breaks php build.
...
* gnu/packages/patches/gd-Revert-fix-303-gdlib.pc-use-Requires-instead-of-Libs.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/gd.scm (gd): Apply patch.
2021-03-28 20:13:22 +02:00
Raghav Gururajan
b8d70b956d
gnu: glib-networking: Update home-page, synopsis, description and license.
...
* gnu/packages/gnome.scm (glib-networking)[home-page]: Modify.
[synopsis]: Modify.
[description]: Modify.
[license]: Update to lgpl2.1+.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-28 17:55:14 +02:00
Raghav Gururajan
a1dd57ce83
gnu: glib-networking: Enable libproxy and openssl support.
...
* gnu/packages/gnome.scm (glib-networking)[configure-flags]: Remove
libproxy_support flag and add openssl flag.
[inputs]: Add libproxy and openssl.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-28 17:55:14 +02:00
Raghav Gururajan
624832ddd1
gnu: glib-networking: Update to 2.68.0.
...
* gnu/packages/gnome.scm (glib-networking)[version]: Update to 2.68.0.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-28 17:55:14 +02:00
Tobias Geerinckx-Rice
57e8e8c916
gnu: zstd: Fix unnecessary dependency upon $PATH.
...
* gnu/packages/compression (zstd)[arguments]:
Add a 'patch-command-file-names phase.
2021-03-27 13:47:59 +01:00
Raghav Gururajan
76b689f339
gnu: gtkmm-2: Fix build.
...
* gnu/packages/gtk.scm (gtkmm-2)[arguments]: Remove field.
[native-inputs]: Remove field.
[propagated-inputs]: Change; atkmm to atkmm-2.28, pangomm to pangomm-2.42,
cairomm to cairomm-1.13 and glibmm to glibmm-2.64.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:04 -04:00
Raghav Gururajan
d893a1ea3d
gnu: gtkmm: Update to 3.24.4.
...
* gnu/packages/gtk.scm (gtkmm)[version]: Update to 3.24.4.
[build-system]: Change from gnu to glib-or-gtk.
[outputs]: New output "doc".
[arguments]<#:phases>['start-xvfb]: Remove phase.
['pre-check]: New phase.
['move-doc]: New phase.
[native-inputs]: Add graphviz, doxygen, m4, mm-common, perl and
libxslt.
[synopsis]: Modify.
[description]: Modify.
[license]: Add gpl2+.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:04 -04:00
Raghav Gururajan
c2f50f7458
gnu: gtk+: Update to 3.24.27.
...
* gnu/packages/gtk.scm (gtk+) [version]: Update to 3.24.27.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:04 -04:00
Raghav Gururajan
e4fdcdee4c
gnu: gtk+: Enable cloud-providers support.
...
* gnu/packages/gtk.scm (gtk+) [arguments]<#:configure-flags>
[--enable-cloudproviders]: New flag.
[propagated-inputs]: Add libcloudproviders.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:04 -04:00
Raghav Gururajan
0f9355c06c
gnu: gtk+: Add missing inputs.
...
* gnu/packages/gtk.scm (gtk+) [native-inputs]: Add docbook-xml,
hicolor-icon-theme, intltool, sassc and libxslt.
[inputs]: Add graphene, harfbuzz, iso-codes and papi.
[propagated-inputs]: Add cairo, fribidi, fontconfig, freetype, glib,
libx11, libxcomposite, libxext, libxfixes and libxrender.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:04 -04:00
Raghav Gururajan
5721c0f03d
gnu: gtk+: Enable tests.
...
* gnu/packages/gtk.scm (gtk+) [arguments]<#:phases>['pre-configure]: Remove phase.
['disable-failing-tests]: New phase.
['pre-check]: New phase.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:04 -04:00
Raghav Gururajan
10b31b5eac
gnu: gtk+-2: Update to 2.24.33.
...
* gnu/packages/gtk.scm (gtk+-2) [version]: Update to 2.24.33.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:03 -04:00
Raghav Gururajan
e0fc4c1fa7
gnu: gtk+-2: Add missing inputs and search-path.
...
* gnu/packages/gtk.scm (gtk+-2) [native-inputs]: Add intltool.
[inputs]: Add libx11, libxext, libxkbcommon, libxrender and libxshmfence.
[propagated-inputs]: Add cairo and glib.
[search-paths]: New field.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:03 -04:00
Raghav Gururajan
3dcdf0c306
gnu: gtk+-2: Enable tests.
...
* gnu/packages/gtk.scm (gtk+-2) [arguments]<#:parallel-tests?>: New argument.
<#:phases>['disable-tests]: Remove phase.
['disable-failing-tests]: New phase.
['pre-check]: New phase.
[native-inputs]: Add xorg-server-for-tests.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:03 -04:00
Raghav Gururajan
e8e33c4ac3
gnu: yelp-xsl: Enable documentation.
...
* gnu/packages/gnome.scm (yelp-xsl) [arguments]<#:configure-flag>
[--enable-doc]: New flag.
[native-inputs]: Add mallard-ducktype, intltool and libxslt.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:03 -04:00
Raghav Gururajan
4d170cfb13
gnu: wayland-protocols: Update description.
...
* gnu/packages/freedesktop.scm (wayland-protocols) [description]: Modify.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:03 -04:00
Raghav Gururajan
084ac03ef0
gnu: wayland: Update synopsis, description and license.
...
* gnu/packages/freedesktop.scm (wayland) [synopsis]: Modify.
[description]: Modify.
[license]: Change from x11 to expat.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:03 -04:00
Raghav Gururajan
9c62b78f52
gnu: wayland: Fix and move documentation.
...
* gnu/packages/freedesktop.scm (wayland) [outputs]: New output "doc".
[arguments]<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:03 -04:00
Raghav Gururajan
ce469cf96d
gnu: wayland: Update to 1.19.0.
...
* gnu/packages/freedesktop.scm (wayland)[version]: Update to 1.19.0.
[build-system]: Change from gnu to meson.
[native-inputs]: Move here docbook-xml and docbook-xsl from ...
[inputs]: ... here. Move libffi to ...
[propagated-inputs]: ... here.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:03 -04:00
Raghav Gururajan
5a02cc8e64
gnu: json-glib: Update synopsis and description.
...
* gnu/packages/gnome.scm (json-glib) [synopsis]: Modify.
[description]: Modify.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:35:02 -04:00
Raghav Gururajan
b0e5b89976
gnu: json-glib: Enable documentation and man-pages.
...
* gnu/packages/gnome.scm (json-glib) [outputs]: New output "doc".
[arguments]<#:configure-flags>[-Ddocs]: New flag.
[-Dman]: New flag.
<#:phases>['patch-docbook]: New phase.
['move-doc]: New phase.
[native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc and libxslt.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:34:58 -04:00
Raghav Gururajan
be06dea224
gnu: json-glib: Update to 1.6.2.
...
* gnu/packages/gnome.scm (json-glib)[version]: Update to 1.6.2.
[arguments]<#:glib-or-gtk?>: New argument.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:00:33 -04:00
Raghav Gururajan
09998230b2
gnu: at-spi2-atk: Update home-page and license.
...
* gnu/packages/gtk.scm (at-spi2-atk) [home-page]: Modify.
[license]: Update to lgpl2.1+.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:00:33 -04:00
Raghav Gururajan
a14de3946c
gnu: at-spi2-atk: Update to 2.38.0.
...
* gnu/packages/gtk.scm (at-spi2-atk) [version]: Update to 2.38.0
[arguments]<#:glib-or-gtk?>: New argument.
[native-inputs]: Add gobject-introspection.
[inputs]: Add glib.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:00:33 -04:00
Raghav Gururajan
e2e527f0b4
gnu: at-spi2-core: Update home-page and license.
...
* gnu/packages/gtk.scm (at-spi2-core) [home-page]: Modify.
[license]: Update to lgpl2.1+.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:00:33 -04:00
Raghav Gururajan
5e4d1f6c40
gnu: at-spi2-core: Fix documentation.
...
* gnu/packages/gtk.scm (at-spi2-core) [arguments]<#:phases>['patch-docbook-sgml]: New phase.
[native-inputs]: Add docbook-xml.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:00:33 -04:00
Raghav Gururajan
34d4502729
gnu: at-spi2-core: Update to 2.40.0.
...
* gnu/packages/gtk.scm (at-spi2-core) [version]: Update to 2.40.0.
[arguments]<#:glib-or-gtk?>: New argument.
[native-inputs]: Add glib:bin and python-wrapper.
[propagated-inputs]: Add libx11.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:00:33 -04:00
Raghav Gururajan
ee71fd9f0e
gnu: Add atkmm-2.28.
...
* gnu/packages/gtk.scm (atkmm-2.28): New variable.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 16:00:26 -04:00
Raghav Gururajan
5756f4dfbb
gnu: atkmm: Update synopsis, description, home-page and license.
...
* gnu/packages/gtk.scm (atkmm) [synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Add gpl2+.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:40 -04:00
Raghav Gururajan
8b149214f3
gnu: atkmm: Enable documentation.
...
* gnu/packages/gtk.scm (atkmm) [outputs]: Add new output "doc".
[arguments]<#:configure-flags>[-Denable-documentation]: New flag.
[arguments]<#:phases>['move-doc]: New phase.
[native-inputs]: Add graphviz, doxygen.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:40 -04:00
Raghav Gururajan
2f31302b78
gnu: atkmm: Update to 2.36.0.
...
* gnu/packages/gtk.scm (atkmm) [version]: Update to 2.36.0.
[build-system]: Change from gnu to meson.
[arguments]<#:glib-or-gtk?>: New argument.
[native-inputs]: Add m4, mm-common, perl and libxslt.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:40 -04:00
Raghav Gururajan
da7d0c5ff0
gnu: atk: Update home-page and license.
...
* gnu/packages/gtk.scm (atk) [home-page]: Modify.
[license]: Update to lgpl2.1+.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:40 -04:00
Raghav Gururajan
aadca15113
gnu: atk: Update to 2.36.0.
...
* gnu/packages/gtk.scm (atk) [version]: Update to 2.36.0.
[arguments]<#:glib-or-gtk?>: New argument.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:40 -04:00
Raghav Gururajan
141d526c6c
gnu: atk: Re-arrange inputs in alphabetical order.
...
* gnu/packages/gtk.scm (atk) [native-inputs]: Modify.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:40 -04:00
Raghav Gururajan
46e236ff77
gnu: libgsf: Update synopsis, description, home-page and license.
...
* gnu/packages/gnome.scm (libgsf) [synopsis]: Modify.
[home-page]: Modify.
[description]: Modify.
[license]: Modify.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:40 -04:00
Raghav Gururajan
6f779ac5d3
gnu: libgsf: Enable documentation.
...
* gnu/packages/gnome.scm (libgsf) [outputs]: New output "doc".
[arguments]<#:configure-flags>[--with-html-dir]: New flag.
[native-inputs]: Add docbook-xml.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:39 -04:00
Raghav Gururajan
0ba9fee14d
gnu: libgsf: Correct inputs.
...
* gnu/packages/gnome.scm (libgsf) [native-inputs]: Add python-wrapper.
[propagated-inputs]: Move gdk-pixbuf to ...
[inputs]: ... here.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:39 -04:00
Raghav Gururajan
3094309b9d
gnu: libgsf: Enable missing features.
...
* gnu/packages/gnome.scm (libgsf) [arguments]<#:configure-flag>[--enable-introspection]: New flag.
[--with-gir-dir=]: New flag.
[--with-typelib-dir=]: New flag.
[--with-zlib]: New flag.
[--with-bz2]: New flag.
[native-inputs]: Add gobject-introspection.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:39 -04:00
Raghav Gururajan
d61767ae57
gnu: libgsf: Re-arrange inputs in alphabetical order.
...
* gnu/packages/gnome.scm (libgsf) [native-inputs]: Modify.
[inputs]: Modify.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:39 -04:00
Raghav Gururajan
2b1ed09746
gnu: libgsf: Make separate output for binaries.
...
* gnu/packages/gnome.scm (libgsf) [outputs]: New output "bin".
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
2021-03-26 15:43:39 -04:00