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

ocamlPackages.yojson: 1.3.3 -> 1.4.0

Browse Source
This commit is contained in:
Vincent Laporte 2017-10-22 06:29:13 +00:00
parent a8da423332
commit d0c513b470
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,26 @@
{ stdenv, fetchzip, ocaml, findlib, cppo, easy-format, biniou }: { stdenv, fetchzip, ocaml, findlib, jbuilder, cppo, easy-format, biniou }:
let let
pname = "yojson"; pname = "yojson";
param = param =
if stdenv.lib.versionAtLeast ocaml.version "4.01" then { if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
version = "1.3.3"; version = "1.4.0";
sha256 = "02l11facbr6bxrxq95vrcp1dxapp02kv7g4gq8rm62pb3dj5c6g7"; sha256 = "0rzn4yihfi0psd2qmgrx5fvwpby87sqx4zws3ijf49f7wbpycccv";
buildInputs = [ jbuilder ];
extra = { inherit (jbuilder) installPhase; };
} else { } else {
version = "1.2.3"; version = "1.2.3";
sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl";
buildInputs = [];
extra = {
createFindlibDestdir = true;
makeFlags = "PREFIX=$(out)";
preBuild = "mkdir $out/bin";
};
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation ({
name = "ocaml${ocaml.version}-${pname}-${param.version}"; name = "ocaml${ocaml.version}-${pname}-${param.version}";
@ -19,18 +29,10 @@ stdenv.mkDerivation {
inherit (param) sha256; inherit (param) sha256;
}; };
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ] ++ param.buildInputs;
propagatedBuildInputs = [ cppo easy-format biniou ]; propagatedBuildInputs = [ cppo easy-format biniou ];
createFindlibDestdir = true;
makeFlags = "PREFIX=$(out)";
preBuild = ''
mkdir $out/bin
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An optimized parsing and printing library for the JSON format"; description = "An optimized parsing and printing library for the JSON format";
homepage = "http://mjambon.com/${pname}.html"; homepage = "http://mjambon.com/${pname}.html";
@ -38,4 +40,4 @@ stdenv.mkDerivation {
maintainers = [ maintainers.vbgl ]; maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
}; };
} } // param.extra)