Age | Commit message (Collapse) | Author |
|
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
|
|
* gnu/packages/glib.scm (libaccounts-glib): New variable.
Co-authored-by: Marius Bakke <marius@gnu.org>
|
|
* gnu/packages/glib.scm (glib-next)[arguments]: Use gexp.
|
|
Conflicts resolved in:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/sdl.scm
pango-next, vala-next and librsvg-bootstrap were removed in the process.
|
|
* gnu/packages/glib.scm (glib-next): New variable.
(glib-with-documentation): Inherit from it.
|
|
* gnu/packages/glib.scm (gobject-introspection-next): New variable.
* gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch:
New file.
* gnu/packages/patches/gobject-introspection-cc-1.72.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Register them.
|
|
* gnu/packages/glib.scm (python-pygobject): Update to 3.42.2.
|
|
* gnu/packages/glib.scm (glibmm): Update to 2.72.1.
[phases]: Use gexps.
|
|
* gnu/packages/glib.scm (glib)[arguments]: Use a plain list.
[disallowed-references]: Adjust accordingly.
[configure-flags]: Likewise.
[phases]: Use gexps.
(glib-with-documentation)[phases]: Use gexps.
|
|
* gnu/packages/glib.scm (glib)[inputs]: Remove bash-completion,
elfutils. Move dbus from here ...
[native-inputs]: ... to here.
|
|
* gnu/packages/glib.scm (glib)[inputs]: Change from LIBELF to ELFUTILS.
|
|
|
|
* gnu/packages/glib.scm (python-pygobject): Update to 3.42.1.
|
|
* gnu/packages/glib.scm (python-pygobject)[properties]: New field.
|
|
* gnu/packages/glib.scm (gobject-introspection): Update to 1.72.0.
* gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch,
gnu/packages/patches/gobject-introspection-cc.patch: Rebase.
|
|
* gnu/packages/glib.scm (glib): Update to 2.72.3.
|
|
* gnu/packages/glib.scm (dbus): Update to 1.14.0.
[source](uri): Use .xz tarball.
|
|
* gnu/packages/glib.scm (itstool)[arguments]: Convert to gexp.
|
|
* gnu/packages/glib.scm (itstool): Update to 2.0.7.
|
|
* gnu/packages/glib.scm (itstool)[home-page]: Use HTTPS and remove defunct
subdomain.
|
|
|
|
* gnu/packages/glib.scm (dbus-verbose): New variable.
|
|
|
|
This partially fixes <https://issues.guix.gnu.org/54786>, allowing the 'jami'
and 'jami-provisioning' system tests to pass again.
In version 0.9.0, Shepherd constructors are now run concurrently, via
cooperative scheduling (Guile Fibers). The Jami service previously relied on
blocking sleeps while polling for D-Bus services to become ready after forking
a process; this wouldn't work anymore since while blocking the service process
wouldn't be given the chance to finish starting. The new reliance on Fibers
in Shepherd's fork+exec-command in the helper 'send-dbus' procedure also meant
that it wouldn't work outside of Shepherd anymore. Finally, the
'start-service' Shepherd procedure used in the test suite would cause the Jami
daemon to be spawned multiple times (a bug introduced in Shepherd 0.9.0).
To fix/simplify these problems, this change does the following:
1. Use the Guile AC/D-Bus library for D-Bus communication, which simplify
things, such as avoiding the need to fork 'dbus-send' processes.
2. The non-blocking 'sleep' version of Fiber is used for the 'with-retries'
waiting syntax.
3. A 'dbus' package variant is used to adjust the session bus configuration,
tailoring it for the use case at hand.
4. Avoid start-service in the tests, preferring 'jami-service-available?' for
now.
* gnu/build/jami-service.scm (parse-dbus-reply, strip-quotes)
(deserialize-item, serialize-boolean, dbus-dict->alist)
(dbus-array->list, parse-account-ids, parse-account-details)
(parse-contacts): Delete procedures.
(%send-dbus-binary, %send-dbus-bus, %send-dbus-user, %send-dbus-group)
(%send-dbus-debug): Delete parameters.
(jami-service-running?): New procedure.
(send-dbus/configuration-manager): Rename to...
(call-configuration-manager-method): ... this. Turn METHOD into a positional
argument. Turn ARGUMENTS into an optional argument. Invoke
`call-dbus-method' instead of `send-dbus', adjusting callers accordingly.
(get-account-ids, id->account-details, id->account-details)
(id->volatile-account-details, username->id, add-account remove-account)
(username->contacts, remove-contact, add-contact, set-account-details)
(set-all-moderators, username->all-moderators?, username->moderators)
(set-moderator): Adjust accordingly.
(with-retries, send-dbus, dbus-available-services)
(dbus-service-available?): Move to ...
* gnu/build/dbus-service.scm: ... this new module.
(send-dbus): Rewrite to use the Guile AC/D-Bus library.
(%dbus-query-timeout, sleep*): New variables.
(%current-dbus-connection): New parameter.
(initialize-dbus-connection!, argument->signature-type)
(call-dbus-method): New procedures.
(dbus-available-services): Adjust accordingly.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register new module.
* gnu/packages/glib.scm (dbus-for-jami): New variable.
* gnu/services/telephony.scm: (jami-configuration)[dbus]: Default to
dbus-for-jami.
(jami-dbus-session-activation): Write a D-Bus daemon configuration file at
'/var/run/jami/session-local.conf'.
(jami-shepherd-services): Add the closure of guile-ac-d-bus and guile-fibers
as extensions. Adjust imported modules. Remove no longer used parameters.
<jami-dbus-session>: Use a PID file, avoiding the need for the manual
synchronization.
<jami>: Set DBUS_SESSION_BUS_ADDRESS environment variable. Poll using
'jami-service-available?' instead of 'dbus-service-available?'.
* gnu/tests/telephony.scm (run-jami-test): Add needed Guile extensions. Set
DBUS_SESSION_BUS_ADDRESS environment variable. Adjust all tests to use
'jami-service-available?' to determine if the service is started rather than
the now problematic Shepherd's 'start-service'.
|
|
* gnu/packages/glib.scm (python2-pygobject, python2-pygobject-2): Delete
variables.
(python-pygobject)[properties]: Delete field.
* gnu/packages/patches/python2-pygobject-2-deprecation.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/gnome.scm (libsecret): Remove commented Python 2 inputs.
|
|
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
|
|
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
|
|
* gnu/packages/glib.scm (glib): Update to 2.70.2.
|
|
* gnu/packages/glib.scm (glibmm): Update to 2.70.0.
[native-inputs]: Use new style.
|
|
Fixes <https://issues.guix.gnu.org/52519>. The package was propagating two
variants of libsigc++.
* gnu/packages/glib.scm (glibmm-2.64)[propagated-inputs]: Replace existing
libsigc++ package instead of prepending an extra one.
Reported-by: Leo Famulari <leo@famulari.name>
|
|
* gnu/packages/glib.scm (glibmm): Remove trailing #t.
|
|
Fixes <https://issues.guix.gnu.org/52574>.
Reported by L p R n d n <guix@lprndn.info>.
Thanks to Maxime Devos for the suggested fix.
* gnu/packages/glib.scm (glib)[configure-flags]: Define as a G-expression.
(glib-with-documentation)[configure-flags]: Likewise.
|
|
* gnu/packages/glib.scm (gobject-introspection): Delete trailing #t.
[native-inputs]: Unconditionally use flex and bison.
|
|
|
|
* gnu/packages/glib.scm (telepathy-glib): Update to 0.24.2.
[source]: Drop upstreamed patches.
* gnu/packages/patches/telepathy-glib-channel-memory-leak.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
|
|
This is the result of running:
./pre-inst-env guix style --input-simplification=safe
and manually undoing changes on a dozen of packages to reduce
rebuilds (derivations for emacs, icecat, and libreoffice are unchanged.)
|
|
This commit was obtained by running:
./pre-inst-env guix style
without any additional argument.
|
|
* gnu/packages/glib.scm (appstream-glib) [inputs]: Use libsoup-minimal-2.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
|
* gnu/packages/glib.scm (glib): Update to 2.70. Remove trailing #t.
[outputs]: Add a debug output.
[configure-flags]: Specify --bindir and disable manpage generation.
[phases]{disable-failing-tests}: Disable the flaky testfilemonitor test.
{move-static-libraries}: Use rename-file instead of link and delete.
{move-bin}: Rename to...
{patch-pkg-config-files}: ... this, and adjust the substitutions.
[native-inputs]: Remove docbook-xsl, libxml2 and libxslt.
[properties]: Re-add the hidden? property that commit 18f73d80416 had
temporarily removed.
(glib-with-documentation)[properties]: Revert to a visible package.
[native-inputs]: Add docbook-xsl and libxslt.
[configure-flags]: Delete the inherited "-Dman=false" flag.
|
|
* gnu/packages/glib.scm (dbus-c++)[inputs]: Add libunwind.
|
|
Fixes <https://issues.guix.gnu.org/50957>.
This reverts the following commits:
- 42231bc (gnu: cheese: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- ad6a950 (gnu: mutter: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- 5e02d1a (gnu: cogl: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- 5c467b2 (gnu: libgweather: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- 26487f6 (gnu: librsvg-next: Do not propagate gdk-pixbuf)
- d891922 (gnu: librsvg: Do not propagate gdk-pixbuf)
- 22476d3 (gnu: libgsf: Do not propagate gdk-pixbuf)
- 099ca0e (gnu: libnotify: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- fb6a1ff (gnu: appstream-glib: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- 4fb525d (gnu: weasyprint: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
These commits were made to resolve a gdk-pixbuf loaders clash that could occur
in a profile when both gdk-pixbuf and gdk-pixbuf+svg were propagated.
Unfortunately, librsvg really needs to propagate gdk-pixbuf itself, which
would introduce a cycle. Packages such as 'efl' were broken as a result of
not propagating gdk-pixbuf.
A more definitive fix will be proposed for core-updates, which includes a
profile hook to generate the gdk-pixbuf loaders.cache file, as well as a build
phase and search path specification, that should resolve the issue for good.
|
|
* gnu/packages/glib.scm (python-pygobject)[version]: Update to 3.40.1.
[native-inputs]: Add python-wrapper.
|
|
Propagating gdk-pixbuf rather than gdk-pixbuf+svg is dangerous as it clashes
with GTK+'s own gdk-pixbuf+svg propagation.
* gnu/packages/glib.scm (appstream-glib)[propagated-inputs]: Replace gdk-pixbuf by
gdk-pixbuf+svg.
|
|
* gnu/packages/glib.scm (dbus-c++)[inputs]: Add libunwind.
|
|
Fixes <https://issues.guix.gnu.org/50957>.
This reverts the following commits:
- 42231bc (gnu: cheese: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- ad6a950 (gnu: mutter: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- 5e02d1a (gnu: cogl: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- 5c467b2 (gnu: libgweather: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- 26487f6 (gnu: librsvg-next: Do not propagate gdk-pixbuf)
- d891922 (gnu: librsvg: Do not propagate gdk-pixbuf)
- 22476d3 (gnu: libgsf: Do not propagate gdk-pixbuf)
- 099ca0e (gnu: libnotify: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- fb6a1ff (gnu: appstream-glib: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
- 4fb525d (gnu: weasyprint: Propagate gdk-pixbuf+svg rather than gdk-pixbuf)
These commits were made to resolve a gdk-pixbuf loaders clash that could occur
in a profile when both gdk-pixbuf and gdk-pixbuf+svg were propagated.
Unfortunately, librsvg really needs to propagate gdk-pixbuf itself, which
would introduce a cycle. Packages such as 'efl' were broken as a result of
not propagating gdk-pixbuf.
A more definitive fix will be proposed for core-updates, which includes a
profile hook to generate the gdk-pixbuf loaders.cache file, as well as a build
phase and search path specification, that should resolve the issue for good.
|
|
'python' is a tiny bit simpler than 'python-wrapper', and is already
used when cross-compiling. Use it unconditionally.
* gnu/packages/glib.scm (gobject-introspection)[inputs]{python}: Use 'python'
even when compiling natively.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
|
|
* gnu/packages/glib.scm (gobject-introspection)[native-inputs]: Make
'bison' and 'flex' inputs unconditional ...
(gobject-introspection)[inputs]: ... and unconditionally remove them here.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
|
|
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
|
|
* gnu/packages/glib.scm (glib)[arguments]: In 'disable-failing-tests'
phase, when 'target-x86-32?' returns true, skip several tests in
timer.c.
|
|
|