From patchwork Tue May 2 00:27:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?6Lev6L6J?= X-Patchwork-Id: 12737 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 078BC27BBEA; Tue, 2 May 2023 01:28:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 E768027BBE2 for ; Tue, 2 May 2023 01:28:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ptdsE-0005MQ-1B; Mon, 01 May 2023 20:28:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptdsC-0005MB-Kp for guix-patches@gnu.org; Mon, 01 May 2023 20:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptdsA-0004CM-R2 for guix-patches@gnu.org; Mon, 01 May 2023 20:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ptdsA-00044P-4C for guix-patches@gnu.org; Mon, 01 May 2023 20:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63216] [PATCH 1/2] gnu: grpc: Add grpc-1.54.0. Resent-From: =?utf-8?b?6Lev6L6J?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 May 2023 00:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63216 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63216@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.168298725115595 (code B ref -1); Tue, 02 May 2023 00:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 May 2023 00:27:31 +0000 Received: from localhost ([127.0.0.1]:41254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptdrf-00043S-Cu for submit@debbugs.gnu.org; Mon, 01 May 2023 20:27:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:53880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptdrb-00043H-1X for submit@debbugs.gnu.org; Mon, 01 May 2023 20:27:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptdrY-0005J5-S2 for guix-patches@gnu.org; Mon, 01 May 2023 20:27:26 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptdrW-00043S-Tv for guix-patches@gnu.org; Mon, 01 May 2023 20:27:24 -0400 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-94ed7e49541so515596566b.1 for ; Mon, 01 May 2023 17:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682987239; x=1685579239; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=mI+DibTwZMnn6JylnhOyDMND9Gzlpf4QxEtdyWSjc5g=; b=lpsBfLOLZkxST8Ln1Oo0FdAKkB/+kdKfRRyBlLFqeC1sxxC4phH+VixDQA2DyIAkaE 7X3K1TfqXYVRlCyTgrNsW2ktDqALV3+jbBdLu83jaBBwC8X6FzxMdvMiffI1OkB/gbYO gN17R9ZznASDm97EX+HxdweKkbxG1mdZN5Jz6YOIU/s039jQzN78TZh+2/nP5j254VK9 mIkd3w8oOjKVKDpykkFBZkFxExKuHm99tft7THleF/vTmj0rSMBjopoHbwWzHy9f9+Y3 b1teYBo557cdfgfwtIhaJHpP+xs4lYsfzKz2f6eXO8blX5Iw+sk1jh4cv72KhW0NrNvf 81uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682987239; x=1685579239; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=mI+DibTwZMnn6JylnhOyDMND9Gzlpf4QxEtdyWSjc5g=; b=YyRihaz2InF7oKt4i5LlvBrTe5De0hCO1O33qWKRXLW+OoWpgREmF4/I3vzq65B5aJ qD2+MWZ7az4ETquACNrlKW9pcxBWrRvZK621cCUFcd0vn3stE9W1foEjsxCBXOyQZfWK GBr1f3SRE+uFHKziuVCDWaPjKIQrAF0DkJmrhCZSOnOK9gSTbM+0Nxjm81OMRhhWxNxJ tTMYvGhWG+1p9YshKW0Zhbn5MJV1+PZBhCyRALBQuFjjTJLfuuv2FNUbmnpdRkkF9595 hB3FZmdNOOjep0XI4J5RlcT/rKb9xLMY5wZ8t4h9vL7wJoH6K3x2+luo3SnVXp4wV1HP WURA== X-Gm-Message-State: AC+VfDy54pKfndq03b8xresb7CmRkEFprLtb2ZqRd/SqzdswJq8JSLbj aqsYxtzUsV0Y/YkDcLmO4jSpl8ndp54QJBG5bFtW92+efsZRcrOs X-Google-Smtp-Source: ACHHUZ6uOlCGvr2XT9/a3WNkGaf/S1BLwrYk02ZbfDtG+a9XBMJWN9jhJI7II801SKsQmeF8rW84ahmvAHOBU3PHetQ= X-Received: by 2002:a17:907:3e9a:b0:94a:5d5c:fe6f with SMTP id hs26-20020a1709073e9a00b0094a5d5cfe6fmr17905247ejc.47.1682987238800; Mon, 01 May 2023 17:27:18 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:6f02:a604:b0:48:2faa:70f5 with HTTP; Mon, 1 May 2023 17:27:18 -0700 (PDT) From: =?utf-8?b?6Lev6L6J?= Date: Tue, 2 May 2023 00:27:18 +0000 Message-ID: Received-SPF: pass client-ip=2a00:1450:4864:20::642; envelope-from=luhux76@gmail.com; helo=mail-ej1-x642.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From 9714c22de0359b0e062f85bf714887cb3534e4eb Mon Sep 17 00:00:00 2001 From: Lu Hui Date: Tue, 2 May 2023 08:20:49 +0800 Subject: [PATCH 1/2] gnu: grpc: Add grpc-1.54.0. * gnu/packages/rpc.scm (grpc-1.54.0): New variable. --- gnu/packages/rpc.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index a88c79f8b9..6dd2e29aed 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2023 Lu Hui ;;; ;;; This file is part of GNU Guix. ;;; @@ -142,6 +143,22 @@ (define-public grpc-for-python-grpcio (inputs (list abseil-cpp-20211102.0 c-ares/cmake openssl re2 zlib)))) +(define-public grpc-1.54.0 + (package + (inherit grpc) + (name "grpc") + (version "1.54.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/grpc/grpc") + (commit (string-append "v" version)) + (recursive? #true))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z627932z9p46yirnaaakshaz9z0szb9qbbp0br65iw5ijnznlar")))))) + ;; Some packages require this older version. (define-public grpc-1.16.1 (package From patchwork Tue May 2 00:28:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?6Lev6L6J?= X-Patchwork-Id: 12738 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 86A4E27BBEA; Tue, 2 May 2023 01:29:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 D79EB27BBE2 for ; Tue, 2 May 2023 01:29:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ptdtC-0005UD-FO; Mon, 01 May 2023 20:29:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptdt9-0005Tn-H8 for guix-patches@gnu.org; Mon, 01 May 2023 20:29:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptdt8-0004MX-Bp for guix-patches@gnu.org; Mon, 01 May 2023 20:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ptdt8-00046W-7a for guix-patches@gnu.org; Mon, 01 May 2023 20:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63217] [PATCH 2/2] gnu: bear: Fix build. Resent-From: =?utf-8?b?6Lev6L6J?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 May 2023 00:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63217 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63217@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.168298730315715 (code B ref -1); Tue, 02 May 2023 00:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 May 2023 00:28:23 +0000 Received: from localhost ([127.0.0.1]:41259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptdsU-00045O-Sk for submit@debbugs.gnu.org; Mon, 01 May 2023 20:28:23 -0400 Received: from lists.gnu.org ([209.51.188.17]:47552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptdsT-00045H-31 for submit@debbugs.gnu.org; Mon, 01 May 2023 20:28:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptdsS-0005Na-TS for guix-patches@gnu.org; Mon, 01 May 2023 20:28:20 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptdsR-0004HH-7z for guix-patches@gnu.org; Mon, 01 May 2023 20:28:20 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-50bcae898b2so1686764a12.0 for ; Mon, 01 May 2023 17:28:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682987297; x=1685579297; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=+ZMKkubc8jOFnUYEQ6iwEdlRq0aaJOfQBeEbKhZy2c4=; b=EDqdylakRICML6aVPFz4xF6nooJ62dhb8Fk1nCL0bmOnHBnAdU0ejZzoOdTdD6kKzE xbdYBnE+rerHYXuRpVRTU/05LeAV+ZhRRcz0UUwmOHAH8Y4KOujAXcPeMwJ7uyOU4UOE ph279LnVYSwkqm9Rw9HhHA22tk7M6hDUS+CtmeLP0xivs0cisWM15VOZsqeID8Xae15t 0xOWeqHJ28uVIjteFwJqfl0Xm+49aIFsycaY3Z0R13ECQklWetyVnlRzL0Y3mvN9ipDR GIoub7g4WLaKlOQTAE+UDvtTAByor2UusVGS6AEFuaCo7Qw2yPQmVnW08o0QCHnuX1px DMAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682987297; x=1685579297; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+ZMKkubc8jOFnUYEQ6iwEdlRq0aaJOfQBeEbKhZy2c4=; b=da393rgiAyF9avoylcPUTspPPGAUvSGW/7W3mW7tcrAw8cFwIuwliH4HgJROXVV8GC RhHKD18Qs1mVg93xrsD1rJrJ3uLxG8bD4B0utBqxRovBlk6B7H2VbkY+KvbKPChIn92G 5NJhlG6v7MVuH3s8qUR2UUJhUy8wd6lQUdoaE/TiUjpv6uQILI7u1UaaiTygVW+xZmhC S8h2XgUeHxb/v+IJk57ixc2YJ1Nv0TwMJiIThFlsqPKfYGWyDp1z6La8BcvAQ3+0rP6A m71adGlTCXVfbyi8nn3p5iMRjnEEBhArvPsM6IouHSP6q/9HR18x1KoejVWg/eC8ic6n 0kgA== X-Gm-Message-State: AC+VfDzBIWegKtWJykxyt0uyM1UA3yd48/V3U6Z/kMqqLMCrzVEdZN6q islERLK+OZ1giBcOPMUklGmfwsc6NJLnZ3Q9S2boXm9rNULX4O8J X-Google-Smtp-Source: ACHHUZ7ctdeuFZR/Wz6IaUFckicroLRkw6TxsRtrCFMgRH3YCwrFEWbSofK3Jz1ptYMe9p93nx56T6ORDpt9f46WkpY= X-Received: by 2002:aa7:c3d9:0:b0:4fe:19cb:4788 with SMTP id l25-20020aa7c3d9000000b004fe19cb4788mr6527542edr.42.1682987296618; Mon, 01 May 2023 17:28:16 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:6f02:a604:b0:48:2faa:70f5 with HTTP; Mon, 1 May 2023 17:28:16 -0700 (PDT) From: =?utf-8?b?6Lev6L6J?= Date: Tue, 2 May 2023 00:28:16 +0000 Message-ID: Received-SPF: pass client-ip=2a00:1450:4864:20::543; envelope-from=luhux76@gmail.com; helo=mail-ed1-x543.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From ecfd0eb5ac3962efb3404b699b2642006b37bd82 Mon Sep 17 00:00:00 2001 From: Lu Hui Date: Tue, 2 May 2023 08:22:39 +0800 Subject: [PATCH 2/2] gnu: bear: Fix build. * gnu/packages/build-tools.scm (bear)[inputs]: use grpc-1.54.0 --- gnu/packages/build-tools.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index bcca229466..b5666f4306 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 qblade ;;; Copyright © 2021, 2023 Maxim Cournoyer ;;; Copyright © 2022, 2023 Juliana Sims +;;; Copyright © 2023 Lu Hui ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,7 +119,7 @@ (define-public bam (define-public bear (package (name "bear") - (version "3.0.20") + (version "3.1.2") (source (origin (method git-fetch) @@ -127,7 +128,7 @@ (define-public bear (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0k89ccp9vz3x71w3r2wfpng9b8s0rxp4qr0ch9q32wq6y1ik847j")))) + (base32 "1iq0ciw3x2awpli4k9mhx80c442xbs70y4g6qpwrirbjw15q33n7")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -147,7 +148,7 @@ (define-public bear (inputs `(("c-ares" ,c-ares) ("fmt" ,fmt-8) - ("grpc" ,grpc) + ("grpc" ,grpc-1.54.0) ("json-modern-cxx" ,json-modern-cxx) ("protobuf" ,protobuf) ("python" ,python-wrapper)