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

Merge pull request #3681 from vbgl/merlin-1.7

Browse Source 
Merlin: update to 1.7
This commit is contained in:
Michael Raskin 2014-09-02 02:07:27 +04:00
commit 4e3ee27060
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/ocaml-modules/yojson/default.nix
View File

@ -4,16 +4,18 @@ let
version = "1.1.8"; version = "1.1.8";
webpage = "http://mjambon.com/${pname}.html"; webpage = "http://mjambon.com/${pname}.html";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "${pname}-${version}"; name = "ocaml-${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; url = "http://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv"; sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv";
}; };
buildInputs = [ ocaml findlib cppo easy-format biniou ]; buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ cppo easy-format biniou ];
createFindlibDestdir = true; createFindlibDestdir = true;

10
pkgs/development/tools/ocaml/merlin/default.nix
View File

@ -1,14 +1,14 @@
{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}: {stdenv, fetchurl, ocaml, findlib, yojson, menhir}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "merlin-1.6"; name = "merlin-1.7.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz"; url = https://github.com/the-lambda-church/merlin/archive/v1.7.1.tar.gz;
sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy"; sha256 = "c3b60c7b3fddaa2860e0d8ac0d4fed2ed60e319875734c7ac1a93df524c67aff";
}; };
buildInputs = [ ocaml findlib biniou yojson menhir easy-format ]; buildInputs = [ ocaml findlib yojson menhir ];
prefixKey = "--prefix "; prefixKey = "--prefix ";