A haikuports recipe for oxy, and the script that writes it for each release (closes #156) a42f9fb47e37

Author: Andy McCall @andymccall <[email protected]>
via: agent agent:claude@andymccall <[email protected]> · keyless, under your grant for changes,refs,seal · key ceacfec1a4c9
When: 7 days ago · 2026-10-28 23:24 UTC
Signature: ◈ sealed by agent:claude@andymccall
Hash: a42f9fb47e372ab21e8cd0ae30848c76d031e43dca3c50d276f33b5ada337605
Depends on: 0588de69a84d 1931724b1d6b 8fd78eb52ad2 e4595038502a
Depended on by: 1db74949c876 34c777f8893a cea2e2f860c5 16aa9e03d85b dab94366a4f0 045340293dc7
In bookmarks: main
In tags: v0.10.0 v0.11.0 v0.9.0
Edits: 4 atoms, 6 tree operations, 4 files

Browse the tree at this change

show whitespace changes

added packaging/haikuports/README.md +25 −0

added packaging/haikuports/dev-vcs/oxy/oxy-0.8.0.recipe +992 −0

added packaging/haikuports/make-recipe.py +101 −0

modified CHANGELOG.md +1 −0

1	+	# oxy on HaikuDepot
2	+
3	+	`dev-vcs/oxy/oxy-VERSION.recipe` is a [haikuports](https://github.com/haikuports/haikuports)
4	+	recipe for oxy (oxygen#156). It builds the release's source archive from
5	+	OxygenHub offline, with every crates.io crate from `Cargo.lock` as a source of
6	+	its own, as haikuports' other Rust recipes (ripgrep) do.
7	+
8	+	For a new release:
9	+
10	+	```sh
11	+	curl -o oxygen-vX.Y.Z.tar.zst 'https://oxygenhub.io/andymccall/oxygen/archive?ref=vX.Y.Z&format=tar.zst'
12	+	tar --zstd -xf oxygen-vX.Y.Z.tar.zst
13	+	python3 packaging/haikuports/make-recipe.py oxygen-vX.Y.Z/Cargo.lock X.Y.Z oxygen-vX.Y.Z.tar.zst \
14	+	> packaging/haikuports/dev-vcs/oxy/oxy-X.Y.Z.recipe
15	+	```
16	+
17	+	Test it in a Haiku R1/beta6 machine with haikuports checked out and
18	+	`haikuporter` installed: copy the recipe to `haikuports/dev-vcs/oxy/` and run
19	+	`haikuporter --no-source-packages -j1 -y oxy`. The 0.8.0 recipe built
20	+	`oxy-0.8.0-1-x86_64.hpkg` that way (2026-10-28), whose `oxy --version` says
21	+	`oxy 0.8.0 (v0.8.0)`.
22	+
23	+	Haiku needs the system's zstd (`ZSTD_SYS_USE_PKG_CONFIG=1`: the bundled
24	+	zstd's hidden symbols break the link), which the recipe sets. Submitting the
25	+	recipe to haikuports is a pull request there.

1	+	#!/usr/bin/env python3
2	+	"""Write a haikuports recipe for oxy from a release's Cargo.lock: the source
3	+	archive from OxygenHub, and every crates.io crate as its own source with its
4	+	checksum, vendored offline in BUILD() as haikuports' Rust recipes do."""
5	+	import hashlib, sys, tomllib
6	+
7	+	lock_path, version, archive = sys.argv[1], sys.argv[2], sys.argv[3]
8	+	lock = tomllib.load(open(lock_path, "rb"))
9	+	crates = sorted((p["name"], p["version"], p["checksum"]) for p in lock["package"] if p.get("source", "").startswith("registry+"))
10	+	sha = hashlib.sha256(open(archive, "rb").read()).hexdigest()
11	+
12	+	out = []
13	+	w = out.append
14	+	w('SUMMARY="A version control system of signed, commuting changes, with Git interop"')
15	+	w('DESCRIPTION="oxy is the command line of Oxygen, a version control system built on \\')
16	+	w('patch theory: changes commute, conflicts are recorded rather than blocking, \\')
17	+	w('every change can be signed, and a trust policy says who may move what. It \\')
18	+	w('imports and exports Git history, clones from OxygenHub and other Oxygen \\')
19	+	w('hosts, and keeps repositories on disk or in S3, GCS or Azure buckets."')
20	+	w('HOMEPAGE="https://oxygenhub.io/andymccall/oxygen"')
21	+	w('COPYRIGHT="2025-2026 Andy McCall"')
22	+	w('LICENSE="MIT\n\tApache v2"')
23	+	w('REVISION="1"')
24	+	w(f'SOURCE_URI="$HOMEPAGE/archive?ref=v$portVersion&format=tar.zst"')
25	+	w(f'SOURCE_FILENAME="oxygen-v$portVersion.tar.zst"')
26	+	w(f'CHECKSUM_SHA256="{sha}"')
27	+	w('SOURCE_DIR="oxygen-v$portVersion"')
28	+	for i, (name, ver, ck) in enumerate(crates, start=2):
29	+	w(f'SOURCE_URI_{i}="https://static.crates.io/crates/{name}/{name}-{ver}.crate"')
30	+	w(f'CHECKSUM_SHA256_{i}="{ck}"')
31	+	w(f'SOURCE_FILENAME_{i}="{name}-{ver}.tar.gz"')
32	+	last = len(crates) + 1
33	+	w('''
34	+	ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
35	+	SECONDARY_ARCHITECTURES="x86"
36	+
37	+	PROVIDES="
38	+	oxy$secondaryArchSuffix = $portVersion
39	+	cmd:oxy
40	+	"
41	+	REQUIRES="
42	+	haiku$secondaryArchSuffix
43	+	lib:libzstd$secondaryArchSuffix
44	+	"
45	+
46	+	BUILD_REQUIRES="
47	+	haiku${secondaryArchSuffix}_devel
48	+	devel:libzstd$secondaryArchSuffix
49	+	"
50	+	BUILD_PREREQUIRES="
51	+	cmd:gcc$secondaryArchSuffix
52	+	cmd:pkg_config$secondaryArchSuffix
53	+	cmd:rustc$secondaryArchSuffix >= 1.88
54	+	"
55	+
56	+	BUILD()
57	+	{
58	+	export CARGO_HOME=$sourceDir/../cargo
59	+	vendor=$CARGO_HOME/haiku
60	+	mkdir -p "$vendor"
61	+	for i in $(seq 2 ''' + str(last) + '''); do
62	+	eval "srcDir=\\$sourceDir$i"
63	+	eval "sha256sum=\\$CHECKSUM_SHA256_$i"
64	+	set -- "$srcDir"/*
65	+	ln -sf "$1" "$vendor"
66	+	cat <<-EOF >"$vendor/${1##*/}/.cargo-checksum.json"
67	+	{
68	+	"package": "$sha256sum",
69	+	"files": {}
70	+	}
71	+	EOF
72	+	done
73	+
74	+	cat <<-EOF >"$CARGO_HOME"/config.toml
75	+	[source.haiku]
76	+	directory = "$vendor"
77	+
78	+	[source.crates-io]
79	+	replace-with = "haiku"
80	+	EOF
81	+
82	+	# The bundled zstd's hidden symbols break the link on Haiku: use the system's.
83	+	export ZSTD_SYS_USE_PKG_CONFIG=1
84	+	export OXY_BUILD=v$portVersion
85	+	cargo build --release --frozen -p oxy
86	+	}
87	+
88	+	INSTALL()
89	+	{
90	+	install -v -m 755 -d "$prefix"/bin "$docDir"
91	+	install -v -m 755 ./target/release/oxy "$prefix"/bin
92	+	install -v -m 644 README.md LICENSE* "$docDir"
93	+	}
94	+
95	+	TEST()
96	+	{
97	+	export CARGO_HOME=$sourceDir/../cargo
98	+	export ZSTD_SYS_USE_PKG_CONFIG=1
99	+	cargo test --release --frozen -p oxy-core
100	+	}''')
101	+	print("\n".join(out))

		…	1 unchanged lines
2	2
3	3		## Unreleased
4	4
	5	+	- Added: a haikuports recipe for oxy (#156). `packaging/haikuports/` holds the recipe that builds oxy for HaikuDepot from the release source and every crate in `Cargo.lock`, and the script that writes it for a new release; the 0.8.0 recipe builds with haikuporter on Haiku R1/beta6.
5	6		- Fixed: an expired checkout token no longer hides your sign-in (#155). A checkout's own token for a remote (`remote.NAME.token`) is used first, so when it expired every fetch, pull and push answered 401 although `oxy auth login` had a good sign-in for the same hub. A checkout token the hub no longer knows (401) now falls back to that sign-in, with a warning naming `oxy config --unset remote.NAME.token` to drop the stale one; never to another checkout's token, and not when the token is refused for permission (403, 404), so a narrowly scoped token is never swapped for a wider sign-in. When both are refused, the error says to sign in again and unset it.
6	7		- Added: artifacts (Cylinder, step C1, #108). `oxy artifact pack DIR --kind archive\|package\|container\|runner-image\|report [--arch --os --entrypoint --env K=V --label K=V]` packs a directory into an artifact: each file an ordinary blob of the repository's store, so files and chunks it holds already cost nothing, under a tree and an artifact encoding in canonical CBOR, named by the BLAKE3 of that encoding (docs/cylinder.md §4.1). `oxy artifact list \| show NAME \| unpack NAME DEST \| verify NAME` (any unique prefix of six characters or more; `--json` on list, show and pack), and `oxy gc` keeps every artifact's blobs. The new `cylinder` crate holds the model.
7	8		- Added: oxy on Haiku (#154). oxy builds and runs on Haiku R1/beta6 (x86_64) with HaikuPorts' Rust; `oxy-VERSION-haiku-x86_64.tar.gz` is on the releases page from 0.8.0, with its own `SHA256SUMS-haiku`. The README says how to install it and how to build it (`ZSTD_SYS_USE_PKG_CONFIG=1`).
		…	300 unchanged lines

`/`	Search
`g` `c`	Code
`g` `h`	History
`g` `b`	Bookmarks
`g` `t`	Trust
`y`	Permalink to this state (files and trees)
`?`	This sheet

1	+	SUMMARY="A version control system of signed, commuting changes, with Git interop"
2	+	DESCRIPTION="oxy is the command line of Oxygen, a version control system built on \
3	+	patch theory: changes commute, conflicts are recorded rather than blocking, \
4	+	every change can be signed, and a trust policy says who may move what. It \
5	+	imports and exports Git history, clones from OxygenHub and other Oxygen \
6	+	hosts, and keeps repositories on disk or in S3, GCS or Azure buckets."
7	+	HOMEPAGE="https://oxygenhub.io/andymccall/oxygen"
8	+	COPYRIGHT="2025-2026 Andy McCall"
9	+	LICENSE="MIT
10	+	Apache v2"
11	+	REVISION="1"
12	+	SOURCE_URI="$HOMEPAGE/archive?ref=v$portVersion&format=tar.zst"
13	+	SOURCE_FILENAME="oxygen-v$portVersion.tar.zst"
14	+	CHECKSUM_SHA256="c826f4e02a3a8c2b3232c3de845f4a4d7c078c9ff2b99cd6767c6879b8792b70"
15	+	SOURCE_DIR="oxygen-v$portVersion"
16	+	SOURCE_URI_2="https://static.crates.io/crates/adler2/adler2-2.0.1.crate"
17	+	CHECKSUM_SHA256_2="320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
18	+	SOURCE_FILENAME_2="adler2-2.0.1.tar.gz"
19	+	SOURCE_URI_3="https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.5.crate"
20	+	CHECKSUM_SHA256_3="c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba"
21	+	SOURCE_FILENAME_3="aho-corasick-1.1.5.tar.gz"
22	+	SOURCE_URI_4="https://static.crates.io/crates/android_system_properties/android_system_properties-0.1.6.crate"
23	+	CHECKSUM_SHA256_4="ae221649c9976a6f6c56ae1facf410f3ddb33cc661c4b7b61020a912d4237fbc"
24	+	SOURCE_FILENAME_4="android_system_properties-0.1.6.tar.gz"
25	+	SOURCE_URI_5="https://static.crates.io/crates/anstream/anstream-1.0.0.crate"
26	+	CHECKSUM_SHA256_5="824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
27	+	SOURCE_FILENAME_5="anstream-1.0.0.tar.gz"
28	+	SOURCE_URI_6="https://static.crates.io/crates/anstyle/anstyle-1.0.14.crate"
29	+	CHECKSUM_SHA256_6="940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
30	+	SOURCE_FILENAME_6="anstyle-1.0.14.tar.gz"
31	+	SOURCE_URI_7="https://static.crates.io/crates/anstyle-parse/anstyle-parse-1.0.0.crate"
32	+	CHECKSUM_SHA256_7="52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
33	+	SOURCE_FILENAME_7="anstyle-parse-1.0.0.tar.gz"
34	+	SOURCE_URI_8="https://static.crates.io/crates/anstyle-query/anstyle-query-1.1.5.crate"
35	+	CHECKSUM_SHA256_8="40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
36	+	SOURCE_FILENAME_8="anstyle-query-1.1.5.tar.gz"
37	+	SOURCE_URI_9="https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.11.crate"
38	+	CHECKSUM_SHA256_9="291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
39	+	SOURCE_FILENAME_9="anstyle-wincon-3.0.11.tar.gz"
40	+	SOURCE_URI_10="https://static.crates.io/crates/anyhow/anyhow-1.0.104.crate"

A haikuports recipe for oxy, and the script that writes it for each release (closes #156) a42f9fb47e37

Keyboard