From patchwork Tue Feb 8 04:16:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 37079 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1AEC227BBE9; Tue, 8 Feb 2022 04:17:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 96B8C27BBEA for ; Tue, 8 Feb 2022 04:17:11 +0000 (GMT) Received: from localhost ([::1]:33306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHHwE-0003bP-L8 for patchwork@mira.cbaines.net; Mon, 07 Feb 2022 23:17:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHHw6-0003ZC-T8 for guix-patches@gnu.org; Mon, 07 Feb 2022 23:17:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50736) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHHw6-0000YV-JY for guix-patches@gnu.org; Mon, 07 Feb 2022 23:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHHw6-0001sB-Fq for guix-patches@gnu.org; Mon, 07 Feb 2022 23:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53867] [PATCH] update python-flask-babel and fix searx build Resent-From: kiasoc5@tutanota.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 04:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53867 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53867@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.16442938126651 (code B ref -1); Tue, 08 Feb 2022 04:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Feb 2022 04:16:52 +0000 Received: from localhost ([127.0.0.1]:44633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHHvv-0001iv-Vy for submit@debbugs.gnu.org; Mon, 07 Feb 2022 23:16:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:35186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHHvr-0001f2-00 for submit@debbugs.gnu.org; Mon, 07 Feb 2022 23:16:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHHvq-0003R8-P0 for guix-patches@gnu.org; Mon, 07 Feb 2022 23:16:46 -0500 Received: from w1.tutanota.de ([81.3.6.162]:50238) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHHvo-0000ST-0s for guix-patches@gnu.org; Mon, 07 Feb 2022 23:16:46 -0500 Received: from w3.tutanota.de (unknown [192.168.1.164]) by w1.tutanota.de (Postfix) with ESMTP id BC7CFFBF4A2 for ; Tue, 8 Feb 2022 04:16:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1644293800; s=s1; d=tutanota.com; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=RyUuZB/9byWeODzKKqjN51Zb7td8jnrIDxSaUmO/a+k=; b=yk6IcnJKb7HYpGETqQldR2reR3czRRr/3XcU7w19hP3Z5NCWGgLvLYOaL3NzPqJu F5dHfSCtDstlp+CUvOmB/S9n6bKojC4RGoqVBXLCmSNnuhxZsW2rIoELZzLotPy8h1g 2BQ7jkQkxeaKlvriFok6i7f86nK3hZBO/Ao68DzDu5eNmgeS7yeiu/DXSK9l3gStIwZ IIUARARAMoRjCfjWGv5LPsrIQx9ygKE0ZWC2PbGqvgMeXeNaQ6lvqgOfhgaliiEZFTf GeVwBh01M7JXQJdyDOI8rOOFASYnni4dnRjFt0OyVlKm4vy/3vJo7wpaDXHpg2k5EX9 v37kZkFHqw== Date: Tue, 8 Feb 2022 05:16:40 +0100 (CET) Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=81.3.6.162; envelope-from=kiasoc5@tutanota.com; helo=w1.tutanota.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: kiasoc5@tutanota.com X-ACL-Warn: , kiasoc5--- via Guix-patches X-Patchwork-Original-From: kiasoc5--- via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches Patch 2 fixes the sanity check for searx. From 92627bdf98793cd0195c3dcacb822cd70bb53bb3 Mon Sep 17 00:00:00 2001 From: kiasoc5 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