JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocamlPackages.zed: 1.4 -> 1.5

Browse Source
This commit is contained in:
Vincent Laporte 2017-10-21 07:51:10 +00:00
parent 2d8b952786
commit bb6629977d
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/development/ocaml-modules/zed/default.nix
View File

@ -1,19 +1,34 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react }:
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, jbuilder }:
stdenv.mkDerivation rec {
version = "1.4";
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 {
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 ];
buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs;
propagatedBuildInputs = [ camomile ];
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)