cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
ocamlPackages.ptime: fix evaluation
This commit is contained in:
Pol Dellaiera 2023-09-25 08:27:33 +02:00 committed by GitHub
commit 591ae3ccd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/ocaml-modules/junit/default.nix
View file

@ -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";
};

3
pkgs/development/ocaml-modules/ptime/default.nix
View file

@ -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";

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

@ -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 { };