diff --git a/packaging/packages/preserves-schemas/APKBUILD b/packaging/packages/preserves-schemas/APKBUILD index 73689ee..5eb9296 100644 --- a/packaging/packages/preserves-schemas/APKBUILD +++ b/packaging/packages/preserves-schemas/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Tony Garnock-Jones pkgname=preserves-schemas -pkgver=0.991.0-r20231031 +pkgver=0.994.0-r20240301 pkgrel=0 pkgdesc="Shared Preserves Schema definitions" url="https://preserves.dev/" @@ -20,5 +20,5 @@ package() { } sha512sums=" -621f3a41c0c4a5c3f7cd0ebe0ec36983d9766e221cfd031b8b59ef2629e9caeb66a0bf00754d33e24c7c6dd56cd8ff5c5e6c802c65ccc773e0a0981ec7b26eb5 preserves-0.991.0-r20231031.zip +2f6a14ec262a8ed8120f0cfe4c6e7641dd5abd6e17a18cc3fb5f51c5d6a0801ac6ace53234a1b35a38452e24b59bf25b4c1697f56c2a7527c33867a1ad8e4248 preserves-0.994.0-r20240301.zip " diff --git a/packaging/packages/preserves-tools/.gitignore b/packaging/packages/preserves-tools/.gitignore index fcf8a44..4afaf39 100644 --- a/packaging/packages/preserves-tools/.gitignore +++ b/packaging/packages/preserves-tools/.gitignore @@ -4,4 +4,4 @@ buildlog.* preserves-tool.aarch64 preserves-tool.armv7 preserves-tool.x86_64 -preserves/ +preserves-rs/ diff --git a/packaging/packages/preserves-tools/Makefile.external b/packaging/packages/preserves-tools/Makefile.external index 2906d49..1be3f91 100644 --- a/packaging/packages/preserves-tools/Makefile.external +++ b/packaging/packages/preserves-tools/Makefile.external @@ -1,24 +1,21 @@ # -*- makefile -*- -prepare: preserves miniclean - echo nightly > preserves/implementations/rust/rust-toolchain - $(MAKE) -C preserves/implementations/rust $(ARCH)-binary-release - cp -p preserves/implementations/rust/target/$(ARCH)-*/release/preserves-tool \ +prepare: preserves-rs miniclean + $(MAKE) -C preserves-rs $(ARCH)-binary-release + cp -p preserves-rs/target/target.$(ARCH)/$(ARCH)-*/release/preserves-tool \ preserves-tool.$(ARCH) - (cd preserves/implementations/rust/preserves-tools && cargo metadata --format-version 1) \ + (cd preserves-rs/preserves-tools && cargo metadata --format-version 1) \ | preserves-tool convert --output-format unquoted \ --select '. "packages" / [. "name" = "preserves-tools"] . "version"' \ > VERSION - rm -f preserves/implementations/rust/rust-toolchain - (cd preserves; ../../../gitversion) > GITVERSION + (cd preserves-rs; ../../../gitversion) > GITVERSION -preserves: - git clone https://gitlab.com/preserves/preserves +preserves-rs: + git clone https://gitlab.com/preserves/preserves-rs miniclean: rm -f preserves-tool.$(ARCH) clean: miniclean - rm -rf preserves/implementations/rust/target - rm -f preserves/implementations/rust/rust-toolchain + rm -rf preserves-rs/target rm -f VERSION diff --git a/packaging/packages/py3-preserves/APKBUILD b/packaging/packages/py3-preserves/APKBUILD index 93b8944..03188de 100644 --- a/packaging/packages/py3-preserves/APKBUILD +++ b/packaging/packages/py3-preserves/APKBUILD @@ -1,27 +1,27 @@ # Maintainer: Tony Garnock-Jones pkgname=py3-preserves _pyname=preserves -pkgver=0.991.0 +pkgver=0.994.0 pkgrel=0 pkgdesc="Preserves serialization format" url="https://preserves.dev/" arch="noarch" license="Apache-2.0" depends="python3" -makedepends="py3-setuptools py3-pip py3-wheel" +makedepends="py3-setuptools py3-pip py3-wheel py3-build" _pypiprefix="${_pyname%${_pyname#?}}" source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" builddir="$srcdir/$_pyname-$pkgver" options="!check" build() { - python3 setup.py build + python3 -m build } package() { - python3 setup.py install --prefix=/usr --root="$pkgdir" + python3 -m pip install --prefix=/usr --root="$pkgdir" ./dist/preserves-$pkgver-*.whl } sha512sums=" -1812f837213329cb830e0a7a9f767c4a3815eb290c0c52515eb5bb95b06ea5a835fee46be0e4a03ff632aa0c00764b5e2b686ae70da2bf539524a930e24d3586 preserves-0.991.0.tar.gz +1b4c65f61a85204d68dcf6568fc63511ac407af1606e4d7edf7adfa12c1cf3ab72e4e344ee9536f012fda1fe3cf22ca5e90db712e3621890d5723708f0c0ce80 preserves-0.994.0.tar.gz " diff --git a/packaging/packages/py3-syndicate/APKBUILD b/packaging/packages/py3-syndicate/APKBUILD index d1b3f69..0301072 100644 --- a/packaging/packages/py3-syndicate/APKBUILD +++ b/packaging/packages/py3-syndicate/APKBUILD @@ -1,27 +1,27 @@ # Maintainer: Tony Garnock-Jones pkgname=py3-syndicate _pyname=syndicate-py -pkgver=0.15.0 +pkgver=0.16.0 pkgrel=0 pkgdesc="Syndicated Actor model for Python" url="https://syndicate-lang.org/" arch="noarch" license="GPL-3.0-or-later" depends="python3 py3-preserves py3-websockets" -makedepends="py3-setuptools py3-pip py3-wheel" +makedepends="py3-setuptools py3-pip py3-wheel py3-build" _pypiprefix="${_pyname%${_pyname#?}}" source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" builddir="$srcdir/$_pyname-$pkgver" options="!check" build() { - python3 setup.py build + python3 -m build } package() { - python3 setup.py install --prefix=/usr --root="$pkgdir" + python3 -m pip install --prefix=/usr --root="$pkgdir" ./dist/syndicate_py-$pkgver-*.whl } sha512sums=" -b7bff76a363995bdeeb7c3f02bb352413d95384303d13ac56196f430124a2235582ae20a9d383063bbd27f0ee6fcc4845d7d9d499e86a6992cff41dcfa88c114 syndicate-py-0.15.0.tar.gz +bc4298d9b7dce9fb7cfa0ae9490f7cb61dc9fcbd2d6cdf1396657645d20ff48fb342c64383ee58569d2cf2c630c9f0ffa781288b82f7d199ae3a4499a288b160 syndicate-py-0.16.0.tar.gz " diff --git a/packaging/packages/syndicate-schemas/APKBUILD b/packaging/packages/syndicate-schemas/APKBUILD index 6d800ad..e5a5b83 100644 --- a/packaging/packages/syndicate-schemas/APKBUILD +++ b/packaging/packages/syndicate-schemas/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Tony Garnock-Jones pkgname=syndicate-schemas -pkgver=0.3.0-r20231031 +pkgver=0.4.0-r20240301 pkgrel=1 pkgdesc="Shared Syndicate Preserves Schema definitions" url="https://syndicate-lang.org/" @@ -19,5 +19,5 @@ package() { } sha512sums=" -d55524dfcf2cdb0d7cb497d904ef32ee11beaab3cb100c41eb02e4012d26ec3cc6aee1cec1c20be437e83f4d4e651697193ff255db2be3da45267ac3a89541fb 0.3.0-r20231031.zip +5669756bceec8c5283041f701016e413981894e268a8630ea32332a2529143242c190dd31425de18daa249c913f10402700c00dee07ab4ee92c13a5210c68853 0.4.0-r20240301.zip " diff --git a/packaging/packages/syndicate-sh/APKBUILD b/packaging/packages/syndicate-sh/APKBUILD index 71ab974..2096292 100644 --- a/packaging/packages/syndicate-sh/APKBUILD +++ b/packaging/packages/syndicate-sh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Tony Garnock-Jones # Maintainer: Tony Garnock-Jones pkgname=syndicate-sh -pkgver=0.0.2 +pkgver=0.0.3 pkgrel=0 pkgdesc="Syndicate connectivity shell support functions" url="https://syndicate-lang.org/" @@ -25,5 +25,5 @@ package() { } sha512sums=" -21abf6305b7e81ebe4d0175a8c0c5a6fb1a75422071dea49f5a923e2dc5de7b41a194b2ead38afe4076834d3f299d77cdd21e88c6f7c52816e691907c1a683d3 syndicate.sh +ed6140f2ade11d8bd9f730efba28bacd9b517d9035dc890ab5c3cc85f3cd735aee8930e686b3e507291325384a377613c3b1b1f0ee395fbfa1e9fc1e6a86e407 syndicate.sh " diff --git a/packaging/packages/synit-config/APKBUILD b/packaging/packages/synit-config/APKBUILD index c490654..1ea9ece 100644 --- a/packaging/packages/synit-config/APKBUILD +++ b/packaging/packages/synit-config/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Tony Garnock-Jones # Maintainer: Tony Garnock-Jones pkgname=synit-config -pkgver=0.0.7$(cat GITVERSION) +pkgver=0.0.8$(cat GITVERSION) pkgrel=0 pkgdesc="synit system layer configuration" url="https://synit.org/" diff --git a/packaging/packages/synit-pid1/Makefile.external b/packaging/packages/synit-pid1/Makefile.external index 6368cf7..979b2b5 100644 --- a/packaging/packages/synit-pid1/Makefile.external +++ b/packaging/packages/synit-pid1/Makefile.external @@ -2,7 +2,7 @@ prepare: miniclean $(MAKE) -C ../../../synit-pid1 $(ARCH)-binary-release - cp -p ../../../synit-pid1/target/$(ARCH)-*/release/synit-pid1 synit-pid1.$(ARCH) + cp -p ../../../synit-pid1/target/target.$(ARCH)/$(ARCH)-*/release/synit-pid1 synit-pid1.$(ARCH) (cd ../../../synit-pid1 && cargo metadata --format-version 1) | \ preserves-tool convert --output-format unquoted \ --select '. "packages" / [. "name" = "synit-pid1"] . "version"' > VERSION