Commit cc0557bb authored by Jules Aguillon's avatar Jules Aguillon
Browse files

ocamlformat: Don't depend on ocaml-ng 

This made ocamlformat always build with the default version of OCaml
independently from the specified version.

The library was incompatible with the other libraries when using a
version different from the default.
parent fb98ebb9

pkgs/development/ocaml-modules/ocamlformat/generic.nix

+3 −3
Original line number Diff line number Diff line 
{ lib, fetchurl, ocaml-ng, version }:

{ lib, fetchurl, version, astring, base, camlp-streams, cmdliner_1_0

, cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk

, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf }:



# The ocamlformat package have been split into two in version 0.25.1:

# one for the library and one for the executable.

# Both have the same sources and very similar dependencies.



with ocaml-ng.ocamlPackages;



rec {

  tarballName = "ocamlformat-${version}.tbz";

pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix

+1 −3
Original line number Diff line number Diff line 
{ lib, callPackage, ocaml-ng, version ? "0.25.1" }:



with ocaml-ng.ocamlPackages;

{ lib, callPackage, buildDunePackage, menhir, version ? "0.25.1" }:



let inherit (callPackage ./generic.nix { inherit version; }) src library_deps;

pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix

+2 −3
Original line number Diff line number Diff line 
{ lib, callPackage, ocaml-ng, version ? "0.25.1" }:



with ocaml-ng.ocamlPackages;

{ lib, callPackage, buildDunePackage, re, ocamlformat-lib, menhir

, version ? "0.25.1" }:



let inherit (callPackage ./generic.nix { inherit version; }) src library_deps;