talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ocamlformat: Don't depend on ocaml-ng

Browse Source 
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.
This commit is contained in:
Jules Aguillon
2023-07-05 17:45:52 +02:00
parent fb98ebb9a0
commit cc0557bb27
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/ocaml-modules/ocamlformat/generic.nix
View File

@@ -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: # The ocamlformat package have been split into two in version 0.25.1:
# one for the library and one for the executable. # one for the library and one for the executable.
# Both have the same sources and very similar dependencies. # Both have the same sources and very similar dependencies.
with ocaml-ng.ocamlPackages;
rec { rec {
tarballName = "ocamlformat-${version}.tbz"; tarballName = "ocamlformat-${version}.tbz";

4
pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix
View File

@@ -1,6 +1,4 @@
{ lib, callPackage, ocaml-ng, version ? "0.25.1" }: { lib, callPackage, buildDunePackage, menhir, version ? "0.25.1" }:
with ocaml-ng.ocamlPackages;
let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; let inherit (callPackage ./generic.nix { inherit version; }) src library_deps;

5
pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
View File

@@ -1,6 +1,5 @@
{ lib, callPackage, ocaml-ng, version ? "0.25.1" }: { lib, callPackage, buildDunePackage, re, ocamlformat-lib, menhir
, version ? "0.25.1" }:
with ocaml-ng.ocamlPackages;
let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; let inherit (callPackage ./generic.nix { inherit version; }) src library_deps;