From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:35276)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jC5Pk-0000hY-04
 for guix-patches@gnu.org; Wed, 11 Mar 2020 13:45:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jC5Pi-00023t-3F
 for guix-patches@gnu.org; Wed, 11 Mar 2020 13:45:03 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:49515)
 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 1jC5Ph-00023p-Uw
 for guix-patches@gnu.org; Wed, 11 Mar 2020 13:45:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jC5Ph-0005TG-Te
 for guix-patches@gnu.org; Wed, 11 Mar 2020 13:45:01 -0400
Subject: bug#39922: [PATCH] Add clipnotify and clipmenu
Resent-To: guix-patches@gnu.org
Resent-Message-ID: <handler.39922.D39922.158394869720998.done@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <87wo7zhzds.fsf@cassou.me>
Date: Wed, 11 Mar 2020 18:44:47 +0100
In-Reply-To: <87wo7zhzds.fsf@cassou.me> (Damien Cassou's message of "Thu, 05
 Mar 2020 11:25:35 +0100")
Message-ID: <878sk6hjlc.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
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: 39922-done@debbugs.gnu.org

Hi Damien,

Damien Cassou <damien@cassou.me> skribis:

>>>From f6f5ed7f4d5ba8a75f8783a7958b6f73d43644dd Mon Sep 17 00:00:00 2001
> From: Damien Cassou <damien@cassou.me>
> Date: Wed, 4 Mar 2020 16:31:51 +0100
> Subject: [PATCH 1/2] gnu: Add clipnotify.
>
> * gnu/packages/xdisorg.scm (clipnotify): New variable.

Neat!  I added a copyright line for you, let me know if anything=E2=80=99s
wrong!

> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let* ((out  (assoc-ref outputs "out"))
> +                    (bin  (string-append out "/bin"))
> +                    (doc  (string-append %output "/share/doc/" ,name "-"=
 ,version)))
> +               (install-file "clipnotify" bin)
> +               (install-file "README.md" doc)))))

I added a #t here (by convention, phase have to return either #t or #f
currently.)

>>>From 6d3202131236adc7f5c38e07541382d04ac68cf1 Mon Sep 17 00:00:00 2001
> From: Damien Cassou <damien@cassou.me>
> Date: Thu, 5 Mar 2020 08:26:23 +0100
> Subject: [PATCH 2/2] gnu: Add clipmenu.
>
> * gnu/packages/xdisorg.scm (clipmenu): New variable.

[...]

> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'fix-hardcoded-paths
> +                  (lambda _
> +                    (substitute* "clipmenud"
> +                      (("has_clipnotify=3D0") "has_clipnotify=3D1")
> +                      (("command -v clipnotify >/dev/null 2>&1 && has_cl=
ipnotify=3D1") "")
> +                      (("clipnotify \\|\\| .*") (string-append (which "c=
lipnotify") "\n"))
> +                      (("xsel --logfile") (string-append (which "xsel") =
" --logfile")))
> +                    (substitute* "clipmenu"
> +                      (("xsel --logfile") (string-append (which "xsel") =
" --logfile")))

I adjusted the indentation and line length here.

> +         (replace 'install
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let* ((out  (assoc-ref outputs "out"))
> +                    (bin  (string-append out "/bin"))
> +                    (doc  (string-append %output "/share/doc/" ,name "-"=
 ,version)))
> +               (install-file "clipdel" bin)
> +               (install-file "clipmenu" bin)
> +               (install-file "clipmenud" bin)
> +               (install-file "README.md" doc)))))

and added #t here.

> +       #:tests? #f))

Oh, I overlooked that, but usually, when disabling tests, we add a
comment explaining why.

Thanks,
Ludo=E2=80=99.