From 0d70d4a8b836d3848b62b56b91e845aa5254c78e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 25 Jul 2019 16:24:18 +0000
Subject: ocamlPackages.merlin_extend-0.3 -> merlin-extend-0.4

---
 .../ocaml-modules/merlin-extend/default.nix        | 22 ++++++++++++++++++
 .../ocaml-modules/merlin_extend/default.nix        | 26 ----------------------
 2 files changed, 22 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/merlin-extend/default.nix
 delete mode 100644 pkgs/development/ocaml-modules/merlin_extend/default.nix

(limited to 'pkgs/development/ocaml-modules')

diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/pkgs/development/ocaml-modules/merlin-extend/default.nix
new file mode 100644
index 000000000000..ad3b1337977f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/merlin-extend/default.nix
@@ -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 ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/merlin_extend/default.nix b/pkgs/development/ocaml-modules/merlin_extend/default.nix
deleted file mode 100644
index 79b8b69bbb57..000000000000
--- a/pkgs/development/ocaml-modules/merlin_extend/default.nix
+++ /dev/null
@@ -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 ];
-  };
-}
-- 
cgit 1.4.1