all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Julien Lepiller <julien@lepiller.eu>
To: 43745@debbugs.gnu.org
Subject: [bug#43745] [PATCH 27/27] gnu: dune: Update to 2.7.1.
Date: Thu,  1 Oct 2020 15:41:33 +0200	[thread overview]
Message-ID: <20201001134133.32105-27-julien@lepiller.eu> (raw)
In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu>

* gnu/packages/ocaml.scm (dune): Update to 2.7.1.
(ocaml4.07-dune): Keep version 1.11.3.
(ocaml-result, ocaml-csexp): Use the bootstrap dune on dune
dependencies.
(ocaml-craml, ocaml-bitstring): Run "dune upgrade" before building.
---
 gnu/packages/ocaml.scm | 67 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 58 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index d2e2e61863..025badb031 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1277,10 +1277,10 @@ full_split, cut, rcut, etc..")
     ;; where it says `mit'.
     (license license:expat)))
 
-(define-public dune
+(define dune-bootstrap
   (package
     (name "dune")
-    (version "1.11.3")
+    (version "2.7.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1289,17 +1289,19 @@ full_split, cut, rcut, etc..")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr"))))
+                "10qgx83fq8b522y9mpllrp0l5cgmr2bs5s7aix5img21hlbm34in"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:tests? #f; require odoc
-       #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+       #:make-flags (list "release"
+                          (string-append "PREFIX=" (assoc-ref %outputs "out"))
                           (string-append "LIBDIR=" (assoc-ref %outputs "out")
                                          "/lib/ocaml/site-lib"))
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)
+             (mkdir-p "src/dune")
              (invoke "./configure")
              #t)))))
     (home-page "https://github.com/ocaml/dune")
@@ -1309,8 +1311,41 @@ release of Jane Street packages.  It reads metadata from @file{dune} files
 following a very simple s-expression syntax.")
     (license license:expat)))
 
+(define-public dune-configurator
+  (package
+    (inherit dune-bootstrap)
+    (name "dune-configurator")
+    (build-system dune-build-system)
+    (arguments
+     `(#:package "dune-configurator"
+       #:dune ,dune-bootstrap
+       ; require ppx_expect
+       #:tests? #f))
+    (propagated-inputs
+     `(("ocaml-csexp" ,ocaml-csexp)))
+    (synopsis "")
+    (description "")))
+
+(define-public dune
+  (package
+    (inherit dune-bootstrap)
+    (propagated-inputs
+     `(("dune-configurator" ,dune-configurator)))
+    (properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune))))))
+
 (define-public ocaml4.07-dune
-  (package-with-ocaml4.07 dune))
+  (package
+    (inherit (package-with-ocaml4.07 dune-bootstrap))
+    (version "1.11.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/ocaml/dune")
+                     (commit version)))
+              (file-name (git-file-name "dune" version))
+              (sha256
+               (base32
+                "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr"))))))
 
 (define-public ocaml-csexp
   (package
@@ -1328,6 +1363,7 @@ following a very simple s-expression syntax.")
     (build-system dune-build-system)
     (arguments
      `(#:tests? #f; FIXME: needs ppx_expect, but which version?
+       #:dune ,dune-bootstrap
        #:phases
        (modify-phases %standard-phases
          (add-before 'build 'chmod
@@ -1335,8 +1371,7 @@ following a very simple s-expression syntax.")
              (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*"))
              #t)))))
     (propagated-inputs
-     `(("dune" ,dune)
-       ("ocaml-result" ,ocaml-result)))
+     `(("ocaml-result" ,ocaml-result)))
     (home-page "https://github.com/ocaml-dune/csexp")
     (synopsis "Parsing and printing of S-expressions in Canonical form")
     (description "This library provides minimal support for Canonical
@@ -1428,7 +1463,13 @@ ocaml-migrate-parsetree")
      `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned)))
     (arguments
      `(#:package "bitstring"
-       #:tests? #f)); Tests fail to build
+       #:tests? #f; Tests fail to build
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'upgrade
+           (lambda _
+             (invoke "dune" "upgrade")
+             #t)))))
     (home-page "https://github.com/xguerin/bitstring")
     (synopsis "Bitstrings and bitstring matching for OCaml")
     (description "Adds Erlang-style bitstrings and matching over bitstrings as
@@ -1453,7 +1494,8 @@ powerful.")
                 "166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q"))))
     (build-system dune-build-system)
     (arguments
-     `(#:test-target "."))
+     `(#:test-target "."
+       #:dune ,dune-bootstrap))
     (home-page "https://github.com/janestreet/result")
     (synopsis "Compatibility Result module")
     (description "Uses the new result type defined in OCaml >= 4.03 while
@@ -3813,6 +3855,13 @@ serializers and deserializers from type definitions.")
         (base32
          "197xjp4vmzdymf2ndinw271ihpf45h04mx8gqj8ypspxdr5fj1a5"))))
     (build-system dune-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'upgrade
+           (lambda _
+             (invoke "dune" "upgrade")
+             #t)))))
     (inputs
      `(("ocaml-fmt" ,ocaml-fmt)
        ("ocaml-astring" ,ocaml-astring)
-- 
2.28.0





  parent reply	other threads:[~2020-10-01 14:07 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-01 13:39 [bug#43745] [PATCH] gnu: dune: Update to 2.7.1 Julien Lepiller
2020-10-01 13:41 ` [bug#43745] [PATCH 01/27] gnu: unison: Build with ocaml-4.09 Julien Lepiller
2020-10-01 13:41   ` [bug#43745] [PATCH 02/27] gnu: camlp5: Update to 7.13 Julien Lepiller
2020-10-12 22:47     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 03/27] gnu: ocaml-mccs: Update to 1.1+11 Julien Lepiller
2020-10-12 22:50     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 04/27] gnu: ocaml-migrate-parsetree: Update to 1.7.3 Julien Lepiller
2020-10-12 22:53     ` zimoun
2020-10-13  2:03       ` Julien Lepiller
2020-10-13 12:09         ` zimoun
2020-10-13 15:24           ` Julien Lepiller
2020-10-13 15:37             ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 05/27] gnu: ocaml-ppx-tools-versioned: Update to 5.4.0 Julien Lepiller
2020-10-12 22:56     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 06/27] gnu: ocaml-qtest: Do not use deprecated jbuilder Julien Lepiller
2020-10-12 23:05     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 07/27] gnu: ocaml-bitstring: " Julien Lepiller
2020-10-12 23:06     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 08/27] gnu: ocaml-lwt-log: " Julien Lepiller
2020-10-12 23:09     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 09/27] gnu: ocaml-easy-format: " Julien Lepiller
2020-10-12 23:11     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 10/27] gnu: ocaml4.07-zed: " Julien Lepiller
2020-10-12 23:18     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 11/27] gnu: ocaml4.07-utop: " Julien Lepiller
2020-10-12 23:20     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 12/27] gnu: ocaml4.07-merlin: " Julien Lepiller
2020-10-12 23:23     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 13/27] gnu: ocaml4.07-ppx-expect: " Julien Lepiller
2020-10-12 23:24     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 14/27] gnu: ocaml4.07-core: " Julien Lepiller
2020-10-12 23:33     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 15/27] gnu: ocaml-tyxml: " Julien Lepiller
2020-10-12 23:36     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 16/27] gnu: Add ocaml-stdlib-shims Julien Lepiller
2020-10-12 23:40     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 17/27] gnu: opam: Update to 2.0.7 Julien Lepiller
2020-10-12 23:43     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 18/27] gnu: ocaml-base64: Update to 3.4.0 Julien Lepiller
2020-10-12 23:46     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 19/27] gnu: ocaml-logs: Update to 0.7.0 Julien Lepiller
2020-10-13 11:20     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 20/27] gnu: ocaml-fmt: Update to 0.8.9 Julien Lepiller
2020-10-13 11:19     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 21/27] gnu: ocaml-alcotest: Update to 1.0.0 Julien Lepiller
2020-10-13 11:22     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 22/27] gnu: ocaml-result: Update to 1.5 Julien Lepiller
2020-10-13 11:23     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 23/27] gnu: Add ocaml-csexp Julien Lepiller
2020-10-13 11:44     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 24/27] gnu: ocaml-compiler-libs: Build only with OCaml 4.07 Julien Lepiller
2020-10-13 11:27     ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 25/27] gnu: ocaml-jane-street-headers: " Julien Lepiller
2020-10-13 11:46     ` zimoun
2020-10-13 11:51       ` Julien Lepiller
2020-10-13 15:13         ` zimoun
2020-10-01 13:41   ` [bug#43745] [PATCH 26/27] gnu: ocaml-4.07: Ensure build with ocaml4.7-dune Julien Lepiller
2020-10-13 11:41     ` zimoun
2020-10-13 11:50       ` Julien Lepiller
2020-10-01 13:41   ` Julien Lepiller [this message]
2020-10-02  8:56     ` [bug#43745] [PATCH 27/27] gnu: dune: Update to 2.7.1 zimoun
2020-10-02 12:42       ` Julien Lepiller
2020-10-05 14:55         ` zimoun
2020-10-13 11:57     ` zimoun
2020-10-12 22:47   ` [bug#43745] [PATCH 01/27] gnu: unison: Build with ocaml-4.09 zimoun
2020-10-12 23:14     ` Julien Lepiller
2020-10-02  2:41 ` [bug#43745] [PATCH] gnu: dune: Update to 2.7.1 Brett Gilio
2020-10-15 16:04 ` bug#43745: " Julien Lepiller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201001134133.32105-27-julien@lepiller.eu \
    --to=julien@lepiller.eu \
    --cc=43745@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.