Unverified Commit 591ae3cc authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #257192 from vbgl/ocaml-ptime-fix 

ocamlPackages.ptime: fix evaluation
parents 32617aec 48e2e83d

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

+1 −2
Original line number Diff line number Diff line
@@ -14,12 +14,11 @@ buildDunePackage (rec { 
    tyxml

  ];



  duneVersion = "3";

  doCheck = true;



  meta = with lib; {

    description = "ocaml-junit is an OCaml package for the creation of JUnit XML reports, proving a typed API to produce valid reports acceptable to Jenkins, comes with packages supporting OUnit and Alcotest.";

    license = licenses.gpl3;

    license = licenses.lgpl3Plus;

    maintainers = with maintainers; [ ];

    homepage = "https://github.com/Khady/ocaml-junit";

  };

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

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ 
, topkg

}:



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

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



stdenv.mkDerivation (finalAttrs: {

  version = "1.1.0";

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

pkgs/top-level/ocaml-packages.nix

+1 −4
Original line number Diff line number Diff line
@@ -1519,10 +1519,7 @@ let 


    psq = callPackage ../development/ocaml-modules/psq { };



    ptime =

      if lib.versionAtLeast ocaml.version "4.08"

      then callPackage ../development/ocaml-modules/ptime { }

      else null;

    ptime = callPackage ../development/ocaml-modules/ptime { };



    ptmap = callPackage ../development/ocaml-modules/ptmap { };