From f0dece30b409d4144234b2e60a9422f9b9757eba Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Tue, 22 Jan 2019 17:11:54 +0100 Subject: gnu: ocaml-uchar: Update to 0.0.2. * gnu/packages/ocaml.scm (ocaml-uchar): Update to 0.0.2. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index deba67c4d7..3993424eb2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2269,14 +2269,14 @@ (define-public ocaml4.02-ulex (define-public ocaml-uchar (package (name "ocaml-uchar") - (version "0.0.1") + (version "0.0.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/ocaml/uchar/releases/download/v" version "/uchar-" version ".tbz")) (sha256 (base32 - "0ficw1x7ymbd6m8hqw3w1aycwm1hbwd6bad3c5pspwnzh3qlikhi")))) + "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7")))) (build-system ocaml-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From cdcbccd17c41d91b0173349aa8c90afece840d57 Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Tue, 22 Jan 2019 17:17:48 +0100 Subject: gnu: ocaml-fmt: Update to 0.8.5. * gnu/packages/ocaml.scm (ocaml-fmt): Update to 0.8.5. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3993424eb2..2ecbd50a5b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Peter Kreye -;;; Copyright © 2018 Gabriel Hondet +;;; Copyright © 2018, 2019 Gabriel Hondet ;;; Copyright © 2018 Kei Kebreau ;;; ;;; This file is part of GNU Guix. @@ -1802,14 +1802,14 @@ (define-public ocaml4.02-cmdliner (define-public ocaml-fmt (package (name "ocaml-fmt") - (version "0.8.0") + (version "0.8.5") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/fmt/releases/fmt-" version ".tbz")) (sha256 (base32 - "16y7ibndnairb53j8a6qgipyqwjxncn4pl9jiw5bxjfjm59108px")))) + "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060")))) (build-system ocaml-build-system) (native-inputs `(("ocamlbuild" ,ocamlbuild) @@ -1817,6 +1817,7 @@ (define-public ocaml-fmt ("topkg" ,ocaml-topkg))) (propagated-inputs `(("result" ,ocaml-result) + ("ocaml-uchar" ,ocaml-uchar) ("cmdliner" ,ocaml-cmdliner))) (arguments `(#:tests? #f #:build-flags (list "build" "--with-base-unix" "true" -- cgit v1.2.3 From ca53346dd57d57ba96d15a82dd9b2543723a4ad9 Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Tue, 22 Jan 2019 17:25:26 +0100 Subject: gnu: ocaml-cmdliner: Update to 1.0.2. * gnu/packages/ocaml.scm (ocaml-cmdliner): Update to 1.0.2. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2ecbd50a5b..c62d1ee8ee 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1768,15 +1768,17 @@ (define-public ocaml4.02-mtime (define-public ocaml-cmdliner (package (name "ocaml-cmdliner") - (version "0.9.8") + (version "1.0.2") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/cmdliner/releases/" "cmdliner-" version ".tbz")) (sha256 (base32 - "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx")))) + "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1")))) (build-system ocaml-build-system) + (inputs + `(("ocaml-result" ,ocaml-result))) (native-inputs `(("ocamlbuild" ,ocamlbuild) ("opam" ,opam))) @@ -1785,6 +1787,12 @@ (define-public ocaml-cmdliner #:build-flags '("native=true" "native-dynlink=true") #:phases (modify-phases %standard-phases + (replace 'install + ;; The makefile says 'adjust on cli invocation' + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "make" "install" (string-append "PREFIX=" out)) + #t))) (delete 'configure)))) (home-page "http://erratique.ch/software/cmdliner") (synopsis "Declarative definition of command line interfaces for OCaml") -- cgit v1.2.3 From 1d209d06edef7b2dfd744862add66aa3fe61f952 Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Tue, 22 Jan 2019 17:40:01 +0100 Subject: gnu: Add ocaml-craml. * gnu/packages/ocaml.scm (ocaml-craml): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c62d1ee8ee..c9df31ae6a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4758,6 +4758,35 @@ (define-public ocaml-yojson yojson package. The program @code{atdgen} can be used to derive OCaml-JSON serializers and deserializers from type definitions.") (license license:bsd-3))) + +(define-public ocaml-craml + (package + (name "ocaml-craml") + (version "1.0.0") + (home-page "https://github.com/realworldocaml/craml") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "197xjp4vmzdymf2ndinw271ihpf45h04mx8gqj8ypspxdr5fj1a5")))) + (build-system dune-build-system) + (inputs + `(("ocaml-fmt" ,ocaml-fmt) + ("ocaml-astring" ,ocaml-astring) + ("ocaml-logs" ,ocaml-logs) + ("ocaml-cmdliner" ,ocaml-cmdliner))) + (synopsis + "CRAM-testing framework for testing command line applications") + (description "CRAM is a is functional testing framework for command line +applications. @code{craml} is freely inspired by the +Mercurial's @code{https://www.selenic.com/blog/?p=663, unified test +format}. @code{craml} is released as a single binary (called @code{craml}).") + (license license:isc))) (define-public ocaml-merlin (package -- cgit v1.2.3 From bb29e855da30ab9e9b4cbcc7249ee38f26186d0a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 25 Jan 2019 13:22:34 +0100 Subject: gnu: ocaml-4.02: Use INVOKE. * gnu/packages/ocaml.scm (ocaml-4.02)[arguments]: Use INVOKE in build phases. --- gnu/packages/ocaml.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c9df31ae6a..3731b2aa49 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -191,19 +191,18 @@ (define-public ocaml-4.02 (mandir (string-append out "/share/man"))) ;; Custom configure script doesn't recognize ;; --prefix= syntax (with equals sign). - (zero? (system* "./configure" - "--prefix" out - "--mandir" mandir))))) + (invoke "./configure" + "--prefix" out + "--mandir" mandir)))) (replace 'build (lambda _ - (zero? (system* "make" "-j" (number->string - (parallel-job-count)) - "world.opt")))) + (invoke "make" "-j" (number->string (parallel-job-count)) + "world.opt"))) (delete 'check) (add-after 'install 'check (lambda _ (with-directory-excursion "testsuite" - (zero? (system* "make" "all"))))) + (invoke "make" "all")))) (add-before 'check 'prepare-socket-test (lambda _ (format (current-error-port) -- cgit v1.2.3 From fa5d6e4c6f0f56d8a909d401f7015f156c20c178 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 25 Jan 2019 13:23:27 +0100 Subject: gnu: ocaml-4.01: Use INVOKE. * gnu/packages/ocaml.scm (ocaml-4.01)[arguments]: Use INVOKE in build phases. --- gnu/packages/ocaml.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3731b2aa49..cf6580e961 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Peter Kreye ;;; Copyright © 2018, 2019 Gabriel Hondet ;;; Copyright © 2018 Kei Kebreau +;;; Copyright © 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -253,7 +254,7 @@ (define-public ocaml-4.01 (replace 'build (lambda _ ;; Specifying '-j' at all causes the build to fail. - (zero? (system* "make" "world.opt")))) + (invoke "make" "world.opt"))) ,@(if (string=? "aarch64-linux" (%current-system)) ;; Custom configure script doesn't recongnize aarch64. '((replace 'configure @@ -268,11 +269,9 @@ (define-public ocaml-4.01 (replace 'check (lambda _ (with-directory-excursion "testsuite" - (zero? (system* - "make" - "all" + (invoke "make" "all" (string-append - "TOPDIR=" (getcwd) "/..")))))))))))) + "TOPDIR=" (getcwd) "/.."))))))))))) (define-public ocaml-4.07 (package -- cgit v1.2.3 From 2c0234e78ea86059fb75a1260228a61a524597b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 25 Jan 2019 13:26:24 +0100 Subject: gnu: camlp4-4.02: Use INVOKE. * gnu/packages/ocaml.scm (camlp4-4.02)[arguments]: Use INVOKE in build phases. --- gnu/packages/ocaml.scm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cf6580e961..eb298c8d7a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -447,26 +447,26 @@ (define-public camlp4-4.02 ;; which fails on the second attempt. #:parallel-build? #f #:make-flags '("all") - #:phases (modify-phases %standard-phases - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; This is a home-made 'configure' script. - (let ((out (assoc-ref outputs "out"))) - (zero? (system* "./configure" - (string-append "--libdir=" out - "/lib/ocaml/site-lib") - (string-append "--bindir=" out "/bin") - (string-append "--pkgdir=" out - "/lib/ocaml/site-lib")))))) - (add-after 'install 'install-meta - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "camlp4/META.in" - (("directory = .*") - (string-append "directory = \"" out - "/lib/ocaml/site-lib/camlp4\"\n"))) - (zero? (system* "make" "install-META")))))))) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; This is a home-made 'configure' script. + (let ((out (assoc-ref outputs "out"))) + (invoke "./configure" + (string-append "--libdir=" out + "/lib/ocaml/site-lib") + (string-append "--bindir=" out "/bin") + (string-append "--pkgdir=" out + "/lib/ocaml/site-lib"))))) + (add-after 'install 'install-meta + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "camlp4/META.in" + (("directory = .*") + (string-append "directory = \"" out + "/lib/ocaml/site-lib/camlp4\"\n"))) + (invoke "make" "install-META"))))))) (home-page "https://github.com/ocaml/camlp4") (synopsis "Write parsers in OCaml") (description -- cgit v1.2.3 From 04daa1ed72be39805b787554f7959b1df6558460 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 25 Jan 2019 13:31:29 +0100 Subject: gnu: ocaml-zarith: Use INVOKE. * gnu/packages/ocaml.scm (ocaml-zarith)[arguments]: Use INVOKE. --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index eb298c8d7a..4d9487afa2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1149,8 +1149,7 @@ (define-public ocaml-zarith #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key #:allow-other-keys) - (zero? (system* "./configure"))))))) + (lambda _ (invoke "./configure")))))) (home-page "https://forge.ocamlcore.org/projects/zarith/") (synopsis "Implements arbitrary-precision integers") (description "Implements arithmetic and logical operations over -- cgit v1.2.3 From c6aaa7bed63ad39a61d7a56fd56f722f0e279ae8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 25 Jan 2019 13:32:04 +0100 Subject: gnu: ocaml-zed: Use INVOKE. * gnu/packages/ocaml.scm (ocaml-zed)[arguments]: Use INVOKE in build phases. --- gnu/packages/ocaml.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4d9487afa2..930697f12f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4348,13 +4348,12 @@ (define-public ocaml-zed (modify-phases %standard-phases (delete 'configure) (replace 'build - (lambda* (#:key #:allow-other-keys) - (zero? (system* "jbuilder" "build")))) + (lambda _ (invoke "jbuilder" "build"))) (delete 'check) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (zero? (system* "jbuilder" "install" "--prefix" out)))))))) + (invoke "jbuilder" "install" "--prefix" out))))))) (native-inputs `(("jbuilder" ,ocaml-jbuilder))) (propagated-inputs -- cgit v1.2.3 From 48b11025b734af39023e780ee7f15522dca1c7ea Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 25 Jan 2019 13:32:41 +0100 Subject: gnu: ocaml-utop: Use INVOKE. * gnu/packages/ocaml.scm (ocaml-utop)[arguments]: Use INVOKE. --- gnu/packages/ocaml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 930697f12f..a32cee44dc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4425,9 +4425,9 @@ (define-public ocaml-utop (let* ((out (assoc-ref outputs "out")) (libdir (string-append out "/lib/ocaml/site-lib"))) (mkdir-p libdir) - (zero? (system* "jbuilder" "install" - "--prefix" out - "--libdir" libdir)))))))) + (invoke "jbuilder" "install" + "--prefix" out + "--libdir" libdir))))))) (native-inputs `(("ocaml" ,ocaml) ("cppo" ,ocaml-cppo) -- cgit v1.2.3