Merge pull request #185770 from teutat3s/bump/garage

This commit is contained in:
Sandro 2022-09-10 21:46:39 +02:00 committed by GitHub
commit 2ffecd0206
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,22 +1,41 @@
{ lib, stdenv, rustPlatform, fetchFromGitea, protobuf, testers, Security, garage }:
{ lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf
, testers, Security, garage }:
rustPlatform.buildRustPackage rec {
pname = "garage";
version = "0.7.0";
version = "0.7.3";
src = fetchFromGitea {
domain = "git.deuxfleurs.fr";
owner = "Deuxfleurs";
repo = "garage";
rev = "v${version}";
sha256 = "sha256-gs0TW431YUrdsdJ+PYrJgnLiBmDPYnUR0iVnQ/YqIfU=";
sha256 = "sha256-WDhe2L+NalMoIy2rhfmv8KCNDMkcqBC9ezEKKocihJg=";
};
cargoSha256 = "sha256-XGSenT2q3VXNcIT1Lg1e5HTOkEdOb1o3H07ahteQM/o=";
cargoSha256 = "sha256-5m4c8/upBYN8nuysDhGKEnNVJjEGC+yLrraicrAQOfI=";
nativeBuildInputs = [ protobuf ];
nativeBuildInputs = [ protobuf pkg-config ];
buildInputs = lib.optional stdenv.isDarwin Security;
buildInputs = [
openssl
] ++ lib.optional stdenv.isDarwin Security;
OPENSSL_NO_VENDOR = true;
# See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.7.2/default.nix#L84-L98
# on version changes for checking if changes are required here
buildFeatures = [
"kubernetes-discovery"
];
# To make integration tests pass, we include the optional k2v feature here,
# but not in buildFeatures. See:
# https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/
checkFeatures = [
"k2v"
"kubernetes-discovery"
];
passthru = {
tests.version = testers.testVersion { package = garage; };