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 <andr...@enge.fr>
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.
--
