all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Raghav Gururajan via Guix-patches via <guix-patches@gnu.org>
To: 47770@debbugs.gnu.org
Cc: Raghav Gururajan <rg@raghavgururajan.name>
Subject: [bug#47770] [PATCH core-updates v2 5/5] gnu: ibus: Remove trailing #t in phases.
Date: Thu, 15 Apr 2021 08:29:02 -0400	[thread overview]
Message-ID: <20210415122902.2608-5-rg@raghavgururajan.name> (raw)
In-Reply-To: <20210415122902.2608-1-rg@raghavgururajan.name>

* gnu/packages/ibus.scm (ibus)[phases]: Remove trailing #t.
---
 gnu/packages/ibus.scm | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index fa12499bb9..cdd4708d22 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -100,16 +100,14 @@
              (with-directory-excursion "src/tests"
                (substitute* '("ibus-share.c" "ibus-compose.c"
                               "ibus-keypress.c")
-                 (("[ \t]*return g_test_run \\(\\);") "")))
-             #t))
+                 (("[ \t]*return g_test_run \\(\\);") "")))))
          (add-after 'unpack 'patch-docbook-xml
            (lambda* (#:key inputs #:allow-other-keys)
              (with-directory-excursion "docs/reference/ibus"
                (substitute* "ibus-docs.sgml.in"
                  (("http://www.oasis-open.org/docbook/xml/4.1.2/")
                   (string-append (assoc-ref inputs "docbook-xml")
-                                 "/xml/dtd/docbook/"))))
-             #t))
+                                 "/xml/dtd/docbook/"))))))
          (add-after 'unpack 'patch-python-target-directories
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((root (string-append (assoc-ref outputs "out")
@@ -120,13 +118,11 @@
                  (("(py2?overridesdir)=.*" _ var)
                   (string-append var "=" root "/gi/overrides/"))
                  (("(pkgpython2dir=).*" _ var)
-                  (string-append var root "/ibus"))))
-             #t))
+                  (string-append var root "/ibus"))))))
          (add-before 'configure 'disable-dconf-update
            (lambda _
              (substitute* "data/dconf/Makefile.in"
-               (("dconf update") "echo dconf update"))
-             #t))
+               (("dconf update") "echo dconf update"))))
          (add-after 'unpack 'delete-generated-files
            (lambda _
              (for-each (lambda (file)
@@ -134,8 +130,7 @@
                            (when (file-exists? c)
                              (format #t "deleting ~a\n" c)
                              (delete-file c))))
-                       (find-files "." "\\.vala"))
-             #t))
+                       (find-files "." "\\.vala"))))
          (add-after 'unpack 'fix-paths
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "src/ibusenginesimple.c"
@@ -144,8 +139,7 @@
                                "/share/X11/locale")))
              (substitute* "ui/gtk3/xkblayout.vala"
                (("\"(setxkbmap|xmodmap)\"" _ prog)
-                (string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\"")))
-             #t))
+                (string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\"")))))
          (add-before 'check 'pre-check
            (lambda _
              ;; Tests write to $HOME.
@@ -158,8 +152,7 @@
              (system "Xvfb :1 +extension GLX &")
              (setenv "DISPLAY" ":1")
              ;; Tests require running iBus daemon.
-             (system "./bus/ibus-daemon --daemonize")
-             #t))
+             (system "./bus/ibus-daemon --daemonize")))
          (add-after 'install 'move-doc
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -167,8 +160,7 @@
                (mkdir-p (string-append doc "/share"))
                (rename-file
                 (string-append out "/share/gtk-doc")
-                (string-append doc "/share/gtk-doc"))
-               #t)))
+                (string-append doc "/share/gtk-doc")))))
          (add-after 'wrap-program 'wrap-with-additional-paths
            (lambda* (#:key outputs #:allow-other-keys)
              ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
@@ -178,8 +170,7 @@
                  `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
                  `("GI_TYPELIB_PATH" ":" prefix
                    (,(getenv "GI_TYPELIB_PATH")
-                    ,(string-append out "/lib/girepository-1.0")))))
-             #t)))))
+                    ,(string-append out "/lib/girepository-1.0"))))))))))
     (inputs
      `(("dbus" ,dbus)
        ("dconf" ,dconf)
-- 
2.31.1





  parent reply	other threads:[~2021-04-15 12:35 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-14 11:42 [bug#47770] [PATCH core-updates 0/4] Update ibus Raghav Gururajan via Guix-patches via
2021-04-14 11:53 ` [bug#47770] [PATCH core-updates 1/4] gnu: ibus: Update to 1.5.24 Raghav Gururajan via Guix-patches via
2021-04-14 11:53   ` [bug#47770] [PATCH core-updates 2/4] gnu: ibus: Enable documentation Raghav Gururajan via Guix-patches via
2021-04-14 21:21     ` Maxime Devos
2021-04-15 12:31       ` Raghav Gururajan via Guix-patches via
2021-04-14 11:53   ` [bug#47770] [PATCH core-updates 3/4] gnu: ibus: Enable memconf Raghav Gururajan via Guix-patches via
2021-04-14 11:53   ` [bug#47770] [PATCH core-updates 4/4] gnu: ibus: Enable tests Raghav Gururajan via Guix-patches via
2021-04-14 21:24     ` Maxime Devos
2021-04-15 12:33       ` Raghav Gururajan via Guix-patches via
2021-04-15 12:28 ` [bug#47770] [PATCH core-updates v2 1/5] gnu: ibus: Update to 1.5.24 Raghav Gururajan via Guix-patches via
2021-04-15 12:28   ` [bug#47770] [PATCH core-updates v2 2/5] gnu: ibus: Enable documentation Raghav Gururajan via Guix-patches via
2021-04-15 12:29   ` [bug#47770] [PATCH core-updates v2 3/5] gnu: ibus: Enable memconf Raghav Gururajan via Guix-patches via
2021-04-15 12:29   ` [bug#47770] [PATCH core-updates v2 4/5] gnu: ibus: Enable tests Raghav Gururajan via Guix-patches via
2021-04-15 12:29   ` Raghav Gururajan via Guix-patches via [this message]
2021-04-16 15:42 ` bug#47770: (no subject) Raghav Gururajan via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210415122902.2608-5-rg@raghavgururajan.name \
    --to=guix-patches@gnu.org \
    --cc=47770@debbugs.gnu.org \
    --cc=rg@raghavgururajan.name \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.