diff options
| author | Gabriel Hondet <gabrielhondet@gmail.com> | 2019-02-01 09:38:22 +0100 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2019-02-04 22:03:22 +0100 |
| commit | 625a3daa12217d7cd162149dcba5657237bb9455 (patch) | |
| tree | c00409c85f1e416135172107a9c0691d8f98cf07 | |
| parent | 8c35a6dd20e5ad663b4a14d64fb2ea5c1af1f6d3 (diff) | |
| download | guix-625a3daa12217d7cd162149dcba5657237bb9455.tar guix-625a3daa12217d7cd162149dcba5657237bb9455.tar.gz | |
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>
| -rw-r--r-- | gnu/packages/ocaml.scm | 4 | ||||
| -rw-r--r-- | guix/build/dune-build-system.scm | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a32cee44dc..986e435f48 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1391,14 +1391,14 @@ coverage information.") (define-public dune (package (name "dune") - (version "1.2.1") + (version "1.6.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/ocaml/dune/releases/" "download/" version "/dune-" version ".tbz")) (sha256 (base32 - "00c5dbm4hkdapc2i7pg07b2lj8sv6ly38qr7zid58cdmbmzq21z9")))) + "0dmf0wbfmgdy5plz1bjiisc2hjgblvxsnrqjmw2c8y45v1h23mdz")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc diff --git a/guix/build/dune-build-system.scm b/guix/build/dune-build-system.scm index fcc2d6567d..00b0c7c406 100644 --- a/guix/build/dune-build-system.scm +++ b/guix/build/dune-build-system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2019 Gabriel Hondet <gabrielhondet@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,7 +50,8 @@ "Install the given package." (let ((out (assoc-ref outputs "out")) (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) (define %standard-phases |