diff --git a/srcpkgs/garage/patches/build-on-macos.patch b/srcpkgs/garage/patches/build-on-macos.patch deleted file mode 100644 index e974bd3a5e7..00000000000 --- a/srcpkgs/garage/patches/build-on-macos.patch +++ /dev/null @@ -1,31 +0,0 @@ -This does not just fix on macos, but also fixes on i686 and arm-32bit -but somehow only on glibc, not musl. Why? - -From c7f5dcd953ff1fdfa002a8bccfb43eafcc6fddd4 Mon Sep 17 00:00:00 2001 -From: trinity-1686a -Date: Sun, 15 Oct 2023 17:57:27 +0200 -Subject: [PATCH] fix compilation on macos - -fsblkcnt_t is ony 32b there, so we have to do an additional cast ---- - src/rpc/system.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/rpc/system.rs b/src/rpc/system.rs -index 78fcc74b..4b40bec4 100644 ---- a/src/rpc/system.rs -+++ b/src/rpc/system.rs -@@ -899,8 +899,8 @@ impl NodeStatus { - use nix::sys::statvfs::statvfs; - let mount_avail = |path: &Path| match statvfs(path) { - Ok(x) => { -- let avail = x.blocks_available() * x.fragment_size() as u64; -- let total = x.blocks() * x.fragment_size() as u64; -+ let avail = x.blocks_available() as u64 * x.fragment_size() as u64; -+ let total = x.blocks() as u64 * x.fragment_size() as u64; - Some((x.filesystem_id(), avail, total)) - } - Err(_) => None, --- -2.40.1 - diff --git a/srcpkgs/garage/template b/srcpkgs/garage/template index 6b95e6c880b..d55fab3828d 100644 --- a/srcpkgs/garage/template +++ b/srcpkgs/garage/template @@ -1,17 +1,17 @@ # Template file for 'garage' pkgname=garage -version=0.9.0 +version=2.0.0 revision=1 build_style=cargo make_install_args="--path src/garage" hostmakedepends="pkg-config" -makedepends="libzstd-devel libsodium-devel" +makedepends="libzstd-devel libsodium-devel sqlite-devel" short_desc="Distributed S3 object storage service tailored for self-hosting" maintainer="Toyam Cox " license="AGPL-3.0-only" homepage="https://garagehq.deuxfleurs.fr/" distfiles="https://git.deuxfleurs.fr/Deuxfleurs/garage/archive/v${version}.tar.gz" -checksum=1d0d09053dd0b5bba89c73e11c568ea28aaedd92db7af618a4dd514d3a7e6222 +checksum=10c50925c57ca9bd84e4b1395555f21fec7ab5acc74f1fa8ac785a30d62f80b6 post_install() { vlicense LICENSE diff --git a/srcpkgs/garage/update b/srcpkgs/garage/update new file mode 100644 index 00000000000..8ffca2da90a --- /dev/null +++ b/srcpkgs/garage/update @@ -0,0 +1,2 @@ +site="https://git.deuxfleurs.fr/Deuxfleurs/garage/tags" +pattern="/archive/v\K[0-9][0-9.]+[0-9](?!\.tar\.gz)"