From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Enge Subject: Re: [PATCH] gnu: Add slurm. Date: Sat, 13 Feb 2016 18:20:01 +0100 Message-ID: <20160213172001.GA3956@debian> References: <20160210220447.0917f1a1@openmailbox.org> <20160211081534.GA8987@thebird.nl> <20160212122042.GA14275@thebird.nl> <20160212123010.GA6019@debian.eduroam.u-bordeaux.fr> <20160212123141.GB14324@thebird.nl> <20160212125719.GA14615@thebird.nl> <20160213085940.GA18223@thebird.nl> <20160213102825.GA19194@debian> <20160213164257.GA19241@thebird.nl> <20160213170119.GA19344@thebird.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUdrd-0003fd-Vg for guix-devel@gnu.org; Sat, 13 Feb 2016 12:20:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUdra-0005ZB-QO for guix-devel@gnu.org; Sat, 13 Feb 2016 12:20:09 -0500 Received: from mailrelay6.public.one.com ([91.198.169.200]:27535) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUdra-0005Xq-E0 for guix-devel@gnu.org; Sat, 13 Feb 2016 12:20:06 -0500 Content-Disposition: inline In-Reply-To: <20160213170119.GA19344@thebird.nl> 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Pjotr Prins Cc: guix-devel@gnu.org On Sat, Feb 13, 2016 at 06:01:19PM +0100, Pjotr Prins wrote: > cat 0001-gnu-Add-slurm.patch |patch -p1 # same patch, different name > patching file gnu/packages/parallel.scm > patching file gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch > Works fine. Maybe because I used an attachment previously? No, that should not be a problem (after I removed the first line ">From..." of the attachment). I still get: patching file gnu/packages/parallel.scm Hunk #1 FAILED at 2. 1 out of 3 hunks FAILED -- saving rejects to file gnu/packages/parallel.scm.rej patching file gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch The thing that does not work is adding your copyright line. Very strange; we seem to have the same white-space in the file. Andreas