ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #233743 from vbgl/ocaml-cleaning-20230523

Browse Source 
ocamlPackages: small fixes
This commit is contained in:
Weijia Wang 2023-05-24 11:38:41 +03:00 committed by GitHub
commit 703640f648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
View File

@ -16,6 +16,7 @@
, chrome-trace
, dune_3
, csexp
, result
, pp
, cmdliner
, ordering
@ -101,6 +102,7 @@ buildDunePackage rec {
jsonrpc
pp
ppx_yojson_conv_lib
result
uutf
] else [
csexp

1
pkgs/development/ocaml-modules/polynomial/default.nix
View File

@ -9,6 +9,7 @@ buildDunePackage rec {
pname = "polynomial";
version = "0.4.0";
duneVersion = "3";
minimalOCamlVersion = "4.08";
src = fetchFromGitLab {
owner = "nomadic-labs";
repo = "cryptography/ocaml-polynomial";

4
pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin }:
{ lib, fetchurl, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin, result }:
buildDunePackage rec {
pname = "dot-merlin-reader";
@ -12,7 +12,7 @@ buildDunePackage rec {
buildInputs = [ findlib ]
++ (if lib.versionAtLeast version "4.7-414"
then [ merlin-lib ]
else [ yojson csexp ]);
else [ yojson csexp result ]);
meta = with lib; {
description = "Reads config files for merlin";