Subject: bug#53867: closed (Re: [bug#53867] [PATCH] update python-flask-babel and fix searx build)

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 09 Feb 2022 14:36:02 +0000

Your bug report

#53867: [PATCH] update python-flask-babel and fix searx build

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
53867: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=53867
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#53867] [PATCH] update python-flask-babel and fix searx build
From: Nicolas Goaziou <[email-masked]>
To: kiasoc5--- via Guix-patches via <[email-masked]>
Cc: [email-masked], [email-masked]
Date: Wed, 09 Feb 2022 15:35:03 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello,

kiasoc5--- via Guix-patches via <[email-masked]> writes:

> Patch 2 fixes the sanity check for searx.

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou

Subject: [PATCH] update python-flask-babel and fix searx build
From: [email-masked]
To: Guix Patches <[email-masked]>
Date: Tue, 8 Feb 2022 05:16:40 +0100 (CET)
List-Id: <debbugs-submit.debbugs.gnu.org>

Patch 2 fixes the sanity check for searx.
>From 1faf5693b773d1ebff9566cc7e17613a370ff0e8 Mon Sep 17 00:00:00 2001
From: kiasoc5 <[email-masked]>
Date: Mon, 7 Feb 2022 10:15:06 -0500
Subject: [PATCH 1/2] gnu: python-flask-babel: Update to 2.0.0.

* gnu/packages/python-web.scm (python-flask-babel): Update to 2.0.0.
---
 gnu/packages/python-web.scm | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 408d7f6571..8c638ce439 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1112,21 +1112,15 @@ (define-public python-flask-assets
 (define-public python-flask-babel
   (package
     (name "python-flask-babel")
-    (version "1.0.0")
+    (version "2.0.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "Flask-Babel" version))
         (sha256
           (base32
-            "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn"))))
+            "0z95v77vib5il8hphyh16n7i15a2gmc06i615vm346ifvdfg9ypr"))))
     (build-system python-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda _
-                      (with-directory-excursion "tests"
-                        (invoke "python" "tests.py")))))))
     (propagated-inputs
      (list python-flask python-babel python-jinja2 python-pytz))
     (home-page "https://github.com/python-babel/flask-babel")

base-commit: 4396fef04717eebb061b2c808087ca638f87a826
-- 
2.35.1

>From 92627bdf98793cd0195c3dcacb822cd70bb53bb3 Mon Sep 17 00:00:00 2001
From: kiasoc5 <[email-masked]>
Date: Mon, 7 Feb 2022 10:31:13 -0500
Subject: [PATCH 2/2] gnu: searx: Fix build.

* gnu/packages/search.scm (searx)[arguments]<#:phases>: Simplify relax-requirements phase for updated dependencies. Add phase to allow sanity check to pass.
---
 gnu/packages/search.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index ea1c555201..12879900dd 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -243,16 +243,15 @@ (define-public searx
        (modify-phases %standard-phases
          (add-after 'unpack 'relax-requirements
            (lambda _
-             ;; These packages are outdated in Guix at the time of packaging.
-             ;; When they are updated, remove corresponding substitutions.
              ;; Tests can run after build with 'searx-checker' tool in /bin.
+             ;; allow using a higher dependency version
              (substitute* "requirements.txt"
-               (("flask-babel==2.0.0") "flask-babel>=1.0.0")
-               (("jinja2==2.11.3") "jinja2>=2.11.2")
-               (("lxml==4.6.3") "lxml>=4.4.2")
-               (("pygments==2.8.0") "pygments>=2.7.3")
-               (("requests\\[socks\\]==2.25.1") "requests>=2.25")
-               (("==") ">=")))))))
+               (("==") ">="))))
+         (add-before 'sanity-check 'set-debug
+           (lambda _
+             ;; the user will need to change the secret key
+             ;; https://github.com/searx/searx/issues/2278
+             (setenv "SEARX_DEBUG" "1"))))))
     (propagated-inputs
      (list python-babel
            python-certifi
-- 
2.35.1