diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-10-21 07:51:10 +0000 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-10-21 10:54:49 +0000 |
commit | bb6629977d05ed0db0ac98e993d2be9e49514fb3 (patch) | |
tree | 6c8c7c0df32651993dfa7f7a6237b816ea39d701 /pkgs/development/ocaml-modules/zed | |
parent | 2d8b952786b7352ca9c454eec1df0df26a41b1e7 (diff) | |
download | nixlib-bb6629977d05ed0db0ac98e993d2be9e49514fb3.tar nixlib-bb6629977d05ed0db0ac98e993d2be9e49514fb3.tar.gz nixlib-bb6629977d05ed0db0ac98e993d2be9e49514fb3.tar.bz2 nixlib-bb6629977d05ed0db0ac98e993d2be9e49514fb3.tar.lz nixlib-bb6629977d05ed0db0ac98e993d2be9e49514fb3.tar.xz nixlib-bb6629977d05ed0db0ac98e993d2be9e49514fb3.tar.zst nixlib-bb6629977d05ed0db0ac98e993d2be9e49514fb3.zip |
ocamlPackages.zed: 1.4 -> 1.5
Diffstat (limited to 'pkgs/development/ocaml-modules/zed')
-rw-r--r-- | pkgs/development/ocaml-modules/zed/default.nix | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 72ff8e4c0497..85977792b4d3 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, jbuilder }: + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then + { + version = "1.5"; + sha256 = "1nq884cxl1k4daa549bk7bxarwivbpp51k4blbiwyxwfhs29xgfr"; + buildInputs = [ jbuilder ]; + extra = { + buildPhase = "jbuilder build -p zed"; + inherit (jbuilder) installPhase; }; + } else { + version = "1.4"; + sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; + buildInputs = []; + extra = { createFindlibDestdir = true; }; + } +; in -stdenv.mkDerivation rec { - version = "1.4"; +stdenv.mkDerivation (rec { + inherit (param) version; name = "ocaml-zed-${version}"; src = fetchzip { url = "https://github.com/diml/zed/archive/${version}.tar.gz"; - sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; + inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild react ]; - - propagatedBuildInputs = [ camomile ]; + buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs; - createFindlibDestdir = true; + propagatedBuildInputs = [ react camomile ]; meta = { description = "Abstract engine for text edition in OCaml"; @@ -31,4 +46,4 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.gal_bolle ]; }; -} +} // param.extra) |