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
parent fa55a99701 e2db82874c
commit 4e3ee27060
2 changed files with 11 additions and 9 deletions
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";
webpage = "http://mjambon.com/${pname}.html";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "${pname}-${version}";
name = "ocaml-${pname}-${version}";
src = fetchurl {
url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
url = "http://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv";
};
buildInputs = [ ocaml findlib cppo easy-format biniou ];
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ cppo easy-format biniou ];
createFindlibDestdir = true;