diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-02 09:18:37 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-02 09:18:37 +0200 |
commit | 6f723b9bad655a64f1234557b5e08b5ce9556228 (patch) | |
tree | 68931ba6b8defdba041734ccc72ac40a0fee5b94 /pkgs/development/ocaml-modules | |
parent | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (diff) | |
parent | 7d4f67a23f599d82f26d1ec9b89f82e1cc5f3ba9 (diff) | |
download | nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.gz nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.bz2 nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.lz nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.xz nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.zst nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/merlin-extend/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/merlin_extend/default.nix | 26 |
2 files changed, 22 insertions, 26 deletions
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 ]; - }; -} |