Here are some julia packages. I'm still working on julia-documenter with all the javascript it downloads at runtime, but these ones are ready. Efraim Flashner (5): gnu: Add julia-quadgk. gnu: Add julia-measurements. gnu: Add julia-mlstyle. gnu: Add julia-pycall. gnu: Add julia-ansicoloredprinters. gnu/packages/julia-xyz.scm | 177 ++++++++++++++++++++++++++++++++++++- 1 file changed, 176 insertions(+), 1 deletion(-) base-commit: bae57cc7d2917c4a67e9afb68ed61ad7117ea7ea -- 2.33.0
Hi Efraim,
Cool!
On Thu, 9 Sept 2021 at 20:20, Efraim Flashner <efraim@flashner.co.il> wrote:
> Here are some julia packages. I'm still working on julia-documenter with
> all the javascript it downloads at runtime, but these ones are ready.
>
> Efraim Flashner (5):
> gnu: Add julia-quadgk.
> gnu: Add julia-measurements.
> gnu: Add julia-mlstyle.
> gnu: Add julia-pycall.
> gnu: Add julia-ansicoloredprinters.
Have you send this?
Cheers,
simon
* gnu/packages/julia-xyz.scm (julia-quadgk): New variable. --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index a80964c2b0..bd6a296463 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -2985,6 +2985,31 @@ everything from run time algorithm choice to code generation at compile time.") human-readable format.") (license license:expat))) +(define-public julia-quadgk + (package + (name "julia-quadgk") + (version "2.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaMath/QuadGK.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hy0629yai6xflgxaflk9764lzr1lzhlghimxk1aqi212q9c6n33")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-datastructures" ,julia-datastructures))) + (home-page "https://github.com/JuliaMath/QuadGK.jl") + (synopsis "Adaptive 1d numerical Gauss–Kronrod integration in Julia") + (description "This package provides support for one-dimensional numerical +integration in Julia using adaptive Gauss-Kronrod quadrature. The code was +originally part of Base Julia. It supports integration of arbitrary numeric +types, including arbitrary precision (@code{BigFloat}), and even integration of +arbitrary normed vector spaces (e.g. matrix-valued integrands).") + (license license:expat))) + (define-public julia-quadmath (package (name "julia-quadmath") -- 2.33.0
* gnu/packages/julia-xyz.scm (julia-measurements): New variable. --- gnu/packages/julia-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index bd6a296463..222f9f129e 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -2433,6 +2433,37 @@ may include other factorizations such as the LQ factorization.") TLS} and cryptography C library for Julia.") (license license:expat))) +(define-public julia-measurements + (package + (name "julia-measurements") + (version "2.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaPhysics/Measurements.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05p3f0gr4sv4maq8cix5fi8ldq0zagswqsd43xn6fhy046f936mz")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-calculus" ,julia-calculus) + ("julia-recipesbase" ,julia-recipesbase) + ("julia-requires" ,julia-requires))) + (native-inputs + `(("julia-specialfunctions" ,julia-specialfunctions) + ("julia-quadgk" ,julia-quadgk) + ("julia-unitful" ,julia-unitful))) + (home-page "https://juliaphysics.github.io/Measurements.jl/stable/") + (synopsis "Error propagation calculator and library") + (description "@code{Measurements.jl} is an error propagation calculator and +library for physical measurements. It supports real and complex numbers with +uncertainty, arbitrary precision calculations, operations with arrays, and +numerical integration. The linear error propagation theory is employed to +propagate the errors.") + (license license:expat))) + (define-public julia-measures (package (name "julia-measures") -- 2.33.0
* gnu/packages/julia-xyz.scm (julia-mlstyle): New variable. --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 222f9f129e..3616ffd006 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -2508,6 +2508,28 @@ resolving them into absolute units.") with @code{missing} values in Julia.") (license license:expat))) +(define-public julia-mlstyle + (package + (name "julia-mlstyle") + (version "0.4.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thautwarm/MLStyle.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0h1cd7cr4c4cnpqyj3180113gdbvcc047lqphp8a8gq5smp3c059")))) + (build-system julia-build-system) + (native-inputs + `(("julia-datastructures" ,julia-datastructures))) + (home-page "https://thautwarm.github.io/MLStyle.jl/latest/") + (synopsis "Julia functional programming infrastructures") + (description "This package provides consistent and extensible functional +programming infrastructures, and metaprogramming facilities.") + (license license:expat))) + (define-public julia-mocking (package (name "julia-mocking") -- 2.33.0
* gnu/packages/julia-xyz.scm (julia-pycall): New variable. --- gnu/packages/julia-xyz.scm | 79 +++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 3616ffd006..1038d3f80b 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -26,7 +26,9 @@ #:use-module (guix git-download) #:use-module (guix build-system julia) #:use-module (gnu packages gcc) - #:use-module (gnu packages julia-jll)) + #:use-module (gnu packages julia-jll) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz)) (define-public julia-abstractffts (package @@ -3038,6 +3040,81 @@ everything from run time algorithm choice to code generation at compile time.") human-readable format.") (license license:expat))) +(define-public julia-pycall + (package + (name "julia-pycall") + (version "1.92.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaPy/PyCall.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07r99ni6nkxpyrp3wsb5qg4jxz7i2r08dyqbiffy2zm3g0bn88jq")))) + (build-system julia-build-system) + (arguments + `(#:imported-modules ((guix build python-build-system) + ,@%julia-build-system-modules) + #:modules ((guix build julia-build-system) + (guix build utils) + ((guix build python-build-system) #:prefix python:)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack '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 'unpack '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))))) + (propagated-inputs + `(("julia-macrotools" ,julia-macrotools) + ("julia-versionparsing" ,julia-versionparsing))) + (inputs + `(("python" ,python))) + (native-inputs + `(("python-numpy" ,python-numpy))) + (home-page "https://github.com/JuliaPy/PyCall.jl") + (synopsis "Call Python functions from the Julia language") + (description "This package provides the ability to directly call and fully +interoperate with Python from the Julia language. You can import arbitrary +Python modules from Julia, call Python functions (with automatic conversion of +types between Julia and Python), define Python classes from Julia methods, and +share large data structures between Julia and Python without copying them.") + (license license:expat))) + (define-public julia-quadgk (package (name "julia-quadgk") -- 2.33.0
* gnu/packages/julia-xyz.scm (julia-ansicoloredprinters): New variable. --- gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 1038d3f80b..ec31d70531 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -100,6 +100,26 @@ acts like @code{convert(T, x)}, but without the restriction of returning a be GPU compatible without throwing away the wrapper.") (license license:expat))) +(define-public julia-ansicoloredprinters + (package + (name "julia-ansicoloredprinters") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDocs/ANSIColoredPrinters.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dp5agljr0g50s5gn0pr70wrz01ggck6pb40ay3l4szhswq7mqzf")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaDocs/ANSIColoredPrinters.jl") + (synopsis "ANSI escape code translator") + (description "@code{ANSIColoredPrinters.jl} converts a text qualified by +ANSI escape codes to another format.") + (license license:expat))) + (define-public julia-aqua (package (name "julia-aqua") -- 2.33.0
Hi Efraim, On mer., 22 sept. 2021 at 15:13, Efraim Flashner <efraim@flashner.co.il> wrote: > * gnu/packages/julia-xyz.scm (julia-quadgk): New variable. > --- > gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm > index a80964c2b0..bd6a296463 100644 > --- a/gnu/packages/julia-xyz.scm > +++ b/gnu/packages/julia-xyz.scm > @@ -2985,6 +2985,31 @@ everything from run time algorithm choice to code generation at compile time.") > human-readable format.") > (license license:expat))) > > +(define-public julia-quadgk > + (package > + (name "julia-quadgk") > + (version "2.4.1") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/JuliaMath/QuadGK.jl") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "1hy0629yai6xflgxaflk9764lzr1lzhlghimxk1aqi212q9c6n33")))) > + (build-system julia-build-system) > + (propagated-inputs > + `(("julia-datastructures" ,julia-datastructures))) > + (home-page "https://github.com/JuliaMath/QuadGK.jl") > + (synopsis "Adaptive 1d numerical Gauss–Kronrod integration in Julia") I would not write «in Julia». > + (description "This package provides support for one-dimensional numerical > +integration in Julia using adaptive Gauss-Kronrod quadrature. The code was > +originally part of Base Julia. It supports integration of arbitrary numeric > +types, including arbitrary precision (@code{BigFloat}), and even integration of > +arbitrary normed vector spaces (e.g. matrix-valued integrands).") > + (license license:expat))) LGTM. Cheers, simon
Hi Efraim, On mer., 22 sept. 2021 at 15:13, Efraim Flashner <efraim@flashner.co.il> wrote: > * gnu/packages/julia-xyz.scm (julia-measurements): New variable. > --- > gnu/packages/julia-xyz.scm | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > > diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm > index bd6a296463..222f9f129e 100644 > --- a/gnu/packages/julia-xyz.scm > +++ b/gnu/packages/julia-xyz.scm > @@ -2433,6 +2433,37 @@ may include other factorizations such as the LQ factorization.") > TLS} and cryptography C library for Julia.") > (license license:expat))) > > +(define-public julia-measurements > + (package > + (name "julia-measurements") > + (version "2.6.0") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/JuliaPhysics/Measurements.jl") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "05p3f0gr4sv4maq8cix5fi8ldq0zagswqsd43xn6fhy046f936mz")))) > + (build-system julia-build-system) > + (propagated-inputs > + `(("julia-calculus" ,julia-calculus) > + ("julia-recipesbase" ,julia-recipesbase) > + ("julia-requires" ,julia-requires))) > + (native-inputs > + `(("julia-specialfunctions" ,julia-specialfunctions) > + ("julia-quadgk" ,julia-quadgk) > + ("julia-unitful" ,julia-unitful))) Could we keep alphabetical sorted list? > + (home-page "https://juliaphysics.github.io/Measurements.jl/stable/") > + (synopsis "Error propagation calculator and library") > + (description "@code{Measurements.jl} is an error propagation calculator and > +library for physical measurements. It supports real and complex numbers with > +uncertainty, arbitrary precision calculations, operations with arrays, and > +numerical integration. The linear error propagation theory is employed to > +propagate the errors.") > + (license license:expat))) LGTM. Cheers, simon
Hi Efraim,
On mer., 22 sept. 2021 at 15:13, Efraim Flashner <efraim@flashner.co.il> wrote:
> * gnu/packages/julia-xyz.scm (julia-mlstyle): New variable.
> ---
> gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
>
> diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
> index 222f9f129e..3616ffd006 100644
> --- a/gnu/packages/julia-xyz.scm
> +++ b/gnu/packages/julia-xyz.scm
> @@ -2508,6 +2508,28 @@ resolving them into absolute units.")
> with @code{missing} values in Julia.")
> (license license:expat)))
>
> +(define-public julia-mlstyle
> + (package
> + (name "julia-mlstyle")
> + (version "0.4.10")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/thautwarm/MLStyle.jl")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32 "0h1cd7cr4c4cnpqyj3180113gdbvcc047lqphp8a8gq5smp3c059"))))
> + (build-system julia-build-system)
> + (native-inputs
> + `(("julia-datastructures" ,julia-datastructures)))
> + (home-page "https://thautwarm.github.io/MLStyle.jl/latest/")
> + (synopsis "Julia functional programming infrastructures")
> + (description "This package provides consistent and extensible functional
> +programming infrastructures, and metaprogramming facilities.")
> + (license license:expat)))
LGTM. I notice that the package raises warning at the check phase.
Cheers,
simon
Hi Efraim,
On mer., 22 sept. 2021 at 15:13, Efraim Flashner <efraim@flashner.co.il> wrote:
> * gnu/packages/julia-xyz.scm (julia-pycall): New variable.
> ---
> gnu/packages/julia-xyz.scm | 79 +++++++++++++++++++++++++++++++++++++-
> 1 file changed, 78 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
> index 3616ffd006..1038d3f80b 100644
> --- a/gnu/packages/julia-xyz.scm
> +++ b/gnu/packages/julia-xyz.scm
> @@ -26,7 +26,9 @@
> #:use-module (guix git-download)
> #:use-module (guix build-system julia)
> #:use-module (gnu packages gcc)
> - #:use-module (gnu packages julia-jll))
> + #:use-module (gnu packages julia-jll)
> + #:use-module (gnu packages python)
> + #:use-module (gnu packages python-xyz))
>
> (define-public julia-abstractffts
> (package
> @@ -3038,6 +3040,81 @@ everything from run time algorithm choice to code generation at compile time.")
> human-readable format.")
> (license license:expat)))
>
> +(define-public julia-pycall
> + (package
> + (name "julia-pycall")
> + (version "1.92.3")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/JuliaPy/PyCall.jl")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "07r99ni6nkxpyrp3wsb5qg4jxz7i2r08dyqbiffy2zm3g0bn88jq"))))
> + (build-system julia-build-system)
> + (arguments
> + `(#:imported-modules ((guix build python-build-system)
> + ,@%julia-build-system-modules)
> + #:modules ((guix build julia-build-system)
> + (guix build utils)
> + ((guix build python-build-system) #:prefix python:))
> + #:phases
> + (modify-phases %standard-phases
> + (add-after 'unpack '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 'unpack '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)))))
> + (propagated-inputs
> + `(("julia-macrotools" ,julia-macrotools)
> + ("julia-versionparsing" ,julia-versionparsing)))
> + (inputs
> + `(("python" ,python)))
> + (native-inputs
> + `(("python-numpy" ,python-numpy)))
> + (home-page "https://github.com/JuliaPy/PyCall.jl")
> + (synopsis "Call Python functions from the Julia language")
> + (description "This package provides the ability to directly call and fully
> +interoperate with Python from the Julia language. You can import arbitrary
> +Python modules from Julia, call Python functions (with automatic conversion of
> +types between Julia and Python), define Python classes from Julia methods, and
> +share large data structures between Julia and Python without copying them.")
> + (license license:expat)))
LGTM!
Cheers,
simon
Hi Efraim,
On mer., 22 sept. 2021 at 15:13, Efraim Flashner <efraim@flashner.co.il> wrote:
> * gnu/packages/julia-xyz.scm (julia-ansicoloredprinters): New variable.
> ---
> gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
> index 1038d3f80b..ec31d70531 100644
> --- a/gnu/packages/julia-xyz.scm
> +++ b/gnu/packages/julia-xyz.scm
> @@ -100,6 +100,26 @@ acts like @code{convert(T, x)}, but without the restriction of returning a
> be GPU compatible without throwing away the wrapper.")
> (license license:expat)))
>
> +(define-public julia-ansicoloredprinters
> + (package
> + (name "julia-ansicoloredprinters")
> + (version "0.0.1")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/JuliaDocs/ANSIColoredPrinters.jl")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32 "0dp5agljr0g50s5gn0pr70wrz01ggck6pb40ay3l4szhswq7mqzf"))))
> + (build-system julia-build-system)
> + (home-page "https://github.com/JuliaDocs/ANSIColoredPrinters.jl")
> + (synopsis "ANSI escape code translator")
> + (description "@code{ANSIColoredPrinters.jl} converts a text qualified by
> +ANSI escape codes to another format.")
> + (license license:expat)))
LGTM!
Cheers,
simon
Hi Efraim,
On mar., 14 sept. 2021 at 21:19, Efraim Flashner <efraim@flashner.co.il> wrote:
> * gnu/packages/julia-jll.scm (julia-libsass-jll): New variable.
> ---
> gnu/packages/julia-jll.scm | 43 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 43 insertions(+)
LGTM!
Cheers,
simon
Hi Efraim, On mar., 14 sept. 2021 at 21:19, Efraim Flashner <efraim@flashner.co.il> wrote: > * gnu/packages/julia-xyz.scm (julia-sass): New variable. > --- > gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm > index a80964c2b0..2f953a33b7 100644 > --- a/gnu/packages/julia-xyz.scm > +++ b/gnu/packages/julia-xyz.scm > @@ -3403,6 +3403,28 @@ (define-public julia-safetestsets > a loadable module.") > (license license:expat)))) > > +(define-public julia-sass > + (package > + (name "julia-sass") > + (version "0.2.0") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/piever/Sass.jl") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0y7kkkj717h5cj659ssry89i5r64symr6pvhr6vv4qmaxrnjxj92")))) > + (build-system julia-build-system) > + (propagated-inputs > + `(("julia-libsass-jll" ,julia-libsass-jll))) > + (home-page "https://github.com/piever/Sass.jl") > + (synopsis "Compile scss and sass file to css in Julia") Again, I would remove «in Julia>.. > + (description "This library provides a simple Julian API to use > the I would write «This package provides…» > +@code{libsass} library to compile scss and sass files to css.") > + (license license:expat))) LGTM. Cheers, simon
Hi Efraim,
On mar., 14 sept. 2021 at 21:19, Efraim Flashner <efraim@flashner.co.il> wrote:
> * gnu/packages/julia-xyz.scm (julia-ansicoloredprinters): New variable.
> ---
> gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
Already added by previous patch. This one should be dropped.
Cheers,
simon
Hi Efraim, On mar., 14 sept. 2021 at 21:19, Efraim Flashner <efraim@flashner.co.il> wrote: I would add here an explanation, along these lines: «These four variables are added by the same commit to avoid a cyclic dependency.» > * gnu/packages/julia-xyz.scm (julia-documenter, > julia-documentermarkdown, julia-documentertools): New variables. > (julia-documenter-0.22): New hidden variable. > --- > gnu/packages/julia-xyz.scm | 146 ++++++++++++++++++++++++++++++++++++- > 1 file changed, 145 insertions(+), 1 deletion(-) The patch does not apply… > diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm > index 309687019d..e7e7680cca 100644 > --- a/gnu/packages/julia-xyz.scm > +++ b/gnu/packages/julia-xyz.scm > @@ -26,7 +26,9 @@ (define-module (gnu packages julia-xyz) > #:use-module (guix git-download) > #:use-module (guix build-system julia) > #:use-module (gnu packages gcc) > - #:use-module (gnu packages julia-jll)) > + #:use-module (gnu packages julia-jll) > + #:use-module (gnu packages python) > + #:use-module (gnu packages version-control)) > > (define-public julia-abstractffts > (package > @@ -990,6 +992,148 @@ (define-public julia-docstringextensions > valuable enough at this time.") > (license license:expat))) > > +;; By removing all the javascript and css downloads any HTML documentation > +;; produced by this package will not be very useful. > +(define-public julia-documenter > + (package > + (name "julia-documenter") > + (version "0.27.6") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/JuliaDocs/Documenter.jl") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "1y6rql7cxc7hfhc8rfq1mdmffp70sqzyh4vnnq93fziwrc8c8sbj")))) > + (build-system julia-build-system) > + (arguments > + `(#:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'patch-source > + (lambda* (#:key inputs #:allow-other-keys) > + (substitute* "src/Deps.jl" > + (("pip install") > + (string-append (assoc-ref inputs "python") > + "/bin/pip install"))) > + #t)) > + (add-after 'unpack '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.*") "")) > + #t))))) > + (propagated-inputs > + `(("julia-ansicoloredprinters" ,julia-ansicoloredprinters) > + ("julia-docstringextensions" ,julia-docstringextensions) > + ("julia-iocapture" ,julia-iocapture) > + ("julia-json" ,julia-json))) > + (inputs > + `(("python" ,python-wrapper))) > + (native-inputs > + `(("git" ,git-minimal) > + ("julia-documentermarkdown" ,julia-documentermarkdown) > + ("julia-documentertools" ,julia-documentertools))) > + (home-page "https://juliadocs.github.io/Documenter.jl") > + (synopsis "Documentation generator for Julia") > + (description "This package provides a documentation generator for Julia.") > + (license license:expat))) > + > +(define-public julia-documenter-0.22 Do we need to make it public? Is it not enough to keep it hidden? > + (package > + (inherit julia-documenter) > + (name "julia-documenter") > + (version "0.22.6") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/JuliaDocs/Documenter.jl") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "1z8b7267y7yn5nx8sjwkmc0ph97vmv42q52jg7s89ghqb9xx3wv5")))) > + (arguments > + `(#:tests? #f ; Some tests require network. > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'remove-javascript-downloads > + (lambda _ > + ;; This isn't problematic because we only use > + ;; this package for bootstrapping. > + (substitute* '("assets/html/documenter.js" > + "assets/html/search.js" > + "src/Writers/HTMLWriter.jl") > + (("cdnjs.cloudflare.com") "example.com")) > + #t))))) > + (propagated-inputs > + `(("julia-docstringextensions" ,julia-docstringextensions) > + ("julia-json" ,julia-json))) > + (inputs `()) > + (native-inputs `()) > + (properties '((hidden? . #t))))) > + > +(define-public julia-documentermarkdown > + (package > + (name "julia-documentermarkdown") > + (version "0.2.2") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/JuliaDocs/DocumenterMarkdown.jl") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0sx89hi5p2f8zi2rp5qrv06m270d90pxj5d2y5cxls1spax7wqx8")))) > + (build-system julia-build-system) > + (inputs > + ;; We don't want to propagate the bootstrap version. > + ;; Cycle with Documenter.jl in later versions. > + `(("julia-documenter" ,julia-documenter-0.22))) > + (home-page "https://github.com/JuliaDocs/DocumenterMarkdown.jl") > + (synopsis "Documenter's Markdown") > + (description "This package enables the Markdown / MkDocs backend of > +@code{Documenter.jl}.") > + (license license:expat))) > + > +(define-public julia-documentertools > + (package > + (name "julia-documentertools") > + (version "0.1.13") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/JuliaDocs/DocumenterTools.jl") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "05p57p8xlkn42m1lv9gq4hl96vp7hpj19d51p828ai1rbpcpi3a6")))) > + (build-system julia-build-system) > + (arguments > + `(#:tests? #f)) ; Tests require network. > + (inputs > + ;; We don't want to propagate the bootstrap version. > + ;; Cycle with Documenter.jl in later versions. > + `(("julia-documenter" ,julia-documenter-0.22))) > + (propagated-inputs > + `(("julia-docstringextensions" ,julia-docstringextensions) > + ("julia-gumbo" ,julia-gumbo) > + ("julia-sass" ,julia-sass))) > + (native-inputs > + `(("julia-example" ,julia-example))) > + (home-page "https://github.com/JuliaDocs/DocumenterTools.jl") > + (synopsis "Extra tools for setting up Documenter") I would write «setting up Documenter.jl» > + (description "This package contains utilities for setting up documentation > +generation with @code{Documenter.jl}.") > + (license license:expat))) > + > (define-public julia-diffresults > (package > (name "julia-diffresults") …so I have not tried it. It LGTM though. Cheers, simon
[-- Attachment #1: Type: text/plain, Size: 8570 bytes --] On Mon, Sep 27, 2021 at 07:11:18PM +0200, zimoun wrote: > Hi Efraim, > > On mar., 14 sept. 2021 at 21:19, Efraim Flashner <efraim@flashner.co.il> wrote: > > I would add here an explanation, along these lines: «These four > variables are added by the same commit to avoid a cyclic dependency.» > > > * gnu/packages/julia-xyz.scm (julia-documenter, > > julia-documentermarkdown, julia-documentertools): New variables. > > (julia-documenter-0.22): New hidden variable. > > --- > > gnu/packages/julia-xyz.scm | 146 ++++++++++++++++++++++++++++++++++++- > > 1 file changed, 145 insertions(+), 1 deletion(-) > > The patch does not apply… Probably due to the module imports. python-xyz was added in a different patch. > > > diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm > > index 309687019d..e7e7680cca 100644 > > --- a/gnu/packages/julia-xyz.scm > > +++ b/gnu/packages/julia-xyz.scm > > @@ -26,7 +26,9 @@ (define-module (gnu packages julia-xyz) > > #:use-module (guix git-download) > > #:use-module (guix build-system julia) > > #:use-module (gnu packages gcc) > > - #:use-module (gnu packages julia-jll)) > > + #:use-module (gnu packages julia-jll) > > + #:use-module (gnu packages python) > > + #:use-module (gnu packages version-control)) > > > > (define-public julia-abstractffts > > (package > > @@ -990,6 +992,148 @@ (define-public julia-docstringextensions > > valuable enough at this time.") > > (license license:expat))) > > > > +;; By removing all the javascript and css downloads any HTML documentation > > +;; produced by this package will not be very useful. > > +(define-public julia-documenter > > + (package > > + (name "julia-documenter") > > + (version "0.27.6") > > + (source > > + (origin > > + (method git-fetch) > > + (uri (git-reference > > + (url "https://github.com/JuliaDocs/Documenter.jl") > > + (commit (string-append "v" version)))) > > + (file-name (git-file-name name version)) > > + (sha256 > > + (base32 "1y6rql7cxc7hfhc8rfq1mdmffp70sqzyh4vnnq93fziwrc8c8sbj")))) > > + (build-system julia-build-system) > > + (arguments > > + `(#:phases > > + (modify-phases %standard-phases > > + (add-after 'unpack 'patch-source > > + (lambda* (#:key inputs #:allow-other-keys) > > + (substitute* "src/Deps.jl" > > + (("pip install") > > + (string-append (assoc-ref inputs "python") > > + "/bin/pip install"))) > > + #t)) > > + (add-after 'unpack '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.*") "")) > > + #t))))) > > + (propagated-inputs > > + `(("julia-ansicoloredprinters" ,julia-ansicoloredprinters) > > + ("julia-docstringextensions" ,julia-docstringextensions) > > + ("julia-iocapture" ,julia-iocapture) > > + ("julia-json" ,julia-json))) > > + (inputs > > + `(("python" ,python-wrapper))) > > + (native-inputs > > + `(("git" ,git-minimal) > > + ("julia-documentermarkdown" ,julia-documentermarkdown) > > + ("julia-documentertools" ,julia-documentertools))) > > + (home-page "https://juliadocs.github.io/Documenter.jl") > > + (synopsis "Documentation generator for Julia") > > + (description "This package provides a documentation generator for Julia.") > > + (license license:expat))) > > + > > +(define-public julia-documenter-0.22 > > Do we need to make it public? Is it not enough to keep it hidden? It should be enough to not make it hidden and not public. Also, I took another look at it and adjusted the package slightly so it can use the current julia-documenter version and not an older version for the bootstrap. > > > + (package > > + (inherit julia-documenter) > > + (name "julia-documenter") > > + (version "0.22.6") > > + (source > > + (origin > > + (method git-fetch) > > + (uri (git-reference > > + (url "https://github.com/JuliaDocs/Documenter.jl") > > + (commit (string-append "v" version)))) > > + (file-name (git-file-name name version)) > > + (sha256 > > + (base32 > > + "1z8b7267y7yn5nx8sjwkmc0ph97vmv42q52jg7s89ghqb9xx3wv5")))) > > + (arguments > > + `(#:tests? #f ; Some tests require network. > > + #:phases > > + (modify-phases %standard-phases > > + (add-after 'unpack 'remove-javascript-downloads > > + (lambda _ > > + ;; This isn't problematic because we only use > > + ;; this package for bootstrapping. > > + (substitute* '("assets/html/documenter.js" > > + "assets/html/search.js" > > + "src/Writers/HTMLWriter.jl") > > + (("cdnjs.cloudflare.com") "example.com")) > > + #t))))) > > + (propagated-inputs > > + `(("julia-docstringextensions" ,julia-docstringextensions) > > + ("julia-json" ,julia-json))) > > + (inputs `()) > > + (native-inputs `()) > > + (properties '((hidden? . #t))))) > > + > > +(define-public julia-documentermarkdown > > + (package > > + (name "julia-documentermarkdown") > > + (version "0.2.2") > > + (source > > + (origin > > + (method git-fetch) > > + (uri (git-reference > > + (url "https://github.com/JuliaDocs/DocumenterMarkdown.jl") > > + (commit (string-append "v" version)))) > > + (file-name (git-file-name name version)) > > + (sha256 > > + (base32 "0sx89hi5p2f8zi2rp5qrv06m270d90pxj5d2y5cxls1spax7wqx8")))) > > + (build-system julia-build-system) > > + (inputs > > + ;; We don't want to propagate the bootstrap version. > > + ;; Cycle with Documenter.jl in later versions. > > + `(("julia-documenter" ,julia-documenter-0.22))) > > + (home-page "https://github.com/JuliaDocs/DocumenterMarkdown.jl") > > + (synopsis "Documenter's Markdown") > > + (description "This package enables the Markdown / MkDocs backend of > > +@code{Documenter.jl}.") > > + (license license:expat))) > > + > > +(define-public julia-documentertools > > + (package > > + (name "julia-documentertools") > > + (version "0.1.13") > > + (source > > + (origin > > + (method git-fetch) > > + (uri (git-reference > > + (url "https://github.com/JuliaDocs/DocumenterTools.jl") > > + (commit (string-append "v" version)))) > > + (file-name (git-file-name name version)) > > + (sha256 > > + (base32 "05p57p8xlkn42m1lv9gq4hl96vp7hpj19d51p828ai1rbpcpi3a6")))) > > + (build-system julia-build-system) > > + (arguments > > + `(#:tests? #f)) ; Tests require network. > > + (inputs > > + ;; We don't want to propagate the bootstrap version. > > + ;; Cycle with Documenter.jl in later versions. > > + `(("julia-documenter" ,julia-documenter-0.22))) > > + (propagated-inputs > > + `(("julia-docstringextensions" ,julia-docstringextensions) > > + ("julia-gumbo" ,julia-gumbo) > > + ("julia-sass" ,julia-sass))) > > + (native-inputs > > + `(("julia-example" ,julia-example))) > > + (home-page "https://github.com/JuliaDocs/DocumenterTools.jl") > > + (synopsis "Extra tools for setting up Documenter") > > I would write «setting up Documenter.jl» > > > + (description "This package contains utilities for setting up documentation > > +generation with @code{Documenter.jl}.") > > + (license license:expat))) > > + > > (define-public julia-diffresults > > (package > > (name "julia-diffresults") > > …so I have not tried it. It LGTM though. > > 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #1: Type: text/plain, Size: 230 bytes --] Patches pushed. -- 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]