From patchwork Wed Dec 14 20:35:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 45287 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 9FDED27BBEB; Wed, 14 Dec 2022 20:39: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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 7761A27BBE9 for ; Wed, 14 Dec 2022 20:39:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5YUz-0006Sy-4x; Wed, 14 Dec 2022 15:37:05 -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 1p5YUy-0006SC-4B for guix-patches@gnu.org; Wed, 14 Dec 2022 15:37:04 -0500 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 1p5YUx-00033e-SF for guix-patches@gnu.org; Wed, 14 Dec 2022 15:37:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5YUx-0001an-Me; Wed, 14 Dec 2022 15:37:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60075] [PATCH 04/58] gnu: julia-mappedarrays: Update to 0.4.1. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: zimon.toutoune@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 14 Dec 2022 20:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60075 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60075@debbugs.gnu.org Cc: Efraim Flashner , zimon.toutoune@gmail.com X-Debbugs-Original-Xcc: zimon.toutoune@gmail.com Received: via spool by 60075-submit@debbugs.gnu.org id=B60075.16710501825812 (code B ref 60075); Wed, 14 Dec 2022 20:37:03 +0000 Received: (at 60075) by debbugs.gnu.org; 14 Dec 2022 20:36:22 +0000 Received: from localhost ([127.0.0.1]:41485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5YUI-0001Vg-EQ for submit@debbugs.gnu.org; Wed, 14 Dec 2022 15:36:22 -0500 Received: from mail-wm1-f42.google.com ([209.85.128.42]:53241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5YUF-0001V3-Bj for 60075@debbugs.gnu.org; Wed, 14 Dec 2022 15:36:19 -0500 Received: by mail-wm1-f42.google.com with SMTP id ay40so12290969wmb.2 for <60075@debbugs.gnu.org>; Wed, 14 Dec 2022 12:36:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=7o17pbaVVQu0olc/RhDXqV1WLBtTV3NDGK5/7qUnsHE=; b=biM6fXhne1zgiLhwUj6Cssb20yMX8Abt8wi4lKNBDQBIOVY89oTjqBOwQme5YJZSxW vKOUV6Z63dk/h2N18DOK3VHnPpmBVpDn7uVgEdbZoDwvowhP0MhlZ48SWE02eCZ7/yvh nNt/SRiU/fr7z5044ChIN0nDqo2s99/d8pog8vSR7QSxGXmIyC+E4JPR8hkyIrIds/Sq nEUHlJsYTMOONxCjBOi94y7hDWYv015kW5Y0IAGNeV4hpv6iz+G6HW2gTdcAXen1na/l 5mRam6AiVrXOHdTWfSyDukTHAS7cAqOSWI454X6iAp56q2tMLGw88mfORyr8waJB4v3b 3IcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7o17pbaVVQu0olc/RhDXqV1WLBtTV3NDGK5/7qUnsHE=; b=fvbI89ErvLDH2hYhNPW8Ge8CIe10sVxkg7Ul/Qp+Ocep+GAW0Iry8Jq1ceSDGZum2s eBpM0HZwTG6zztRLno0KzsTyL7N+FzKbohH+N6HTSBIHgb4bv3wR+H1qsAuPibgDeIZ4 ZYoXpu9J3MoVKrtwOFZdc6ll/eG954BkV+GZaMlLbiOBSa+VKxSNxw1cXayVcU/Ed7xN dkDJd+0N7XNJva/UMJIOOlMqIy6XyZ8Vsjoiyclgx23RiQyzthEdz/WWRrj25aYAlQ9R DiYeiyH16WtaoCPz9mHTbRBi4BLoqFy61kffENpJxBSbzj1AYAsbR1dz8iIPonUI/ft2 950g== X-Gm-Message-State: ANoB5pnBMUXfqwBV/ZNMYfuNnZ5W+dpKEucJDZKlFQuxjrIae9sHvJPF 4sPxFVJP40914t9u6GdQEc6yAIaTT5iCCw== X-Google-Smtp-Source: AA0mqf4eN4/AAAC4Av1GsQOzpQrN291ogBabbpXKTo2gpjvKceek1NImNy04rv3QDNsXT3AYE2HhSg== X-Received: by 2002:a05:600c:1d15:b0:3cf:c2a5:5aad with SMTP id l21-20020a05600c1d1500b003cfc2a55aadmr20490694wms.14.1671050173549; Wed, 14 Dec 2022 12:36:13 -0800 (PST) Received: from localhost ([2a02:ed3:914:7800:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id n3-20020a7bcbc3000000b003cfd4e6400csm3819493wmi.19.2022.12.14.12.36.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 12:36:13 -0800 (PST) From: Efraim Flashner Date: Wed, 14 Dec 2022 22:35:02 +0200 Message-Id: <3a81daf5853c3fb97866cb6a11c2fcdf40a59a25.1671049573.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.38.1 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/julia-xyz.scm (julia-mappedarrays): Update to 0.4.1. [source]: Add snippet to fix deprecation warning and to fix the testsuite. [arguments]: Add 'adjust-tests phase to skip a test and absorb the i686-linux specific phase 'fix-tests-int32-i686. [native-inputs]: Remove julia-colortypes. Add julia-colors. --- gnu/packages/julia-xyz.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index b31ef2faac..01a3569e8d 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -3438,7 +3438,7 @@ (define-public julia-macrotools (define-public julia-mappedarrays (package (name "julia-mappedarrays") - (version "0.4.0") + (version "0.4.1") (source (origin (method git-fetch) @@ -3447,22 +3447,36 @@ (define-public julia-mappedarrays (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0l5adird8m1cmnsxwhzi5hcr7q9bm1rf7a6018zc7kcn2yxdshy3")))) + (base32 "08kb28dv1zzqbbxblhyllgs4sjxyp76dgjqhdizcq4zg4i1kls6p")) + (snippet + #~(begin + (use-modules (guix build utils)) + ;; Fix deprecation warning + ;; https://github.com/JuliaArrays/MappedArrays.jl/pull/51 + (substitute* "src/MappedArrays.jl" + (("Vararg\\{<:AbstractArray") "Vararg{AbstractArray")) + ;; Fix test failures + ;; https://github.com/JuliaArrays/MappedArrays.jl/pull/50 + (substitute* "test/runtests.jl" + (("_zero\\(x\\) = x > 0 \\? x : 0") + "_zero(x) = ismissing(x) ? x : (x > 0 ? x : 0)")))))) (build-system julia-build-system) (arguments (list #:phases - (if (target-64bit?) - #~%standard-phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-tests-int32-i686 - (lambda _ - (substitute* "test/runtests.jl" - (("Int64") "Int32")))))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-tests + (lambda _ + (substitute* "test/runtests.jl" + ((".*@test_throws ErrorException b.*") "")) + + (when #$(not (target-64bit?)) + (substitute* "test/runtests.jl" + (("Int64") "Int32")))))))) (propagated-inputs (list julia-fixedpointnumbers)) (native-inputs - (list julia-colortypes + (list julia-colors julia-fixedpointnumbers julia-offsetarrays)) (home-page "https://github.com/JuliaArrays/MappedArrays.jl")