[bug#53434] Patches to unbreak many i686 packages

[bug#53434] Patches to unbreak many i686 packages

[Denis 'GNUtoo' Carikli]

[-- Attachment #1.1: Type: text/plain, Size: 1888 bytes --]

Hi,

This is a patch serie to unbreak many i686 packages.

In it, there is a patch to disable tests for Guix. This is necessary
until the bug #52752 [1] is fixed. Part of it was fixed, but then some
new tests failed and I'm unsure if I've managed to re-open the
bug, or if I should bugreport in a new bug.

I've tested this patch serie by building a system (I've attached the
system.scm) with the following command:
> ./pre-inst-env guix system build -M 1 -c 1 --save-provenance \
> system.scm

I use that system.scm as it worked before as my guix system
installation used that (with gdm enabled and without (debug? #t) and
(wayland? #t) in the gdm configuration).

The big issue I had when doing that work is that at the time I managed
to verify that everything was ok with guix system build, but at that
point new commits are merged into the Guix repository, and after
rebasing, the build takes ages again (usually one day or more) due to
missing substitutes but also because building Guix also hangs with
messages like that:
> GC Warning: Failed to expand heap by 1335296 bytes
> GC Warning: Out of Memory! Heap size: 2617 MiB. Returning NULL!
> Warning: Unwind-only out of memory exception; skipping pre-unwind
> handler.
> Warning: Unwind-only out of memory exception; skipping pre-unwind
> handler.
That is not an issue when building it with 'make' as you restart at the
same point, but when running guix system build you need to restart from
scratch.

So I've tested all that on top of commit
4d7a997ee147acf82c8ca510c0ecd3f520ea74f4 (gnu: Add nhooks.), and right
now I'm still in the process of testing the rebase on top of commit
cadcbbaf655953b28df9466c07b4b5c63d29b00b (gnu: r-bigmelon: Add r-knitr.

I've sent patches for the rebased version.

References:
-----------
[1]http://debbugs.gnu.org/cgi/bugreport.cgi?bug=52752

Denis.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: system.scm --]
[-- Type: text/x-scheme, Size: 11043 bytes --]

;; Copyright (C) 2021 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;
;; This program is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;;
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
;; along with this program.  If not, see <https://www.gnu.org/licenses/>.

(use-modules
 (gnu)
 (gnu system mapped-devices)
 (gnu system nss)
 (guix build-system gnu)
 (guix git-download)
 ((guix licenses) #:prefix license:)
 (guix packages))
(use-package-modules
 admin
 android
 audio
 autotools
 base
 bash
 bison
 bootloaders
 certs
 commencement
 compression
 cryptsetup
 databases
 disk
 display-managers
 emacs
 emacs-xyz
 file
 flashing-tools
 freedesktop
 gnome
 gnupg
 linux
 mail
 mpd
 networking
 ncurses
 package-management
 patchutils
 pulseaudio
 python
 rsync
 screen
 ssh
 terminals
 tls
 tor
 version-control
 video
 vim
 virtualization
 web
 web-browsers
 wm
 xdisorg
 xfce
 xorg)
(use-service-modules
 databases
 desktop
 mail
 networking
 sound
 virtualization
 xorg)

(define-public fdm-git
  (package
    (name "fdm-git")
    (version "2.0+25")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/nicm/fdm")
             (commit "c245d210a5b0049f48c78e40af44d2889ecf217f")))
       (file-name (git-file-name name version))
       (sha256
        (base32 "06al4rs11c859zwfqknicn31nz66w1g73bsb61463dk12q06pwy7"))))
    (build-system gnu-build-system)
    (inputs
     (list tdb openssl zlib))
    (native-inputs
      (list autoconf automake bison))
    (home-page "https://github.com/nicm/fdm")
    (synopsis "Mail Retrieval Agent (MRA) and Mail Delivery Agent (MDA)")
    (description "fdm is a program designed to fetch mail from POP3
or IMAP servers, or receive local mail from stdin, and
deliver it in various ways.")
    (license
     ;; Why point to a source file?  Well, all the individual files have a
     ;; copy of this license in their headers, but there's no seprate file
     ;; with that information.
     (license:non-copyleft
      "https://github.com/nicm/fdm/blob/master/command.c"))))

(define %lvm-vg
  (list
   (mapped-device
    (source (uuid "fd8d9fd8-56a5-4c61-9f6e-35371ff964f0"))
    (target "internal-cleartext")
    (type luks-device-mapping))
   (mapped-device
    (source "primary_laptop")
    (targets (list "primary_laptop-guix32"))
    (type lvm-device-mapping))))
(define %guix32-rootfs
  (file-system
   (device "/dev/mapper/primary_laptop-guix32")
   (mount-point "/")
   (type "ext4")
   (dependencies %lvm-vg)))
(define %parabola32-rootfs
  (file-system
   (mount-point "/srv/distros/parabola32")
   (device "/dev/mapper/primary_laptop-parabola32")
   (type "ext4")
   (dependencies %lvm-vg)
   (create-mount-point? #t)
   (mount-may-fail? #t)))

(define (parabola32-bind-mount path)
  (file-system
   (mount-point path)
   (device (string-append "/srv/distros/parabola32" path))
   (type "none")
   (dependencies (list %parabola32-rootfs))
   (flags '(bind-mount))
   (create-mount-point? #t)
   (mount-may-fail? #t)))

(operating-system
 (host-name "primary_laptop")
 (timezone "Europe/Paris")
 (locale "en_US.utf8")
 (kernel-arguments (append (list
			    "iomem=relaxed"
			    "modprobe.blacklist=pcspkr"
			    "quiet")))
 (initrd-modules (cons "i915" %base-initrd-modules))
 (keyboard-layout (keyboard-layout "us" "altgr-intl"))
 (bootloader (bootloader-configuration (bootloader (bootloader
                                                    (inherit grub-bootloader)
                                                    (installer #~(const #t))))
                                       (keyboard-layout keyboard-layout)))
 (mapped-devices %lvm-vg)
 (file-systems (append (list
                        %guix32-rootfs
                        %parabola32-rootfs
                        (parabola32-bind-mount "/home/gnutoo")
                        (parabola32-bind-mount "/root")
                        (parabola32-bind-mount "/etc/ssh/ssh_config")
                        (parabola32-bind-mount "/etc/gitconfig")
                        (parabola32-bind-mount "/etc/git/")
                        (parabola32-bind-mount "/etc/wpa_supplicant/")
                        (parabola32-bind-mount "/srv/http/")
                        (parabola32-bind-mount "/srv/kiwix/")
                        (parabola32-bind-mount "/usr/local/bin/")
                        (parabola32-bind-mount "/var/lib/postgres/"))
                       %base-file-systems))
 (users (cons*
         (user-account
          (name "gnutoo")
          (uid 1000)
          (group "gnutoo")
          (supplementary-groups '("wheel" "netdev" "audio" "video")))
         (user-account
          (name "postgres")
          (uid 88)
          (group "postgres")
          (comment "PostgreSQL user")
          (home-directory "/var/lib/postgres")
          (shell (file-append bash "/bin/bash"))
          (system? #t))
         %base-user-accounts))
 (groups (cons*
          (user-group
           (name "gnutoo")
           (id 1000))
          (user-group
           (name "postgres")
           (id 88)
           (system? #t))
          %base-groups))

 (hosts-file (local-file "etc/hosts"))
 (packages (append (list
                    alsa-utils
                    adb
                    abootimg
                    android-udev-rules
                    autoconf
                    automake
                    bash-completion
                    bemenu
                    claws-mail
                    cryptsetup
                    ddrescue
                    dosfstools
                    dovecot
                    elogind
                    emacs
                    fastboot
                    fdm-git
                    file
                    flashrom
                    fluxbox
                    gnu-make
                    gcc-toolchain
                    gdm
                    git
                    glibc ;; for the utilities
                    gnupg
                    grub
                    heimdall
                    htop
                    kiwix-tools
                    libtool
                    links
                    lvm2
                    lzip
                    meld
                    midori
                    mkbootimg
                    mpd
                    mpd-mpc
                    mplayer
                    myrepos
                    nbd
                    ncurses
                    net-tools
                    netcat-openbsd
                    nss-certs
                    openssh
                    picocom
                    pinentry
                    pulseaudio
                    python
                    ponymix
                    redshift
                    rsync
                    screen
                    sshfs
                    strace
                    sway
                    terminator
                    tor
                    udisks
                    vim
                    virt-manager
                    vlc
                    waybar
                    wayland
                    wpa-supplicant
                    xauth
                    xfce4-screensaver
                    xfce4-session
                    xf86-input-keyboard
                    xf86-input-libinput
                    xf86-video-intel
                    xinit
                    xorg-server
                    xrandr)
                   %base-packages))
 (services (append (list
                    (dovecot-service #:config
                                     (dovecot-configuration
                                      (mail-location "maildir:~/.local/Maildir")
                                      (listen '("127.0.0.1"))))
                    (service alsa-service-type)
                    (service dhcp-client-service-type)
                    (service elogind-service-type)
                    ;; (service gdm-service-type
                              ;;(gdm-configuration
                               ;; (debug? #t)
                               ;; (wayland? #t)
		              ;;)
			      ;;)
                    (service libvirt-service-type
                             (libvirt-configuration))
                    (service postgresql-service-type
                             (postgresql-configuration
                              (postgresql postgresql-13)
                              (data-directory "/var/lib/postgres/data")
                              (config-file
                               (postgresql-config-file
                                (hba-file
                                 (plain-file
                                  "pg_hba.conf"
                                  (string-append
                                   "# TYPE DATABASE USER ADDRESS\n"
                                   "  local  all      all  trust\n")))
                                (extra-config
                                 '(("max_connections"            100)
                                   ("shared_buffers"             "128 MB")
                                   ("dynamic_shared_memory_type" "posix")
                                   ("max_wal_size"               "1 GB")
                                   ("min_wal_size"               "80 MB")
                                   ("log_timezone"               "Europe/Paris")
                                   ("datestyle"                  "iso, dmy")
                                   ("timezone"                   "Europe/Paris")
                                   ("lc_messages"                "en_US.UTF-8")
                                   ("lc_monetary"                "en_US.UTF-8")
                                   ("lc_numeric"                 "en_US.UTF-8")
                                   ("lc_time"                    "fr_FR.UTF-8")
                                   ("default_text_search_config"
                                    "pg_catalog.english")))))))
                    (service pulseaudio-service-type)
                    (service tor-service-type
                             (tor-configuration))
                    (udisks-service)
                    (service xfce-desktop-service-type))
                   %base-services)))

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#53434] [PATCH 01/11] gnu: gtk-vnc: Remove dependency on GJS on non-x86_64.

[Denis 'GNUtoo' Carikli]

* gnu/packages/gnome.scm (gtk-vnc)[native-inputs]: Provide GJS
only when 'target-x86-64?'.
---
 gnu/packages/gnome.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 088c368054..1ed3acf8ae 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -67,6 +67,7 @@
 ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
 ;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
 ;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -8828,7 +8829,11 @@ (define-public gtk-vnc
     (arguments
      `(#:glib-or-gtk? #t))   ; To wrap binaries and/or compile schemas
     (native-inputs
-     `(("gjs" ,gjs)
+     `(;; GJS depends on Rust, which is x86_64-only so far, so remove the GJS
+       ;; dependency on other platforms (FIXME).
+       ,@(if (target-x86-64?)
+             `(("gjs" ,gjs))
+             '())
        ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)

base-commit: cadcbbaf655953b28df9466c07b4b5c63d29b00b
-- 
2.34.0

[bug#53434] [PATCH 02/11] gnu: gtk-vnc: Build with correct librsvg.

[Denis 'GNUtoo' Carikli]

* gnu/packages/gnome.scm (gtk-vnc)[inputs]: Replace librsvg with
  librsvg-for-system.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1ed3acf8ae..9a88ad556a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8844,7 +8844,7 @@ (define-public gtk-vnc
        ("vala" ,vala)))
     (inputs
      `(("cairo" ,cairo)
-       ("librsvg" ,librsvg)
+       ("librsvg" ,(librsvg-for-system))
        ("glib" ,glib)
        ("gnutls" ,gnutls)
        ("libgcrypt" ,libgcrypt)
-- 
2.34.0

[bug#53434] [PATCH 03/11] gnu: gnome-settings-daemon: Build with correct librsvg.

[Denis 'GNUtoo' Carikli]

* gnu/packages/gnome.scm (gnome-settings-daemon)[inputs]:
Replace librsvg with librsvg-for-system.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9a88ad556a..a727ef6f23 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5628,7 +5628,7 @@ (define-public gnome-settings-daemon
            cups
            gsettings-desktop-schemas
            libwacom
-           librsvg
+           (librsvg-for-system)
            xf86-input-wacom
            wayland
            network-manager
-- 
2.34.0

[bug#53434] [PATCH 04/11] gnu: vlc: Build with correct librsvg.

[Denis 'GNUtoo' Carikli]

* gnu/packages/video.scm (vlc)[inputs]: Replace librsvg
with librsvg-for-system.
---
 gnu/packages/video.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 461ccbb950..3c105e9b57 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -57,6 +57,7 @@
 ;;; Copyright © 2021 Robin Templeton <robin@terpri.org>
 ;;; Copyright © 2021 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2021 Pradana Aumars <paumars@courrier.dev>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1910,7 +1911,7 @@ (define-public vlc
        ("libogg" ,libogg)
        ("libpng" ,libpng)
        ("libraw1394" ,libraw1394)
-       ("librsvg" ,librsvg)
+       ("librsvg" ,(librsvg-for-system))
        ("libsamplerate" ,libsamplerate)
        ("libsecret" ,libsecret)
        ("libssh2" ,libssh2)
-- 
2.34.0

[bug#53434] [PATCH 05/11] gnu: python-dbusmock: Disable tests on i686.

[Denis 'GNUtoo' Carikli]

* gnu/packages/python-xyz.scm (python-dbusmock)[arguments]<#:tests?>:
Conditionally disable tests.
---
 gnu/packages/python-xyz.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index eff1c4259b..de73ea2f5b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -116,6 +116,7 @@
 ;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24152,7 +24153,8 @@ (define-public python-dbusmock
                     ((_ . status)
                      (unless (zero? status)
                        (error "`pytest' exited with status"
-                              status))))))))))))
+                              status))))))))))
+       #:tests? ,(not (target-x86-32?))))
     (native-inputs
      (list dbus python-pytest tini which))
     (inputs
-- 
2.34.0

[bug#53434] [PATCH 06/11] gnu: node: Disable tests on i686.

[Denis 'GNUtoo' Carikli]

* gnu/packages/node.scm (node)[arguments]<#:tests?>:
Conditionally disable tests.
---
 gnu/packages/node.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index ce94557a8c..1cccfe9263 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021, 2022 Philip McGrath <philip@philipmcgrath.com>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -101,6 +102,7 @@ (define-public node
                            "--shared-zlib"
                            "--without-snapshot"
                            "--with-intl=system-icu")
+       #:tests? ,(not (target-x86-32?))
        ;; Run only the CI tests.  The default test target requires additional
        ;; add-ons from NPM that are not distributed with the source.
        #:test-target "test-ci-js"
-- 
2.34.0

[bug#53434] [PATCH 07/11] gnu: guix: Disable tests on i686.

[Denis 'GNUtoo' Carikli]

* gnu/packages/package-management.scm (guix)[arguments]<#:tests?>:
Conditionally disable tests.
---
 gnu/packages/package-management.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 05795824b5..bdf58448cf 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -202,6 +203,7 @@ (define-public guix
                             ;; for tests.
                             "ac_cv_guix_test_root=/tmp/guix-tests"
                             ,@(if (hurd-target?) '("--with-courage") '()))
+         #:tests? ,(not (target-x86-32?))
          #:parallel-tests? #f         ;work around <http://bugs.gnu.org/21097>
 
          #:modules ((guix build gnu-build-system)
-- 
2.34.0

[bug#53434] [PATCH 08/11] gnu: mesa: Disable tests on i686.

[Denis 'GNUtoo' Carikli]

* gnu/packages/gl.scm (mesa)[arguments]<#:tests?>:
Conditionally disable tests.
---
 gnu/packages/gl.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index fa49679870..fd21e8b7f6 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
 ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
 ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -348,6 +349,7 @@ (define-public mesa
                   (srfi srfi-1)
                   (guix build utils)
                   (guix build meson-build-system))
+       #:tests? ,(not (target-x86-32?))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'disable-failing-test
-- 
2.34.0

[bug#53434] [PATCH 09/11] gnu: imath: Disable tests on i686.

[Denis 'GNUtoo' Carikli]

* gnu/packages/graphjics.scm (imath)[arguments]<#:tests?>:
Conditionally disable tests.
---
 gnu/packages/graphics.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index b69ab52aec..6bf42d69d1 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -27,6 +27,7 @@
 ;;; Copyright © 2021 Andy Tai <atai@atai.org>
 ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
 ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -690,6 +691,8 @@ (define-public imath
        (sha256
         (base32 "1nyld18mf220ghm1vidnfnn0rdns9z5i4l9s66xgd0kfdgarb31f"))))
     (build-system cmake-build-system)
+    (arguments
+     `(#:tests? ,(not (target-x86-32?))))
     (home-page "https://github.com/AcademySoftwareFoundation/Imath")
     (synopsis "Library of math operations for computer graphics")
     (description
-- 
2.34.0

[bug#53434] [PATCH 10/11] gnu: openexr: Disable tests on i686.

[Denis 'GNUtoo' Carikli]

* gnu/packages/graphics.scm (openexr)[arguments]<#:tests?>:
Conditionally disable tests.
---
 gnu/packages/graphics.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 6bf42d69d1..77811402bf 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1018,7 +1018,8 @@ (define-public openexr
         (base32 "0c9vla0kbsbbhkk42jlbf94nzfb1anqh7dy9b0b3nna1qr6v4bh6"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:phases
+     '(#:tests? ,(not (target-x86-32?))
+       #:phases
        (modify-phases %standard-phases
          ;; /var/tmp does not exist in the Guix build environment
          (add-after 'unpack 'patch-test-directory
-- 
2.34.0

[bug#53434] [PATCH 11/11] gnu: upower: Disable tests on i686.

[Denis 'GNUtoo' Carikli]

* gnu/packages/gnome.scm (upower)[arguments]<#:tests?>:
Conditionally disable tests.
---
 gnu/packages/gnome.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a727ef6f23..f0024824c9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5469,7 +5469,7 @@ (define-public upower
               "dbusconfdir = $(sysconfdir)/dbus-1/system.d\n"))))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     '(#:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-before 'check 'pre-check
            (lambda* (#:key inputs #:allow-other-keys)
@@ -5479,7 +5479,8 @@ (define-public upower
        #:configure-flags (list "--localstatedir=/var"
                                (string-append "--with-udevrulesdir="
                                               (assoc-ref %outputs "out")
-                                              "/lib/udev/rules.d"))))
+                                              "/lib/udev/rules.d"))
+       #:tests? ,(not (target-x86-32?))))
     (native-inputs
      (list autoconf
            automake
-- 
2.34.0

[bug#53434] Patches to unbreak many i686 packages

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 531 bytes --]

Denis 'GNUtoo' Carikli schreef op za 22-01-2022 om 03:54 [+0100]:
> Hi,
> 
> This is a patch serie to unbreak many i686 packages.
> [...]

I noticed that for quite a few packages, tests are disabled.
That might allow builds to ‘succeed’, but presumably these test
failures indicate real problems (otherwise, why have a test suite?),
so this only ignores potential brokenness without addressing it.

Before ignoring tests, it would be necessary to investigate the cause
of the test failures.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53434] Patches to unbreak many i686 packages

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 1438 bytes --]

On Sat, 22 Jan 2022 13:38:18 +0100
Maxime Devos <maximedevos@telenet.be> wrote:

> Denis 'GNUtoo' Carikli schreef op za 22-01-2022 om 03:54 [+0100]:
> > Hi,
> > 
> > This is a patch serie to unbreak many i686 packages.
> > [...]
> 
> I noticed that for quite a few packages, tests are disabled.
> That might allow builds to ‘succeed’, but presumably these test
> failures indicate real problems (otherwise, why have a test suite?),
> so this only ignores potential brokenness without addressing it.
> 
> Before ignoring tests, it would be necessary to investigate the cause
> of the test failures.
As I see it, we have a bit of chicken and egg issue here: If the
test fails, we have no substitutes, and because of that, fixing packages
where test fails become extremely time consuming, and so way less
likely to happen. 

And even if that work to fix tests is not done, if tests are disabled
we end up with a somewhat working i686 system, whereas if tests are not
disabled we end up with a more and more broken i686 probably with less
and less people willing to fix it.

So my idea here was to first get the tests disabled and then to fix the
root causes. And that can takes some time to do too, as not only we
need to understand why they are failing and fix them, but also need to
upstream the patches and backport them in Guix or update the packages to
the new versions where this is fixed.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#53434] Patches to unbreak many i686 packages

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 1276 bytes --]

On Sat, 22 Jan 2022 17:49:37 +0100
Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> wrote:

> On Sat, 22 Jan 2022 13:38:18 +0100
> Maxime Devos <maximedevos@telenet.be> wrote:
> 
> > Denis 'GNUtoo' Carikli schreef op za 22-01-2022 om 03:54 [+0100]:
> > > Hi,
> > > 
> > > This is a patch serie to unbreak many i686 packages.
> > > [...]
> > 
> > I noticed that for quite a few packages, tests are disabled.
> > That might allow builds to ‘succeed’, but presumably these test
> > failures indicate real problems (otherwise, why have a test suite?),
> > so this only ignores potential brokenness without addressing it.
> > 
> > Before ignoring tests, it would be necessary to investigate the
> > cause of the test failures.
> As I see it, we have a bit of chicken and egg issue here: If the
> test fails, we have no substitutes, and because of that, fixing
> packages where test fails become extremely time consuming, and so way
> less likely to happen. 
Would it make sense if in parallel, if they don't exist yet, I open
new bugs for each package that fails test or fail to compile on i686?

This way we would at least have the log of the failing tests or
builds and we could also manage to coordinate work on fixing these
better.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#53434] Patches to unbreak many i686 packages

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1301 bytes --]

Denis 'GNUtoo' Carikli schreef op za 22-01-2022 om 20:19 [+0100]:
> This way we would at least have the log of the failing tests or

I cannot spend much time building every package, 
but if you provide the build logs, I can try to
determine what the cause is.

E.g.,  I built upower of i686-linux today, and the build log
contained:

> # UPower-DEBUG: deferring as others queued
> # UPower-DEBUG: limiting data to last 10 seconds
> # UPower-DEBUG: length of array (before) 3
> # UPower-DEBUG: limiting data to last 10 seconds
> # UPower-DEBUG: length of array (before) 3
> # UPower-DEBUG: Using a x division of 2.000000
> (first=1642875457,last=1642875453)
> # UPower-DEBUG: length of array (after) 3
> **
> UPower:ERROR:up-self-test.c:218:up_test_history_func: assertion
> failed (array->len == 2): (3 == 2)
> Bail out! UPower:ERROR:up-self-test.c:218:up_test_history_func:
> assertion failed (array->len == 2): (3 == 2)
> FAIL up-self-test (exit status: 134)


1642875457 > 1642875453, so first > last, which is suspect.

Would this be a 32-bit/64-bit issue?

(expt 2 32) is 4294967296 which is as long as 1642875457 and
1642875453, so this seems like an overflow issue, so maybe?
To be investigated ... (I'll look at the source code later).

Greetings,
Maxime


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53434] Patches to unbreak many i686 packages

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 608 bytes --]

Denis 'GNUtoo' Carikli schreef op za 22-01-2022 om 20:19 [+0100]:
> Would it make sense if in parallel, if they don't exist yet, I open
> new bugs for each package that fails test or fail to compile on i686?
> 
> This way we would at least have the log of the failing tests or
> builds and we could also manage to coordinate work on fixing these
> better.

Seems like a plan to me, though I would add comments like

#:tests? ,(not (target-x86-32?)) ; see <https://issues.guix.gnu.org/....>

to avoid giving the impression that simply ignoring test failures
is acceptable.

Greetings,
Maxime

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53434] Patches to unbreak many i686 packages

[Ludovic Courtès]

Hi,

Maxime Devos <maximedevos@telenet.be> skribis:

> E.g.,  I built upower of i686-linux today, and the build log
> contained:
>
>> # UPower-DEBUG: deferring as others queued
>> # UPower-DEBUG: limiting data to last 10 seconds
>> # UPower-DEBUG: length of array (before) 3
>> # UPower-DEBUG: limiting data to last 10 seconds
>> # UPower-DEBUG: length of array (before) 3
>> # UPower-DEBUG: Using a x division of 2.000000
>> (first=1642875457,last=1642875453)
>> # UPower-DEBUG: length of array (after) 3
>> **
>> UPower:ERROR:up-self-test.c:218:up_test_history_func: assertion
>> failed (array->len == 2): (3 == 2)
>> Bail out! UPower:ERROR:up-self-test.c:218:up_test_history_func:
>> assertion failed (array->len == 2): (3 == 2)
>> FAIL up-self-test (exit status: 134)
>
>
> 1642875457 > 1642875453, so first > last, which is suspect.
>
> Would this be a 32-bit/64-bit issue?
>
> (expt 2 32) is 4294967296 which is as long as 1642875457 and
> 1642875453, so this seems like an overflow issue, so maybe?
> To be investigated ... (I'll look at the source code later).

I remember investigating it while on ‘core-updates-frozen’… and
eventually forgetting about it.  :-/

I think the pragmatic approach in such situations is to:

  1. Report the test failure upstream, including the test log;

  2. Skip tests (ideally selectively) for i686-linux, adding a link to
     the upstream bug report.

That makes sure we move forward while not just sweeping issues under the
carpet.

Ludo’.

[bug#53434] Patches to unbreak many i686 packages

[Ludovic Courtès]

Hi,

Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> skribis:

> * gnu/packages/package-management.scm (guix)[arguments]<#:tests?>:
> Conditionally disable tests.

There are no test failures as of
ee6bf00b2d89f6acab55b7a82896d99e39c1229b:

  https://ci.guix.gnu.org/log/gmmri6v3vhzwngwshk9y5h57xkpkj2yk-guix-1.3.0-23.a27e47f

If there were test failures, surely we could discuss it with upstream.
;-)

Ludo’.

[bug#53434] Patches to unbreak many i686 packages

[Ludovic Courtès]

Hi,

I’ve applied the librsvg/GJS-related ones as
b45bbe561a18fffa226f36d0e8cfb9b3fddbe9d0.

Let’s look at the other issues in the coming days.

Thanks,
Ludo’.

[bug#53434] [PATCH 11/11] gnu: upower: Disable tests on i686.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

Denis 'GNUtoo' Carikli schreef op za 22-01-2022 om 03:59 [+0100]:
> * gnu/packages/gnome.scm (upower)[arguments]<#:tests?>:

Reported upstream at
<https://gitlab.freedesktop.org/upower/upower/-/issues/167>.



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53434] [PATCH 09/11] gnu: imath: Disable tests on i686.

[Denis 'GNUtoo' Carikli]

[-- Attachment #1.1: Type: text/plain, Size: 281 bytes --]

On Sat, 22 Jan 2022 03:59:24 +0100
Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> wrote:

> * gnu/packages/graphjics.scm (imath)[arguments]<#:tests?>:
> Conditionally disable tests.
This one still fails without this patch. I've attached the build log
for now.

Denis.

[-- Attachment #1.2: fgm9h86nqk6xmwhbcc7f042jqawnyf-imath-3.1.3.drv.bz2 --]
[-- Type: application/x-bzip, Size: 9006 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#53434] [PATCH 09/11] gnu: imath: Disable tests on i686.

[Leo Famulari]

On Wed, Jan 26, 2022 at 02:06:34AM +0100, Denis 'GNUtoo' Carikli wrote:
> On Sat, 22 Jan 2022 03:59:24 +0100
> Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> wrote:
> 
> > * gnu/packages/graphjics.scm (imath)[arguments]<#:tests?>:
> > Conditionally disable tests.
> This one still fails without this patch. I've attached the build log
> for now.

We should find out if imath is supposed to work on 32-bit hardware.

Considering its use case, I wouldn't be surprised if it's 64-bit only.

[bug#53434] [PATCH 08/11] gnu: mesa: Disable tests on i686.

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 2188 bytes --]

On Sat, 22 Jan 2022 03:59:23 +0100
Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> wrote:

> * gnu/packages/gl.scm (mesa)[arguments]<#:tests?>:
> Conditionally disable tests.
Without that patch mesa now seems to build fine.

When trying to build it I have:
$ ./pre-inst-env guix build --check --no-substitutes --rounds=2 mesa
The following graft will be made:
   /gnu/store/gaf97xclvim3x4iak44hrwrj1hr2sczv-mesa-21.3.2.drv
applying 3 grafts for /gnu/store/gaf97xclvim3x4iak44hrwrj1hr2sczv-mesa-21.3.2.drv ...
grafting '/gnu/store/0kg54299yqzv9p1yfhph871qqpin1rkp-mesa-21.3.2-bin' -> '/gnu/store/hvhc1k2aks02zhjzw6s76m7lq3s8qnz5-mesa-21.3.2-bin'...
grafting '/gnu/store/q8fsnspfd3ajwrrjhnsznjp2wmm4f6bc-mesa-21.3.2' -> '/gnu/store/i8jghxbpzp2vf3rk0wd4pks0pc9qbjd3-mesa-21.3.2'...
successfully built /gnu/store/gaf97xclvim3x4iak44hrwrj1hr2sczv-mesa-21.3.2.drv
successfully built /gnu/store/gaf97xclvim3x4iak44hrwrj1hr2sczv-mesa-21.3.2.drv
applying 3 grafts for /gnu/store/gaf97xclvim3x4iak44hrwrj1hr2sczv-mesa-21.3.2.drv ...
grafting '/gnu/store/0kg54299yqzv9p1yfhph871qqpin1rkp-mesa-21.3.2-bin' -> '/gnu/store/hvhc1k2aks02zhjzw6s76m7lq3s8qnz5-mesa-21.3.2-bin'...
grafting '/gnu/store/q8fsnspfd3ajwrrjhnsznjp2wmm4f6bc-mesa-21.3.2' -> '/gnu/store/i8jghxbpzp2vf3rk0wd4pks0pc9qbjd3-mesa-21.3.2'...
successfully built /gnu/store/gaf97xclvim3x4iak44hrwrj1hr2sczv-mesa-21.3.2.drv
successfully built /gnu/store/gaf97xclvim3x4iak44hrwrj1hr2sczv-mesa-21.3.2.drv
successfully built /gnu/store/gaf97xclvim3x4iak44hrwrj1hr2sczv-mesa-21.3.2.drv
/gnu/store/hvhc1k2aks02zhjzw6s76m7lq3s8qnz5-mesa-21.3.2-bin
/gnu/store/i8jghxbpzp2vf3rk0wd4pks0pc9qbjd3-mesa-21.3.2

But using --no-grafts make it really builds:
$ ./pre-inst-env guix build --check --no-substitutes --rounds=2 --no-grafts mesa
The following derivation will be built:
   /gnu/store/f9inawjwgjrb56d3i823ph558iqvc9z9-mesa-21.3.2.drv
building /gnu/store/f9inawjwgjrb56d3i823ph558iqvc9z9-mesa-21.3.2.drv...
starting phase `set-SOURCE-DATE-EPOCH'
phase `set-SOURCE-DATE-EPOCH' succeeded after 0.0 seconds
[...]

And the first build succeeded (I aborted after that as it takes a long
time to build).

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#53434] [PATCH 09/11] gnu: imath: Disable tests on i686.

[Leo Famulari]

On Wed, Jan 26, 2022 at 02:06:34AM +0100, Denis 'GNUtoo' Carikli wrote:
> > * gnu/packages/graphjics.scm (imath)[arguments]<#:tests?>:
> > Conditionally disable tests.
> This one still fails without this patch. I've attached the build log
> for now.

The salient parts of the log

------
    dir ~ (0 0 -1), result = 0
  transform box by matrix
ImathTest: /tmp/guix-build-imath-3.1.3.drv-0/source/src/ImathTest/testBoxAlgo.cpp:816: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed.

      Start 31: Imath.testBox
------

... and ...

------
    extendBy() point for type V2i64
    extendBy() point for type V2f 
ImathTest: /tmp/guix-build-imath-3.1.3.drv-0/source/src/ImathTest/testBox.cpp:257: void {anonymous}::testExtendByPoint(const char*) [with T = Imath_3_1::Vec2<float>]: Assertion `b.min == min && b.max == max' failed. 

      Start 32: Imath.testProcrustes
32/36 Test #32: Imath.testProcrustes ....................   Passed    0.01 sec 
      Start 33: Imath.testTinySVD
------

Upstream report:

https://github.com/AcademySoftwareFoundation/Imath/issues/226

[bug#53434] Patches to unbreak many i686 packages

[Ludovic Courtès]

Hi,

Maxime Devos <maximedevos@telenet.be> skribis:

> Denis 'GNUtoo' Carikli schreef op za 22-01-2022 om 03:59 [+0100]:
>> * gnu/packages/gnome.scm (upower)[arguments]<#:tests?>:
>
> Reported upstream at
> <https://gitlab.freedesktop.org/upower/upower/-/issues/167>.

This reminds me that we had to build with ‘-fexcess-precision=standard’
many packages on i686 since the switch to GCC 10.  Would it help?

However, it turns out there upower builds fine currently:

--8<---------------cut here---------------start------------->8---
$ guix describe
Generacio 204   Feb 15 2022 10:48:52    (nuna)
  guix 8d472e9
    repository URL: https://git.savannah.gnu.org/git/guix.git
    branch: master
    commit: 8d472e9314052403ad548f92ca6c10f9c961a087
$ guix weather upower -s i686-linux
computing 1 package derivations for i686-linux...
looking for 1 store items on https://ci.guix.gnu.org...
https://ci.guix.gnu.org
  100.0% substitutes available (1 out of 1)
  at least 0.7 MiB of nars (compressed)
  1.1 MiB on disk (uncompressed)
  0.168 seconds per request (0.2 seconds in total)
  5.9 requests per second

  4 queued builds
      aarch64-linux: 2 (50.0%)
      powerpc64le-linux: 2 (50.0%)
  build rate: 56.46 builds per hour
      aarch64-linux: 19.60 builds per hour
      x86_64-linux: 18.75 builds per hour
      powerpc64le-linux: 8.86 builds per hour
      i686-linux: 9.33 builds per hour
looking for 1 store items on https://bordeaux.guix.gnu.org...
https://bordeaux.guix.gnu.org
  100.0% substitutes available (1 out of 1)
  0.2 MiB of nars (compressed)
  1.1 MiB on disk (uncompressed)
  0.126 seconds per request (0.1 seconds in total)
  7.9 requests per second
  (continuous integration information unavailable)
$ guix build upower -s i686-linux --no-grafts
/gnu/store/dcddizvvl599s6zgwk951gz7frk2g2gh-upower-0.99.13
$ guix build upower -s i686-linux --no-grafts -d
/gnu/store/x78bb68amwgb7znvbbmhg5pxrlnj9p53-upower-0.99.13.drv
--8<---------------cut here---------------end--------------->8---

Did the problem sort itself?

Thanks,
Ludo’.

[bug#53434] Patches to unbreak many i686 packages

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1044 bytes --]

Ludovic Courtès schreef op wo 16-02-2022 om 14:53 [+0100]:
> Hi,
> 
> Maxime Devos <maximedevos@telenet.be> skribis:
> 
> > Denis 'GNUtoo' Carikli schreef op za 22-01-2022 om 03:59 [+0100]:
> > > * gnu/packages/gnome.scm (upower)[arguments]<#:tests?>:
> > 
> > Reported upstream at
> > <https://gitlab.freedesktop.org/upower/upower/-/issues/167>.

> However, it turns out there upower builds fine currently:
> [...]
> Did the problem sort itself?

The test failure was somewhat non-deterministic.

> This reminds me that we had to build with ‘-fexcess-
> precision=standard’
> many packages on i686 since the switch to GCC 10.  Would it help?

Possibly, but perhaps backporting the upstream fix that largely avoids
floating-point arithmetic would be better?
(See
<https://gitlab.freedesktop.org/upower/upower/-/merge_requests/101>.)

Also, looks like there's a '0.99.15' release now
(https://gitlab.freedesktop.org/upower/upower/-/tree/v0.99.15),
so perhaps we could just update upower?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53434] Patches to unbreak many i686 packages

[Ludovic Courtès]

Hi,

Maxime Devos <maximedevos@telenet.be> skribis:

> Possibly, but perhaps backporting the upstream fix that largely avoids
> floating-point arithmetic would be better?
> (See
> <https://gitlab.freedesktop.org/upower/upower/-/merge_requests/101>.)

Yes, that’s even better.

> Also, looks like there's a '0.99.15' release now
> (https://gitlab.freedesktop.org/upower/upower/-/tree/v0.99.15),
> so perhaps we could just update upower?

Yes, we can do that on master.  Do you want to give it a try?

Thanks,
Ludo’.

[bug#53434] Patches to unbreak many i686 packages

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

Ludovic Courtès schreef op do 17-02-2022 om 11:40 [+0100]:
> Yes, we can do that on master.  Do you want to give it a try?

Done.  I'll send the patches once building the dependencies again (as a
test) succeeds.

Greetings,
Maxime

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53434] Patches to unbreak many i686 packages

[Maxime Devos]

[-- Attachment #1.1: Type: text/plain, Size: 2102 bytes --]

Ludovic Courtès schreef op do 17-02-2022 om 11:40 [+0100]:
> Yes, we can do that on master.  Do you want to give it a try?

See attachment! I verified that:

* upower builds: ./pre-inst-env guix build upower
* upower builds on i686:
 ./pre-inst-env guix build upower --system=i686-linux
* linting (almost) succeeds:

  ./pre-inst-env guix lint upower umockdev
  [...] upower@0.99.15: label 'glib' does not match package name 'glib:bin'

  I just did `(,glib "bin") (new-input style), so this seems more a problem
  of the linter or whatever code is reponsible for constructing labels to me.

  [...]: upower@0.99.15: line 5457 is way too long (101 characters)

  It contains a long URL, so not much that can be done here.

* the dependents of upower and umockdev build:

  ./pre-inst-env guix refresh -l upower umockdev
  [...]: thermald@2.4.7 gnome-power-manager@3.32.0 rhythmbox@3.4.4 eiciel@0.9.13.1 gnome-tweaks@40.0 gpaste@3.42.2 gnome-shell-extension-gsconnect@33 arc-theme@20210412 numix-gtk-theme@2.6.7 gnome@41.0 eolie@0.9.101 wmbattery@2.54 mate@1.24.1 mixxx@2.3.2 xfce@4.16.0 usbguard@0.7.8
  ./pre-inst-env guix build thermald@2.4.7 gnome-power-manager@3.32.0 rhythmbox@3.4.4 eiciel@0.9.13.1 gnome-tweaks@40.0 gpaste@3.42.2 gnome-shell-extension-gsconnect@33 arc-theme@20210412 numix-gtk-theme@2.6.7 gnome@41.0 eolie@0.9.101 wmbattery@2.54 mate@1.24.1 mixxx@2.3.2 xfce@4.16.0 usbguard@0.7.8

  This took to long to run it to the end, but no build failures so far

It has _not_ been verified whether this upower is usable for system services!

Some remarks:

* "guix refresh -u upower" did not work completely because the 'commit' field
  was

 (string-append "UPOWER_" (string-map (match-lambda (#\. #\_)
                                        (chr chr))
                                      version))

  before the update and (string-append "v" version) after the update,
  which (guix upstream) does not not how to change.

  If the tag was replaced by the commit it referred to, this would not
  have been necessary.

Greetings,
Maxime.

[-- Attachment #1.2: 0001-gnu-upower-Make-it-auto-updatable.patch --]
[-- Type: text/x-patch, Size: 1232 bytes --]

From 08cc8cdb129241d194c2c2bac4b05a7809eae00c Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Thu, 17 Feb 2022 14:47:38 +0000
Subject: [PATCH 1/6] gnu: upower: Make it auto-updatable.

* gnu/packages/gnome.scm (upower)[properties]: Set 'release-tag-prefix'
  and 'release-tag-delimiter'.
---
 gnu/packages/gnome.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 92900c8421..b5c81fe6ff 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5512,7 +5512,11 @@ faster results and to avoid unnecessary server load.")
 listening to device events and querying history and statistics.  Any
 application or service on the system can access the org.freedesktop.UPower
 service via the system message bus.")
-    (license license:gpl2+)))
+    (license license:gpl2+)
+    ;; Old versions of upower are tagged as UPOWER_0_99_13, which confuses
+    ;; the 'generic-git' updater.  Give it a little help.
+    (properties '((release-tag-prefix . "v")
+                  (release-tag-version-delimiter . ".")))))
 
 (define-public libgweather
   (package

base-commit: 877da38bd3f279d5618d6c6517f48b50541a1e4c
-- 
2.30.2


[-- Attachment #1.3: 0002-gnu-upower-Update-to-0.99.15.patch --]
[-- Type: text/x-patch, Size: 7568 bytes --]

From 6bdcd52a01e16c31b91c01805e9d1cc15ad0cc4f Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Thu, 17 Feb 2022 14:51:13 +0000
Subject: [PATCH 2/6] gnu: upower: Update to 0.99.15.

Upstream has removed the Autotools build system and now
only supports Meson, so the build system has been changed
to 'meson-build-system'.

The patch 'power-builddir.patch' has to be replaced to
adjust to the switch to Meson.  This has been done by adding
an origin snippet.

The origin snippet has been simplified, and for consistency,
it has been made a gexp.

Some dependencies were Autotools-only and could be removed.

* gnu/packages/gnome.scm (upower): Update to 0.99.15.
---
 gnu/local.mk                               |  1 -
 gnu/packages/gnome.scm                     | 67 +++++++++++-----------
 gnu/packages/patches/upower-builddir.patch | 34 -----------
 3 files changed, 33 insertions(+), 69 deletions(-)
 delete mode 100644 gnu/packages/patches/upower-builddir.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index dddda78efa..e354ddcfb0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1938,7 +1938,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/util-linux-tests.patch			\
   %D%/packages/patches/util-linux-CVE-2021-3995.patch		\
   %D%/packages/patches/util-linux-CVE-2021-3996.patch		\
-  %D%/packages/patches/upower-builddir.patch			\
   %D%/packages/patches/valgrind-enable-arm.patch		\
   %D%/packages/patches/vboot-utils-fix-format-load-address.patch	\
   %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch	\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b5c81fe6ff..64571d414a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -62,7 +62,7 @@
 ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
 ;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
-;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 Josselin Poiret <josselin.poiret@protonmail.ch>
 ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
 ;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
@@ -5441,55 +5441,54 @@ faster results and to avoid unnecessary server load.")
 (define-public upower
   (package
     (name "upower")
-    (version "0.99.13")
+    (version "0.99.15")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://gitlab.freedesktop.org/upower/upower")
-             (commit (string-append "UPOWER_"
-                                    (string-map (match-lambda (#\. #\_)
-                                                              (chr chr))
-                                                version)))))
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0khwg6jpq81dcylkpi7cn75bjzif0q9qscwvirrk41krma23iddj"))
-       (patches (search-patches "upower-builddir.patch"))
+        (base32 "1zk7w7pw8dhlnxhxzcbk33gmxmg8f32mppd67556v9z2qgcg4lhs"))
        (modules '((guix build utils)))
        (snippet
-        '(begin
-           ;; Upstream commit
-           ;; <https://cgit.freedesktop.org/upower/commit/?id=18457c99b68786cd729b315723d680e6860d9cfa>
-           ;; moved 'dbus-1/system.d' from etc/ to share/.  However,
-           ;; 'dbus-configuration-directory' in (gnu services dbus)
-           ;; expects it in etc/.  Thus, move it back to its previous
-           ;; location.
-           (substitute* "src/Makefile.am"
-             (("^dbusconfdir =.*$")
-              "dbusconfdir = $(sysconfdir)/dbus-1/system.d\n"))))))
-    (build-system glib-or-gtk-build-system)
+         ;; Upstream commit
+         ;; <https://cgit.freedesktop.org/upower/commit/?id=18457c99b68786cd729b315723d680e6860d9cfa>
+         ;; moved 'dbus-1/system.d' from etc/ to share/.  However,
+         ;; 'dbus-configuration-directory' in (gnu services dbus)
+         ;; expects it in etc/.  Thus, move it back to its previous
+         ;; location.
+         #~(substitute* "src/meson.build"
+            (("dbusdir / 'system.d'")
+              "get_option('sysconfdir') / 'dbus-1/system.d'")
+            ;; Avoid writing to /var during the build, this is
+            ;; not possible in Guix!
+            (("^install_subdir\\('does-not-exist'.*$") "")))))
+    (build-system meson-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'pre-check
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((umockdev (string-append (assoc-ref inputs "umockdev")
-                                            "/lib")))
-               (setenv "LD_LIBRARY_PATH" umockdev)))))
-       #:configure-flags (list "--localstatedir=/var"
-                               (string-append "--with-udevrulesdir="
-                                              (assoc-ref %outputs "out")
-                                              "/lib/udev/rules.d"))))
+      (list
+       #:glib-or-gtk? #t
+       #:phases
+       #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((umockdev (string-append (assoc-ref inputs "umockdev")
+                                             "/lib")))
+                (setenv "LD_LIBRARY_PATH" umockdev)))))
+       #:configure-flags
+       #~(list "-Dsystemdsystemunitdir=no"
+               ;; If not specified, udev will try putting history information
+               ;; in /gnu/store.
+               "-Dhistorydir=/var/lib/upower"
+               (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d"))))
     (native-inputs
-     (list autoconf
-           automake
+     (list `(,glib "bin") ; for gdbus-codegen
            gobject-introspection
            gtk-doc
            intltool
-           libtool
            pkg-config
            python
-           which ; for ./autogen.sh
            ;; For tests.
            python-dbus
            python-dbusmock
diff --git a/gnu/packages/patches/upower-builddir.patch b/gnu/packages/patches/upower-builddir.patch
deleted file mode 100644
index a61d387faf..0000000000
--- a/gnu/packages/patches/upower-builddir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 27ae011b31d831752b97eb209bc2b2206fcf40f7 Mon Sep 17 00:00:00 2001
-From: Tobias Geerinckx-Rice <me@tobias.gr>
-Date: Mon, 28 Jun 2021 11:58:47 +0200
-Subject: [PATCH] gnu: upower: Fix build directory.
-
-Remove explicit set of UPOWER_CONF_FILE_NAME in up-self-test.c;
-instead the harness should set it.  In Guix we set it explicitly; the
-right thing is to use AM_TEST_ENVIRONMENT and regenerate the
-makefiles, but we can't regenerate because current autotools carp on
-some things, so we patch the Makefile.in instead.
-
-Also fix to not try to create /var/lib/upower if /var isn't writable.
-
-Based on a patch by Andy Wingo <wingo@igalia.com>
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3400139..f51ee89 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -181,7 +181,7 @@ $(systemdservice_DATA): $(systemdservice_in_files) Makefile
- endif
- 
- install-data-hook:
--	if test -w $(DESTDIR)$(prefix)/; then \
-+	if test -w $(DESTDIR)$(localstatedir)/; then \
- 		mkdir -p $(DESTDIR)$(historydir); \
- 	fi
- 
--- 
-2.32.0
-
-- 
2.30.2


[-- Attachment #1.4: 0003-gnu-umockdev-Use-G-expressions.patch --]
[-- Type: text/x-patch, Size: 1329 bytes --]

From c36d191e64303e1f58f77b7c106d73f8a9f4f324 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Thu, 17 Feb 2022 18:09:49 +0000
Subject: [PATCH 3/6] gnu: umockdev: Use G-expressions.

While we're at it, remove the trailing #t.

* gnu/packagers/check.scm (umockdev)[arguments]<#:phases>: Change to a G-exp.
---
 gnu/packages/check.scm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 4115a5c22b..6060bff4cb 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2844,13 +2844,12 @@ provides a simple way to achieve this.")
                 "0xmi24ckpps32k7hc139psgbsnsf4g106sv4l9m445m46amkxggd"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-test
-           (lambda _
-             (substitute* "tests/test-umockdev.c"
-               (("/run") "/tmp"))
-             #t)))))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-test
+                 (lambda _
+                   (substitute* "tests/test-umockdev.c"
+                     (("/run") "/tmp")))))))
     (native-inputs
      (list vala
            gobject-introspection
-- 
2.30.2


[-- Attachment #1.5: 0004-gnu-umockdev-Reference-env-and-sh-by-absolute-path.patch --]
[-- Type: text/x-patch, Size: 2256 bytes --]

From 7668016b2db3fcf1dd24f74e7060962dfd48cd36 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Thu, 17 Feb 2022 18:30:00 +0000
Subject: [PATCH 4/6] gnu: umockdev: Reference 'env' and 'sh' by absolute path.

* gnu/packages/check.scm
  (umockdev)[inputs]: Add 'bash-minimal' and 'coreutils-minimal'.
  (umockdev)[arguments]<#:phases>{absolute-filenames}: New phase.
---
 gnu/packages/check.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 6060bff4cb..deffcefda2 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -37,6 +37,7 @@
 ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
+;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2849,7 +2850,14 @@ provides a simple way to achieve this.")
                (add-after 'unpack 'fix-test
                  (lambda _
                    (substitute* "tests/test-umockdev.c"
-                     (("/run") "/tmp")))))))
+                     (("/run") "/tmp"))))
+               (add-after 'install 'absolute-filenames
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   ;; 'patch-shebangs' will take care of the shebang.
+                   (substitute* (string-append #$output "/bin/umockdev-wrapper")
+                     (("env") (search-input-file inputs "bin/env"))
+                     (("libumockdev")
+                      (string-append #$output "/lib/libumockdev"))))))))
     (native-inputs
      (list vala
            gobject-introspection
@@ -2859,7 +2867,9 @@ provides a simple way to achieve this.")
            python
            which))
     (inputs
-     (list glib eudev libgudev))
+     (list bash-minimal ;for umockdev-wrapper
+           coreutils-minimal ;for bin/env
+           glib eudev libgudev))
     (home-page "https://github.com/martinpitt/umockdev/")
     (synopsis "Mock hardware devices for creating unit tests")
     (description "umockdev mocks hardware devices for creating integration
-- 
2.30.2


[-- Attachment #1.6: 0005-gnu-umockdev-Reference-libumockdev-by-absolute-path.patch --]
[-- Type: text/x-patch, Size: 1395 bytes --]

From 5f133f50031fb194e212af1ec39c11abb64d47c7 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Thu, 17 Feb 2022 19:02:08 +0000
Subject: [PATCH 5/6] gnu: umockdev: Reference libumockdev by absolute path.

* gnu/packages/check.scm
  (umockdev)[arguments]<#:phases>{absolute-introspection-library}:
  New phase.
---
 gnu/packages/check.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index deffcefda2..39273c6fb5 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2851,6 +2851,14 @@ provides a simple way to achieve this.")
                  (lambda _
                    (substitute* "tests/test-umockdev.c"
                      (("/run") "/tmp"))))
+               ;; Avoid having to set 'LD_LIBRARY_PATH' to use umockdev
+               ;; via introspection.
+               (add-after 'unpack 'absolute-introspection-library
+                 (lambda _
+                   (substitute* "Makefile.in"
+                     (("g-ir-compiler -l libumockdev")
+                      (string-append "g-ir-compiler -l " #$output
+                                     "/lib/libumockdev")))))
                (add-after 'install 'absolute-filenames
                  (lambda* (#:key inputs #:allow-other-keys)
                    ;; 'patch-shebangs' will take care of the shebang.
-- 
2.30.2


[-- Attachment #1.7: 0006-gnu-upower-Remove-obsolete-phase.patch --]
[-- Type: text/x-patch, Size: 1246 bytes --]

From 3771de31fc23a626eebb153589ceac4aa25189f6 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Thu, 17 Feb 2022 19:05:26 +0000
Subject: [PATCH 6/6] gnu: upower: Remove obsolete phase

Now umockdev-wrapper refers to things by absolute path, this phase
is no longer necessary.

* gnu/packages/gnome.scm
  (upower)[arguments]<#:phases>{pre-check}: Remove.
---
 gnu/packages/gnome.scm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 64571d414a..708542ccd7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5469,13 +5469,6 @@ faster results and to avoid unnecessary server load.")
     (arguments
       (list
        #:glib-or-gtk? #t
-       #:phases
-       #~(modify-phases %standard-phases
-          (add-before 'check 'pre-check
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((umockdev (string-append (assoc-ref inputs "umockdev")
-                                             "/lib")))
-                (setenv "LD_LIBRARY_PATH" umockdev)))))
        #:configure-flags
        #~(list "-Dsystemdsystemunitdir=no"
                ;; If not specified, udev will try putting history information
-- 
2.30.2


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53434] Patches to unbreak many i686 packages

[Ludovic Courtès]

Hi Maxime,

Maxime Devos <maximedevos@telenet.be> skribis:

> Ludovic Courtès schreef op do 17-02-2022 om 11:40 [+0100]:
>> Yes, we can do that on master.  Do you want to give it a try?
>
> See attachment! I verified that:

Wonderful.  I pushed the whole series:

  0d1a6cffaf gnu: upower: Remove obsolete phase
  4262919ea9 gnu: umockdev: Reference libumockdev by absolute path.
  569d7ba38c gnu: umockdev: Reference 'env' and 'sh' by absolute path.
  33f2e862c7 gnu: umockdev: Use G-expressions.
  b3d7eae08e gnu: upower: Update to 0.99.15.
  7168148abe gnu: upower: Make it auto-updatable.

Thank you!

Ludo’.

[bug#53434] Patches to unbreak many i686 packages

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 465 bytes --]

On Wed, 16 Feb 2022 14:53:53 +0100
Ludovic Courtès <ludo@gnu.org> wrote:

> Did the problem sort itself?
I think so. Beside gdm that started to really depend on rust, all the
other packages I mentioned now build fine.

Should I send a mail to close the bug?

PS: In case this mail is somehow duplicated I already sent a similar
    mail months ago but it seems to have never arrived so there might
    have been an issue with my mail client.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#53434: Patches to unbreak many i686 packages

[Ludovic Courtès]

Hi,

Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> skribis:

> On Wed, 16 Feb 2022 14:53:53 +0100
> Ludovic Courtès <ludo@gnu.org> wrote:
>
>> Did the problem sort itself?
> I think so. Beside gdm that started to really depend on rust, all the
> other packages I mentioned now build fine.
>
> Should I send a mail to close the bug?

Doing it right now.  :-)

Thanks!

Ludo’.