From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZd9b-0001R6-DG for guix-patches@gnu.org; Mon, 24 Jul 2017 09:12:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZd9W-0001WE-9G for guix-patches@gnu.org; Mon, 24 Jul 2017 09:12:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51259) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZd9W-0001Vu-6E for guix-patches@gnu.org; Mon, 24 Jul 2017 09:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dZd9V-0001Ul-SE for guix-patches@gnu.org; Mon, 24 Jul 2017 09:12:01 -0400 Subject: [bug#26684] let nginx configs reference the store Resent-Message-ID: References: <87pofp7dk5.fsf@lassieur.org> <87wp6ykmyx.fsf@gnu.org> From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur In-reply-to: <87wp6ykmyx.fsf@gnu.org> Date: Mon, 24 Jul 2017 15:11:40 +0200 Message-ID: <87mv7uq8s3.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: Andy Wingo , 26684@debbugs.gnu.org Ludovic Courtès writes: > Christopher, Clément: I wanted to apply this patch from Andy but it > conflicts with recent changes, presumably commit cb341293fa by Chris. > Could you take a look and apply it, if possible? > > https://bugs.gnu.org/26684 Hi Ludo, Sure, I'll have a look at it, probably this week-end. I remember I fixed the conflict on my local branch. I haven't been very active those last weeks, but I hope to be back soon. :) Clément