From cb1f53fe2c8f257d801367c3acb38d891dcd98c9 Mon Sep 17 00:00:00 2001 From: Emma Jin Date: Wed, 13 Nov 2024 16:25:38 -0800 Subject: [PATCH 1/2] Homebrew has deprecated pkg-config. `brew install pkg-config` now installs pkgconf. Accordingly, this PR adjusts the expectations of `conf-pkg-config` to depend on `pkgconf`. --- packages/conf-pkg-config/conf-pkg-config.1.0/opam | 2 +- packages/conf-pkg-config/conf-pkg-config.1.1/opam | 2 +- packages/conf-pkg-config/conf-pkg-config.1.2/opam | 2 +- packages/conf-pkg-config/conf-pkg-config.1.3/opam | 2 +- packages/conf-pkg-config/conf-pkg-config.2/opam | 2 +- packages/conf-pkg-config/conf-pkg-config.3/opam | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/conf-pkg-config/conf-pkg-config.1.0/opam b/packages/conf-pkg-config/conf-pkg-config.1.0/opam index 5080cda0b5e..0b4583aaaad 100644 --- a/packages/conf-pkg-config/conf-pkg-config.1.0/opam +++ b/packages/conf-pkg-config/conf-pkg-config.1.0/opam @@ -18,7 +18,7 @@ depexts: [ ["pkgconf"] {os-distribution = "alpine"} ["pkg-config"] {os-distribution = "nixos"} ["devel/pkgconf"] {os = "openbsd"} - ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} + ["pkgconf"] {os = "macos" & os-distribution = "homebrew"} ["pkgconf"] {os = "freebsd"} ["system:pkgconf"] {os = "win32" & os-distribution = "cygwinports"} ["pkgconf"] {os = "cygwin"} diff --git a/packages/conf-pkg-config/conf-pkg-config.1.1/opam b/packages/conf-pkg-config/conf-pkg-config.1.1/opam index a3115282c99..681e4f0763f 100644 --- a/packages/conf-pkg-config/conf-pkg-config.1.1/opam +++ b/packages/conf-pkg-config/conf-pkg-config.1.1/opam @@ -28,7 +28,7 @@ depexts: [ ["pkgconf"] {os-distribution = "alpine"} ["pkg-config"] {os-distribution = "nixos"} ["devel/pkgconf"] {os = "openbsd"} - ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} + ["pkgconf"] {os = "macos" & os-distribution = "homebrew"} ["pkgconf"] {os = "freebsd"} ["system:pkgconf"] {os = "win32" & os-distribution = "cygwinports"} ["pkgconf"] {os = "cygwin"} diff --git a/packages/conf-pkg-config/conf-pkg-config.1.2/opam b/packages/conf-pkg-config/conf-pkg-config.1.2/opam index d0cf9626ef5..cc8b43ba02b 100644 --- a/packages/conf-pkg-config/conf-pkg-config.1.2/opam +++ b/packages/conf-pkg-config/conf-pkg-config.1.2/opam @@ -28,7 +28,7 @@ depexts: [ ["pkgconf"] {os-distribution = "alpine"} ["pkg-config"] {os-distribution = "nixos"} ["devel/pkgconf"] {os = "openbsd"} - ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} + ["pkgconf"] {os = "macos" & os-distribution = "homebrew"} ["pkgconf"] {os = "freebsd"} ["pkgconf-pkg-config"] {os-distribution = "rhel" & os-version >= "8"} ["pkgconf-pkg-config"] {os-distribution = "centos" & os-version >= "8"} diff --git a/packages/conf-pkg-config/conf-pkg-config.1.3/opam b/packages/conf-pkg-config/conf-pkg-config.1.3/opam index 380569339ac..a6a55d9bbb9 100644 --- a/packages/conf-pkg-config/conf-pkg-config.1.3/opam +++ b/packages/conf-pkg-config/conf-pkg-config.1.3/opam @@ -28,7 +28,7 @@ depexts: [ ["pkgconf"] {os-distribution = "alpine"} ["pkg-config"] {os-distribution = "nixos"} ["devel/pkgconf"] {os = "openbsd"} - ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} + ["pkgconf"] {os = "macos" & os-distribution = "homebrew"} ["pkgconfig"] {os = "macos" & os-distribution = "macports"} ["pkgconf"] {os = "freebsd"} ["pkgconf-pkg-config"] {os-distribution = "rhel" & os-version >= "8"} diff --git a/packages/conf-pkg-config/conf-pkg-config.2/opam b/packages/conf-pkg-config/conf-pkg-config.2/opam index eb440ed2d3c..99be5406b12 100644 --- a/packages/conf-pkg-config/conf-pkg-config.2/opam +++ b/packages/conf-pkg-config/conf-pkg-config.2/opam @@ -28,7 +28,7 @@ depexts: [ ["pkgconf"] {os-distribution = "alpine"} ["pkg-config"] {os-distribution = "nixos"} ["devel/pkgconf"] {os = "openbsd"} - ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} + ["pkgconf"] {os = "macos" & os-distribution = "homebrew"} ["pkgconfig"] {os = "macos" & os-distribution = "macports"} ["pkgconf"] {os = "freebsd"} ["pkgconf-pkg-config"] {os-distribution = "rhel" & os-version >= "8"} diff --git a/packages/conf-pkg-config/conf-pkg-config.3/opam b/packages/conf-pkg-config/conf-pkg-config.3/opam index c7cae5d07cd..86f38cb0fcf 100644 --- a/packages/conf-pkg-config/conf-pkg-config.3/opam +++ b/packages/conf-pkg-config/conf-pkg-config.3/opam @@ -22,7 +22,7 @@ depexts: [ ["pkgconfig"] {os-distribution = "ol" & os-version <= "7"} ["pkgconf"] {os-distribution = "alpine"} ["pkg-config"] {os-distribution = "nixos"} - ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} + ["pkgconf"] {os = "macos" & os-distribution = "homebrew"} ["pkgconfig"] {os = "macos" & os-distribution = "macports"} ["pkgconf"] {os = "freebsd"} ["pkgconf-pkg-config"] {os-distribution = "rhel" & os-version >= "8"} From 6b743f648d40f7ea46c7932a5a95642f0be0f686 Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Thu, 14 Nov 2024 17:32:32 +0100 Subject: [PATCH 2/2] conf-pkg-config: let's leave the old ones untouched Signed-off-by: Marcello Seri --- packages/conf-pkg-config/conf-pkg-config.1.0/opam | 2 +- packages/conf-pkg-config/conf-pkg-config.1.1/opam | 2 +- packages/conf-pkg-config/conf-pkg-config.1.2/opam | 2 +- packages/conf-pkg-config/conf-pkg-config.1.3/opam | 2 +- packages/conf-pkg-config/conf-pkg-config.2/opam | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/conf-pkg-config/conf-pkg-config.1.0/opam b/packages/conf-pkg-config/conf-pkg-config.1.0/opam index 0b4583aaaad..5080cda0b5e 100644 --- a/packages/conf-pkg-config/conf-pkg-config.1.0/opam +++ b/packages/conf-pkg-config/conf-pkg-config.1.0/opam @@ -18,7 +18,7 @@ depexts: [ ["pkgconf"] {os-distribution = "alpine"} ["pkg-config"] {os-distribution = "nixos"} ["devel/pkgconf"] {os = "openbsd"} - ["pkgconf"] {os = "macos" & os-distribution = "homebrew"} + ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} ["pkgconf"] {os = "freebsd"} ["system:pkgconf"] {os = "win32" & os-distribution = "cygwinports"} ["pkgconf"] {os = "cygwin"} diff --git a/packages/conf-pkg-config/conf-pkg-config.1.1/opam b/packages/conf-pkg-config/conf-pkg-config.1.1/opam index 681e4f0763f..a3115282c99 100644 --- a/packages/conf-pkg-config/conf-pkg-config.1.1/opam +++ b/packages/conf-pkg-config/conf-pkg-config.1.1/opam @@ -28,7 +28,7 @@ depexts: [ ["pkgconf"] {os-distribution = "alpine"} ["pkg-config"] {os-distribution = "nixos"} ["devel/pkgconf"] {os = "openbsd"} - ["pkgconf"] {os = "macos" & os-distribution = "homebrew"} + ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} ["pkgconf"] {os = "freebsd"} ["system:pkgconf"] {os = "win32" & os-distribution = "cygwinports"} ["pkgconf"] {os = "cygwin"} diff --git a/packages/conf-pkg-config/conf-pkg-config.1.2/opam b/packages/conf-pkg-config/conf-pkg-config.1.2/opam index cc8b43ba02b..d0cf9626ef5 100644 --- a/packages/conf-pkg-config/conf-pkg-config.1.2/opam +++ b/packages/conf-pkg-config/conf-pkg-config.1.2/opam @@ -28,7 +28,7 @@ depexts: [ ["pkgconf"] {os-distribution = "alpine"} ["pkg-config"] {os-distribution = "nixos"} ["devel/pkgconf"] {os = "openbsd"} - ["pkgconf"] {os = "macos" & os-distribution = "homebrew"} + ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} ["pkgconf"] {os = "freebsd"} ["pkgconf-pkg-config"] {os-distribution = "rhel" & os-version >= "8"} ["pkgconf-pkg-config"] {os-distribution = "centos" & os-version >= "8"} diff --git a/packages/conf-pkg-config/conf-pkg-config.1.3/opam b/packages/conf-pkg-config/conf-pkg-config.1.3/opam index a6a55d9bbb9..380569339ac 100644 --- a/packages/conf-pkg-config/conf-pkg-config.1.3/opam +++ b/packages/conf-pkg-config/conf-pkg-config.1.3/opam @@ -28,7 +28,7 @@ depexts: [ ["pkgconf"] {os-distribution = "alpine"} ["pkg-config"] {os-distribution = "nixos"} ["devel/pkgconf"] {os = "openbsd"} - ["pkgconf"] {os = "macos" & os-distribution = "homebrew"} + ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} ["pkgconfig"] {os = "macos" & os-distribution = "macports"} ["pkgconf"] {os = "freebsd"} ["pkgconf-pkg-config"] {os-distribution = "rhel" & os-version >= "8"} diff --git a/packages/conf-pkg-config/conf-pkg-config.2/opam b/packages/conf-pkg-config/conf-pkg-config.2/opam index 99be5406b12..eb440ed2d3c 100644 --- a/packages/conf-pkg-config/conf-pkg-config.2/opam +++ b/packages/conf-pkg-config/conf-pkg-config.2/opam @@ -28,7 +28,7 @@ depexts: [ ["pkgconf"] {os-distribution = "alpine"} ["pkg-config"] {os-distribution = "nixos"} ["devel/pkgconf"] {os = "openbsd"} - ["pkgconf"] {os = "macos" & os-distribution = "homebrew"} + ["pkg-config"] {os = "macos" & os-distribution = "homebrew"} ["pkgconfig"] {os = "macos" & os-distribution = "macports"} ["pkgconf"] {os = "freebsd"} ["pkgconf-pkg-config"] {os-distribution = "rhel" & os-version >= "8"}