nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: dune: Update to 1.6.3. 

* gnu/packages/ocaml.scm (dune): Update to 1.6.3.
* guix/build/dune-build-system.scm (build): Use --libdir.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
This commit is contained in:
Gabriel Hondet 2019-02-01 09:38:22 +01:00 committed by Julien Lepiller
parent 8c35a6dd20
commit 625a3daa12
No known key found for this signature in database
GPG Key ID: 43111F4520086A0C
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/ocaml.scm
View File

@ -1391,14 +1391,14 @@ coverage information.")
(define-public dune (define-public dune
(package (package
(name "dune") (name "dune")
(version "1.2.1") (version "1.6.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ocaml/dune/releases/" (uri (string-append "https://github.com/ocaml/dune/releases/"
"download/" version "/dune-" version ".tbz")) "download/" version "/dune-" version ".tbz"))
(sha256 (sha256
(base32 (base32
"00c5dbm4hkdapc2i7pg07b2lj8sv6ly38qr7zid58cdmbmzq21z9")))) "0dmf0wbfmgdy5plz1bjiisc2hjgblvxsnrqjmw2c8y45v1h23mdz"))))
(build-system ocaml-build-system) (build-system ocaml-build-system)
(arguments (arguments
`(#:tests? #f; require odoc `(#:tests? #f; require odoc

4
guix/build/dune-build-system.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Gabriel Hondet <gabrielhondet@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -49,7 +50,8 @@
"Install the given package." "Install the given package."
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(program (if jbuild? "jbuilder" "dune"))) (program (if jbuild? "jbuilder" "dune")))
(invoke program install-target "--prefix" out)) (invoke program install-target "--prefix" out "--libdir"
(string-append out "/lib/ocaml/site-lib")))
#t) #t)
(define %standard-phases (define %standard-phases