From d77310cc3f6626baf2a11a8a8c6e4b7730c2f1b2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 22 Jan 2020 01:08:19 +0100 Subject: nu: Add ocaml-lwt-react. * gnu/packages/ocaml.scm (ocaml-lwt-react): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 31e200f3d5..b51dc3b4f7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1794,6 +1794,28 @@ process. Also, in many cases, Lwt threads can interact without the need for locks or other synchronization primitives.") (license license:lgpl2.1))) +(define-public ocaml-lwt-react + (package + (inherit ocaml-lwt) + (name "ocaml-lwt-react") + (version "1.1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocsigen/lwt") + ;; Version from opam + (commit "4.3.0"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f7036srqz7zmnz0n164734smgkrqz78r1i35cg30x31kkr3pnn4")))) + (arguments + `(#:package "lwt_react")) + (properties `((upstream-name . "lwt_react"))) + (propagated-inputs + `(("ocaml-lwt" ,ocaml-lwt) + ("ocaml-react" ,ocaml-react))))) + (define-public ocaml-lwt-log (package (name "ocaml-lwt-log") -- cgit v1.2.3 From 6c89e06626bfb679bf681ed3e6c04bba79e271cd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 22 Jan 2020 01:10:27 +0100 Subject: gnu: ocaml-lambda-term: Add missing dependencies. * gnu/packages/ocaml.scm (ocaml-lambda-term)[propagated-inputs]: Add ocaml-lwt-react. [inputs]: Add libev. --- gnu/packages/ocaml.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b51dc3b4f7..d41bd2af42 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3117,9 +3117,12 @@ connect an engine to your inputs and rendering functions to get an editor.") `(#:build-flags (list "--profile" "release") #:tests? #f)) (propagated-inputs - `(("lwt" ,ocaml-lwt) - ("lwt-log" ,ocaml-lwt-log) - ("zed" ,ocaml-zed))) + `(("ocaml-lwt" ,ocaml-lwt) + ("ocaml-lwt-log" ,ocaml-lwt-log) + ("ocaml-lwt-react" ,ocaml-lwt-react) + ("ocaml-zed" ,ocaml-zed))) + (inputs + `(("libev" ,libev))) (home-page "https://github.com/diml/lambda-term") (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the -- cgit v1.2.3 From e3388d6361dedabb2f6df9cdd5cc98e6cac7f457 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 22 Jan 2020 01:15:47 +0100 Subject: gnu: Add ocaml4.07-findlib. * gnu/packages/ocaml.scm (ocaml4.07-findlib): New variable. --- gnu/packages/ocaml.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d41bd2af42..8ef6effb1f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -968,6 +968,14 @@ compilation and linkage, there are new frontends of the various OCaml compilers that can directly deal with packages.") (license license:x11))) +(define-public ocaml4.07-findlib + (package + (inherit ocaml-findlib) + (name "ocaml4.07-findlib") + (inputs + `(("m4" ,m4) + ("ocaml" ,ocaml-4.07))))) + ;; note that some tests may hang for no obvious reason. (define-public ocaml-ounit (package -- cgit v1.2.3 From 0f654e63d619c2407728a15890fe674685e571da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 11:06:56 +0200 Subject: gnu: ocaml-mmap: Use a source file-name. * gnu/packages/ocaml.scm (ocaml-mmap)[source]: Add file-name field. --- gnu/packages/ocaml.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8ef6effb1f..7c5a2f939b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2016, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016-2020 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -1756,6 +1756,7 @@ through Transport Layer Security (@dfn{TLS}) encrypted connections.") (uri (git-reference (url "https://github.com/mirage/mmap") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1jaismy5d1bhbbanysmr2k79px0yv6ya265dri3949nha1l23i60")))) -- cgit v1.2.3 From 59fcf386f804ab76089682da746b606218fbc5af Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 23 Jan 2020 01:48:10 +0100 Subject: gnu: ocaml4.07-findlib: Fix building with ocaml 4.07. * gnu/packages/ocaml.scm (ocaml4.07-findlib): rename inputs to native-inputs. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7c5a2f939b..098c116cf3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -972,7 +972,7 @@ compilers that can directly deal with packages.") (package (inherit ocaml-findlib) (name "ocaml4.07-findlib") - (inputs + (native-inputs `(("m4" ,m4) ("ocaml" ,ocaml-4.07))))) -- cgit v1.2.3