diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2021-02-08 09:04:12 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-02-12 17:42:29 +0100 |
| commit | 0279876952630f87edb8957698fb7280ba499e70 (patch) | |
| tree | b77c0e849a10704ff702ac6726a636ad2fb8c5e6 /pkgs/development/ocaml-modules | |
| parent | e4b1824c5bfdf1d2d64990cab370cd061efc7450 (diff) | |
| download | nixlib-0279876952630f87edb8957698fb7280ba499e70.tar nixlib-0279876952630f87edb8957698fb7280ba499e70.tar.gz nixlib-0279876952630f87edb8957698fb7280ba499e70.tar.bz2 nixlib-0279876952630f87edb8957698fb7280ba499e70.tar.lz nixlib-0279876952630f87edb8957698fb7280ba499e70.tar.xz nixlib-0279876952630f87edb8957698fb7280ba499e70.tar.zst nixlib-0279876952630f87edb8957698fb7280ba499e70.zip | |
ocamlPackages.lwt: 5.3.0 → 5.4.0
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/lwt-dllist/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/lwt/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/lwt_log/default.nix | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/lwt-dllist/default.nix b/pkgs/development/ocaml-modules/lwt-dllist/default.nix index 59e13330e58f..28a6f5f43d7f 100644 --- a/pkgs/development/ocaml-modules/lwt-dllist/default.nix +++ b/pkgs/development/ocaml-modules/lwt-dllist/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "lwt-dllist"; version = "1.0.0"; + useDune2 = true; + minimumOCamlVersion = "4.03"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 83146ef9104b..ee0c3b5b00cc 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,21 +1,25 @@ { lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml -, cppo, ocaml-migrate-parsetree, ocplib-endian, result +, cppo, dune-configurator, ocaml-migrate-parsetree, ocplib-endian, result , mmap, seq +, ocaml-syntax-shims }: let inherit (lib) optional versionAtLeast; in buildDunePackage rec { pname = "lwt"; - version = "5.3.0"; + version = "5.4.0"; + + useDune2 = true; src = fetchzip { url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; - sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2"; + sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cppo ocaml-migrate-parsetree ] + buildInputs = [ cppo dune-configurator ocaml-migrate-parsetree ] + ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix index 05a5a28dcd7b..9213e1af94f2 100644 --- a/pkgs/development/ocaml-modules/lwt_log/default.nix +++ b/pkgs/development/ocaml-modules/lwt_log/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "lwt_log"; version = "1.1.1"; + useDune2 = true; + minimumOCamlVersion = "4.02"; src = fetchFromGitHub { |