From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:60745)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jFmmh-0007iJ-Ju
 for guix-patches@gnu.org; Sat, 21 Mar 2020 18:40:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jFmmg-0008JQ-Kl
 for guix-patches@gnu.org; Sat, 21 Mar 2020 18:40:03 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:42403)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1jFmmg-0008JJ-HK
 for guix-patches@gnu.org; Sat, 21 Mar 2020 18:40:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jFmmg-0004s0-CM
 for guix-patches@gnu.org; Sat, 21 Mar 2020 18:40:02 -0400
Subject: bug#40168: [PATCH]
Resent-To: guix-patches@gnu.org
Resent-Message-ID: <handler.40168.D40168.158483037218673.done@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <87imixr67y.fsf@cassou.me>
Date: Sat, 21 Mar 2020 23:39:12 +0100
In-Reply-To: <87imixr67y.fsf@cassou.me> (Damien Cassou's message of "Sat, 21
 Mar 2020 18:02:57 +0100")
Message-ID: <87fte1wcxb.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Damien Cassou <damien@cassou.me>
Cc: 40168-done@debbugs.gnu.org

--=-=-=
Content-Type: text/plain

Hi Damien,

Damien Cassou <damien@cassou.me> skribis:

> Damien Cassou (3):
>   * gnu/packages/xdisorg.scm (clipmenu): Re-indent
>   * gnu/packages/xdisorg.scm (clipnotify): Add a comment
>   gnu: clipmenu: Improve the package definition

Applied!

I added a subject line to the commit logs.  For the last patch I
adjusted the shebang substitute:


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index f7c4668bf8..facd63ab53 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -2204,8 +2204,8 @@ tools to complement clipnotify.")
                  #t)))
            (add-after 'install 'wrap-script
              (lambda* (#:key inputs outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (clipnotify (assoc-ref inputs "clipnotify"))
+               (let* ((out               (assoc-ref outputs "out"))
+                      (clipnotify        (assoc-ref inputs "clipnotify"))
                       (coreutils-minimal (assoc-ref inputs "coreutils-minimal"))
                       (gawk              (assoc-ref inputs "gawk"))
                       (util-linux        (assoc-ref inputs "util-linux"))
@@ -2227,7 +2227,7 @@ tools to complement clipnotify.")
                ;; file writes this string to a temporary file):
                (substitute* "tests/test-clipmenu"
                  (("#!/usr/bin/env bash")
-                  (which "bash")))
+                  (string-append "#!" (which "bash"))))
                (invoke "tests/test-clipmenu")
                #t)))))
       (inputs

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable


Thanks!

Ludo=E2=80=99.

--=-=-=--