From patchwork Sun Sep 17 19:12:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 53998 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 C0EC027BBEA; Sun, 17 Sep 2023 20:14:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 28F9E27BBE9 for ; Sun, 17 Sep 2023 20:14:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhxDP-0002VC-I7; Sun, 17 Sep 2023 15:13:55 -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 1qhxDO-0002Ut-NU for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:54 -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 1qhxDO-0007Ay-Fv for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhxDW-0000zn-0C for guix-patches@gnu.org; Sun, 17 Sep 2023 15:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66030] [PATCH v3 1/6] gnu: openblas-ilp64: Add symbol suffix. References: In-Reply-To: Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 19:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66030@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 66030-submit@debbugs.gnu.org id=B66030.16949779893703 (code B ref 66030); Sun, 17 Sep 2023 19:14:01 +0000 Received: (at 66030) by debbugs.gnu.org; 17 Sep 2023 19:13:09 +0000 Received: from localhost ([127.0.0.1]:51445 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCe-0000xY-IH for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:09 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCb-0000we-Fs for 66030@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:06 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-32156ca22aaso1014f8f.1 for <66030@debbugs.gnu.org>; Sun, 17 Sep 2023 12:12:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694977972; x=1695582772; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ep/oiK3UN9H3yeVqSN9ucEPt82S1diMBOas6UDttgJQ=; b=kdGa0FTMGAun/CS6dQK2sn/N2TxFtjM8nOah2dZdhPPnW/Wt89S5UGh28GH2n9lK0g 93I/jpBiCYs3ON8Xp+h3Q4rHTpRmwM8CoLzr9zbIbdz5nJ7QJB87Grx1ZQooa01GzdtJ usJbin5jiALckQlcaSXy7XViLjTuP1lmd4AzdMaUfwJhlIdudpE2lMa/OvjQaPNcM6/w fTGrOxQnDBonakRQuP9dC73kOwAmR5gHxbiKG6+x1XAxEVkMDpi4N3RaCSwjxHcdkFxq lGXYGfCMrDDr7tT6fMXLKaYRntSUhkdGJ0CgGOwgVUeNH5bAQv0RPW2Th4ZdoSR7cvVh 5p4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694977972; x=1695582772; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ep/oiK3UN9H3yeVqSN9ucEPt82S1diMBOas6UDttgJQ=; b=juhMyIZR93BvWpvA+BNuKuvIOxvUVcleenZP2lhybpuPLFKqC0bLFsJQLlaVzRctbO O07iTOfusSSJexvYSqAyLiwmW1TWNKqo6xGoJhoL/ceOy+hsM7BYTP+p2DjPe1Imsqu6 IUzWVuAziMKgqr4gyi5sZCSTa0oHgM4yKoKvHnq2I0tQVzNYmpqLg3dr7BUce+esl6bY 0XT2LhMNouHHJHpsN4RmoDp4cgx7xrDNTH9otBMUiWvkJdSvJq2+yzwET4I0CN5oc3/3 T/jlhsocMdWTXrMauyhh+GRFCtfvZmex3iRKO1D9Ua4DyZqXgs+YHCGg0VafGEDj/kfB YMwQ== X-Gm-Message-State: AOJu0YxMlvhGG4sZfcngupZ0D4iAEe/oQc0d+sG4yQX/atS4OEMOYwx5 yTsQjMWAdw/hUs/i702iGNPUPzbdc7g= X-Google-Smtp-Source: AGHT+IG7itBg6MFhJn8v5OBfb1Buu6gbUooUpdosOhkMEHmg4w6k3jq0IPmLdbYAjU2eUC/MiGbDXA== X-Received: by 2002:adf:e903:0:b0:31a:ed75:75e8 with SMTP id f3-20020adfe903000000b0031aed7575e8mr5449208wrm.2.1694977971457; Sun, 17 Sep 2023 12:12:51 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id r6-20020a5d4e46000000b003198a9d758dsm10416451wrt.78.2023.09.17.12.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 12:12:50 -0700 (PDT) From: Simon Tournier Date: Sun, 17 Sep 2023 21:12:35 +0200 Message-Id: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 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 From: Efraim Flashner * gnu/packages/maths.scm (openblas-ilp64)[arguments]<#:make-flags>: Add the symbol '64_' as suffix. --- gnu/packages/maths.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) base-commit: fc3a53525ab3dcaf7c22eec8d62294017f9760fe diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6141c0988612..c051e60d5e40 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4638,7 +4638,9 @@ (define-public openblas-ilp64 (arguments (substitute-keyword-arguments (package-arguments openblas) ((#:make-flags flags #~'()) - #~(append (list "INTERFACE64=1" "LIBNAMESUFFIX=ilp64") + #~(append (list "INTERFACE64=1" + "SYMBOLSUFFIX=64_" + "LIBPREFIX=libopenblas64_") #$flags)))) (synopsis "Optimized BLAS library based on GotoBLAS (ILP64 version)") (license license:bsd-3))) From patchwork Sun Sep 17 19:12:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 53999 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 0890A27BBEB; Sun, 17 Sep 2023 20:14:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 7856327BBE9 for ; Sun, 17 Sep 2023 20:14:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhxDR-0002W7-3Q; Sun, 17 Sep 2023 15:13:57 -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 1qhxDP-0002V2-6v for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:55 -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 1qhxDO-0007B3-VN for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhxDW-0000zu-Fz for guix-patches@gnu.org; Sun, 17 Sep 2023 15:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66030] [PATCH v3 2/6] gnu: julia: Conditionally use openblas with ILP64 support. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 19:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66030@debbugs.gnu.org Cc: Efraim Flashner , Simon Tournier Received: via spool by 66030-submit@debbugs.gnu.org id=B66030.16949779893711 (code B ref 66030); Sun, 17 Sep 2023 19:14:02 +0000 Received: (at 66030) by debbugs.gnu.org; 17 Sep 2023 19:13:09 +0000 Received: from localhost ([127.0.0.1]:51448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCf-0000xg-2s for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:09 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:40354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCc-0000wg-9O for 66030@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:07 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4046f7d49a9so11603145e9.1 for <66030@debbugs.gnu.org>; Sun, 17 Sep 2023 12:12:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694977972; x=1695582772; darn=debbugs.gnu.org; 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=uSnoEmNFwBvT0GRGBykD/LakiKM3JbQSWS9i2t5st+8=; b=SKwG6Ee1Rdw3c+bGAttMV9g09r+w7vih0qULsmKDkprPkx/cNYgJTJET1BxZOWyvvJ l0kTkt2mWIyKauzC1CoE4mBwcXvUjp6j/T5xfVR5QrXpr7r7MYah6JI6uPZvL6v5IAgd 3ZfwLG4FL/DkxNPfGHbUW/5YvQcHG8dZR1jdFcIZx3jjLn8f3XwDfFj27+1BnSPZtEJC ZZt/KC5YS7VToMn3cpzsJDDxfZCpre8dfeHsI7pntTSRpY1m1sV8G2m2oKtvmhTLo9tb QbGZInEyZMqBMRKoXLLpTruzTmrnL+d0hyirbpU0GD5e4CGQDWNel6zs6XGePqlg0Bok JVgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694977972; x=1695582772; 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=uSnoEmNFwBvT0GRGBykD/LakiKM3JbQSWS9i2t5st+8=; b=QuH2umNX05hYMeILa88kaH2I2BtAGyTExk5RQnFF5kHBxc/Z4Wr5OzWP95B4Qn2Mf4 45FCnPwkhE6urgrxvLDB8zxX1douP05SbKygamlmKKyBMjbfpEWaf8jIb99HZkUPUOFI /4T9pMAdAuFE7eHkx+YVjSBNm56urPIfdwcTPfmdQrpF763+6dkzOy/8Ev8vHmHqERDa 5HPKiSqukSGUzfvQZPqrA9zVrU9vHvu/BIxVTeQYdQB0TrwyX8GM7+EDVOQJrLKyt7y2 u+x3PksUYAqpqpzhUhw50c8uKY7qPsZ2d/3cMaJz9RVoFPH2V5O/PXaJLdRczRL2taPL Kodw== X-Gm-Message-State: AOJu0YxrSw0b+c8Vh0BZwRK9L5wflOsyX0wroczZ24rkLP6Kl1X6nE3y FNYWBp/VYIl6kFaqy777ZiEge9K/iLg= X-Google-Smtp-Source: AGHT+IEGI0wRKNpDaAGerJitGUmgE1f5XsMFSoEznMBKeFOT4ym+6RrJIWcz4oO89ShmnnQLOozq9w== X-Received: by 2002:adf:ef88:0:b0:317:3d36:b2c1 with SMTP id d8-20020adfef88000000b003173d36b2c1mr5903883wro.7.1694977972419; Sun, 17 Sep 2023 12:12:52 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id r6-20020a5d4e46000000b003198a9d758dsm10416451wrt.78.2023.09.17.12.12.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 12:12:51 -0700 (PDT) From: Simon Tournier Date: Sun, 17 Sep 2023 21:12:36 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@gmail.com> References: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@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 From: Efraim Flashner Fixes . Reported by Cayetano Santos . * gnu/packages/julia.scm (julia)[arguments]<#:phases>: Conditionally use OpenBLAS with ILP64 support for x86-64 target. <#:make-flags>: Likewise. [inputs]: Conditionally replace openblas by openblas-ilp64 for x86-64 target. Co-authored-by: Simon Tournier --- gnu/packages/julia.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index ba541758223e..8ba2b480ce55 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -269,7 +269,10 @@ (define-public julia (substitute* (jlpath "nghttp2") (((from "libnghttp2")) (to "libnghttp2" "libnghttp2"))) (substitute* (jlpath "OpenBLAS") - (((from "libopenblas")) (to "openblas" "libopenblas"))) + (((from "libopenblas")) + ,@(if (target-x86-64?) + `((to "openblas" "libopenblas64_" "libopenblas")) + `((to "openblas" "libopenblas"))))) (substitute* (jlpath "OpenLibm") (((from "libopenlibm")) (to "openlibm" "libopenlibm"))) (substitute* (jlpath "PCRE2") @@ -479,12 +482,13 @@ (define-public julia "NO_GIT=1" ; build from release tarball. "USE_GPL_LIBS=1" ; proudly - ,@(if (target-aarch64?) - `("USE_BLAS64=0") - '()) - - "LIBBLAS=-lopenblas" - "LIBBLASNAME=libopenblas" + ,@(if (target-x86-64?) + `("USE_BLAS64=1" + "LIBBLAS=-lopenblas64_" + "LIBBLASNAME=libopenblas64_") + `("USE_BLAS64=0" + "LIBBLAS=-lopenblas" + "LIBBLASNAME=libopenblas")) (string-append "UTF8PROC_INC=" (assoc-ref %build-inputs "utf8proc") @@ -513,7 +517,9 @@ (define-public julia ("llvm" ,llvm-julia) ("mbedtls-apache" ,mbedtls-apache) ("mpfr" ,mpfr) - ("openblas" ,openblas) + ,@(if (target-x86-64?) + `(("openblas" ,openblas-ilp64)) + `(("openblas" ,openblas))) ("openlibm" ,openlibm) ("p7zip" ,p7zip) ("pcre2" ,pcre2) From patchwork Sun Sep 17 19:12:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54002 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 2997327BBEA; Sun, 17 Sep 2023 20:14:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 B2AA927BBE2 for ; Sun, 17 Sep 2023 20:14:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhxDS-0002X1-FW; Sun, 17 Sep 2023 15:13:58 -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 1qhxDP-0002VB-FO for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:55 -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 1qhxDP-0007B9-7V for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhxDW-000101-V3 for guix-patches@gnu.org; Sun, 17 Sep 2023 15:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66030] [PATCH v3 3/6] gnu: julia-arraylayouts: Fix tests. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 19:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66030@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 66030-submit@debbugs.gnu.org id=B66030.16949779903717 (code B ref 66030); Sun, 17 Sep 2023 19:14:02 +0000 Received: (at 66030) by debbugs.gnu.org; 17 Sep 2023 19:13:10 +0000 Received: from localhost ([127.0.0.1]:51450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCf-0000xo-NJ for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:10 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:40447) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCd-0000wr-4D for 66030@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:07 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-32156ca22aaso1016f8f.1 for <66030@debbugs.gnu.org>; Sun, 17 Sep 2023 12:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694977973; x=1695582773; darn=debbugs.gnu.org; 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=0ojGqbCZdVnALTDLOBq4dm2euHSCNdOjWVMAjxy7nVI=; b=HJ1M0k6vo+YkiUX8/4LMYfr5ku1FdpHt3F7XPRsfQnTloeyM45AcOLdxKDhLNSMOFv 2v/t4NTuT0667pH63ghV+CnTPDLonmslwHvhDmqMOlJpA9z9k2OT1rKmXArKmwvPnfCc xatOUrsuD+29ez7+cv7EGn8lM0NBQktMksvoBkfLPA97x4TtMTBEz8vAXsB9bNvIF9ym Iw+6JO16u1tVHqI0MOu2TkyNlSwIOQc7Ei8hJJN2gAIMh1tqkD+tzkAqXHHRg/Y4Tp1d ya3dgxvCK1cu+UTXf2xPhFdNRfRPFr4DLRPeLXq0ljB5UNDU1A3TPNTa94WQf5PCiQ4n dQiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694977973; x=1695582773; 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=0ojGqbCZdVnALTDLOBq4dm2euHSCNdOjWVMAjxy7nVI=; b=DBgtdvWsj7B7aLLcCtb747dnn8gYqpnsbQbcUtInefVTnWaD/JR+QPAKVv0tsHpHXY K/iWEmfEVMZzeTigT+DIzVC4qY7TQSStkU68+5kscHaJDZgGETsrNMrAvUo8f4zturn6 PqZG3w4XXzsKoRRZOENkiZ1ThlbxOgP+Nflp3aEcrIUmx3ozt42GRkk7J2wIXOeujptz DXM9k1VSMa8PPOo1AYbhoYI4IQ4kHblANnARkK0uLCd3RHLGXLqgkZFgpBexJmULJqO1 gLFE7/fiIC2ZYB9eFHP9RX41soteWZBxLAjDIFbNv7u9DTdK+bOWliV6SRWlWfLxbGJ+ A8wQ== X-Gm-Message-State: AOJu0YxOsrSMXQU/xr3Vo/IxMYUy+kWr6J+jdvrbuJQ7axPkOAAslvmw g8niOdTJM9s5JpMwQ4jCgmv38QnHQWU= X-Google-Smtp-Source: AGHT+IGyGAJLRg2T6241NW5BvI9uHoqMKWWygc/YNEYmleFuKaNPXLvlSIts6TYlVutQLfR+9FjjQg== X-Received: by 2002:adf:ec4f:0:b0:31f:edc3:c5fb with SMTP id w15-20020adfec4f000000b0031fedc3c5fbmr5763467wrn.5.1694977973158; Sun, 17 Sep 2023 12:12:53 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id r6-20020a5d4e46000000b003198a9d758dsm10416451wrt.78.2023.09.17.12.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 12:12:52 -0700 (PDT) From: Simon Tournier Date: Sun, 17 Sep 2023 21:12:37 +0200 Message-Id: <1f400ccc15ef81a7af6689a83858d3b524ec0b42.1694977883.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@gmail.com> References: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@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/julia-xyz.scm (julia-arraylayouts)[arguments]: Remove. --- gnu/packages/julia-xyz.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index a1e65332fa10..a3c158763cb5 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -242,14 +242,6 @@ (define-public julia-arraylayouts (sha256 (base32 "1j11jid4scw9icrbr8g6myp17nabjzmf4f40cichb20lzf1agz8l")))) (build-system julia-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'adjust-tests - (lambda _ - (substitute* "test/test_layoutarray.jl" - (("@test all\\(B") "@test_broken all(B"))))))) (propagated-inputs (list julia-fillarrays)) (native-inputs From patchwork Sun Sep 17 19:12:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54000 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 D8D1027BBE9; Sun, 17 Sep 2023 20:14:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 C604727BBE2 for ; Sun, 17 Sep 2023 20:14:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhxDQ-0002Vv-QF; Sun, 17 Sep 2023 15:13:56 -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 1qhxDP-0002Ve-W7 for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:56 -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 1qhxDP-0007BG-Ob for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhxDX-000109-G0 for guix-patches@gnu.org; Sun, 17 Sep 2023 15:14:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66030] [PATCH v3 4/6] gnu: julia-scanbyte: Update to 0.4.0. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 19:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66030@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 66030-submit@debbugs.gnu.org id=B66030.16949779993746 (code B ref 66030); Sun, 17 Sep 2023 19:14:03 +0000 Received: (at 66030) by debbugs.gnu.org; 17 Sep 2023 19:13:19 +0000 Received: from localhost ([127.0.0.1]:51453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCp-0000yK-3k for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:19 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:37944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCd-0000x2-Ly for 66030@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:08 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-31f7c87353eso733653f8f.0 for <66030@debbugs.gnu.org>; Sun, 17 Sep 2023 12:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694977974; x=1695582774; darn=debbugs.gnu.org; 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=09jSP8REMBA9oyvdeWgfd+zCvPaDP0X3QL+Meayyl90=; b=E9QgTpjInXyMUd7qQRq93kOWwErqlVMWfpdcL5maJ2ChRYHVRlSufoo2Ci40K5CiqD S3dmN+MiAQbAV9CnwtF2PQM/ogjgxKhCC38N/JXQbc/lgWsh32CfD/YeWsOCrSgZNvH7 tut6urAWVuMjGlPh2msG3AbT+QCb2iIO7LWN898CQBWtqikC0hW0Bnxw6e+id6QJOJlo dMgwp52SG9H1JdBxspBzxAw01F2Hhm458fFKqFP2T7lJhu4jC/8+U/2tzKADse0rw/8w /1ag82vb8KF/kuFUIN4IowOZH2GYzj+UHkGAwCH+VKEr87wPrxzKTTtrIaAOzqNSVrDS yOVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694977974; x=1695582774; 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=09jSP8REMBA9oyvdeWgfd+zCvPaDP0X3QL+Meayyl90=; b=cW9PSVa+wQBmJZNAePXCfJ+3uaU4H+H9g47/DJ9ic26rwboC/yZg+tGyP0pi2NFMxT DjwTwpG9hm8BqaiPfXVU0rYh4tTWcWAZxGkv6yfee9YjUu73Jy/hIuLo8JW2DFN9zGaG eBEmi6xW454PfWlO6i1uF5KzF7huhqNBaLZouDG7A3+RzflKMUx0nVR15yV0SyS/RJs0 bcPJHHCrvTKX1ERdiF5KgNbjOkjKQP1keZ+f6D29/1FiHN4fJo+E4UDiaHvQhKJkY8my UfNr8AsDj2/VTayNVEa8lodyl/YBW7dbl/Q/jh/7OI+luGCSbNI/KvJuLe7X3VRAzDlu nlKg== X-Gm-Message-State: AOJu0YyWldbu00R1ju6vIk/NH2F84RLj/SrjtAM/pZsLqWadkry7/SJN vt14R1OBqjArpvbdUdmUdisaDEbng8g= X-Google-Smtp-Source: AGHT+IEIxA4Wm/VsZ21PidaWkjriMj6Bh+TtAt4wSG+PzsSiwyCFbsA15h8S9iwgLcKDbXmUTfbZeQ== X-Received: by 2002:a5d:408e:0:b0:31f:85dc:110c with SMTP id o14-20020a5d408e000000b0031f85dc110cmr6320468wrp.0.1694977974049; Sun, 17 Sep 2023 12:12:54 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id r6-20020a5d4e46000000b003198a9d758dsm10416451wrt.78.2023.09.17.12.12.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 12:12:53 -0700 (PDT) From: Simon Tournier Date: Sun, 17 Sep 2023 21:12:38 +0200 Message-Id: <07910d593390ad96854bcad0521dd302faed1644.1694977883.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@gmail.com> References: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@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/julia-xyz.scm (julia-scanbyte): Update to 0.4.0. --- gnu/packages/julia-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index a3c158763cb5..8eedea85184f 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -5527,7 +5527,7 @@ (define-public julia-sass (define-public julia-scanbyte (package (name "julia-scanbyte") - (version "0.3.2") + (version "0.4.0") (source (origin (method git-fetch) @@ -5536,7 +5536,7 @@ (define-public julia-scanbyte (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1c18hkcb0h6l437v2s02kijjkyly91mqark84czvh8yzxm19hr7k")))) + (base32 "1ww7bbh02s4l917dwkzg9pq71xk0db2rba247vz1xfm24msi8lwj")))) (build-system julia-build-system) (propagated-inputs (list julia-simd)) From patchwork Sun Sep 17 19:12:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54003 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 A0DBA27BBEA; Sun, 17 Sep 2023 20:14:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 256AD27BBE9 for ; Sun, 17 Sep 2023 20:14:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhxDT-0002XO-1d; Sun, 17 Sep 2023 15:13:59 -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 1qhxDQ-0002Vr-Jt for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:56 -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 1qhxDQ-0007BM-9v for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhxDY-00010G-18 for guix-patches@gnu.org; Sun, 17 Sep 2023 15:14:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66030] [PATCH v3 5/6] gnu: Add wcslib-7.12. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 19:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66030@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 66030-submit@debbugs.gnu.org id=B66030.16949780003753 (code B ref 66030); Sun, 17 Sep 2023 19:14:03 +0000 Received: (at 66030) by debbugs.gnu.org; 17 Sep 2023 19:13:20 +0000 Received: from localhost ([127.0.0.1]:51455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCp-0000yM-Fh for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:19 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCe-0000x8-Oh for 66030@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:10 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3159b524c56so727747f8f.1 for <66030@debbugs.gnu.org>; Sun, 17 Sep 2023 12:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694977975; x=1695582775; darn=debbugs.gnu.org; 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=qi9+Ub9gyzG69o6V2oBW3ry146LA/0mYK0xvg0NZQUg=; b=nVuRAoDyX+SnG9g/dxUr+/sPQfRylFJCRpbGRDM4WkZ0c3tG4hFZsGli0+q+dNtd5u 16W7Z2DEOe/HBz6XjmrQTJV/sViPmP/3TKDvaVRH0xxu/rR+4XgWQW5mF/4ArRKpovIT qYW/Xi5ztu90nfSCFh5tp9pelyQXlLY98gesOp9+XtTH5bXbs3s/SnGRB8vzDBnqlom5 RVf0EPpnFspzVt/zZ7/NIeV+nhaRA5Dr6jaJYsxEV7tZQHSnP+4mO/t9tvUiQYQaXXHs YWRb85iaBG25jjq6UC6wRM8RMG0N54srdwH8/2KVuGIAWxK5KH5IPmiRwZwuo/auPrrv AHCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694977975; x=1695582775; 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=qi9+Ub9gyzG69o6V2oBW3ry146LA/0mYK0xvg0NZQUg=; b=kvgLWf2D++f6Ko1If83BbW7MpYLbVdWsV+nJRZIBLQCMXIKvXE9HlbqodtfA9lW68+ eAjy7DZQ1d5cBkNYQAGjilLY96QXDjIRl+IYNKwlUSVTynfH5Cf11Yt80tqaHpxa8mZv LvlhsoqsXBfHF9yVOP+rYsuhAMRTcVnVSybtnJotbDcC+f79hU07FVVtq/PDLgtvD+h2 pOm7flwno91HgLRtjaGtkpfC3RUuuFCCINa3FUqt81IpW3cPpySXXzkR2mkSkPmCF6jj tGciKA5o7TRPsgWlJ7dGooqoKhG1EzXkODQwbEK1Ql5oiz68EDSZOt1a3d0mg9HDwFiQ eLoA== X-Gm-Message-State: AOJu0Yz7+GTPQgiT+DK3O53zwfQ7/vPR7xM2WvZV1L8yPZ//mGfg9ymV XsSIYIe88sMd+bMV0Z2EE+nSHzKbqBg= X-Google-Smtp-Source: AGHT+IEvwvo08uCsAYv9FIcpsbjYsJrLZ1+uQTbKj/t1zrXs977ucSCQ97dAOXoR0yvZSaqMq3zpMQ== X-Received: by 2002:adf:fe04:0:b0:31a:e54e:c790 with SMTP id n4-20020adffe04000000b0031ae54ec790mr5475668wrr.6.1694977975106; Sun, 17 Sep 2023 12:12:55 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id r6-20020a5d4e46000000b003198a9d758dsm10416451wrt.78.2023.09.17.12.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 12:12:54 -0700 (PDT) From: Simon Tournier Date: Sun, 17 Sep 2023 21:12:39 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@gmail.com> References: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@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/astronomy.scm (wcslib-7.12): New variable. --- gnu/packages/astronomy.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index e8499bb4b4df..402c09a6db4b 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2023 Iliya Tikhonenko ;;; Copyright © 2023 Andreas Enge +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -741,6 +742,21 @@ (define-public wcslib header.") (license license:lgpl3+))) +;;; The version is required for julia-wcs-jll and julia-wcs. They do not +;;; support version higher than 7.x. +(define-public wcslib-7.12 + (package + (inherit wcslib) + (version "7.12") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.atnf.csiro.au/people/mcalabre/WCS/" + "wcslib-" version ".tar.bz2")) + (sha256 + (base32 "1m3bx6gh5w3c7vvsqcki0x20mg8lilg13m0i8nh7za89w58dxy4w")))) + (properties '((hidden? . #t))))) + (define-public weightwatcher (package (name "weightwatcher") From patchwork Sun Sep 17 19:12:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54001 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 D736B27BBE9; Sun, 17 Sep 2023 20:14:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 C2B3F27BBE2 for ; Sun, 17 Sep 2023 20:14:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhxDS-0002X2-MK; Sun, 17 Sep 2023 15:13:58 -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 1qhxDQ-0002W0-Um for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:56 -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 1qhxDQ-0007BT-MO for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhxDY-00010O-DM for guix-patches@gnu.org; Sun, 17 Sep 2023 15:14:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66030] [PATCH v3 6/6] gnu: julia-wcslib-jll: Downgrade wcslib version. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 19:14:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66030@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 66030-submit@debbugs.gnu.org id=B66030.16949780003760 (code B ref 66030); Sun, 17 Sep 2023 19:14:04 +0000 Received: (at 66030) by debbugs.gnu.org; 17 Sep 2023 19:13:20 +0000 Received: from localhost ([127.0.0.1]:51457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCq-0000yZ-00 for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:20 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:41411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCf-0000xA-Rr for 66030@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:12 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-401e6ce2d9fso12712385e9.1 for <66030@debbugs.gnu.org>; Sun, 17 Sep 2023 12:13:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694977976; x=1695582776; darn=debbugs.gnu.org; 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=DLmKSMa1dtmq5RxQFju+4i36MfcUsMqK8f/3uROUnOM=; b=FH0JbWweaAsipZVhNqL8LLzRVgU7kzDb27APYGOwoajJ3BDfLPLVzUypDJkN0QVX36 atN8H4byOVSBuT6a+VKSQcZvUz02CEof61vfMHiqXTv9oz0B0ApqL5QJbFNLMTtCIZUm X5cr2cFEm+87O+cDmG/OmZoyP8p2lxxMdshzPbpw2hZ/Ze0sX2q+Voz7tYoqRVkAsZmX Rl7H/53z1+086z+PmZ4KyoynRaa3ShQ/57c8j8COtFw53t79VkX33uNLemTcsCvw7MeU EYgu1P9EbDYkMUhDPM4/f807DVDHJa4bDtOfoTW95DYWKqJqybqmpGZVHlilRbrXTZlE 8lIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694977976; x=1695582776; 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=DLmKSMa1dtmq5RxQFju+4i36MfcUsMqK8f/3uROUnOM=; b=EY2IHoephez8ytdOH5EKluexX6syRFfjsG3txFNMQ5YVwZ9dClteZXExTfjNgiCjOT wz/v66z/8+eWGCyt6bAOumcStVN7SEORkN+R16jYATvXTxg/K4sLdQD/hsmAeMlkJrlx CEa4j7igzeDiCC6s4BvIyjRQbVJYZEQENFhrUBrsV1REAT2K51mfSpYz9CragqcYa0gD zl80/xjPx8epofXw5fNNgUBF4X6ZuQ08mbe3+LiRzHW4Am/cR+sqmucz7Uh1YqzdXxwx zC2d2ieqwPN+jTGg9XzSFOFg9Gh2V15VbkjgAPrv+mSTzWgLIUb7tB8TW3zxbXSVj18y zVCA== X-Gm-Message-State: AOJu0YwS8W6DuCqnvqiKJ6p7P8kyyrELuEBQ9OHnu0tQrvQsXG14rCvd Mfh5n0WoOXL6vA/321jXOYm5w24S73I= X-Google-Smtp-Source: AGHT+IFLTmPQrhOJZC7ryH1qYobYJYSYwYpF+MIvyf5secQmjLmINF/Wm7dvyw9SRnhajR9Mm96xWw== X-Received: by 2002:adf:f552:0:b0:319:7624:4c88 with SMTP id j18-20020adff552000000b0031976244c88mr5787356wrp.0.1694977976345; Sun, 17 Sep 2023 12:12:56 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id r6-20020a5d4e46000000b003198a9d758dsm10416451wrt.78.2023.09.17.12.12.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 12:12:55 -0700 (PDT) From: Simon Tournier Date: Sun, 17 Sep 2023 21:12:40 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@gmail.com> References: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@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 The package julia-wcs does not support version higher than 7.x. * gnu/packages/julia-jll.scm (julia-wcslib-jll)[inputs]: Replace wcslib by wcslib-7.12. --- gnu/packages/julia-jll.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 753651cb9e31..1c03b7e58958 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -1792,7 +1792,7 @@ (define-public julia-wcs-jll ;; There's a Julia file for each platform, override them all (find-files "src/wrappers/" "\\.jl$"))))))) (inputs - (list wcslib)) + (list wcslib-7.12)) (propagated-inputs (list julia-jllwrappers)) (home-page "https://github.com/JuliaBinaryWrappers/WCS_jll.jl")