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

ocamlPackages.merlin_extend-0.3 -> merlin-extend-0.4

Browse Source
This commit is contained in:
Vincent Laporte 2019-07-25 16:24:18 +00:00 committed by Vincent Laporte
parent 62768f8efc
commit 0d70d4a8b8
4 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/reason/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune { stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune
, menhir, merlin_extend, ppx_tools_versioned, utop , menhir, merlin-extend, ppx_tools_versioned, utop
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune utop menhir ]; buildInputs = [ ocaml findlib dune utop menhir ];

22
pkgs/development/ocaml-modules/merlin-extend/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, buildDunePackage, fetchFromGitHub, cppo }:
buildDunePackage rec {
pname = "merlin-extend";
version = "0.4";
src = fetchFromGitHub {
owner = "let-def";
repo = pname;
sha256 = "1dxiqmm7ry24gvw6p9n4mrz37mnq4s6m8blrccsv3rb8yq82acx9";
rev = "v${version}";
};
buildInputs = [ cppo ];
meta = with lib; {
inherit (src.meta) homepage;
description = "SDK to extend Merlin";
license = licenses.mit;
maintainers = [ maintainers.volth ];
};
}

26
pkgs/development/ocaml-modules/merlin_extend/default.nix
View File

@ -1,26 +0,0 @@
{ stdenv, buildOcaml, fetchFromGitHub, cppo }:
buildOcaml rec {
name = "merlin_extend";
version = "0.3";
minimumSupportedOcamlVersion = "4.02";
src = fetchFromGitHub {
owner = "let-def";
repo = "merlin-extend";
sha256 = "1z6hybcb7ry0bkzjd0r2dlcgjnhhxdsr06x3h03sj7h5fihsc7vd";
rev = "v${version}";
};
buildInputs = [ cppo ];
createFindlibDestdir = true;
meta = with stdenv.lib; {
homepage = https://github.com/let-def/merlin-extend;
description = "SDK to extend Merlin";
license = licenses.mit;
maintainers = [ maintainers.volth ];
};
}

2
pkgs/top-level/ocaml-packages.nix
View File

@ -436,7 +436,7 @@ let
merlin = callPackage ../development/tools/ocaml/merlin { }; merlin = callPackage ../development/tools/ocaml/merlin { };
merlin_extend = callPackage ../development/ocaml-modules/merlin_extend { }; merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { };
mezzo = callPackage ../development/compilers/mezzo { }; mezzo = callPackage ../development/compilers/mezzo { };