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

ocamlPackages.zed: refactor

Browse Source 
Remove legacy version 1.4 (whose evaluation actually fails)

Refactor with `buildDunePackage`

Use dune 2
This commit is contained in:
Vincent Laporte 2021-01-06 08:11:28 +01:00 committed by Vincent Laporte
parent c36b928f4f
commit 0476529037
1 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,36 +1,19 @@
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune, charInfo_width }:
{ lib, buildDunePackage, fetchFromGitHub, camomile, react, charInfo_width }:
let param =
if lib.versionAtLeast ocaml.version "4.02" then
{
version = "3.1.0";
buildDunePackage rec {
pname = "zed";
version = "3.1.0";
useDune2 = true;
src = fetchFromGitHub {
owner = "ocaml-community";
repo = pname;
rev = version;
sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p";
buildInputs = [ dune ];
propagatedBuildInputs = [ charInfo_width ];
extra = {
buildPhase = "dune build -p zed";
inherit (dune) installPhase; };
} else {
version = "1.4";
sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w";
buildInputs = [ ocamlbuild ];
propagatedBuildInputs = [ camomile ];
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";
inherit (param) sha256;
};
buildInputs = [ ocaml findlib ] ++ param.buildInputs;
propagatedBuildInputs = [ react ] ++ param.propagatedBuildInputs;
propagatedBuildInputs = [ charInfo_width react ];
meta = {
description = "Abstract engine for text edition in OCaml";
@ -41,11 +24,10 @@ stdenv.mkDerivation (rec {
To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.
'';
homepage = "https://github.com/diml/zed";
inherit (src.meta) homepage;
license = lib.licenses.bsd3;
platforms = ocaml.meta.platforms or [];
maintainers = [
lib.maintainers.gal_bolle
];
};
} // param.extra)
}