movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-27 03:26:50 +03:00
Code Activity

merlin: update from 2.1 to 2.1.1

Browse source
This commit is contained in:
Vincent Laporte 2015-01-29 07:45:39 +01:00
parent 54c8a82818
commit db75b5d052
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/tools/ocaml/merlin/default.nix
View file

@ -1,15 +1,17 @@
{stdenv, fetchurl, ocaml, findlib, yojson, menhir { stdenv, fetchzip, ocaml, findlib, yojson, menhir
, withEmacsMode ? false, emacs}: , withEmacsMode ? false, emacs }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
let version = "2.1.1"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "merlin-2.1"; name = "merlin-${version}";
src = fetchurl { src = fetchzip {
url = https://github.com/the-lambda-church/merlin/archive/v2.1.tar.gz; url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz";
sha256 = "0rk5ffhr69wbhr50ixgw1vnv0wkhxwh1z3cpbcwkm72cnac74nj6"; sha256 = "1j60jsgls6kkkh2cv4gq36q0mf27nw8pc6k94n0yvjafjmwl3kks";
}; };
buildInputs = [ ocaml findlib yojson menhir ] buildInputs = [ ocaml findlib yojson menhir ]