Package: guix-patches;
Reported by: Efraim Flashner <efraim <at> flashner.co.il>
Date: Mon, 21 Feb 2022 12:49:02 UTC
Severity: normal
Tags: patch
Done: Efraim Flashner <efraim <at> flashner.co.il>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 54088 in the body.
You can then email your comments to 54088 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Mon, 21 Feb 2022 12:49:02 GMT) Full text and rfc822 format available.Efraim Flashner <efraim <at> flashner.co.il>:guix-patches <at> gnu.org.
(Mon, 21 Feb 2022 12:49:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Efraim Flashner <efraim <at> flashner.co.il> To: guix-patches <at> gnu.org, zimon.toutoune <at> gmail.com Cc: Efraim Flashner <efraim <at> flashner.co.il> Subject: [PATCH 0/2] julia-build-system: Add missing julia-pkg-deps Date: Mon, 21 Feb 2022 14:47:05 +0200
It turns out we didn't expose julia-package-dependencies in the julia-build-system, making the created Package.toml incomplete. This corrects the omission and fixes the one package where it is manually added. Efraim Flashner (2): build: julia: Add julia-package-dependencies as keyword. gnu: julia-media: Use julia-package-dependencies. gnu/packages/julia-xyz.scm | 15 ++------------- guix/build-system/julia.scm | 5 ++++- guix/build/julia-build-system.scm | 7 ++++++- 3 files changed, 12 insertions(+), 15 deletions(-) base-commit: 7eefff2054b94f8a7ad850ad8f36b8773bb39ce9 -- 2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Mon, 21 Feb 2022 12:53:01 GMT) Full text and rfc822 format available.Message #8 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: Efraim Flashner <efraim <at> flashner.co.il> To: 54088 <at> debbugs.gnu.org, zimon.toutoune <at> gmail.com Cc: Efraim Flashner <efraim <at> flashner.co.il> Subject: [PATCH 1/2] build: julia: Add julia-package-dependencies as keyword. Date: Mon, 21 Feb 2022 14:51:20 +0200
* guix/build-system/julia.scm (link-depot): Accept
julia-package-dependencies keyword and use it for
julia-create-package-toml function.
(julia-build): Add julia-pacakge-dependencies.
* guix/build/julia-build-system.scm (julia-build): Add
julia-package-dependencies keyword.
---
guix/build-system/julia.scm | 5 ++++-
guix/build/julia-build-system.scm | 7 ++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm
index 6261f8a55a..66eec65ef1 100644
--- a/guix/build-system/julia.scm
+++ b/guix/build-system/julia.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2021 Ludovic Courtès <ludo <at> gnu.org>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv <at> pm.me>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune <at> gmail.com>
+;;; Copyright © 2022 Efraim Flashner <efraim <at> flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -88,6 +89,7 @@ (define* (julia-build name inputs
(guile #f)
(julia-package-name #f)
(julia-package-uuid #f)
+ (julia-package-dependencies #f)
(imported-modules %julia-build-system-modules)
(modules '((guix build julia-build-system)
(guix build utils))))
@@ -108,7 +110,8 @@ (define builder
search-paths))
#:inputs #$(input-tuples->gexp inputs)
#:julia-package-name #$julia-package-name
- #:julia-package-uuid #$julia-package-uuid))))
+ #:julia-package-uuid #$julia-package-uuid
+ #:julia-package-dependencies #$julia-package-dependencies))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))
diff --git a/guix/build/julia-build-system.scm b/guix/build/julia-build-system.scm
index 03d669be64..fb524f03d7 100644
--- a/guix/build/julia-build-system.scm
+++ b/guix/build/julia-build-system.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2019, 2020 Nicolò Balzarotti <nicolo <at> nixo.xyz>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv <at> pm.me>
;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune <at> gmail.com>
+;;; Copyright © 2022 Efraim Flashner <efraim <at> flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -136,7 +137,8 @@ (define* (check #:key tests? source inputs outputs julia-package-name
package "/test/runtests.jl"))))))
(define* (link-depot #:key source inputs outputs
- julia-package-name julia-package-uuid #:allow-other-keys)
+ julia-package-name julia-package-uuid
+ julia-package-dependencies #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(name+version (strip-store-file-name out))
(version (last (string-split name+version #\-)))
@@ -156,6 +158,7 @@ (define* (link-depot #:key source inputs outputs
(julia-create-package-toml (getcwd)
julia-package-name julia-package-uuid
version
+ julia-package-dependencies
#:file "Project.toml"))
;; When installing a package, julia looks first at in the JULIA_DEPOT_PATH
@@ -207,6 +210,7 @@ (define %standard-phases
(delete 'build)))
(define* (julia-build #:key inputs julia-package-name julia-package-uuid
+ julia-package-dependencies
(phases %standard-phases)
#:allow-other-keys #:rest args)
"Build the given Julia package, applying all of PHASES in order."
@@ -214,4 +218,5 @@ (define* (julia-build #:key inputs julia-package-name julia-package-uuid
#:inputs inputs #:phases phases
#:julia-package-name julia-package-name
#:julia-package-uuid julia-package-uuid
+ #:julia-package-dependencies julia-package-dependencies
args))
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Mon, 21 Feb 2022 12:53:01 GMT) Full text and rfc822 format available.Message #11 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: Efraim Flashner <efraim <at> flashner.co.il> To: 54088 <at> debbugs.gnu.org, zimon.toutoune <at> gmail.com Cc: Efraim Flashner <efraim <at> flashner.co.il> Subject: [PATCH 2/2] gnu: julia-media: Use julia-package-dependencies. Date: Mon, 21 Feb 2022 14:51:21 +0200
* gnu/packages/julia.scm (julia-media)[arguments]: Remove custom phase,
add dependency packages to julia-package-dependencies.
---
gnu/packages/julia-xyz.scm | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 4090d6d9c4..daf12e59fe 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -3472,19 +3472,8 @@ (define-public julia-media
(arguments
'(#:julia-package-name "Media"
#:julia-package-uuid "e89f7d12-3494-54d1-8411-f7d8b9ae1f27"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'create-package-toml
- (lambda* (#:key julia-package-name julia-package-uuid #:allow-other-keys)
- (with-output-to-file "Project.toml"
- (lambda _
- (format #t
- "name = \"~a\"~@
- uuid = \"~a\"~@
- [deps]~@
- MacroTools = \"1914dd2f-81c6-5fcd-8719-6d5c9610ff09\"~%"
- julia-package-name
- julia-package-uuid))))))))
+ #:julia-package-dependencies
+ `(("MacroTools" . "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"))))
(propagated-inputs
(list julia-macrotools))
(home-page "https://github.com/JunoLab/Media.jl")
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:48:01 GMT) Full text and rfc822 format available.Message #14 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim <at> flashner.co.il> Subject: [PATCH v2 02/19] build: julia: Add 'julia-package-dependencies' as keyword. Date: Wed, 23 Feb 2022 14:47:05 +0100
From: Efraim Flashner <efraim <at> flashner.co.il>
* guix/build-system/julia.scm (link-depot): Accept julia-package-dependencies
keyword and use it for 'julia-create-package-toml' function.
(julia-create-package-toml): Use pattern matching.
(julia-build): Add 'julia-pacakge-dependencies'.
* guix/build/julia-build-system.scm (julia-build): Add
'#:julia-package-dependencies' keyword.
---
guix/build-system/julia.scm | 7 +++++--
guix/build/julia-build-system.scm | 14 ++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm
index 6261f8a55a..66e7711bcd 100644
--- a/guix/build-system/julia.scm
+++ b/guix/build-system/julia.scm
@@ -2,7 +2,8 @@
;;; Copyright © 2019 Nicolò Balzarotti <nicolo <at> nixo.xyz>
;;; Copyright © 2021 Ludovic Courtès <ludo <at> gnu.org>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv <at> pm.me>
-;;; Copyright © 2021 Simon Tournier <zimon.toutoune <at> gmail.com>
+;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune <at> gmail.com>
+;;; Copyright © 2022 Efraim Flashner <efraim <at> flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -88,6 +89,7 @@ (define* (julia-build name inputs
(guile #f)
(julia-package-name #f)
(julia-package-uuid #f)
+ (julia-package-dependencies ''())
(imported-modules %julia-build-system-modules)
(modules '((guix build julia-build-system)
(guix build utils))))
@@ -108,7 +110,8 @@ (define builder
search-paths))
#:inputs #$(input-tuples->gexp inputs)
#:julia-package-name #$julia-package-name
- #:julia-package-uuid #$julia-package-uuid))))
+ #:julia-package-uuid #$julia-package-uuid
+ #:julia-package-dependencies #$julia-package-dependencies))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))
diff --git a/guix/build/julia-build-system.scm b/guix/build/julia-build-system.scm
index 03d669be64..c5ad65d029 100644
--- a/guix/build/julia-build-system.scm
+++ b/guix/build/julia-build-system.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2019, 2020 Nicolò Balzarotti <nicolo <at> nixo.xyz>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv <at> pm.me>
;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune <at> gmail.com>
+;;; Copyright © 2022 Efraim Flashner <efraim <at> flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -136,7 +137,8 @@ (define* (check #:key tests? source inputs outputs julia-package-name
package "/test/runtests.jl"))))))
(define* (link-depot #:key source inputs outputs
- julia-package-name julia-package-uuid #:allow-other-keys)
+ julia-package-name julia-package-uuid
+ julia-package-dependencies #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(name+version (strip-store-file-name out))
(version (last (string-split name+version #\-)))
@@ -156,6 +158,7 @@ (define* (link-depot #:key source inputs outputs
(julia-create-package-toml (getcwd)
julia-package-name julia-package-uuid
version
+ julia-package-dependencies
#:file "Project.toml"))
;; When installing a package, julia looks first at in the JULIA_DEPOT_PATH
@@ -186,9 +189,10 @@ (define* (julia-create-package-toml location
") f)
(when (not (null? deps))
(display "[deps]\n" f)
- (for-each (lambda dep
- (display (string-append (car (car dep)) " = \"" (cdr (car dep)) "\"\n")
- f))
+ (for-each (match-lambda
+ ((name . uuid)
+ (display (string-append name " = \"" uuid "\"\n")
+ f)))
deps))
(close-port f)))
@@ -207,6 +211,7 @@ (define %standard-phases
(delete 'build)))
(define* (julia-build #:key inputs julia-package-name julia-package-uuid
+ julia-package-dependencies
(phases %standard-phases)
#:allow-other-keys #:rest args)
"Build the given Julia package, applying all of PHASES in order."
@@ -214,4 +219,5 @@ (define* (julia-build #:key inputs julia-package-name julia-package-uuid
#:inputs inputs #:phases phases
#:julia-package-name julia-package-name
#:julia-package-uuid julia-package-uuid
+ #:julia-package-dependencies julia-package-dependencies
args))
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:48:02 GMT) Full text and rfc822 format available.Message #17 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim <at> flashner.co.il> Subject: [PATCH v2 03/19] gnu: julia-media: Use 'julia-package-dependencies'. Date: Wed, 23 Feb 2022 14:47:06 +0100
From: Efraim Flashner <efraim <at> flashner.co.il>
* gnu/packages/julia.scm (julia-media)[arguments]: Remove custom phase,
add dependency packages to '#:julia-package-dependencies'.
---
gnu/packages/julia-xyz.scm | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 14c8c30751..6bb404761b 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -3508,19 +3508,8 @@ (define-public julia-media
(list
#:julia-package-name "Media"
#:julia-package-uuid "e89f7d12-3494-54d1-8411-f7d8b9ae1f27"
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'create-package-toml
- (lambda* (#:key julia-package-name julia-package-uuid #:allow-other-keys)
- (with-output-to-file "Project.toml"
- (lambda _
- (format #t
- "name = \"~a\"~@
- uuid = \"~a\"~@
- [deps]~@
- MacroTools = \"1914dd2f-81c6-5fcd-8719-6d5c9610ff09\"~%"
- julia-package-name
- julia-package-uuid))))))))
+ #:julia-package-dependencies
+ #~(list '("MacroTools" . "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"))))
(propagated-inputs
(list julia-macrotools))
(home-page "https://github.com/JunoLab/Media.jl")
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:48:03 GMT) Full text and rfc822 format available.Message #20 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 04/19] build: julia-build-system: Fix corner-case for parallel tests. Date: Wed, 23 Feb 2022 14:47:07 +0100
* guix/build/julia-build-system.scm (check): Do not run parallel tests when
'--cores=1'.
---
guix/build/julia-build-system.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/build/julia-build-system.scm b/guix/build/julia-build-system.scm
index c5ad65d029..b0dac154e9 100644
--- a/guix/build/julia-build-system.scm
+++ b/guix/build/julia-build-system.scm
@@ -112,9 +112,9 @@ (define* (check #:key tests? source inputs outputs julia-package-name
(job-count (if parallel-tests?
(parallel-job-count)
1))
- ;; The --proc argument of Julia *adds* extra processors rather than
- ;; specify the exact count to use, so zero must be specified to
- ;; disable parallel processing...
+ ;; The --procs argument of Julia *adds* extra processors rather
+ ;; than specify the exact count to use, so zero must be specified
+ ;; to disable parallel processing...
(additional-procs (max 0 (1- job-count))))
;; With a patch, SOURCE_DATE_EPOCH is honored
(setenv "SOURCE_DATE_EPOCH" "1")
@@ -127,7 +127,7 @@ (define* (check #:key tests? source inputs outputs julia-package-name
(setenv "HOME" "/tmp")
(apply invoke "julia"
`("--depwarn=yes"
- ,@(if parallel-tests?
+ ,@(if (and parallel-tests? (< 0 additional-procs))
;; XXX: ... but '--procs' doesn't accept 0 as a valid
;; value, so just omit the argument entirely.
(list (string-append "--procs="
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:48:03 GMT) Full text and rfc822 format available.Message #23 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 05/19] gnu: julia-codeczlib: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:08 +0100
* gnu/packages/julia-xyz.scm (julia-codeczlib): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 6bb404761b..f2d209cc3e 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -827,8 +827,7 @@ (define-public julia-codeczlib
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(for-each make-file-writable
- (find-files out "\\.gz$"))
- #t))))))
+ (find-files out "\\.gz$"))))))))
(propagated-inputs
(list julia-transcodingstreams
julia-zlib-jll))
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:48:04 GMT) Full text and rfc822 format available.Message #26 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 06/19] gnu: julia-dataframes: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:09 +0100
* gnu/packages/julia-xyz.scm (julia-dataframes): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index f2d209cc3e..da139277b7 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -1180,8 +1180,7 @@ (define-public julia-dataframes
(string-append all "return\n")))
(substitute* "test/join.jl"
(("test (levels\\(outerjoin\\(B)" _ test)
- (string-append "test_nowarn " test)))
- #t)))))
+ (string-append "test_nowarn " test))))))))
(propagated-inputs
(list julia-dataapi
julia-invertedindices
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:48:05 GMT) Full text and rfc822 format available.Message #29 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 07/19] gnu: julia-datavalues: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:10 +0100
* gnu/packages/julia-xyz.scm (julia-datavalues): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index da139277b7..4709aa9d89 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -1292,8 +1292,7 @@ (define-public julia-datavalues
;; https://github.com/queryverse/DataValues.jl/issues/83
(substitute* "test/array/test_reduce.jl"
((".*DataValue\\(mapreduce.*") "")
- ((".*DataValue\\(method\\(f.*") ""))
- #t)))))
+ ((".*DataValue\\(method\\(f.*") "")))))))
(propagated-inputs
(list julia-datavalueinterfaces))
(home-page "https://github.com/queryverse/DataValues.jl")
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:48:06 GMT) Full text and rfc822 format available.Message #32 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 08/19] gnu: julia-finitediff: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:11 +0100
* gnu/packages/julia-xyz.scm (julia-finitediff): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 4709aa9d89..cedb11bf9b 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -1884,8 +1884,7 @@ (define-public julia-finitediff
(lambda _
;; We don't want to run all the tests; the Downstream tests
;; try to download the package registry.
- (setenv "GROUP" "Core")
- #t)))))
+ (setenv "GROUP" "Core"))))))
(propagated-inputs
(list julia-arrayinterface
julia-requires
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:48:06 GMT) Full text and rfc822 format available.Message #35 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 09/19] gnu: julia-fixedpointnumbers: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:12 +0100
* gnu/packages/julia-xyz.scm (julia-fixedpointnumbers): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index cedb11bf9b..07ac7172da 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -1961,8 +1961,7 @@ (define-public julia-fixedpointnumbers
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "test/fixed.jl"
;; A deprecation warning is not thrown
- (("@test_logs.*:warn" all) (string-append "# " all)))
- #t)))))
+ (("@test_logs.*:warn" all) (string-append "# " all))))))))
(propagated-inputs
(list julia-compat))
(home-page "https://github.com/JuliaMath/FixedPointNumbers.jl")
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:48:07 GMT) Full text and rfc822 format available.Message #38 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 10/19] gnu: julia-http: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:13 +0100
* gnu/packages/julia-xyz.scm (julia-http): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 07ac7172da..06f780a6cf 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -2372,8 +2372,7 @@ (define-public julia-http
(("@testset.*Body - .*" all)
(string-append all "return\n"))
(("@testset.*Write to file.*" all)
- (string-append all "return\n")))
- #t)))))
+ (string-append all "return\n"))))))))
(propagated-inputs
(list julia-inifile
julia-mbedtls
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:49:01 GMT) Full text and rfc822 format available.Message #41 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 01/19] gnu: julia-xyz: Adjust style using G-expressions. Date: Wed, 23 Feb 2022 14:47:04 +0100
* gnu/packages/julia-xyz.scm: Adjust style using G-expressions.
---
gnu/packages/julia-xyz.scm | 1114 +++++++++++++++++++-----------------
1 file changed, 581 insertions(+), 533 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 4090d6d9c4..14c8c30751 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -139,7 +139,7 @@ (define-public julia-aqua
(base32 "1g0kyzcdykgs247j72jpc2qqall696jwgb3hnn4cxmbi8bkf7wpk"))))
(build-system julia-build-system)
(arguments
- `(#:parallel-tests? #f))
+ (list #:parallel-tests? #f))
(home-page "https://github.com/JuliaTesting/Aqua.jl")
(synopsis "Automated quality assurance for Julia packages")
(description "@acronym{Aqua.jl, Auto QUality Assurance for Julia packages},
@@ -165,7 +165,7 @@ (define-public julia-arrayinterface
;; Expression: @inferred(ArrayInterface.size(Rnr)) === (StaticInt(4),)
;; Evaluated: (static(2),) === (static(4),)
;; Disable as stopgap.
- `(#:tests? ,(not (target-x86-32?))))
+ (list #:tests? (not (target-x86-32?))))
(propagated-inputs
(list julia-ifelse
julia-requires
@@ -335,24 +335,25 @@ (define-public julia-benchmarktools
(base32 "1xz3kdrphp4b158pg7dwkiry49phs2fjjpdvk1hjpww5ykxacks8"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- ,@(if (target-x86-32?)
- '((modify-phases %standard-phases
- (add-after 'unpack 'remove-failing-tests-i686
- (lambda _
- (substitute* "test/GroupsTests.jl"
- (("@test sprint\\(show, g1\\)")
- "@test_broken sprint(show, g1)")
- (("@test sprint\\(show, g1; context = :boundto => 1\\)")
- "@test_broken sprint(show, g1; context = :boundto => 1)")
- (("@test sprint\\(show, g1; context = :limit => false\\)")
- "@test_broken sprint(show, g1; context = :limit => false)")
- (("@test @test_deprecated") "@test_broken"))
- (substitute* "test/ExecutionTests.jl"
- ;; Evaluated: 12 == 8
- (("@test @ballocated\\(Ref\\(1\\)\\)")
- "@test_broken @ballocated(Ref(1))"))))))
- '(%standard-phases))))
+ (list
+ #:phases
+ (if (target-x86-32?)
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-failing-tests-i686
+ (lambda _
+ (substitute* "test/GroupsTests.jl"
+ (("@test sprint\\(show, g1\\)")
+ "@test_broken sprint(show, g1)")
+ (("@test sprint\\(show, g1; context = :boundto => 1\\)")
+ "@test_broken sprint(show, g1; context = :boundto => 1)")
+ (("@test sprint\\(show, g1; context = :limit => false\\)")
+ "@test_broken sprint(show, g1; context = :limit => false)")
+ (("@test @test_deprecated") "@test_broken"))
+ (substitute* "test/ExecutionTests.jl"
+ ;; Evaluated: 12 == 8
+ (("@test @ballocated\\(Ref\\(1\\)\\)")
+ "@test_broken @ballocated(Ref(1))")))))
+ #~%standard-phases)))
(propagated-inputs
(list julia-json))
(home-page "https://github.com/JuliaCI/BenchmarkTools.jl")
@@ -405,15 +406,16 @@ (define-public julia-bioalignments
(base32 "1wf6qgsada59r2fykxfj9hcr635wl8maqxbd3w8qpa01k9glxa0k"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'skip-test
- (lambda _
- ;; Test fails because an unexpected type representation from
- ;; BioSequences. The aligned value is correct though.
- (substitute* "test/runtests.jl"
- (("@test sprint\\(show, aln\\)")
- "@test_broken sprint(show, aln)")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'skip-test
+ (lambda _
+ ;; Test fails because an unexpected type representation from
+ ;; BioSequences. The aligned value is correct though.
+ (substitute* "test/runtests.jl"
+ (("@test sprint\\(show, aln\\)")
+ "@test_broken sprint(show, aln)")))))))
(propagated-inputs
(list julia-biogenerics
julia-biosequences
@@ -498,13 +500,14 @@ (define-public julia-biosymbols
(base32 "1222rwdndi777lai8a6dwrh35i5rgmj75kcrhn8si72sxgz0syjm"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'adjust-tests
- (lambda _
- (substitute* "test/runtests.jl"
- (("\\@testset \\\"Range.*" all)
- (string-append all " return\n"))))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'adjust-tests
+ (lambda _
+ (substitute* "test/runtests.jl"
+ (("\\@testset \\\"Range.*" all)
+ (string-append all " return\n"))))))))
(propagated-inputs
(list julia-automa))
(home-page "https://github.com/BioJulia/BioSymbols.jl")
@@ -528,14 +531,15 @@ (define-public julia-blockarrays
(base32 "1by26036fk9mawmcgqxpwizgbs398v9p6vrbsgg7h6llqn3q9iw1"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- ,@(if (target-64bit?)
- '(%standard-phases)
- '((modify-phases %standard-phases
- (add-after 'unpack 'fix-tests-int32-i686
- (lambda _
- (substitute* "test/test_blockarrays.jl"
- (("Int64") "Int32")))))))))
+ (list
+ #:phases
+ (if (target-64bit?)
+ #~%standard-phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests-int32-i686
+ (lambda _
+ (substitute* "test/test_blockarrays.jl"
+ (("Int64") "Int32"))))))))
(propagated-inputs
(list julia-arraylayouts
julia-fillarrays))
@@ -627,9 +631,10 @@ (define-public julia-bufferedstreams
;; freeze, see
;; https://travis-ci.org/BioJulia/BufferedStreams.jl/jobs/491050182
(arguments
- '(#:tests? #f
- #:julia-package-name "BufferedStreams"
- #:julia-package-uuid "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d"))
+ (list
+ #:tests? #f
+ #:julia-package-name "BufferedStreams"
+ #:julia-package-uuid "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d"))
(propagated-inputs
(list julia-compat))
(home-page "https://github.com/BioJulia/BufferedStreams.jl")
@@ -815,14 +820,15 @@ (define-public julia-codeczlib
(base32 "0xm603nylkwk4bzx66zv1g3syzrvn3jh9spdx7kvcvgszzyrrgh4"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'reset-gzip-timestamps 'make-files-writable
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (for-each make-file-writable
- (find-files out "\\.gz$"))
- #t))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'reset-gzip-timestamps 'make-files-writable
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (for-each make-file-writable
+ (find-files out "\\.gz$"))
+ #t))))))
(propagated-inputs
(list julia-transcodingstreams
julia-zlib-jll))
@@ -1015,27 +1021,28 @@ (define-public julia-configurations
(base32 "1b23p0zk8dx2sf01cnw177mqci7qd81b9s32ixz9clsh0r0icl1b"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'fix-tests
- (lambda _
- (substitute* "test/runtests.jl"
- (("option.toml") "test/option.toml"))))
- (add-after 'link-depot 'dont-use-exproniconlite
- (lambda _
- (substitute* '("Project.toml"
- "src/Configurations.jl"
- "test/runtests.jl")
- (("ExproniconLite") "Expronicon"))
- (substitute* "Project.toml"
- (("55351af7-c7e9-48d6-89ff-24e801d99491")
- "6b7a57c9-7cc1-4fdf-b7f5-e857abae3636"))))
- ,@(if (target-64bit?)
- '()
- '((add-after 'unpack 'fix-tests-int32-i686
- (lambda _
- (substitute* "test/runtests.jl"
- (("Int64") "Int32")))))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'fix-tests
+ (lambda _
+ (substitute* "test/runtests.jl"
+ (("option.toml") "test/option.toml"))))
+ (add-after 'link-depot 'dont-use-exproniconlite
+ (lambda _
+ (substitute* '("Project.toml"
+ "src/Configurations.jl"
+ "test/runtests.jl")
+ (("ExproniconLite") "Expronicon"))
+ (substitute* "Project.toml"
+ (("55351af7-c7e9-48d6-89ff-24e801d99491")
+ "6b7a57c9-7cc1-4fdf-b7f5-e857abae3636"))))
+ #$@(if (target-64bit?)
+ '()
+ '((add-after 'unpack 'fix-tests-int32-i686
+ (lambda _
+ (substitute* "test/runtests.jl"
+ (("Int64") "Int32")))))))))
(propagated-inputs
(list julia-crayons
julia-expronicon
@@ -1160,21 +1167,22 @@ (define-public julia-dataframes
(base32 "1bk0amrghgjrkyn1mm4ac23swwbgszl1d0qyl9137qj5zvv9dasp"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'skip-failing-test
- (lambda _
- ;; Tests with non-standard colors.
- (substitute* "test/show.jl"
- (("test (sprint\\(show, df, context=:color=>true)" _ test)
- (string-append "test_nowarn " test)))
- (substitute* "test/io.jl"
- (("testset \\\"improved.*" all)
- (string-append all "return\n")))
- (substitute* "test/join.jl"
- (("test (levels\\(outerjoin\\(B)" _ test)
- (string-append "test_nowarn " test)))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'skip-failing-test
+ (lambda _
+ ;; Tests with non-standard colors.
+ (substitute* "test/show.jl"
+ (("test (sprint\\(show, df, context=:color=>true)" _ test)
+ (string-append "test_nowarn " test)))
+ (substitute* "test/io.jl"
+ (("testset \\\"improved.*" all)
+ (string-append all "return\n")))
+ (substitute* "test/join.jl"
+ (("test (levels\\(outerjoin\\(B)" _ test)
+ (string-append "test_nowarn " test)))
+ #t)))))
(propagated-inputs
(list julia-dataapi
julia-invertedindices
@@ -1220,18 +1228,19 @@ (define-public julia-datastructures
julia-orderedcollections))
(build-system julia-build-system)
(arguments
- `(#:phases
- ,@(if (target-x86-32?)
- '((modify-phases %standard-phases
- (add-after 'unpack 'remove-failing-test-i686
- (lambda _
- ;; The evaluation returns the correct value,
- ;; Evaluated: "Accumulator(1 => 3, 3 => 4)"
- ;; but, for some reasons, is considered as failed.
- (substitute* "test/test_accumulator.jl"
- (("@test sprint\\(show,Accumulator\\(1 => 3, 3 => 4\\)\\)")
- "@test_broken sprint(show, Accumulator(1 => 3, 3 => 4))"))))))
- '(%standard-phases))))
+ (list
+ #:phases
+ (if (target-x86-32?)
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-failing-test-i686
+ (lambda _
+ ;; The evaluation returns the correct value,
+ ;; Evaluated: "Accumulator(1 => 3, 3 => 4)"
+ ;; but, for some reasons, is considered as failed.
+ (substitute* "test/test_accumulator.jl"
+ (("@test sprint\\(show,Accumulator\\(1 => 3, 3 => 4\\)\\)")
+ "@test_broken sprint(show, Accumulator(1 => 3, 3 => 4))")))))
+ #~%standard-phases)))
(home-page "https://github.com/JuliaCollections/DataStructures.jl")
(synopsis "Julia module providing different data structures")
(description "This package implements a variety of data structures,
@@ -1275,17 +1284,18 @@ (define-public julia-datavalues
(base32 "15j3hrqq6nazn533bfsvg32xznacbzsl303j1qs48av59ppnvhhv"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f ; Tests need upgrading with newer Julia version.
- #:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'skip-known-failing-tests
- (lambda _
- ;; See upstream report:
- ;; https://github.com/queryverse/DataValues.jl/issues/83
- (substitute* "test/array/test_reduce.jl"
- ((".*DataValue\\(mapreduce.*") "")
- ((".*DataValue\\(method\\(f.*") ""))
- #t)))))
+ (list
+ #:tests? #f ; Tests need upgrading with newer Julia version.
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'skip-known-failing-tests
+ (lambda _
+ ;; See upstream report:
+ ;; https://github.com/queryverse/DataValues.jl/issues/83
+ (substitute* "test/array/test_reduce.jl"
+ ((".*DataValue\\(mapreduce.*") "")
+ ((".*DataValue\\(method\\(f.*") ""))
+ #t)))))
(propagated-inputs
(list julia-datavalueinterfaces))
(home-page "https://github.com/queryverse/DataValues.jl")
@@ -1354,17 +1364,18 @@ (define-public julia-distances
(base32 "1yqd9wg4z15k42mrp4y14j2x0sq7yrjhm5zpqklrw6w6j1c367ig"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'skip-flakey-tests
- (lambda _
- ;; Some combination of these tests fail nondeterministically
- ;; each of the times this package is built.
- (substitute* "test/test_dists.jl"
- (("test dyz ≥") "test_nowarn dyz ≥")
- (("test dist\\(y, x") "test_nowarn dist(y, x")
- (("test dist\\(z, x") "test_nowarn dist(z, x")
- (("test dist\\(z, y") "test_nowarn dist(z, y")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'skip-flakey-tests
+ (lambda _
+ ;; Some combination of these tests fail nondeterministically
+ ;; each of the times this package is built.
+ (substitute* "test/test_dists.jl"
+ (("test dyz ≥") "test_nowarn dyz ≥")
+ (("test dist\\(y, x") "test_nowarn dist(y, x")
+ (("test dist\\(z, x") "test_nowarn dist(z, x")
+ (("test dist\\(z, y") "test_nowarn dist(z, y")))))))
(propagated-inputs
(list julia-statsapi))
(native-inputs
@@ -1393,7 +1404,7 @@ (define-public julia-docstringextensions
(base32 "0fy4kfnfacyfmlly6nqxn77dk2gqw80b69zb4m1i0i39zv3cpqfb"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Tests try to read SSL certificates.
+ (list #:tests? #f)) ; Tests try to read SSL certificates.
(home-page "https://juliadocs.github.io/DocStringExtensions.jl/latest/")
(synopsis "Extensions for Julia's docsystem")
(description "This package provides a collection of useful extensions for
@@ -1420,22 +1431,23 @@ (define-public julia-documenter
(base32 "00ai3c24i3fkn5plmavampcxm0ijhwk0v5cn9xwm7rvbjnnvaaam"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'patch-source
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/Deps.jl"
- (("pip install")
- (string-append (search-input-file inputs "bin/pip")
- " install")))))
- (add-after 'link-depot 'remove-javascript-downloads
- (lambda _
- (substitute* "src/Writers/HTMLWriter.jl"
- (("cdnjs.cloudflare.com") "example.com"))
- ;; Removing the javascript downloads causes these tests fail.
- (substitute* "test/examples/tests.jl"
- ((".*Main\\.examples_html_doc.*") "")
- ((".*Main\\.examples_html_mathjax3_doc.*") "")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'patch-source
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/Deps.jl"
+ (("pip install")
+ (string-append (search-input-file inputs "bin/pip")
+ " install")))))
+ (add-after 'link-depot 'remove-javascript-downloads
+ (lambda _
+ (substitute* "src/Writers/HTMLWriter.jl"
+ (("cdnjs.cloudflare.com") "example.com"))
+ ;; Removing the javascript downloads causes these tests fail.
+ (substitute* "test/examples/tests.jl"
+ ((".*Main\\.examples_html_doc.*") "")
+ ((".*Main\\.examples_html_mathjax3_doc.*") "")))))))
(propagated-inputs
(list julia-ansicoloredprinters
julia-docstringextensions
@@ -1505,7 +1517,7 @@ (define-public julia-documentertools
(base32 "05p57p8xlkn42m1lv9gq4hl96vp7hpj19d51p828ai1rbpcpi3a6"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Tests require network.
+ (list #:tests? #f)) ; Tests require network.
(inputs
;; We don't want to propagate the bootstrap version.
;; Cycle with Documenter.jl in later versions.
@@ -1604,13 +1616,14 @@ (define-public julia-dualnumbers
(base32 "05vr5wbzqpchnb96b3pmn67x196mbfnkv7r9bdlz3gm56if4awk5"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'adjust-test-suite
- (lambda _
- (substitute* "test/runtests.jl"
- ;; Seems to not play nicely with SpecialFunctions
- ((".*isempty.*") "")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'adjust-test-suite
+ (lambda _
+ (substitute* "test/runtests.jl"
+ ;; Seems to not play nicely with SpecialFunctions
+ ((".*isempty.*") "")))))))
(propagated-inputs
(list julia-calculus
julia-nanmath
@@ -1638,13 +1651,14 @@ (define-public julia-ellipsisnotation
(base32 "0py46kxl702r8pw3v7x4cqllf7yc91b0dr7vb60xh2qi7d6y3jc7"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'adjust-test-suite
- (lambda _
- (substitute* "test/runtests.jl"
- ;; Seems to not play nicely with Julia-1.6.
- ((".*basic.jl.*") "")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'adjust-test-suite
+ (lambda _
+ (substitute* "test/runtests.jl"
+ ;; Seems to not play nicely with Julia-1.6.
+ ((".*basic.jl.*") "")))))))
(propagated-inputs
(list julia-arrayinterface))
(home-page "https://github.com/ChrisRackauckas/EllipsisNotation.jl")
@@ -1690,13 +1704,14 @@ (define-public julia-expronicon
(base32 "0h8aaynqlxrkn8575k5vqmhzil4vvxchhf0bcxa6zwawp558gj2y"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'skip-network-tests
- (lambda _
- (substitute* "test/runtests.jl"
- ;; This test tries to access the Julia package registry.
- ((".*expand\\.jl.*") "")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'skip-network-tests
+ (lambda _
+ (substitute* "test/runtests.jl"
+ ;; This test tries to access the Julia package registry.
+ ((".*expand\\.jl.*") "")))))))
(propagated-inputs
(list julia-mlstyle))
(native-inputs
@@ -1768,26 +1783,27 @@ (define-public julia-fileio
(base32 "1b18x43i737g5q41n9818xbnc2pgd98q1m6yw3h29yri0clg4gfx"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (delete 'reset-gzip-timestamps)
- (add-after 'link-depot 'skip-network-tests
- (lambda _
- ;; These tests try to download audio/video files.
- (substitute* "test/query.jl"
- (("testset.*(MP4|OGG|MATROSKA).*" all)
- (string-append all "return\n")))
- (substitute* "test/loadsave.jl"
- (("testset.*CSVFiles.*" all)
- (string-append all "return\n")))
- ;; This test tries to download a Julia package.
- (substitute* "test/error_handling.jl"
- (("testset.*Not installed.*" all)
- (string-append all "return\n")))
- ;; This test tries to write to the store.
- ;; (Error says can't find User 0)
- (substitute* "test/runtests.jl"
- ((".*test_mimesave.*") "")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'reset-gzip-timestamps)
+ (add-after 'link-depot 'skip-network-tests
+ (lambda _
+ ;; These tests try to download audio/video files.
+ (substitute* "test/query.jl"
+ (("testset.*(MP4|OGG|MATROSKA).*" all)
+ (string-append all "return\n")))
+ (substitute* "test/loadsave.jl"
+ (("testset.*CSVFiles.*" all)
+ (string-append all "return\n")))
+ ;; This test tries to download a Julia package.
+ (substitute* "test/error_handling.jl"
+ (("testset.*Not installed.*" all)
+ (string-append all "return\n")))
+ ;; This test tries to write to the store.
+ ;; (Error says can't find User 0)
+ (substitute* "test/runtests.jl"
+ ((".*test_mimesave.*") "")))))))
(propagated-inputs
(list julia-requires))
(native-inputs
@@ -1818,7 +1834,7 @@ (define-public julia-filepathsbase
(base32 "136wm4ik6isrdanmpi4gdr1qw0qhr15i925qzjxbawk5hnyzwng9"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Cycle with JLSO.jl
+ (list #:tests? #f)) ; Cycle with JLSO.jl
(home-page "https://github.com/rofinn/FilePathsBase.jl")
(synopsis "Filesystem path types in Julia")
(description "@code{FilePathsBase.jl} provides a type based approach to
@@ -1864,14 +1880,15 @@ (define-public julia-finitediff
(base32 "105f6r0hq97n9mxf1nacmz94dpca66vzqj5p3zh4h0brshmggqnq"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'check 'pre-check
- (lambda _
- ;; We don't want to run all the tests; the Downstream tests
- ;; try to download the package registry.
- (setenv "GROUP" "Core")
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; We don't want to run all the tests; the Downstream tests
+ ;; try to download the package registry.
+ (setenv "GROUP" "Core")
+ #t)))))
(propagated-inputs
(list julia-arrayinterface
julia-requires
@@ -1903,16 +1920,17 @@ (define-public julia-finitedifferences
(base32 "09nsf9cgk49yrvprflnhd9h5rrgs280rgj8sad3csghxdx6jqk5c"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- ,@(if (target-x86-32?)
- '((modify-phases %standard-phases
- (add-after 'unpack 'remove-failing-test-i686
- (lambda _
- ;; Machine Precision incorrectly handled
- (substitute* "test/methods.jl"
- (("@test central_fdm\\(15, 5, adapt=2\\)\\(exp, 1.0\\)")
- "@test_broken central_fdm(15, 5, adapt=2)(exp, 1.0)"))))))
- '(%standard-phases))))
+ (list
+ #:phases
+ (if (target-x86-32?)
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-failing-test-i686
+ (lambda _
+ ;; Machine Precision incorrectly handled
+ (substitute* "test/methods.jl"
+ (("@test central_fdm\\(15, 5, adapt=2\\)\\(exp, 1.0\\)")
+ "@test_broken central_fdm(15, 5, adapt=2)(exp, 1.0)")))))
+ #~%standard-phases)))
(inputs
(list julia-benchmarktools))
(propagated-inputs
@@ -1940,14 +1958,15 @@ (define-public julia-fixedpointnumbers
(base32 "0j0n40n04q9sk68wh9jq90m6c67k4ws02k41djjzkrqmpzv4rcdi"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'disable-failing-test
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "test/fixed.jl"
- ;; A deprecation warning is not thrown
- (("@test_logs.*:warn" all) (string-append "# " all)))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'disable-failing-test
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "test/fixed.jl"
+ ;; A deprecation warning is not thrown
+ (("@test_logs.*:warn" all) (string-append "# " all)))
+ #t)))))
(propagated-inputs
(list julia-compat))
(home-page "https://github.com/JuliaMath/FixedPointNumbers.jl")
@@ -2000,7 +2019,7 @@ (define-public julia-forwarddiff
;; Expression: dual_isapprox(FDNUM ^ PRIMAL, exp(PRIMAL * log(FDNUM)))
;; ERROR: LoadError: LoadError: There was an error during testing
;; Disable as stopgap.
- `(#:tests? ,(not (target-x86-32?))))
+ (list #:tests? (not (target-x86-32?))))
(inputs ;required for tests
(list julia-calculus
julia-difftests))
@@ -2034,13 +2053,14 @@ (define-public julia-functionwrappers
(base32 "02jilpjr7px6138dx2w7ixricvfgsxqdk84d9dgviranibhnjcxa"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'adjust-tests
- (lambda _
- (substitute* "test/runtests.jl"
- (("testset \\\"Abstract.*" all)
- (string-append all "return\n"))))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'adjust-tests
+ (lambda _
+ (substitute* "test/runtests.jl"
+ (("testset \\\"Abstract.*" all)
+ (string-append all "return\n"))))))))
(home-page "https://github.com/yuyichao/FunctionWrappers.jl")
(synopsis "Type stable and efficient wrapper of arbitrary functions")
(description "This package provides a type stable and efficient wrapper of
@@ -2087,12 +2107,13 @@ (define-public julia-fuzzycompletions
(base32 "07sv88c472n6w4x7diy952igbcfm1s104ysnnvprld83312siw06"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'skip-failing-test
- (lambda _
- (substitute* "test/runtests.jl"
- ((".*RPLE.*") "")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'skip-failing-test
+ (lambda _
+ (substitute* "test/runtests.jl"
+ ((".*RPLE.*") "")))))))
(home-page "https://github.com/JunoLab/FuzzyCompletions.jl")
(synopsis "Fuzzy completion provider for Julia")
(description
@@ -2114,12 +2135,13 @@ (define-public julia-genericlinearalgebra
(base32 "0ndwypa397z3pwzdgc3s9plaqlqf63g3d4px5pvym5psgr6lnm3l"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'adjust-test-suite
- (lambda _
- (substitute* "test/runtests.jl"
- ((".*lapack.*") "")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'adjust-test-suite
+ (lambda _
+ (substitute* "test/runtests.jl"
+ ((".*lapack.*") "")))))))
(native-inputs
(list julia-quaternions))
(home-page "https://github.com/JuliaLinearAlgebra/GenericLinearAlgebra.jl")
@@ -2145,20 +2167,21 @@ (define-public julia-genericschur
(base32 "12x6lxzxm91y3k6s9dam46dq5hrby5sr0gy0fdfnp0xhjzdy2j0d"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'adjust-test-suite
- (lambda _
- (substitute* "test/complex.jl"
- ;; expected Array{Int32,1}, got a value of type Array{Int64,1}
- (("A = _example") "#A = _example")
- (("schurtest\\(A,20\\)") ""))
- (substitute* "test/runtests.jl"
- ;; Test errors relating to liblapack.so
- ((".*complex\\.jl.*") "")
- ((".*real\\.jl.*") "")
- ;; GenericSVD is deprecated upstream
- ((".*gordschur\\.jl.*") "")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'adjust-test-suite
+ (lambda _
+ (substitute* "test/complex.jl"
+ ;; expected Array{Int32,1}, got a value of type Array{Int64,1}
+ (("A = _example") "#A = _example")
+ (("schurtest\\(A,20\\)") ""))
+ (substitute* "test/runtests.jl"
+ ;; Test errors relating to liblapack.so
+ ((".*complex\\.jl.*") "")
+ ((".*real\\.jl.*") "")
+ ;; GenericSVD is deprecated upstream
+ ((".*gordschur\\.jl.*") "")))))))
(home-page "https://github.com/RalphAS/GenericSchur.jl")
(synopsis "Schur decomposition of matrices with generic element types")
(description "The Schur decomposition is the workhorse for eigensystem
@@ -2182,24 +2205,25 @@ (define-public julia-geometrybasics
(base32 "057j3hjpli3q5b98cqkpi4p10x2k9pyksrz62hjmv1kb5qzdvhsj"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'remove-earcut
- (lambda _
- (substitute* '("Project.toml"
- "src/GeometryBasics.jl")
- ((".*EarCut.*") ""))))
- (add-after 'link-depot 'skip-incompatible-test
- (lambda _
- (substitute* "test/runtests.jl"
- (("@testset.*MetaT and heterogeneous data.*" all)
- (string-append all "return\n")))))
- ,@(if (target-64bit?)
- '()
- '((add-after 'unpack 'fix-tests-int32-i686
- (lambda _
- (substitute* "test/runtests.jl"
- (("Int64") "Int32")))))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'remove-earcut
+ (lambda _
+ (substitute* '("Project.toml"
+ "src/GeometryBasics.jl")
+ ((".*EarCut.*") ""))))
+ (add-after 'link-depot 'skip-incompatible-test
+ (lambda _
+ (substitute* "test/runtests.jl"
+ (("@testset.*MetaT and heterogeneous data.*" all)
+ (string-append all "return\n")))))
+ #$@(if (target-64bit?)
+ '()
+ '((add-after 'unpack 'fix-tests-int32-i686
+ (lambda _
+ (substitute* "test/runtests.jl"
+ (("Int64") "Int32")))))))))
(propagated-inputs
(list julia-itertools
julia-staticarrays
@@ -2325,35 +2349,36 @@ (define-public julia-http
(base32 "1jsyk3mhnwj4h19cxclx26igdqdrw51fd3k1hgav0nm67dy4cxyk"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'install 'disable-network-tests
- (lambda _
- (substitute* "test/runtests.jl"
- (("\"async.jl") "# \"async.jl")
- (("\"client.jl") "# \"client.jl"))
- (substitute* "test/aws4.jl"
- (("@testset.*HTTP.request with AWS authentication.*" all)
- (string-append all "return\n")))
- (substitute* "test/insert_layers.jl"
- (("@testset.*Inserted final layer runs handler.*" all)
- (string-append all "return\n")))
- (substitute* "test/multipart.jl"
- (("@testset \"Setting of Content-Type.*" all)
- (string-append all "return\n"))
- (("@testset \"Deprecation of .*" all)
- (string-append all "return\n")))
- (substitute* "test/websockets.jl"
- (("@testset.*External Host.*" all)
- (string-append all "return\n")))
- (substitute* "test/messages.jl"
- (("@testset.*Read methods.*" all)
- (string-append all "return\n"))
- (("@testset.*Body - .*" all)
- (string-append all "return\n"))
- (("@testset.*Write to file.*" all)
- (string-append all "return\n")))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'disable-network-tests
+ (lambda _
+ (substitute* "test/runtests.jl"
+ (("\"async.jl") "# \"async.jl")
+ (("\"client.jl") "# \"client.jl"))
+ (substitute* "test/aws4.jl"
+ (("@testset.*HTTP.request with AWS authentication.*" all)
+ (string-append all "return\n")))
+ (substitute* "test/insert_layers.jl"
+ (("@testset.*Inserted final layer runs handler.*" all)
+ (string-append all "return\n")))
+ (substitute* "test/multipart.jl"
+ (("@testset \"Setting of Content-Type.*" all)
+ (string-append all "return\n"))
+ (("@testset \"Deprecation of .*" all)
+ (string-append all "return\n")))
+ (substitute* "test/websockets.jl"
+ (("@testset.*External Host.*" all)
+ (string-append all "return\n")))
+ (substitute* "test/messages.jl"
+ (("@testset.*Read methods.*" all)
+ (string-append all "return\n"))
+ (("@testset.*Body - .*" all)
+ (string-append all "return\n"))
+ (("@testset.*Write to file.*" all)
+ (string-append all "return\n")))
+ #t)))))
(propagated-inputs
(list julia-inifile
julia-mbedtls
@@ -2457,7 +2482,7 @@ (define-public julia-imagebase
(base32 "1n63f2zs6ail9pcl7rzgv3l0z8v1idjsaza3zgvgy7iacxsdpcj2"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Cycle with ImageMagick.jl.
+ (list #:tests? #f)) ; Cycle with ImageMagick.jl.
(propagated-inputs
(list julia-imagecore
julia-reexport))
@@ -2488,7 +2513,7 @@ (define-public julia-imagecore
(base32 "0h9m3pl3wic1jrgaqkdifz24cya5vxd3m6qdmm37pxg2y2ii2vcq"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Cycle with ImageMagick.jl.
+ (list #:tests? #f)) ; Cycle with ImageMagick.jl.
(propagated-inputs
(list julia-abstractffts
julia-colors
@@ -2530,7 +2555,7 @@ (define-public julia-imageinterminal
(base32 "0bbpzi7bv8jdiggq1wmcn67vnf96qagvwg0fk95s125wy5980xsl"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Cycle with ReferenceTests.jl.
+ (list #:tests? #f)) ; Cycle with ReferenceTests.jl.
(propagated-inputs
(list julia-crayons
julia-imagebase
@@ -2568,18 +2593,19 @@ (define-public julia-imagemagick
(base32 "05vzv4jsj3l9pv6yrix28hlw7wnag0mqdfjwv8shn4x71hcfxl1p"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'skip-failing-test
- (lambda _
- ;; These tests try to download from the imagemagick.org
- (substitute* "test/runtests.jl"
- ((".*readremote\\.jl.*") ""))
- ;; Tests with the color gray are hard.
- (substitute* "test/constructed_images.jl"
- (("test (b == aa)" _ test) (string-append "test_nowarn " test))
- (("test (B == map)" _ test) (string-append "test_nowarn " test)))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'skip-failing-test
+ (lambda _
+ ;; These tests try to download from the imagemagick.org
+ (substitute* "test/runtests.jl"
+ ((".*readremote\\.jl.*") ""))
+ ;; Tests with the color gray are hard.
+ (substitute* "test/constructed_images.jl"
+ (("test (b == aa)" _ test) (string-append "test_nowarn " test))
+ (("test (B == map)" _ test) (string-append "test_nowarn " test)))
+ #t)))))
(propagated-inputs
(list julia-fileio
julia-imagecore
@@ -2646,7 +2672,7 @@ (define-public julia-imageshow
(base32 "00wq3ab8y6nyhxwc5lpz9dnslsmcr1vg3cjdkh7wb7k6a8bw98mh"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; cycle with ImageMagick.jl.
+ (list #:tests? #f)) ; cycle with ImageMagick.jl.
(propagated-inputs
(list julia-fileio
julia-imagebase
@@ -2681,7 +2707,7 @@ (define-public julia-imagetransformations
(base32 "0i8gw68hljshsy9wdl5mrpbb31irhmayqyglsxi7jwm88iy9pxhm"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Cycle with ImageMagick.jl.
+ (list #:tests? #f)) ; Cycle with ImageMagick.jl.
(propagated-inputs
(list julia-axisalgorithms
julia-colorvectorspace
@@ -2718,8 +2744,9 @@ (define-public julia-indexablebitvectors
(build-system julia-build-system)
;; Package without Project.toml
(arguments
- '(#:julia-package-name "IndexableBitVectors"
- #:julia-package-uuid "1cb3b9ac-1ffd-5777-9e6b-a3d42300664d"))
+ (list
+ #:julia-package-name "IndexableBitVectors"
+ #:julia-package-uuid "1cb3b9ac-1ffd-5777-9e6b-a3d42300664d"))
(home-page "https://github.com/BioJulia/IndexableBitVectors.jl")
(synopsis "Bit vectors operations with extremely fast speed")
(description "This package exports following operations over bit vectors
@@ -2798,14 +2825,15 @@ (define-public julia-infinity
(base32 "1941lwvrdjnrynigzixxin3chpg1ba6xplvcwc89x0f6z658hwmm"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'remove-timezones.jl
- (lambda _
- (substitute* "test/runtests.jl"
- (("using TimeZones.*") "")
- ((".*infextendedtime.*") ""))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'remove-timezones.jl
+ (lambda _
+ (substitute* "test/runtests.jl"
+ (("using TimeZones.*") "")
+ ((".*infextendedtime.*") ""))
+ #t)))))
(propagated-inputs
(list julia-requires))
(native-inputs
@@ -2851,12 +2879,13 @@ (define-public julia-interpolations
(base32 "1236c20k388qlh7k74mhf7hkbn0vf7ss8b1rgh1a6aj0234ayfnc"))))
(build-system julia-build-system)
(arguments
- `(#:parallel-tests? #f
- ;; XXXX: Unexpected failures for i686, e.g.,
- ;; Got exception outside of a @test
- ;; OverflowError: 96908232 * 106943408 overflowed for type Int32
- ;; Disable as stopgap.
- #:tests? ,(not (target-x86-32?))))
+ (list
+ #:parallel-tests? #f
+ ;; XXXX: Unexpected failures for i686, e.g.,
+ ;; Got exception outside of a @test
+ ;; OverflowError: 96908232 * 106943408 overflowed for type Int32
+ ;; Disable as stopgap.
+ #:tests? (not (target-x86-32?))))
(propagated-inputs
(list julia-axisalgorithms
julia-offsetarrays
@@ -2891,19 +2920,20 @@ (define-public julia-intervalsets
(base32 "0gsz89cd3iygbl5qr389k9vwpg7w1nk0s90g25nsmk34y9hifxag"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- ,@(if (target-x86-32?)
- '((modify-phases %standard-phases
- (add-after 'unpack 'remove-failing-test-i686
- (lambda _
- (substitute* "test/runtests.jl"
- ;; For some reason, the output is correct but the test
- ;; is considered as failed:
- ;; Expression: duration(ClosedInterval(A, B)) ≡ 60
- ;; Evaluated: 60 ≡ 60
- (("@test duration\\(ClosedInterval")
- "@test_broken duration(ClosedInterval"))))))
- '(%standard-phases))))
+ (list
+ #:phases
+ (if (target-x86-32?)
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-failing-test-i686
+ (lambda _
+ (substitute* "test/runtests.jl"
+ ;; For some reason, the output is correct but the test
+ ;; is considered as failed:
+ ;; Expression: duration(ClosedInterval(A, B)) ≡ 60
+ ;; Evaluated: 60 ≡ 60
+ (("@test duration\\(ClosedInterval")
+ "@test_broken duration(ClosedInterval")))))
+ #~%standard-phases)))
(propagated-inputs
(list julia-ellipsisnotation))
(native-inputs
@@ -3183,14 +3213,15 @@ (define-public julia-lazyarrays
(base32 "17rhlrmgfvdw8w62pg32ikr9j4xy2ylr7mx7ar0hnpzryv929rp5"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- ,@(if (target-64bit?)
- '(%standard-phases)
- '((modify-phases %standard-phases
- (add-after 'unpack 'fix-tests-int32-i686
- (lambda _
- (substitute* "test/multests.jl"
- (("Int64") "Int32")))))))))
+ (list
+ #:phases
+ (if (target-64bit?)
+ #~%standard-phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests-int32-i686
+ (lambda _
+ (substitute* "test/multests.jl"
+ (("Int64") "Int32"))))))))
(propagated-inputs
(list julia-arraylayouts
julia-fillarrays
@@ -3221,19 +3252,20 @@ (define-public julia-linesearches
(base32 "1qc4la07w6s1xhcyd0hvbnpr31zc1a2ssgyybc8biv5m00g0dnr0"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'skip-optim-tests
- (lambda _
- (substitute* "test/examples.jl"
- ;; Prevent a cycle with Optim.jl.
- (("^ SKIPFILE.*") "")
- (("^ #SKIPFILE") " SKIPFILE"))))
- (add-after 'link-depot 'skip-doublefloats-tests
- (lambda _
- (substitute* "test/runtests.jl"
- (("using DoubleFloats.*") "")
- ((".*arbitrary_precision\\.jl.*") "")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'skip-optim-tests
+ (lambda _
+ (substitute* "test/examples.jl"
+ ;; Prevent a cycle with Optim.jl.
+ (("^ SKIPFILE.*") "")
+ (("^ #SKIPFILE") " SKIPFILE"))))
+ (add-after 'link-depot 'skip-doublefloats-tests
+ (lambda _
+ (substitute* "test/runtests.jl"
+ (("using DoubleFloats.*") "")
+ ((".*arbitrary_precision\\.jl.*") "")))))))
(propagated-inputs
(list julia-nlsolversbase
julia-nanmath
@@ -3311,14 +3343,15 @@ (define-public julia-mappedarrays
(base32 "0l5adird8m1cmnsxwhzi5hcr7q9bm1rf7a6018zc7kcn2yxdshy3"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- ,@(if (target-64bit?)
- '(%standard-phases)
- '((modify-phases %standard-phases
- (add-after 'unpack 'fix-tests-int32-i686
- (lambda _
- (substitute* "test/runtests.jl"
- (("Int64") "Int32")))))))))
+ (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"))))))))
(propagated-inputs
(list julia-fixedpointnumbers))
(native-inputs
@@ -3350,16 +3383,17 @@ (define-public julia-matrixfactorizations
(base32 "15zvcv2l4iqmjpnqjyx2kry7a85p652nbjy9pj3wq0piksqcz4jb"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'skip-failing-test
- (lambda _
- ;; Tests with math functions are hard.
- (substitute* "test/test_ul.jl"
- (("@test @inferred\\(logdet") "@test @test_nowarn(logdet")
- ;; Also skip the REPL test.
- (("test String") "test_nowarn String"))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'skip-failing-test
+ (lambda _
+ ;; Tests with math functions are hard.
+ (substitute* "test/test_ul.jl"
+ (("@test @inferred\\(logdet") "@test @test_nowarn(logdet")
+ ;; Also skip the REPL test.
+ (("test String") "test_nowarn String"))
+ #t)))))
(propagated-inputs
(list julia-arraylayouts))
(home-page "https://github.com/JuliaMatrices/MatrixFactorizations.jl")
@@ -3385,14 +3419,15 @@ (define-public julia-mbedtls
(base32 "0zjzf2r57l24n3k0gcqkvx3izwn5827iv9ak0lqix0aa5967wvfb"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'install 'disable-network-tests
- ;; Tries to connect to httpbin.org
- (lambda _
- (substitute* "test/runtests.jl"
- (("testhost =") "return #"))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'disable-network-tests
+ ;; Tries to connect to httpbin.org
+ (lambda _
+ (substitute* "test/runtests.jl"
+ (("testhost =") "return #"))
+ #t)))))
(propagated-inputs
(list julia-mbedtls-jll))
(home-page "https://github.com/JuliaLang/MbedTLS.jl")
@@ -3470,21 +3505,22 @@ (define-public julia-media
(build-system julia-build-system)
;; Package without Project.toml
(arguments
- '(#:julia-package-name "Media"
- #:julia-package-uuid "e89f7d12-3494-54d1-8411-f7d8b9ae1f27"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'create-package-toml
- (lambda* (#:key julia-package-name julia-package-uuid #:allow-other-keys)
- (with-output-to-file "Project.toml"
- (lambda _
- (format #t
- "name = \"~a\"~@
+ (list
+ #:julia-package-name "Media"
+ #:julia-package-uuid "e89f7d12-3494-54d1-8411-f7d8b9ae1f27"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'create-package-toml
+ (lambda* (#:key julia-package-name julia-package-uuid #:allow-other-keys)
+ (with-output-to-file "Project.toml"
+ (lambda _
+ (format #t
+ "name = \"~a\"~@
uuid = \"~a\"~@
[deps]~@
MacroTools = \"1914dd2f-81c6-5fcd-8719-6d5c9610ff09\"~%"
- julia-package-name
- julia-package-uuid))))))))
+ julia-package-name
+ julia-package-uuid))))))))
(propagated-inputs
(list julia-macrotools))
(home-page "https://github.com/JunoLab/Media.jl")
@@ -3599,7 +3635,7 @@ (define-public julia-mosaicviews
(base32 "04fgxghyb7n2ji76xkb1r1fjhzsdbgmp5wsfyyn3yjcsdqbyp8pz"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Cycle with ImageCore.jl
+ (list #:tests? #f)) ; Cycle with ImageCore.jl
(propagated-inputs
(list julia-mappedarrays
julia-paddedviews
@@ -3651,21 +3687,22 @@ (define-public julia-mutablearithmetics
(base32 "1isyj8h4nx96cr6892d154v8pw1nhr7mjyz5bd6ffr2mkzb2bq4f"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- ,@(if (target-x86-32?)
- '((modify-phases %standard-phases
- (add-after 'unpack 'remove-failing-test-i686
- (lambda _
- (substitute* "test/utilities.jl"
- ;; Non-deterministic returned value, e.g.,
- ;; Expression: n == @allocated(f())
- ;; Evaluated: 240 == 120
- ;; and for some other values:
- ;; Got correct result, please change to @test
- ;; so @test_broken is not enough.
- (("@test n == @allocated f\\(\\)")
- " "))))))
- '(%standard-phases))))
+ (list
+ #:phases
+ (if (target-x86-32?)
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-failing-test-i686
+ (lambda _
+ (substitute* "test/utilities.jl"
+ ;; Non-deterministic returned value, e.g.,
+ ;; Expression: n == @allocated(f())
+ ;; Evaluated: 240 == 120
+ ;; and for some other values:
+ ;; Got correct result, please change to @test
+ ;; so @test_broken is not enough.
+ (("@test n == @allocated f\\(\\)")
+ " ")))))
+ #~%standard-phases)))
(propagated-inputs
(list julia-offsetarrays))
(home-page "https://github.com/jump-dev/MutableArithmetics.jl")
@@ -3742,14 +3779,15 @@ (define-public julia-nnlib
(base32 "16vn5w5274kcywh1xp0zqjk5q10xrk125aznz5av6wifwrvghk8s"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'skip-cuda-tests
- (lambda _
- (substitute* "test/runtests.jl"
- (("using CUDA") "")
- (("&& CUDA\\.functional\\(\\)") ""))
- (setenv "NNLIB_TEST_CUDA" "false"))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'skip-cuda-tests
+ (lambda _
+ (substitute* "test/runtests.jl"
+ (("using CUDA") "")
+ (("&& CUDA\\.functional\\(\\)") ""))
+ (setenv "NNLIB_TEST_CUDA" "false"))))))
(propagated-inputs
(list julia-adapt
julia-chainrulescore
@@ -3827,8 +3865,9 @@ (define-public julia-optimtestproblems
(base32 "10h47x5ws42pkqjccimaz0yxfvz41w0yazq6inamfk4lg5g2g3d9"))))
(build-system julia-build-system)
(arguments
- `(#:julia-package-name "OptimTestProblems"
- #:julia-package-uuid "cec144fc-5a64-5bc6-99fb-dde8f63e154c"))
+ (list
+ #:julia-package-name "OptimTestProblems"
+ #:julia-package-uuid "cec144fc-5a64-5bc6-99fb-dde8f63e154c"))
(home-page "https://github.com/JuliaNLSolvers/OptimTestProblems.jl")
(synopsis "Collection of optimization test problems")
(description "The purpose of this package is to provide test problems for
@@ -3874,7 +3913,7 @@ (define-public julia-offsetarrays
(propagated-inputs
(list julia-adapt))
;; CatIndices depends on OffsetArrays, introducing a recursive dependency
- (arguments '(#:tests? #f))
+ (arguments (list #:tests? #f))
(home-page "https://juliaarrays.github.io/OffsetArrays.jl/stable/")
(synopsis "Fortran-like arrays with arbitrary, zero or negative indices")
(description "@code{OffsetArrays.jl} provides Julia users with arrays that
@@ -4091,7 +4130,7 @@ (define-public julia-preferences
(base32 "1cail43iqzbi6m9v6981rhz47zf2lcvhs5ds5gdqvc9nx5frghxq"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Tests try to mkdir /.julia
+ (list #:tests? #f)) ; Tests try to mkdir /.julia
(home-page "https://github.com/JuliaPackaging/Preferences.jl")
(synopsis "Store configuration switches to TOML files")
(description "The @code{Preferences} package provides an integrated way for
@@ -4116,13 +4155,14 @@ (define-public julia-prettytables
(base32 "1d1sd87kkwbar3l608h0adzws42cwdrmp1idxx7an6mfqcsdrijw"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'skip-color-tests
- (lambda _
- (substitute* "test/text_backend.jl"
- ((".*colors\\.jl.*") ""))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'skip-color-tests
+ (lambda _
+ (substitute* "test/text_backend.jl"
+ ((".*colors\\.jl.*") ""))
+ #t)))))
(propagated-inputs
(list julia-crayons
julia-formatting
@@ -4150,49 +4190,50 @@ (define-public julia-pycall
"1fj5d1ihnhnm0pl4hbx6hcd2bpdyhm8jiaqah2axsbd069j70saf"))))
(build-system julia-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ (list
+ #:imported-modules `((guix build python-build-system)
,@%julia-build-system-modules)
- #:modules ((guix build julia-build-system)
+ #:modules '((guix build julia-build-system)
(guix build utils)
((guix build python-build-system) #:prefix python:))
- #:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'remove-conda
- (lambda _
- (substitute* "Project.toml"
- ((".*Conda.*") ""))
- (substitute* (list "src/PyCall.jl"
- "test/runtests.jl")
- (("import Conda") ""))
- (substitute* "deps/depsutils.jl"
- (("Conda.PYTHONDIR") "\"/\""))
- #t))
- (add-after 'link-depot 'set-python
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((python (assoc-ref inputs "python")))
- (setenv "PYCALL_JL_RUNTIME_PYTHON"
- (string-append python "/bin/python3"))
- (with-output-to-file "deps/deps.jl"
- (lambda _
- (format #t
- "const python = \"~a/bin/python3\"~@
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'remove-conda
+ (lambda _
+ (substitute* "Project.toml"
+ ((".*Conda.*") ""))
+ (substitute* (list "src/PyCall.jl"
+ "test/runtests.jl")
+ (("import Conda") ""))
+ (substitute* "deps/depsutils.jl"
+ (("Conda.PYTHONDIR") "\"/\""))
+ #t))
+ (add-after 'link-depot 'set-python
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((python (assoc-ref inputs "python")))
+ (setenv "PYCALL_JL_RUNTIME_PYTHON"
+ (string-append python "/bin/python3"))
+ (with-output-to-file "deps/deps.jl"
+ (lambda _
+ (format #t
+ "const python = \"~a/bin/python3\"~@
const pyprogramname = \"~a/bin/python3\"~@
const libpython = \"~a/lib/libpython~a.so.1.0\"~@
const PYTHONHOME = \"~a\"~@
const pyversion_build = v\"~a\"~@
const conda = false~%"
- python
- python
- python
- (python:python-version python)
- python
- ,(package-version python))))
- #t)))
- (add-before 'check 'pre-check
- (lambda _
- (setenv "CI" "true")
- (setenv "JULIA_PKGEVAL" "true")
- #t)))))
+ python
+ python
+ python
+ (python:python-version python)
+ python
+ #$(package-version python))))
+ #t)))
+ (add-before 'check 'pre-check
+ (lambda _
+ (setenv "CI" "true")
+ (setenv "JULIA_PKGEVAL" "true")
+ #t)))))
(propagated-inputs
(list julia-macrotools
julia-versionparsing))
@@ -4278,15 +4319,16 @@ (define-public julia-quadmath
(base32 "051biw4b9zni7cmh2f1yzifp1v8wazlfxrdz4p44lyd1wba6379w"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'hardcode-libmath-location
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((gcclib (assoc-ref inputs "gcc:lib")))
- (substitute* "src/Quadmath.jl"
- (("libgcc_s.so.1" lib) (string-append gcclib "/lib/" lib))
- (("libquadmath.so.0" lib) (string-append gcclib "/lib/" lib)))
- #t))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'hardcode-libmath-location
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((gcclib (assoc-ref inputs "gcc:lib")))
+ (substitute* "src/Quadmath.jl"
+ (("libgcc_s.so.1" lib) (string-append gcclib "/lib/" lib))
+ (("libquadmath.so.0" lib) (string-append gcclib "/lib/" lib)))
+ #t))))))
(propagated-inputs
(list julia-requires))
(inputs
@@ -4427,7 +4469,7 @@ (define-public julia-recipespipeline
(base32 "0zq4bzxvq36zr0va6iip3x97mgq5b4fwza8avszx1ryfqm3lg1f7"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Cycle with Plots.jl.
+ (list #:tests? #f)) ; Cycle with Plots.jl.
(propagated-inputs
(list julia-nanmath
julia-plotutils
@@ -4457,7 +4499,7 @@ (define-public julia-recursivearraytools
(base32 "0vx8ndxrii53na7jsc2lki47wfpi77rn3y2r6xhiysx1qwr14msf"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Cycle with OrdinaryDiffEq.jl.
+ (list #:tests? #f)) ; Cycle with OrdinaryDiffEq.jl.
(propagated-inputs
(list julia-arrayinterface
julia-chainrulescore
@@ -4512,7 +4554,7 @@ (define-public julia-referencetests
(base32 "0mm6bjhs8a21pippww6b08b5frmnb9m6k8xrszrwq9zhc879zpc9"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Cycle with ImageCore.jl through ImageMagick.jl.
+ (list #:tests? #f)) ; Cycle with ImageCore.jl through ImageMagick.jl.
(propagated-inputs
(list julia-deepdiffs
julia-distances
@@ -4550,7 +4592,7 @@ (define-public julia-requires
(base32 "03hyfy7c0ma45b0y756j76awi3az2ii4bz4s8cxm3xw9yy1z7b01"))))
(build-system julia-build-system)
(arguments
- `(#:parallel-tests? #f))
+ (list #:parallel-tests? #f))
(inputs ;required for test
(list julia-example))
(propagated-inputs
@@ -4582,7 +4624,7 @@ (define-public julia-reversediff
;; Expression: hash(tr_float, hash(1)) === hash(v_float, hash(1))
;; MethodError: no method matching decompose(::ReverseDiff.TrackedReal{Float64, Float64, Nothing})
;; Disable as stopgap.
- `(#:tests? ,(not (target-x86-32?))))
+ (list #:tests? (not (target-x86-32?))))
(propagated-inputs
(list julia-diffresults
julia-diffrules
@@ -4680,8 +4722,9 @@ (define-public julia-safetestsets
(base32 "1fb1dfdmiw2ggx60hf70954xlps0r48fcb3k3dvxynlz7ylphp96"))))
(build-system julia-build-system)
(arguments
- `(#:julia-package-name "SafeTestsets"
- #:julia-package-uuid "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"))
+ (list
+ #:julia-package-name "SafeTestsets"
+ #:julia-package-uuid "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"))
(native-inputs
(list julia-staticarrays))
(home-page "https://github.com/YingboMa/SafeTestsets.jl")
@@ -4751,7 +4794,7 @@ (define-public julia-scratch
"09xni9rrrax17fxjz04j1b48mk9ffww5rcbagh66jklr89mrkqhx"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Test suite tries to access the Julia package registry.
+ (list #:tests? #f)) ; Test suite tries to access the Julia package registry.
(home-page "https://github.com/JuliaPackaging/Scratch.jl")
(synopsis "Scratch spaces for all your persistent mutable data needs")
(description "This repository implements the scratch spaces API for
@@ -4872,7 +4915,7 @@ (define-public julia-sortingalgorithms
(base32 "173x77a80xnh99viqa3r7rgdaksvxaw8xyfqw09gwvp4p2zrxivb"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; cycle with StatsBase.jl
+ (list #:tests? #f)) ; cycle with StatsBase.jl
(propagated-inputs
(list julia-datastructures))
;(native-inputs
@@ -4976,13 +5019,14 @@ (define-public julia-stackviews
(base32 "1fwiaxdpx1z9dli3jr8kyraych0jbdiny3qklynf0r13px25r6i7"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'link-depot 'skip-doctest
- (lambda _
- (substitute* "test/runtests.jl"
- ((".*doctest.*") ""))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'link-depot 'skip-doctest
+ (lambda _
+ (substitute* "test/runtests.jl"
+ ((".*doctest.*") ""))
+ #t)))))
(propagated-inputs
(list julia-offsetarrays))
(native-inputs
@@ -5141,14 +5185,15 @@ (define-public julia-stringencodings
(base32 "1qwc5ll68ng80b5921ww6fvifxbsmiylakfgsbsjbzg7lzyb5i67"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'skip-failing-test
- (lambda _
- ;; https://github.com/JuliaStrings/StringEncodings.jl/issues/49
- (substitute* "test/runtests.jl"
- (("\"SHIFT_JIS\", \"SHIFT_JISX0213\"")
- " ")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'skip-failing-test
+ (lambda _
+ ;; https://github.com/JuliaStrings/StringEncodings.jl/issues/49
+ (substitute* "test/runtests.jl"
+ (("\"SHIFT_JIS\", \"SHIFT_JISX0213\"")
+ " ")))))))
(propagated-inputs
(list julia-libiconv-jll))
(home-page "https://github.com/JuliaStrings/StringEncodings.jl")
@@ -5173,15 +5218,16 @@ (define-public julia-structarrays
(base32 "0rjcpyjwzg70n87q5r9c5i1qzigavncslxssm3rk5a3y549py56v"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- ,@(if (target-64bit?)
- '(%standard-phases)
- '((modify-phases %standard-phases
- (add-after 'unpack 'fix-tests-int32-i686
- (lambda _
- (substitute* '("src/utils.jl"
- "test/runtests.jl")
- (("Int64") "Int32")))))))))
+ (list
+ #:phases
+ (if (target-64bit?)
+ #~%standard-phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests-int32-i686
+ (lambda _
+ (substitute* '("src/utils.jl"
+ "test/runtests.jl")
+ (("Int64") "Int32"))))))))
(propagated-inputs
(list julia-dataapi
julia-staticarrays
@@ -5379,7 +5425,7 @@ (define-public julia-testimages
(base32 "1lnfsmx33qspyvxw0cykwh7il8xykjpcw1080sisn95ngz2qhdmy"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; cycle with ImageMagick.jl
+ (list #:tests? #f)) ; cycle with ImageMagick.jl
(propagated-inputs
(list julia-axisarrays
julia-colortypes
@@ -5448,7 +5494,7 @@ (define-public julia-transcodingstreams
(base32 "1w3klii293caqiclfh28jggv7f53xclm9fr6xmw38brwrn1hjb48"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ; Circular dependency with various codecs.
+ (list #:tests? #f)) ; Circular dependency with various codecs.
(home-page "https://github.com/JuliaIO/TranscodingStreams.jl")
(synopsis "Fast I/O transcoding data streams")
(description "This package provides tools for transcoding data streams
@@ -5543,17 +5589,18 @@ (define-public julia-uris
(base32 "0kp4hg3kknkm2smlcizqfd33l9x4vkahc2714gnbjp39fj285b92"))))
(build-system julia-build-system)
(arguments
- '(#:julia-package-name "URIs" ;required to run tests
- #:julia-package-uuid "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
- #:phases
- (modify-phases %standard-phases
- (add-before 'check 'change-dir
- ;; Tests must be run from the testdir
- (lambda* (#:key source outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (chdir
- (string-append out "/share/julia/loadpath/URIs/test")))
- #t)))))
+ (list
+ #:julia-package-name "URIs" ;required to run tests
+ #:julia-package-uuid "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'change-dir
+ ;; Tests must be run from the testdir
+ (lambda* (#:key source outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (chdir
+ (string-append out "/share/julia/loadpath/URIs/test")))
+ #t)))))
;; required for tests
(inputs (list julia-json))
(home-page "https://github.com/JuliaWeb/URIs.jl")
@@ -5578,7 +5625,7 @@ (define-public julia-unitful
(base32 "10qwscd15dnmvx116dwvg99m7kmwgmj5ahdkq7psiq48lcc554gq"))))
(build-system julia-build-system)
(arguments
- `(#:parallel-tests? #f))
+ (list #:parallel-tests? #f))
(propagated-inputs
(list julia-constructionbase))
(home-page "https://painterqubits.github.io/Unitful.jl/stable/")
@@ -5650,15 +5697,16 @@ (define-public julia-woodburymatrices
(base32 "04yykivi8zrbryxlmb0p5xa6lma8iq22r5s863117dnnqj5gaffd"))))
(build-system julia-build-system)
(arguments
- `(#:phases
- ,@(if (target-x86-32?)
- '((modify-phases %standard-phases
- (add-after 'unpack 'remove-failing-test-i686
- (lambda _
- (substitute* "test/woodbury.jl"
- (("@test logdet\\(W\\)")
- "@test_broken logdet(W)"))))))
- '(%standard-phases))))
+ (list
+ #:phases
+ (if (target-x86-32?)
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-failing-test-i686
+ (lambda _
+ (substitute* "test/woodbury.jl"
+ (("@test logdet\\(W\\)")
+ "@test_broken logdet(W)")))))
+ #~%standard-phases)))
(home-page "https://github.com/timholy/WoodburyMatrices.jl")
(synopsis "Support for the Woodbury matrix identity for Julia")
(description "This package provides support for the Woodbury matrix identity
@@ -5753,7 +5801,7 @@ (define-public julia-zygote
(base32 "1cx66sp30s34ln6p0fpqk1ggjxfxg2gp8791zz3cl85dmk4dl14b"))))
(build-system julia-build-system)
(arguments
- `(#:tests? #f)) ;require CUDA, not packaged yet
+ (list #:tests? #f)) ;require CUDA, not packaged yet
(propagated-inputs
(list julia-abstractffts
julia-chainrules
base-commit: 6cae4e97927dd215bc5af84e7c4d938a26fb40c1
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:49:02 GMT) Full text and rfc822 format available.Message #44 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 11/19] gnu: julia-imagemagick: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:14 +0100
* gnu/packages/julia-xyz.scm (julia-imagemagick): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 06f780a6cf..653191cc43 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -2598,8 +2598,7 @@ (define-public julia-imagemagick
;; Tests with the color gray are hard.
(substitute* "test/constructed_images.jl"
(("test (b == aa)" _ test) (string-append "test_nowarn " test))
- (("test (B == map)" _ test) (string-append "test_nowarn " test)))
- #t)))))
+ (("test (B == map)" _ test) (string-append "test_nowarn " test))))))))
(propagated-inputs
(list julia-fileio
julia-imagecore
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:49:02 GMT) Full text and rfc822 format available.Message #47 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 12/19] gnu: julia-infinity: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:15 +0100
* gnu/packages/julia-xyz.scm (julia-infinity): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 653191cc43..ebb6d2f2af 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -2825,8 +2825,7 @@ (define-public julia-infinity
(lambda _
(substitute* "test/runtests.jl"
(("using TimeZones.*") "")
- ((".*infextendedtime.*") ""))
- #t)))))
+ ((".*infextendedtime.*") "")))))))
(propagated-inputs
(list julia-requires))
(native-inputs
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:49:02 GMT) Full text and rfc822 format available.Message #50 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 13/19] gnu: julia-matrixfactorizations: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:16 +0100
* gnu/packages/julia-xyz.scm (julia-matrixfactorizations): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index ebb6d2f2af..8d67e31ea2 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -3384,8 +3384,7 @@ (define-public julia-matrixfactorizations
(substitute* "test/test_ul.jl"
(("@test @inferred\\(logdet") "@test @test_nowarn(logdet")
;; Also skip the REPL test.
- (("test String") "test_nowarn String"))
- #t)))))
+ (("test String") "test_nowarn String")))))))
(propagated-inputs
(list julia-arraylayouts))
(home-page "https://github.com/JuliaMatrices/MatrixFactorizations.jl")
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:49:03 GMT) Full text and rfc822 format available.Message #53 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 14/19] gnu: julia-mbedtls: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:17 +0100
* gnu/packages/julia-xyz.scm (julia-mbedtls): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 8d67e31ea2..55a97b6aa1 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -3417,8 +3417,7 @@ (define-public julia-mbedtls
;; Tries to connect to httpbin.org
(lambda _
(substitute* "test/runtests.jl"
- (("testhost =") "return #"))
- #t)))))
+ (("testhost =") "return #")))))))
(propagated-inputs
(list julia-mbedtls-jll))
(home-page "https://github.com/JuliaLang/MbedTLS.jl")
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:49:03 GMT) Full text and rfc822 format available.Message #56 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 15/19] gnu: julia-prettytables: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:18 +0100
* gnu/packages/julia-xyz.scm (julia-prettytables): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 55a97b6aa1..10d311247c 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -4140,8 +4140,7 @@ (define-public julia-prettytables
(add-after 'link-depot 'skip-color-tests
(lambda _
(substitute* "test/text_backend.jl"
- ((".*colors\\.jl.*") ""))
- #t)))))
+ ((".*colors\\.jl.*") "")))))))
(propagated-inputs
(list julia-crayons
julia-formatting
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:49:04 GMT) Full text and rfc822 format available.Message #59 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 16/19] gnu: julia-pycall: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:19 +0100
* gnu/packages/julia-xyz.scm (julia-pycall): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 10d311247c..e95c51a167 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -4184,8 +4184,7 @@ (define-public julia-pycall
"test/runtests.jl")
(("import Conda") ""))
(substitute* "deps/depsutils.jl"
- (("Conda.PYTHONDIR") "\"/\""))
- #t))
+ (("Conda.PYTHONDIR") "\"/\""))))
(add-after 'link-depot 'set-python
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((python (assoc-ref inputs "python")))
@@ -4205,13 +4204,11 @@ (define-public julia-pycall
python
(python:python-version python)
python
- #$(package-version python))))
- #t)))
+ #$(package-version python)))))))
(add-before 'check 'pre-check
(lambda _
(setenv "CI" "true")
- (setenv "JULIA_PKGEVAL" "true")
- #t)))))
+ (setenv "JULIA_PKGEVAL" "true"))))))
(propagated-inputs
(list julia-macrotools
julia-versionparsing))
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:49:04 GMT) Full text and rfc822 format available.Message #62 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 17/19] gnu: julia-quadmath: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:20 +0100
* gnu/packages/julia-xyz.scm (julia-quadmath): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index e95c51a167..6510b8acf4 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -4302,8 +4302,7 @@ (define-public julia-quadmath
(let ((gcclib (assoc-ref inputs "gcc:lib")))
(substitute* "src/Quadmath.jl"
(("libgcc_s.so.1" lib) (string-append gcclib "/lib/" lib))
- (("libquadmath.so.0" lib) (string-append gcclib "/lib/" lib)))
- #t))))))
+ (("libquadmath.so.0" lib) (string-append gcclib "/lib/" lib)))))))))
(propagated-inputs
(list julia-requires))
(inputs
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:49:04 GMT) Full text and rfc822 format available.Message #65 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 18/19] gnu: julia-stackviews: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:21 +0100
* gnu/packages/julia-xyz.scm (julia-stackviews): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 6510b8acf4..b43c04eb1e 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -4999,8 +4999,7 @@ (define-public julia-stackviews
(add-after 'link-depot 'skip-doctest
(lambda _
(substitute* "test/runtests.jl"
- ((".*doctest.*") ""))
- #t)))))
+ ((".*doctest.*") "")))))))
(propagated-inputs
(list julia-offsetarrays))
(native-inputs
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:49:05 GMT) Full text and rfc822 format available.Message #68 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: 54088 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune <at> gmail.com> Subject: [PATCH v2 19/19] gnu: julia-uris: Delete trailing #t. Date: Wed, 23 Feb 2022 14:47:22 +0100
* gnu/packages/julia-xyz.scm (julia-uris): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index b43c04eb1e..eedfe9c438 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -5572,8 +5572,7 @@ (define-public julia-uris
(lambda* (#:key source outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(chdir
- (string-append out "/share/julia/loadpath/URIs/test")))
- #t)))))
+ (string-append out "/share/julia/loadpath/URIs/test"))))))))
;; required for tests
(inputs (list julia-json))
(home-page "https://github.com/JuliaWeb/URIs.jl")
--
2.34.0
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Wed, 23 Feb 2022 13:49:05 GMT) Full text and rfc822 format available.Message #71 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: Efraim Flashner <efraim <at> flashner.co.il> Cc: 54088 <at> debbugs.gnu.org Subject: Re: bug#54088: [PATCH 0/2] julia-build-system: Add missing julia-pkg-deps Date: Wed, 23 Feb 2022 14:44:43 +0100
Hi Efraim,
On Mon, 21 Feb 2022 at 14:47, Efraim Flashner <efraim <at> flashner.co.il> wrote:
> It turns out we didn't expose julia-package-dependencies in the
> julia-build-system, making the created Package.toml incomplete. This
> corrects the omission and fixes the one package where it is manually
> added.
All LGTM. But I take this opportunity to uniform, as discussed:
It's definitely the new pattern we're using now. I suppose it's
not really necessary here, but having more instances of it
throughout the codebase also makes it easier to search for
examples when others are looking to use or modify gexps.
<https://issues.guix.gnu.org/issue/53656#4-lineno49>
The first patch of the series uses G-exps. Note that it does not imply
any rebuild.
The Julia build system is adapted for the new
'julia-package-dependencies' and so it requires the minor tweak to
default with ''() instead of #f; otherwise it crashes for some packages.
Since we are at it, I fix a minor typo of how Julia uses --procs. Other
said, currently "guix build julia-media -c 0" works but not "guix build
julia-media -c 1" which crashes.
Because the build system modifications imply a full Julia rebuild, let
take the opportunity to remove the trailing #t. It is done package per
package because each modified package need a rebuild so it eases to
follow, IMHO. They can be squashed otherwise.
Cheers,
simon
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Thu, 24 Feb 2022 10:25:01 GMT) Full text and rfc822 format available.Message #74 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: Efraim Flashner <efraim <at> flashner.co.il> To: zimoun <zimon.toutoune <at> gmail.com> Cc: 54088 <at> debbugs.gnu.org Subject: Re: [bug#54088] [PATCH v2 05/19] gnu: julia-codeczlib: Delete trailing #t. Date: Thu, 24 Feb 2022 12:23:51 +0200
[Message part 1 (text/plain, inline)]
With this one we actually don't need the make-file-writable phase anymore, so I skipped this patch and replaced it with one to remove the entire phase. On Wed, Feb 23, 2022 at 02:47:08PM +0100, zimoun wrote: > * gnu/packages/julia-xyz.scm (julia-codeczlib): Delete trailing #t. > --- > gnu/packages/julia-xyz.scm | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm > index 6bb404761b..f2d209cc3e 100644 > --- a/gnu/packages/julia-xyz.scm > +++ b/gnu/packages/julia-xyz.scm > @@ -827,8 +827,7 @@ (define-public julia-codeczlib > (lambda* (#:key outputs #:allow-other-keys) > (let ((out (assoc-ref outputs "out"))) > (for-each make-file-writable > - (find-files out "\\.gz$")) > - #t)))))) > + (find-files out "\\.gz$")))))))) > (propagated-inputs > (list julia-transcodingstreams > julia-zlib-jll)) > -- > 2.34.0 > > > > -- Efraim Flashner <efraim <at> flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]
Efraim Flashner <efraim <at> flashner.co.il>:Efraim Flashner <efraim <at> flashner.co.il>:Message #79 received at 54088-done <at> debbugs.gnu.org (full text, mbox):
From: Efraim Flashner <efraim <at> flashner.co.il> To: zimoun <zimon.toutoune <at> gmail.com> Cc: 54088-done <at> debbugs.gnu.org Subject: Re: bug#54088: [PATCH 0/2] julia-build-system: Add missing julia-pkg-deps Date: Thu, 24 Feb 2022 12:24:05 +0200
[Message part 1 (text/plain, inline)]
Great job! Patches pushed (with one change) On Wed, Feb 23, 2022 at 02:44:43PM +0100, zimoun wrote: > Hi Efraim, > > On Mon, 21 Feb 2022 at 14:47, Efraim Flashner <efraim <at> flashner.co.il> wrote: > > > It turns out we didn't expose julia-package-dependencies in the > > julia-build-system, making the created Package.toml incomplete. This > > corrects the omission and fixes the one package where it is manually > > added. > > All LGTM. But I take this opportunity to uniform, as discussed: > > It's definitely the new pattern we're using now. I suppose it's > not really necessary here, but having more instances of it > throughout the codebase also makes it easier to search for > examples when others are looking to use or modify gexps. > > <https://issues.guix.gnu.org/issue/53656#4-lineno49> > > The first patch of the series uses G-exps. Note that it does not imply > any rebuild. > > The Julia build system is adapted for the new > 'julia-package-dependencies' and so it requires the minor tweak to > default with ''() instead of #f; otherwise it crashes for some packages. > > Since we are at it, I fix a minor typo of how Julia uses --procs. Other > said, currently "guix build julia-media -c 0" works but not "guix build > julia-media -c 1" which crashes. > > Because the build system modifications imply a full Julia rebuild, let > take the opportunity to remove the trailing #t. It is done package per > package because each modified package need a rebuild so it eases to > follow, IMHO. They can be squashed otherwise. > > > Cheers, > simon -- Efraim Flashner <efraim <at> flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Thu, 24 Feb 2022 10:49:02 GMT) Full text and rfc822 format available.Message #82 received at 54088 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: Efraim Flashner <efraim <at> flashner.co.il> Cc: 54088 <at> debbugs.gnu.org Subject: Re: [bug#54088] [PATCH v2 05/19] gnu: julia-codeczlib: Delete trailing #t. Date: Thu, 24 Feb 2022 11:39:15 +0100
Hi Efraim, On Thu, 24 Feb 2022 at 12:23, Efraim Flashner <efraim <at> flashner.co.il> wrote: >> (lambda* (#:key outputs #:allow-other-keys) >> (let ((out (assoc-ref outputs "out"))) >> (for-each make-file-writable >> - (find-files out "\\.gz$")) >> - #t)))))) >> + (find-files out "\\.gz$")))))))) > > With this one we actually don't need the make-file-writable phase > anymore, so I skipped this patch and replaced it with one to remove the > entire phase. Ah sorry to have missed that. Thanks for the review. :-) Cheers, simon
guix-patches <at> gnu.org:bug#54088; Package guix-patches.
(Thu, 24 Feb 2022 10:50:01 GMT) Full text and rfc822 format available.Message #85 received at 54088-done <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: Efraim Flashner <efraim <at> flashner.co.il> Cc: 54088-done <at> debbugs.gnu.org Subject: Re: bug#54088: [PATCH 0/2] julia-build-system: Add missing julia-pkg-deps Date: Thu, 24 Feb 2022 11:39:50 +0100
On Thu, 24 Feb 2022 at 12:24, Efraim Flashner <efraim <at> flashner.co.il> wrote: > Great job! Patches pushed (with one change) Thanks! Cheers, simon
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Thu, 24 Mar 2022 11:24:12 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.