[PATCH 0/2] julia-build-system: Add missing julia-pkg-deps

  • Done
  • quality assurance status badge
Details
2 participants
  • Efraim Flashner
  • zimoun
Owner
unassigned
Submitted by
Efraim Flashner
Severity
normal
E
E
Efraim Flashner wrote on 21 Feb 2022 13:47
(name . Efraim Flashner)(address . efraim@flashner.co.il)
cover.1645447521.git.efraim@flashner.co.il
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
E
E
Efraim Flashner wrote on 21 Feb 2022 13:51
[PATCH 1/2] build: julia: Add julia-package-dependencies as keyword.
(name . Efraim Flashner)(address . efraim@flashner.co.il)
9cdd299f057aad897abf5d16b28cf2421421f367.1645447521.git.efraim@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-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(-)

Toggle diff (76 lines)
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@gnu.org>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2022 Efraim Flashner <efraim@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@nixo.xyz>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2022 Efraim Flashner <efraim@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
E
E
Efraim Flashner wrote on 21 Feb 2022 13:51
[PATCH 2/2] gnu: julia-media: Use julia-package-dependencies.
(name . Efraim Flashner)(address . efraim@flashner.co.il)
6ef43f223656ad86c16e1e9bea6fbe8df5febb3f.1645447521.git.efraim@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(-)

Toggle diff (28 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 02/19] build: julia: Add 'julia-package-dependencies' as keyword.
(address . 54088@debbugs.gnu.org)(name . Efraim Flashner)(address . efraim@flashner.co.il)
20220223134722.354636-2-zimon.toutoune@gmail.com
From: Efraim Flashner <efraim@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(-)

Toggle diff (92 lines)
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@nixo.xyz>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
-;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2022 Efraim Flashner <efraim@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@nixo.xyz>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2022 Efraim Flashner <efraim@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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 03/19] gnu: julia-media: Use 'julia-package-dependencies'.
(address . 54088@debbugs.gnu.org)(name . Efraim Flashner)(address . efraim@flashner.co.il)
20220223134722.354636-3-zimon.toutoune@gmail.com
From: Efraim Flashner <efraim@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(-)

Toggle diff (28 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 04/19] build: julia-build-system: Fix corner-case for parallel tests.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-4-zimon.toutoune@gmail.com
* 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(-)

Toggle diff (28 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 05/19] gnu: julia-codeczlib: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-5-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-codeczlib): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 06/19] gnu: julia-dataframes: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-6-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-dataframes): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 07/19] gnu: julia-datavalues: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-7-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-datavalues): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 08/19] gnu: julia-finitediff: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-8-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-finitediff): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 09/19] gnu: julia-fixedpointnumbers: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-9-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-fixedpointnumbers): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 10/19] gnu: julia-http: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-10-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-http): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 01/19] gnu: julia-xyz: Adjust style using G-expressions.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-1-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm: Adjust style using G-expressions.
---
gnu/packages/julia-xyz.scm | 1114 +++++++++++++++++++-----------------
1 file changed, 581 insertions(+), 533 deletions(-)

Toggle diff (441 lines)
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

This message was truncated. Download the full message here.
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 11/19] gnu: julia-imagemagick: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-11-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-imagemagick): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 12/19] gnu: julia-infinity: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-12-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-infinity): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 13/19] gnu: julia-matrixfactorizations: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-13-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-matrixfactorizations): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 14/19] gnu: julia-mbedtls: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-14-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-mbedtls): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 15/19] gnu: julia-prettytables: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-15-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-prettytables): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 16/19] gnu: julia-pycall: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-16-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-pycall): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

Toggle diff (32 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 17/19] gnu: julia-quadmath: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-17-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-quadmath): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 18/19] gnu: julia-stackviews: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-18-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-stackviews): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:47
[PATCH v2 19/19] gnu: julia-uris: Delete trailing #t.
(address . 54088@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220223134722.354636-19-zimon.toutoune@gmail.com
* gnu/packages/julia-xyz.scm (julia-uris): Delete trailing #t.
---
gnu/packages/julia-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
Z
Z
zimoun wrote on 23 Feb 2022 14:44
Re: bug#54088: [PATCH 0/2] julia-build-system: Add missing julia-pkg-deps
(name . Efraim Flashner)(address . efraim@flashner.co.il)(address . 54088@debbugs.gnu.org)
87sfs9hf3o.fsf@gmail.com
Hi Efraim,

On Mon, 21 Feb 2022 at 14:47, Efraim Flashner <efraim@flashner.co.il> wrote:

Toggle quote (5 lines)
> 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.


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
E
E
Efraim Flashner wrote on 24 Feb 2022 11:23
Re: [bug#54088] [PATCH v2 05/19] gnu: julia-codeczlib: Delete trailing #t.
(name . zimoun)(address . zimon.toutoune@gmail.com)(address . 54088@debbugs.gnu.org)
Yhdct0AvLg73QU6S@3900XT
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:
Toggle quote (26 lines)
> * 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@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
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmIXXLcACgkQQarn3Mo9
g1ESrA/+KYeT6hWwygse9p7tM9Ga+svQ3vCstCm6jyKVQkS5WXKB4hJOvJa2jZfk
Nec1WUL+LK5JWM0aTdG2Nl/UrkoO9utp9pqUfhykLXzyxJ8V85oepu1bwBalJ643
7DoLq0mhjmkvmw7OvKH7xMSp3EjQ4aAEgC8MV89sfl9/iGP6Q69vlkLnyEzLa9A1
hNmTPZkjN3d59mCmAAs0ZNQpgtHhvstO20gouCbDfXLSGqMdtRaaiPebWynJ3gsF
0Y1q0pFqo4GANA1oBLvUe3OlcF2LI7fPzuYONj835JyTvc8mBy4DBmv3Znney6vM
H/8T3oQ5kBsK02R6Pqo8xsLz8NmRflWdXjreCBIWYHv58BK+0SI4rPs6Z9niE0hZ
5aMzPvLvQrGB0CzDzEVtvkqRUrqVagM7gO2bvFBBfQs6B8C+Ir/GWFN4W0NXYXI7
RYCF0EfoFoozEP36+aWSPxCNcrhuBx02hvoyGW16h8LAnQ9ZvbukyVk7/BR7U6hd
3SAIFvYVpLJLKA+53cgvIaHLtrpZY0ufguAoo+vQaSZBAcA5a95PZ8kOVB6d6/NJ
ggXwkR6rYRjMNOmQq3er/S3lpEZLcLvvZON71xX1V1EiTUrC1zsPo5emZxLmSjyH
6CVyCYsC6ybbsH6nYqM+xB67jipugYW0SXKf8t1u7DNT33gNfuc=
=k+8f
-----END PGP SIGNATURE-----


E
E
Efraim Flashner wrote on 24 Feb 2022 11:24
Re: bug#54088: [PATCH 0/2] julia-build-system: Add missing julia-pkg-deps
(name . zimoun)(address . zimon.toutoune@gmail.com)(address . 54088-done@debbugs.gnu.org)
YhdcxUz0TFPzzKKt@3900XT
Great job! Patches pushed (with one change)

On Wed, Feb 23, 2022 at 02:44:43PM +0100, zimoun wrote:
Toggle quote (38 lines)
> Hi Efraim,
>
> On Mon, 21 Feb 2022 at 14:47, Efraim Flashner <efraim@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@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
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmIXXMUACgkQQarn3Mo9
g1FRzA/8DImCTTIHNjxbJ1N2hWx8HwkMdxjz8T7bqVJ02ufPOJ08MYjqOizEvB7l
MhVhZxEjM3EL5UK7iwZU0M9RSiOjMTbjhgjdid5aBHMwxrFvKxVIXdEhGfUAKmq+
Nh0DEpFZ4eE9DtHekWLzCXdO5wbJpBs6NwvBczK0NzBrPuHEPOfR4g6wLssbuCcM
RJNmK1FXEPsr0qWmiLXx3Ym/j12ABhTEACP2ZNtuq5+LagWuQVLAWnqlJ0szapD5
5yb3kGhbevto/ahwPZ7HJqSWuQDHs4B06cz9ITYi4PnR4dxwjB3RMRytgVsclcgs
V0608RfjIvtzz3vapN2KVx+kE3z6oe+WVse1oZKr6Wrf7Q/M7XrbhRY0M2a34V3q
P9whSUyNl2YiV0VfbNFpszvwFd2T6VrgJJLk+0CKtwtwm5QR67AxdZmwKTb23pZC
ppzWZ5cch3F1O+BjzS4MKOS2Kx9OrNBuSYQ/mBqdIjXYiPBpA6CuHCD3TVvYPJqF
N58K3SX7W6cCcPJ5YB+rvfHbKEGBQpVpdxh1RbTtw/p8hvKaFhsW+v4FISlBO3fZ
ZaLvbF2/3PrkeWwubRVXJtZWjbRHqE779gwKqLUPwPRIIq3Mfj7lyfLOgZNO/nuZ
wLebwk0/yLMBY7pCc1FRM7sGwMj/2bwmk1L//JNahYTKyByrrgE=
=Mk5S
-----END PGP SIGNATURE-----


Closed
Z
Z
zimoun wrote on 24 Feb 2022 11:39
Re: [bug#54088] [PATCH v2 05/19] gnu: julia-codeczlib: Delete trailing #t.
(name . Efraim Flashner)(address . efraim@flashner.co.il)(address . 54088@debbugs.gnu.org)
8635k8r1kc.fsf@gmail.com
Hi Efraim,

On Thu, 24 Feb 2022 at 12:23, Efraim Flashner <efraim@flashner.co.il> wrote:

Toggle quote (11 lines)
>> (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
Z
Z
zimoun wrote on 24 Feb 2022 11:39
Re: bug#54088: [PATCH 0/2] julia-build-system: Add missing julia-pkg-deps
(name . Efraim Flashner)(address . efraim@flashner.co.il)(address . 54088-done@debbugs.gnu.org)
86y220pmyx.fsf@gmail.com
On Thu, 24 Feb 2022 at 12:24, Efraim Flashner <efraim@flashner.co.il> wrote:

Toggle quote (2 lines)
> Great job! Patches pushed (with one change)

Thanks!

Cheers,
simon
Closed
?