From patchwork Sun Feb 16 00:33:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38653 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 2F98B27BBE2; Sun, 16 Feb 2025 00:37:33 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 56A7327BBE9 for ; Sun, 16 Feb 2025 00:37:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjSeh-0002kw-BG; Sat, 15 Feb 2025 19:37:07 -0500 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 1tjSee-0002gp-3J for guix-patches@gnu.org; Sat, 15 Feb 2025 19:37:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tjSed-0002BS-PC for guix-patches@gnu.org; Sat, 15 Feb 2025 19:37:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=fj9aXnuS67TQVp5HwJdX6PXQIu0UyPhCaWrXhnPexFo=; b=l3sE9WBQ5oW1Hakh0IeMUeC8/hPzM3lPwyuhVaZ08PHShi67t8CSIxnRy/aseiFmy+194OYjYzziHlTedkF1NkDRicjirVVFwKH+jg0htSJkFjtfl5EjWSSsyj2slPULcai60IieynMqq/6rOAzDnl6sCcrwpleFODidwPVF4GWmhekxkIUi3J2XWK8TkBUc3U6VoSX1OTeXhPRUEfJvwX/loWR+GTN6r243KRnuZ+JHIzdrjAvwRY5ad/jbtb57DpHFCJ6uhvlBHHNHeOyP7h6pix2KOk52uVqtGUKjfRXfQMQvGeYhuUpIWjS/gNE9g4YBBMG3AKGJ5M5D9AjXDQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tjSed-00042u-JN for guix-patches@gnu.org; Sat, 15 Feb 2025 19:37:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76314] [PATCH ruby-team 11/71] gnu: ruby-flores: Update to 0.0.8-0.92fded0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Feb 2025 00:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76314 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76314@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 76314-submit@debbugs.gnu.org id=B76314.173966619815297 (code B ref 76314); Sun, 16 Feb 2025 00:37:03 +0000 Received: (at 76314) by debbugs.gnu.org; 16 Feb 2025 00:36:38 +0000 Received: from localhost ([127.0.0.1]:58694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjSeD-0003yf-4s for submit@debbugs.gnu.org; Sat, 15 Feb 2025 19:36:37 -0500 Received: from 5.mo584.mail-out.ovh.net ([188.165.44.50]:46569) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tjSdu-0003wr-UM for 76314@debbugs.gnu.org; Sat, 15 Feb 2025 19:36:20 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.109.148.49]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4YwRfn1lR6z1QlM for <76314@debbugs.gnu.org>; Sun, 16 Feb 2025 00:36:17 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-6fk7v (unknown [10.110.101.93]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DB1D51FD33; Sun, 16 Feb 2025 00:36:16 +0000 (UTC) Received: from ngraves.fr ([37.59.142.114]) by ghost-submission-5b5ff79f4f-6fk7v with ESMTPSA id J4gNIQAzsWcEpgwAEg8sCw (envelope-from ); Sun, 16 Feb 2025 00:36:16 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-114S0087411ab8c-ec08-4011-bd45-eb5194894b7f, 9A8994E2D2D994E918F063C652E1CB4623A3A71F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.137.22 Date: Sun, 16 Feb 2025 01:33:39 +0100 Message-ID: <20250216003503.6348-11-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250216003503.6348-1-ngraves@ngraves.fr> References: <20250216003503.6348-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3675218773729796834 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdehgedtvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupddujeeirddujeelrddufeejrddvvddpfeejrdehledrudegvddruddugeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeeifedugeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=fj9aXnuS67TQVp5HwJdX6PXQIu0UyPhCaWrXhnPexFo=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739666177; v=1; b=fOlT6sT15xhWKwOK2QAq6myhbNIWEZsfqSSDXoYzIIp0qD+lIG4G7bvWid6VKNeUrqqRp6p7 C2si4tBfGbAS66udCruG6ejlITDQutyqx284XK/UqPw4BiDl04xhRMsbT/+7j6AIG0teep26T1T ilK02lGWtccVHbnC8zgc2WKGzBiTvRBwQpwOltcvfqZzK0544SpPgDpKmkr88bMc1M9HO3UJHFb sTGfLPQn44vTilwV6RXtG8katGxTkuOFELcSrV7lo5tYMocSV8lhX83MUd23VEHhJO92fCkJ4xK 3sjylF915ChYeqN6ERnbDrERq20CrKF6xGiPzGcT4TXOg== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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-flores): Update to 0.0.8-0.92fded0. [origin]: Move to git-fetch to be able to choose latest commit. Use snippet to list files in flores.gemspec. Record patch to fix deprecations. * gnu/local.mk: Record patch. * gnu/packages/patches/ruby-flores-fix-deprecations.patch: Add patch. --- gnu/local.mk | 1 + .../ruby-flores-fix-deprecations.patch | 38 +++++++++++++ gnu/packages/ruby.scm | 56 +++++++++++-------- 3 files changed, 72 insertions(+), 23 deletions(-) create mode 100644 gnu/packages/patches/ruby-flores-fix-deprecations.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8f88654ef6..ecb91de430 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2182,6 +2182,7 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-hydra-minimal-no-byebug.patch \ %D%/packages/patches/ruby-anystyle-data-immutable-install.patch \ %D%/packages/patches/ruby-anystyle-fix-dictionary-populate.patch \ + %D%/packages/patches/ruby-flores-fix-deprecations.patch \ %D%/packages/patches/ruby-latex-decode-fix-test.patch \ %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \ %D%/packages/patches/ruby-nokogiri.patch \ diff --git a/gnu/packages/patches/ruby-flores-fix-deprecations.patch b/gnu/packages/patches/ruby-flores-fix-deprecations.patch new file mode 100644 index 0000000000..036c308edf --- /dev/null +++ b/gnu/packages/patches/ruby-flores-fix-deprecations.patch @@ -0,0 +1,38 @@ +From b1c38d58d5e94df8c74c9c69c2f9b5841589a4bd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?C=C3=A9dric=20Boutillier?= +Date: Mon, 23 Sep 2024 23:47:22 +0200 +Subject: [PATCH] Replace deprecated Fixnum by Integer + +https://github.com/jordansissel/ruby-flores/pull/14 + +--- + lib/flores/random.rb | 2 +- + spec/flores/random_spec.rb | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/flores/random.rb b/lib/flores/random.rb +index e512b80..ec44f8b 100644 +--- a/lib/flores/random.rb ++++ b/lib/flores/random.rb +@@ -32,7 +32,7 @@ module Flores::Random + # * The length can be a number or a range `x..y`. If a range, it must be ascending (x < y) + # * Negative lengths are not permitted and will raise an ArgumentError + # +- # @param length [Fixnum or Range] the length of text to generate ++ # @param length [Integer or Range] the length of text to generate + # @return [String] the generated text + def self.text(length) + return text_range(length) if length.is_a?(Range) +diff --git a/spec/flores/random_spec.rb b/spec/flores/random_spec.rb +index 9e479fb..0e792c3 100644 +--- a/spec/flores/random_spec.rb ++++ b/spec/flores/random_spec.rb +@@ -108,7 +108,7 @@ + end + + describe "#integer" do +- it_behaves_like Numeric, Fixnum do ++ it_behaves_like Numeric, Integer do + subject { Flores::Random.integer(range) } + end + end diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9afd5590da..09d3ed9ee1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4583,30 +4583,40 @@ fiber, and defaults to a shared thread-local state.") (license license:expat))) (define-public ruby-flores - (package - (name "ruby-flores") - (version "0.0.8") - (source (origin - (method url-fetch) - (uri (rubygems-uri "flores" version)) - (sha256 - (base32 - "0pd8gqgy67rp1baq5r7himl0r9jzv5kqlhdmqh8wngynv548w2ai")))) - (build-system ruby-build-system) - (arguments - (list #:ruby ruby-2.7 - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ruby" (which "rspec")))))))) - (native-inputs (list ruby-rspec ruby-simplecov)) - (synopsis "Fuzzing, randomization, and stress testing library") - (description "Flores is a fuzzing, randomization, and stress library to + (let ((commit "92fded00b04b1e3d308edb7440d7b7ab2c89ab5e") + (revision "0")) + (package + (name "ruby-flores") + (version (git-version "0.0.8" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jordansissel/ruby-flores") + (commit commit))) + (sha256 + (base32 "0jvnw0jli2zzxklfk751vfbi4acf9lijppk67346j3b2qxqi8xms")) + (patches + (search-patches "ruby-flores-fix-deprecations.patch")))) + (build-system ruby-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-gemspec + (lambda _ + (substitute* "flores.gemspec" + ;; Since this is not a git repository, do not call 'git'. + (("git ls-files") "find . -type f |sort")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ruby" (which "rspec")))))))) + (native-inputs (list ruby-rspec ruby-simplecov)) + (synopsis "Fuzzing, randomization, and stress testing library") + (description "Flores is a fuzzing, randomization, and stress library to help tests uncover more bugs.") - (home-page "https://github.com/jordansissel/ruby-flores") - (license license:asl2.0))) + (home-page "https://github.com/jordansissel/ruby-flores") + (license license:asl2.0)))) (define-public ruby-ipaddr (package