[bug#66784] [PATCH] gnu: dunst: Update to 1.9.2.

[bug#66784] [PATCH] gnu: dunst: Update to 1.9.2.

[Jaeme Sifat via Guix-patches via]

Dunst is primarily used in X11 window managers and wayland
compositors (similar to mako). Having a file dedicated to it is space
inefficient.

* gnu/packages/dunst.scm: Delete file.
* gnu/packages/wm.scm (dunst): Update to 1.9.2.
[arguments]: Use gexps.

Signed-off-by: Jaeme Sifat <jaeme@runbox.com>
Change-Id: I02ce49ffcdb8d790659c8d7fc8a95976daa4e349
---
 gnu/packages/dunst.scm | 89 ------------------------------------------
 gnu/packages/wm.scm    | 51 ++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 89 deletions(-)
 delete mode 100644 gnu/packages/dunst.scm

diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm
deleted file mode 100644
index 4a8ff59ec9..0000000000
--- a/gnu/packages/dunst.scm
+++ /dev/null
@@ -1,89 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2017, 2018 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019, 2023 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
-;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
-;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix 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.
-;;;
-;;; GNU Guix 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 GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages dunst)
-  #:use-module (guix packages)
-  #:use-module (guix git-download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix utils)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages freedesktop)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages xorg))
-
-(define-public dunst
-  (package
-    (name "dunst")
-    (version "1.9.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/dunst-project/dunst")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1nfxf2rahngxpy606yrizrz16d0pswl5sa9jfzpv7h19x6xy24vx"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f                      ; no check target
-       #:make-flags (list (string-append "CC=" ,(cc-for-target))
-                          (string-append "PREFIX=" %output)
-                          (string-append "SYSCONFDIR=" %output "/etc")
-                          ;; Otherwise it tries to install service file
-                          ;; to "dbus" store directory.
-                          (string-append "SERVICEDIR_DBUS=" %output
-                                         "/share/dbus-1/services")
-                          "dunstify")
-       #:phases (modify-phases %standard-phases
-                  (delete 'configure))))
-    (native-inputs
-     (list pkg-config perl ; for pod2man
-           which))
-    (inputs
-     (list dbus
-           (librsvg-for-system) ; for svg support
-           glib
-           cairo
-           pango
-           libnotify ; for dunstify
-           libx11
-           libxscrnsaver
-           libxinerama
-           libxrandr
-           libxdg-basedir
-           wayland))           ; for wayland support
-    (home-page "https://dunst-project.org/")
-    (synopsis "Customizable and lightweight notification daemon")
-    (description
-     "Dunst is a highly configurable and minimalistic notification daemon.
-It provides @code{org.freedesktop.Notifications} D-Bus service, so it is
-started automatically on the first call via D-Bus.")
-    (license license:bsd-3)))
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8576d0297d..2c2e908589 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -64,6 +64,7 @@
 ;;; Copyright © 2023 Jonathan Brielamier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2023 Vessel Wave <vesselwave@disroot.org>
 ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1490,6 +1491,56 @@ (define-public cwm
 project derived from the original Calm Window Manager.")
     (license license:isc)))
 
+(define-public dunst
+  (package
+    (name "dunst")
+    (version "1.9.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dunst-project/dunst")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "17zrw7jrnlyln81pxw7p4jgvl7j1w1gf488nfskhns6j6dcz90gh"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ;no check target
+      #:make-flags #~(list (string-append "CC="
+                                          #$(cc-for-target))
+                           (string-append "PREFIX=" %output)
+                           (string-append "SYSCONFDIR=" %output "/etc")
+                           ;; Otherwise it tries to install service file
+                           ;; to "dbus" store directory.
+                           (string-append "SERVICEDIR_DBUS=" %output
+                                          "/share/dbus-1/services")
+                           "dunstify")
+      #:phases #~(modify-phases %standard-phases
+                   (delete 'configure))))
+    (native-inputs (list pkg-config perl ;for pod2man
+                         which))
+    (inputs (list dbus
+                  (librsvg-for-system) ;for svg support
+                  glib
+                  cairo
+                  pango
+                  libnotify ;for dunstify
+                  libx11
+                  libxscrnsaver
+                  libxinerama
+                  libxrandr
+                  libxdg-basedir
+                  wayland)) ;for wayland support
+    (home-page "https://dunst-project.org/")
+    (synopsis "Customizable and lightweight notification daemon")
+    (description
+     "Dunst is a highly configurable and minimalistic notification daemon.
+It provides @code{org.freedesktop.Notifications} D-Bus service, so it is
+started automatically on the first call via D-Bus.")
+    (license license:bsd-3)))
+
 (define-public dwl
   (package
     (name "dwl")

base-commit: ff1146fb4f7254a8f644f89d7af6b4b566528603
-- 
2.34.1

[bug#66784] [PATCH] gnu: dunst: Update to 1.9.2.

[Christopher Baines]

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


Jaeme Sifat via Guix-patches via <guix-patches@gnu.org> writes:

> Dunst is primarily used in X11 window managers and wayland
> compositors (similar to mako). Having a file dedicated to it is space
> inefficient.
>
> * gnu/packages/dunst.scm: Delete file.
> * gnu/packages/wm.scm (dunst): Update to 1.9.2.
> [arguments]: Use gexps.

Hi,

I like the move to wm.scm, however could you separate moving the package
from updating it? That would make the changes much clearer.

You'll also need to remove dunst.scm from gnu/local.mk and maybe even
update the example using it in the docs.

Would you be able to send some updated patches?

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#66784] [PATCH 0/4] Update dunst

[Jaeme Sifat via Guix-patches via]

This patch series updates dunst to version 1.9.2 and also moves dunst
to wm.scm and deletes dunst.scm as well. It also revises the
references made to dunst.scm in the Contributing section of the Guix
Manual.

Jaeme Sifat (4):
  gnu: dunst: Update to 1.9.2.
  gnu: Remove dunst.scm.
  doc: contributing: Replace reference to dunst.scm.
  po: doc: guix-manual: Replace reference to dunst.scm

 doc/contributing.texi       |  2 +-
 gnu/local.mk                |  1 -
 gnu/packages/dunst.scm      | 89 -------------------------------------
 gnu/packages/wm.scm         | 51 +++++++++++++++++++++
 po/doc/guix-manual.de.po    |  4 +-
 po/doc/guix-manual.es.po    |  4 +-
 po/doc/guix-manual.fr.po    |  4 +-
 po/doc/guix-manual.pt_BR.po |  2 +-
 po/doc/guix-manual.ru.po    |  4 +-
 po/doc/guix-manual.zh_CN.po |  4 +-
 10 files changed, 63 insertions(+), 102 deletions(-)
 delete mode 100644 gnu/packages/dunst.scm


base-commit: e3f318f0489322c4c9b5964f03a8b063a7bfbebd
--
2.41.0

[bug#66784] [PATCH 1/4] gnu: dunst: Update to 1.9.2.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/dunst.scm (dunst): Update to 1.9.2.

Change-Id: Ic13f1679074462918991a1ceba8571a46e721224
---
 gnu/packages/dunst.scm | 76 ++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm
index 4a8ff59ec9..ee389098fb 100644
--- a/gnu/packages/dunst.scm
+++ b/gnu/packages/dunst.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
+;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,7 @@
 
 (define-module (gnu packages dunst)
   #:use-module (guix packages)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix utils)
@@ -41,45 +43,45 @@ (define-module (gnu packages dunst)
 (define-public dunst
   (package
     (name "dunst")
-    (version "1.9.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/dunst-project/dunst")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1nfxf2rahngxpy606yrizrz16d0pswl5sa9jfzpv7h19x6xy24vx"))))
+    (version "1.9.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dunst-project/dunst")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "17zrw7jrnlyln81pxw7p4jgvl7j1w1gf488nfskhns6j6dcz90gh"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ; no check target
-       #:make-flags (list (string-append "CC=" ,(cc-for-target))
-                          (string-append "PREFIX=" %output)
-                          (string-append "SYSCONFDIR=" %output "/etc")
-                          ;; Otherwise it tries to install service file
-                          ;; to "dbus" store directory.
-                          (string-append "SERVICEDIR_DBUS=" %output
-                                         "/share/dbus-1/services")
-                          "dunstify")
-       #:phases (modify-phases %standard-phases
-                  (delete 'configure))))
-    (native-inputs
-     (list pkg-config perl ; for pod2man
-           which))
-    (inputs
-     (list dbus
-           (librsvg-for-system) ; for svg support
-           glib
-           cairo
-           pango
-           libnotify ; for dunstify
-           libx11
-           libxscrnsaver
-           libxinerama
-           libxrandr
-           libxdg-basedir
-           wayland))           ; for wayland support
+     (list
+      #:tests? #f ;no check target
+      #:make-flags #~(list (string-append "CC="
+                                          #$(cc-for-target))
+                           (string-append "PREFIX=" %output)
+                           (string-append "SYSCONFDIR=" %output "/etc")
+                           ;; Otherwise it tries to install service file
+                           ;; to "dbus" store directory.
+                           (string-append "SERVICEDIR_DBUS=" %output
+                                          "/share/dbus-1/services")
+                           "dunstify")
+      #:phases #~(modify-phases %standard-phases
+                   (delete 'configure))))
+    (native-inputs (list pkg-config perl ;for pod2man
+                         which))
+    (inputs (list dbus
+                  (librsvg-for-system) ;for svg support
+                  glib
+                  cairo
+                  pango
+                  libnotify ;for dunstify
+                  libx11
+                  libxscrnsaver
+                  libxinerama
+                  libxrandr
+                  libxdg-basedir
+                  wayland)) ;for wayland support
     (home-page "https://dunst-project.org/")
     (synopsis "Customizable and lightweight notification daemon")
     (description
-- 
2.41.0

[bug#66784] [PATCH 2/4] gnu: Remove dunst.scm.

[Jaeme Sifat via Guix-patches via]

The dunst package is much beter suited to be in wm.scm. This patch deletes
dunst.scm, moves dunst to wm.scm, and removes dunst.scm from the build
process.

* gnu/local.mk (GNU_SYSTEM_MODULES): Remove dunst.scm.
* gnu/packages/dunst.scm: Delete file.
* gnu/packages/wm.scm (dunst): New variable.

Change-Id: I3b074f12f34e14ef1101069ed45ddb33f8d3ea51
---
 gnu/local.mk           |  1 -
 gnu/packages/dunst.scm | 91 ------------------------------------------
 gnu/packages/wm.scm    | 51 +++++++++++++++++++++++
 3 files changed, 51 insertions(+), 92 deletions(-)
 delete mode 100644 gnu/packages/dunst.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index 8d817379a7..a381d28b83 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -234,7 +234,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/docbook.scm			\
   %D%/packages/docker.scm			\
   %D%/packages/documentation.scm		\
-  %D%/packages/dunst.scm			\
   %D%/packages/dvtm.scm				\
   %D%/packages/easyrpg.scm			\
   %D%/packages/ebook.scm			\
diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm
deleted file mode 100644
index ee389098fb..0000000000
--- a/gnu/packages/dunst.scm
+++ /dev/null
@@ -1,91 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2017, 2018 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019, 2023 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
-;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
-;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
-;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix 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.
-;;;
-;;; GNU Guix 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 GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages dunst)
-  #:use-module (guix packages)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix utils)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages freedesktop)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages xorg))
-
-(define-public dunst
-  (package
-    (name "dunst")
-    (version "1.9.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/dunst-project/dunst")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "17zrw7jrnlyln81pxw7p4jgvl7j1w1gf488nfskhns6j6dcz90gh"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ;no check target
-      #:make-flags #~(list (string-append "CC="
-                                          #$(cc-for-target))
-                           (string-append "PREFIX=" %output)
-                           (string-append "SYSCONFDIR=" %output "/etc")
-                           ;; Otherwise it tries to install service file
-                           ;; to "dbus" store directory.
-                           (string-append "SERVICEDIR_DBUS=" %output
-                                          "/share/dbus-1/services")
-                           "dunstify")
-      #:phases #~(modify-phases %standard-phases
-                   (delete 'configure))))
-    (native-inputs (list pkg-config perl ;for pod2man
-                         which))
-    (inputs (list dbus
-                  (librsvg-for-system) ;for svg support
-                  glib
-                  cairo
-                  pango
-                  libnotify ;for dunstify
-                  libx11
-                  libxscrnsaver
-                  libxinerama
-                  libxrandr
-                  libxdg-basedir
-                  wayland)) ;for wayland support
-    (home-page "https://dunst-project.org/")
-    (synopsis "Customizable and lightweight notification daemon")
-    (description
-     "Dunst is a highly configurable and minimalistic notification daemon.
-It provides @code{org.freedesktop.Notifications} D-Bus service, so it is
-started automatically on the first call via D-Bus.")
-    (license license:bsd-3)))
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index c3a6b31c84..95d2a879bc 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -64,6 +64,7 @@
 ;;; Copyright © 2023 Jonathan Brielamier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2023 Vessel Wave <vesselwave@disroot.org>
 ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1490,6 +1491,56 @@ (define-public cwm
 project derived from the original Calm Window Manager.")
     (license license:isc)))
 
+(define-public dunst
+  (package
+    (name "dunst")
+    (version "1.9.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dunst-project/dunst")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "17zrw7jrnlyln81pxw7p4jgvl7j1w1gf488nfskhns6j6dcz90gh"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ;no check target
+      #:make-flags #~(list (string-append "CC="
+                                          #$(cc-for-target))
+                           (string-append "PREFIX=" %output)
+                           (string-append "SYSCONFDIR=" %output "/etc")
+                           ;; Otherwise it tries to install service file
+                           ;; to "dbus" store directory.
+                           (string-append "SERVICEDIR_DBUS=" %output
+                                          "/share/dbus-1/services")
+                           "dunstify")
+      #:phases #~(modify-phases %standard-phases
+                   (delete 'configure))))
+    (native-inputs (list pkg-config perl ;for pod2man
+                         which))
+    (inputs (list dbus
+                  (librsvg-for-system) ;for svg support
+                  glib
+                  cairo
+                  pango
+                  libnotify ;for dunstify
+                  libx11
+                  libxscrnsaver
+                  libxinerama
+                  libxrandr
+                  libxdg-basedir
+                  wayland)) ;for wayland support
+    (home-page "https://dunst-project.org/")
+    (synopsis "Customizable and lightweight notification daemon")
+    (description
+     "Dunst is a highly configurable and minimalistic notification daemon.
+It provides @code{org.freedesktop.Notifications} D-Bus service, so it is
+started automatically on the first call via D-Bus.")
+    (license license:bsd-3)))
+
 (define-public dwl
   (package
     (name "dwl")
-- 
2.41.0

[bug#66784] [PATCH 3/4] doc: contributing: Replace reference to dunst.scm.

[Jaeme Sifat via Guix-patches via]

The contributing documentation makes a reference to dunst.scm as an example of
the build process failing after an update. This patch replaces that reference
with a much more permanent linux.scm.

* doc/contributing.texi: Replace reference to dunst.scm.

Change-Id: I89a4157eb253e25979bc35d6d3b12201a0d19951
---
 doc/contributing.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 30876447d4..f18dc0a513 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -190,7 +190,7 @@ Building from Git
 similar to the following example:
 
 @example
-error: failed to load 'gnu/packages/dunst.scm':
+error: failed to load 'gnu/packages/linux.scm':
 ice-9/eval.scm:293:34: In procedure abi-check: #<record-type <origin>>: record ABI mismatch; recompilation needed
 @end example
 
-- 
2.41.0

[bug#66784] [PATCH 4/4] po: doc: guix-manual: Replace reference to dunst.scm

[Jaeme Sifat via Guix-patches via]

This patch just makes the the corresponding change to dunst in
doc/contributing.texi consistent with the translation files.

Change-Id: I7147f6bcc8f7cfc3ccc3791c4a378508dca75600
---
 po/doc/guix-manual.de.po    | 4 ++--
 po/doc/guix-manual.es.po    | 4 ++--
 po/doc/guix-manual.fr.po    | 4 ++--
 po/doc/guix-manual.pt_BR.po | 2 +-
 po/doc/guix-manual.ru.po    | 4 ++--
 po/doc/guix-manual.zh_CN.po | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/po/doc/guix-manual.de.po b/po/doc/guix-manual.de.po
index 8e5cc792f9..3559604d32 100644
--- a/po/doc/guix-manual.de.po
+++ b/po/doc/guix-manual.de.po
@@ -486,10 +486,10 @@ msgstr "Wenn Sie das Repository einmal aktualisieren, kann es passieren, dass @c
 #: guix-git/doc/contributing.texi:195
 #, no-wrap
 msgid ""
-"error: failed to load 'gnu/packages/dunst.scm':\n"
+"error: failed to load 'gnu/packages/linux.scm':\n"
 "ice-9/eval.scm:293:34: In procedure abi-check: #<record-type <origin>>: record ABI mismatch; recompilation needed\n"
 msgstr ""
-"error: failed to load 'gnu/packages/dunst.scm':\n"
+"error: failed to load 'gnu/packages/linux.scm':\n"
 "ice-9/eval.scm:293:34: In procedure abi-check: #<record-type <origin>>: record ABI mismatch; recompilation needed\n"
 
 #. type: Plain text
diff --git a/po/doc/guix-manual.es.po b/po/doc/guix-manual.es.po
index 43cd7a3a83..6fcd8c9d2e 100644
--- a/po/doc/guix-manual.es.po
+++ b/po/doc/guix-manual.es.po
@@ -524,10 +524,10 @@ msgstr "Después de actualizar el repositorio, @command{make} podría fallar con
 #: guix-git/doc/contributing.texi:188
 #, no-wrap
 msgid ""
-"error: failed to load 'gnu/packages/dunst.scm':\n"
+"error: failed to load 'gnu/packages/linux.scm':\n"
 "ice-9/eval.scm:293:34: In procedure abi-check: #<record-type <origin>>: record ABI mismatch; recompilation needed\n"
 msgstr ""
-"error: fallo al cargar 'gnu/packages/dunst.scm':\n"
+"error: fallo al cargar 'gnu/packages/linux.scm':\n"
 "ice-9/eval.scm:293:34: En el procedimiento abi-check: #<record-type <origin>>: registro ABI erróneo; se necesita recompilación\n"
 
 #. type: Plain text
diff --git a/po/doc/guix-manual.fr.po b/po/doc/guix-manual.fr.po
index 323ee7dad3..f01eef2278 100644
--- a/po/doc/guix-manual.fr.po
+++ b/po/doc/guix-manual.fr.po
@@ -521,10 +521,10 @@ msgstr "Après la mise à jour du dépôt, @command{make} peut échouer avec une
 #: guix-git/doc/contributing.texi:195
 #, no-wrap
 msgid ""
-"error: failed to load 'gnu/packages/dunst.scm':\n"
+"error: failed to load 'gnu/packages/linux.scm':\n"
 "ice-9/eval.scm:293:34: In procedure abi-check: #<record-type <origin>>: record ABI mismatch; recompilation needed\n"
 msgstr ""
-"error: failed to load 'gnu/packages/dunst.scm':\n"
+"error: failed to load 'gnu/packages/linux.scm':\n"
 "ice-9/eval.scm:293:34: In procedure abi-check: #<record-type <origin>>: record ABI mismatch; recompilation needed\n"
 
 #. type: Plain text
diff --git a/po/doc/guix-manual.pt_BR.po b/po/doc/guix-manual.pt_BR.po
index d34d0fe2a8..7e15b59f89 100644
--- a/po/doc/guix-manual.pt_BR.po
+++ b/po/doc/guix-manual.pt_BR.po
@@ -465,7 +465,7 @@ msgstr ""
 #: guix-git/doc/contributing.texi:188
 #, no-wrap
 msgid ""
-"error: failed to load 'gnu/packages/dunst.scm':\n"
+"error: failed to load 'gnu/packages/linux.scm':\n"
 "ice-9/eval.scm:293:34: In procedure abi-check: #<record-type <origin>>: record ABI mismatch; recompilation needed\n"
 msgstr ""
 
diff --git a/po/doc/guix-manual.ru.po b/po/doc/guix-manual.ru.po
index 032fd664cf..603e564ef1 100644
--- a/po/doc/guix-manual.ru.po
+++ b/po/doc/guix-manual.ru.po
@@ -470,10 +470,10 @@ msgstr "После обновления репозитория команда @c
 #: guix-git/doc/contributing.texi:188
 #, no-wrap
 msgid ""
-"error: failed to load 'gnu/packages/dunst.scm':\n"
+"error: failed to load 'gnu/packages/linux.scm':\n"
 "ice-9/eval.scm:293:34: In procedure abi-check: #<record-type <origin>>: record ABI mismatch; recompilation needed\n"
 msgstr ""
-"error: failed to load 'gnu/packages/dunst.scm':\n"
+"error: failed to load 'gnu/packages/linux.scm':\n"
 "ice-9/eval.scm:293:34: In procedure abi-check: #<record-type <origin>>: record ABI mismatch; recompilation needed\n"
 
 #. type: Plain text
diff --git a/po/doc/guix-manual.zh_CN.po b/po/doc/guix-manual.zh_CN.po
index 512e242e6a..c680328253 100644
--- a/po/doc/guix-manual.zh_CN.po
+++ b/po/doc/guix-manual.zh_CN.po
@@ -497,10 +497,10 @@ msgstr "在每次更新仓库后，@command{make} 可能会因为一个错误而
 #: guix-git/doc/contributing.texi:195
 #, no-wrap
 msgid ""
-"error: failed to load 'gnu/packages/dunst.scm':\n"
+"error: failed to load 'gnu/packages/linux.scm':\n"
 "ice-9/eval.scm:293:34: In procedure abi-check: #<record-type <origin>>: record ABI mismatch; recompilation needed\n"
 msgstr ""
-"error: failed to load 'gnu/packages/dunst.scm':\n"
+"error: failed to load 'gnu/packages/linux.scm':\n"
 "ice-9/eval.scm:293:34: In procedure abi-check: #<record-type <origin>>: record ABI mismatch; recompilation needed\n"
 
 #. type: Plain text
-- 
2.41.0

[bug#66784] Sent Revised Patch Series.

[Jaeme Sifat via Guix-patches via]

Hello Chris,

I have sent a patch series that separates updating dunst and removing 
dunst.scm. I have also added two extra patches that revise the reference 
made to dunst.scm in contributing.texi and the corresponding translation 
files. Please let me know if there are any other fixes that need have to 
be made.

Thank you for your input,

Jaeme

bug#66784: Sent Revised Patch Series.

[Christopher Baines]

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


Jaeme Sifat <jaeme@runbox.com> writes:

> I have sent a patch series that separates updating dunst and removing
> dunst.scm. I have also added two extra patches that revise the
> reference made to dunst.scm in contributing.texi and the corresponding
> translation files. Please let me know if there are any other fixes
> that need have to be made.

Awesome, thanks. I left out the changes in po/ since I don't think these
files usually get updated manually. I think there's some process to
regenerate them. I've pushed the other 3 commits to master as
0826cc8a07abbcc4ae3bfd51eb0750044a859369.

Thanks again,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]