ocamlPackages.piqi: 0.6.14 → 0.6.15
This commit is contained in:
parent
e3bacebbd0
commit
a1b8192dbf
|
@ -1,16 +1,19 @@
|
||||||
{ stdenv, fetchurl, ocaml, findlib, which, ulex, easy-format, ocaml_optcomp, xmlm, base64 }:
|
{ stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex_2, easy-format, xmlm, base64 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.6.14";
|
version = "0.6.15";
|
||||||
pname = "piqi";
|
pname = "piqi";
|
||||||
|
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz";
|
owner = "alavrik";
|
||||||
sha256 = "1ssccnwqzfyf7syfq2fv4zyhwayxwd75rhq9y28mvq1w6qbww4l7";
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0v04hs85xv6d4ysqxyv1dik34dx49yab9shpi4x7iv19qlzl7csb";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ ocaml findlib which ocaml_optcomp ];
|
buildInputs = [ ocaml findlib which ];
|
||||||
propagatedBuildInputs = [ulex xmlm easy-format base64];
|
propagatedBuildInputs = [ sedlex_2 xmlm easy-format base64 ];
|
||||||
|
|
||||||
patches = [ ./no-ocamlpath-override.patch ];
|
patches = [ ./no-ocamlpath-override.patch ];
|
||||||
|
|
||||||
|
|
|
@ -712,9 +712,7 @@ let
|
||||||
|
|
||||||
phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { };
|
phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { };
|
||||||
|
|
||||||
piqi = callPackage ../development/ocaml-modules/piqi {
|
piqi = callPackage ../development/ocaml-modules/piqi { };
|
||||||
base64 = base64_2;
|
|
||||||
};
|
|
||||||
|
|
||||||
piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
|
piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue