Skip to content

Commit 38560a0

Browse files
authored
ocamlPackages: exit useDune2 (#468024)
2 parents d38ebcc + 54e8de7 commit 38560a0

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

doc/languages-frameworks/ocaml.section.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@ Here is a simple package example.
4545

4646
- It also accepts a `duneVersion` parameter (valid values are `"2"`, and
4747
`"3"`). The recommended practice is to set it only if you don't want the
48-
default value and/or it depends on something else like package version. You
49-
might see a not-supported argument `useDune2`. The behavior was `useDune2 =
50-
true;` => `duneVersion = "2";` and `useDune2 = false;` => `duneVersion =
51-
"1";`. It was used at the time when dune3 didn't exist.
48+
default value and/or it depends on something else like package version.
5249

5350
- It sets the optional `doCheck` attribute such that tests will be run with
5451
`dune runtest -p angstrom` after the build (`dune build -p angstrom`) is

pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,22 @@
44
fetchurl,
55
}:
66

7-
buildDunePackage rec {
8-
minimumOCamlVersion = "4.02.3";
9-
7+
buildDunePackage (finalAttrs: {
108
pname = "ocaml-syntax-shims";
119
version = "1.0.0";
1210

1311
src = fetchurl {
14-
url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz";
15-
sha256 = "1j7848khli4p7j8i2kmnvhdnhcwhy3zgdpf5ds5ic30ax69y3cl9";
12+
url = "https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/${finalAttrs.version}/ocaml-syntax-shims-${finalAttrs.version}.tbz";
13+
hash = "sha256-ibLhk+kKDBaLbsXd9v7wkDNoG9y2ThGRPJdECici6Mg=";
1614
};
1715

18-
useDune2 = true;
19-
2016
doCheck = true;
2117

22-
meta = with lib; {
18+
meta = {
2319
homepage = "https://github.com/ocaml-ppx/ocaml-syntax-shims";
2420
description = "Backport new syntax to older OCaml versions";
2521
mainProgram = "ocaml-syntax-shims";
26-
license = licenses.mit;
27-
maintainers = with maintainers; [ sternenseemann ];
22+
license = lib.licenses.mit;
23+
maintainers = with lib.maintainers; [ sternenseemann ];
2824
};
29-
}
25+
})

0 commit comments

Comments
 (0)