ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: julia-jllwrappers: Move to (gnu packages julia-jll).

Browse source 
* gnu/packages/julia-xyz.scm (julia-jlwrappers): Move to ...
* gnu/packages/julia-jll.scm: ... here.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register julia-jll.scm
This commit is contained in:
Efraim Flashner 2021-05-30 09:46:34 +03:00
parent c00b1760f6
commit 0f6902ea79
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
3 changed files with 72 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -308,6 +308,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/jrnl.scm \
%D%/packages/jose.scm \
%D%/packages/julia.scm \
%D%/packages/julia-jll.scm \
%D%/packages/julia-xyz.scm \
%D%/packages/jupyter.scm \
%D%/packages/kawa.scm \

70
gnu/packages/julia-jll.scm Normal file
View file

@ -0,0 +1,70 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages julia-jll)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system julia)
#:use-module (gnu packages)
#:use-module (gnu packages julia))
(define-public julia-jllwrappers
(package
(name "julia-jllwrappers")
(version "1.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaPackaging/JLLWrappers.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0v7xhsv9z16d657yp47vgc86ggc01i1wigqh3n0d7i1s84z7xa0h"))))
(arguments
;; Wants to download stuff
'(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'custom-override-path
(lambda* (#:key inputs #:allow-other-keys)
;; Make @generate_wrapper_header take an optional argument that
;; guix packagers can pass to override the default "override"
;; binary path. This won't be needed when something like
;; https://github.com/JuliaPackaging/JLLWrappers.jl/pull/27
;; will be merged.
(substitute* "src/wrapper_generators.jl"
(("generate_wrapper_header.*")
"generate_wrapper_header(src_name, override_path = nothing)\n")
(("pkg_dir = .*" all)
(string-append
all "\n" "override = something(override_path,"
"joinpath(dirname(pkg_dir), \"override\"))\n"))
(("@static if isdir.*") "@static if isdir($override)\n")
(("return joinpath.*") "return $override\n"))
#t)))))
(build-system julia-build-system)
(home-page "https://github.com/JuliaPackaging/JLLWrappers.jl")
(synopsis "Julia macros used by JLL packages")
(description "This package contains Julia macros that enable JLL packages
to generate themselves. It is not intended to be used by users, but rather is
used in autogenerated packages via @code{BinaryBuilder.jl}.")
(license license:expat)))

44
gnu/packages/julia-xyz.scm
View file

@ -27,6 +27,7 @@ (define-module (gnu packages julia-xyz)
#:use-module (gnu packages gcc)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages julia-jll)
#:use-module (gnu packages maths)
#:use-module (gnu packages tls)
#:use-module (gnu packages web))
@ -1077,49 +1078,6 @@ (define-public julia-irtools
Cassette.")
(license license:expat)))
(define-public julia-jllwrappers
(package
(name "julia-jllwrappers")
(version "1.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaPackaging/JLLWrappers.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0v7xhsv9z16d657yp47vgc86ggc01i1wigqh3n0d7i1s84z7xa0h"))))
(arguments
;; Wants to download stuff
'(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'custom-override-path
(lambda* (#:key inputs #:allow-other-keys)
;; Make @generate_wrapper_header take an optional argument that
;; guix packagers can pass to override the default "override"
;; binary path. This won't be needed when something like
;; https://github.com/JuliaPackaging/JLLWrappers.jl/pull/27
;; will be merged.
(substitute* "src/wrapper_generators.jl"
(("generate_wrapper_header.*")
"generate_wrapper_header(src_name, override_path = nothing)\n")
(("pkg_dir = .*" all)
(string-append
all "\n" "override = something(override_path,"
"joinpath(dirname(pkg_dir), \"override\"))\n"))
(("@static if isdir.*") "@static if isdir($override)\n")
(("return joinpath.*") "return $override\n"))
#t)))))
(build-system julia-build-system)
(home-page "https://github.com/JuliaPackaging/JLLWrappers.jl")
(synopsis "Julia macros used by JLL packages")
(description "This package contains Julia macros that enable JLL packages
to generate themselves. It is not intended to be used by users, but rather is
used in autogenerated packages via @code{BinaryBuilder.jl}.")
(license license:expat)))
(define-public julia-jpegturbo-jll
(package
(name "julia-jpegturbo-jll")