Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opam: add 'support' for wolfi #14747

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion opam.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: opam
version: 2.1.5
epoch: 0
epoch: 1
description: "opam is a source-based package manager. It supports multiple simultaneous compiler installations, flexible package constraints, and a Git-friendly development workflow."
copyright:
- license: LGPL-2.1-or-later-WITH-linking-exception
Expand All @@ -27,6 +27,10 @@ pipeline:
tag: ${{package.version}}
expected-commit: 93f47ec3140f6299182254fbe7eeae68f9ca7abd

- uses: patch
with:
patches: 0001-opam-Let-wolfi-be-treated-like-alpine.patch

- runs: |
./configure \
--build=$CBUILD \
Expand Down
29 changes: 29 additions & 0 deletions opam/0001-opam-Let-wolfi-be-treated-like-alpine.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 5fd51f6e361fd03b06e2e5dca8bb0a18c5495d92 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <[email protected]>
Date: Mon, 11 Mar 2024 23:54:58 +0000
Subject: [PATCH] opam: Let wolfi be treated like alpine

Signed-off-by: Dimitri John Ledkov <[email protected]>
---

Backport from https://github.com/ocaml/opam/pull/5878/files

src/state/opamSysInteract.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/state/opamSysInteract.ml b/src/state/opamSysInteract.ml
index 7b6374c71..1110cb9ff 100644
--- a/src/state/opamSysInteract.ml
+++ b/src/state/opamSysInteract.ml
@@ -105,7 +105,7 @@ let family =
"External dependency unusable, OS family not detected."
| Some family ->
match family with
- | "alpine" -> Alpine
+ | "alpine" | "wolfi" -> Alpine
| "amzn" | "centos" | "fedora" | "mageia" | "oraclelinux" | "ol"
| "rhel" -> Centos
| "archlinux" | "arch" -> Arch
--
2.43.0

Loading