From patchwork Mon Mar 20 17:14:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48411 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 082F816F13; Mon, 20 Mar 2023 17:42:56 +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=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 7B59C16F1F for ; Mon, 20 Mar 2023 17:42:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJVa-0007t2-2C; Mon, 20 Mar 2023 13:41:22 -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 1peJVX-0007ql-F2 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:41:19 -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 1peJVW-0005Dt-QM for guix-patches@gnu.org; Mon, 20 Mar 2023 13:41:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJVW-0005Ok-ME for guix-patches@gnu.org; Mon, 20 Mar 2023 13:41:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 091/223] gnu: ruby-concurrent: Replace with ruby-concurrent-ruby. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:41:18 +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.167933402920346 (code B ref 62196); Mon, 20 Mar 2023 17:41:18 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:40:29 +0000 Received: from localhost ([127.0.0.1]:56626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJUi-0005Hz-It for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:40:28 -0400 Received: from mail-qv1-f43.google.com ([209.85.219.43]:46600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJ93-0003N4-OA for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:18:06 -0400 Received: by mail-qv1-f43.google.com with SMTP id q88so1781066qvq.13 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:18:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679332680; 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=1gYyodZ11WyBrYWnkmbYpM7K/MdR/WugpMa4ebpmWnA=; b=bEzkaZowGGytqYUHPI5/O+RqXFUqmQ29dSCWKXlPZfQMVth3/B2fwGeKn5d3xYIBbX 0jTGA3gtmOwFn9kAJpF9qA3k4dM+2SMljNcbcmltBNaB0OgVFyRiDASeV703nt0lbYcm pHYJe9qms07dKgu9fRbFrmAAs5j+C1ubkyFcCeh3+9B8T8n1C4fQ6oYEa410DvCSs6yv ds3+8ZvKugZL3KRxiPhan6RR+g/EyetZYUVkhGfxc+db3U2MFwrAdmmarq3ir5vTZhaZ nZE8PGkpcMbtxkE961vFCr97DmrMNCzkMP3YhlYpzGbx5nxACrLcCzzJhvloB1nIeJUJ MWUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679332680; 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=1gYyodZ11WyBrYWnkmbYpM7K/MdR/WugpMa4ebpmWnA=; b=Auzc04dzEHHDYqPVPSsqHfxsk3quA0Hv7YGqQOKNfWmrmMXnr73mICQfWej6I9ma6K plHRIq/lzhIWF90KMLUwQ2X/MtLBRx/TknJC5wcrjOSA4z3h+H7uIdg/i/GRqEOvNIlD WdmJzAh7FGgWf2D1tJ38xaiw86SSh7T//7XmKmCNl3nCqdo7lOhd7zd/23OLhsf2ya5W 2saPuxzJs038ePalRdxFHNnRPSp94z2NkenHWnHjZMdahggGdFd58Ck2bTiSneKjqR2K MIJXsIHegS6CWFtYUxbijZvoRTf0TlDO5GgA0/CNYl/YSBb54hBWGo/K0VbQ5b8FszlY pXdw== X-Gm-Message-State: AO0yUKWhesIr14EXge335JTPczPaMq37zjwdUh96iN1xSuYKEinV/aDK IlQssTPmblksE5PdjXwPvCJDn2t0gFQ= X-Google-Smtp-Source: AK7set8psfgLJPsl2hH9qjeNsgZIR/t3vdgcCyjf5TEghBGbUdziUmVOrAxpmis+KeBt1tPjnqsVUA== X-Received: by 2002:ad4:5dc2:0:b0:5b5:5186:d0aa with SMTP id m2-20020ad45dc2000000b005b55186d0aamr23552488qvh.45.1679332680122; Mon, 20 Mar 2023 10:18:00 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id p17-20020a374211000000b007428e743508sm7673809qka.70.2023.03.20.10.17.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:17:59 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:14:23 -0400 Message-Id: <20230320171635.11184-91-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320171635.11184-1-maxim.cournoyer@gmail.com> References: <20230320171635.11184-1-maxim.cournoyer@gmail.com> 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-concurrent): Delete package, and define it as a deprecated alias to ruby-concurrent-ruby instead. --- gnu/packages/ruby.scm | 77 ++++--------------------------------------- 1 file changed, 6 insertions(+), 71 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a1a4521805..a5539808a1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -10403,77 +10403,6 @@ (define-public ruby-timecop (home-page "https://github.com/travisjeffery/timecop") (license license:expat))) -(define-public ruby-concurrent - (package - (name "ruby-concurrent") - (version "1.1.5") - (source - (origin - (method git-fetch) - ;; Download from GitHub because the rubygems version does not contain - ;; Rakefile. - (uri (git-reference - (url "https://github.com/ruby-concurrency/concurrent-ruby") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "193q2k47vk7qdvv9hlhmmdxgy91xl4imapyk1ijdg9vgf46knyzj")))) - (build-system ruby-build-system) - (arguments - `(#:test-target "ci" - #:phases - (modify-phases %standard-phases - (add-before 'replace-git-ls-files 'remove-extra-gemspecs - (lambda _ - ;; Delete extra gemspec files so 'first-gemspec' chooses the - ;; correct one. - (delete-file "concurrent-ruby-edge.gemspec") - (delete-file "concurrent-ruby-ext.gemspec") - #t)) - (replace 'replace-git-ls-files - (lambda _ - ;; XXX: The default substitution made by this phase is not fully - ;; compatible with "git ls-files". The latter produces file names - ;; such as "lib/foo", whereas ruby-build-system uses "find . [...]" - ;; which gives "./lib/foo". That difference in turn breaks the - ;; comparison against a glob pattern in this script. - (substitute* "concurrent-ruby.gemspec" - (("git ls-files") "find * -type f | sort")) - #t)) - (add-before 'build 'remove-jar-from-gemspec - (lambda _ - ;; The gemspec wants to include a JAR file that we do not build - ;; nor need. - (substitute* "concurrent-ruby.gemspec" - (("'lib/concurrent/concurrent_ruby.jar'") - "")) - #t)) - (add-before 'build 'remove-rake_compiler_dock-dependency - (lambda _ - ;; This library is only used when building for non-MRI targets. - (substitute* "Rakefile" - (("require 'rake_compiler_dock'") - "")) - #t)) - (add-before 'check 'remove-timecop-dependency - ;; Remove timecop-dependent tests as having timecop as a depedency - ;; causes circular depedencies. - (lambda _ - (delete-file "spec/concurrent/executor/timer_set_spec.rb") - (delete-file "spec/concurrent/scheduled_task_spec.rb") - #t))))) - (native-inputs - (list ruby-rake-compiler ruby-rspec)) - (synopsis "Concurrency tools for Ruby") - (description - "This library provides modern concurrency tools including agents, -futures, promises, thread pools, actors, supervisors, and more. It is -inspired by Erlang, Clojure, Go, JavaScript, actors and classic concurrency -patterns.") - (home-page "http://www.concurrent-ruby.com") - (license license:expat))) - (define-public ruby-concurrent-ruby (package (name "ruby-concurrent-ruby") @@ -10512,6 +10441,12 @@ (define-public ruby-concurrent-ruby (home-page "https://github.com/ruby-concurrency/concurrent-ruby") (license license:expat))) +;;; The 'gem' is called 'concurrent-ruby'; reversing its name was confusing +;;; and failed to be picked by the gem importer (which led to this newer +;;; package). +(define-public ruby-concurrent + (deprecated-package "ruby-concurrent" ruby-concurrent-ruby)) + (define-public ruby-pkg-config (package (name "ruby-pkg-config")