Unverified Commit 683d4c3b authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

ocamlPackages: fix eval and let ci check that it still evals (#406555)

parents 9233a4e9 b32b1dc1

pkgs/build-support/ocaml/oasis.nix

+37 −38
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ 
  ...

}@args:



if args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion then

  throw "${pname}-${version} is not available for OCaml ${ocaml.version}"

else



stdenv.mkDerivation (

  args

  // {
@@ -63,5 +59,8 @@ else 
      runHook postInstall

    '';



    meta = args.meta // {

      broken = args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion;

    };

  }

)

pkgs/by-name/li/libnbd/package.nix

+64 −67
Original line number Diff line number Diff line
@@ -16,11 +16,7 @@ 
  autoreconfHook,

}:



lib.throwIf (buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.version "4.05")

  "OCaml binding are not available for OCaml < 4.05"



  stdenv.mkDerivation

  rec {

stdenv.mkDerivation rec {

  pname = "libnbd";

  version = "1.22.1";
@@ -91,6 +87,7 @@ lib.throwIf (buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.versi 
      humancalico

    ];

    platforms = with platforms; linux;

    broken = buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.version "4.05";

  };

}

# TODO: package the 1.6-stable version too

pkgs/development/compilers/mezzo/default.nix

+53 −56
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ 
  functory,

}:



if lib.versionAtLeast ocaml.version "4.06" then

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

else



let

  check-ocaml-version = lib.versionAtLeast (lib.getVersion ocaml);

in
@@ -78,6 +74,7 @@ else 
    homepage = "http://protz.github.io/mezzo/";

    description = "Programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory";

    license = licenses.gpl2;

    broken = lib.versionAtLeast ocaml.version "4.06";

    platforms = ocaml.meta.platforms or [ ];

  };

}

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

+48 −54
Original line number Diff line number Diff line
@@ -9,14 +9,7 @@ 
  cmdliner,

}:



let



in

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

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



  stdenv.mkDerivation

  rec {

stdenv.mkDerivation rec {



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

  version = "0.0.5";
@@ -61,5 +54,6 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") 
    inherit (ocaml.meta) platforms;

    license = licenses.isc;

    maintainers = [ maintainers.Julow ];

    broken = !(lib.versionAtLeast ocaml.version "4.08");

  };

}

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

+93 −96
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ 
  z3,

}:



if lib.versionOlder ocaml.version "4.08" then

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

else



stdenv.mkDerivation rec {

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

  version = "2.5.0+pr1621";
@@ -148,5 +144,6 @@ else 
    license = licenses.mit;

    maintainers = [ maintainers.maurer ];

    mainProgram = "bap";

    broken = lib.versionOlder ocaml.version "4.08";

  };

}