From 6e56d357ac75c8fc901ad0270b9b6649059d87de Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 Dec 2025 07:01:15 +0100 Subject: [PATCH 1/2] ocamlPackages.ocaml-syntax-shims: small cleaning --- .../ocaml-syntax-shims/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix index e3539194e111..00dc61f326af 100644 --- a/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix @@ -4,26 +4,22 @@ fetchurl, }: -buildDunePackage rec { - minimumOCamlVersion = "4.02.3"; - +buildDunePackage (finalAttrs: { pname = "ocaml-syntax-shims"; version = "1.0.0"; src = fetchurl { - url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1j7848khli4p7j8i2kmnvhdnhcwhy3zgdpf5ds5ic30ax69y3cl9"; + url = "https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/${finalAttrs.version}/ocaml-syntax-shims-${finalAttrs.version}.tbz"; + hash = "sha256-ibLhk+kKDBaLbsXd9v7wkDNoG9y2ThGRPJdECici6Mg="; }; - useDune2 = true; - doCheck = true; - meta = with lib; { + meta = { homepage = "https://github.com/ocaml-ppx/ocaml-syntax-shims"; description = "Backport new syntax to older OCaml versions"; mainProgram = "ocaml-syntax-shims"; - license = licenses.mit; - maintainers = with maintainers; [ sternenseemann ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) From 54e8de7b2408889df25c2213a956f2d2c01ac718 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 Dec 2025 07:01:20 +0100 Subject: [PATCH 2/2] OCaml documentation: remove reference to useDune2 --- doc/languages-frameworks/ocaml.section.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 55739e652aad..d09e35c3a84b 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -45,10 +45,7 @@ Here is a simple package example. - It also accepts a `duneVersion` parameter (valid values are `"2"`, and `"3"`). The recommended practice is to set it only if you don't want the - default value and/or it depends on something else like package version. You - might see a not-supported argument `useDune2`. The behavior was `useDune2 = - true;` => `duneVersion = "2";` and `useDune2 = false;` => `duneVersion = - "1";`. It was used at the time when dune3 didn't exist. + default value and/or it depends on something else like package version. - It sets the optional `doCheck` attribute such that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is