Unverified Commit f0e4eea0 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #231536 from vbgl/ounit2 

ocamlPackages.ounit2: disable for OCaml < 4.08
parents aa23ec90 c81792a4

pkgs/development/ocaml-modules/cfstream/default.nix

+2 −4
Original line number Diff line number Diff line 
{ lib, buildDunePackage, fetchFromGitHub, m4, camlp-streams, core_kernel, ounit }:

{ lib, buildDunePackage, fetchFromGitHub, ocaml, m4, camlp-streams, core_kernel, ounit }:



buildDunePackage rec {

  pname = "cfstream";

  version = "1.3.2";



  duneVersion = "3";



  minimalOCamlVersion = "4.04.1";



  src = fetchFromGitHub {
@@ -23,7 +21,7 @@ buildDunePackage rec { 
  checkInputs = [ ounit ];

  propagatedBuildInputs = [ camlp-streams core_kernel ];



  doCheck = true;

  doCheck = lib.versionAtLeast ocaml.version "4.08";



  meta = with lib; {

    inherit (src.meta) homepage;

pkgs/development/ocaml-modules/cudf/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec { 
  checkInputs = [

    ounit

  ];

  doCheck = true;

  doCheck = lib.versionAtLeast ocaml.version "4.08";



  preInstall = "mkdir -p $OCAMLFIND_DESTDIR";

  installFlags = [ "BINDIR=$(out)/bin" ];

pkgs/development/ocaml-modules/diet/default.nix

+3 −5
Original line number Diff line number Diff line 
{ lib, buildDunePackage, fetchurl, stdlib-shims, ounit }:

{ lib, buildDunePackage, fetchurl, ocaml, stdlib-shims, ounit }:



buildDunePackage rec {

  pname = "diet";

  version = "0.4";



  useDune2 = true;



  src = fetchurl {

    url =

      "https://github.com/mirage/ocaml-diet/releases/download/v${version}/diet-v${version}.tbz";

    sha256 = "96acac2e4fdedb5f47dd8ad2562e723d85ab59cd1bd85554df21ec907b071741";

  };



  minimumOCamlVersion = "4.03";

  minimalOCamlVersion = "4.03";



  propagatedBuildInputs = [ stdlib-shims ];



  doCheck = true;

  doCheck = lib.versionAtLeast ocaml.version "4.08";

  checkInputs = [ ounit ];



  meta = with lib; {

pkgs/development/ocaml-modules/expat/0.9.nix

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
{stdenv, lib, 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";

  };



  nativeBuildInputs = [ocaml findlib ];

  buildInputs = [ ounit expat];



  strictDeps = true;



  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)"

  '';



  dontConfigure = 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 = lib.licenses.mit;

    maintainers = [ lib.maintainers.roconnor ];

  };

}

pkgs/development/ocaml-modules/expat/default.nix

+6 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }:



lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02")

  "ocaml_expat is not available for OCaml ${ocaml.version}"



stdenv.mkDerivation rec {

  pname = "ocaml${ocaml.version}-expat";

  version = "1.1.0";
@@ -16,12 +19,13 @@ stdenv.mkDerivation rec { 
  '';



  nativeBuildInputs = [ ocaml findlib ];

  buildInputs = [ expat ounit ];

  buildInputs = [ expat ];



  strictDeps = true;



  doCheck = lib.versionOlder ocaml.version "4.06";

  doCheck = lib.versionAtLeast ocaml.version "4.08";

  checkTarget = "testall";

  checkInputs = [ ounit ];



  createFindlibDestdir = true;