From 6ca6253a9cae7e30d524834d61b6c93dcc208f94 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Sat, 22 Jun 2024 08:25:38 +0100 Subject: [PATCH] Update conf-git for Cygwin Native Windows opam already ensures that Git for Windows is installed, so the depext here is for os = "cygwin" only; on native Windows, git has already been made a required tool for opam. --- packages/conf-git/conf-git.1.0/opam | 4 ++++ packages/conf-git/conf-git.1.1/opam | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/packages/conf-git/conf-git.1.0/opam b/packages/conf-git/conf-git.1.0/opam index ea83b502f97..f20d0bc3171 100644 --- a/packages/conf-git/conf-git.1.0/opam +++ b/packages/conf-git/conf-git.1.0/opam @@ -17,6 +17,10 @@ depexts: [ ["git"] {os-distribution = "arch"} ["git"] {os = "macos" & os-distribution = "homebrew"} ["system:git"] {os = "win32" & os-distribution = "cygwinports"} + # This is intentionally os = "cygwin" and *not* os-distribution = "cygwin" + # For native Windows, opam 2.2 recommends Git for Windows, so for native + # Windows there's no need for depext support. + ["git"] {os = "cygwin"} ] synopsis: "Virtual package relying on git" description: diff --git a/packages/conf-git/conf-git.1.1/opam b/packages/conf-git/conf-git.1.1/opam index 99ef4159d20..e5839e1e30d 100644 --- a/packages/conf-git/conf-git.1.1/opam +++ b/packages/conf-git/conf-git.1.1/opam @@ -16,6 +16,10 @@ depexts: [ ["git"] {os-family = "arch"} ["git"] {os-family = "alpine"} ["system:git"] {os = "win32" & os-distribution = "cygwinports"} + # This is intentionally os = "cygwin" and *not* os-distribution = "cygwin" + # For native Windows, opam 2.2 recommends Git for Windows, so for native + # Windows there's no need for depext support. + ["git"] {os = "cygwin"} ["git"] {os = "freebsd"} ] synopsis: "Virtual package relying on git"