Message ID | 20190427093659.21851-3-mail@brendan.scot |
---|---|
State | Accepted |
Headers | show |
Series | [bug#35446,01/26] gnu: Use 'license:' prefix in (gnu packages web). | expand |
Context | Check | Description |
---|---|---|
cbaines/applying patch | success | Successfully applied |
cbaines/applying patch | success | Successfully applied |
cbaines/applying patch | success | Successfully applied |
cbaines/applying patch | success | Successfully applied |
cbaines/applying patch | success | Successfully applied |
cbaines/applying patch | success | Successfully applied |
cbaines/applying patch | success | Successfully applied |
cbaines/applying patch | success | Successfully applied |
Hello, On Sat, Apr 27, 2019 at 07:36:36PM +1000, Brendan Tildesley wrote: > * gnu/packages/ebook.scm (calibre): Update to 3.41.3. This breaks the build > until my followup patches. could you prepare a minimal patch that updates calibre and includes all modifications to make it work? I think it will be desirable to be "atomic" in the sense that after every commit, we have a functioning Guix. Unbundling patches etc. can then come one by one, but again such that "guix build calibre" should work at all times. Thanks! Andreas PS: I considered applying some later patches like your change of e-mail address, but this one did not apply on current master, and then I thought that maybe it will be easier for you if I do not take patches out of order.
On 5/3/19 9:57 PM, Andreas Enge wrote: > Hello, > > On Sat, Apr 27, 2019 at 07:36:36PM +1000, Brendan Tildesley wrote: >> * gnu/packages/ebook.scm (calibre): Update to 3.41.3. This breaks the build >> until my followup patches. > could you prepare a minimal patch that updates calibre and includes all > modifications to make it work? I think it will be desirable to be "atomic" > in the sense that after every commit, we have a functioning Guix. > Unbundling patches etc. can then come one by one, but again such that > "guix build calibre" should work at all times. I ended up redoing the whole patch set, and fixed a small problems, and made sure it applies to the latest master. Actually Calibre 3.42.0 is out now so I added that on the end (its too difficult to rebase it back on to the original update to 3.41.3, so im sending both updates.). Also, in git send-email i accidentally set the last patch's char encoding to 'y', hopefully it doesn't break anything. > > Thanks! > > Andreas > > PS: I considered applying some later patches like your change of e-mail > address, but this one did not apply on current master, and then I > thought that maybe it will be easier for you if I do not take patches > out of order. >
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 99e49bc172..be30388b82 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -78,7 +78,7 @@ (define-public calibre (package (name "calibre") - (version "3.35.0") + (version "3.41.3") (source (origin (method url-fetch) @@ -87,7 +87,7 @@ version ".tar.xz")) (sha256 (base32 - "1gd15wjz4fhcra6d44xiy3hwbyk0miwb66a1pq5yldyy0hlb271z")) + "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra")) ;; Remove non-free or doubtful code, see ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils)))