b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #230809 from vbgl/ocaml-ocp-indent-dune3

Browse source 
ocamlPackages.ocp-indent: fix for Dune 3
This commit is contained in:
Weijia Wang 2023-05-09 13:09:20 +03:00 committed by GitHub
parent cb48c35858 757ec67f02
commit 90ce902383
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/tools/ocaml/ocaml-top/default.nix
View file

@ -4,6 +4,8 @@ with ocamlPackages; buildDunePackage rec {
pname = "ocaml-top";
version = "1.2.0";
duneVersion = "3";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocaml-top";

7
pkgs/development/tools/ocaml/ocp-indent/default.nix
View file

@ -1,10 +1,10 @@
{ lib, fetchFromGitHub, buildDunePackage, cmdliner }:
{ lib, fetchFromGitHub, buildDunePackage, cmdliner, findlib }:
buildDunePackage rec {
version = "1.8.2";
pname = "ocp-indent";
useDune2 = true;
duneVersion = "3";
src = fetchFromGitHub {
owner = "OCamlPro";
@ -13,9 +13,10 @@ buildDunePackage rec {
sha256 = "sha256-IyvURw/6R0eKrnahV1fqLV0iIeypykrmxDbliECgbLc=";
};
minimumOCamlVersion = "4.02";
minimalOCamlVersion = "4.03";
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ findlib ];
meta = with lib; {
homepage = "https://www.typerex.org/ocp-indent.html";

2
pkgs/development/tools/ocaml/ocp-index/default.nix
View file

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "ocp-index";
version = "1.3.4";
duneVersion = "3";
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {