From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: Re: [PATCH] gnu: Add p7zip. Date: Fri, 2 Sep 2016 14:12:05 +0200 Message-ID: References: <87oa51puzr.fsf@openmailbox.org> <878tw5el71.fsf@elephly.net> <87k2floj6v.fsf@openmailbox.org> <87r39hysdu.fsf@elephly.net> <87r39ge4pe.fsf@openmailbox.org> <87inumijn2.fsf@openmailbox.org> <87wpiwacrm.fsf@elephly.net> <874m5zipdq.fsf@openmailbox.org> <87mvjra2yq.fsf@elephly.net> <87zinrh24h.fsf@openmailbox.org> <20160902082657.GA4019@macbook42.flashner.co.il> <5C1179FB-7092-481F-A778-841ED20606CA@flashner.co.il> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bfnKV-0000UU-QO for guix-devel@gnu.org; Fri, 02 Sep 2016 08:12:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bfnKP-0000IM-RE for guix-devel@gnu.org; Fri, 02 Sep 2016 08:12:18 -0400 Received: from sinope02.bbbm.mdc-berlin.de ([141.80.25.24]:53933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bfnKP-0000IC-Ge for guix-devel@gnu.org; Fri, 02 Sep 2016 08:12:13 -0400 In-Reply-To: <5C1179FB-7092-481F-A778-841ED20606CA@flashner.co.il> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Efraim Flashner Cc: guix-devel@gnu.org Efraim Flashner writes: > On September 2, 2016 2:51:03 PM GMT+03:00, Ricardo Wurmus wrote: >> >>Efraim Flashner writes: >> >>> On Thu, Sep 01, 2016 at 03:05:34PM -0400, Kei Kebreau wrote: >>>> Ricardo Wurmus writes: >>>>=20 >>>> > Kei Kebreau writes: >>>> > >>>> >> Ricardo Wurmus writes: >>>> >> >>>> >>> Kei Kebreau writes: >>>> >>> >>>> >>>> Whoops, last patch was a bit messy and stacked on the previous >>one. This >>>> >>>> patch should be better! >>>> >>> >>>> >>> I just wanted to push a slightly modified version of this >>(attached) but >>>> >>> I cannot actually build the package. The patch to remove unused >>code >>>> >>> does not apply due to different line endings. >>>> >>> >>>> >>> Could you please take a look at this again and make sure that >>the patch >>>> >>> to the sources applies? >>>> >>> >>>> >>> ~~ Ricardo >>>> >>> >>>> >> I just tried it on my machine, and everything applied and built >>>> >> correctly from a clean Guix tree. I don't exactly know how to >>proceed >>>> >> From here. Perhaps a third party can try to build from the patch? >>>> > >>>> > The problem might be with the inline patch in the email. Don=E2=80= =99t >>know. >>>> > >>>> > ~~ Ricardo >>>>=20 >>>> I'll try sending it again, for lack of a better plan. If all else >>fails >>>> I can post it on paste.lisp.org. >> >>> Hunk #1 FAILED at 139 (different line endings). >>[...] >>> Hunk #1 FAILED at 47 (different line endings). >> >>These are the exact same errors I got. Maybe the line endings were >>converted automatically when you saved the patch with your editor? >> >>~~ Ricardo > > I opened the mail with mutt, passed the patch to "cd workspace/guix; gi= t am", which is my normal workflow Sorry, my reply was meant to be directed at Kei. ~~ Ricardo