From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:46343)
 by lists.gnu.org with esmtp (Exim 4.86_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hmR9b-0006ck-2u
 for guix-patches@gnu.org; Sat, 13 Jul 2019 19:10:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hmR9Z-0003Oe-V5
 for guix-patches@gnu.org; Sat, 13 Jul 2019 19:10:07 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:34785)
 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 1hmR9Z-0003OK-6n
 for guix-patches@gnu.org; Sat, 13 Jul 2019 19:10:05 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hmR9Z-0001Tn-1U
 for guix-patches@gnu.org; Sat, 13 Jul 2019 19:10:05 -0400
Subject: bug#36563: [PATCH] guix: Add directory to channel.
Resent-To: guix-patches@gnu.org
Resent-Message-ID: <handler.36563.D36563.15630594005649.done@debbugs.gnu.org>
From: Jan Nieuwenhuizen <janneke@gnu.org>
References: <878st7dn7b.fsf@gnu.org> <87lfx29qjq.fsf@gnu.org>
 <87ef2ukkt8.fsf@gnu.org> <875zo58xsv.fsf@gnu.org>
Date: Sun, 14 Jul 2019 01:09:49 +0200
In-Reply-To: <875zo58xsv.fsf@gnu.org> ("Ludovic
 \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\=
 \=\?utf-8\?Q\?s\?\= message of "Sat, 13 Jul 2019 22:49:36 +0200")
Message-ID: <87a7dhlef6.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: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Cc: 36563-done@debbugs.gnu.org

Ludovic Court=C3=A8s writes:

Hi!

> What about framing it along these lines:
>
>   As a channel author, you may want to keep your channel modules in a
>   sub-directory.  In that case, blah=E2=80=A6
>
> ?

Better, changed it to

--8<---------------cut here---------------start------------->8---
@cindex subdirectory, channels
@subsection Package Modules in a Sub-directory

As a channel author, you may want to keep your channel modules in a
sub-directory.  If your modules are in the sub-directory @file{guix}, you m=
ust
add a meta-data file @file{.guix-channel} that contains:

@lisp
(channel
  (version 0)
  (directory "guix"))
@end lisp
--8<---------------cut here---------------end--------------->8---

> (=E2=80=98read-channel-metadata=E2=80=99 currently ignores =E2=80=98versi=
on=E2=80=99, but that=E2=80=99s a bug
> that we should fix afterwards, IMO.)

OK.

>> +            (let* ((subdir (if #$directory
>> +                               (string-append "/" #$directory)
>> +                               ""))
>> +                   (dir (string-append #$source subdir)))
>
> Maybe s/dir/source/?

Sure, done.

> Otherwise LGTM!

Great, thanks; pushed to master as 53f21642729e4786141c072dd835b04cb85dfe28

Greetings,
janneke

--=20
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com