[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#34265] [PATCH 1/3] gnu: dune: Update to 1.6.3.
From: |
Gabriel Hondet |
Subject: |
[bug#34265] [PATCH 1/3] gnu: dune: Update to 1.6.3. |
Date: |
Fri, 1 Feb 2019 09:38:22 +0100 |
User-agent: |
mu4e 1.0; emacs 26.1 |
* gnu/packages/ocaml.scm (dune): Update to 1.6.3.
* guix/build/dune-build-system.scm
---
gnu/packages/ocaml.scm | 4 ++--
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 a32cee44d..986e435f4 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 fcc2d6567..00b0c7c40 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 <address@hidden>
+;;; Copyright © 2019 Gabriel Hondet <address@hidden>
;;;
;;; 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
--
2.20.1
On Fri 01 Feb 2019 at 09:22 Gabriel Hondet wrote:
> So I guess we have to add the flag ~--libdir=(string-append (assoc-ref
> %outputs "out") "/lib/ocaml/site-lib/")~ during the install phase
So I have tried, and it works like a charm. So here is a 3-patch-only
version of my 9 previous patches, without any beta version.
signature.asc
Description: PGP signature