From ab365b25b33f675a6e9f99c9f59e9e2a2d10bc06 Mon Sep 17 00:00:00 2001 From: Louis Gesbert Date: Wed, 2 Aug 2023 12:19:38 +0200 Subject: [PATCH] Clerk: replace colordiff with `diff --color` This should be available mostly everywhere now (first appeared in e.g. Ubuntu 18) and avoids the need for an additional run-time dependency. --- build_system/clerk_driver.ml | 2 +- clerk.opam | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build_system/clerk_driver.ml b/build_system/clerk_driver.ml index 90a1432f..f8469d47 100644 --- a/build_system/clerk_driver.ml +++ b/build_system/clerk_driver.ml @@ -338,7 +338,7 @@ let pipe_diff_cmd = Var.tested_file; Lit "/dev/stdin"; ] - else Seq [Lit "| colordiff -u -b"; Var.tested_file; Lit "-"] + else Seq [Lit "| diff -u -b --color"; Var.tested_file; Lit "-"] let inline_test_rule catala_exe catala_opts = let open Nj.Expr in diff --git a/clerk.opam b/clerk.opam index 9114a831..58babf36 100644 --- a/clerk.opam +++ b/clerk.opam @@ -19,6 +19,7 @@ depends: [ "catala" {= version} "ninja_utils" {= version} "odoc" {with-doc} + "conf-diffutils" {cataladevmode} ] build: [ ["dune" "subst"] {dev} @@ -38,8 +39,4 @@ dev-repo: "git+https://github.com/CatalaLang/catala.git" depexts: [ ["ninja-build"] {os-family = "debian"} ["samurai"] {os-distribution = "alpine"} - ["colordiff"] {cataladevmode & - (os-distribution = "alpine" | - os-family = "arch" | - os-family = "debian")} ]