me
/
guix
Archived
1
0
Fork 0
Code

gnu: dune: Update to 3.0.3. 

* gnu/packages/ocaml.scm (dune): Update to 3.0.3.
(dune-configurator)[arguments]: Remove vendored dependencies.
(ocaml4.09-dune-configurator)[arguments]: Extend from dune-configurator.
master
Julien Lepiller 2022-03-13 14:48:53 +01:00
parent c49b410344
commit bd9eb9ef27
No known key found for this signature in database
GPG Key ID: 53D457B2D636EE82
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/ocaml.scm
View File

@ -1648,7 +1648,7 @@ full_split, cut, rcut, etc..")
(define dune-bootstrap (define dune-bootstrap
(package (package
(name "dune") (name "dune")
(version "2.9.3") (version "3.0.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1657,7 +1657,7 @@ full_split, cut, rcut, etc..")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1b4rsqn6gf3cv46jgvrsq0xh9zfsaif810zpbvm0mv2bhphqfjk7")))) "1ndn560fg0fg8n3wplmkg5px69h0g38pyma9wik85cmmqfxry14k"))))
(build-system ocaml-build-system) (build-system ocaml-build-system)
(arguments (arguments
`(#:tests? #f; require odoc `(#:tests? #f; require odoc
@ -1691,7 +1691,15 @@ following a very simple s-expression syntax.")
`(#:package "dune-configurator" `(#:package "dune-configurator"
#:dune ,dune-bootstrap #:dune ,dune-bootstrap
; require ppx_expect ; require ppx_expect
#:tests? #f)) #:tests? #f
#:phases
(modify-phases %standard-phases
;; When building dune, these directories are normally removed after
;; the bootstrap.
(add-before 'build 'remove-vendor
(lambda _
(delete-file-recursively "vendor/csexp")
(delete-file-recursively "vendor/pp"))))))
(propagated-inputs (propagated-inputs
(list ocaml-csexp)) (list ocaml-csexp))
(properties `((ocaml4.09-variant . ,(delay ocaml4.09-dune-configurator)))) (properties `((ocaml4.09-variant . ,(delay ocaml4.09-dune-configurator))))
@ -1712,8 +1720,7 @@ config.h files for instance. Among other things, dune-configurator allows one t
(inherit dune-configurator) (inherit dune-configurator)
(name "ocaml4.09-dune-configurator") (name "ocaml4.09-dune-configurator")
(arguments (arguments
`(#:package "dune-configurator" `(,@(package-arguments dune-configurator)
#:tests? #f
#:dune ,ocaml4.09-dune-bootstrap #:dune ,ocaml4.09-dune-bootstrap
#:ocaml ,ocaml-4.09 #:ocaml ,ocaml-4.09
#:findlib ,ocaml4.09-findlib)) #:findlib ,ocaml4.09-findlib))