08/13: gnu: lightdm: Apply patch to fix a problem with VNC integration.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit da3c784c68d9d3d0ec12eaaa98deaaf51ddb4c36
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 9 10:24:42 2022 -0400

gnu: lightdm: Apply patch to fix a problem with VNC integration.

* gnu/packages/patches/lightdm-vncserver-check.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/display-managers.scm (lightdm): Apply it.
---
 gnu/local.mk   |  1 +
 gnu/packages/display-managers.scm  |  7 ++-
 gnu/packages/patches/lightdm-vncserver-check.patch | 66 ++
 3 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 462aa7c731..6a55ecc8d8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1360,6 +1360,7 @@ dist_patch_DATA = 
\
   %D%/packages/patches/librime-fix-build-with-gcc10.patch  \
   %D%/packages/patches/libvirt-add-install-prefix.patch\
   %D%/packages/patches/libziparchive-add-includes.patch\
+  %D%/packages/patches/lightdm-vncserver-check.patch   \
   %D%/packages/patches/localed-xorg-keyboard.patch \
   %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \
   %D%/packages/patches/kiki-level-selection-crash.patch\
diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index d6cf9445c6..022e0509aa 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -268,7 +268,8 @@ experience for your users, your family and yourself")
   (file-name (git-file-name name version))
   (sha256
(base32
-"1wr60c946p8jz9kb8zi4cd8d4mkcy7infbvlfzwajiglc22nblxn"
+"1wr60c946p8jz9kb8zi4cd8d4mkcy7infbvlfzwajiglc22nblxn"))
+  (patches (search-patches "lightdm-vncserver-check.patch"
 (build-system gnu-build-system)
 (arguments
  '(#:parallel-tests? #f ; fails when run in parallel
@@ -303,8 +304,8 @@ experience for your users, your family and yourself")
  (unsetenv "LC_ALL"))
 (inputs
  (list audit
-   bash-minimal   ;for cross-compilation
-   coreutils-minimal  ;ditto
+   bash-minimal ;for cross-compilation
+   coreutils-minimal;ditto
linux-pam
shadow   ;for sbin/nologin
libgcrypt
diff --git a/gnu/packages/patches/lightdm-vncserver-check.patch 
b/gnu/packages/patches/lightdm-vncserver-check.patch
new file mode 100644
index 00..0e31ff3d68
--- /dev/null
+++ b/gnu/packages/patches/lightdm-vncserver-check.patch
@@ -0,0 +1,66 @@
+Honor the Xvnc command specified in the config instead of using a hard-coded
+default.
+
+Submitted upstream at: https://github.com/canonical/lightdm/pull/265
+
+diff --git a/src/lightdm.c b/src/lightdm.c
+index 74f9ff2d..0ccfcd78 100644
+--- a/src/lightdm.c
 b/src/lightdm.c
+@@ -349,27 +349,42 @@ start_display_manager (void)
+ /* Start the VNC server */
+ if (config_get_boolean (config_get_instance (), "VNCServer", "enabled"))
+ {
+-g_autofree gchar *path = g_find_program_in_path ("Xvnc");
+-if (path)
++/* Validate that a the VNC command is available. */
++g_autofree gchar *command = config_get_string (config_get_instance 
(), "VNCServer", "command");
++if (command)
+ {
+-vnc_server = vnc_server_new ();
+-if (config_has_key (config_get_instance (), "VNCServer", "port"))
++g_auto(GStrv) tokens = g_strsplit (command, " ", 2);
++if (!g_find_program_in_path (tokens[0]))
+ {
+-gint port = config_get_integer (config_get_instance (), 
"VNCServer", "port");
+-if (port > 0)
+-vnc_server_set_port (vnc_server, port);
++g_warning ("Can't start VNC server; command '%s' not found", 
tokens[0]);
++return;
+ }
+-g_autofree gchar *listen_address = config_get_string 
(config_get_instance (), "VNCServer", "listen-address");
+-vnc_server_set_listen_address (vnc_server, listen_address);
+-g_signal_connect (vnc_server, VNC_SERVER_SIGNAL_NEW_CONNECTION, 
G_CALLBACK (vnc_connection_cb), NULL);
+-
+-g_debug ("Starting VNC server on TCP/IP port %d", 
vnc_server_get_port (vnc_server));
+-vnc_server_start (vnc_server);
+ }
+ else
+-g_warning ("Can't start VNC server, Xvnc is not in the path");
++{
++/* Fallback to 'Xvnc'. */
++if (!g_find_program_in_path ("Xvnc")) {
++g_warning ("Can't start VNC server; 'Xvnc' command not 
found");
++return;
++}
++}
++
++

04/13: gnu: lightdm-gtk-greeter: Use the glib-or-gtk-wrap phase as-is.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 0d23e9cda2a3777c035c36846fe7b994c818114b
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 9 00:54:22 2022 -0400

gnu: lightdm-gtk-greeter: Use the glib-or-gtk-wrap phase as-is.

* gnu/packages/display-managers.scm (lightdm-gtk-greeter)
[configure-flags]: Install binaries to bin/, so the wrap phase of 
glib-or-gtk
handles them.
[phases]{wrap-program}: Delete.
{custom-wrap}: New phase, wrapping the wrapper with a few extra environment
variables.
---
 gnu/packages/display-managers.scm | 54 +++
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index 53002f2122..11d5c519ea 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -54,6 +54,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages guile)
   #:use-module (gnu packages image)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages linux)
@@ -353,6 +354,9 @@ display manager which supports different greeters.")
  (list
   #:configure-flags
   #~(list "--disable-indicator-services-command" ;requires upstart
+  ;; Put the binary under /bin rather than /sbin, so that it gets
+  ;; wrapped by the glib-or-gtk-wrap phase.
+  (string-append "--sbindir=" #$output "/bin")
   (string-append "--enable-at-spi-command="
  (search-input-file
   %build-inputs "libexec/at-spi-bus-launcher")))
@@ -367,35 +371,29 @@ display manager which supports different greeters.")
 (("Exec=lightdm-gtk-greeter")
  (string-append "Exec="
 (search-input-file
- outputs "sbin/lightdm-gtk-greeter"))
-  (add-after 'fix-.desktop-file 'wrap-program
-;; Mimic glib-or-gtk build system which doesn't wrap files in
-;; /sbin.
-(lambda* (#:key outputs inputs #:allow-other-keys)
-  (let ((gtk #$(this-package-input "gtk+"))
-(shared-mime-info #$(this-package-input 
"shared-mime-info"))
-(glib #$(this-package-input "glib")))
-(wrap-program (search-input-file
-   outputs "sbin/lightdm-gtk-greeter")
-  ;; Wrap GDK_PIXBUF_MODULE_FILE, so that the SVG loader is
-  ;; available at all times even outside of profiles, such as
-  ;; when used in the lightdm-service-type.  Otherwise, it
-  ;; wouldn't be able to display its own icons.
-  `("GDK_PIXBUF_MODULE_FILE" =
-(,(search-input-file
-   inputs
-   "lib/gdk-pixbuf-2.0/2.10.0/loaders.cache")))
-  `("XDG_DATA_DIRS" ":" prefix
-,(cons "/run/current-system/profile/share"
-   (map (lambda (pkg)
-  (string-append pkg "/share"))
-(list gtk shared-mime-info glib
-  `("GTK_PATH" ":" prefix (,gtk))
-  `("GIO_EXTRA_MODULES" ":" prefix (,gtk))
-  '("XCURSOR_PATH" ":" prefix
-("/run/current-system/profile/share/icons")
+ outputs "bin/lightdm-gtk-greeter"))
+  (add-after 'glib-or-gtk-wrap 'custom-wrap
+(lambda* (#:key outputs #:allow-other-keys)
+  (wrap-script (search-input-file
+outputs "bin/lightdm-gtk-greeter")
+;; Wrap GDK_PIXBUF_MODULE_FILE, so that the SVG loader is
+;; available at all times even outside of profiles, such as
+;; when used in the lightdm-service-type.  Otherwise, it
+;; wouldn't be able to display its own icons.
+`("GDK_PIXBUF_MODULE_FILE" =
+  (,(search-input-file
+ outputs
+ "lib/gdk-pixbuf-2.0/2.10.0/loaders.cache")))
+`("XDG_DATA_DIRS" ":" prefix
+  (,(string-append "/run/current-system/profile/share:"
+   (getenv "XDG_DATA_DIRS"
+'("XCURSOR_PATH" ":" prefix
+  ("/run/current-system/profile/share/icons"
 (native-inputs
- (list exo intltool pkg-config xfce4-dev-tools))
+ (list exo
+   intltool
+   pkg-config
+   xfce4-dev-tools))
 (inputs
  (list at-spi2-core
bash-minimal ;for wrap-program

13/13: services: Add lightdm-service-type.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 0ea62e84a787fe94cfeadf67ef27ea995a382b84
Author: Maxim Cournoyer 
AuthorDate: Wed Aug 3 23:41:35 2022 -0400

services: Add lightdm-service-type.

* gnu/services/lightdm.scm: New service.
* tests/services/lightdm.scm: Test it.
* doc/guix.texi (X Window): Document it.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register it.

Co-authored-by: L p R n d n 
Co-authored-by: Ricardo Wurmus 
---
 Makefile.am|   1 +
 doc/guix.texi  | 202 +
 gnu/local.mk   |   1 +
 gnu/services/lightdm.scm   | 687 +
 gnu/tests/lightdm.scm  | 160 +++
 tests/services/lightdm.scm |  52 
 6 files changed, 1103 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 8df8222573..502ca73866 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -533,6 +533,7 @@ SCM_TESTS = \
   tests/services.scm   \
   tests/services/file-sharing.scm  \
   tests/services/configuration.scm \
+  tests/services/lightdm.scm   \
   tests/services/linux.scm \
   tests/services/telephony.scm \
   tests/sets.scm   \
diff --git a/doc/guix.texi b/doc/guix.texi
index 4f6973518f..7199ff6bc2 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -21278,6 +21278,208 @@ Relogin after logout.
 @end table
 @end deftp
 
+@cindex lightdm, graphical login manager
+@cindex display manager, lightdm
+@defvr {Scheme Variable} lightdm-service-type
+This is the type of the service to run the
+@url{https://github.com/canonical/lightdm,LightDM display manager}.  Its
+value must be a @code{lightdm-configuration} record, which is documented
+below.  Among its distinguishing features are TigerVNC integration for
+easily remoting your desktop as well as support for the XDMCP protocol,
+which can be used by remote clients to start a session from the login
+manager.
+
+In its most basic form, it can be used simply as:
+
+@lisp
+(service lightdm-service-type)
+@end lisp
+
+A more elaborate example making use of the VNC capabilities and enabling
+more features and verbose logs could look like:
+
+@lisp
+(service lightdm-service-type
+ (lightdm-configuration
+  (allow-empty-passwords? #t)
+  (xdmcp? #t)
+  (vnc-server? #t)
+  (vnc-server-command
+   (file-append tigervnc-server "/bin/Xvnc"
+"  -SecurityTypes None"))
+  (seats
+   (list (lightdm-seat-configuration
+  (name "*")
+  (user-session "ratpoison"))
+@end lisp
+@end defvr
+
+@c The LightDM service documentation can be auto-generated via the
+@c 'generate-doc' procedure at the bottom of the (gnu services lightdm)
+@c module.
+@c %start of fragment
+@deftp {Data Type} lightdm-configuration
+Available @code{lightdm-configuration} fields are:
+
+@table @asis
+@item @code{lightdm} (default: @code{lightdm}) (type: file-like)
+The lightdm package to use.
+
+@item @code{allow-empty-passwords?} (default: @code{#f}) (type: boolean)
+Whether users not having a password set can login.
+
+@item @code{debug?} (default: @code{#f}) (type: boolean)
+Enable verbose output.
+
+@item @code{xorg-configuration} (type: xorg-configuration)
+The default Xorg server configuration to use to generate the Xorg server
+start script.  It can be refined per seat via the @code{xserver-command}
+of the @code{} record, if desired.
+
+@item @code{greeters} (type: list-of-greeter-configurations)
+The LightDM greeter configurations specifying the greeters to use.
+
+@item @code{seats} (type: list-of-seat-configurations)
+The seat configurations to use.  A LightDM seat is akin to a user.
+
+@item @code{xdmcp?} (default: @code{#f}) (type: boolean)
+Whether a XDMCP server should listen on port UDP 177.
+
+@item @code{xdmcp-listen-address} (type: maybe-string)
+The host or IP address the XDMCP server listens for incoming
+connections.  When unspecified, listen on for any hosts/IP addresses.
+
+@item @code{vnc-server?} (default: @code{#f}) (type: boolean)
+Whether a VNC server is started.
+
+@item @code{vnc-server-command} (type: file-like)
+The Xvnc command to use for the VNC server, it's possible to provide
+extra options not otherwise exposed along the command, for example to
+disable security:
+
+@lisp
+(vnc-server-command (file-append tigervnc-server "/bin/Xvnc"
+ " -SecurityTypes None" ))
+@end lisp
+
+Or to set a PasswordFile for the classic (unsecure) VncAuth
+mecanism:
+
+@lisp
+(vnc-server-command (file-append tigervnc-server "/bin/Xvnc"
+ " -PasswordFile 
/var/lib/lightdm/.vnc/passwd"))
+@end lisp
+
+The password file should be manually created using the
+@command{vncpasswd} command.  Note that LightDM will create new sessions

10/13: gnu: lightdm: Apply patch to fix color depth issue with VNC.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit b096b939f74913cfed5ed3efb5701a9132854760
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 9 16:17:45 2022 -0400

gnu: lightdm: Apply patch to fix color depth issue with VNC.

* gnu/packages/patches/lightdm-vnc-color-depth.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/display-managers.scm (lightdm): Apply it.
---
 gnu/local.mk   |  1 +
 gnu/packages/display-managers.scm  |  3 +-
 gnu/packages/patches/lightdm-vnc-color-depth.patch | 81 ++
 3 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 396f227188..a9aebe5193 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1362,6 +1362,7 @@ dist_patch_DATA = 
\
   %D%/packages/patches/libziparchive-add-includes.patch\
   %D%/packages/patches/lightdm-arguments-ordering.patch\
   %D%/packages/patches/lightdm-vncserver-check.patch   \
+  %D%/packages/patches/lightdm-vnc-color-depth.patch   \
   %D%/packages/patches/localed-xorg-keyboard.patch \
   %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \
   %D%/packages/patches/kiki-level-selection-crash.patch\
diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index 2a0a72d145..137bd2739e 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -270,7 +270,8 @@ experience for your users, your family and yourself")
(base32
 "1wr60c946p8jz9kb8zi4cd8d4mkcy7infbvlfzwajiglc22nblxn"))
   (patches (search-patches "lightdm-arguments-ordering.patch"
-   "lightdm-vncserver-check.patch"
+   "lightdm-vncserver-check.patch"
+   "lightdm-vnc-color-depth.patch"
 (build-system gnu-build-system)
 (arguments
  '(#:parallel-tests? #f ; fails when run in parallel
diff --git a/gnu/packages/patches/lightdm-vnc-color-depth.patch 
b/gnu/packages/patches/lightdm-vnc-color-depth.patch
new file mode 100644
index 00..cd69977d6a
--- /dev/null
+++ b/gnu/packages/patches/lightdm-vnc-color-depth.patch
@@ -0,0 +1,81 @@
+There is no longer support for 8 bit color depth in TigerVNC (see:
+https://github.com/TigerVNC/tigervnc/commit/e86d8720ba1e79b486ca29a5c2b27fa25811e6a2);
+using it causes a fatal error.
+
+Submitted upstream at: https://github.com/canonical/lightdm/pull/265.
+
+diff --git a/data/lightdm.conf b/data/lightdm.conf
+index 0df38429..60e3e8b4 100644
+--- a/data/lightdm.conf
 b/data/lightdm.conf
+@@ -160,4 +160,4 @@
+ #listen-address=
+ #width=1024
+ #height=768
+-#depth=8
++#depth=24
+diff --git a/src/x-server-xvnc.c b/src/x-server-xvnc.c
+index 68340d53..27ca4454 100644
+--- a/src/x-server-xvnc.c
 b/src/x-server-xvnc.c
+@@ -127,7 +127,7 @@ x_server_xvnc_init (XServerXVNC *server)
+ XServerXVNCPrivate *priv = x_server_xvnc_get_instance_private (server);
+ priv->width = 1024;
+ priv->height = 768;
+-priv->depth = 8;
++priv->depth = 24;
+ }
+ 
+ static void
+diff --git a/tests/scripts/vnc-command.conf b/tests/scripts/vnc-command.conf
+index 0f1e25fd..335956d9 100644
+--- a/tests/scripts/vnc-command.conf
 b/tests/scripts/vnc-command.conf
+@@ -19,7 +19,7 @@ command=Xvnc -option
+ #?VNC-CLIENT CONNECT
+ 
+ # Xvnc server starts
+-#?XVNC-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=TRUE
++#?XVNC-0 START GEOMETRY=1024x768 DEPTH=24 OPTION=TRUE
+ 
+ # Daemon connects when X server is ready
+ #?*XVNC-0 INDICATE-READY
+diff --git a/tests/scripts/vnc-guest.conf b/tests/scripts/vnc-guest.conf
+index 431bb244..ce2b97db 100644
+--- a/tests/scripts/vnc-guest.conf
 b/tests/scripts/vnc-guest.conf
+@@ -21,7 +21,7 @@ user-session=default
+ #?VNC-CLIENT CONNECT
+ 
+ # Xvnc server starts
+-#?XVNC-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE
++#?XVNC-0 START GEOMETRY=1024x768 DEPTH=24 OPTION=FALSE
+ 
+ # Daemon connects when X server is ready
+ #?*XVNC-0 INDICATE-READY
+diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf
+index cdfe17b8..f0d65b7f 100644
+--- a/tests/scripts/vnc-login.conf
 b/tests/scripts/vnc-login.conf
+@@ -21,7 +21,7 @@ user-session=default
+ #?VNC-CLIENT CONNECT
+ 
+ # Xvnc server starts
+-#?XVNC-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE
++#?XVNC-0 START GEOMETRY=1024x768 DEPTH=24 OPTION=FALSE
+ 
+ # Daemon connects when X server is ready
+ #?*XVNC-0 INDICATE-READY
+diff --git a/tests/scripts/vnc-open-file-descriptors.conf 
b/tests/scripts/vnc-open-file-descriptors.conf
+index 753c84dd..e5d35730 100644
+--- a/tests/scripts/vnc-open-file-descriptors.conf
 b/tests/scripts/vnc-open-file-descriptors.conf
+@@ -21,7 +21,7 @@ user-session=default
+ #?VNC-CLIENT CONNECT
+ 
+ # Xvnc 

12/13: build: marionette: Add support for Tesseract OCR.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 42fee6d0f176aea5d208e3e6d8b5270abcf4173c
Author: Maxim Cournoyer 
AuthorDate: Fri Aug 12 11:23:29 2022 -0400

build: marionette: Add support for Tesseract OCR.

* gnu/build/marionette.scm (invoke-ocrad-ocr): New procedure.
(invoke-tesseract-ocr): Likewise.
(marionette-screen-text): Rename the #:ocrad argument to #:ocr.  Dispatch 
the
matching OCR invocation procedure.
(wait-for-screen-text): Rename the #:ocrad argument to #:ocr.
* gnu/tests/base.scm (run-basic-test): Adjust accordingly.
* gnu/tests/install.scm (enter-luks-passphrase): Likewise.
(enter-luks-passphrase-for-home): Likewise.
---
 gnu/build/marionette.scm | 67 
 gnu/tests/base.scm   |  4 +--
 gnu/tests/install.scm|  8 +++---
 3 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm
index 24170bbd30..06b699bd7b 100644
--- a/gnu/build/marionette.scm
+++ b/gnu/build/marionette.scm
@@ -268,39 +268,50 @@ Monitor\")."
  ;; The "quit" command terminates QEMU immediately, with no output.
  (unless (string=? command "quit") (wait-for-monitor-prompt monitor)
 
-(define* (marionette-screen-text marionette
- #:key
- (ocrad "ocrad"))
-  "Take a screenshot of MARIONETTE, perform optical character
-recognition (OCR), and return the text read from the screen as a string.  Do
-this by invoking OCRAD (file name for GNU Ocrad's command)"
-  (define (random-file-name)
-(string-append "/tmp/marionette-screenshot-"
-   (number->string (random (expt 2 32)) 16)
-   ".ppm"))
-
-  (let ((image (random-file-name)))
+(define* (invoke-ocrad-ocr image #:key (ocrad "ocrad"))
+  "Invoke the OCRAD command on image, and return the recognized text."
+  (let* ((pipe (open-pipe* OPEN_READ ocrad "-i" "-s" "10" image))
+ (text (get-string-all pipe)))
+(unless (zero? (close-pipe pipe))
+  (error "'ocrad' failed" ocrad))
+text))
+
+(define* (invoke-tesseract-ocr image #:key (tesseract "tesseract"))
+  "Invoke the TESSERACT command on IMAGE, and return the recognized text."
+  (let* ((output-basename (tmpnam))
+ (output-basename* (string-append output-basename ".txt")))
 (dynamic-wind
   (const #t)
   (lambda ()
-(marionette-control (string-append "screendump " image)
-marionette)
-
-;; Tell Ocrad to invert the image colors (make it black on white) and
-;; to scale the image up, which significantly improves the quality of
-;; the result.  In spite of this, be aware that OCR confuses "y" and
-;; "V" and sometimes erroneously introduces white space.
-(let* ((pipe (open-pipe* OPEN_READ ocrad
- "-i" "-s" "10" image))
-   (text (get-string-all pipe)))
-  (unless (zero? (close-pipe pipe))
-(error "'ocrad' failed" ocrad))
-  text))
+(let ((exit-val (status:exit-val
+ (system* tesseract image output-basename
+  (unless (zero? exit-val)
+(error "'tesseract' failed" tesseract))
+  (call-with-input-file output-basename* get-string-all)))
   (lambda ()
-(false-if-exception (delete-file image))
+(false-if-exception (delete-file output-basename))
+(false-if-exception (delete-file output-basename*))
+
+(define* (marionette-screen-text marionette #:key (ocr "ocrad"))
+  "Take a screenshot of MARIONETTE, perform optical character
+recognition (OCR), and return the text read from the screen as a string.  Do
+this by invoking OCR, which should be the file name of GNU Ocrad's
+@command{ocrad} or Tesseract OCR's @command{tesseract} command."
+  (define image (string-append (tmpnam) ".ppm"))
+  ;; Use the QEMU Monitor to save an image of the screen to the host.
+  (marionette-control (string-append "screendump " image) marionette)
+  ;; Process it via the OCR.
+  (cond
+   ((string-contains ocr "ocrad")
+(invoke-ocrad-ocr image #:ocrad ocr))
+   ((string-contains ocr "tesseract")
+(invoke-tesseract-ocr image #:tesseract ocr))
+   (else (error "unsupported ocr command"
 
 (define* (wait-for-screen-text marionette predicate
-   #:key (timeout 30) (ocrad "ocrad"))
+   #:key
+   (ocr "ocrad")
+   (timeout 30))
   "Wait for TIMEOUT seconds or until the screen text on MARIONETTE matches
 PREDICATE, whichever comes first.  Raise an error when TIMEOUT is exceeded."
   (define start
@@ -312,7 +323,7 @@ PREDICATE, whichever comes first.  Raise an error when 
TIMEOUT is exceeded."
   (let loop ((last-text #f))
 (if (> (car (gettimeofday)) end)
 (error 

09/13: gnu: lightdm: Apply patch to allow using VNC options.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit a4fd1840ab16086d6b9c4001b510d73ef5727222
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 9 15:47:21 2022 -0400

gnu: lightdm: Apply patch to allow using VNC options.

* gnu/packages/patches/lightdm-arguments-ordering.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/display-managers.scm (lightdm): Apply it.
---
 gnu/local.mk   |  1 +
 gnu/packages/display-managers.scm  |  3 +-
 .../patches/lightdm-arguments-ordering.patch   | 54 ++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6a55ecc8d8..396f227188 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1360,6 +1360,7 @@ dist_patch_DATA = 
\
   %D%/packages/patches/librime-fix-build-with-gcc10.patch  \
   %D%/packages/patches/libvirt-add-install-prefix.patch\
   %D%/packages/patches/libziparchive-add-includes.patch\
+  %D%/packages/patches/lightdm-arguments-ordering.patch\
   %D%/packages/patches/lightdm-vncserver-check.patch   \
   %D%/packages/patches/localed-xorg-keyboard.patch \
   %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \
diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index 022e0509aa..2a0a72d145 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -269,7 +269,8 @@ experience for your users, your family and yourself")
   (sha256
(base32
 "1wr60c946p8jz9kb8zi4cd8d4mkcy7infbvlfzwajiglc22nblxn"))
-  (patches (search-patches "lightdm-vncserver-check.patch"
+  (patches (search-patches "lightdm-arguments-ordering.patch"
+   "lightdm-vncserver-check.patch"
 (build-system gnu-build-system)
 (arguments
  '(#:parallel-tests? #f ; fails when run in parallel
diff --git a/gnu/packages/patches/lightdm-arguments-ordering.patch 
b/gnu/packages/patches/lightdm-arguments-ordering.patch
new file mode 100644
index 00..c3b513a19a
--- /dev/null
+++ b/gnu/packages/patches/lightdm-arguments-ordering.patch
@@ -0,0 +1,54 @@
+When providing the VNCServer command as 'Xvnc -SecurityTypes None',
+the formatted command line used would look like:
+
+  Xvnc  -SecurityTypes None :1 -auth /var/run/lightdm/root/:1
+
+which is invalid (the display number must appear first).
+
+Submitted upstream at: https://github.com/canonical/lightdm/pull/265
+
+ src/x-server-local.c | 14 +-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/x-server-local.c b/src/x-server-local.c
+index 7c4ab870..6c540d18 100644
+--- a/src/x-server-local.c
 b/src/x-server-local.c
+@@ -463,14 +463,20 @@ x_server_local_start (DisplayServer *display_server)
+ l_debug (display_server, "Logging to %s", log_file);
+ 
+ g_autofree gchar *absolute_command = get_absolute_command (priv->command);
++g_auto(GStrv) tokens = g_strsplit (absolute_command, " ", 2);
++const gchar* binary = tokens[0];
++const gchar *extra_options = tokens[1];
++
+ if (!absolute_command)
+ {
+ l_debug (display_server, "Can't launch X server %s, not found in 
path", priv->command);
+ stopped_cb (priv->x_server_process, X_SERVER_LOCAL (server));
+ return FALSE;
+ }
+-g_autoptr(GString) command = g_string_new (absolute_command);
++g_autoptr(GString) command = g_string_new (binary);
+ 
++/* The display argument must be given first when the X server used
++ * is Xvnc. */
+ g_string_append_printf (command, " :%d", priv->display_number);
+ 
+ if (priv->config_file)
+@@ -513,6 +519,12 @@ x_server_local_start (DisplayServer *display_server)
+ if (X_SERVER_LOCAL_GET_CLASS (server)->add_args)
+ X_SERVER_LOCAL_GET_CLASS (server)->add_args (server, command);
+ 
++/* Any extra user options provided via the VNCServer 'command'
++ * config option are appended last, so the user can override any
++ * of the above. */
++if (extra_options)
++g_string_append_printf (command, " %s", extra_options);
++
+ process_set_command (priv->x_server_process, command->str);
+ 
+ l_debug (display_server, "Launching X Server");
+-- 
+2.36.1
+

01/13: gnu: accountsservice: Update to 22.08.8, enable doc and test suite.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 12bb1c6db1a4163baf18e7434bac010b59c06ac8
Author: Maxim Cournoyer 
AuthorDate: Sun Aug 7 17:55:54 2022 -0400

gnu: accountsservice: Update to 22.08.8, enable doc and test suite.

* gnu/packages/freedesktop.scm (accountsservice): Update to 22.08.8.
[tests?]: Delete argument.
[configure-flags]: Remove obsolete "-Dsystemd" flag.  Add "-Ddocbook=true" 
and
"-Dgtk_doc=true".
[phases]{patch-docbook-references}: New phase.
{patch-/bin/cat}: Delete and merge into...
[patch-paths]: ... this phase, renamed from pre-configure.  Use
search-input-file.
[native-inputs]: Add docbook-xml-4.1.2, docbook-xsl, gtk-doc, libxml2,
libxslt, python-dbusmock, python-pygobject, vala and xmlto.
---
 gnu/packages/freedesktop.scm | 85 ++--
 1 file changed, 51 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 037a247243..8ebd0e5359 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -27,7 +27,7 @@
 ;;; Copyright © 2021 Robby Zambito 
 ;;; Copyright © 2021, 2022 Maxime Devos 
 ;;; Copyright © 2021 John Kehayias 
-;;; Copyright © 2021, 2021 Maxim Cournoyer 
+;;; Copyright © 2021, 2021, 2022 Maxim Cournoyer 
 ;;; Copyright © 2022 Daniel Meißner 
 ;;; Copyright © 2022 muradm 
 ;;;
@@ -1435,7 +1435,7 @@ message bus.")
 (define-public accountsservice
   (package
 (name "accountsservice")
-(version "0.6.55")
+(version "22.08.8")
 (source
  (origin
(method url-fetch)
@@ -1443,45 +1443,62 @@ message bus.")
"accountsservice/accountsservice-"
version ".tar.xz"))
(sha256
-(base32 "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz"
+(base32 "14d3lwik048h62qrzg1djdd2sqmxf3m1r859730pvzhrd6krg6ch"
 (build-system meson-build-system)
 (arguments
- `(#:tests? #f ; XXX: tests require DocBook 4.1.2
-   #:configure-flags
+ `(#:configure-flags
'("--localstatedir=/var"
- "-Dsystemdsystemunitdir=/tmp/empty"
- "-Dsystemd=false"
- "-Delogind=true")
+ "-Delogind=true"
+ "-Ddocbook=true"
+ "-Dgtk_doc=true"
+ "-Dsystemdsystemunitdir=/tmp/empty")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-/bin/cat
-   (lambda _
- (substitute* "src/user.c"
-   (("/bin/cat") (which "cat")
- (add-before
-  'configure 'pre-configure
-  (lambda* (#:key inputs #:allow-other-keys)
-(substitute* "meson_post_install.py"
-  (("in dst_dirs") "in []"))
-(let ((shadow (assoc-ref inputs "shadow")))
-  (substitute* '("src/user.c" "src/daemon.c")
-(("/usr/sbin/usermod")
- (string-append shadow "/sbin/usermod"))
-(("/usr/sbin/useradd")
- (string-append shadow "/sbin/useradd"))
-(("/usr/sbin/userdel")
- (string-append shadow "/sbin/userdel"))
-(("/usr/bin/passwd")
- (string-append shadow "/bin/passwd"))
-(("/usr/bin/chage")
- (string-append shadow "/bin/chage")
+ (add-after 'unpack 'patch-docbook-references
+   ;; Having XML_CATALOG_FILES set is not enough; xmlto does not seem
+   ;; to honor it.
+   (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* (find-files "." "\\.xml(\\.in)?$")
+   
(("http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd;)
+(search-input-file inputs "share/xml/dbus-1/introspect.dtd"))
+   (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd;)
+(search-input-file inputs "xml/dtd/docbook/docbookx.dtd")
+ (add-after 'unpack 'patch-paths
+   (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "meson_post_install.py"
+   (("in dst_dirs") "in []"))
+ (substitute* '("src/user.c" "src/daemon.c")
+   (("/bin/cat")
+(search-input-file inputs "bin/cat"))
+   (("/usr/sbin/usermod")
+(search-input-file inputs "sbin/usermod"))
+   (("/usr/sbin/useradd")
+(search-input-file inputs "sbin/useradd"))
+   (("/usr/sbin/userdel")
+(search-input-file inputs "sbin/userdel"))
+   (("/usr/bin/passwd")
+(search-input-file inputs "bin/passwd"))
+   (("/usr/bin/chage")
+(search-input-file inputs "bin/chage"
 (native-inputs
- `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.
-   ("gobject-introspection" ,gobject-introspection)
-   ("intltool" ,intltool)
-   

11/13: marionette: Improve the error message of 'wait-for-screen-text'.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 697b797160f8145f282767cedd66be2d7297fe1e
Author: Maxim Cournoyer 
AuthorDate: Fri Aug 12 08:53:46 2022 -0400

marionette: Improve the error message of 'wait-for-screen-text'.

* gnu/build/marionette.scm (wait-for-screen-text): Return the last OCR'd 
text
when the predicate fails to match instead of the not useful predicate 
object.
---
 gnu/build/marionette.scm | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm
index 4f409166db..24170bbd30 100644
--- a/gnu/build/marionette.scm
+++ b/gnu/build/marionette.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016-2022 Ludovic Courtès 
 ;;; Copyright © 2018 Chris Marusich 
+;;; Copyright © 2022 Maxim Cournoyer 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -308,13 +309,14 @@ PREDICATE, whichever comes first.  Raise an error when 
TIMEOUT is exceeded."
   (define end
 (+ start timeout))
 
-  (let loop ()
+  (let loop ((last-text #f))
 (if (> (car (gettimeofday)) end)
-(error "'wait-for-screen-text' timeout" predicate)
-(or (predicate (marionette-screen-text marionette #:ocrad ocrad))
-(begin
-  (sleep 1)
-  (loop))
+(error "'wait-for-screen-text' timeout" 'ocr-text: last-text)
+(let ((text (marionette-screen-text marionette #:ocrad ocrad)))
+  (or (predicate text)
+  (begin
+(sleep 1)
+(loop text)))
 
 (define %qwerty-us-keystrokes
   ;; Maps "special" characters to their keystrokes.

07/13: gnu: lightdm-gtk-greeter: Adjust --enable-at-spi-command value.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 0e76781df4be465caca9da59d467c926eb65a0da
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 9 01:06:28 2022 -0400

gnu: lightdm-gtk-greeter: Adjust --enable-at-spi-command value.

* gnu/packages/display-managers.scm (lightdm-gtk-greeter)
[configure-flags]: Add the '--launch-immediately' option to the
at-spi-bus-launcher to match what is used in the source.
---
 gnu/packages/display-managers.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index 6fbefafe7d..d6cf9445c6 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -360,8 +360,8 @@ display manager which supports different greeters.")
   (string-append "--with-libxklavier")
   (string-append "--enable-at-spi-command="
  (search-input-file
-  %build-inputs "libexec/at-spi-bus-launcher")))
-
+  %build-inputs "libexec/at-spi-bus-launcher")
+ " --launch-immediately"))
   #:phases
   #~(modify-phases %standard-phases
   (add-after 'unpack 'customize-default-config-path

06/13: gnu: lightdm-gtk-greeter: Adjust default config file path.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 20c8fb042c0d1c2b96e1a84e37011fb3eecf6258
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 9 01:05:29 2022 -0400

gnu: lightdm-gtk-greeter: Adjust default config file path.

* gnu/packages/display-managers.scm (lightdm-gtk-greeter)
[phases]{customize-default-config-path}: New phase.
---
 gnu/packages/display-managers.scm | 8 
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index e8f7f68c46..6fbefafe7d 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -364,6 +364,14 @@ display manager which supports different greeters.")
 
   #:phases
   #~(modify-phases %standard-phases
+  (add-after 'unpack 'customize-default-config-path
+(lambda _
+  (substitute* "src/Makefile.in"
+;; Have the default config directory sourced from
+;; /etc/lightdm/lightdm-gtk-greeter.conf, which is where the
+;; lightdm service writes it.
+(("\\$\\(sysconfdir)/lightdm/lightdm-gtk-greeter.conf")
+ "/etc/lightdm/lightdm-gtk-greeter.conf"
   (add-after 'install 'fix-.desktop-file
 (lambda* (#:key outputs #:allow-other-keys)
   (substitute* (search-input-file

02/13: gnu: accountsservice: Provide a means to locate extensions.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 6da5eed4e7e5859d158b835aee6c337fdcdc58c2
Author: Maxim Cournoyer 
AuthorDate: Sun Aug 7 23:54:05 2022 -0400

gnu: accountsservice: Provide a means to locate extensions.

* gnu/packages/patches/accountsservice-extensions.patch: New patch.
* gnu/packages/freedesktop.scm (accountsservice)[source]: Apply it.
[phases]{wrap-with-xdg-data-dirs}: New phase.
---
 gnu/local.mk   |  1 +
 gnu/packages/freedesktop.scm   | 12 +--
 .../patches/accountsservice-extensions.patch   | 25 ++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index fcbbdbd1fb..462aa7c731 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -843,6 +843,7 @@ dist_patch_DATA =   
\
   %D%/packages/patches/abseil-cpp-fix-strerror_test.patch  \
   %D%/packages/patches/adb-add-libraries.patch \
   %D%/packages/patches/adb-libssl_11-compatibility.patch   \
+  %D%/packages/patches/accountsservice-extensions.patch\
   %D%/packages/patches/aegis-constness-error.patch \
   %D%/packages/patches/aegis-perl-tempdir1.patch   \
   %D%/packages/patches/aegis-perl-tempdir2.patch   \
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 8ebd0e5359..ab6fb480a7 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1443,7 +1443,8 @@ message bus.")
"accountsservice/accountsservice-"
version ".tar.xz"))
(sha256
-(base32 "14d3lwik048h62qrzg1djdd2sqmxf3m1r859730pvzhrd6krg6ch"
+(base32 "14d3lwik048h62qrzg1djdd2sqmxf3m1r859730pvzhrd6krg6ch"))
+   (patches (search-patches "accountsservice-extensions.patch"
 (build-system meson-build-system)
 (arguments
  `(#:configure-flags
@@ -1479,7 +1480,14 @@ message bus.")
(("/usr/bin/passwd")
 (search-input-file inputs "bin/passwd"))
(("/usr/bin/chage")
-(search-input-file inputs "bin/chage"
+(search-input-file inputs "bin/chage")
+ (add-after 'install 'wrap-with-xdg-data-dirs
+   ;; This is to allow accountsservice finding extensions, which
+   ;; should be installed to the system profile.
+   (lambda* (#:key outputs #:allow-other-keys)
+ (wrap-program (search-input-file outputs 
"libexec/accounts-daemon")
+   '("XDG_DATA_DIRS" prefix
+ ("/run/current-system/profile/share"
 (native-inputs
  (list docbook-xml-4.1.2
docbook-xsl
diff --git a/gnu/packages/patches/accountsservice-extensions.patch 
b/gnu/packages/patches/accountsservice-extensions.patch
new file mode 100644
index 00..2cfab580e3
--- /dev/null
+++ b/gnu/packages/patches/accountsservice-extensions.patch
@@ -0,0 +1,25 @@
+Patch from NixOS retrieved from
+https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch.
+
+diff --git a/src/extensions.c b/src/extensions.c
+index 038dcb2..830465d 100644
+--- a/src/extensions.c
 b/src/extensions.c
+@@ -121,16 +121,7 @@ daemon_read_extension_directory (GHashTable  *ifaces,
+ continue;
+ }
+ 
+-/* Ensure it looks like "../../dbus-1/interfaces/${name}" */
+-const gchar * const prefix = "../../dbus-1/interfaces/";
+-if (g_str_has_prefix (symlink, prefix) && g_str_equal 
(symlink + strlen (prefix), name)) {
+-daemon_read_extension_file (ifaces, filename);
+-}
+-else {
+-g_warning ("Found accounts service vendor extension 
symlink %s, but it must be exactly "
+-   "equal to '../../dbus-1/interfaces/%s' for 
forwards-compatibility reasons.",
+-   filename, name);
+-}
++daemon_read_extension_file (ifaces, filename);
+ }
+ 
+ g_dir_close (dir);

05/13: gnu: lightdm-gtk-greeter: Enable libklavier support.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit d0046bc13ba8c5e532c2193149a6747eb60467a3
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 9 01:04:12 2022 -0400

gnu: lightdm-gtk-greeter: Enable libklavier support.

* gnu/packages/display-managers.scm (lightdm-gtk-greeter)
[configure-flags]: Add '--with-libxklavier'.
[inputs]: Add libxklavier.
---
 gnu/packages/display-managers.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index 11d5c519ea..e8f7f68c46 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -357,6 +357,7 @@ display manager which supports different greeters.")
   ;; Put the binary under /bin rather than /sbin, so that it gets
   ;; wrapped by the glib-or-gtk-wrap phase.
   (string-append "--sbindir=" #$output "/bin")
+  (string-append "--with-libxklavier")
   (string-append "--enable-at-spi-command="
  (search-input-file
   %build-inputs "libexec/at-spi-bus-launcher")))
@@ -400,6 +401,7 @@ display manager which supports different greeters.")
gtk+
guile-3.0
librsvg
+   libxklavier
lightdm
shared-mime-info))
 (synopsis "GTK+ greeter for LightDM")

branch master updated (3c2d2b4538 -> 0ea62e84a7)

[guix-commits]

apteryx pushed a change to branch master
in repository guix.

from 3c2d2b4538 gnu: security: Add fail2ban-service-type.
 new 12bb1c6db1 gnu: accountsservice: Update to 22.08.8, enable doc and 
test suite.
 new 6da5eed4e7 gnu: accountsservice: Provide a means to locate extensions.
 new 9376411fbe gnu: lightdm-gtk-greeter: Add GDK_PIXBUF_MODULE_FILE to 
wrapper.
 new 0d23e9cda2 gnu: lightdm-gtk-greeter: Use the glib-or-gtk-wrap phase 
as-is.
 new d0046bc13b gnu: lightdm-gtk-greeter: Enable libklavier support.
 new 20c8fb042c gnu: lightdm-gtk-greeter: Adjust default config file path.
 new 0e76781df4 gnu: lightdm-gtk-greeter: Adjust --enable-at-spi-command 
value.
 new da3c784c68 gnu: lightdm: Apply patch to fix a problem with VNC 
integration.
 new a4fd1840ab gnu: lightdm: Apply patch to allow using VNC options.
 new b096b939f7 gnu: lightdm: Apply patch to fix color depth issue with VNC.
 new 697b797160 marionette: Improve the error message of 
'wait-for-screen-text'.
 new 42fee6d0f1 build: marionette: Add support for Tesseract OCR.
 new 0ea62e84a7 services: Add lightdm-service-type.

The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile.am|   1 +
 doc/guix.texi  | 202 ++
 gnu/build/marionette.scm   |  79 ++-
 gnu/local.mk   |   5 +
 gnu/packages/display-managers.scm  |  83 ++-
 gnu/packages/freedesktop.scm   |  93 ++-
 .../patches/accountsservice-extensions.patch   |  25 +
 .../patches/lightdm-arguments-ordering.patch   |  54 ++
 gnu/packages/patches/lightdm-vnc-color-depth.patch |  81 +++
 gnu/packages/patches/lightdm-vncserver-check.patch |  66 ++
 gnu/services/lightdm.scm   | 687 +
 gnu/tests/base.scm |   4 +-
 gnu/tests/install.scm  |   8 +-
 gnu/tests/lightdm.scm  | 160 +
 tests/services/lightdm.scm |  52 ++
 15 files changed, 1496 insertions(+), 104 deletions(-)
 create mode 100644 gnu/packages/patches/accountsservice-extensions.patch
 create mode 100644 gnu/packages/patches/lightdm-arguments-ordering.patch
 create mode 100644 gnu/packages/patches/lightdm-vnc-color-depth.patch
 create mode 100644 gnu/packages/patches/lightdm-vncserver-check.patch
 create mode 100644 gnu/services/lightdm.scm
 create mode 100644 gnu/tests/lightdm.scm
 create mode 100644 tests/services/lightdm.scm

03/13: gnu: lightdm-gtk-greeter: Add GDK_PIXBUF_MODULE_FILE to wrapper.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 9376411fbe5be440c40ee6ea9b8dd2f2d3429f7b
Author: Maxim Cournoyer 
AuthorDate: Sun Aug 7 09:50:39 2022 -0400

gnu: lightdm-gtk-greeter: Add GDK_PIXBUF_MODULE_FILE to wrapper.

* gnu/packages/display-managers.scm (lightdm-gtk-greeter)
[build-system]: Use glib-or-gtk-build-system.
[phases]{wrap-program}: Add GDK_PIXBUF_MODULE_FILE to wrapper.
[inputs]: Add librsvg.
---
 gnu/packages/display-managers.scm | 22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index 6c1c5b6c25..53002f2122 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -37,6 +37,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system qt)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system trivial)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -347,7 +348,7 @@ display manager which supports different greeters.")
   (sha256
(base32
 "04q62mvr97l9gv8h37hfarygqc7p0498ig7xclcg4kxkqw0b7yxy"
-(build-system gnu-build-system)
+(build-system glib-or-gtk-build-system)
 (arguments
  (list
   #:configure-flags
@@ -376,6 +377,14 @@ display manager which supports different greeters.")
 (glib #$(this-package-input "glib")))
 (wrap-program (search-input-file
outputs "sbin/lightdm-gtk-greeter")
+  ;; Wrap GDK_PIXBUF_MODULE_FILE, so that the SVG loader is
+  ;; available at all times even outside of profiles, such as
+  ;; when used in the lightdm-service-type.  Otherwise, it
+  ;; wouldn't be able to display its own icons.
+  `("GDK_PIXBUF_MODULE_FILE" =
+(,(search-input-file
+   inputs
+   "lib/gdk-pixbuf-2.0/2.10.0/loaders.cache")))
   `("XDG_DATA_DIRS" ":" prefix
 ,(cons "/run/current-system/profile/share"
(map (lambda (pkg)
@@ -388,12 +397,13 @@ display manager which supports different greeters.")
 (native-inputs
  (list exo intltool pkg-config xfce4-dev-tools))
 (inputs
- (list bash-minimal ;for wrap-program
+ (list at-spi2-core
+   bash-minimal ;for wrap-program
+   gtk+
+   guile-3.0
+   librsvg
lightdm
-   shared-mime-info
-   at-spi2-core
-   glib
-   gtk+))
+   shared-mime-info))
 (synopsis "GTK+ greeter for LightDM")
 (home-page "https://github.com/xubuntu/lightdm-gtk-greeter;)
 (description "This package provides a LightDM greeter implementation using

02/02: gnu: security: Add fail2ban-service-type.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 3c2d2b453832167df02f4aa25de4857a003fbecf
Author: muradm 
AuthorDate: Tue Aug 23 23:13:55 2022 +0300

gnu: security: Add fail2ban-service-type.

* gnu/services/security.scm: New module.
* gnu/tests/security.scm: New module.
* gnu/local.mk: Add new security module and tests.
* doc/guix.text: Add fail2ban-service-type documentation.

Signed-off-by: Maxim Cournoyer 
---
 doc/guix.texi | 249 
 gnu/local.mk  |   3 +
 gnu/services/security.scm | 415 ++
 gnu/tests/security.scm| 221 
 4 files changed, 888 insertions(+)

diff --git a/doc/guix.texi b/doc/guix.texi
index 7bce8a567c..4f6973518f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -36311,6 +36311,255 @@ Extra command line options for 
@code{nix-service-type}.
 @end table
 @end deftp
 
+@cindex Fail2Ban
+@subsubheading Fail2Ban service
+
+@uref{http://www.fail2ban.org/, @code{fail2ban}} scans log files
+(e.g. @code{/var/log/apache/error_log}) and bans IP addresses that show
+malicious signs -- repeated password failures, attempts to make use of
+exploits, etc.
+
+@code{fail2ban-service-type} service type is provided by the @code{(gnu
+services security)} module.
+
+This service type runs the @code{fail2ban} daemon.  It can be configured
+in various ways, which are:
+
+@table @asis
+@item Basic configuration
+The basic parameters of the Fail2Ban service can be configured via its
+@code{fail2ban} configuration, which is documented below.
+
+@item User-specified jail extensions
+The @code{fail2ban-jail-service} function can be used to add new
+Fail2Ban jails.
+
+@item Shepherd extension mechanism
+Service developers can extend the @code{fail2ban-service-type} service
+type itself via the usual service extension mechanism.
+@end table
+
+@defvr {Scheme Variable} fail2ban-service-type
+
+This is the type of the service that runs @code{fail2ban} daemon.  Below
+is an example of a basic, explicit configuration:
+
+@lisp
+(append
+ (list
+  (service fail2ban-service-type
+   (fail2ban-configuration
+(extra-jails
+ (list
+  (fail2ban-jail-configuration
+   (name "sshd")
+   (enabled #t))
+  ;; There is no implicit dependency on an actual SSH
+  ;; service, so you need to provide one.
+  (service openssh-service-type))
+ %base-services)
+@end lisp
+@end defvr
+
+@deffn {Scheme Procedure} fail2ban-jail-service @var{svc-type} @var{jail}
+Extend @var{svc-type}, a @code{} object with @var{jail}, a
+@code{fail2ban-jail-configuration} object.
+
+For example:
+
+@lisp
+(append
+ (list
+  (service
+   ;; The 'fail2ban-jail-service' procedure can extend any service type
+   ;; with a fail2ban jail.  This removes the requirement to explicitly
+   ;; extend services with fail2ban-service-type.
+   (fail2ban-jail-service
+openssh-service-type
+(fail2ban-jail-configuration
+ (name "sshd")
+ (enabled #t)))
+   (openssh-configuration ...
+@end lisp
+@end deffn
+
+Below is the reference for the different @code{jail-service-type}
+configuration records.
+
+@c The documentation is to be auto-generated via
+@c 'generate-documentation'.  See at the bottom of (gnu services
+@c security).
+
+@deftp {Data Type} fail2ban-configuration
+Available @code{fail2ban-configuration} fields are:
+
+@table @asis
+@item @code{fail2ban} (default: @code{fail2ban}) (type: package)
+The @code{fail2ban} package to use.  It is used for both binaries and as
+base default configuration that is to be extended with
+@code{} objects.
+
+@item @code{run-directory} (default: @code{"/var/run/fail2ban"}) (type: string)
+The state directory for the @code{fail2ban} daemon.
+
+@item @code{jails} (default: @code{()}) (type: 
list-of-fail2ban-jail-configurations)
+Instances of @code{} collected from
+extensions.
+
+@item @code{extra-jails} (default: @code{()}) (type: 
list-of-fail2ban-jail-configurations)
+Instances of @code{} explicitly provided.
+
+@item @code{extra-content} (type: maybe-string)
+Extra raw content to add to the end of the @file{jail.local} file.
+
+@end table
+
+@end deftp
+
+@deftp {Data Type} fail2ban-ignore-cache-configuration
+Available @code{fail2ban-ignore-cache-configuration} fields are:
+
+@table @asis
+@item @code{key} (type: string)
+Cache key.
+
+@item @code{max-count} (type: integer)
+Cache size.
+
+@item @code{max-time} (type: integer)
+Cache time.
+
+@end table
+
+@end deftp
+
+@deftp {Data Type} fail2ban-jail-action-configuration
+Available @code{fail2ban-jail-action-configuration} fields are:
+
+@table @asis
+@item @code{name} (type: string)
+Action name.
+
+@item @code{arguments} (default: @code{()}) (type: list-of-arguments)
+Action arguments.
+
+@end table
+
+@end deftp
+
+@deftp {Data Type} fail2ban-jail-configuration
+Available @code{fail2ban-jail-configuration} fields 

branch master updated (3294fa2ba4 -> 3c2d2b4538)

[guix-commits]

apteryx pushed a change to branch master
in repository guix.

from 3294fa2ba4 tests: Add test for menu-entry roundtrips as sexps.
 new ba0dbe3bf2 gexp: directory-union: Fix documentation.
 new 3c2d2b4538 gnu: security: Add fail2ban-service-type.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/guix.texi | 249 
 gnu/local.mk  |   3 +
 gnu/services/security.scm | 415 ++
 gnu/tests/security.scm| 221 
 guix/gexp.scm |   4 +-
 5 files changed, 890 insertions(+), 2 deletions(-)
 create mode 100644 gnu/services/security.scm
 create mode 100644 gnu/tests/security.scm

01/02: gexp: directory-union: Fix documentation.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit ba0dbe3bf2ae4e036a6974489d30bd7f1571a13a
Author: Maxim Cournoyer 
AuthorDate: Thu Aug 25 22:50:14 2022 -0400

gexp: directory-union: Fix documentation.

* guix/gexp.scm (directory-union): Fix documentation.
---
 guix/gexp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/gexp.scm b/guix/gexp.scm
index ef92223048..73595a216b 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -2140,8 +2140,8 @@ Call RESOLVE-COLLISION when several files collide, 
passing it the list of
 colliding files.  RESOLVE-COLLISION must return the chosen file or #f, in
 which case the colliding entry is skipped altogether.
 
-When HARD-LINKS? is true, create hard links instead of symlinks.  When QUIET?
-is true, the derivation will not print anything."
+When COPY? is true, copy files instead of creating symlinks.  When QUIET?  is
+true, the derivation will not print anything."
   (define symlink
 (if copy?
 (gexp (lambda (old new)

18/19: gnu: gtk: Update to 4.6.7.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit a12a2aea285927a11dd2237fb4f58b4e334149c7
Author: Maxim Cournoyer 
AuthorDate: Fri Aug 26 15:29:36 2022 -0400

gnu: gtk: Update to 4.6.7.

* gnu/packages/gtk.scm (gtk): Update to 4.6.7.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f2e0b9561f..7608327e51 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1057,7 +1057,7 @@ application suites.")
 (define-public gtk
   (package
 (name "gtk")
-(version "4.6.6")
+(version "4.6.7")
 (source
  (origin
(method url-fetch)
@@ -1065,7 +1065,7 @@ application suites.")
(version-major+minor version)  "/"
name "-" version ".tar.xz"))
(sha256
-(base32 "0w5fb4grgmb6nhf2glq2y5xqnc9y4v3lm0s9xnbw5xv96p8y9gvv"))
+(base32 "1s0hn1mqw9zzr99bgc5bj90am2x6vr5g5q23mmzmqajy9dy2xzgg"))
(patches
 (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"
 (build-system meson-build-system)

16/19: gnu: at-spi2-core-minimal: Update to 2.45.90, rename to at-spi2-core.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 28d27ddd3dbd0cde763c73ca7eda79f4b3da8660
Author: Maxim Cournoyer 
AuthorDate: Mon Aug 22 23:19:17 2022 -0400

gnu: at-spi2-core-minimal: Update to 2.45.90, rename to at-spi2-core.

at-spi2-core now includes at-spi2-atk (see:
https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78).

* gnu/packages/gtk.scm (at-spi2-core-minimal): Rename to...
(at-spi2-core): ... this.  Update to 2.45.90.
[phases]{check}: Adjust per upstream changes.
[inputs]: Add libxml2.
[native-inputs]: Delete labels.  Add gsettings-desktop-schemas,
python-dbusmock and python-pytest.
(at-spi2-core-with-documentation): Variable renamed from at-spi2-core.  
Adjust
accordingly to changes to parent (inherited) package, and use gexps.
(at-spi2-atk): Deprecate by at-spi2-core.
(gtk+)[propagated-inputs]: Use at-spi2-core.
* gnu/packages/gnome.scm (orca)[inputs]: Likewise.
* gnu/packages/gnome.scm (gnome): Likewise.
---
 gnu/packages/chromium.scm |   2 +-
 gnu/packages/gnome.scm|   4 +-
 gnu/packages/gtk.scm  | 162 +++---
 3 files changed, 69 insertions(+), 99 deletions(-)

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 2f67e23f4d..1a62550aad 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -878,7 +878,7 @@
 (inputs
  (list alsa-lib
atk
-   at-spi2-atk
+   at-spi2-core
cups
curl
dbus
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d73d41c9a7..ad7efc442f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9444,7 +9444,7 @@ world.")
;; XXX: Find out exactly which ones are needed and why.
("font-abattis-cantarell",font-abattis-cantarell)
("font-dejavu"   ,font-dejavu)
-   ("at-spi2-core"  ,at-spi2-core-minimal)
+   ("at-spi2-core"  ,at-spi2-core)
("dbus"  ,dbus)
("dconf" ,dconf)
("desktop-file-utils",desktop-file-utils)
@@ -10391,7 +10391,7 @@ accessibility infrastructure.")
pkg-config
libxml2))
 (inputs
- (list at-spi2-atk
+ (list at-spi2-core
gsettings-desktop-schemas
gstreamer
gst-plugins-base
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 70e1c2d1d4..f2e0b9561f 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -724,11 +724,11 @@ ever use this library.")
 (license license:lgpl2.1+)))
 
 ;;; A minimal variant used to prevent a cycle with Inkscape.
-(define-public at-spi2-core-minimal
+(define-public at-spi2-core
   (hidden-package
(package
  (name "at-spi2-core")
- (version "2.40.0")
+ (version "2.45.90")
  (source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -736,33 +736,44 @@ ever use this library.")
name "-" version ".tar.xz"))
(sha256
 (base32
- "0a9l6cfxynjn6jcp29d72i75xbkrzs1l5kmqcwmfal801b9sg5j1"
+ "03dba3c6m3sfapkkbbgzvbi1qcmrrlppydxjjs1m8ds9qb9hl1g9"
  (build-system meson-build-system)
  (arguments
-  '(#:glib-or-gtk? #t; To wrap binaries and/or compile schemas
-#:phases
-(modify-phases %standard-phases
-  (add-after 'install 'check
-(lambda _
-  (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable 
HOME
-  ;; Run test-suite under a dbus session.
-  (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
-  (string-append %output "/share"))
-  ;; Don't fail on missing  '/etc/machine-id'.
-  (setenv "DBUS_FATAL_WARNINGS" "0") ;
-  (invoke "dbus-launch" "ninja" "test")))
-  (delete 'check
+  (list
+   #:glib-or-gtk? #t  ;to wrap binaries and/or compile schemas
+   #:phases
+   #~(modify-phases %standard-phases
+   (delete 'check)
+   (add-after 'install 'check
+ (lambda _
+   (setenv "HOME" (getenv "TMPDIR")) ;xfconfd requires a writable 
HOME
+   ;; Run test-suite under a dbus session.
+   (setenv "XDG_DATA_DIRS"  ;for finding org.xfce.Xfconf.service
+   (string-append #$output "/share:" (getenv 
"XDG_DATA_DIRS")))
+   ;; Don't fail on missing  '/etc/machine-id'.
+   (setenv "DBUS_FATAL_WARNINGS" "0")
+   (with-directory-excursion (string-append "../at-spi2-core-"
+#$version "")
+ (invoke "dbus-run-session" "--" "ci/run-registryd-tests.sh")
+

17/19: gnu: python-numpy: Skip 'test_rint_big_int' test.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 0c6586df3bd6e3a42fcf273605d2714ed5dc626f
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 23 21:41:54 2022 -0400

gnu: python-numpy: Skip 'test_rint_big_int' test.

* gnu/packages/python-xyz.scm (python-numpy)
[phases]{check}: Skip the 'test_rint_big_int' test.
---
 gnu/packages/python-xyz.scm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 12a5bfa8dd..ca4d7f9cf4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5686,7 +5686,11 @@ include_dirs = ~:*~a/include~%" #$(this-package-input 
"openblas"))
   ;; These tests may fail on 32-bit systems (see:
   ;; https://github.com/numpy/numpy/issues/18387).
   "not test_float_remainder_overflow "
-  "and not test_pareto"
+  "and not test_pareto "
+  ;; The 'test_rint_big_int' test fails on older
+  ;; x86_64 CPUs such as the Core 2 Duo (see:
+  ;; https://github.com/numpy/numpy/issues/22170).
+  "and not test_rint_big_int "
   ;; These tests seem to fail on machines without
   ;; an FPU is still under investigation upstream.
   ;; https://github.com/numpy/numpy/issues/20635

19/19: gnu: nghttp2: Fix conditional openssl:static input.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 9b389f229b40bbdf31ca4b9739bb87c9069b157e
Author: Maxim Cournoyer 
AuthorDate: Sun Aug 28 21:00:51 2022 -0400

gnu: nghttp2: Fix conditional openssl:static input.

This is a follow up to commit 3ab568573e2.

* gnu/packages/web.scm (nghttp2)[inputs]: Wrap conditional openssl input in 
a
list.
---
 gnu/packages/web.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 24991879ff..c0b382f294 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -7512,7 +7512,7 @@ derivation by David Revoy from the original MonsterID by 
Andreas Gohr.")
  ;; Required to build the tools (i.e. without ‘--enable-lib-only’).
  (append
   (if (hurd-target?)
-  `(,openssl "static")
+  `((,openssl "static"))
   (list jemalloc))  ; fight nghttpd{,x} heap fragmentation
   (list c-ares
 jansson ; for HPACK tools

10/19: gnu: colord-minimal: Update to 1.4.6, use gexps and remove labels.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit efb9e6f17e867437e229e2df706ffe02020815f7
Author: Maxim Cournoyer 
AuthorDate: Mon Aug 22 16:52:36 2022 -0400

gnu: colord-minimal: Update to 1.4.6, use gexps and remove labels.

Also enable the test suite.

* gnu/packages/gnome.scm (colord-minimal): Update to 1.4.6.
[arguments]:  Use gexps.
[tests?]: Delete argument.
[phases]{disable-problematic-tests}: New phase.
{set-sqlite3-file-name}: Use search-input-file.
[native-inputs, propagated-inputs, inputs]: Remove labels.
(colord): Adjust to use gexps.
[native-inputs]: Use modify-inputs and remove labels.
---
 gnu/packages/gnome.scm | 148 +
 1 file changed, 75 insertions(+), 73 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5f494b7671..55f5c57bf3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5177,65 +5177,68 @@ keyboard shortcuts.")
 (define-public colord-minimal
   (package
 (name "colord-minimal")
-(version "1.4.5")
+(version "1.4.6")
 (source
  (origin
(method url-fetch)
(uri (string-append 
"https://www.freedesktop.org/software/colord/releases/;
"colord-" version ".tar.xz"))
(sha256
-(base32 "05sydi6qqqx1rrqwnga1vbg9srkf89wdcfw5w4p4m7r37m2flx5p"
+(base32 "0vwfx06k1in8hci3kdxpc3c0bh81f1vl5bp7favd3rdz4wd661vl"
 (build-system meson-build-system)
 (arguments
- '( ;; FIXME: One test fails:
-   ;; /colord/icc-store (in lib/colord/colord-self-test-private):
-   ;; Incorrect content type for /tmp/colord-vkve/already-exists.icc, got
-   ;; application/x-zerosize
-   #:tests? #f
-   #:glib-or-gtk? #t
-   #:configure-flags (list "-Dargyllcms_sensor=false" ;requires spotread
-   "-Dbash_completion=false"
-   "-Ddaemon_user=colord"
-   "-Ddocs=false"
-   "-Dlocalstatedir=/var"
-   "-Dman=false"
-   "-Dsane=true"
-   "-Dsystemd=false") ;no systemd
-   #:phases
-   (modify-phases %standard-phases
- (add-before 'configure 'patch-build-system
-   (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "rules/meson.build"
-   (("udev.get_pkgconfig_variable\\('udevdir'\\)")
-(string-append "'" (assoc-ref outputs "out") "/lib/udev'")
- (add-before 'configure 'set-sqlite3-file-name
-   (lambda* (#:key inputs #:allow-other-keys)
- ;; "colormgr dump" works by invoking the "sqlite3" command.
- ;; Record its absolute file name.
- (let ((sqlite (assoc-ref inputs "sqlite")))
-   (substitute* "client/cd-util.c"
- (("\"sqlite3\"")
-  (string-append "\"" sqlite "/bin/sqlite3\"")
-(native-inputs
- `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
-   ("gettext" ,gettext-minimal)
-   ("pkg-config" ,pkg-config)
-   ("vala" ,vala)))
+ (list
+  #:glib-or-gtk? #t
+  #:configure-flags #~(list "-Dargyllcms_sensor=false" ;requires spotread
+"-Dbash_completion=false"
+"-Ddaemon_user=colord"
+"-Ddocs=false"
+"-Dlocalstatedir=/var"
+"-Dman=false"
+"-Dsane=true"
+"-Dsystemd=false") ;no systemd
+  #:phases
+  #~(modify-phases %standard-phases
+  (add-after 'unpack 'disable-problematic-tests
+(lambda _
+  ;; Skip the colord-test-private, which requires a *system* D-Bus
+  ;; session, which wants to run as root, among other requirements
+  ;; (see: https://github.com/hughsie/colord/issues/97).
+  (substitute* "lib/colord/meson.build"
+((".*test\\('colord-test-private'.*") ""
+  (add-before 'configure 'patch-build-system
+(lambda _
+  (substitute* "rules/meson.build"
+(("udev.get_pkgconfig_variable\\('udevdir'\\)")
+ (string-append "'" #$output "/lib/udev'")
+  (add-before 'configure 'set-sqlite3-file-name
+(lambda* (#:key inputs #:allow-other-keys)
+  ;; "colormgr dump" works by invoking the "sqlite3" command.
+  ;; Record its absolute file name.
+  (substitute* "client/cd-util.c"
+(("\"sqlite3\"")
+ (format #f "~s" (search-input-file inputs
+"bin/sqlite3")
+(native-inputs
+ (list `(,glib "bin")

09/19: gnu: polkit-mozjs: Rename to polkit and remove obsolete polkit-duktape.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit e8f4e1808563eb3c1cd28d419a1f349412af4a0d
Author: Maxim Cournoyer 
AuthorDate: Sun Aug 21 20:40:39 2022 -0400

gnu: polkit-mozjs: Rename to polkit and remove obsolete polkit-duktape.

Polkit 121 now uses duktape as the default JavaScript engine.

* gnu/packages/polkit.scm (polkit-mozjs): Rename to...
(polkit): ... this.
[import-modules, modules]: New arguments.
[configure-flags]: Drop non-default "js_engine=mozjs" option.
[phases]{adjust-install-time-etc-directory, patch-bash}: New phases.
{check}: New override.
[inputs]: Replace mozjs-91 with duktape.
[native-inputs]: Add python, python-dbusmock and tini.
(polkit-duktape): Delete variable.
(polkit-for-system): Delete procedure.
(polkit) Delete syntax.
* gnu/services/dbus.scm (%default-polkit): Delete variable.
(): Adjust accordingly.
---
 gnu/packages/polkit.scm | 173 
 gnu/services/dbus.scm   |  11 +--
 2 files changed, 88 insertions(+), 96 deletions(-)

diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 18d299bbd1..5ef84ca730 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -8,9 +8,9 @@
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Ricardo Wurmus 
 ;;; Copyright © 2021 Morgan Smith 
-;;; Copyright © 2021 Maxim Cournoyer 
 ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ 
 ;;; Copyright © 2022 Marius Bakke 
+;;; Copyright © 2021, 2022 Maxim Cournoyer 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,11 +28,11 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (gnu packages polkit)
-  #:use-module ((guix licenses) #:select (lgpl2.0+))
-  #:use-module (guix packages)
-  #:use-module (guix gexp)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix memoization)
+  #:use-module ((guix licenses) #:select (lgpl2.0+))
+  #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (guix build utils)
   #:use-module (guix build-system cmake)
@@ -40,6 +40,7 @@
   #:use-module (guix build-system meson)
   #:use-module (gnu packages)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages docker)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
@@ -50,73 +51,103 @@
   #:use-module (gnu packages nss)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages xml)
   #:export (polkit))
 
-(define-public polkit-mozjs
+(define-public polkit
   (package
 (name "polkit")
 (version "121")
 (source (origin
- (method url-fetch)
- (uri (string-append
-   "https://www.freedesktop.org/software/polkit/releases/;
-   name "-" version ".tar.gz"))
- (sha256
-  (base32
-   "1apz3bh7nbpmlp1cr00pb8z8wp0c7yb23ninb959jz3r38saxiwx"))
- (modules '((guix build utils)))
- (snippet
-  '(begin
- ;; Disable a test that requires Python, D-Bus and a few
- ;; libraries and fails with "ERROR: timed out waiting for bus
- ;; process to terminate".
- (substitute* "test/meson.build"
-   (("subdir\\('polkitbackend'\\)")
-""))
- ;; Guix System's polkit
- ;; service stores actions under /etc/polkit-1/actions.
- (substitute* 
"src/polkitbackend/polkitbackendinteractiveauthority.c"
-   (("PACKAGE_DATA_DIR \"/polkit-1/actions\"")
-"PACKAGE_SYSCONF_DIR \"/polkit-1/actions\""))
- ;; Set the setuid helper's real location.
- (substitute* "src/polkitagent/polkitagentsession.c"
-   (("PACKAGE_PREFIX \"/lib/polkit-1/polkit-agent-helper-1\"")
-"\"/run/setuid-programs/polkit-agent-helper-1\""))
+  (method url-fetch)
+  (uri (string-append
+"https://www.freedesktop.org/software/polkit/releases/;
+name "-" version ".tar.gz"))
+  (sha256
+   (base32
+"1apz3bh7nbpmlp1cr00pb8z8wp0c7yb23ninb959jz3r38saxiwx"
 (build-system meson-build-system)
+(arguments
+ (list
+  #:imported-modules `(,@%meson-build-system-modules
+   (guix build syscalls))
+  #:modules '((guix build meson-build-system)
+  (guix build syscalls)
+  (guix build utils)
+  (ice-9 match))
+  #:configure-flags
+  #~(list "--sysconfdir=/etc"
+  "-Dman=true"
+  "-Dtests=true"
+ 

15/19: gnu: libcloudproviders-minimal: Remove input labels.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 5f73aaa6c3d7dfb3480e9098f9cf8ff65588f11c
Author: Maxim Cournoyer 
AuthorDate: Mon Aug 22 20:58:23 2022 -0400

gnu: libcloudproviders-minimal: Remove input labels.

* gnu/packages/gnome.scm (libcloudproviders-minimal)
[native-inputs]: Remove labels.
---
 gnu/packages/gnome.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 55f5c57bf3..d73d41c9a7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -370,9 +370,7 @@ features to enable users to create their discs easily and 
quickly.")
"-Denable-gtk-doc=false"
"-Dvapigen=false")))
 (native-inputs
- `(("glib:bin" ,glib "bin")
-   ("pkg-config" ,pkg-config)
-   ("vala" ,vala)))
+ (list `(,glib "bin") pkg-config vala))
 (inputs
  (list glib glib-networking))
 (synopsis "Cloudproviders Integration API")

14/19: gnu: pulseaudio: Update to 16.1 and use gexps.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 7693ee2dd09d3df4ccc8a62f14fed11b78d69980
Author: Maxim Cournoyer 
AuthorDate: Mon Aug 22 17:13:06 2022 -0400

gnu: pulseaudio: Update to 16.1 and use gexps.

* gnu/packages/pulseaudio.scm (pulseaudio): Update to 16.1.
[source]: Delete trailing #t and extraneous 'begin'.
[arguments]: Use gexps.
[phases]: Delete trailing #t.
[native-inputs]: Delete input labels.
---
 gnu/packages/pulseaudio.scm | 102 ++--
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index 96ba13d484..bb5ebeb920 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2020 Pierre Neidhardt 
 ;;; Copyright © 2020 Marius Bakke 
 ;;; Copyright © 2021 Brice Waegeneire 
+;;; Copyright © 2022 Maxim Cournoyer 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,6 +35,7 @@
 (define-module (gnu packages pulseaudio)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix l:)
@@ -178,57 +180,55 @@ rates.")
 (define-public pulseaudio
   (package
 (name "pulseaudio")
-(version "15.0")
+(version "16.1")
 (source (origin
- (method url-fetch)
- (uri (string-append
-   "https://freedesktop.org/software/pulseaudio/releases/;
-   name "-" version ".tar.xz"))
- (sha256
-  (base32
-   "1851rg4h6sjwanvd294hn52z321rc6vbs4gbfrlw53597dx8h2x4"))
- (modules '((guix build utils)))
- (snippet
-  ;; Disable console-kit support by default since it's deprecated
-  ;; anyway.
-  '(begin
- (substitute* "src/daemon/default.pa.in"
-   (("load-module module-console-kit" all)
-(string-append "#" all "\n")))
- #t))
- (patches (search-patches
-   "pulseaudio-fix-mult-test.patch"
-   "pulseaudio-longer-test-timeout.patch"
+  (method url-fetch)
+  (uri (string-append
+"https://freedesktop.org/software/pulseaudio/releases/;
+name "-" version ".tar.xz"))
+  (sha256
+   (base32
+"1r2aa0g7al9jhrrbrnih6i3bfznd73kkbafrbzwpjyflj7735vwf"))
+  (modules '((guix build utils)))
+  (snippet
+   ;; Disable console-kit support by default since it's deprecated
+   ;; anyway.
+   '(substitute* "src/daemon/default.pa.in"
+  (("load-module module-console-kit" all)
+   (string-append "#" all "\n"
+  (patches (search-patches
+"pulseaudio-fix-mult-test.patch"
+"pulseaudio-longer-test-timeout.patch"
 (build-system meson-build-system)
 (arguments
- `(#:configure-flags
-   (let ((out (assoc-ref %outputs "out")))
- (list "-Doss-output=disabled"
-   "-Dlocalstatedir=/var"
-   (string-append "-Dudevrulesdir="
-  out "/lib/udev/rules.d")
-   ;; Ensure the RUNPATH contains all installed library locations.
-   (string-append "-Dc_link_args=-Wl,-rpath="
-  out "/lib/pulseaudio:"
-  out "/lib:"
-  out "/lib/pulse-" ,version "/modules")))
-   #:phases (modify-phases %standard-phases
- (add-before 'check 'pre-check
-   (lambda _
- ;; 'tests/lock-autospawn-test.c' wants to create a file
- ;; under ~/.config/pulse.
- (setenv "HOME" (getcwd))
- ;; 'thread-test' needs more time on hydra and on slower
- ;; machines, so we set the default timeout to 120 seconds.
- (setenv "CK_DEFAULT_TIMEOUT" "120")
- #t)
+ (list
+  #:configure-flags
+  #~(list "-Doss-output=disabled"
+  "-Dlocalstatedir=/var"
+  (string-append "-Dudevrulesdir="
+ #$output "/lib/udev/rules.d")
+  ;; Ensure the RUNPATH contains all installed library locations.
+  (string-append "-Dc_link_args=-Wl,-rpath="
+ #$output "/lib/pulseaudio:"
+ #$output "/lib:"
+ #$output "/lib/pulse-" #$version "/modules"))
+  #:phases
+  #~(modify-phases %standard-phases
+  (add-before 'check 'pre-check
+(lambda _
+  ;; 'tests/lock-autospawn-test.c' wants to 

11/19: gnu: glslang: Update to 11.11.0.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 78696a6d317c1805f688b871cc17f79b8a6dc2af
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 23 00:37:19 2022 -0400

gnu: glslang: Update to 11.11.0.

* gnu/packages/vulkan.scm (glslang): Update to 11.11.0.
[source]: Use version as commit.
---
 gnu/packages/vulkan.scm | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index f5c619a2b2..c6df524fbc 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -149,18 +149,16 @@ SPIR-V, aiming to emit GLSL or MSL that looks like 
human-written code.")
 (define-public glslang
   (package
 (name "glslang")
-(version "10-11.0.0")
+(version "11.11.0")
 (source
  (origin
(method git-fetch)
(uri (git-reference
  (url "https://github.com/KhronosGroup/glslang;)
- ;; Tag "10-11.0.0" was moved to "11.0.0".
- ;; FIXME: Use (commit version) on next update.
- (commit "11.0.0")))
+ (commit version)))
(sha256
 (base32
- "14mn2awswl022ls75mfpsnpsl0ai0jgfbqj3sxcsqawyj5f432py"))
+ "03jnaj90q2cg2hjdsg96ashz28dw5hcsg9rvf60bp2mphzzsklpq"))
(file-name (string-append name "-" version "-checkout"
 (build-system cmake-build-system)
 (arguments

06/19: gnu: glibmm: Update to 2.72.1 and use gexps.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 111d525d8acfe154c4bd31432a18fcc0a4586ab5
Author: Maxim Cournoyer 
AuthorDate: Mon Aug 22 13:27:16 2022 -0400

gnu: glibmm: Update to 2.72.1 and use gexps.

* gnu/packages/glib.scm (glibmm): Update to 2.72.1.
[phases]: Use gexps.
---
 gnu/packages/glib.scm | 44 +---
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index dacfa8da93..26ac393120 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -766,7 +766,7 @@ by GDBus included in Glib.")
 (define glibmm
   (package
 (name "glibmm")
-(version "2.70.0")
+(version "2.72.1")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://gnome/sources/glibmm/"
@@ -774,31 +774,29 @@ by GDBus included in Glib.")
   "/glibmm-" version ".tar.xz"))
   (sha256
(base32
-"085mzpphz71sh5wh71ppikwnxsgn4pk3s4bzz6ingj6wxn5gs240"
+"1n2w2pcpbxjbsxynmar3i5ibr7src6gnrdxb9nn57p5miai4jxia"
 (build-system meson-build-system)
 (outputs '("out" "doc"))
 (arguments
- `(#:configure-flags
-   (list "-Dbuild-documentation=true")
-   #:phases
-   (modify-phases %standard-phases
- (add-after 'unpack 'disable-failing-tests
-   (lambda _
- (substitute* "tests/meson.build"
-   ;; This test uses /etc/fstab as an example file to read
-   ;; from; disable it.
-   (("[ \t]*.*giomm_simple.*$") "")
-   ;; This test does a DNS lookup, and then expects to be able
-   ;; to open a TLS session; just skip it.
-   (("[ \t]*.*giomm_tls_client.*$") ""
- (add-after 'install 'move-doc
-   (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
-(doc (assoc-ref outputs "doc")))
-   (mkdir-p (string-append doc "/share"))
-   (rename-file
-(string-append out "/share/doc")
-(string-append doc "/share/doc"
+ (list
+  #:configure-flags #~(list "-Dbuild-documentation=true")
+  #:phases
+  #~(modify-phases %standard-phases
+  (add-after 'unpack 'disable-failing-tests
+(lambda _
+  (substitute* "tests/meson.build"
+;; This test uses /etc/fstab as an example file to read from;
+;; disable it.
+(("[ \t]*.*giomm_simple.*$") "")
+;; This test does a DNS lookup, and then expects to be able to
+;; open a TLS session; just skip it.
+(("[ \t]*.*giomm_tls_client.*$") ""
+  (add-after 'install 'move-doc
+(lambda _
+  (mkdir-p (string-append #$output:doc "/share"))
+  (rename-file
+   (string-append #$output "/share/doc")
+   (string-append #$output:doc "/share/doc")))
 (native-inputs
  (list graphviz
doxygen

08/19: gnu: wayland-protocols: Update to 1.26.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 39fe13ee2675f062e53f4cbc114ff5d5248cb9b1
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 23 00:37:18 2022 -0400

gnu: wayland-protocols: Update to 1.26.

* gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.26.
---
 gnu/packages/freedesktop.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index a7d9472425..22e27be8e8 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -27,7 +27,7 @@
 ;;; Copyright © 2021 Robby Zambito 
 ;;; Copyright © 2021, 2022 Maxime Devos 
 ;;; Copyright © 2021 John Kehayias 
-;;; Copyright © 2021, 2021 Maxim Cournoyer 
+;;; Copyright © 2021, 2021, 2022 Maxim Cournoyer 
 ;;; Copyright © 2022 Daniel Meißner 
 ;;; Copyright © 2022 Wamm K. D. 
 ;;; Copyright © 2022 Petr Hodina 
@@ -1064,7 +1064,7 @@ fullscreen) or other display servers.")
 (define-public wayland-protocols
   (package
 (name "wayland-protocols")
-(version "1.25")
+(version "1.26")
 (source (origin
   (method url-fetch)
   (uri (string-append
@@ -1072,7 +1072,7 @@ fullscreen) or other display servers.")
 "wayland-protocols-" version ".tar.xz"))
   (sha256
(base32
-"0q0laxdvf8p8b7ks2cbpqf6q0rwrjycqrp8pf8rxm86hk5qhzzzi"
+"04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5"
 (build-system meson-build-system)
 (inputs
  (list wayland))

12/19: gnu: libical: Update to 3.0.14, enable tests and use gexps.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit d0ab0039870c8acba1eb4cab580f6289013f85d1
Author: Maxim Cournoyer 
AuthorDate: Mon Aug 22 20:47:16 2022 -0400

gnu: libical: Update to 3.0.14, enable tests and use gexps.

* gnu/packages/calendar.scm (libical): Update to 3.0.14.
[tests?]: Delete argument.
[parallel-build?]: Likewise.
[configure-flags]: Use gexps.
[phases]: Use gexps.  Delete trailing #t.
{patch-docbook-reference}: Use this-package-native-input.
{patch-paths}: Use search-input-directory.  Set TZDIR for tests.
---
 gnu/packages/calendar.scm | 54 ---
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 715d158241..80740d8bc1 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2020 Tanguy Le Carrour 
 ;;; Copyright © 2020 Peng Mei Yu 
 ;;; Copyright © 2021 Wamm K. D. 
+;;; Copyright © 2022 Maxim Cournoyer 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,6 +30,7 @@
 
 (define-module (gnu packages calendar)
   #:use-module (gnu packages)
+  #:use-module (guix gexp)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix git-download)
   #:use-module (guix packages)
@@ -130,32 +132,32 @@ the  library for handling time zones and leap 
seconds.")
 "13ycghsi4iv8mnm0xv97bs0x6qvfhdxkw20n3yhcc7bg6n0bg122"
 (build-system cmake-build-system)
 (arguments
- '(#:tests? #f ; test suite appears broken
-   #:parallel-build? #f ;may cause GIR generation failure
-   #:configure-flags '("-DSHARED_ONLY=true"
-   ;; required by evolution-data-server
-   "-DGOBJECT_INTROSPECTION=true"
-   "-DICAL_GLIB_VAPI=true")
-   #:phases
-   (modify-phases %standard-phases
- (add-after 'unpack 'patch-docbook-reference
-   (lambda* (#:key inputs #:allow-other-keys)
- (substitute* 
"doc/reference/libical-glib/libical-glib-docs.sgml.in"
-   (("http://www.oasis-open.org/docbook/xml/4.3/;)
-(string-append (assoc-ref inputs "docbook-xml")
-   "/xml/dtd/docbook/")
- (add-before 'configure 'patch-paths
-   (lambda* (#:key inputs #:allow-other-keys)
- ;; TODO: libical 3.1.0 supports using TZDIR instead of a 
hard-coded
- ;; zoneinfo database.  When that is released we can drop
- ;; the tzdata dependency.
- (let ((tzdata (assoc-ref inputs "tzdata")))
-   (substitute* "src/libical/icaltz-util.c"
- (("\\\"/usr/share/zoneinfo\\\",")
-  (string-append "\"" tzdata "/share/zoneinfo\""))
- (("\\\"/usr/lib/zoneinfo\\\",") "")
- (("\\\"/etc/zoneinfo\\\",") "")
- (("\\\"/usr/share/lib/zoneinfo\\\"") ""
+ (list
+  #:configure-flags #~(list "-DSHARED_ONLY=true"
+;; required by evolution-data-server
+"-DGOBJECT_INTROSPECTION=true"
+"-DICAL_GLIB_VAPI=true")
+  #:phases
+  #~(modify-phases %standard-phases
+  (add-after 'unpack 'patch-docbook-reference
+(lambda _
+  (substitute* 
"doc/reference/libical-glib/libical-glib-docs.sgml.in"
+(("http://www.oasis-open.org/docbook/xml/4.3/;)
+ (string-append #$(this-package-native-input "docbook-xml")
+"/xml/dtd/docbook/")
+  (add-before 'configure 'patch-paths
+(lambda* (#:key inputs #:allow-other-keys)
+  (define zoneinfo (search-input-directory inputs 
"share/zoneinfo"))
+  ;; The timezones test fails if TZDIR is not set, for some
+  ;; reason.  If only TZDIR is set, tests checking the timezone
+  ;; fallback fail, so also patch the source.
+  (setenv "TZDIR" zoneinfo) ;for tests
+  (substitute* "src/libical/icaltz-util.c"
+(("\\\"/usr/share/zoneinfo\\\",")
+ (format #f "~s" zoneinfo))
+(("\\\"/usr/lib/zoneinfo\\\",") "")
+(("\\\"/etc/zoneinfo\\\",") "")
+(("\\\"/usr/share/lib/zoneinfo\\\"") "")))
 (native-inputs
  (list docbook-xml-4.3
gobject-introspection

04/19: gnu: gtk+: Delete trailing #t and use iso-codes.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 91a830d02894030dba1d2cbdaf2b3001df44c3b7
Author: Maxim Cournoyer 
AuthorDate: Sun Aug 21 21:05:52 2022 -0400

gnu: gtk+: Delete trailing #t and use iso-codes.

* gnu/packages/gtk.scm (gtk+)[inputs]: Replace iso-codes/official with
iso-codes.
[phases]: Delete trailing #t.
---
 gnu/packages/gtk.scm | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 428273ee89..68d0b567e4 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -977,8 +977,8 @@ application suites.")
fontconfig
freetype
(if (target-x86-64?)
- librsvg
- librsvg-2.40)
+   librsvg
+   librsvg-2.40)
glib
libcloudproviders-minimal
libepoxy
@@ -998,11 +998,11 @@ application suites.")
wayland
wayland-protocols))
 (inputs
- (list colord-minimal ;to prevent a cycle with inkscape
+ (list colord-minimal   ;to prevent a cycle with inkscape
cups
graphene
harfbuzz
-   iso-codes/official ;XXX TODO core-updates: use iso-codes
+   iso-codes
json-glib-minimal
libxml2
rest))
@@ -1059,8 +1059,7 @@ application suites.")
 "tree-performance text children derive"))
  (substitute* "testsuite/reftests/Makefile.in"
(("TEST_PROGS = gtk-reftest")
-"TEST_PROGS = "))
- #t))
+"TEST_PROGS = "
  (add-before 'check 'pre-check
(lambda _
  ;; Tests require a running X server.
@@ -1071,8 +1070,7 @@ application suites.")
  ;; Tests look for $XDG_RUNTIME_DIR.
  (setenv "XDG_RUNTIME_DIR" (getcwd))
  ;; For missing '/etc/machine-id'.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- #t))
+ (setenv "DBUS_FATAL_WARNINGS" "0")))
  (add-after 'install 'move-desktop-files
;; Move desktop files into 'bin' to avoid cycle references.
(lambda* (#:key outputs #:allow-other-keys)
@@ -1080,8 +1078,7 @@ application suites.")
(bin (assoc-ref outputs "bin")))
(mkdir-p (string-append bin "/share"))
(rename-file (string-append out "/share/applications")
-(string-append bin "/share/applications"))
-   #t))
+(string-append bin "/share/applications"
 (native-search-paths
  (list (search-path-specification
 (variable "GUIX_GTK3_PATH")

05/19: gnu: gtkmm-3: Update to 3.24.6.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit bcef9356f81b5ee9babf518a255b42aa5b825b3b
Author: Maxim Cournoyer 
AuthorDate: Mon Aug 22 09:16:27 2022 -0400

gnu: gtkmm-3: Update to 3.24.6.

* gnu/packages/gtk.scm (gtkmm-3): Update to 3.24.6.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 68d0b567e4..70e1c2d1d4 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1840,7 +1840,7 @@ tutorial.")
   (package
 (inherit gtkmm)
 (name "gtkmm")
-(version "3.24.5")
+(version "3.24.6")
 (source
  (origin
(method url-fetch)
@@ -1849,7 +1849,7 @@ tutorial.")
(version-major+minor version)  "/"
name "-" version ".tar.xz"))
(sha256
-(base32 "1ri2msp3cmzi6r65ghwb8gfavfaxv0axpwi3q60nm7v8hvg36qw5"
+(base32 "1mhi3ws43l051fha4zssfpykraa1qc2hd408l2xk65jfjhp18gjb"
 (propagated-inputs
  `(("atkmm-2.28" ,atkmm-2.28)
("cairomm-1.14" ,cairomm-1.14)

07/19: gnu: glib-networking: Update to 2.72.2.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 882dff87c6f736625ad74776e31d1d0e80ef76ad
Author: Maxim Cournoyer 
AuthorDate: Mon Aug 22 15:49:15 2022 -0400

gnu: glib-networking: Update to 2.72.2.

* gnu/packages/gnome.scm (glib-networking): Update to 2.72.2.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8199a8af29..5f494b7671 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4713,7 +4713,7 @@ indicators etc).")
 (define-public glib-networking
   (package
 (name "glib-networking")
-(version "2.70.0")
+(version "2.72.2")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -4721,7 +4721,7 @@ indicators etc).")
   "glib-networking-" version ".tar.xz"))
   (sha256
(base32
-"0dbg1na239mbavn4hknkax5sns9q2dbdnqw9wcpmhv58mzkhid36"))
+"0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand"))
   (patches
(search-patches "glib-networking-gnutls-binding.patch"
 (build-system meson-build-system)

01/19: gnu: glib: Use gexps.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit c6e4a14458e34b9bd90a598034c54bc54287ac2b
Author: Maxim Cournoyer 
AuthorDate: Mon Aug 22 12:44:41 2022 -0400

gnu: glib: 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 | 263 +-
 1 file changed, 129 insertions(+), 134 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index c155395858..dacfa8da93 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -235,125 +235,122 @@ information, refer to the @samp{dbus-daemon(1)} man 
page.")))
"bin";executables; depends on Python
"debug"))
 (arguments
- `(#:disallowed-references
-   (,tzdata-for-tests
-;; Verify glib-mkenums, gtester, ... use the cross-compiled
-;; python.
-,@(if (%current-target-system)
-  (map (cut gexp-input <> #:native? #t)
-   `(,(this-package-native-input "python")
- ,(this-package-native-input "python-wrapper")))
-  '()))
-   #:configure-flags ,#~(list "--default-library=both"
-  "-Dman=false"
-  "-Dselinux=disabled"
-  (string-append "--bindir="
- #$output:bin "/bin"))
-   #:phases
-   (modify-phases %standard-phases
- ;; Needed to pass the test phase on slower ARM and i686 machines.
- (add-after 'unpack 'increase-test-timeout
-   (lambda _
- (substitute* "meson.build"
-   (("(test_timeout.*) = ([[:digit:]]+)" all first second)
-(string-append first " = " second "0")
- (add-after 'unpack 'disable-failing-tests
-   (lambda _
- (substitute* "gio/tests/meson.build"
-   ((".*'testfilemonitor'.*") ;marked as flaky
-""))
- (with-directory-excursion "glib/tests"
-   (substitute* '("unix.c" "utils.c")
- (("[ \t]*g_test_add_func.*;") "")))
- (with-directory-excursion "gio/tests"
-   (substitute* '("contenttype.c" "gdbus-address-get-session.c"
-  "gdbus-peer.c" "appinfo.c" "desktop-app-info.c")
- (("[ \t]*g_test_add_func.*;") "")))
+ (list
+  #:disallowed-references
+  (cons tzdata-for-tests
+;; Verify glib-mkenums, gtester, ... use the cross-compiled
+;; python.
+(if (%current-target-system)
+(map (cut gexp-input <> #:native? #t)
+ `(,(this-package-native-input "python")
+   ,(this-package-native-input "python-wrapper")))
+'()))
+  #:configure-flags #~(list "--default-library=both"
+"-Dman=false"
+"-Dselinux=disabled"
+(string-append "--bindir="
+   #$output:bin "/bin"))
+  #:phases
+  #~(modify-phases %standard-phases
+  ;; Needed to pass the test phase on slower ARM and i686 machines.
+  (add-after 'unpack 'increase-test-timeout
+(lambda _
+  (substitute* "meson.build"
+(("(test_timeout.*) = ([[:digit:]]+)" all first second)
+ (string-append first " = " second "0")
+  (add-after 'unpack 'disable-failing-tests
+(lambda _
+  (substitute* "gio/tests/meson.build"
+((".*'testfilemonitor'.*") ;marked as flaky
+ ""))
+  (with-directory-excursion "glib/tests"
+(substitute* '("unix.c" "utils.c")
+  (("[ \t]*g_test_add_func.*;") "")))
+  (with-directory-excursion "gio/tests"
+(substitute* '("contenttype.c" "gdbus-address-get-session.c"
+   "gdbus-peer.c" "appinfo.c" "desktop-app-info.c")
+  (("[ \t]*g_test_add_func.*;") "")))
 
- ,@(if (target-x86-32?)
-   ;; Comment out parts of timer.c that fail on i686 due to
-   ;; excess precision when building with GCC 10:
-   ;; .
-   '((substitute* "glib/tests/timer.c"
-   (("^  g_assert_cmpuint \\(micros.*" all)
-(string-append "//" all "\n"))
-   (("^  g_assert_cmpfloat \\(elapsed, ==.*" all)
-(string-append "//" all "\n"
-   '(
- ;; Python references are not 

13/19: gnu: bluez: Update to 5.65, use gexps and remove input labels.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 58c9cbc63bd4ba6ff33442e7c2a461920b6349d0
Author: Maxim Cournoyer 
AuthorDate: Mon Aug 22 17:10:04 2022 -0400

gnu: bluez: Update to 5.65, use gexps and remove input labels.

* gnu/packages/linux.scm (bluez): Update to 5.65.
[arguments]: Use gexps.
[phases]: Delete trailing #t.
[native-inputs]: Delete labels.
---
 gnu/packages/linux.scm | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index aa777095c4..6aa5891057 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -33,7 +33,7 @@
 ;;; Copyright © 2018, 2019 Pierre Langlois 
 ;;; Copyright © 2018 Vasile Dumitrascu 
 ;;; Copyright © 2019 Tim Gesthuizen 
-;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer 
+;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer 

 ;;; Copyright © 2019 Stefan Stefanović 
 ;;; Copyright © 2019, 2020, 2021 Brice Waegeneire 
 ;;; Copyright © 2019 Kei Kebreau 
@@ -5302,7 +5302,7 @@ Bluetooth audio output devices like headphones or 
loudspeakers.")
 (define-public bluez
   (package
 (name "bluez")
-(version "5.64")
+(version "5.65")
 (source (origin
   (method url-fetch)
   (uri (string-append
@@ -5310,7 +5310,7 @@ Bluetooth audio output devices like headphones or 
loudspeakers.")
 version ".tar.xz"))
   (sha256
(base32
-"0d6yl7l5zrlx5w3y503k72m9xsydx6gi1c65icchq1xknrjpwhxf"
+"1m4n7nczjlbhb20bp2hwb2b85036xma5pqljmpk7ddalhgaa8r95"
 (build-system gnu-build-system)
 (arguments
  (list
@@ -5335,24 +5335,26 @@ Bluetooth audio output devices like headphones or 
loudspeakers.")
 (("tester_init\\(, \\);") "return 77;"
   (add-after 'install 'post-install
 (lambda* (#:key inputs outputs #:allow-other-keys)
-  (let* ((out#$output)
- (servicedir (string-append out "/share/dbus-1/services"))
+  (let* ((servicedir (string-append #$output
+"/share/dbus-1/services"))
  (service"obexd/src/org.bluez.obex.service")
  (rule   (string-append
-  out "/lib/udev/rules.d/97-hid2hci.rules")))
+  #$output 
"/lib/udev/rules.d/97-hid2hci.rules")))
 ;; Install the obex dbus service file.
 (substitute* service
   (("/bin/false")
-   (string-append out "/libexec/bluetooth/obexd")))
+   (string-append #$output "/libexec/bluetooth/obexd")))
 (install-file service servicedir)
 ;; Fix paths in the udev rule.
 (substitute* rule
   (("hid2hci --method")
-   (string-append out "/lib/udev/hid2hci --method"))
+   (string-append #$output "/lib/udev/hid2hci --method"))
   (("/sbin/udevadm")
(search-input-file inputs "/bin/udevadm")
 (native-inputs
- (list pkg-config python-docutils gettext-minimal))
+ (list gettext-minimal
+   pkg-config
+   python-docutils))
 (inputs
  (list glib dbus eudev libical readline))
 (home-page "http://www.bluez.org/;)

02/19: gnu: libdrm: Update to 2.4.112.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit f4f9ee826191bc94d39ccacddc6dcfd43e172304
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 23 00:37:19 2022 -0400

gnu: libdrm: Update to 2.4.112.

* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.112.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 8de7e97b23..0ba5f740ea 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -691,7 +691,7 @@ rasterisation.")
 (define-public libdrm
   (package
 (name "libdrm")
-(version "2.4.111")
+(version "2.4.112")
 (source (origin
   (method url-fetch)
   (uri (string-append
@@ -699,7 +699,7 @@ rasterisation.")
 version ".tar.xz"))
   (sha256
(base32
-"1adjg96mz0ghjzsgp9hrdr622shrvqmjcz5sxksfcka2fx7idmqs"
+"1zr0hi7k5s7my4q9hyj6ryzg89zyjx24zbqfv3c5rcq9pl87gc00"
 (build-system meson-build-system)
 (arguments
  (list #:configure-flags

03/19: gnu: mesa: Update to 22.1.7.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 9b2a3e023f7090d19c98e7582220340df3962555
Author: Maxim Cournoyer 
AuthorDate: Mon Aug 22 16:11:24 2022 -0400

gnu: mesa: Update to 22.1.7.

* gnu/packages/gl.scm (mesa): Update to 22.1.7.
[source]: Fix indentation.  Remove patch, implementing it as a...
[configure-flags]: Remove '-Ddri-drivers=...' flag, no longer supported.
[phases]{disable-failing-test} ... substitution instead.
[propagated-inputs]: Move comment above.
[inputs]: Remove extraneous append and sort.
[native-inputs]: Likewise.
[configure-flags]: Break long lines.
* gnu/packages/patches/mesa-skip-tests.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
---
 gnu/local.mk   |   1 -
 gnu/packages/gl.scm| 109 +++--
 gnu/packages/patches/mesa-skip-tests.patch |  18 -
 3 files changed, 58 insertions(+), 70 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index f061f1d4dd..6ee756c37e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1491,7 +1491,6 @@ dist_patch_DATA = 
\
   %D%/packages/patches/libsigrokdecode-python3.9-fix.patch \
   %D%/packages/patches/mercurial-hg-extension-path.patch   \
   %D%/packages/patches/mesa-opencl-all-targets.patch   \
-  %D%/packages/patches/mesa-skip-tests.patch   \
   %D%/packages/patches/meson-allow-dirs-outside-of-prefix.patch\
   %D%/packages/patches/mhash-keygen-test-segfault.patch\
   %D%/packages/patches/mia-fix-boost-headers.patch \
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index d6d127d765..dd38c1a502 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -268,73 +268,72 @@ also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
 (name "mesa")
-(version "22.1.2")
+(version "22.1.7")
 (source
-  (origin
-(method url-fetch)
-(uri (list (string-append "https://mesa.freedesktop.org/archive/;
-  "mesa-" version ".tar.xz")
-   (string-append "ftp://ftp.freedesktop.org/pub/mesa/;
-  "mesa-" version ".tar.xz")
-   (string-append "ftp://ftp.freedesktop.org/pub/mesa/;
-  version "/mesa-" version ".tar.xz")))
-(sha256
- (base32
-  "1smrvvh8l7xcccwfbccx9k0ihzh1whrnnwsmqb7i0gba99mj4w89"))
-(patches
- (search-patches "mesa-skip-tests.patch"
+ (origin
+   (method url-fetch)
+   (uri (list (string-append "https://mesa.freedesktop.org/archive/;
+ "mesa-" version ".tar.xz")
+  (string-append "ftp://ftp.freedesktop.org/pub/mesa/;
+ "mesa-" version ".tar.xz")
+  (string-append "ftp://ftp.freedesktop.org/pub/mesa/;
+ version "/mesa-" version ".tar.xz")))
+   (sha256
+(base32
+ "12ax6lmshc8aqzw5ca7ab7f7z64n9nyzci4r1s6y1l0iryr8x0ys"
 (build-system meson-build-system)
 (propagated-inputs
-  (list ;; The following are in the Requires.private field of gl.pc.
-libdrm
-libvdpau
-libx11
-libxdamage
-libxfixes
-libxshmfence
-libxxf86vm
-xorgproto))
+ ;; The following are in the Requires.private field of gl.pc.
+ (list libdrm
+   libvdpau
+   libx11
+   libxdamage
+   libxfixes
+   libxshmfence
+   libxxf86vm
+   xorgproto))
 (inputs
- (append (list expat
-   elfutils ;libelf required for r600 when 
using llvm
-   (force libva-without-mesa)
-   libxml2
-   libxrandr
-   libxvmc
-   wayland
-   wayland-protocols)
- ;; TODO: Resort alphabetically.
- ;; Note: update the 'clang' input of mesa-opencl when bumping 
this.
- (list llvm)))
+ (list elfutils  ;libelf required for r600 when using llvm
+   expat
+   (force libva-without-mesa)
+   libxml2
+   libxrandr
+   libxvmc
+   ;; Note: update the 'clang' input of mesa-opencl when bumping this.
+   llvm
+   wayland
+   wayland-protocols))
 (native-inputs
- (append (list bison
-   flex
-   gettext-minimal
-   pkg-config
-   python-wrapper
-   python-libxml2  ;for OpenGL ES 1.1 and 2.0 
support
-   python-mako
-   (@ (gnu packages base) which))
- ;; TODO: Resort alphabetically.
- 

branch core-updates updated (0eab5926dd -> 9b389f229b)

[guix-commits]

apteryx pushed a change to branch core-updates
in repository guix.

from 0eab5926dd build-system: copy: Support #:tests?.
 new c6e4a14458 gnu: glib: Use gexps.
 new f4f9ee8261 gnu: libdrm: Update to 2.4.112.
 new 9b2a3e023f gnu: mesa: Update to 22.1.7.
 new 91a830d028 gnu: gtk+: Delete trailing #t and use iso-codes.
 new bcef9356f8 gnu: gtkmm-3: Update to 3.24.6.
 new 111d525d8a gnu: glibmm: Update to 2.72.1 and use gexps.
 new 882dff87c6 gnu: glib-networking: Update to 2.72.2.
 new 39fe13ee26 gnu: wayland-protocols: Update to 1.26.
 new e8f4e18085 gnu: polkit-mozjs: Rename to polkit and remove obsolete 
polkit-duktape.
 new efb9e6f17e gnu: colord-minimal: Update to 1.4.6, use gexps and remove 
labels.
 new 78696a6d31 gnu: glslang: Update to 11.11.0.
 new d0ab003987 gnu: libical: Update to 3.0.14, enable tests and use gexps.
 new 58c9cbc63b gnu: bluez: Update to 5.65, use gexps and remove input 
labels.
 new 7693ee2dd0 gnu: pulseaudio: Update to 16.1 and use gexps.
 new 5f73aaa6c3 gnu: libcloudproviders-minimal: Remove input labels.
 new 28d27ddd3d gnu: at-spi2-core-minimal: Update to 2.45.90, rename to 
at-spi2-core.
 new 0c6586df3b gnu: python-numpy: Skip 'test_rint_big_int' test.
 new a12a2aea28 gnu: gtk: Update to 4.6.7.
 new 9b389f229b gnu: nghttp2: Fix conditional openssl:static input.

The 19 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/local.mk   |   1 -
 gnu/packages/calendar.scm  |  54 ++---
 gnu/packages/chromium.scm  |   2 +-
 gnu/packages/freedesktop.scm   |   6 +-
 gnu/packages/gl.scm| 109 +-
 gnu/packages/glib.scm  | 307 ++---
 gnu/packages/gnome.scm | 158 +++
 gnu/packages/gtk.scm   | 187 --
 gnu/packages/linux.scm |  20 +-
 gnu/packages/patches/mesa-skip-tests.patch |  18 --
 gnu/packages/polkit.scm| 173 
 gnu/packages/pulseaudio.scm| 102 +-
 gnu/packages/python-xyz.scm|   6 +-
 gnu/packages/vulkan.scm|   8 +-
 gnu/packages/web.scm   |   2 +-
 gnu/packages/xdisorg.scm   |   4 +-
 gnu/services/dbus.scm  |  11 +-
 17 files changed, 557 insertions(+), 611 deletions(-)
 delete mode 100644 gnu/packages/patches/mesa-skip-tests.patch

branch core-updates updated: build-system: copy: Support #:tests?.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

lilyp pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
 new 0eab5926dd build-system: copy: Support #:tests?.
0eab5926dd is described below

commit 0eab5926dd95ae67b0db7b68a2fb4ef3048db824
Author: Liliana Marie Prikler 
AuthorDate: Sat Aug 13 11:26:34 2022 +0200

build-system: copy: Support #:tests?.

* guix/build-system/copy.scm (copy-build): Pass tests? to builder.
---
 guix/build-system/copy.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm
index 4894ba46fb..0df397cf77 100644
--- a/guix/build-system/copy.scm
+++ b/guix/build-system/copy.scm
@@ -84,6 +84,7 @@
  (install-plan ''(("." "./")))
  (search-paths '())
  (out-of-source? #t)
+ (tests? #t)
  (validate-runpath? #t)
  (patch-shebangs? #t)
  (strip-binaries? #t)
@@ -118,6 +119,7 @@
(sexp->gexp phases)
phases)
 #:out-of-source? #$out-of-source?
+#:tests? #$tests?
 #:validate-runpath? #$validate-runpath?
 #:patch-shebangs? #$patch-shebangs?
 #:strip-binaries? #$strip-binaries?

branch master updated (b9322d7819 -> 3294fa2ba4)

[guix-commits]

mbakke pushed a change to branch master
in repository guix.

from b9322d7819 gnu: emacs-crdt: Update to 0.3.3.
 new 0811d2cb8d bootloader: Convert device in menu-entry to proper sexp.
 new 3294fa2ba4 tests: Add test for menu-entry roundtrips as sexps.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/bootloader.scm| 25 +
 tests/boot-parameters.scm | 23 +++
 2 files changed, 44 insertions(+), 4 deletions(-)

02/02: tests: Add test for menu-entry roundtrips as sexps.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 3294fa2ba451c7d5ef42a5d9fac780877f364bc7
Author: Josselin Poiret 
AuthorDate: Sun Aug 21 10:41:16 2022 +0200

tests: Add test for menu-entry roundtrips as sexps.

* tests/boot-parameters.scm (%uuid-menu-entry,
%file-system-label-menu-entry): New variables.
("menu-entry roundtrip, uuid", "menu-entry roundtrip,
file-system-label"): New tests.

Signed-off-by: Marius Bakke 
---
 tests/boot-parameters.scm | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/tests/boot-parameters.scm b/tests/boot-parameters.scm
index 8e48e1775e..03a1d01aff 100644
--- a/tests/boot-parameters.scm
+++ b/tests/boot-parameters.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas 
+;;; Copyright © 2022 Josselin Poiret 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -303,4 +304,26 @@
(operating-system-boot-parameters %default-operating-system
  %default-root-device)))
 
+(define %uuid-menu-entry
+  (menu-entry
+   (label "test")
+   (device (uuid "6d5b13d4-6092-46d0-8be4-073dc07413cc"))
+   (linux "/boot/bzImage")
+   (initrd "/boot/initrd.cpio.gz")))
+
+(define %file-system-label-menu-entry
+  (menu-entry
+   (label "test")
+   (device (file-system-label "test-label"))
+   (linux "/boot/bzImage")
+   (initrd "/boot/initrd.cpio.gz")))
+
+(test-equal "menu-entry roundtrip, uuid"
+  %uuid-menu-entry
+  (sexp->menu-entry (menu-entry->sexp %uuid-menu-entry)))
+
+(test-equal "menu-entry roundtrip, file-system-label"
+  %file-system-label-menu-entry
+  (sexp->menu-entry (menu-entry->sexp %file-system-label-menu-entry)))
+
 (test-end "boot-parameters")

01/02: bootloader: Convert device in menu-entry to proper sexp.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 0811d2cb8dff5de9f535e14726c9874ec2f4a96c
Author: Josselin Poiret 
AuthorDate: Sun Aug 21 10:41:15 2022 +0200

bootloader: Convert device in menu-entry to proper sexp.

Previously, menu-entry->sexp didn't try to convert `device` to a
proper sexp, which was inserted directly into the boot parameters
G-exp, leading to a G-exp input error.  Now convert both uuid and
file-system-label possibilities to sexps, and add parsing code to
sexp->menu-entry.  This fixes #57307.

* gnu/bootloader.scm (menu-entry->sexp, sexp->menu-entry): Take
non-string devices into account.

Signed-off-by: Marius Bakke 
---
 gnu/bootloader.scm | 25 +
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm
index 70e1836179..2eec48693c 100644
--- a/gnu/bootloader.scm
+++ b/gnu/bootloader.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2017 Leo Famulari 
 ;;; Copyright © 2019, 2021 Ludovic Courtès 
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen 
+;;; Copyright © 2022 Josselin Poiret 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +22,8 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (gnu bootloader)
+  #:use-module (gnu system file-systems)
+  #:use-module (gnu system uuid)
   #:use-module (guix discovery)
   #:use-module (guix gexp)
   #:use-module (guix profiles)
@@ -104,12 +107,19 @@
 
 (define (menu-entry->sexp entry)
   "Return ENTRY serialized as an sexp."
+  (define (device->sexp device)
+(match device
+  ((? uuid? uuid)
+   `(uuid ,(uuid-type uuid) ,(uuid->string uuid)))
+  ((? file-system-label? label)
+   `(label ,(file-system-label->string label)))
+  (_ device)))
   (match entry
 (($  label device mount-point linux linux-arguments initrd #f
  ())
  `(menu-entry (version 0)
   (label ,label)
-  (device ,device)
+  (device ,(device->sexp device))
   (device-mount-point ,mount-point)
   (linux ,linux)
   (linux-arguments ,linux-arguments)
@@ -118,7 +128,7 @@
  multiboot-kernel multiboot-arguments multiboot-modules)
  `(menu-entry (version 0)
   (label ,label)
-  (device ,device)
+  (device ,(device->sexp device))
   (device-mount-point ,mount-point)
   (multiboot-kernel ,multiboot-kernel)
   (multiboot-arguments ,multiboot-arguments)
@@ -127,6 +137,13 @@
 (define (sexp->menu-entry sexp)
   "Turn SEXP, an sexp as returned by 'menu-entry->sexp', into a 
 record."
+  (define (sexp->device device-sexp)
+(match device-sexp
+  (('uuid type uuid-string)
+   (uuid uuid-string type))
+  (('label label)
+   (file-system-label label))
+  (_ device-sexp)))
   (match sexp
 (('menu-entry ('version 0)
   ('label label) ('device device)
@@ -135,7 +152,7 @@ record."
   ('initrd initrd) _ ...)
  (menu-entry
   (label label)
-  (device device)
+  (device (sexp->device device))
   (device-mount-point mount-point)
   (linux linux)
   (linux-arguments linux-arguments)
@@ -148,7 +165,7 @@ record."
   ('multiboot-modules multiboot-modules) _ ...)
  (menu-entry
   (label label)
-  (device device)
+  (device (sexp->device device))
   (device-mount-point mount-point)
   (multiboot-kernel multiboot-kernel)
   (multiboot-arguments multiboot-arguments)

branch master updated: gnu: emacs-crdt: Update to 0.3.3.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new b9322d7819 gnu: emacs-crdt: Update to 0.3.3.
b9322d7819 is described below

commit b9322d78194fe76ef1586e5dc6fc30d0707d7310
Author: Nicolas Goaziou 
AuthorDate: Sun Aug 28 22:46:12 2022 +0200

gnu: emacs-crdt: Update to 0.3.3.

* gnu/packages/emacs-xyz.scm (emacs-crdt): Update to 0.3.3.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c35912a26b..90ee485f1e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19836,8 +19836,8 @@ never confused by comments or @code{foo-bar} matching 
@code{foo}.")
 (define-public emacs-crdt
   ;; XXX: Upstream does not always tag new releases.  The commit below
   ;; corresponds exactly to latest version bump.
-  (let ((commit "2feb88ea9a2589946014878790af585cad9f28fc")
-(version "0.3.2"))
+  (let ((commit "480f60fdda9e40848920fa460b59dfba23fa06e5")
+(version "0.3.3"))
 (package
   (name "emacs-crdt")
   (version version)
@@ -19849,7 +19849,7 @@ never confused by comments or @code{foo-bar} matching 
@code{foo}.")
(commit commit)))
  (file-name (git-file-name name version))
  (sha256
-  (base32 "1fc98kl5qm7h5hrd70g61zzbdinnbf0zvk9rghf6w78ndp6lv7fz"
+  (base32 "10hb2xwv8ylkm4cla2q5l11r1m1s1j4ywiwvy9x5884gxvbpbbph"
   (build-system emacs-build-system)
   (home-page "https://code.librehq.com/qhong/crdt.el;)
   (synopsis "Real-time collaborative editing environment")

branch staging updated: gnu: libunwind-julia: Skip tests.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch staging
in repository guix.

The following commit(s) were added to refs/heads/staging by this push:
 new 20fb55364e gnu: libunwind-julia: Skip tests.
20fb55364e is described below

commit 20fb55364e6e8684c08110af547de141bd363c67
Author: Efraim Flashner 
AuthorDate: Sun Aug 28 21:42:10 2022 +0300

gnu: libunwind-julia: Skip tests.

* gnu/packages/julia.scm (libunwind-julia)[arguments]: Skip tests.
---
 gnu/packages/julia.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 29c981189c..9f3ef031c3 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -82,6 +82,10 @@
   
"1jk3bmiw61ypcchqkk1fyg5wh8wpggk574wxyfyaic870zh3lhgq")
  (julia-patch "libunwind-cfa-rsp"
   
"1aswjhvysahhldbzh1afbf0hsjxrvs6xidsz2i7s1cjkjbdiia1z"))
+(arguments
+ (substitute-keyword-arguments (package-arguments libunwind)
+   ;; Skip tests on this older and patched version of libunwind.
+   ((#:tests? _ #t) #f)))
 (home-page "https://github.com/JuliaLang/tree/master/deps/;)))
 
 (define (julia-patch-url version name)

04/05: gnu: Remove rinutils.

[guix-commits]

lilyp pushed a commit to branch master
in repository guix.

commit 5e174805742b2bec9f5a06c9dd208c60b9af5c14
Author: Liliana Marie Prikler 
AuthorDate: Sat Jul 23 17:16:35 2022 +0200

gnu: Remove rinutils.

This package was introduced as native input to the now removed fortune-mod,
so let's remove it as well.

* gnu/packages/games.scm (rinutils): Delete variable.
---
 gnu/packages/games.scm | 59 --
 1 file changed, 59 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 77929aa790..e39b30ce83 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7632,65 +7632,6 @@ original.")
 (sha256
  (base32 "05xdikw5ln0yh8p5chsmd8qnndmxg5b5vjlfpdqrjcb1ncqzywkc"
 
-(define-public rinutils
-  (package
-(name "rinutils")
-(version "0.10.1")
-(source (origin
-  (method git-fetch)
-  (uri (git-reference
-(url "https://github.com/shlomif/rinutils;)
-(commit version)))
-  (file-name (git-file-name name version))
-  (sha256
-   (base32
-"0r90kncf6mvyklifpdsnm50iya7w2951nz35nlgndmqnr82gvdwf"
-(build-system cmake-build-system)
-(arguments
- (list #:phases
-   #~(modify-phases %standard-phases
-   (add-after 'unpack 'copy-cmake-modules
- (lambda _
-   (copy-file #$shlomif-cmake-modules
-  (string-append "cmake/"
- (strip-store-file-name
-  #$shlomif-cmake-modules)
-   (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
-   (when tests?
- (with-directory-excursion "../source"
-   (setenv "FCS_TEST_BUILD" "1")
-   (setenv "RINUTILS_TEST_BUILD" "1")
-   ;; TODO: Run tests after setting RINUTILS_TEST_TIDY to 
`1',
-   ;; which requires tidy-all.
-   ;; (setenv "RINUTILS_TEST_TIDY" "1")
-   (invoke "perl"
-   
"CI-testing/continuous-integration-testing.pl"
-(native-inputs
- (list perl
-   ;; The following are needed only for tests.
-   perl-class-xsaccessor
-   perl-file-find-object
-   perl-io-all
-   perl-test-differences
-   perl-test-runvalgrind
-   pkg-config))
-(inputs
- (list cmocka
-   perl-env-path
-   perl-inline
-   perl-inline-c
-   perl-string-shellquote
-   perl-test-trailingspace
-   perl-file-find-object-rule
-   perl-text-glob
-   perl-number-compare
-   perl-moo))
-(home-page "https://www.shlomifish.org/open-source/projects/;)
-(synopsis "C11 / gnu11 utilities C library")
-(description "This package provides C11 / gnu11 utilities C library")
-(license license:expat)))
-
 (define xonotic-data
   (package
 (name "xonotic-data")

01/05: gnu: Add daikichi.

[guix-commits]

lilyp pushed a commit to branch master
in repository guix.

commit 2a010ba81d9af05b3ba12f21a8f673ee32ce73fd
Author: Liliana Marie Prikler 
AuthorDate: Sat Jul 23 17:06:02 2022 +0200

gnu: Add daikichi.

* gnu/packages/toys.scm (daikichi): New variable.
---
 gnu/packages/toys.scm | 45 -
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
index fb2f367490..051b4a885d 100644
--- a/gnu/packages/toys.scm
+++ b/gnu/packages/toys.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2017, 2018, 2020–2022 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019 Jesse Gibbons 
 ;;; Copyright © 2019, 2020, 2021 Timotej Lazar 
-;;; Copyright © 2019 Liliana Marie Prikler 
+;;; Copyright © 2019, 2022 Liliana Marie Prikler 
 ;;; Copyright © 2020 Efraim Flashner 
 ;;; Copyright © 2021 Leo Famulari 
 ;;;
@@ -23,22 +23,65 @@
 
 (define-module (gnu packages toys)
   #:use-module (gnu packages)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages man)
+  #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils))
 
+(define-public daikichi
+  (package
+(name "daikichi")
+(version "0.3.0")
+(source (origin
+  (method git-fetch)
+  (uri (git-reference
+(url "https://gitlab.com/lilyp/daikichi;)
+(commit version)))
+  (file-name (git-file-name name version))
+  (sha256
+   (base32
+"1y35f1qpxl743s0s83dg5ivkvprv19mqn0azm14k3y8pmp6cs52z"
+(build-system meson-build-system)
+(arguments
+ (list #:phases
+   #~(modify-phases %standard-phases
+   (add-after 'unpack 'hard-code-test-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+   (substitute* (list "test-dat.in" "test-strings.in")
+ (("(basename|cmp|diff|mktemp|rm|sed|seq)" cmd)
+  (search-input-file inputs
+ (string-append "bin/" cmd)
+(inputs (list bash-minimal coreutils sed
+  fmt gmp))
+(native-inputs (list pkg-config))
+(home-page "https://gitlab.com/lilyp/daikichi;)
+(synopsis "Display random fortunes")
+(description "Daikichi is an alternative implementation of
+@command{fortune}, which displays random quotes from a database.
+This package provides just the utilities and no quotes.")
+(license license:gpl3+)
+(native-search-paths
+ (list (search-path-specification
+(variable "DAIKICHI_FORTUNE_PATH")
+(files '("share/fortunes")))
+
 (define-public lolcat
   (let ((commit "35dca3d0a381496d7195cd78f5b24aa7b62f2154")
 (revision "0"))

03/05: gnu: Remove fortune-mod.

[guix-commits]

lilyp pushed a commit to branch master
in repository guix.

commit 6b6b947b6133c40f86800dc0d36a59e16ac169fc
Author: Liliana Marie Prikler 
AuthorDate: Sat Jul 23 17:13:41 2022 +0200

gnu: Remove fortune-mod.

Since the addition of fortune-jkirchartz, it is no longer necessary to
keep around a package that propagates various non-nice things.
For a complete list, see .

* gnu/packages/games.scm (fortune-mod): Delete variable.
---
 gnu/packages/games.scm | 73 --
 1 file changed, 73 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5dc7298acb..77929aa790 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7691,79 +7691,6 @@ original.")
 (description "This package provides C11 / gnu11 utilities C library")
 (license license:expat)))
 
-(define-public fortune-mod
-  (package
-(name "fortune-mod")
-(version "3.14.0")
-(source
- (origin
-   (method git-fetch)
-   (uri (git-reference
- (url "https://github.com/shlomif/fortune-mod;)
- (commit (string-append "fortune-mod-" version
-   (file-name (git-file-name name version))
-   (sha256
-(base32 "1f2zif3s6vddbhph4jr1cymdsn7gagg59grrxs0yap6myqmy8shg"
-(build-system cmake-build-system)
-(arguments
- (list #:configure-flags
-   #~(let ((fortunes (string-append #$output "/share/fortunes")))
-   (list (string-append "-DLOCALDIR=" fortunes)
- (string-append "-DLOCALODIR=" fortunes "/off")
- (string-append "-DCOOKIEDIR=" fortunes)
- (string-append "-DOCOOKIEDIR=" fortunes "/off")))
-   #:test-target "check"
-   #:phases
-   #~(modify-phases %standard-phases
-   (add-after 'unpack 'enter-build-directory
- (lambda _
-   (chdir "fortune-mod")))
-   (add-after 'enter-build-directory 'symlink-rinutils
- (lambda _
-   (mkdir-p "rinutils")
-   (symlink #$(this-package-native-input "rinutils")
-"rinutils/rinutils")))
-   (add-after 'enter-build-directory 'copy-cmake-modules
- (lambda _
-   (copy-file #$shlomif-cmake-modules
-  (string-append "cmake/"
- (strip-store-file-name
-  #$shlomif-cmake-modules)
-   (add-after 'enter-build-directory 'delete-failing-test
- (lambda _
-   ;; TODO: Valgrind tests fail for some reason.  Similar 
issue?
-   ;; https://github.com/shlomif/fortune-mod/issues/21
-   (delete-file "tests/data/valgrind.t")
-   (with-output-to-file "tests/scripts/split-valgrind.pl"
- (const #t
-   (add-after 'install 'fix-install-directory
- ;; Move fortune from "games/" to "bin/" and remove the
- ;; former.  This is easier than patching CMakeLists.txt
- ;; since the tests hard-code the location as well.
- (lambda _
-   (with-directory-excursion #$output
- (rename-file "games/fortune" "bin/fortune")
- (rmdir "games")))
-(inputs (list recode))
-(native-inputs
- (list perl
-   ;; For generating the documentation.
-   docbook-xml-5
-   docbook-xsl
-   perl-app-xml-docbook-builder
-   ;; The following are only needed for tests.
-   perl-file-find-object
-   perl-test-differences
-   perl-class-xsaccessor
-   perl-io-all
-   perl-test-runvalgrind
-   rinutils))
-(home-page "https://www.shlomifish.org/open-source/projects/fortune-mod/;)
-(synopsis "The Fortune Cookie program from BSD games")
-(description "Fortune is a command-line utility which displays a random
-quotation from a collection of quotes.")
-(license license:bsd-4)))
-
 (define xonotic-data
   (package
 (name "xonotic-data")

02/05: gnu: Add fortunes-jkirchartz.

[guix-commits]

lilyp pushed a commit to branch master
in repository guix.

commit 560b365c2c569f5b7603c9b33b7f982ad97be770
Author: Liliana Marie Prikler 
AuthorDate: Sat Jul 23 17:11:16 2022 +0200

gnu: Add fortunes-jkirchartz.

* gnu/packages/toys.scm (fortunes-jkirchartz): New variable.
---
 gnu/packages/toys.scm | 54 +++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
index 051b4a885d..8967c0c25b 100644
--- a/gnu/packages/toys.scm
+++ b/gnu/packages/toys.scm
@@ -37,6 +37,7 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system copy)
   #:use-module (guix build-system meson)
   #:use-module (guix download)
   #:use-module (guix gexp)
@@ -82,6 +83,59 @@ This package provides just the utilities and no quotes.")
 (variable "DAIKICHI_FORTUNE_PATH")
 (files '("share/fortunes")))
 
+(define-public fortunes-jkirchartz
+  ;; No public release.
+  ;; Note to updaters: Please ensure that new quotes do not bring harm
+  ;; rather than fortune.
+  (let ((commit "2e32ba0a57e3842dc06c8128d880ab4c8ec3aefc")
+(revision "0"))
+(package
+  (name "fortunes-jkirchartz")
+  (version (git-version "0" revision commit))
+  (source (origin
+(method git-fetch)
+(uri (git-reference
+  (url "https://github.com/JKirchartz/fortunes;)
+  (commit commit)))
+(file-name (git-file-name name version))
+(sha256
+ (base32
+  "1ym4ldzww5yfd76q7zvhi491bqlykfjnc215bqx1cbj0c8ndb2l4"))
+(snippet
+ #~(for-each delete-file
+ ;; incompatible license
+ '("BibleAbridged")
+  (build-system copy-build-system)
+  (native-inputs (list daikichi gnu-make))
+  (arguments
+   (list #:install-plan
+ #~`(("." "share/fortunes" #:include-regexp ("\\.dat$")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-source
+   (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (substitute* "showerthoughts"
+   (("") "<")
+   (("") ">")
+   (("") "&"))
+ (substitute* "Makefile"
+   (("strfile") "daikichi pack"
+ (add-before 'install 'build
+   (lambda _
+ (invoke "make")))
+ (add-after 'build 'check
+   (lambda* (#:key inputs tests? #:allow-other-keys)
+ (when tests?
+   (apply
+invoke
+(search-input-file inputs "libexec/daikichi/test-dat")
+(find-files "." "\\.dat$"
+  (home-page "https://github.com/JKirchartz/fortunes;)
+  (synopsis "Collection of fortunes")
+  (description "This package contains a large collection of quotes to
+display via @command{fortune}, drawn from sources all around the world.")
+  (license license:unlicense
+
 (define-public lolcat
   (let ((commit "35dca3d0a381496d7195cd78f5b24aa7b62f2154")
 (revision "0"))

05/05: gnu: Remove shlomif-cmake-modules.

[guix-commits]

lilyp pushed a commit to branch master
in repository guix.

commit f592decd4d823a973600d4cdd9f3f7d3ea610429
Author: Liliana Marie Prikler 
AuthorDate: Sat Jul 23 17:17:32 2022 +0200

gnu: Remove shlomif-cmake-modules.

This origin was added for the now removed fortune-mod, so let's remove it
as well.

* gnu/packages/games.scm (shlomif-cmake-modules): Delete variable.
---
 gnu/packages/games.scm | 10 --
 1 file changed, 10 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e39b30ce83..fe66343a4c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7622,16 +7622,6 @@ entirely config file, savegame, netplay and demo 
compatible with the
 original.")
 (home-page "https://www.chocolate-doom.org/wiki/index.php/Crispy_Doom;)))
 
-(define shlomif-cmake-modules
-  (origin
-(method url-fetch)
-(uri (string-append
-  "https://raw.githubusercontent.com/shlomif/shlomif-cmake-modules/;
-  "89f05caf86078f783873975525230cf4fecede8a"
-  "/shlomif-cmake-modules/Shlomif_Common.cmake"))
-(sha256
- (base32 "05xdikw5ln0yh8p5chsmd8qnndmxg5b5vjlfpdqrjcb1ncqzywkc"
-
 (define xonotic-data
   (package
 (name "xonotic-data")

branch master updated (57f8f69562 -> f592decd4d)

[guix-commits]

lilyp pushed a change to branch master
in repository guix.

from 57f8f69562 gnu: gnome-shell: Adjust for polkit 121.
 new 2a010ba81d gnu: Add daikichi.
 new 560b365c2c gnu: Add fortunes-jkirchartz.
 new 6b6b947b61 gnu: Remove fortune-mod.
 new 5e17480574 gnu: Remove rinutils.
 new f592decd4d gnu: Remove shlomif-cmake-modules.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/games.scm | 142 -
 gnu/packages/toys.scm  |  99 +-
 2 files changed, 98 insertions(+), 143 deletions(-)

[shepherd] 01/03: tests: Ensure log file is closed when service is stopped.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository shepherd.

commit 9ac885273911c7a500e165adaf29c3c9d125d975
Author: Ludovic Courtès 
AuthorDate: Wed Jun 29 18:21:51 2022 +0200

tests: Ensure log file is closed when service is stopped.

* tests/logging.sh (find_file_descriptor): New function.
Use it to check whether "$service_log" is closed after "herd stop
test-file-logging".
---
 tests/logging.sh | 20 
 1 file changed, 20 insertions(+)

diff --git a/tests/logging.sh b/tests/logging.sh
index 6f96b3e..4d7a652 100644
--- a/tests/logging.sh
+++ b/tests/logging.sh
@@ -84,6 +84,26 @@ do
 grep -E '^2[0-9]{3}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} 
'"$message" "$service_log"
 done
 
+# Return the file descriptor corresponding to the given file.
+find_file_descriptor ()
+{
+for fd in "/proc/$shepherd_pid/fd"/*
+do
+   if [ "$(readlink $fd)" = "$1" ]
+   then
+   echo "$fd"
+   break
+   fi
+done
+}
+
+# At this point, the log file is open.
+test -n "$(find_file_descriptor "$PWD/$service_log")"
+
+# Stop the service and ensure the log file has been closed.
+$herd stop test-file-logging
+test -z "$(find_file_descriptor "$PWD/$service_log")"
+
 rm -f "$service_pid"
 $herd start test-builtin-logging
 for message in "STARTING" "STARTED" "café" "latin1 garbage: .* alors"

[shepherd] 02/03: shepherd: Mark server socket as SOCK_CLOEXEC.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository shepherd.

commit 6373599137886ba8f5e088ce2fdcb730544c38e6
Author: Ludovic Courtès 
AuthorDate: Sun Aug 28 17:31:47 2022 +0200

shepherd: Mark server socket as SOCK_CLOEXEC.

* modules/shepherd.scm (open-server-socket): Add SOCK_CLOEXEC to the
second argument to 'socket'.
---
 modules/shepherd.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/shepherd.scm b/modules/shepherd.scm
index 61d0402..cbc5eaa 100644
--- a/modules/shepherd.scm
+++ b/modules/shepherd.scm
@@ -44,7 +44,9 @@
 (define (open-server-socket file-name)
   "Open a socket at FILE-NAME, and listen for connections there."
   (with-fluids ((%default-port-encoding "UTF-8"))
-(let ((sock(socket PF_UNIX SOCK_STREAM 0))
+(let ((sock(socket PF_UNIX
+   (logior SOCK_STREAM SOCK_CLOEXEC)
+   0))
   (address (make-socket-address AF_UNIX file-name)))
   (fcntl sock F_SETFL (logior O_NONBLOCK
   (fcntl sock F_GETFL)))

[shepherd] branch master updated (0665dc6 -> 245f884)

[Ludovic Courtès]

civodul pushed a change to branch master
in repository shepherd.

from 0665dc6  build: Bump to version 0.9.1.
 new 9ac8852  tests: Ensure log file is closed when service is stopped.
 new 6373599  shepherd: Mark server socket as SOCK_CLOEXEC.
 new 245f884  comm: Mark the syslog socket as SOCK_CLOEXEC.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 modules/shepherd.scm  |  4 +++-
 modules/shepherd/comm.scm |  6 --
 tests/logging.sh  | 20 
 3 files changed, 27 insertions(+), 3 deletions(-)

[shepherd] 03/03: comm: Mark the syslog socket as SOCK_CLOEXEC.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository shepherd.

commit 245f884e22656ef6907082bcc24cc9968b5dee44
Author: Ludovic Courtès 
AuthorDate: Sun Aug 28 17:32:43 2022 +0200

comm: Mark the syslog socket as SOCK_CLOEXEC.

* modules/shepherd/comm.scm (call-with-syslog-port):  Add 'SOCK_CLOEXEC'
to the second argument to 'socket'.
---
 modules/shepherd/comm.scm | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/shepherd/comm.scm b/modules/shepherd/comm.scm
index b90b893..a993439 100644
--- a/modules/shepherd/comm.scm
+++ b/modules/shepherd/comm.scm
@@ -1,5 +1,5 @@
 ;; comm.scm -- Communication between processes and general output.
-;; Copyright (C) 2013, 2014, 2016, 2018, 2019 Ludovic Courtès 
+;; Copyright (C) 2013, 2014, 2016, 2018, 2019, 2022 Ludovic Courtès 

 ;; Copyright (C) 2002, 2003 Wolfgang Jährling 
 ;; Copyright (C) 2018 Danny Milosavljevic 
 ;;
@@ -238,7 +238,9 @@ mechanism."
 (apply throw args)
 
   (or (and port (not (port-closed? port)) (call/syslog))
-  (let ((sock (socket AF_UNIX SOCK_DGRAM 0)))
+  (let ((sock (socket AF_UNIX
+  (logior SOCK_CLOEXEC SOCK_DGRAM)
+  0)))
 (catch 'system-error
   (lambda ()
 (connect sock AF_UNIX "/dev/log")

01/01: Merge branch 'master' into staging

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit dedbaa3a69e8e4da419d62ce0022c1af02bbef5a
Merge: 5bfe389a6e 57f8f69562
Author: Marius Bakke 
AuthorDate: Sun Aug 28 15:43:30 2022 +0200

Merge branch 'master' into staging

 gnu/local.mk   |   4 +-
 gnu/packages/admin.scm |  12 +-
 gnu/packages/bdw-gc.scm|   5 +
 gnu/packages/bioconductor.scm  |  10 +-
 gnu/packages/build-tools.scm   | 101 
 gnu/packages/direct-connect.scm|   2 +-
 gnu/packages/disk.scm  |   1 +
 gnu/packages/education.scm |   4 +-
 gnu/packages/emacs-xyz.scm | 183 +++--
 gnu/packages/game-development.scm  |   1 +
 gnu/packages/geo.scm   |   6 +-
 gnu/packages/gnome.scm |  81 +++--
 gnu/packages/gps.scm   |   1 +
 gnu/packages/gtk.scm   |   1 -
 gnu/packages/image.scm |   1 +
 gnu/packages/installers.scm|   2 +-
 gnu/packages/libffi.scm|  20 +--
 .../patches/gnome-shell-polkit-autocleanup.patch   |  50 ++
 gnu/packages/patches/scons-test-environment.patch  |  57 +++
 gnu/packages/python-xyz.scm|  45 -
 gnu/packages/qt.scm|   2 +-
 gnu/packages/samba.scm |   7 +-
 gnu/packages/web.scm   |   4 +-
 gnu/packages/webkit.scm|   7 +-
 gnu/packages/wm.scm|  11 +-
 gnu/packages/xdisorg.scm   |   1 +
 guix/build-system/scons.scm|   4 +-
 27 files changed, 472 insertions(+), 151 deletions(-)

diff --cc gnu/packages/bdw-gc.scm
index c812248e86,268f0703b8..4dd559ef79
--- a/gnu/packages/bdw-gc.scm
+++ b/gnu/packages/bdw-gc.scm
@@@ -133,8 -133,13 +133,13 @@@ C or C++ programs, though that is not i
  version "/libatomic_ops-" version ".tar.gz"))
(sha256
 (base32
 -"1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq"
 +"0glzah695wsf6c27hs5wwlw4mnq1vfivdshz1rb8pq7w4mp5dazh"
  (build-system gnu-build-system)
+ (arguments
+  `(,@(if (target-riscv64?)
+`(#:configure-flags
+  (list "CFLAGS_EXTRA=-latomic"))
+'(
  (outputs '("out" "debug"))
  (synopsis "Accessing hardware atomic memory update operations")
  (description

branch staging updated (5bfe389a6e -> dedbaa3a69)

[guix-commits]

mbakke pushed a change to branch staging
in repository guix.

from 5bfe389a6e gnu: imlib2: Update to 1.9.1.
 add a3c097e1cd gnu: emacs-auctex: Update to 13.1.4.
 add cbbea5b470 gnu: emacs-subed: Update to 1.0.7.
 add fd4d531e10 gnu: emacs-taxy-magit-section: Update to 0.10.
 add ea2ead6827 gnu: emacs-iter2: Update to 1.3.
 add 1f9a4f79f6 gnu: Add emacs-drag-stuff.
 add ba1612d81c gnu: Add emacs-consult-org-roam.
 add 2026a967f7 gnu: emacs-lpy: Update to ce78a46.
 add 5655a84779 gnu: Add emacs-tamil99.
 add 5299ee228f gnu: Add emacs-alarm-clock.
 add 92f64f833a gnu: emacs-org-contrib: Update to 0.4.
 add b07180a13b gnu: emacs-arduino-mode: Update to 1.3.0-0-652c6a3.
 add b594c7354c gnu: emacs-arduino-mode: Slightly improve description.
 add 3e8769f3c9 gnu: realmd: Remove input labels.
 add 34625246e4 gnu: Remove unused module import.
 add ada35de38f gnu: scons: Move to (gnu packages build-tools).
 add 59bbf7e86c gnu: scons: Update to 4.4.0.
 add 9f8f34a16a gnu: samba: Update to 4.16.4.
 add 69820ecfd9 gnu: qtwebengine: Fix QTWEBENGINEPROCESS_PATH specification.
 add b0d64a81dc gnu: qtile: Install .desktop file.
 add 9779cf046e gnu: fet: Update to 6.5.7.
 add 9ad4d90a61 gnu: emacs-cider: Update to 1.5.0.
 add 8df29c26ba gnu: ruby-ffi: Update to 1.15.5.
 add 84d191ea30 gnu: libatomic-ops: Fix test suite on riscv64-linux.
 add 10f0d0766c gnu: r-iranges: Update to 2.30.1.
 add 0aeedfb89a gnu: webkit: Update to 2.36.7.
 add 444c300e3e gnu: r-genomeinfodb: Update to 1.32.3.
 add d9c7321255 gnu: libgweather: Remove input labels.
 add 134a29fc08 gnu: libgweather: Remove obsolete input.
 add 17f646aeba gnu: Add libgweather4.
 add a44e08337d gnu: gnome-maps: Update to 42.2.
 add 57f8f69562 gnu: gnome-shell: Adjust for polkit 121.
 new dedbaa3a69 Merge branch 'master' into staging

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/local.mk   |   4 +-
 gnu/packages/admin.scm |  12 +-
 gnu/packages/bdw-gc.scm|   5 +
 gnu/packages/bioconductor.scm  |  10 +-
 gnu/packages/build-tools.scm   | 101 
 gnu/packages/direct-connect.scm|   2 +-
 gnu/packages/disk.scm  |   1 +
 gnu/packages/education.scm |   4 +-
 gnu/packages/emacs-xyz.scm | 183 +++--
 gnu/packages/game-development.scm  |   1 +
 gnu/packages/geo.scm   |   6 +-
 gnu/packages/gnome.scm |  81 +++--
 gnu/packages/gps.scm   |   1 +
 gnu/packages/gtk.scm   |   1 -
 gnu/packages/image.scm |   1 +
 gnu/packages/installers.scm|   2 +-
 gnu/packages/libffi.scm|  20 +--
 .../patches/gnome-shell-polkit-autocleanup.patch   |  50 ++
 gnu/packages/patches/scons-test-environment.patch  |  57 +++
 gnu/packages/python-xyz.scm|  45 -
 gnu/packages/qt.scm|   2 +-
 gnu/packages/samba.scm |   7 +-
 gnu/packages/web.scm   |   4 +-
 gnu/packages/webkit.scm|   7 +-
 gnu/packages/wm.scm|  11 +-
 gnu/packages/xdisorg.scm   |   1 +
 guix/build-system/scons.scm|   4 +-
 27 files changed, 472 insertions(+), 151 deletions(-)
 create mode 100644 gnu/packages/patches/gnome-shell-polkit-autocleanup.patch
 create mode 100644 gnu/packages/patches/scons-test-environment.patch

04/05: gnu: gnome-maps: Update to 42.2.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit a44e08337d15b3f254a35d0311663c2bbd501852
Author: Marius Bakke 
AuthorDate: Sun Aug 28 15:24:23 2022 +0200

gnu: gnome-maps: Update to 42.2.

* gnu/packages/geo.scm (gnome-maps): Update to 42.2.
[inputs]: Change from LIBGWEATHER to LIBGWEATHER4.
---
 gnu/packages/geo.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 66c97d3d6a..83bb4d9cb0 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -253,7 +253,7 @@ topology functions.")
 (define-public gnome-maps
   (package
 (name "gnome-maps")
-(version "41.2")
+(version "42.2")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://gnome/sources/" name "/"
@@ -261,7 +261,7 @@ topology functions.")
   name "-" version ".tar.xz"))
   (sha256
(base32
-"037xmkmcmcw87vb1c1s3y225m8757k331cvk1m8cshf6mx61p0l1"
+"1cb9s2zz1zib3f33c035lmgshpl679isbzdd3alrx4yclw61nvay"
 (build-system meson-build-system)
 (arguments
  `(#:glib-or-gtk? #t
@@ -318,7 +318,7 @@ topology functions.")
("libhandy" ,libhandy)
("libsecret" ,libsecret)
("libsoup" ,libsoup-minimal-2)
-   ("libgweather" ,libgweather)
+   ("libgweather" ,libgweather4)
("libxml2" ,libxml2)
("librsvg" ,librsvg)
("glib-networking" ,glib-networking)

01/05: gnu: libgweather: Remove input labels.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit d9c73212555368089274e580f71bd6aec10b6dac
Author: Marius Bakke 
AuthorDate: Sun Aug 28 13:23:22 2022 +0200

gnu: libgweather: Remove input labels.

* gnu/packages/gnome.scm (libgweather)[arguments]: Use G-expression and
SEARCH-INPUT-DIRECTORY.
[native-inputs, propagated-inputs]: Remove labels.
---
 gnu/packages/gnome.scm | 31 ++-
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ae46e55c51..252bac544b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5519,27 +5519,24 @@ service via the system message bus.")
 "1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna"
 (build-system meson-build-system)
 (arguments
- `(#:tests? #f ; one of two tests requires network access
-   #:configure-flags
-   `(,(string-append "-Dzoneinfo_dir="
- (assoc-ref %build-inputs "tzdata")
- "/share/zoneinfo"
+ (list
+  #:tests? #f;one of two tests requires network access
+  #:configure-flags
+  #~(list (string-append "-Dzoneinfo_dir="
+ (search-input-directory %build-inputs
+ "share/zoneinfo")
 (native-inputs
- `(("glib:bin" ,glib "bin") ; for glib-mkenums
-   ("gobject-introspection" ,gobject-introspection)
-   ("pkg-config" ,pkg-config)
-   ("python" ,python)
-   ("vala" ,vala)
-   ("intltool" ,intltool)
-   ("python-pygobject" ,python-pygobject)))
+ (list `(,glib "bin")   ;for glib-mkenums
+   gobject-introspection
+   pkg-config
+   python
+   vala
+   intltool
+   python-pygobject))
 (propagated-inputs
  ;; gweather-3.0.pc refers to GTK+, GDK-Pixbuf, GLib/GObject, libxml, and
  ;; libsoup.
- `(("gtk+" ,gtk+)
-   ("gdk-pixbuf" ,gdk-pixbuf)
-   ("libxml2" ,libxml2)
-   ("libsoup" ,libsoup-minimal-2)
-   ("geocode-glib" ,geocode-glib)))
+ (list gtk+ gdk-pixbuf libxml2 libsoup-minimal-2 geocode-glib))
 (inputs
  (list tzdata))
 (home-page "https://wiki.gnome.org/action/show/Projects/LibGWeather;)

05/05: gnu: gnome-shell: Adjust for polkit 121.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 57f8f69562e942557e3331bb81c7e4acd973d189
Author: Marius Bakke 
AuthorDate: Sun Aug 28 15:39:54 2022 +0200

gnu: gnome-shell: Adjust for polkit 121.

* gnu/packages/patches/gnome-shell-polkit-autocleanup.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/gnome.scm (gnome-shell)[source](patches): New field.
---
 gnu/local.mk   |  3 +-
 gnu/packages/gnome.scm |  1 +
 .../patches/gnome-shell-polkit-autocleanup.patch   | 50 ++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 2a26a3879b..027cb8e3cb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1211,7 +1211,8 @@ dist_patch_DATA = 
\
   %D%/packages/patches/gnome-online-miners-tracker-3.patch \
   %D%/packages/patches/gnome-screenshot-meson-0.60.patch   \
   %D%/packages/patches/gnome-settings-daemon-gc.patch  \
-  %D%/packages/patches/gnome-session-support-elogind.patch  \
+  %D%/packages/patches/gnome-session-support-elogind.patch \
+  %D%/packages/patches/gnome-shell-polkit-autocleanup.patch\
   %D%/packages/patches/gnome-todo-libportal.patch  \
   %D%/packages/patches/gnome-tweaks-search-paths.patch \
   %D%/packages/patches/gnupg-CVE-2022-34903.patch  \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f028eb7611..251d08ae01 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8701,6 +8701,7 @@ properties, screen resolution, and other GNOME 
parameters.")
   (uri (string-append "mirror://gnome/sources/" name "/"
   (version-major version) "/"
   name "-" version ".tar.xz"))
+  (patches (search-patches "gnome-shell-polkit-autocleanup.patch"))
   (sha256
(base32
 "0ragmcln210zvzhc2br33yprbkj9drjzd7inp5sdxra0a7l73yaj"
diff --git a/gnu/packages/patches/gnome-shell-polkit-autocleanup.patch 
b/gnu/packages/patches/gnome-shell-polkit-autocleanup.patch
new file mode 100644
index 00..08968b83a1
--- /dev/null
+++ b/gnu/packages/patches/gnome-shell-polkit-autocleanup.patch
@@ -0,0 +1,50 @@
+Don't redefine G_DEFINE_AUTOPTR_CLEANUP_FUNC when available in polkit.
+
+Taken from upstream:
+
+  
https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+
+diff --git a/config.h.meson b/config.h.meson
+index b93fda8727..ff355d3062 100644
+--- a/config.h.meson
 b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+diff --git a/meson.build b/meson.build
+index 42ec01c566..778a34c6ef 100644
+--- a/meson.build
 b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+   cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include 
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+diff --git a/src/shell-polkit-authentication-agent.h 
b/src/shell-polkit-authentication-agent.h
+index 55b46af110..4f14749563 100644
+--- a/src/shell-polkit-authentication-agent.h
 b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the 
autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT 
(shell_polkit_authentication_agent_get_type())
+ 

02/05: gnu: libgweather: Remove obsolete input.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 134a29fc08c7693156c002d6196c8e748032364f
Author: Marius Bakke 
AuthorDate: Sun Aug 28 13:24:23 2022 +0200

gnu: libgweather: Remove obsolete input.

* gnu/packages/gnome.scm (libgweather)[native-inputs]: Remove INTLTOOL.  Add
GETTEXT-MINIMAL.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 252bac544b..93d98121b4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5526,12 +5526,12 @@ service via the system message bus.")
  (search-input-directory %build-inputs
  "share/zoneinfo")
 (native-inputs
- (list `(,glib "bin")   ;for glib-mkenums
+ (list gettext-minimal
+   `(,glib "bin")   ;for glib-mkenums
gobject-introspection
pkg-config
python
vala
-   intltool
python-pygobject))
 (propagated-inputs
  ;; gweather-3.0.pc refers to GTK+, GDK-Pixbuf, GLib/GObject, libxml, and

branch master updated (444c300e3e -> 57f8f69562)

[guix-commits]

mbakke pushed a change to branch master
in repository guix.

from 444c300e3e gnu: r-genomeinfodb: Update to 1.32.3.
 new d9c7321255 gnu: libgweather: Remove input labels.
 new 134a29fc08 gnu: libgweather: Remove obsolete input.
 new 17f646aeba gnu: Add libgweather4.
 new a44e08337d gnu: gnome-maps: Update to 42.2.
 new 57f8f69562 gnu: gnome-shell: Adjust for polkit 121.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/local.mk   |  3 +-
 gnu/packages/geo.scm   |  6 +-
 gnu/packages/gnome.scm | 81 +-
 .../patches/gnome-shell-polkit-autocleanup.patch   | 50 +
 4 files changed, 119 insertions(+), 21 deletions(-)
 create mode 100644 gnu/packages/patches/gnome-shell-polkit-autocleanup.patch

03/05: gnu: Add libgweather4.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 17f646aeba39f0d297f6c911d83b3bd9e88a227b
Author: Marius Bakke 
AuthorDate: Sun Aug 28 13:55:03 2022 +0200

gnu: Add libgweather4.

* gnu/packages/gnome.scm (libgweather4): New variable.
---
 gnu/packages/gnome.scm | 49 +
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 93d98121b4..f028eb7611 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5546,6 +5546,55 @@ service via the system message bus.")
 services for numerous locations.")
 (license license:gpl2+)))
 
+;; libgweather no longer follows the GNOME version, and recommends changing
+;; the package name in distributions to avoid accidental downgrades.  See
+;; .
+;; TODO: how to prevent the updater from picking version 40?
+(define-public libgweather4
+  (package
+(inherit libgweather)
+(name "libgweather4")
+(version "4.0.0")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "mirror://gnome/sources/libgweather/"
+  (version-major+minor version) "/"
+  "libgweather-" version ".tar.xz"))
+  (sha256
+   (base32
+"0k43mr7vmcg14lkwjk6p9wwy3zlw23wkfpkfcy6b8wkg3f0483a4"
+(arguments
+ (list
+  ;; FIXME: multiple tests fails as such:
+  ;;   "GLib-GIO-FATAL-ERROR: Settings schema 'org.gnome.system.proxy'
+  ;;   is not installed"
+  #:tests? #f
+  #:configure-flags
+  #~(list (string-append "-Dzoneinfo_dir="
+ (search-input-directory %build-inputs
+ "share/zoneinfo"))
+  ;; TODO: Requires 'gi-docgen'.
+  "-Dgtk_doc=false")
+  #:phases
+  #~(modify-phases %standard-phases
+  (add-before 'check 'pre-check
+(lambda _
+  (setenv "HOME" "/tmp"))
+(native-inputs
+ (list gettext-minimal
+   `(,glib "bin")   ;for glib-mkenums
+   gobject-introspection
+   pkg-config
+   python
+   vala
+   python-pygobject))
+;; TODO: It would be good to make the package respect TZDIR instead
+;; of using a "hard coded" version of tzdata.
+(inputs (list tzdata))
+(propagated-inputs
+ ;; gweather4.pc refers to all of these.
+ (list glib libxml2 libsoup-minimal-2 geocode-glib
+
 (define-public gnome-settings-daemon
   (package
 (name "gnome-settings-daemon")

branch master updated: gnu: r-genomeinfodb: Update to 1.32.3.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 444c300e3e gnu: r-genomeinfodb: Update to 1.32.3.
444c300e3e is described below

commit 444c300e3e088d31e44209e735618b97ca402f61
Author: Efraim Flashner 
AuthorDate: Sun Aug 28 15:47:58 2022 +0300

gnu: r-genomeinfodb: Update to 1.32.3.

* gnu/packages/bioconductor.scm (r-genomeinfodb): Update to 1.32.3.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index a4a020e71c..7aee0c55c3 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -4328,13 +4328,13 @@ genomic intervals.  In addition, it can use BAM or 
BigWig files as input.")
 (define-public r-genomeinfodb
   (package
 (name "r-genomeinfodb")
-(version "1.32.2")
+(version "1.32.3")
 (source (origin
   (method url-fetch)
   (uri (bioconductor-uri "GenomeInfoDb" version))
   (sha256
(base32
-"1n37bwb2fqmdgqbn19rgsd2qn8vbdhv6khdwjr7v12bwabcbx9xh"
+"17nwcq2ivj3bdibdywfyjq4n6z0djispbh9ahqa55sp31ksq41xh"
 (properties
  `((upstream-name . "GenomeInfoDb")))
 (build-system r-build-system)

branch master updated: gnu: webkit: Update to 2.36.7.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 0aeedfb89a gnu: webkit: Update to 2.36.7.
0aeedfb89a is described below

commit 0aeedfb89a530c52ce11f171d99758fb6d88d162
Author: Efraim Flashner 
AuthorDate: Sun Aug 28 14:47:14 2022 +0300

gnu: webkit: Update to 2.36.7.

* gnu/packages/webkit.scm (%webkit-version, webkitgtk, wpewebkit):
Update to 2.36.7.
---
 gnu/packages/webkit.scm | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 5a6d49c888..7f9610149d 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2018 Pierre Neidhardt 
 ;;; Copyright © 2019 Marius Bakke 
 ;;; Copyright © 2021, 2022 Maxim Cournoyer 
+;;; Copyright © 2022 Efraim Flashner 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -123,7 +124,7 @@ the WPE-flavored port of WebKit.")
 engine that uses Wayland for graphics output.")
 (license license:bsd-2)))
 
-(define %webkit-version "2.36.4")
+(define %webkit-version "2.36.7")
 
 (define-public webkitgtk
   (package
@@ -134,7 +135,7 @@ engine that uses Wayland for graphics output.")
   (uri (string-append "https://www.webkitgtk.org/releases/;
   name "-" version ".tar.xz"))
   (sha256
-   (base32 "1a72w9md2xvb82rd2sk3c7pqrvr28rqa8i4yq5ldjyd4hlgvxgmn"))
+   (base32 "0hqpfgzbb7lzdih9aw86rmkljm8ynv8zw3b72z88211gngr0q9hc"))
   (patches (search-patches
 "webkitgtk-adjust-bubblewrap-paths.patch"
 (build-system cmake-build-system)
@@ -300,7 +301,7 @@ propagated by default) such as @code{gst-plugins-good} and
   (uri (string-append "https://wpewebkit.org/releases/;
   name "-" version ".tar.xz"))
   (sha256
-   (base32 
"08f0sz4d5bpgrgvkgby3fri3wk5474f66gvp3y39laflypnknyih"
+   (base32 
"1jcm5fjzn1k9l87qwqgmvd5qriwpv3vgs632zc6asqn5zxr7sx7k"
 (arguments
  (substitute-keyword-arguments (package-arguments webkitgtk)
((#:configure-flags flags)

branch staging updated: gnu: imlib2: Update to 1.9.1.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch staging
in repository guix.

The following commit(s) were added to refs/heads/staging by this push:
 new 5bfe389a6e gnu: imlib2: Update to 1.9.1.
5bfe389a6e is described below

commit 5bfe389a6eb7727994b802d2aa8737c16fd78057
Author: Efraim Flashner 
AuthorDate: Sun Aug 28 12:17:21 2022 +0300

gnu: imlib2: Update to 1.9.1.

* gnu/packages/image.scm (imlib2): Update to 1.9.1.
---
 gnu/packages/image.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index c31688d045..752b7f80ca 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -978,7 +978,7 @@ Metafile}, and @acronym{EMF+, Enhanced Metafile Plus} 
files.")
 (define-public imlib2
   (package
 (name "imlib2")
-(version "1.9.0")
+(version "1.9.1")
 (source (origin
   (method url-fetch)
   (uri (string-append
@@ -986,7 +986,7 @@ Metafile}, and @acronym{EMF+, Enhanced Metafile Plus} 
files.")
 "/imlib2-" version ".tar.xz"))
   (sha256
(base32
-"0l662h74i3mzl5ligj1352rf8bf48drasj97wygr2037gk5fijas"
+"0hsdfs7wa5f7fwb5nfgqzvf29bp59rgy0i0c4m6mvgpzpww408ja"
 (build-system gnu-build-system)
 (arguments
  '(#:configure-flags (list "--disable-static")))

branch master updated: gnu: r-iranges: Update to 2.30.1.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 10f0d0766c gnu: r-iranges: Update to 2.30.1.
10f0d0766c is described below

commit 10f0d0766ca838ed40b349f7c302c405aa27b81d
Author: Efraim Flashner 
AuthorDate: Sun Aug 28 13:27:31 2022 +0300

gnu: r-iranges: Update to 2.30.1.

* gnu/packages/bioconductor.scm (r-iranges): Update to 2.30.1.
---
 gnu/packages/bioconductor.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index facfb75abf..a4a020e71c 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Roel Janssen 
 ;;; Copyright © 2016 Pjotr Prins 
 ;;; Copyright © 2016 Ben Woodcroft 
-;;; Copyright © 2017 Efraim Flashner 
+;;; Copyright © 2017, 2022 Efraim Flashner 
 ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice 

 ;;; Copyright © 2019, 2020, 2021, 2022 Simon Tournier 

 ;;; Copyright © 2020 Peter Lo 
@@ -2756,13 +2756,13 @@ over-abundant or less-abundant as compared to that of 
normal cells.")
 (define-public r-iranges
   (package
 (name "r-iranges")
-(version "2.30.0")
+(version "2.30.1")
 (source (origin
   (method url-fetch)
   (uri (bioconductor-uri "IRanges" version))
   (sha256
(base32
-"0hfx5n0b4pqrrc1w2dik596803ly8ffnxfs768iy5l5kr8wwyc8k"
+"1r01c9lczkchgd9hbxxd6wrd5avhy52mfqjck7l9avjq1jimvzv3"
 (properties
  `((upstream-name . "IRanges")))
 (build-system r-build-system)

branch master updated: gnu: libatomic-ops: Fix test suite on riscv64-linux.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 84d191ea30 gnu: libatomic-ops: Fix test suite on riscv64-linux.
84d191ea30 is described below

commit 84d191ea30eb7d97ee3f4d62f39c811ba77bb187
Author: Efraim Flashner 
AuthorDate: Sun Aug 28 11:29:20 2022 +0300

gnu: libatomic-ops: Fix test suite on riscv64-linux.

* gnu/packages/bdw-gc.scm (libatomic-ops)[arguments]: When building for
riscv64-linux add a configure-flag to link libatomic.
---
 gnu/packages/bdw-gc.scm | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm
index 2698d56da0..268f0703b8 100644
--- a/gnu/packages/bdw-gc.scm
+++ b/gnu/packages/bdw-gc.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2016, 2018 Leo Famulari 
 ;;; Copyright © 2017 Rene Saavedra 
 ;;; Copyright © 2019, 2020 Marius Bakke 
+;;; Copyright © 2022 Efraim Flashner 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -134,6 +135,11 @@ C or C++ programs, though that is not its primary goal.")
(base32
 "1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq"
 (build-system gnu-build-system)
+(arguments
+ `(,@(if (target-riscv64?)
+   `(#:configure-flags
+ (list "CFLAGS_EXTRA=-latomic"))
+   '(
 (outputs '("out" "debug"))
 (synopsis "Accessing hardware atomic memory update operations")
 (description

branch master updated: gnu: ruby-ffi: Update to 1.15.5.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 8df29c26ba gnu: ruby-ffi: Update to 1.15.5.
8df29c26ba is described below

commit 8df29c26ba184874561c67e48f69fd3526156516
Author: Efraim Flashner 
AuthorDate: Sun Aug 28 10:23:37 2022 +0300

gnu: ruby-ffi: Update to 1.15.5.

* gnu/packages/libffi.scm (ruby-ffi): Update to 1.15.5.
[arguments]: Remove custom 'do-not-depend-on-ccache phase. Adjust custom
'remove-git-ls-files phase to changes in the code. Remove trailing #t
from phases.
---
 gnu/packages/libffi.scm | 20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm
index 701feeb773..99a07ceaac 100644
--- a/gnu/packages/libffi.scm
+++ b/gnu/packages/libffi.scm
@@ -184,28 +184,22 @@ project.")
 (define-public ruby-ffi
   (package
 (name "ruby-ffi")
-(version "1.12.2")
+(version "1.15.5")
 (source (origin
   ;; Pull from git because the RubyGems release bundles LibFFI,
   ;; and comes with a gemspec that makes it difficult to unbundle.
   (method git-fetch)
   (uri (git-reference
 (url "https://github.com/ffi/ffi;)
-(commit version)))
+(commit (string-append "v" version
   (file-name (git-file-name name version))
   (sha256
(base32
-"1cvqsbjr2gfjgqggq9kdx90qhhzr7qkyr9wmxdsfsik6cnxnnpmd"
+"1qk55s1zwpdjykwkj9l37m71i5n228i7f8bg3ply3ks9py16m7s6"
 (build-system ruby-build-system)
 (arguments
  `(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'do-not-depend-on-ccache
-   (lambda _
- (substitute* "spec/ffi/fixtures/GNUmakefile"
-   (("^CCACHE := .*")
-""))
- #t))
  (replace 'replace-git-ls-files
(lambda _
  ;; Do not try to execute git, or include the (un)bundled LibFFI.
@@ -215,9 +209,10 @@ project.")
(("lfs \\+?= .*")
 "lfs = []\n"))
  (substitute* "Rakefile"
+   (("git .*ls-files -z")
+"find * -type f -print0 | sort -z")
(("LIBFFI_GIT_FILES = .*")
-"LIBFFI_GIT_FILES = []\n"))
- #t))
+"LIBFFI_GIT_FILES = []\n"
  (replace 'build
   (lambda _
 ;; Tests depend on the native extensions, so we build it
@@ -236,8 +231,7 @@ project.")
(setenv "MAKE" "make")
(setenv "CC" "gcc")
(invoke "rspec" "spec"))
- (format #t "test suite not run~%"))
- #t)
+ (format #t "test suite not run~%")))
 (native-inputs
  (list ruby-rake-compiler ruby-rspec ruby-rubygems-tasks))
 (inputs

branch core-updates updated: gnu: samba: Update to 4.17.0rc3 to fix build.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
 new 0c444ddd4d gnu: samba: Update to 4.17.0rc3 to fix build.
0c444ddd4d is described below

commit 0c444ddd4d30568f49307185d3e08e7e961b4dda
Author: Maxim Cournoyer 
AuthorDate: Tue Aug 23 23:32:37 2022 -0400

gnu: samba: Update to 4.17.0rc3 to fix build.

* gnu/packages/samba.scm (samba): Update to 4.17.0rc3.
[source]: Adjust URL.
[configure-flags]: Delete leftover comment.
(samba/fixed): Update to 4.17.0rc3.
---
 gnu/packages/samba.scm | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index f6ead57cc1..9434455c19 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -185,14 +185,14 @@ external dependencies.")
 (define-public samba
   (package
 (name "samba")
-(version "4.16.2")
+(version "4.17.0rc3") ;4.16.4 doesn't build with mit-krb5 1.20
 (source
  (origin
(method url-fetch)
-   (uri (string-append "https://download.samba.org/pub/samba/stable/;
+   (uri (string-append "https://download.samba.org/pub/samba/rc/;
"samba-" version ".tar.gz"))
(sha256
-(base32 "1745gx36gyd7353a94w4lrgksbmms0502kj9gg63il9zbdns1dx0"
+(base32 "1vi5vxv9cmy00wyrrr01xsdf4yc0fa96vj7980l51lnn90fgvj60"
 (build-system gnu-build-system)
 (arguments
  (list
@@ -226,7 +226,7 @@ external dependencies.")
 ;; a single directory to avoid RPATH issues.
 (string-append "--libdir=" libdir)
 (string-append "--with-privatelibdir=" libdir)
-"--with-system-mitkrb5" ;#$(this-package-input 
"mit-krb5")
+"--with-system-mitkrb5"
 (string-append "--with-system-mitkdc="
(search-input-file inputs 
"sbin/krb5kdc"))
 "--with-experimental-mit-ad-dc"
@@ -290,14 +290,14 @@ Desktops into Active Directory environments using the 
winbind daemon.")
   ;; Version that rarely changes, depended on by libsoup.
   (hidden-package
(package/inherit samba
- (version "4.15.3")
+ (version "4.17.0rc3");4.16.4 doesn't build with mit-krb5 1.20
  (source
   (origin
 (method url-fetch)
-(uri (string-append "https://download.samba.org/pub/samba/stable/;
+(uri (string-append "https://download.samba.org/pub/samba/rc/;
 "samba-" version ".tar.gz"))
 (sha256
- (base32 "1nrp85aya0pbbqdqjaqcw82cnzzys16yls37hi2h6mci8d09k4si")))
+ (base32 "1vi5vxv9cmy00wyrrr01xsdf4yc0fa96vj7980l51lnn90fgvj60")))
 
 (define-public talloc
   (package