Subject: [bug#53581] [PATCH 1/8] gnu: libdrm: Update to 2.4.109.

From: phodina <[email-masked]>
Date: Thu, 27 Jan 2022 11:43:13 +0000

Hi,

here is a patch set to update the sway window manager to latest version 1.7.

Since it updates wayland packages and libdrm is there a way how to test all the packages which are effected?

Currently I list the affected packages like this:

./pre-inst-env guix refresh --list-dependent <UPDATED PACKAGES>

I can use sed to remove the versions and also remove guix-minimal from the list
sed "s/@[-\.a-zA-Z0-9]* / /g" | sed "s/guix-minimal//g"

Finally I call the build itself
xargs ./pre-inst-env guix build

Since it touches lots of packages I expect it will go to core-updates, right? Should I mark the patches somehow (next time)?

There is package xf86-video-freedreno, but it also fails to build without the patches and by quick check the last commit is ~5yrs old.

Also should I test all the packages to build? I stopped at ungoogled-chromium as that requires a lot of resources and time.
----
Petr

From cdcb165374e183c887c09096ea3ba9c813c4648c Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Wed, 26 Jan 2022 18:04:28 +0100
Subject: [PATCH 1/8] gnu: libdrm: Update to 2.4.109.

* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.109.

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index ec995c3496..51724a0df4 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -53,6 +53,7 @@
 ;;; Copyright © 2021 Felix Gruber <[email-masked]>
 ;;; Copyright © 2021 jgart <[email-masked]>
 ;;; Copyright © 2022 John Kehayias <[email-masked]>
+;;; Copyright © 2022 Petr Hodina <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -622,7 +623,7 @@ (define-public pixman
 (define-public libdrm
   (package
     (name "libdrm")
-    (version "2.4.107")
+    (version "2.4.109")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -630,7 +631,7 @@ (define-public libdrm
                     version ".tar.xz"))
               (sha256
                (base32
-                "127qf1rzhaf13vdd75a58v5q34617hvangjlfnlkcdh37gqcwm65"))))
+                "09kzrdsd14zr0i3izvi5mck4vqccl3c9hr84r9i4is0zikh554v2"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
-- 
2.34.0

From 77bef403c1b74612314aa2e440543e04add05e84 Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Wed, 26 Jan 2022 18:07:17 +0100
Subject: [PATCH 2/8] gnu: wayland: Update to 1.20.0.

* gnu/packages/freedesktop.scm (wayland): Update to 1.20.0.

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 818d9966dd..fdd391b36c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -29,6 +29,7 @@
 ;;; Copyright © 2021 John Kehayias <[email-masked]>
 ;;; Copyright © 2021 Maxim Cournoyer <[email-masked]>
 ;;; Copyright © 2022 Daniel Meißner <[email-masked]>
+;;; Copyright © 2022 Petr Hodina <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -956,14 +957,14 @@ (define-public python2-pyxdg
 (define-public wayland
   (package
     (name "wayland")
-    (version "1.19.0")
+    (version "1.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://wayland.freedesktop.org/releases/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "05bd2vphyx8qwa1mhsj1zdaiv4m4v94wrlssrn0lad8d601dkk5s"))))
+                "09c7rpbwavjg4y16mrfa57gk5ix6rnzpvlnv1wp7fnbh9hak985q"))))
     (build-system meson-build-system)
     (outputs '("out" "doc"))
     (arguments
-- 
2.34.0

From 4f285bbbeecbe14882e4b919c531cba30d5e7b98 Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Thu, 27 Jan 2022 09:28:26 +0100
Subject: [PATCH 6/8] gnu: cagebreak: Update to 1.8.3.

* gnu/packages/wm.scm (cagebreak): Update to 1.8.3.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index e17d03fe8b..7a2059377f 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2476,7 +2476,7 @@ (define-public xnotify
 (define-public cagebreak
   (package
     (name "cagebreak")
-    (version "1.8.0")
+    (version "1.8.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2485,13 +2485,18 @@ (define-public cagebreak
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0296mnzk7qd0zvnhw716jvpp7madjsar373ixx4qcff0m0jwfrxm"))))
+                "0vm97ak0589v39m3fljf1qhy92dqgiqcrrfp757gg7q58qwa6dkf"))))
     (build-system meson-build-system)
-    (arguments '(#:configure-flags '("-Dxwayland=true")))
-    (native-inputs
-     (list pandoc pkg-config))
-    (inputs
-     (list libevdev pango wlroots))
+    (arguments
+     `(#:configure-flags '("-Dxwayland=true")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-data-dir
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "meson.build"
+               (("/etc/") (string-append (assoc-ref outputs "out") "/etc"))))))))
+    (native-inputs (list pandoc pkg-config))
+    (inputs (list libevdev pango wlroots))
     (home-page "https://github.com/project-repo/cagebreak")
     (synopsis "Tiling wayland compositor inspired by ratpoison")
     (description
-- 
2.34.0

From 3f8243456eb4165d011540a621ea1c37e7f49588 Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Wed, 26 Jan 2022 18:09:02 +0100
Subject: [PATCH 3/8] gnu: wayland-protocols: Update to 1.24.

* gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.24.

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index fdd391b36c..47124640e4 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1022,7 +1022,7 @@ (define-public wayland
 (define-public wayland-protocols
   (package
     (name "wayland-protocols")
-    (version "1.23")
+    (version "1.24")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1030,7 +1030,7 @@ (define-public wayland-protocols
                     "wayland-protocols-" version ".tar.xz"))
               (sha256
                (base32
-                "0xizccackgwszjhlq7jjiv2z2gwppljx0w32ga91bxlnby8z22kc"))))
+                "1hlb6gvyqlmsdkv5179ccj07p04cn6xacjkgklakbszczv7xiw5z"))))
     (build-system meson-build-system)
     (inputs
      (list wayland))
-- 
2.34.0

From 99619d4039ed018d42f8a492c959c9458de11581 Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Wed, 26 Jan 2022 18:12:34 +0100
Subject: [PATCH 5/8] gnu: sway: Update to 1.7.

* gnu/packages/wm.scm (sway): Update to 1.7.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 007c9bf73c..e17d03fe8b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1575,7 +1575,7 @@ (define-public wlroots
 (define-public sway
   (package
     (name "sway")
-    (version "1.6.1")
+    (version "1.7")
     (source
      (origin
        (method git-fetch)
@@ -1584,7 +1584,7 @@ (define-public sway
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j"))))
+        (base32 "0ss3l258blyf2d0lwd7pi7ga1fxfj8pxhag058k7cmjhs3y30y5l"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
-- 
2.34.0

From f7f91b299c0d079bba073f5dc4bf7c97112fec4a Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Thu, 27 Jan 2022 09:34:07 +0100
Subject: [PATCH 8/8] gnu: hikari: Update to 2.3.3.

* gnu/packages/wm.scm (hikari): Update to 2.3.3.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index fec7523a6d..b68295d11a 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2533,14 +2533,14 @@ (define-public libucl
 (define-public hikari
   (package
     (name "hikari")
-    (version "2.3.2")
+    (version "2.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://hikari.acmelabs.space/releases/"
                            "hikari-" version ".tar.gz"))
        (sha256
-        (base32 "1jvy21irh6s7czff2hk63spswqibjcjhrpsgmrki5bii9ddi73wy"))))
+        (base32 "1qjd9dhpmv75idf6jjzwff8wgliad4d0af8pih9526p14vrnyws0"))))
     (build-system gnu-build-system)
     (native-inputs
      (list bmake pkg-config wayland-protocols))
-- 
2.34.0

From a998a5b6e625b30f7411195707dccd89d34b12ea Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Wed, 26 Jan 2022 18:09:58 +0100
Subject: [PATCH 4/8] gnu: wlroots: Update to 0.15.0.

* gnu/packages/wm.scm (wlroots): Update to 0.15.0.
  [source]: Update url link to
  'https://gitlab.freedesktop.org/wlroots/wlroots' due to original link
  pointing now to archived repo.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 9549b073cf..007c9bf73c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -45,7 +45,7 @@
 ;;; Copyright © 2021 Sharlatan Hellseher <[email-masked]>
 ;;; Copyright © 2021 qblade <[email-masked]>
 ;;; Copyright © 2021 lasnesne <[email-masked]>
-;;; Copyright © 2021 Petr Hodina <[email-masked]>
+;;; Copyright © 2021, 2022 Petr Hodina <[email-masked]>
 ;;; Copyright © 2021 jgart <[email-masked]>
 ;;; Copyright © 2021 Disseminate Dissent <[email-masked]>
 ;;; Copyright © 2022 John Kehayias <[email-masked]>
@@ -1529,16 +1529,16 @@ (define-public polybar
 (define-public wlroots
   (package
     (name "wlroots")
-    (version "0.14.1")
+    (version "0.15.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/swaywm/wlroots")
+             (url "https://gitlab.freedesktop.org/wlroots/wlroots")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1sshp3lvlkl1i670kxhwsb4xzxl8raz6769kqvgmxzcb63ns9ay1"))))
+        (base32 "0wdzs0wpv61pxgy3mx3xjsndyfmbj30v47d3w9ymmnd4r479n41n"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
-- 
2.34.0

From 4ce1446ff5181ac5245a866eea06230eb0776428 Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Thu, 27 Jan 2022 09:31:00 +0100
Subject: [PATCH 7/8] gnu: dwl: Update to 0.2.2.

* gnu/packages/wm.scm (dwl): Update to 0.2.2.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 7a2059377f..fec7523a6d 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1408,7 +1408,7 @@ (define-public cwm
 (define-public dwl
   (package
     (name "dwl")
-    (version "0.2.1")
+    (version "0.2.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1417,7 +1417,7 @@ (define-public dwl
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0js8xjc2rx1ml6s58s90jrak5n7vh3kj5na2j4yy3qy0cb501xcm"))))
+                "022ax9bafhwzdvz395q4gj706q75h14nasmrp4gfyd21x06slqag"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
-- 
2.34.0