From patchwork Sun Jul 9 05:57:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 51649 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 48D8227BBE9; Sun, 9 Jul 2023 06:59:41 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 B6E5327BBE2 for ; Sun, 9 Jul 2023 06:59:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qINRr-0006Ut-8t; Sun, 09 Jul 2023 01:59:07 -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 1qINRo-0006RS-QF for guix-patches@gnu.org; Sun, 09 Jul 2023 01:59: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 1qINRm-0005tL-Hb for guix-patches@gnu.org; Sun, 09 Jul 2023 01:59:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qINRm-0006QS-5r; Sun, 09 Jul 2023 01:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64538] [PATCH 4/6] gnu: ruby-rbnacl: Use new package style. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, guix-patches@gnu.org Resent-Date: Sun, 09 Jul 2023 05:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64538 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64538@debbugs.gnu.org Cc: gemmaro , Christopher Baines X-Debbugs-Original-Xcc: Christopher Baines Received: via spool by 64538-submit@debbugs.gnu.org id=B64538.168888230024618 (code B ref 64538); Sun, 09 Jul 2023 05:59:02 +0000 Received: (at 64538) by debbugs.gnu.org; 9 Jul 2023 05:58:20 +0000 Received: from localhost ([127.0.0.1]:45613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qINR6-0006Oz-47 for submit@debbugs.gnu.org; Sun, 09 Jul 2023 01:58:20 -0400 Received: from mail-pf1-f174.google.com ([209.85.210.174]:46512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qINR4-0006On-DX for 64538@debbugs.gnu.org; Sun, 09 Jul 2023 01:58:19 -0400 Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-668730696a4so1753294b3a.1 for <64538@debbugs.gnu.org>; Sat, 08 Jul 2023 22:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688882293; x=1691474293; 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=TffGsPIum+l2jmVlh0eKcxebjsYuD2jzrHpeZiQW/Wk=; b=ce11MWTfFrX9agSVTIfs5gyiJ6AhcZ5CbiW8qYtglSVy+LREAkBdT015JLcCbj/MOB 6eJA8az8fOJx7+sIsItumTcCWJg+cgUf+EYmPW48fSyi+mvjiHCJRQK+WzdwocURD7NL Na9D8qZAOa96LGzi1zrjmYWqAwSIngmvcPHQYnf6UqNevZL9b2iDqN6DfHrxYt0F/VNf C7ORzQ9iGvabczb/Q2Yi09v4Oc0npZdO5WmgqqfSNlET0/WWN0dlAFnYTkrE/ZQisyya O7FFTiWNfElpU1rwpoZ4RD0BmemhJmlfGvfRanE1Er34C5dpiMQKK2pKmuw88QGpiQBp N3sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688882293; x=1691474293; 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=TffGsPIum+l2jmVlh0eKcxebjsYuD2jzrHpeZiQW/Wk=; b=lPvrWC8/0LpifuCqwV5pissRlOc6YYoSh0C54u4/fdarjfHsejzYs1Z1lRD6BLI0Aq zbksocDuzV8wt+8L2kn3j1Iafl6m4/dNU2SPZkxRpODEwycTzaqa2gNxM+jIN42usS6f o61Y5PChO4QiYFDjupIVNchP2sGaJCT7v1BAsf5DoQ77Xca1DJG5OYYdWOJ8GMk51wOk cBi/BYD2IAWovtcUGye2GMLYIGN/cMWUe37iVCbG+IffX4VdwHE+RQRTujqYjwfmN0YV W92BeWWV4tcip28g5TluVMlNQ2FaxXxih+ICx7x2IN8QJrOJSV9vejzgX6cScaWUxldB SxeQ== X-Gm-Message-State: ABy/qLbJFRxyXD8WRy4YpkH0DEfQ9cUlDxwq+JkJhxxtZ+EqQ2DN/cZt LGgKnSiEJvxHn9/Ln/neLkesxReuet6clw== X-Google-Smtp-Source: APBJJlFCIQ+gUDVd8ptksEHClvC6z2/ml4vOAL265garwwZuh9aixwDtJ1om6G5HC6Qb85y1Z0UFZA== X-Received: by 2002:a05:6a21:7899:b0:12f:85cd:ba10 with SMTP id bf25-20020a056a21789900b0012f85cdba10mr9590710pzc.58.1688882292719; Sat, 08 Jul 2023 22:58:12 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id ey2-20020a056a0038c200b006828a3c259fsm5055304pfb.104.2023.07.08.22.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 22:58:12 -0700 (PDT) From: gemmaro Date: Sun, 9 Jul 2023 14:57:20 +0900 Message-ID: <578ced5791c8ac1f8134e4bb713e702731214298.1688881346.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/ruby.scm (ruby-rbnacl): Use new package style. [arguments]: Use gexp. [source, propagated-inputs, inputs, native-inputs]: Restyle format. --- gnu/packages/ruby.scm | 81 +++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 161218ba14..dd434efb52 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3166,50 +3166,47 @@ (define-public ruby-rbnacl (package (name "ruby-rbnacl") (version "7.1.1") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "rbnacl" version)) - (sha256 - (base32 - "0y8yzianlkc9w6sbqy8iy8l0yym0y6x7p5rjflkfixq76fqmhvzk")))) + (source (origin + (method url-fetch) + (uri (rubygems-uri "rbnacl" version)) + (sha256 + (base32 + "0y8yzianlkc9w6sbqy8iy8l0yym0y6x7p5rjflkfixq76fqmhvzk")))) (build-system ruby-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-unnecessary-dependencies - (lambda _ - ;; Coveralls relates to a network service, and Rubocop to code - ;; linting and both are unnecessary to run the tests - (substitute* "Gemfile" - ((".*rubocop.*") "\n") - ((".*guard-rspec.*") "\n") - ((".*coveralls.*") "\n")) - (substitute* "spec/spec_helper.rb" - (("require \"coveralls\"") "") - (("Coveralls.wear!") "")) - #t)) - (add-after 'unpack 'use-libsodium-from-store - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("lib/rbnacl/init.rb" - "lib/rbnacl/sodium.rb") - (("ffi_lib \\[.+\\]") - (string-append "ffi_lib [\"" - (assoc-ref inputs "libsodium") "/lib/libsodium.so" - "\"]"))) - #t)) - ;; Run Rspec directly to avoid the Rubocop dependency in the Rakefile - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "rspec")) - #t))))) - (propagated-inputs - (list ruby-ffi)) - (inputs - (list libsodium)) - (native-inputs - (list bundler ruby-rspec)) + (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'remove-unnecessary-dependencies + (lambda _ + ;; Coveralls relates to a network service, and Rubocop to code + ;; linting and both are unnecessary to run the tests + (substitute* "Gemfile" + ((".*rubocop.*") + "\n") + ((".*guard-rspec.*") + "\n") + ((".*coveralls.*") + "\n")) + (substitute* "spec/spec_helper.rb" + (("require \"coveralls\"") + "") + (("Coveralls.wear!") + "")) #t)) + (add-after 'unpack 'use-libsodium-from-store + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("lib/rbnacl/init.rb" + "lib/rbnacl/sodium.rb") + (("ffi_lib \\[.+\\]") + (string-append "ffi_lib [\"" + (assoc-ref inputs "libsodium") + "/lib/libsodium.so" "\"]"))) #t)) + ;; Run Rspec directly to avoid the Rubocop dependency in the Rakefile + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) #t))))) + (propagated-inputs (list ruby-ffi)) + (inputs (list libsodium)) + (native-inputs (list bundler ruby-rspec)) (synopsis "Ruby FFI binding to libsodium") (description "This package provides Ruby FFI bindings to the Networking and