From 81f258e7bfd5b65424fd25a10d1378600924960c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 1 Aug 2014 09:42:37 +0200 Subject: [PATCH] merlin: some cleaning of the derivation --- pkgs/development/tools/ocaml/merlin/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index a5a06f37c9c1..c0882439f5c5 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,15 +1,10 @@ {stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}: -let - pname = "merlin"; - version = "1.6"; - webpage = "http://the-lambda-church.github.io/merlin/"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; + name = "merlin-1.6"; src = fetchurl { - url = "https://github.com/the-lambda-church/${pname}/archive/v${version}.tar.gz"; + url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz"; sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy"; }; @@ -19,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "An editor-independant tool to ease the developpement of programs in OCaml"; - homepage = "${webpage}"; + homepage = "http://the-lambda-church.github.io/merlin/"; license = stdenv.lib.licenses.mit; }; }