Unverified Commit c81792a4 authored by Vincent Laporte's avatar Vincent Laporte
Browse files

ocamlPackages.ounit2: disable for OCaml < 4.08

parent bc9afd16

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/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -19,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;

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ buildDunePackage rec { 
  checkInputs = [

    ounit2

  ];

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

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



  meta = with lib; {

    description = "OCaml API to manipulate real files (POSIX like) and filenames";