From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id ALL4LOyqGGR1KQAASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 19:50:20 +0100 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id qHj9LOyqGGRoFQAA9RJhRA (envelope-from ) for ; Mon, 20 Mar 2023 19:50:20 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id 5209937716 for ; Mon, 20 Mar 2023 19:50:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJMc-00042M-Kp; Mon, 20 Mar 2023 13:32: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 1peJMb-00041G-Uz for guix-patches@gnu.org; Mon, 20 Mar 2023 13:32:05 -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 1peJMa-00009I-TT for guix-patches@gnu.org; Mon, 20 Mar 2023 13:32:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJMa-0004wM-PH for guix-patches@gnu.org; Mon, 20 Mar 2023 13:32:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 181/223] gnu: ruby-protobuf: Update to 3.10.3. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:32:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62196@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 62196-submit@debbugs.gnu.org id=B62196.167933351018899 (code B ref 62196); Mon, 20 Mar 2023 17:32:04 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:31:50 +0000 Received: from localhost ([127.0.0.1]:56469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJML-0004uf-JB for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:31:50 -0400 Received: from mail-vs1-f45.google.com ([209.85.217.45]:42518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJMH-0004u4-75 for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:31:45 -0400 Received: by mail-vs1-f45.google.com with SMTP id d2so4945179vso.9 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:31:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333499; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZLGp9FlyYdWUWqbOMtrRxxoadP6x8Z8u9m2VPMVv0Bc=; b=AK3Kynmwj3ox2M058rFij0bloNOQtIuTl8IMOG5/xWAoUDM304Eac4gCyftKx66wTN HIsUWLSVqGIVFshggvjhuInwuC2i8n73wssp3Zpj5THWVmLwcqRKOJ/rQXQlOE2wZHu4 uflkUewA1TUBJZFwnho0px5hN//5TdVOtdMzZv8Dnr91rVOmQwhjk0dzZ7GqzCSWuO7F 61+gTS8Zcuze8o6dO5jsH6uW25y2+TmGblKMH83bM1q0lEo4fEgXSiFfMYGus8CPoYpS uOMuXhqAZLZj1RspmyCxBANLF/TLsaqyh0CPcBHnDFeaUmu8YhLe+dH22mqYIv0g+ks1 FZtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333499; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZLGp9FlyYdWUWqbOMtrRxxoadP6x8Z8u9m2VPMVv0Bc=; b=P0OLo7GbCE8R+xkhcvTEHAvxNb3bfhBvIvCxF27k9K+k+BoSc9U32ioPSCZUl3E3Kx BaPE1Fq1pQnTUhjluZrMXpakqU8DwOwdW2gO4ujS0ch29QFRSAOoLr1oVPMsD/+/bAZI PMiE1ljAsFehe7sTFIX56dzz+i3mu669eJRbpqN58uiI6/LJzbItFWmvLBfyEJt8YOZc ZEvzYCgDH7lOT3iIdB6cCteqqPSz7BzPvhY+3bk+HJDbmhBdHBQ/2BiUP3fQRlLyxgmS yFCjHqc81R5+2xozTZiR2oQGRi9fThsO8T5z64oZzcnAmLeAOzN1kve6KfVLZIAzpn/w NdQg== X-Gm-Message-State: AO0yUKUul1Nkv4VKWfNIbhvshTkl8B3qG5diogLM6tMBZoUIGriRRpp8 AVeT/j7UCcgWQjf1fNZHZ37FPvHhK08= X-Google-Smtp-Source: AK7set9cyb9q+1iUWZRdjPFGIH3Xv7ehjPPgEZ1dmuoUCqi2bqvv/p5hKDD5jDC52tsomLxj4XvD7w== X-Received: by 2002:a05:6214:40f:b0:5a8:d23e:9ab2 with SMTP id z15-20020a056214040f00b005a8d23e9ab2mr53080605qvx.16.1679333109624; Mon, 20 Mar 2023 10:25:09 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id i7-20020a378607000000b007422eee8058sm7769352qkd.125.2023.03.20.10.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:25:09 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:23:07 -0400 Message-Id: <20230320172349.12752-80-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172349.12752-1-maxim.cournoyer@gmail.com> References: <20230320172349.12752-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679338220; a=rsa-sha256; cv=none; b=B5OGPm4D+rUrAiAwbvQKgqn8ihrEv+EdLVP1frf+vj4g8ftF/fESuttonbl2eKOR1171aX PuKCCU87Lst2bw/vWRbSDLzjSSYFnVqkBMH3H4g0IZOa6rYW0GIJvefX63dI4pT5DpHb4n 0jt4Eq3kWKELyyLEYLZONDjhEe37eJl9jptBzu7tKh2HDrQF5Gixm4bR30qvm+9kthoRUH FPxaMBSxX2PE51Y9aDCIfsm7OPEwRG8JW8bYSVzWhWl5gSFE/LBF11uKOJrpfRm80Wg20O GdesCErUQau3+VAJZtbtF1aK0safyenOXynLzXrxMw7XsNTs5KVUNmJEu0hJVQ== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=AK3Kynmw; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679338220; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ZLGp9FlyYdWUWqbOMtrRxxoadP6x8Z8u9m2VPMVv0Bc=; b=rniUG1R2d476q4t1tpSORBsOqylwpNkqZeU2ONyGA9b3IpHGZoKy0onO2iw9kn0wSUkZCQ zaWCAKwDGA5+pMO6bhtDlm/NJV2zZ2qoqQxFRmhOTx1/zEGGsFtvFfmMBnxcGFJGBgG4QT flfW2FIOvco/DmxjGhyz+XhykhncPzOYwteaqSexeoMC4qY/DxdIsczSJ0dMgrz3kXnI07 B1Oy+e9t5VtLS4/R20Xu2MsBopNWug4QCVFcrgY47YwLfqZxwaozdm3pe6V84oKaabG5HK h4SWrTdTntVJrgbCWFjDhpcciD7U0cUnnmd0U4h+kEhl5qZR7zxqtUyMtc6CFA== X-Migadu-Spam-Score: 5.75 X-Spam-Score: 5.75 X-Migadu-Queue-Id: 5209937716 Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=AK3Kynmw; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: lIMIdhxUHTw9 * gnu/packages/protobuf.scm (ruby-protobuf): Update to 3.10.3. Delete trailing #t. [arguments]: Use search-input-file in patch-protoc phase. Honor #:tests? in check phase. --- gnu/packages/protobuf.scm | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index a746b7de9c..82cf8f452d 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017, 2018, 2019, 2022 Ricardo Wurmus ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Felix Gruber @@ -513,7 +513,7 @@ (define-public emacs-protobuf-mode (define-public ruby-protobuf (package (name "ruby-protobuf") - (version "3.10.3") + (version "3.10.7") (source (origin (method git-fetch) (uri (git-reference @@ -522,7 +522,7 @@ (define-public ruby-protobuf (file-name (git-file-name name version)) (sha256 (base32 - "1yzz7jgpp6qip5d6qhzbkf5gqaydfk3z3c1ngccwzp6w6wa75g8a")))) + "12hp1clg83jfl35x1h2ymzpj5w83wrnqw7hjfc6mqa8lsvpw535r")))) (build-system ruby-build-system) (arguments `(#:phases @@ -530,8 +530,7 @@ (define-public ruby-protobuf (add-after 'unpack 'do-not-use-bundler-for-tests (lambda _ (substitute* "spec/spec_helper.rb" - (("Bundler\\.setup.*") "")) - #t)) + (("Bundler\\.setup.*") "")))) (add-after 'unpack 'relax-version-requirements (lambda _ (substitute* ((@@ (guix build ruby-build-system) first-gemspec)) @@ -540,33 +539,30 @@ (define-public ruby-protobuf (("\"rubocop\",.*") "'rubocop'\n") (("\"parser\",.*") - "'parser'\n")) - #t)) + "'parser'\n")))) (add-after 'unpack 'patch-protoc (lambda* (#:key inputs #:allow-other-keys) - (let ((protoc (assoc-ref inputs "protobuf"))) - (substitute* "lib/protobuf/tasks/compile.rake" - (("\"protoc\"") - (string-append "\"" protoc "/bin/protoc" "\""))) - #t))) + (substitute* "lib/protobuf/tasks/compile.rake" + (("\"protoc\"") + (string-append "\"" (search-input-file inputs "bin/protoc") + "\""))))) (add-after 'unpack 'skip-failing-test ;; See: https://github.com/ruby-protobuf/protobuf/issues/419 (lambda _ (substitute* "spec/lib/protobuf/rpc/connectors/ping_spec.rb" (("expect\\(::IO\\)\\.to receive\\(:select\\).*" all) - (string-append " pending\n" all))) - #t)) + (string-append " pending\n" all))))) (add-after 'replace-git-ls-files 'replace-more-git-ls-files (lambda _ (substitute* ((@@ (guix build ruby-build-system) first-gemspec)) (("`git ls-files -- \\{test,spec,features\\}/*`") "`find test spec features -type f | sort`") (("`git ls-files -- bin/*`") - "`find bin -type f | sort`")) - #t)) + "`find bin -type f | sort`")))) (replace 'check - (lambda _ - (invoke "rspec")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec"))))))) (native-inputs (list ruby-benchmark-ips ruby-ffi-rzmq @@ -584,7 +580,10 @@ (define-public ruby-protobuf (inputs (list protobuf)) (propagated-inputs - (list ruby-activesupport ruby-middleware ruby-thor ruby-thread-safe)) + (list ruby-activesupport + ruby-middleware + ruby-thor + ruby-thread-safe)) (home-page "https://github.com/ruby-protobuf/protobuf") (synopsis "Implementation of Google's Protocol Buffers in Ruby") (description "Protobuf is an implementation of Google's Protocol Buffers -- 2.39.1