[PATCH 1/9] gnu: dune: Update to 1.6.3.

Done

Details

2 participants

Gabriel Hondet
Julien Lepiller

Owner: unassigned

Submitted by: Gabriel Hondet

Severity: normal

Debbugs page

Gabriel Hondet wrote 6 years ago

Recipients:(address . guix-patches@gnu.org)

Message-ID:875zu4ycve.fsf@gmail.com

* gnu/packages/ocaml.scm (dune): Update to 1.6.3.

---

gnu/packages/ocaml.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)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
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 2/9] gnu: sexplib0: Update to 0.12-preview.120.18+252.

Recipients:(address . 34265@debbugs.gnu.org)

Message-ID:874l9oycqm.fsf@gmail.com

* gnu/packages/ocaml.scm (sexplib0): Update to 0.12-preview.120.18+252.

---

gnu/packages/ocaml.scm | 20 +++++++++++++++-----

1 file changed, 15 insertions(+), 5 deletions(-)

Toggle diff (49 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 986e435f4..5f95591d9 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4903,27 +4903,37 @@ exclusion algorithms are typical examples of such systems.")
 (define-public ocaml-sexplib0
   (package
     (name "ocaml-sexplib0")
-    (version "0.11.0")
+    (version "0.12-preview.120.18+252")
     (home-page "https://github.com/janestreet/sexplib0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url (string-append home-page ".git"))
-             (commit (string-append "v" version))))
+             (commit "7e602a00a9b7c037f3717cc60577a2aad8941830")))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "07v3ggyss7xhfv14bjk1n87sr42iqwj4cgjiv2lcdfkqk49i2bmi"))))
+         "0hrxy52nbnrd9l9v66klghsdy7xnbsjk85fb1rdkhcjcr38jnmad"))))
     (build-system dune-build-system)
     (arguments
-     '(#:tests? #f)) ;no tests
+     '(#:tests? #f ;no tests
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "dune" "install"
+                     (string-append "--libdir="
+                                    (assoc-ref outputs "out")
+                                    "/lib/ocaml/site-lib")
+                     (string-append "--prefix="
+                                    (assoc-ref outputs "out"))))))))
     (synopsis "Library containing the definition of S-expressions and some
 base converters")
     (description "Part of Jane Street's Core library The Core suite of
 libraries is an industrial strength alternative to OCaml's standard library
 that was developed by Jane Street, the largest industrial user of OCaml.")
-(license license:expat)))
+    (license license:expat)))
 
 (define-public ocaml-parsexp
   (package
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 3/9] gnu: ocaml-ppx-derivers: Fix libdir install

Recipients:(address . 34265@debbugs.gnu.org)

Message-ID:8736p8ycos.fsf@gmail.com

---

gnu/packages/ocaml.scm | 12 +++++++++++-

1 file changed, 11 insertions(+), 1 deletion(-)

Toggle diff (25 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 5f95591d9..946360833 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5116,7 +5116,17 @@ a more consistent API.")
          "0bnhihl1w31as5w2czly1v3d6pbir9inmgsjg2cj6aaj9v1dzd85"))))
     (build-system dune-build-system)
     (arguments
-     '(#:tests? #f)) ;no tests
+     '(#:tests? #f ;no tests
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "dune" "install"
+                       (string-append "--prefix=" out)
+                       (string-append "--libdir=" out
+                                      "/lib/ocaml/site-lib/")))
+             #t)))))
     (synopsis "Shared @code{@@deriving} plugin registry")
     (description
      "Ppx_derivers is a tiny package whose sole purpose is to allow
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 4/9] gnu: ocaml-stdio: Fix libdir install

Recipients:(address . 34265@debbugs.gnu.org)

Message-ID:871s4sycn5.fsf@gmail.com

---

gnu/packages/ocaml.scm | 13 ++++++++++++-

1 file changed, 12 insertions(+), 1 deletion(-)

Toggle diff (26 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 946360833..94b108961 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5090,7 +5090,18 @@ is now @code{Ocaml_common.Ast_helper}.")
     (inputs `(("ocaml-base" ,ocaml-base)
               ("ocaml-sexplib0" ,ocaml-sexplib0)))
     (arguments
-     '(#:tests? #f)) ;no tests
+     '(#:tests? #f ;no tests
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           ;; set libdir to use ocaml-site
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "dune" "install"
+                       (string-append "--prefix=" out)
+                       (string-append "--libdir=" out
+                                      "/lib/ocaml/site-lib")))
+             #t)))))
     (synopsis "Standard IO library for OCaml")
     (description
      "Stdio implements simple input/output functionalities for OCaml.  It
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 5/9] gnu: ocaml-base: Update to 0.12-preview.120.18+252.

Recipients:(address . 34265@debbugs.gnu.org)

Message-ID:87zhrgwy0p.fsf@gmail.com

* gnu/packages/ocaml.scm (ocaml-base): Update to 0.12-preview.120.18+252.

---

gnu/packages/ocaml.scm | 15 +++++++++++----

1 file changed, 11 insertions(+), 4 deletions(-)

Toggle diff (44 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 94b108961..4c2579975 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5011,18 +5011,18 @@ functionality for parsing and pretty-printing s-expressions.")
 (define-public ocaml-base
   (package
     (name "ocaml-base")
-    (version "0.11.1")
+    (version "0.12-preview.120.18+252")
     (home-page "https://github.com/janestreet/base")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url (string-append home-page ".git"))
-             (commit (string-append "v" version))))
+             (commit "170e96604ea81a44354a7508d168eb341a92e060")))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir"))))
+         "166dhrgkwp2iy5cipzalvkyln94f73la1rnqkb07p3wz8yl41gb5"))))
     (build-system dune-build-system)
     (inputs
      `(("ocaml-sexplib0" ,ocaml-sexplib0)))
@@ -5032,7 +5032,14 @@ functionality for parsing and pretty-printing s-expressions.")
          (replace 'build
            ;; make warnings non fatal (jbuilder behaviour)
            (lambda _
-             (invoke "dune" "build" "@install" "--profile=release"))))))
+             (invoke "dune" "build" "@install" "--profile=release")))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "dune" "install"
+                       (string-append "--prefix=" out)
+                       (string-append "--libdir=" out
+                                      "/lib/ocaml/site-lib"))))))))
   (synopsis
     "Full standard library replacement for OCaml")
   (description
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 6/9] gnu: ocaml-migrate-parsetree: Update to 1.2.0.

Recipients:(address . 34265@debbugs.gnu.org)

Message-ID:87y370wxyf.fsf@gmail.com

* gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 1.2.0.

---

gnu/packages/ocaml.scm | 37 ++++++++++++++++++++++++-------------

1 file changed, 24 insertions(+), 13 deletions(-)

Toggle diff (55 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 4c2579975..bf12cc85c 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1419,24 +1419,35 @@ following a very simple s-expression syntax.")
 (define-public ocaml-migrate-parsetree
   (package
     (name "ocaml-migrate-parsetree")
-    (version "1.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ocaml-ppx/"
-                                  "ocaml-migrate-parsetree/releases/download/v"
-                                  version "/ocaml-migrate-parsetree-"
-                                  version ".tbz"))
-              (sha256
-               (base32
-                "01zjp1q4hryqaxv4apkjd868fycz2kf887r6lkb6x2a545h1lh7f"))))
+    (version "1.2.0")
+    (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append home-page ".git"))
+             (commit (string-append "v" version))))
+       (sha256
+        (base32
+         "16kas19iwm4afijv3yxd250s08absabmdcb4yj57wc8r4fmzv5dm"))))
     (build-system dune-build-system)
     (arguments
      `(#:tests? #f
-       #:jbuild? #t))
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           ;; set libdir to use ocaml-site
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "dune" "install"
+                       (string-append "--prefix=" out)
+                       (string-append "--libdir=" out
+                                      "/lib/ocaml/site-lib")))
+             #t)))))
     (propagated-inputs
-     `(("ocamlbuild" ,ocamlbuild)
+     `(("ocaml-ppx-derivers" ,ocaml-ppx-derivers)
+       ("ocamlbuild" ,ocamlbuild)
        ("ocaml-result" ,ocaml-result)))
-    (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree")
     (synopsis "OCaml parsetree convertor")
     (description "This library converts between parsetrees of different OCaml
 versions.  For each version, there is a snapshot of the parsetree and conversion
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 7/9] gnu: ocaml-compiler-libs: Fix libdir install

Recipients:(address . 34265@debbugs.gnu.org)

Message-ID:87womkwxx0.fsf@gmail.com

---

gnu/packages/ocaml.scm | 13 ++++++++++++-

1 file changed, 12 insertions(+), 1 deletion(-)

Toggle diff (26 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index bf12cc85c..8abbbab71 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5082,7 +5082,18 @@ provided by companion libraries such as
          "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s"))))
     (build-system dune-build-system)
     (arguments
-     '(#:tests? #f)) ;no tests
+     '(#:tests? #f ;no tests
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           ;; set libdir to use ocaml-site
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "dune" "install"
+                       (string-append "--prefix=" out)
+                       (string-append "--libdir=" out
+                                      "/lib/ocaml/site-lib")))
+             #t)))))
     (synopsis "Compiler libraries repackaged")
     (description "This packaeg simply repackages the OCaml compiler libraries
 so they don't expose everything at toplevel.  For instance, @code{Ast_helper}
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 8/9] gnu: ocaml-ppxlib: Update to 0.5.0.

Recipients:(address . 34265@debbugs.gnu.org)

Message-ID:87va24wxva.fsf@gmail.com

* gnu/packages/ocaml.scm (ocaml-ppxlib): Update to 0.5.0.

---

gnu/packages/ocaml.scm | 12 ++++++++++--

1 file changed, 10 insertions(+), 2 deletions(-)

Toggle diff (39 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 8abbbab71..66a200520 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5177,7 +5177,7 @@ as part of the same ocaml-migrate-parsetree driver.")
 (define-public ocaml-ppxlib
   (package
     (name "ocaml-ppxlib")
-    (version "0.4.0")
+    (version "0.5.0")
     (home-page "https://github.com/ocaml-ppx/ppxlib")
     (source
      (origin
@@ -5188,7 +5188,7 @@ as part of the same ocaml-migrate-parsetree driver.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1nr4igf5m4prvigvv470dnhfdhdw0p6hz6zw8gnm5bzcv7s2lg5l"))))
+         "0d2nyp4mlx7m3vdvcdhs51x570vw30j645yfbwlhjpwdd8243fya"))))
     (build-system dune-build-system)
     (inputs
      `(("ocaml-base" ,ocaml-base)
@@ -5218,6 +5218,14 @@ as part of the same ocaml-migrate-parsetree driver.")
                  (("#use \"topfind\";;" all)
                   (string-append "#directory \"" findlib-libdir "\"\n"
                                  all))))
+             #t))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "dune" "install"
+                       (string-append "--prefix=" out)
+                       (string-append "--libdir=" out
+                                      "/lib/ocaml/site-lib/")))
              #t)))))
     (synopsis
      "Base library and tools for ppx rewriters")
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 9/9] gnu: Add ocaml-ppx-inline-test.

Recipients:(address . 34265@debbugs.gnu.org)

Message-ID:87tvhowxls.fsf@gmail.com

* gnu/packages/ocaml.scm (ocaml-ppx-inline-test): New variable.

---

gnu/packages/ocaml.scm | 41 +++++++++++++++++++++++++++++++++++++++++

1 file changed, 41 insertions(+)

Toggle diff (54 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 66a200520..efbd8da18 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4705,6 +4705,47 @@ Dedukti files.")
 syntax checking on dedukti files.")
       (license license:cecill-b))))
 
+(define-public ocaml-ppx-inline-test
+  (package
+    (name "ocaml-ppx-inline-test")
+    (version "0.12-preview.120.18+252")
+    (home-page "https://github.com/janestreet/ppx_inline_test")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append home-page ".git"))
+             (commit "f594c2d98c9ef03009893cbddb1ad061e883bf7f")))
+       (sha256
+        (base32
+         "0b1n5xs429d93ysdq6vhg73rkh3r69fx78si8ls8jjgzg2svxald"))))
+    (build-system dune-build-system)
+    (arguments
+     `(#:tests? #f ;see home page README for further information
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "dune" "install"
+                       (string-append "--prefix=" out)
+                       (string-append "--libdir=" out
+                                      "/lib/ocaml/site-lib")))
+             #t)))))
+    (inputs
+     `(("ocaml-base" ,ocaml-base)
+       ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)
+       ("ocaml-compiler-libs" ,ocaml-compiler-libs)
+       ("ocaml-sexplib0" ,ocaml-sexplib0)
+       ("ocaml-stdio" ,ocaml-stdio)
+       ("ocaml-ppxlib" ,ocaml-ppxlib)))
+    (synopsis
+     "Syntax extension for writing in-line tests in ocaml code")
+    (description
+     "Part of the Jane Street's PPX rewriters collection.")
+    (license license:expat)))
+
 (define-public ocaml-biniou
  (package
    (name "ocaml-biniou")
-- 
2.20.1

Julien Lepiller wrote 6 years ago

Re: [bug#34265] [PATCH 2/9] gnu: sexplib0: Update to 0.12-preview.120.18+252.

Recipients:

Message-ID:C0D0C1F5-25F9-482E-904D-1C9295435774@lepiller.eu

Le 31 janvier 2019 17:20:24 GMT+01:00, Gabriel Hondet <gabrielhondet@gmail.com> a écrit :

Toggle quote (57 lines)>
>* gnu/packages/ocaml.scm (sexplib0): Update to 0.12-preview.120.18+252.
>---
> gnu/packages/ocaml.scm | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
>diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
>index 986e435f4..5f95591d9 100644
>--- a/gnu/packages/ocaml.scm
>+++ b/gnu/packages/ocaml.scm
>@@ -4903,27 +4903,37 @@ exclusion algorithms are typical examples of
>such systems.")
> (define-public ocaml-sexplib0
>   (package
>     (name "ocaml-sexplib0")
>-    (version "0.11.0")
>+    (version "0.12-preview.120.18+252")
>     (home-page "https://github.com/janestreet/sexplib0")
>     (source
>      (origin
>        (method git-fetch)
>        (uri (git-reference
>              (url (string-append home-page ".git"))
>-             (commit (string-append "v" version))))
>+             (commit "7e602a00a9b7c037f3717cc60577a2aad8941830")))
>        (file-name (git-file-name name version))
>        (sha256
>         (base32
>-         "07v3ggyss7xhfv14bjk1n87sr42iqwj4cgjiv2lcdfkqk49i2bmi"))))
>+         "0hrxy52nbnrd9l9v66klghsdy7xnbsjk85fb1rdkhcjcr38jnmad"))))
>     (build-system dune-build-system)
>     (arguments
>-     '(#:tests? #f)) ;no tests
>+     '(#:tests? #f ;no tests
>+       #:phases
>+       (modify-phases %standard-phases
>+         (replace 'install
>+           (lambda* (#:key outputs #:allow-other-keys)
>+             (invoke "dune" "install"
>+                     (string-append "--libdir="
>+                                    (assoc-ref outputs "out")
>+                                    "/lib/ocaml/site-lib")
>+                     (string-append "--prefix="
>+                                    (assoc-ref outputs "out"))))))))
> (synopsis "Library containing the definition of S-expressions and some
> base converters")
>     (description "Part of Jane Street's Core library The Core suite of
>libraries is an industrial strength alternative to OCaml's standard
>library
>that was developed by Jane Street, the largest industrial user of
>OCaml.")
>-(license license:expat)))
>+    (license license:expat)))
> 
> (define-public ocaml-parsexp
>   (package

Hi Gabriel, thanks for these patches!

We usually don't use beta,preview or otherwise unreleased software in guix. The opam website still has 0.11.0 as the latest version. What's the reason behind this change?

Tge libdir thing is worrying. Is it now needed with newer versions of dune? Shouldn't we rather modify the dure-build-system?

These questions apply to other packages in the series, so I'll refrain from pushing anything for now.

Gabriel Hondet wrote 6 years ago

Re: [bug#34265] [PATCH 2/9] gnu: sexplib0: Update to 0.12-preview.120.18+252.

Recipients:(name . Julien Lepiller)(address . julien@lepiller.eu)(address . 34265@debbugs.gnu.org)

Message-ID:87sgx8wwcf.fsf@gmail.com

Hi Julien,

On Thu 31 Jan 2019 at 18:28 Julien Lepiller wrote:

Toggle quote (2 lines)

> We usually don't use beta,preview or otherwise unreleased software in guix. The opam website still has 0.11.0 as the latest version. What's the reason behind this change?

Some packages still use jbuilder things and other use dune ones in the

0.11.x versions of jane street packages. It resulted in errors with, for

instance ppxlib, who kept files in jbuilder syntax (although the file

was named ppxlib.dune). In the 0.12 preview, everything uses dune.

Toggle quote (2 lines)

> Tge libdir thing is worrying.

Concerning the =libdir=, it seems that Jane Street installs by default

everything to e.g. =lib/sexplib0/= directly (or =lib/ocaml/sexplib0= I

don't remember), but not in =lib/ocaml/site-lib/=, resulting in

libraries not found.

Toggle quote (2 lines)

> Is it now needed with newer versions of dune?

Curiously, this was already an issue, as the ~janestreet-origin~
function shows in =ocaml.scm= but it disappeared in the 0.10/0.11
series, as I packaged ~ocaml-sexplib0~ &c. without any issue; and it
reappeared when upgrading dune to 1.6.3.  So it seems that it is needed
with the new version of dune.

Toggle quote (2 lines)

> Shouldn't we rather modify the dure-build-system?

It would seem to be a better idea. I can give it a try.

Toggle quote (2 lines)

> These questions apply to other packages in the series, so I'll refrain from pushing anything for now.

Indeed.

Gabriel

Gabriel Hondet wrote 6 years ago

Recipients:(name . Julien Lepiller)(address . julien@lepiller.eu)(address . 34265@debbugs.gnu.org)

Message-ID:87r2crx6ic.fsf@gmail.com

Hello,

On Thu 31 Jan 2019 at 18:49 Gabriel Hondet wrote:

Toggle quote (7 lines)

>> Tge libdir thing is worrying.

> Concerning the =libdir=, it seems that Jane Street installs by default

> everything to e.g. =lib/sexplib0/= directly (or =lib/ocaml/sexplib0= I

> don't remember), but not in =lib/ocaml/site-lib/=, resulting in

> libraries not found.

The new behaviour of dune is to follow the prefix given, see

[[https://dune.readthedocs.io/en/latest/usage.html#destination]].

As the prefix is given, findlib is not consulted and everything is

installed directly into =out/lib=.

So I guess we have to add the flag ~--libdir=(string-append (assoc-ref

%outputs "out") "/lib/ocaml/site-lib/")~ during the install phase

Or we can keep the installation process but modify the OCAMLPATH

variable to search not in =lib/ocaml/site-lib= but in =lib/=.

Gabriel

Gabriel Hondet wrote 6 years ago

Re: [bug#34265] [PATCH 1/3] gnu: dune: Update to 1.6.3.

Recipients:(name . Julien Lepiller)(address . julien@lepiller.eu)(address . 34265@debbugs.gnu.org)

Message-ID:87pnsbx5ce.fsf@gmail.com

* 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(-)

Toggle diff (52 lines)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 <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
-- 
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.

Gabriel Hondet wrote 6 years ago

Re: [bug#34265] [PATCH 2/3] gnu: ocaml-migrate-parsetree: Update to 1.2.0.

Recipients:(name . Julien Lepiller)(address . julien@lepiller.eu)(address . 34265@debbugs.gnu.org)

Message-ID:87o97vx59r.fsf@gmail.com

* gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 1.2.0.

---

gnu/packages/ocaml.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 986e435f4..a1f9e7996 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1419,24 +1419,24 @@ following a very simple s-expression syntax.")
 (define-public ocaml-migrate-parsetree
   (package
     (name "ocaml-migrate-parsetree")
-    (version "1.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ocaml-ppx/"
-                                  "ocaml-migrate-parsetree/releases/download/v"
-                                  version "/ocaml-migrate-parsetree-"
-                                  version ".tbz"))
-              (sha256
-               (base32
-                "01zjp1q4hryqaxv4apkjd868fycz2kf887r6lkb6x2a545h1lh7f"))))
+    (version "1.2.0")
+    (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append home-page ".git"))
+             (commit (string-append "v" version))))
+       (sha256
+        (base32
+         "16kas19iwm4afijv3yxd250s08absabmdcb4yj57wc8r4fmzv5dm"))))
     (build-system dune-build-system)
     (arguments
-     `(#:tests? #f
-       #:jbuild? #t))
+     `(#:tests? #f))
     (propagated-inputs
-     `(("ocamlbuild" ,ocamlbuild)
+     `(("ocaml-ppx-derivers" ,ocaml-ppx-derivers)
+       ("ocamlbuild" ,ocamlbuild)
        ("ocaml-result" ,ocaml-result)))
-    (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree")
     (synopsis "OCaml parsetree convertor")
     (description "This library converts between parsetrees of different OCaml
 versions.  For each version, there is a snapshot of the parsetree and conversion
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

Re: [bug#34265] [PATCH 3/3] gnu: Add ocaml-ppx-inline-test.

Recipients:(name . Julien Lepiller)(address . julien@lepiller.eu)(address . 34265@debbugs.gnu.org)

Message-ID:87munfx581.fsf@gmail.com

* gnu/packages/ocaml.scm (ocaml-ppx-inline-test): New variable.

---

gnu/packages/ocaml.scm | 33 +++++++++++++++++++++++++++++++++

1 file changed, 33 insertions(+)

Toggle diff (46 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index a1f9e7996..2d33db1c0 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4694,6 +4694,39 @@ Dedukti files.")
 syntax checking on dedukti files.")
       (license license:cecill-b))))
 
+(define-public ocaml-ppx-inline-test
+  (package
+    (name "ocaml-ppx-inline-test")
+    (version "0.11.0")
+    (home-page "https://github.com/janestreet/ppx_inline_test")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append home-page ".git"))
+             (commit (string-append "v" version))))
+       (sha256
+        (base32
+         "0b1n5xs429d93ysdq6vhg73rkh3r69fx78si8ls8jjgzg2svxald"))))
+    (build-system dune-build-system)
+    (arguments
+     `(#:tests? #f ;see home page README for further information
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure))))
+    (inputs
+     `(("ocaml-base" ,ocaml-base)
+       ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)
+       ("ocaml-compiler-libs" ,ocaml-compiler-libs)
+       ("ocaml-sexplib0" ,ocaml-sexplib0)
+       ("ocaml-stdio" ,ocaml-stdio)
+       ("ocaml-ppxlib" ,ocaml-ppxlib)))
+    (synopsis
+     "Syntax extension for writing in-line tests in ocaml code")
+    (description
+     "Part of the Jane Street's PPX rewriters collection.")
+    (license license:expat)))
+
 (define-public ocaml-biniou
  (package
    (name "ocaml-biniou")
-- 
2.20.1

Julien Lepiller wrote 6 years ago

Re: [bug#34265] [PATCH 2/9] gnu: sexplib0: Update to 0.12-preview.120.18+252.

Recipients:(address . 34265-done@debbugs.gnu.org)

Message-ID:20190204221224.40fd0924@lepiller.eu

Pushed as 625a3daa12217d7cd162149dcba5657237bb9455 and following. Thank

you!

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 34265@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 34265

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags

mumi command -t +confirmed -t +easy

Or, remove the moreinfo tag and set the help tag

mumi command -t -moreinfo -t +help

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date