From patchwork Sat Jul 3 17:41:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Baptiste Volatier X-Patchwork-Id: 31093 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 0439B27BC78; Sat, 3 Jul 2021 18:42:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 77D5927BC81 for ; Sat, 3 Jul 2021 18:42:27 +0100 (BST) Received: from localhost ([::1]:42774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzjes-0003FN-HF for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 13:42:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzjeU-0002xb-QW for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56494) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzjeU-0004io-Iw for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzjeU-0007tM-H9 for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48325] [PATCH v5 1/5] gnu: Add utf8proc-2.6.1. Resent-From: Jean-Baptiste Volatier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 17:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48325 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxime Devos , Jean-Baptiste Volatier , zimoun , 48325@debbugs.gnu.org, Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 48325-submit@debbugs.gnu.org id=B48325.162533410730279 (code B ref 48325); Sat, 03 Jul 2021 17:42:02 +0000 Received: (at 48325) by debbugs.gnu.org; 3 Jul 2021 17:41:47 +0000 Received: from localhost ([127.0.0.1]:39798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjeE-0007sJ-Ku for submit@debbugs.gnu.org; Sat, 03 Jul 2021 13:41:47 -0400 Received: from mail-40136.protonmail.ch ([185.70.40.136]:35531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjeB-0007s1-JR for 48325@debbugs.gnu.org; Sat, 03 Jul 2021 13:41:44 -0400 Date: Sat, 03 Jul 2021 17:41:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1625334097; bh=A2DCF7GxXkHtq5P6Q8jBaHQZhc/dDZUGdIXpLBbWFNw=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=KnSkeFJSBNwB8xIpyZIeDj9D9piJi9U0tGvK9q2u8rC+Sm69Wo8ccj6i0/tZrM5S2 q+0qULPJxdqJNUDS9rMd3o2KCTp2Q3Br4cup4rfTFyVILH/wVFFbQgfRMx8XY3lPnw SNhcNaCVYHb7ZHoZODvfnOZYkYo2E2cXBmBXtCdrfHv8V3iJIMShaCGcusQUwTREBZ +rmwD2J+H/tmuxD4CxBN0kvC9nauV4qbnHUxAYDl5cDVTgST3HPPHbnJegT1sXi/vc 5abgwM+X1PxVqxFvy16+BdQQxv3NiS2IDYEJGZrbje9IbwDtV7a67DGD55TlNMOFWq 1K2RzE1Ds1SoA== Message-ID: <20210703174116.21259-2-jbv@pm.me> In-Reply-To: <20210703174116.21259-1-jbv@pm.me> References: <87pmx0kn5p.fsf_-_@gnu.org> <87zgw2znuf.fsf@guix.i-did-not-set--mail-host-address--so-tickle-me> <86v96ejt4s.fsf@gmail.com> <20210629132128.22249-1-jbv@pm.me> <20210629132128.22249-4-jbv@pm.me> <20210703174116.21259-1-jbv@pm.me> 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" Reply-to: Jean-Baptiste Volatier X-ACL-Warn: , Jean-Baptiste Volatier via Guix-patches X-Patchwork-Original-From: Jean-Baptiste Volatier via Guix-patches via From: Jean-Baptiste Volatier X-getmail-retrieved-from-mailbox: Patches * gnu/packages/textutils.scm (utf8proc-2.6.1): New variable. * gnu/packages/textutils.scm (utf8pro): Fix cross-compilation. Co-Authored-By: zimoun . --- gnu/packages/textutils.scm | 46 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) -- 2.32.0 diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index ab34373705..37b925e6d9 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2019 Mădălin Ionel Patrașcu ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,6 +64,7 @@ #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages slang) #:use-module (gnu packages web)) @@ -185,9 +187,9 @@ libenca and several charset conversion libraries and tools.") (modify-phases %standard-phases (delete 'configure) (add-before 'check 'check-data - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) (for-each (lambda (i) - (copy-file (assoc-ref inputs i) + (copy-file (assoc-ref (or native-inputs inputs) i) (string-append "data/" i))) '("NormalizationTest.txt" "GraphemeBreakTest.txt")) (substitute* "data/GraphemeBreakTest.txt" @@ -201,6 +203,46 @@ normalization, case-folding, and other operations for data in the UTF-8 encoding, supporting Unicode version 9.0.0.") (license license:expat))) +(define-public utf8proc-2.6.1 + (package + (inherit utf8proc) + (name "utf8proc") + (version "2.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaStrings/utf8proc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zqc6airkzkssbjxanx5v8blfk90180gc9id0dx8ncs54f1ib8w7")))) + (arguments + (substitute-keyword-arguments (package-arguments utf8proc) + ((#:phases phases) + `(modify-phases ,phases + (replace 'check-data + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (display native-inputs) + (for-each (lambda (i) + (copy-file (assoc-ref (or native-inputs inputs) i) + (string-append "data/" i))) + '("NormalizationTest.txt" "GraphemeBreakTest.txt" + "DerivedCoreProperties.txt")))))))) + (native-inputs + (append + (package-native-inputs utf8proc) + (let ((UNICODE_VERSION "13.0.0")) + `(("DerivedCoreProperties.txt" + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/" + UNICODE_VERSION "/ucd/DerivedCoreProperties.txt")) + (sha256 + (base32 "0j12x112cd8fpgazkc8izxnhhpia44p1m36ff8yapslxndcmzm55")))) + ;; For tests + ("ruby" ,ruby))))))) + (define-public libconfuse (package (name "libconfuse") From patchwork Sat Jul 3 17:41:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Baptiste Volatier X-Patchwork-Id: 31091 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 1972F27BC81; Sat, 3 Jul 2021 18:42:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8BE0027BC78 for ; Sat, 3 Jul 2021 18:42:18 +0100 (BST) Received: from localhost ([::1]:42358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzjej-0002yA-Li for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 13:42:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzjeV-0002xc-5U for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzjeU-0004jA-UT for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzjeU-0007tT-TI for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48325] [PATCH v5 2/5] gnu: Add pcre2-10.36. Resent-From: Jean-Baptiste Volatier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 17:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48325 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxime Devos , Jean-Baptiste Volatier , zimoun , 48325@debbugs.gnu.org, Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 48325-submit@debbugs.gnu.org id=B48325.162533411630305 (code B ref 48325); Sat, 03 Jul 2021 17:42:02 +0000 Received: (at 48325) by debbugs.gnu.org; 3 Jul 2021 17:41:56 +0000 Received: from localhost ([127.0.0.1]:39802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjeO-0007si-3O for submit@debbugs.gnu.org; Sat, 03 Jul 2021 13:41:56 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:51591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjeL-0007sR-Vx for 48325@debbugs.gnu.org; Sat, 03 Jul 2021 13:41:54 -0400 Date: Sat, 03 Jul 2021 17:41:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1625334107; bh=W626Zj490vwDXKJn6Xg8VP091mNy/pEXHTLU+DbfHec=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=Zj3EFwnsqfD6QMjk/I7yexMVEo+1je4zob2rdgZh7XdzzITP89y32kx4dn3PI2OP3 ShS4ELBdnmsaKkd9NJ7DqRYTCkBP5P6V7K6y8c13NxMITHkehMTLrpIDvGij7c83d8 UveMndsd5bu/8KDX6WIpuIHlCvFVe4Xe8PowGgNSiQQCSFrr0nLmaLlQo7MUUCeVia RIk4/h6qx5k/AC8X857Rpa96JB+xoPy1gqAr2X7Ip3dYSeDuL7ZsV71ehIL4eXImXS piSxXoPTKpJ42/a9Ug1lUyzHVLNxsZT5AK0ouLtiDkyVxGRLtuqfY32rdcJnFMH94K gdQki+rPZjkPQ== Message-ID: <20210703174116.21259-3-jbv@pm.me> In-Reply-To: <20210703174116.21259-1-jbv@pm.me> References: <87pmx0kn5p.fsf_-_@gnu.org> <87zgw2znuf.fsf@guix.i-did-not-set--mail-host-address--so-tickle-me> <86v96ejt4s.fsf@gmail.com> <20210629132128.22249-1-jbv@pm.me> <20210629132128.22249-4-jbv@pm.me> <20210703174116.21259-1-jbv@pm.me> 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" Reply-to: Jean-Baptiste Volatier X-ACL-Warn: , Jean-Baptiste Volatier via Guix-patches X-Patchwork-Original-From: Jean-Baptiste Volatier via Guix-patches via From: Jean-Baptiste Volatier X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pcre.scm (pcre2-10.36): New variable. Co-Authored-By: zimoun . --- gnu/packages/pcre.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.32.0 diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index ab48168567..8a1bd487fe 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Ludovic Courtès ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -125,3 +126,16 @@ own native API, as well as a set of wrapper functions that correspond to the POSIX regular expression API.") (license license:bsd-3) (home-page "https://www.pcre.org/"))) + +(define-public pcre2-10.36 + (package + (inherit pcre2) + (name "pcre2") + (version "10.36") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/pcre/pcre2/" + version "/pcre2-" version ".tar.bz2")) + (sha256 + (base32 + "0p3699msps07p40g9426lvxa3b41rg7k2fn7qxl2jm0kh4kkkvx9")))))) From patchwork Sat Jul 3 17:41:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Volatier X-Patchwork-Id: 31092 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 966AA27BC78; Sat, 3 Jul 2021 18:42:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 55FD127BC78 for ; Sat, 3 Jul 2021 18:42:27 +0100 (BST) Received: from localhost ([::1]:42772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzjes-0003FM-EN for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 13:42:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzjeW-0002xe-2L for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56496) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzjeV-0004je-As for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzjeV-0007tb-8v for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48325] [PATCH v5 3/5] gnu: openlibm: Update to 0.7.4. Resent-From: Jean-Baptiste Volatier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 17:42:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48325 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxime Devos , Jean-Baptiste Volatier , zimoun , 48325@debbugs.gnu.org, Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 48325-submit@debbugs.gnu.org id=B48325.162533412230330 (code B ref 48325); Sat, 03 Jul 2021 17:42:03 +0000 Received: (at 48325) by debbugs.gnu.org; 3 Jul 2021 17:42:02 +0000 Received: from localhost ([127.0.0.1]:39806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjeT-0007t2-FH for submit@debbugs.gnu.org; Sat, 03 Jul 2021 13:42:01 -0400 Received: from mail-4323.protonmail.ch ([185.70.43.23]:14884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjeR-0007sb-CB for 48325@debbugs.gnu.org; Sat, 03 Jul 2021 13:41:59 -0400 Date: Sat, 03 Jul 2021 17:41:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1625334113; bh=RTWDbiPMbx7x0sspONvSePKh3cbXu4I0Ixzp/V1io7E=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=Igmp27LD5jQSD6j8eulcvsWtW6ubo1MXqNdiJk+vipEjr0EdtC9l32j+SvamHoMvH GjJV9V6A45yyHI++alkCG1OLdU017prNF+XrBBOry+nWGC7HXrxvl08XI8RhoYalGn zGIRb03gYnfkthhKYojTCiJQx/fGSXwYWV8JYexAWtbvUU7lbx9HFd1Feu1KkFTLbC hW3GKuBdFv+gy0d3aIat/NyRP0OSYYMCKKiDqvODIi+cFE9RH56UPpBE4FduL706Na Sd3syoKHIDIr//LkjwsGA6jUPqq8+StVyhSErdit/iF3xco11RO9Iqg2feLvZQBw2H pC3YfTCxxAamw== Message-ID: <20210703174116.21259-4-jbv@pm.me> In-Reply-To: <20210703174116.21259-1-jbv@pm.me> References: <87pmx0kn5p.fsf_-_@gnu.org> <87zgw2znuf.fsf@guix.i-did-not-set--mail-host-address--so-tickle-me> <86v96ejt4s.fsf@gmail.com> <20210629132128.22249-1-jbv@pm.me> <20210629132128.22249-4-jbv@pm.me> <20210703174116.21259-1-jbv@pm.me> 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" Reply-to: Jean-Baptiste Volatier X-ACL-Warn: , Jean-Baptiste Volatier via Guix-patches X-Patchwork-Original-From: Jean-Baptiste Volatier via Guix-patches via From: Jean-Baptiste Volatier X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (openlibm): Update to 0.7.4. --- gnu/packages/maths.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.32.0 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 93b8ee2ad4..335c745956 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4002,7 +4002,7 @@ access to BLIS implementations via traditional BLAS routine calls.") (define-public openlibm (package (name "openlibm") - (version "0.6.0") + (version "0.7.4") (source (origin (method git-fetch) @@ -4011,11 +4011,11 @@ access to BLIS implementations via traditional BLAS routine calls.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "08wfchmmr5200fvmn1kwq9byc1fhsq46hn0y5k8scdl74771c7gh")))) + (base32 "1azms0lpxb7vxb3bln5lyz0wpwx6jnzbffkclclpq2v5aiw8d14i")))) (build-system gnu-build-system) (arguments `(#:make-flags - (list (string-append "prefix=" (assoc-ref %outputs "out"))) + (list (string-append "prefix=" (assoc-ref %outputs "out")) ,(string-append "CC=" (cc-for-target))) #:phases ;; no configure script (modify-phases %standard-phases (delete 'configure)) From patchwork Sat Jul 3 17:41:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Volatier X-Patchwork-Id: 31094 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 4704227BC81; Sat, 3 Jul 2021 18:43:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0B14B27BC78 for ; Sat, 3 Jul 2021 18:43:12 +0100 (BST) Received: from localhost ([::1]:43224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzjfb-0003Zs-36 for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 13:43:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzjfR-0003ZZ-SL for guix-patches@gnu.org; Sat, 03 Jul 2021 13:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzjfR-0005Nc-LM for guix-patches@gnu.org; Sat, 03 Jul 2021 13:43:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzjfR-0007vQ-Jp for guix-patches@gnu.org; Sat, 03 Jul 2021 13:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48325] [PATCH v5 4/5] gnu: julia-staticarrays: Update to 1.2.5 Resent-From: Jean-Baptiste Volatier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 17:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48325 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxime Devos , Jean-Baptiste Volatier , zimoun , 48325@debbugs.gnu.org, Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 48325-submit@debbugs.gnu.org id=B48325.162533412930388 (code B ref 48325); Sat, 03 Jul 2021 17:43:01 +0000 Received: (at 48325) by debbugs.gnu.org; 3 Jul 2021 17:42:09 +0000 Received: from localhost ([127.0.0.1]:39814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjea-0007u4-V5 for submit@debbugs.gnu.org; Sat, 03 Jul 2021 13:42:09 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:22797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjeZ-0007t8-GT for 48325@debbugs.gnu.org; Sat, 03 Jul 2021 13:42:07 -0400 Date: Sat, 03 Jul 2021 17:41:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1625334121; bh=Wdzo1MHeokoW09Th9hsiXyBs1PSldbTNAtlRSu/gqVc=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=COpoLu8ZNk8eAkvQyQ5eBrA+nJn8klth5jGpI3r8R9mVM2bk4TOSYJz1uG8WT66nL yXwUzhjRPjVHGGYpuV2ze7tTi68OSQTElLtSIy5/1iH2uefAMmK+wC9TvG4P3sFa/K 9crG6KHh/iXVehdB3lIJw9jv8hOJ91FK3XpoufSmrsepdSYp2JB/TljHNvj4Z0PQor 8QFBCMOUVjdBnklj2m5MHroNsCtzFIxXqI1nx907zxTAq1SB3PEC65+XIP6BkZ31Sc uV/g8abaekfDOQVl8SGMwP4++WfAIG+WS6QNdZGYg4xMRxwV/HPVcq+WJADd+tEwq2 xjDAKp1f23PUg== Message-ID: <20210703174116.21259-5-jbv@pm.me> In-Reply-To: <20210703174116.21259-1-jbv@pm.me> References: <87pmx0kn5p.fsf_-_@gnu.org> <87zgw2znuf.fsf@guix.i-did-not-set--mail-host-address--so-tickle-me> <86v96ejt4s.fsf@gmail.com> <20210629132128.22249-1-jbv@pm.me> <20210629132128.22249-4-jbv@pm.me> <20210703174116.21259-1-jbv@pm.me> 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" Reply-to: Jean-Baptiste Volatier X-ACL-Warn: , Jean-Baptiste Volatier via Guix-patches X-Patchwork-Original-From: Jean-Baptiste Volatier via Guix-patches via From: Jean-Baptiste Volatier X-getmail-retrieved-from-mailbox: Patches * gnu/packages/julia-xyz.scm (julia-staticarrays): Update to 1.2.5 --- gnu/packages/julia-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.32.0 diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 50effa43f4..b2c7d93589 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -3566,7 +3566,7 @@ types and a common interface that is shared between them.") (define-public julia-staticarrays (package (name "julia-staticarrays") - (version "1.2.0") + (version "1.2.5") (source (origin (method git-fetch) @@ -3575,7 +3575,7 @@ types and a common interface that is shared between them.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0z4g1kk6gy514dyafb559gcp4264ffx6h28ffczdvkyk8gm9j0m7")))) + (base32 "0vvs1kwpax18iyhiivznhq49nid0zh4fbfxyq99h0n3x2s1hzyi6")))) (build-system julia-build-system) (inputs `(("julia-benchmarktools" ,julia-benchmarktools))) From patchwork Sat Jul 3 17:41:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Baptiste Volatier X-Patchwork-Id: 31095 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 813F327BC81; Sat, 3 Jul 2021 18:43:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EBDFB27BC78 for ; Sat, 3 Jul 2021 18:43:14 +0100 (BST) Received: from localhost ([::1]:43252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzjfe-0003b5-2Z for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 13:43:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzjfS-0003Zb-7k for guix-patches@gnu.org; Sat, 03 Jul 2021 13:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzjfS-0005Nh-0t for guix-patches@gnu.org; Sat, 03 Jul 2021 13:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzjfS-0007vY-07 for guix-patches@gnu.org; Sat, 03 Jul 2021 13:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48325] [PATCH v5 5/5] DRAFT gnu: julia: Update to 1.6.1. Resent-From: Jean-Baptiste Volatier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 17:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48325 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxime Devos , Jean-Baptiste Volatier , zimoun , 48325@debbugs.gnu.org, Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 48325-submit@debbugs.gnu.org id=B48325.162533414330421 (code B ref 48325); Sat, 03 Jul 2021 17:43:01 +0000 Received: (at 48325) by debbugs.gnu.org; 3 Jul 2021 17:42:23 +0000 Received: from localhost ([127.0.0.1]:39818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjef-0007uM-5a for submit@debbugs.gnu.org; Sat, 03 Jul 2021 13:42:22 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:59985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjeb-0007ts-72 for 48325@debbugs.gnu.org; Sat, 03 Jul 2021 13:42:11 -0400 Date: Sat, 03 Jul 2021 17:41:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1625334122; bh=002+DEioll+luE9jtifkjzy9XGnF7yqbM5L9oJHpVZQ=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=LjVUuEaYKPHeApZKlEpy4b0KIYqxGdms/JpV63YiRS8BXUwZ7iN8l6EkEuwp0+H8N /3XbMLFPd7x/QasLUvvYmT5F7y5Zkn+Dg2gjp2nP7DXh4I7D9hD8VUb2ayEriHi1yG r7sB9FokvsP0F+KzVIcuY7SgUnlWpKAKDlJ8P3U0KhQ2jTM99lO9JgRHeh78jjj/aw XMggcZf9uCEFYaTkySuut5RdNssrlKcDslSV6H0hF7pNTjnf2LrOz/lFuES2aN4hWw 2WubXxht7ajsTbJO9C5l55tyjypCTSeeu+vMMl42kPQL0flOcVQ9qXDKZJEY+L3adO ZgMwHmDXv15Kg== Message-ID: <20210703174116.21259-6-jbv@pm.me> In-Reply-To: <20210703174116.21259-1-jbv@pm.me> References: <87pmx0kn5p.fsf_-_@gnu.org> <87zgw2znuf.fsf@guix.i-did-not-set--mail-host-address--so-tickle-me> <86v96ejt4s.fsf@gmail.com> <20210629132128.22249-1-jbv@pm.me> <20210629132128.22249-4-jbv@pm.me> <20210703174116.21259-1-jbv@pm.me> 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" Reply-to: Jean-Baptiste Volatier X-ACL-Warn: , Jean-Baptiste Volatier via Guix-patches X-Patchwork-Original-From: Jean-Baptiste Volatier via Guix-patches via From: Jean-Baptiste Volatier X-getmail-retrieved-from-mailbox: Patches * gnu/packages/julia.scm (julia): Update to 1.6.1. [arguments]<#:phases>: Fixed paths to shared objects in 'shared-objects-paths phase, Fix tests that did not propagate GUIX_LOCPATH in 'fix-setenv, Add symlinks to libs in 'symlink-libraries [arguments]<:make-flags>: Added generic,-cx16 target for better compatibility [inputs]: Add nghttp2:lib, Add gfortran:lib, Add curl-ssh, Remove arpack-ng. [native-inputs]: Add nss-certs. * gnu/packages/julia.scm (curl-ssh): New variable. * gnu/packages/julia.scm (llvm-julia): Update to 11.0.0 [source]: Move julia specific patches to a julia-patches phase. [arguments]<#:phases>: Apply julia specific patches in 'julia-patches phase Co-Authored-By: Nicolò Balzarotti . Co-Authored-By: zimoun . --- gnu/packages/julia.scm | 353 ++++++++++++++++++++++++++++------------- 1 file changed, 239 insertions(+), 114 deletions(-) -- 2.32.0 diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 13c9f7baf1..9903bb009b 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -1,9 +1,11 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016, 2020 Efraim Flashner -;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020, 2021 Nicolò Balzarotti ;;; Copyright © 2020 Tim Howes ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2021 Jean-Baptiste Volatier +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +32,7 @@ #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages base) + #:use-module (gnu packages certs) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages elf) @@ -48,14 +51,15 @@ #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages web) #:use-module (gnu packages wget) #:use-module (ice-9 match)) (define libuv-julia - (let ((commit "1fcc6d66f9df74189c74d3d390f02202bb7db953") - (revision "2")) + (let ((commit "fb3e3364c33ae48c827f6b103e05c3f0e78b79a9") + (revision "3")) ;; When upgrading Julia, also upgrade this. Get the commit from - ;; https://github.com/JuliaLang/julia/blob/v1.5.2/deps/libuv.version + ;; https://github.com/JuliaLang/julia/blob/v1.6.0/deps/libuv.version (package (inherit libuv) (name "libuv-julia") @@ -68,7 +72,7 @@ (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "040l7f1hk7xyza11sry5cj4fhw05na949865axqqhxnifdvnmfji")))) + "1kqpn19d20aka30h6q5h8lnzyp0vw0xzgx0wm4w2r5j6yf76m2hr")))) (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments libuv) @@ -97,7 +101,9 @@ (julia-patch "libunwind-prefer-extbl" "0lr4dafw8qyfh8sw8hhbwkql1dlhqv8px7k81y2l20hhxfgnh2m1") (julia-patch "libunwind-static-arm" - "1jk3bmiw61ypcchqkk1fyg5wh8wpggk574wxyfyaic870zh3lhgq"))))) + "1jk3bmiw61ypcchqkk1fyg5wh8wpggk574wxyfyaic870zh3lhgq") + (julia-patch "libunwind-cfa-rsp" + "1aswjhvysahhldbzh1afbf0hsjxrvs6xidsz2i7s1cjkjbdiia1z"))))) (home-page "https://github.com/JuliaLang/tree/master/deps/"))) (define (julia-patch-url version name) @@ -105,7 +111,7 @@ "/deps/patches/" name ".patch")) (define (julia-patch name sha) - (let ((version "1.5.3")) + (let ((version "1.6.1")) (origin (method url-fetch) (uri (julia-patch-url version name)) (sha256 (base32 sha)) @@ -113,52 +119,10 @@ (define llvm-julia (package - (inherit llvm-9) + (inherit llvm-11) (name "llvm-julia") - (source (origin - (inherit (package-source llvm-9)) - ;; Those patches are inside the Julia source repo. - ;; They are _not_ Julia specific (https://github.com/julialang/julia#llvm) - ;; but they are required to build Julia. - ;; Discussion: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919628 - (patches - (map (match-lambda - ((name hash) - (julia-patch name hash))) - (list - '("llvm-D27629-AArch64-large_model_6.0.1" - "1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm2j4z") - '("llvm8-D34078-vectorize-fdiv" - "19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602") - '("llvm-7.0-D44650" - "1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir") - '("llvm9-D50010-VNCoercion-ni" - "1s1d3sjsiq4vxg7ncy5cz56zgy5vcq6ls3iqaiqkvr23wyryqmdx") - '("llvm-exegesis-mingw" - "0ph1cj1j7arvf1xq2xcr7qf9g0cpdl14fincgr67vpi520zvd3vp") - '("llvm-test-plugin-mingw" - "12z738cnahbf6n381im7i0hxp1m6k9hrnfjlmq9sac46nxly9gnj") - '("llvm7-revert-D44485" - "0f59kq3p3mpwsbmskypbi4zn01l6ig0x7v2rjp08k2r8z8m6fa8n") - '("llvm-8.0-D66657-codegen-degenerate" - "1n1ddx19h90bbpimdyd9dh8fsm6gb93xxyqm4ljkxa1k3cx2vm72") - '("llvm-8.0-D71495-vectorize-freduce" - "1zff08wvji9lnpskk4b3p5zyjsy5hhy23ynxjqlj9dw7jvvfrf0p") - '("llvm-D75072-SCEV-add-type" - "029a3fywsm233vf48mscina24idd50dc75wr70lmimrhwnw27p0z") - '("llvm-9.0-D65174-limit-merge-stores" - "04bff1mnblfj9mxfdwr1qdnw3i3szmp60gnhxwas5y68qg33z6j0") - '("llvm9-D71443-PPC-MC-redef-symbol" - "1c93nv7rgc9jg5mqrnvv08xib1789qvlql94fwggh18mp3b9hbgy") - '("llvm-9.0-D78196" - "08a43hyg7yyqjq2vmfsmppf34xcz60wq6y9zw5fdyhw2h1mcnmns") - '("llvm-julia-tsan-custom-as" - "0awh40kf6lm4wn1nsjd1bmhfwq7rqj811szanp2xkpspykw9hg9s") - '("llvm-9.0-D85499" - "0vxlr35srvbvihlgrxq15v6dylp90vgi0qahj22j01jgqmdasjkm")))) - (patch-flags '("-p1")))) (arguments - (substitute-keyword-arguments (package-arguments llvm-9) + (substitute-keyword-arguments (package-arguments llvm-11) ((#:configure-flags flags) `(list ;; Taken from NixOS. Only way I could get libLLVM-6.0.so "-DCMAKE_BUILD_TYPE=Release" @@ -177,7 +141,61 @@ ;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" ;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LINK_LLVM_DYLIB=ON")))))) + "-DLLVM_LINK_LLVM_DYLIB=ON")) + ((#:phases phases) + `(modify-phases ,phases + ;; applying patches from julia + ;; list of patches can be found in deps/llvm.mk in julia source + (add-after 'unpack 'julia-patches + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((patch + (lambda (patchname flag) + (invoke "patch" flag "-i" + (string-append + "julia-src/deps/patches/" + patchname + ".patch"))))) + (mkdir-p "julia-src") + (invoke "tar" "xf" + (assoc-ref inputs "julia-source") + "-C" "julia-src" "--strip-components=1") + (map (lambda (patchname) + (patch patchname "-p1")) + (list "llvm-D27629-AArch64-large_model_6.0.1" + "llvm8-D34078-vectorize-fdiv" + "llvm-7.0-D44650" + "llvm-6.0-DISABLE_ABI_CHECKS" + "llvm9-D50010-VNCoercion-ni" + "llvm7-revert-D44485" + "llvm-11-D75072-SCEV-add-type" + "llvm-julia-tsan-custom-as" + "llvm-D80101" + "llvm-D84031" + "llvm-10-D85553" + "llvm-10-unique_function_clang-sa" + "llvm-11-D85313-debuginfo-empty-arange" + "llvm-11-D90722-rtdyld-absolute-relocs" + "llvm-invalid-addrspacecast-sink" + "llvm-11-D92906-ppc-setjmp" + "llvm-11-PR48458-X86ISelDAGToDAG" + "llvm-11-D93092-ppc-knownbits" + "llvm-11-D93154-globalisel-as" + "llvm-11-ppc-half-ctr" + "llvm-11-ppc-sp-from-bp" + "llvm-rGb498303066a6-gcc11-header-fix" + "llvm-11-D94813-mergeicmps" + "llvm-11-D94980-CTR-half" + "llvm-11-D94058-sext-atomic-ops" + "llvm-11-D96283-dagcombine-half")) + (map (lambda (patchname) + (patch patchname "-p2")) + (list "llvm-11-AArch64-FastIsel-bug" + "llvm-11-D97435-AArch64-movaddrreg" + "llvm-11-D97571-AArch64-loh" + "llvm-11-aarch64-addrspace"))))))))) + (inputs + `(("julia-source" ,(package-source julia)) + ,@(package-inputs llvm-11))))) (define-public libwhich (package @@ -220,10 +238,22 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (license license:expat))) +(define curl-ssh + (package + (inherit curl) + (arguments + (substitute-keyword-arguments (package-arguments curl) + ((#:configure-flags flags) + `(cons "--with-libssh2" ,flags)))) + (inputs + `(("libssh2" ,libssh2) + ,@(package-inputs curl))) + )) + (define-public julia (package (name "julia") - (version "1.5.3") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append @@ -231,9 +261,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") version "/julia-" version ".tar.gz")) (sha256 (base32 - "1zmim82x9kkdcgn0cdi01hmzi59zbszy1sqlygb86xq4hc1n66dy")) - (patches - (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch")))) + "1mfzbjyqcmx7wb1sa7qab5fl78yzd7ap088krqbphbwvpn880srn")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -259,14 +287,13 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (string-join (map (lambda (pkg) (string-append (assoc-ref inputs pkg) "/lib")) - '("arpack-ng" "curl" "dsfmt" + '("curl" "dsfmt" "gmp" "lapack" - "libssh2" "libgit2" + "libssh2" "libnghttp2" "libgit2" "mbedtls" "mpfr" "openblas" "openlibm" "pcre2" - "suitesparse")) - ":")) - #t)) + "suitesparse" "libfortran")) + ":")))) ;; FIXME: Building the documentation requires Julia packages that ;; would be downloaded from the Internet. We should build them in a ;; separate build phase. @@ -304,7 +331,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") "$(BUILDDIR)/$(EXENAME)-debug\\$\\(EXE\\): $(DOBJS) $(LLT_debug)")) ;; The REPL must be linked with libuv. - (substitute* "ui/Makefile" + (substitute* "cli/Makefile" (("JLDFLAGS \\+= ") (string-append "JLDFLAGS += " (assoc-ref %build-inputs "libuv") @@ -320,27 +347,82 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (substitute* "base/client.jl" (("/bin/sh") (which "sh"))) #t)) - (add-before 'build 'fix-precompile - (lambda _ - (substitute* "base/loading.jl" - (("something(Base.active_project(), \"\")") "\"\"")) + (add-before 'build 'shared-objects-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((jlpath + (lambda (pkgname) + (string-append + "stdlib/" pkgname "_jll/src/" pkgname "_jll.jl"))) + (from + (lambda (libname) + (string-append "const " libname " = .*\\.so"))) + (to + (lambda* (pkg libname #:optional libname_jl) + (string-append + "const " (or libname_jl libname) "= \"" + (assoc-ref inputs pkg) "/lib/" libname ".so")))) + (substitute* (jlpath "dSFMT") + (((from "libdSFMT")) (to "dsfmt" "libdSFMT"))) + (substitute* (jlpath "GMP") + (((from "libgmp")) (to "gmp" "libgmp")) + (((from "libgmpxx")) (to "gmp" "libgmpxx"))) + (substitute* (jlpath "libLLVM") + (((from "libLLVM")) (to "llvm" "libLLVM"))) + (substitute* (jlpath "LibCURL") + (((from "libcurl")) (to "curl" "libcurl"))) + (substitute* (jlpath "LibGit2") + (((from "libgit2")) (to "libgit2" "libgit2"))) + (substitute* (jlpath "LibSSH2") + (((from "libssh2")) (to "libssh2" "libssh2"))) + (substitute* (jlpath "LibUV") + (((from "libuv")) (to "libuv" "libuv"))) + (substitute* (jlpath "LibUnwind") + (((from "libunwind")) (to "libunwind" "libunwind"))) + (substitute* (jlpath "MPFR") + (((from "libmpfr")) (to "mpfr" "libmpfr"))) + (substitute* (jlpath "MbedTLS") + (((from "libmbedcrypto")) (to "mbedtls" "libmbedcrypto")) + (((from "libmbedtls")) (to "mbedtls" "libmbedtls")) + (((from "libmbedx509")) (to "mbedtls" "libmbedx509"))) + (substitute* (jlpath "nghttp2") + (((from "libnghttp2")) (to "libnghttp2" "libnghttp2"))) + (substitute* (jlpath "OpenBLAS") + (((from "libopenblas")) (to "openblas" "libopenblas"))) + (substitute* (jlpath "OpenLibm") + (((from "libopenlibm")) (to "openlibm" "libopenlibm"))) + (substitute* (jlpath "PCRE2") + (((from "libpcre2")) (to "pcre2" "libpcre2" "libpcre2_8"))) + (substitute* (jlpath "SuiteSparse") + (((from "libamd")) (to "suitesparse" "libamd")) + (((from "libbtf")) (to "suitesparse" "libbtf")) + (((from "libcamd")) (to "suitesparse" "libcamd")) + (((from "libccolamd")) (to "suitesparse" "libccolamd")) + (((from "libcholmod")) (to "suitesparse" "libcholmod")) + (((from "libcolamd")) (to "suitesparse" "libcolamd")) + (((from "libklu")) (to "suitesparse" "libklu")) + (((from "libldl")) (to "suitesparse" "libldl")) + (((from "librbio")) (to "suitesparse" "librbio")) + (((from "libspqr")) (to "suitesparse" "libspqr")) + (((from "libsuitesparse")) (to "suitesparse" "libsuitesparse")) + (((from "libsuitesparseconfig")) (to "suitesparse" "libsuitesparseconfig")) + (((from "libumfpack")) (to "suitesparse" "libumfpack"))) + (substitute* (jlpath "Zlib") + (((from "libz")) (to "zlib" "libz")))) #t)) + (add-before 'check 'fix-setenv + (lambda* (#:key inputs #:allow-other-keys) + ;; some tests execute julia in an environment that needs to propagate GUIX_LOCPATH + (substitute* "test/cmdlineargs.jl" + (("\"HOME\"\\s=>\\shomedir\\(\\)") + "\"HOME\" => homedir(), \"GUIX_LOCPATH\" => ENV[\"GUIX_LOCPATH\"]")))) (add-before 'check 'disable-broken-tests (lambda _ (substitute* "test/choosetests.jl" - (("tests = testnames") - ;; Those failings are not deterministic. They depends on the - ;; running order. I think it depends on the number of - ;; runners, disabling it for now - ;; https://github.com/JuliaLang/julia/issues/34330 - "tests = filter(e->!in(e,[\"backtrace\",\"exceptions\",\"precompile\", - \"client\",\"stacktraces\"]), - testnames)")) - ;; Marking the test as broken as it's a known bug: - ;; https://github.com/JuliaLang/julia/issues/32377 - (substitute* "stdlib/REPL/test/replcompletions.jl" - (("@test count") "@test_broken count")) - ;; Dates has a similar bug: + (("skip_tests = \\[\\]") + ;; disabling REPL tests because they require a stdin + ;; disabling tests for MPFR, MbedTLS and SuiteSparse because they only check for hardcoded versions + "skip_tests = [\"REPL\", \"MPFR_jll\", \"MbedTLS_jll\", \"SuiteSparse_jll\"]")) + ;; Dates/io tests fail on master when networking is unavailable ;; https://github.com/JuliaLang/julia/issues/34655 (substitute* "stdlib/Dates/test/io.jl" (("\"Dates.Date") "\"Date") @@ -349,11 +431,43 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") ;; https://github.com/JuliaLang/julia/issues/35785 (substitute* "test/file.jl" (("@test dirname\\(t\\) == d") "@test_broken dirname(t) == d")) - ;; Deprecation test fails with --depwarn=no - ;; https://github.com/JuliaLang/julia/issues/37673 - (substitute* "test/Makefile" - (("./runtests.jl") "--depwarn=error ./runtests.jl")) + ;; julia embeds a certificate, we are not doing that + (substitute* "stdlib/MozillaCACerts_jll/test/runtests.jl" + (("@test isfile\\(MozillaCACerts_jll.cacert\\)") "@test_broken isfile(MozillaCACerts_jll.cacert)")) + ;; since certificate is not present some tests are failing in network option + (substitute* "usr/share/julia/stdlib/v1.6/NetworkOptions/test/runtests.jl" + (("@test isfile\\(bundled_ca_roots\\(\\)\\)") "@test_broken isfile(bundled_ca_roots())") + (("@test ispath\\(ca_roots_path\\(\\)\\)") "@test_broken ispath(ca_roots_path())") + (("@test ca_roots_path\\(\\) \\!= bundled_ca_roots\\(\\)") "@test_broken ca_roots_path() != bundled_ca_roots()")) #t)) + (add-before 'install 'symlink-libraries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((link + (lambda (pkgname dir pred) + (map (lambda (file) + (invoke "ln" "-s" file dir)) + (find-files (string-append (assoc-ref inputs pkgname) "/lib") pred))))) + (link "curl" "usr/lib/" "\\.so") ;; missing libpthreads libLLVM-11jl + (link "suitesparse" "usr/lib/julia/" "libbtf\\.so") + (link "suitesparse" "usr/lib/julia/" "libklu\\.so") + (link "suitesparse" "usr/lib/julia/" "libldl\\.so") + (link "suitesparse" "usr/lib/julia/" "librbio\\.so") + (link "gmp" "usr/lib/julia/" "libgmpxx\\.so") + (link "libuv" "usr/lib/julia/" "libuv\\.so") + (link "zlib" "usr/lib/julia/" "libz\\.so") + (link "libunwind" "usr/lib/julia/" "libunwind\\.so") + (invoke "ln" "-s" (string-append (assoc-ref inputs "p7zip") "/bin/7z") "usr/bin/") + #t))) + (add-after 'install 'symlink-llvm-utf8proc + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((link + (lambda (pkgname pred) + (map (lambda (file) + (invoke "ln" "-s" file (string-append (assoc-ref outputs "out") "/lib/julia/"))) + (find-files (string-append (assoc-ref inputs pkgname) "/lib") pred))))) + (link "llvm" "libLLVM-11\\.so") + (link "utf8proc" "libutf8proc\\.so") + #t))) (add-after 'install 'make-wrapper (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -370,7 +484,10 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) - + ;; Adding generic,-cx16 target to the list of defaults target for better compatibility + ;; clone_all is required otherwise julia complains during compilation + ;; see https://docs.julialang.org/en/v1/devdocs/sysimg/#Specifying-multiple-system-image-targets + "JULIA_CPU_TARGET=generic;generic,-cx16,clone_all;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" ;; Passing the MARCH flag is necessary to build binary substitutes for ;; the supported architectures. ,(match (or (%current-target-system) @@ -382,69 +499,76 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") ;; platforms, e.g. when running "guix package --search=" (_ "MARCH=UNSUPPORTED")) - "CONFIG_SHELL=bash" ;needed to build bundled libraries + "CONFIG_SHELL=bash -x" ;needed to build bundled libraries + "USE_BINARYBUILDER=0" ;; list of "USE_SYSTEM_*" is here: - ;; https://github.com/JuliaLang/julia/blob/v1.3.1/Make.inc + ;; https://github.com/JuliaLang/julia/blob/v1.6.0/Make.inc + ;; + "USE_SYSTEM_CSL=1" + "USE_SYSTEM_LLVM=1" + "USE_SYSTEM_LIBUNWIND=1" + "USE_SYSTEM_PCRE=1" + "USE_SYSTEM_OPENLIBM=1" + "USE_SYSTEM_DSFMT=1" + "USE_SYSTEM_BLAS=1" + "USE_SYSTEM_LAPACK=1" + "USE_SYSTEM_GMP=1" + "USE_SYSTEM_MPFR=1" + "USE_SYSTEM_SUITESPARSE=1" + "USE_SYSTEM_LIBUV=1" + "USE_SYSTEM_UTF8PROC=1" + "USE_SYSTEM_MBEDTLS=1" + "USE_SYSTEM_LIBSSH2=1" + "USE_SYSTEM_NGHTTP2=1" + "USE_SYSTEM_CURL=1" + "USE_SYSTEM_LIBGIT2=1" + "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_ZLIB=1" + "USE_SYSTEM_P7ZIP=1" "USE_SYSTEM_DSFMT=1" "USE_SYSTEM_P7ZIP=1" "USE_SYSTEM_LAPACK=1" - "USE_SYSTEM_BLAS=1" + "USE_SYSTEM_CURL=1" "USE_BLAS64=0" ;needed when USE_SYSTEM_BLAS=1 "LIBBLAS=-lopenblas" "LIBBLASNAME=libopenblas" - "USE_SYSTEM_SUITESPARSE=1" (string-append "SUITESPARSE_INC=-I " (assoc-ref %build-inputs "suitesparse") "/include") + "USE_GPL_LIBS=1" ;proudly - "USE_SYSTEM_UTF8PROC=1" (string-append "UTF8PROC_INC=" (assoc-ref %build-inputs "utf8proc") "/include") - "USE_SYSTEM_LLVM=1" - "LLVM_VER=9.0.1" + "LLVM_VER=11.0.0" "USE_LLVM_SHLIB=1" - "USE_SYSTEM_LIBUNWIND=1" - "USE_SYSTEM_LIBUV=1" (string-append "LIBUV=" (assoc-ref %build-inputs "libuv") "/lib/libuv.so") (string-append "LIBUV_INC=" (assoc-ref %build-inputs "libuv") - "/include") - "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_PCRE=1" - "USE_SYSTEM_OPENLIBM=1" - "USE_SYSTEM_MBEDTLS=1" - "USE_SYSTEM_LIBSSH2=1" - "USE_SYSTEM_GMP=1" - "USE_SYSTEM_MPFR=1" - "USE_SYSTEM_ARPACK=1" - "USE_SYSTEM_LIBGIT2=1" - "USE_SYSTEM_ZLIB=1"))) + "/include")))) (inputs `(("llvm" ,llvm-julia) ("p7zip" ,p7zip) - ;; The bundled version is 3.3.0 so stick to that version. With other - ;; versions, we get test failures in 'linalg/arnoldi' as described in - ;; . - ("arpack-ng" ,arpack-ng-3.3.0) - ("coreutils" ,coreutils) ;for bindings to "mkdir" and the like ("lapack" ,lapack) ("openblas" ,openblas) ;Julia does not build with Atlas ("libunwind" ,libunwind-julia) ("openlibm" ,openlibm) ("mbedtls" ,mbedtls-apache) - ("curl" ,curl) - ("libgit2" ,libgit2-0.28) + ("curl" ,curl-ssh) + ("libnghttp2" ,nghttp2 "lib") + ("libgit2" ,libgit2) ("libssh2" ,libssh2) ("fortran" ,gfortran) + ;; required for libgcc_s.so + ("libfortran" ,gfortran "lib") ("libuv" ,libuv-julia) - ("pcre2" ,pcre2) - ("utf8proc" ,utf8proc) + ("pcre2" ,pcre2-10.36) + ("utf8proc" ,utf8proc-2.6.1) ("mpfr" ,mpfr) ("wget" ,wget) ("which" ,which) @@ -452,7 +576,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") ("gmp" ,gmp) ("suitesparse" ,suitesparse) ;; Find dependencies versions here: - ;; https://raw.githubusercontent.com/JuliaLang/julia/v1.3.0/deps/Versions.make + ;; https://raw.githubusercontent.com/JuliaLang/julia/v1.6.0/deps/Versions.make ("libwhich" ,libwhich) ("dsfmt" ,dsfmt))) (native-inputs @@ -460,6 +584,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") ("perl" ,perl) ("patchelf" ,patchelf) ("pkg-config" ,pkg-config) + ("nss-certs" ,nss-certs) ("python" ,python-2))) (native-search-paths (list (search-path-specification