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

ocamlPackages.ocaml_expat: 0.9.1 -> 1.0.0

This commit is contained in:
Vincent Laporte 2017-11-01 23:32:41 +00:00
parent 78eaae0204
commit ee23541f89
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
3 changed files with 78 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pkgs/development/ocaml-modules/expat/0.9.nix Normal file
View File

@ -0,0 +1,51 @@
{stdenv, fetchurl, ocaml, findlib, ounit, expat}:
let
pname = "ocaml-expat";
testcase = fetchurl {
url = "http://www.w3.org/TR/1998/REC-xml-19980210.xml";
sha256 = "00a3gsfvlkdhmcbziqhvpvy1zmcgbcihfqwcvl6ay03zf7gvw0k1";
};
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "0.9.1";
src = fetchurl {
url = "http://www.xs4all.nl/~mmzeeman/ocaml/${pname}-${version}.tar.gz";
sha256 = "16n2j3y0jc9xgqyshw9plrwqnjiz30vnpbhahmgxlidbycw8rgjz";
};
buildInputs = [ocaml findlib ounit expat];
createFindlibDestdir = true;
patches = [ ./unittest.patch ];
postPatch = ''
substituteInPlace "unittest.ml" \
--replace "/home/maas/xml-samples/REC-xml-19980210.xml.txt" "${testcase}"
substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat.out}/lib" \
--replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \
--replace "gcc" "\$(CC)"
'';
configurePhase = "true"; # Skip configure
buildPhase = ''
make all allopt
'';
doCheck = true;
checkTarget = "testall";
meta = {
homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
description = "An ocaml wrapper for the Expat XML parsing library";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.roconnor ];
};
}

65
pkgs/development/ocaml-modules/expat/default.nix
View File

@ -1,51 +1,32 @@
{stdenv, fetchurl, ocaml, findlib, ounit, expat}:
let
pname = "ocaml-expat";
testcase = fetchurl {
url = "http://www.w3.org/TR/1998/REC-xml-19980210.xml";
sha256 = "00a3gsfvlkdhmcbziqhvpvy1zmcgbcihfqwcvl6ay03zf7gvw0k1";
};
in
{ stdenv, fetchFromGitHub, expat, ocaml, findlib, ounit }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "0.9.1";
name = "ocaml${ocaml.version}-expat-${version}";
version = "1.0.0";
src = fetchurl {
url = "http://www.xs4all.nl/~mmzeeman/ocaml/${pname}-${version}.tar.gz";
sha256 = "16n2j3y0jc9xgqyshw9plrwqnjiz30vnpbhahmgxlidbycw8rgjz";
};
src = fetchFromGitHub {
owner = "whitequark";
repo = "ocaml-expat";
rev = "v${version}";
sha256 = "0rb47v08ra2hhh73p3d8sl4sizqwiwc37gnkl22b23sbwbjrpbz0";
};
buildInputs = [ocaml findlib ounit expat];
prePatch = ''
substituteInPlace Makefile --replace "gcc" "\$(CC)"
'';
createFindlibDestdir = true;
buildInputs = [ ocaml findlib expat ounit ];
patches = [ ./unittest.patch ];
doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06";
checkTarget = "testall";
postPatch = ''
substituteInPlace "unittest.ml" \
--replace "/home/maas/xml-samples/REC-xml-19980210.xml.txt" "${testcase}"
substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat.out}/lib" \
--replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \
--replace "gcc" "\$(CC)"
'';
createFindlibDestdir = true;
configurePhase = "true"; # Skip configure
buildPhase = ''
make all allopt
'';
doCheck = true;
checkTarget = "testall";
meta = {
homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
description = "An ocaml wrapper for the Expat XML parsing library";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.roconnor ];
};
meta = {
description = "OCaml wrapper for the Expat XML parsing library";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}

5
pkgs/top-level/ocaml-packages.nix
View File

@ -407,7 +407,10 @@ let
ocaml_data_notation = callPackage ../development/ocaml-modules/odn { };
ocaml_expat = callPackage ../development/ocaml-modules/expat { };
ocaml_expat =
if lib.versionAtLeast ocaml.version "4.02"
then callPackage ../development/ocaml-modules/expat { }
else callPackage ../development/ocaml-modules/expat/0.9.nix { };
frontc = callPackage ../development/ocaml-modules/frontc { };