From patchwork Wed Mar 26 17:08:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 40861 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 5C1FC27BBE2; Wed, 26 Mar 2025 17:10:18 +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.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 B6AC427BBE9 for ; Wed, 26 Mar 2025 17:10:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txUGV-0006ya-Bd; Wed, 26 Mar 2025 13:10: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 1txUGQ-0006yI-Og for guix-patches@gnu.org; Wed, 26 Mar 2025 13:10:04 -0400 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 1txUGQ-0001Gf-EC for guix-patches@gnu.org; Wed, 26 Mar 2025 13:10:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=ME/y2EMe1xdjbFy+ngGCpMwUFrHFVTIsaf5Y73H3+lk=; b=OjxjHoW1IMrUE5jcrztEr0QthAJi3X1s0ZXwy9wjgtb46mkWVdzNIaXgolGnyS9eaSQB2j+o+kxOyuN1PXcQuT1P1+/jNW/C+gUgmvoKHMrUoN4VIfvoxmEB5qCrYZGblSAEeTPri5+H2eH+aE5b7wANHLFjMPPsYpoXa+s9mSXfnF/tQdyAvKHWChmCWOEYxDQuWnBWWZwrV5TZgCChSYF2Exn9JQ6Y7/H/APCNXLItlvpmDSc7Nc8r+wTgvcmzOsHdBwOQAQrY6eXTm4A3m86FB/+3LdL2Th+JgTmxrxP1BakyKO1FNSp6YCUx6o38J9vKPWZ5AnCiftr9UJVkgw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txUGQ-0001SZ-8j; Wed, 26 Mar 2025 13:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77289] [PATCH] gnu: Remove ruby-2.6. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, guix-patches@gnu.org Resent-Date: Wed, 26 Mar 2025 17:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77289 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77289@debbugs.gnu.org Cc: guix@cbaines.net, Andreas Enge , Christopher Baines X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines Received: via spool by submit@debbugs.gnu.org id=B.17430089685536 (code B ref -1); Wed, 26 Mar 2025 17:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Mar 2025 17:09:28 +0000 Received: from localhost ([127.0.0.1]:44192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txUFr-0001RD-Tn for submit@debbugs.gnu.org; Wed, 26 Mar 2025 13:09:28 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45022) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1txUFn-0001Qs-7y for submit@debbugs.gnu.org; Wed, 26 Mar 2025 13:09:25 -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 1txUFg-0006tp-8H for guix-patches@gnu.org; Wed, 26 Mar 2025 13:09:16 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txUFd-0001Bs-Mg for guix-patches@gnu.org; Wed, 26 Mar 2025 13:09:15 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 729E078; Wed, 26 Mar 2025 18:09:11 +0100 (CET) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id 9lqQTVrqG5I8; Wed, 26 Mar 2025 18:09:10 +0100 (CET) Received: from jurong.lan (176-179-191-150.abo.bbox.fr [176.179.191.150]) by hera.aquilenet.fr (Postfix) with ESMTPSA id E8D1C615; Wed, 26 Mar 2025 18:09:08 +0100 (CET) From: Andreas Enge Date: Wed, 26 Mar 2025 18:08:47 +0100 Message-ID: <40a4fe0fa113712712556099938dc3c2b4136d9d.1743008552.git.andreas@enge.fr> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 729E078 X-Spamd-Result: default: False [-2.60 / 15.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM(-3.00)[-1.000]; FORGED_RECIPIENTS(2.00)[m:andreas@enge.fr,s:andreas.enge@aquilenet.fr]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Action: no action X-Spamd-Bar: -- X-Rspamd-Server: hera Received-SPF: pass client-ip=185.233.100.1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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 * gnu/packages/ruby.scm (ruby-2.6): Delete variable. (ruby-2.7): Copy fields previously inherited from ruby-2.6. Change-Id: I14065e045ede6224cb30b05dcb7fcbdf03df8dbd --- This commit removes ruby@2.6, which was EOL on 2022-04-12 and has no dependent packages any more. Unfortunately it appears that since @2.7 inherited from @2.6, it is rebuilt with all its 14000 dependent packages although I have only copy-pasted the previously inherited fields. According to the removal policy, this commit could be pushed on April 26; but we should make sure that everything is built on CI. gnu/packages/ruby.scm | 82 +++++++++---------------------------------- 1 file changed, 17 insertions(+), 65 deletions(-) base-commit: 80651b889926a304a671092ad2fc223440845a70 diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 24407fbd58..c7be9fb2ce 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -114,81 +114,20 @@ (define %prawn-project-licenses license:gpl2+ license:gpl3+)) -(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") - #t)))) - (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"))) - #t))))) - (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 @@ -227,7 +166,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-3.0 (package