From 15e033980089b4b873f3acf539e8fb1c7d6b3006 Mon Sep 17 00:00:00 2001 From: Louis Gesbert Date: Fri, 1 Sep 2023 14:55:49 +0200 Subject: [PATCH] Update ocamlformat Apparently this time it has no incidence on our code. --- .ocamlformat | 2 +- catala.opam | 2 +- doc/catala-dev-dependencies.opam | 20 -------------------- flake.nix | 2 +- 4 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 doc/catala-dev-dependencies.opam diff --git a/.ocamlformat b/.ocamlformat index f538edb1..7f58a2a5 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -4,7 +4,7 @@ exp-grouping = preserve break-fun-decl = fit-or-vertical wrap-comments parse-docstrings -version=0.21.0 +version=0.26.0 cases-exp-indent=2 indicate-multiline-delimiters=no parens-tuple=multi-line-only diff --git a/catala.opam b/catala.opam index 188e1047..0ff764f1 100644 --- a/catala.opam +++ b/catala.opam @@ -43,7 +43,7 @@ depends: [ "crunch" {>= "3.0.0"} "alcotest" {>= "1.5.0"} "odoc" {with-doc} - "ocamlformat" {cataladevmode & = "0.21.0"} + "ocamlformat" {cataladevmode & = "0.26.0"} "obelisk" {cataladevmode} "conf-npm" {cataladevmode} "conf-python-3-dev" {cataladevmode} diff --git a/doc/catala-dev-dependencies.opam b/doc/catala-dev-dependencies.opam deleted file mode 100644 index 70799447..00000000 --- a/doc/catala-dev-dependencies.opam +++ /dev/null @@ -1,20 +0,0 @@ -opam-version: "2.0" -version: "0.8.0" -synopsis: "Virtual package listing the requirements for a complete Catala dev environment" -maintainer: ["contact@catala-lang.org"] -authors: [ - "Denis Merigoux" - "Nicolas Chataing" - "Emile Rolley" - "Louis Gesbert" - "Aymeric Fromherz" - "Alain Delaƫt-Tixeuil" -] -license: "Apache-2.0" -homepage: "https://github.com/CatalaLang/catala" -bug-reports: "https://github.com/CatalaLang/catala/issues" -depends: [ - "ocamlformat" {= "0.21.0"} - "obelisk" - "conf-npm" -] diff --git a/flake.nix b/flake.nix index 4ad97602..d351d94f 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ buildInputs = [ pkgs.inotify-tools ocamlPackages.merlin - pkgs.ocamlformat_0_21_0 + pkgs.ocamlformat_0_26_0 ocamlPackages.ocp-indent ocamlPackages.utop ocamlPackages.odoc