MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ocamlPackages.piqi: 0.6.14 → 0.6.15

Browse source
This commit is contained in:
Vincent Laporte 2020-06-12 09:45:22 +02:00 committed by Vincent Laporte
parent e3bacebbd0
commit a1b8192dbf
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/ocaml-modules/piqi/default.nix
View file

@ -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 {
version = "0.6.14";
version = "0.6.15";
pname = "piqi";
name = "ocaml${ocaml.version}-${pname}-${version}";
src = fetchurl {
url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz";
sha256 = "1ssccnwqzfyf7syfq2fv4zyhwayxwd75rhq9y28mvq1w6qbww4l7";
src = fetchFromGitHub {
owner = "alavrik";
repo = pname;
rev = "v${version}";
sha256 = "0v04hs85xv6d4ysqxyv1dik34dx49yab9shpi4x7iv19qlzl7csb";
};
buildInputs = [ ocaml findlib which ocaml_optcomp ];
propagatedBuildInputs = [ulex xmlm easy-format base64];
buildInputs = [ ocaml findlib which ];
propagatedBuildInputs = [ sedlex_2 xmlm easy-format base64 ];
patches = [ ./no-ocamlpath-override.patch ];

4
pkgs/top-level/ocaml-packages.nix
View file

@ -712,9 +712,7 @@ let
phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { };
piqi = callPackage ../development/ocaml-modules/piqi {
base64 = base64_2;
};
piqi = callPackage ../development/ocaml-modules/piqi { };
piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };