Commit 543ced16 authored by toastal's avatar toastal Committed by Vincent Laporte
Browse files

ocamlPackages.logs: ocamlPackages.logs: refactor to use buildTopkg

parent 7e628eba

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

+26 −37
Original line number Diff line number Diff line
@@ -3,18 +3,17 @@ 
  stdenv,

  fetchurl,

  ocaml,

  findlib,

  ocamlbuild,

  topkg,

  result,

  lwt,

  buildTopkgPackage,

  cmdlinerSupport ? true,

  cmdliner,

  fmt,

  fmtSupport ? lib.versionAtLeast ocaml.version "4.08",

  js_of_ocaml-compiler,

  fmt,

  jsooSupport ? true,

  js_of_ocaml-compiler,

  lwtSupport ? true,

  cmdlinerSupport ? true,

  lwt,

  result,

}:

let

  pname = "logs";
@@ -49,25 +48,17 @@ let 
  optional_buildInputs = map (d: d.pkg) (lib.filter (d: d.enabled) optional_deps);

in



if lib.versionOlder ocaml.version "4.03" then

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

else



  stdenv.mkDerivation rec {

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

buildTopkgPackage rec {

  inherit pname;

  version = "0.8.0";



  minimalOCamlVersion = "4.03";



  src = fetchurl {

    url = "${webpage}/releases/${pname}-${version}.tbz";

    hash = "sha256-mmFRQJX6QvMBIzJiO2yNYF1Ce+qQS2oNF3+OwziCNtg=";

  };



    nativeBuildInputs = [

      ocaml

      findlib

      ocamlbuild

      topkg

    ];

  buildInputs = [ topkg ] ++ optional_buildInputs;

  propagatedBuildInputs = [ result ];
@@ -75,8 +66,6 @@ else 


  buildPhase = "${topkg.run} build ${lib.escapeShellArgs enable_flags}";



    inherit (topkg) installPhase;



  meta = with lib; {

    description = "Logging infrastructure for OCaml";

    homepage = webpage;