From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pjotr Prins Subject: Re: [PATCH] gnu: Add slurm. Date: Sat, 13 Feb 2016 18:01:19 +0100 Message-ID: <20160213170119.GA19344@thebird.nl> References: <56bb7530.v5bvas2QpzoMjKMl%pjotr.public12@thebird.nl> <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> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUdaM-0007ir-Ia for guix-devel@gnu.org; Sat, 13 Feb 2016 12:02:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUdaJ-0000SI-7z for guix-devel@gnu.org; Sat, 13 Feb 2016 12:02:18 -0500 Received: from mail.thebird.nl ([95.154.246.10]:47609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUdaJ-0000S0-2P for guix-devel@gnu.org; Sat, 13 Feb 2016 12:02:15 -0500 Content-Disposition: inline In-Reply-To: <20160213164257.GA19241@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 05:42:57PM +0100, Pjotr Prins wrote: > > However, your patch still does not apply on top of master: > I am using a recent repo of guix. I did do a rebase and the patch applies > on my tree (as did the previous one). Is there no more information? git pull origin master >From git://git.savannah.gnu.org/guix * branch master -> FETCH_HEAD Updating a747bab..a42d99f Fast-forward gnu/packages/ebook.scm | 4 ++-- gnu/packages/maths.scm | 4 ++-- gnu/packages/ocaml.scm | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) bergamo:~/izip/git/opensource/scheme/guix$ git log commit a42d99f2843d3880cad2f20777b4bd1f969c38dd Author: Andreas Enge Date: Sat Feb 13 14:34:50 2016 +0100 gnu: calibre: Update to 2.51.0. * gnu/packages/ebook.scm (calibre): Update to 2.51.0. (i.e. latest) 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? I'll send it again after renaming the patch. --