From patchwork Tue Jan 21 18:36:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 37351 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 E59F427BBEA; Tue, 21 Jan 2025 18:44:54 +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=-6.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 0ACA627BBE2 for ; Tue, 21 Jan 2025 18:44:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1taJEy-0000Ia-CR; Tue, 21 Jan 2025 13:44:46 -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 1taJEN-0008Po-1k for guix-patches@gnu.org; Tue, 21 Jan 2025 13:44:08 -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 1taJEL-0004DA-7b for guix-patches@gnu.org; Tue, 21 Jan 2025 13:44:06 -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=+6FsM1uccoOjk+I/9PrALHlC0+ng9R42q/kRPD6iqxQ=; b=BeMJLxbtkZy50//JFj9wtbLlE74/SjdhxNaMbsQrkZSluvltaVa8qrS27vmLCzq27KL0cp8BDHhB1wsImREsSmHQbvsR1I0CUlWup7jXCS/YU9rKJ4Yo+ZEkvd7/gtKWxeiRd6Y704pYwLFhYUsCYaZT7LGp1VOToTFpGu8V/rqXOlWxeJ5JCT8rxah8QpUrFuok6CvAlQMoUOQpPR+qB9MouiwJQlrSp8nHXxjXOfNaIpo5d/N0uxZfhaPJwrZusNTMVj1ysxYw+lW6DxF7SiphJE+EGl3x4CV0Ca4mocLG0BbpUiKY8H6KQw3ETmbB2LCORMpnsq8z3eq2pKW/4w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1taJEL-00061Y-2A for guix-patches@gnu.org; Tue, 21 Jan 2025 13:44:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75737] [PATCH v2 010/118] gnu: Remove ruby-2.6. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2025 18:44:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75737 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75737@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 75737-submit@debbugs.gnu.org id=B75737.173748500222985 (code B ref 75737); Tue, 21 Jan 2025 18:44:05 +0000 Received: (at 75737) by debbugs.gnu.org; 21 Jan 2025 18:43:22 +0000 Received: from localhost ([127.0.0.1]:56425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taJDd-0005yZ-TJ for submit@debbugs.gnu.org; Tue, 21 Jan 2025 13:43:22 -0500 Received: from 7.mo560.mail-out.ovh.net ([188.165.48.182]:50161) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1taJ9E-0005XI-4P for 75737@debbugs.gnu.org; Tue, 21 Jan 2025 13:38:53 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.139.154]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Ycwvq18Htz1f5G for <75737@debbugs.gnu.org>; Tue, 21 Jan 2025 18:38:47 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-jxpbb (unknown [10.110.164.123]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E005B1FDF6; Tue, 21 Jan 2025 18:38:46 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-5b5ff79f4f-jxpbb with ESMTPSA id k7aJLLbpj2fBhAQAXt+NjA (envelope-from ); Tue, 21 Jan 2025 18:38:46 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S00258b7e358-7ea2-48d4-a13a-8d079eb43e10, 4AD4F6D9E29B644C883BCAB2D4411A241F789B85) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Tue, 21 Jan 2025 19:36:30 +0100 Message-ID: <20250121183835.2080-10-ngraves@ngraves.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250121183835.2080-1-ngraves@ngraves.fr> References: <20250121183835.2080-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 16840929333566563042 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejvddgkeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnheplefggefffeefkeelheelfedujeelheeiuddvgeejgeehudduledvleehgfekheffnecuffhomhgrihhnpehruhgshidqlhgrnhhgrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejheejfeejseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=+6FsM1uccoOjk+I/9PrALHlC0+ng9R42q/kRPD6iqxQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737484727; v=1; b=1oU8h+tmacj/CF8Xf+pAjAnTAHV2zzSsRkuz5Q2x6PTb9WQMAk5L0cL0w5KEQnBNawQcdD+g M/0ppDicDmU/+hZjPm1S5yQZrct/tpJQs24ABsgIDcHyBOEBX0lG2GuPXiXlmLfi0U17AjbA3CM LZFIxfc8Lu2oDtlCD3oouzVdLet09T8WPSgkEvsmonicA4TAoO6kFDzCqVb6BT8oYWQl/Oq30yI 5efzl6DcX76IywxlEmEf5VKNGGsYHBpyu72t7kH1XIkHGKgV+ENp3Gu1pqgn7R6mPOpsKkLDLQZ +ZKRzlx1jA8mWYibMyADQLDj6B1x7t7ieCI7q4Rk7/lLg== 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-2.6): Delete variable. --- gnu/packages/ruby.scm | 80 +++++++++---------------------------------- 1 file changed, 17 insertions(+), 63 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 614e0ea0da..3d72567fce 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -220,79 +220,20 @@ (define-public ruby-3.1 (modify-inputs (package-inputs ruby-3.2) (delete "libyaml"))))) -(define-public ruby-2.6 - (package - (name "ruby") - (version "2.6.10") - (source - (origin - (method url-fetch) - (uri (string-append "http://cache.ruby-lang.org/pub/ruby/" - (version-major+minor version) - "/ruby-" version ".tar.xz")) - (sha256 - (base32 - "1wn12klc44hn2nh5v1lkqbdyvljip6qhwjqvkkf8zf112gaxxn2z")) - (modules '((guix build utils))) - (snippet `(begin - ;; Remove bundled libffi - (delete-file-recursively "ext/fiddle/libffi-3.2.1"))))) - (build-system gnu-build-system) - (arguments - `(#:test-target "test" - #:configure-flags - ,(if (%current-target-system) - '(list (string-append - "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib") - "--enable-shared") - ''("--enable-shared")) ; dynamic linking - #:phases - (modify-phases %standard-phases - (add-before 'configure 'replace-bin-sh-and-remove-libffi - (lambda _ - (substitute* '("Makefile.in" - "ext/pty/pty.c" - "io.c" - "lib/mkmf.rb" - "process.c" - "test/rubygems/test_gem_ext_configure_builder.rb" - "test/rdoc/test_rdoc_parser.rb" - "test/ruby/test_rubyoptions.rb" - "test/ruby/test_process.rb" - "test/ruby/test_system.rb" - "tool/rbinstall.rb") - (("/bin/sh") (which "sh")))))))) - (native-inputs (if (%current-target-system) - (list this-package) - '())) - (inputs - (list readline openssl-1.1 libffi gdbm)) - (propagated-inputs - (list zlib)) - (native-search-paths - (list (search-path-specification - (variable "GEM_PATH") - (files (list (string-append "lib/ruby/vendor_ruby")))))) - (synopsis "Programming language interpreter") - (description "Ruby is a dynamic object-oriented programming language with -a focus on simplicity and productivity.") - (home-page "https://www.ruby-lang.org") - (license license:ruby))) - (define-public ruby-2.7 (package - (inherit ruby-2.6) + (name "ruby") (version "2.7.8") (source (origin - (inherit (package-source ruby-2.6)) + (method url-fetch) (uri (string-append "https://cache.ruby-lang.org/pub/ruby/" (version-major+minor version) "/ruby-" version ".tar.gz")) (sha256 (base32 "182vni66djmiqagwzfsd0za7x9k3zag43b88c590aalgphybdnn2")))) + (build-system gnu-build-system) (arguments `(#:test-target "test" #:configure-flags @@ -330,7 +271,20 @@ (define-public ruby-2.7 (append (if (%current-target-system) (list this-package) '()) - (list autoconf))))) + (list autoconf))) + (inputs + (list readline openssl-1.1 libffi gdbm)) + (propagated-inputs + (list zlib)) + (native-search-paths + (list (search-path-specification + (variable "GEM_PATH") + (files (list (string-append "lib/ruby/vendor_ruby")))))) + (synopsis "Programming language interpreter") + (description "Ruby is a dynamic object-oriented programming language with +a focus on simplicity and productivity.") + (home-page "https://www.ruby-lang.org") + (license license:ruby))) (define-public ruby ruby-3.1)