unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: Damien Cassou <damien@cassou.me>
Cc: 40168-done@debbugs.gnu.org
Subject: bug#40168: [PATCH]
Date: Sat, 21 Mar 2020 23:39:12 +0100	[thread overview]
Message-ID: <87fte1wcxb.fsf@gnu.org> (raw)
In-Reply-To: <87imixr67y.fsf@cassou.me> (Damien Cassou's message of "Sat, 21 Mar 2020 18:02:57 +0100")

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

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:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1240 bytes --]

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

[-- Attachment #3: Type: text/plain, Size: 23 bytes --]


Thanks!

Ludo’.

      reply	other threads:[~2020-03-21 22:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-21 17:02 [bug#40168] [PATCH] Damien Cassou
2020-03-21 22:39 ` Ludovic Courtès [this message]

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

  List information: https://guix.gnu.org/

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

  git send-email \
    --in-reply-to=87fte1wcxb.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=40168-done@debbugs.gnu.org \
    --cc=damien@cassou.me \
    /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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).