[bug#33593] [PATCH 1/3] gnu: python-regex, python2-regex: Update to 2018.11.22.

[bug#33593] [PATCH 1/3] gnu: python-regex, python2-regex: Update to 2018.11.22.

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 112 bytes --]

I could not figure out how to get the tests working, but I updated this
for a calibre test which worked ok.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-python-regex-python2-regex-Update-to-2018.11.22.patch --]
[-- Type: text/x-patch; name="0001-gnu-python-regex-python2-regex-Update-to-2018.11.22.patch", Size: 1377 bytes --]

From ab73ed73c76da6ac98856d2b7f576f535d2629b7 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Fri, 30 Nov 2018 16:39:23 +1100
Subject: [PATCH 1/3] gnu: python-regex, python2-regex: Update to 2018.11.22.

* gnu/packages/python.scm (python-regex, python2-regex): Update to 2018.11.22.
---
 gnu/packages/python.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3168e0f89d..f893a21e32 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12465,13 +12465,15 @@ window memory map manager.")
 (define-public python-regex
   (package
     (name "python-regex")
-    (version "2017.06.07")
+    (version "2018.11.22")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "regex" version))
               (sha256
                (base32
-                "06r6b7yigikbj3a72whl85r2b64pj1r0ypmw9yalmkm0wnxq8mz4"))))
+                "0gxslhjx9qgxqbbassbdc7v3lx1vbvbh33421vmi4fzfs47ad9kr"))))
+    ;; TODO: Fix and enable regex_test.py tests that complain about the
+    ;; test.support module not existing.
     (build-system python-build-system)
     (home-page "https://bitbucket.org/mrabarnett/mrab-regex")
     (synopsis "Alternative regular expression module")
-- 
2.19.1

[bug#33593] [PATCH 2/3] gnu: calibre: Update to 3.34.0.

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0002-gnu-calibre-Update-to-3.34.0.patch --]
[-- Type: text/x-patch, Size: 1121 bytes --]

From fb6fd7c11d965deff1017f2615f5dd0ce8b8d606 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 2 Dec 2018 13:31:41 +1100
Subject: [PATCH 2/3] gnu: calibre: Update to 3.34.0.

* gnu/packages/ebooks.scm: (calibre): Update to 3.34.0.
---
 gnu/packages/ebook.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index a78e3e871f..0ab07ed738 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -75,7 +75,7 @@
 (define-public calibre
   (package
     (name "calibre")
-    (version "3.28.0")
+    (version "3.34.0")
     (source
       (origin
         (method url-fetch)
@@ -84,7 +84,7 @@
                             version ".tar.xz"))
         (sha256
          (base32
-          "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414"))
+          "06hvilkiawq2xw6iya56979gyrh8417zxwzmzk2qalvac7xf1w5z"))
         ;; Remove non-free or doubtful code, see
         ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
         (modules '((guix build utils)))
-- 
2.19.1

[bug#33593] [PATCH 3/3] gnu: calibre: Remove unused dependencies.

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0003-gnu-calibre-Remove-unused-dependencies.patch --]
[-- Type: text/x-patch, Size: 1230 bytes --]

From 0be9e8ca365fe38501480ac488fafb7fef644a0a Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 2 Dec 2018 19:52:57 +1100
Subject: [PATCH 3/3] gnu: calibre: Remove unused dependencies.

* gnu/packages/ebooks.scm (calibre): [inputs]: remove python2-cssselect,
  python2-pillow.
---
 gnu/packages/ebook.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 0ab07ed738..2612183bc8 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -125,7 +125,6 @@
        ("python" ,python-2)
        ("python2-apsw" ,python2-apsw)
        ("python2-chardet" ,python2-chardet)
-       ("python2-cssselect" ,python2-cssselect)
        ("python2-cssutils" ,python2-cssutils)
        ("python2-dateutil" ,python2-dateutil)
        ("python2-dbus" ,python2-dbus)
@@ -139,7 +138,6 @@
        ;; python2-msgpack is needed for the network content server to work.
        ("python2-msgpack" ,python2-msgpack)
        ("python2-netifaces" ,python2-netifaces)
-       ("python2-pillow" ,python2-pillow)
        ("python2-pygments" ,python2-pygments)
        ("python2-pyqt" ,python2-pyqt)
        ("python2-sip" ,python2-sip)
-- 
2.19.1

[bug#33593] [PATCH] gnu: calibre: Update to 3.35.0.

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 23 bytes --]

3.35.0 is out already.

[-- Attachment #2: 0001-gnu-calibre-Update-to-3.35.0.patch --]
[-- Type: text/x-patch, Size: 1117 bytes --]

From bf08de4e524ca20d69f0de0d4479ad24f7e16b03 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 2 Dec 2018 13:31:41 +1100
Subject: [PATCH] gnu: calibre: Update to 3.35.0.

* gnu/packages/ebooks.scm: (calibre): Update to 3.35.0.
---
 gnu/packages/ebook.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index a78e3e871f..e750c6cac8 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -75,7 +75,7 @@
 (define-public calibre
   (package
     (name "calibre")
-    (version "3.28.0")
+    (version "3.35.0")
     (source
       (origin
         (method url-fetch)
@@ -84,7 +84,7 @@
                             version ".tar.xz"))
         (sha256
          (base32
-          "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414"))
+          "1gd15wjz4fhcra6d44xiy3hwbyk0miwb66a1pq5yldyy0hlb271z"))
         ;; Remove non-free or doubtful code, see
         ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
         (modules '((guix build utils)))
-- 
2.19.2

bug#33593: [PATCH] gnu: calibre: Update to 3.35.0.

[Andreas Enge]

On Fri, Dec 07, 2018 at 08:27:44PM +1100, Brendan Tildesley wrote:
> 3.35.0 is out already.

It builds and works, applied in commit ec60c3a58137ddb3c135999c3e7ccb90d51e3185.
Thanks!

Andreas