about summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorJules Aguillon <jules@j3s.fr>2023-07-05 17:45:52 +0200
committerJules Aguillon <jules@j3s.fr>2023-07-05 17:45:52 +0200
commitcc0557bb27dafc2e03dc69001a85a7c62688f9f2 (patch)
tree381e72aa27d0f32ae8fac1cf66decc56182f63f1 /pkgs/development/ocaml-modules
parentfb98ebb9a05fefa25585ef78000b40744e8d4d17 (diff)
downloadnixlib-cc0557bb27dafc2e03dc69001a85a7c62688f9f2.tar
nixlib-cc0557bb27dafc2e03dc69001a85a7c62688f9f2.tar.gz
nixlib-cc0557bb27dafc2e03dc69001a85a7c62688f9f2.tar.bz2
nixlib-cc0557bb27dafc2e03dc69001a85a7c62688f9f2.tar.lz
nixlib-cc0557bb27dafc2e03dc69001a85a7c62688f9f2.tar.xz
nixlib-cc0557bb27dafc2e03dc69001a85a7c62688f9f2.tar.zst
nixlib-cc0557bb27dafc2e03dc69001a85a7c62688f9f2.zip
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.
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r--pkgs/development/ocaml-modules/ocamlformat/generic.nix6
-rw-r--r--pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix4
-rw-r--r--pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix5
3 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix
index 9f9f7cff1301..0e998af86ff7 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix
@@ -1,11 +1,11 @@
-{ 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";
 
diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix
index a95f8d9a410b..cefae4af027c 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix
@@ -1,6 +1,4 @@
-{ 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;
 
diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
index 30a0b01e5af4..275c20dea865 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
@@ -1,6 +1,5 @@
-{ 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;