JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

garage: 0.8.0 -> 0.8.1

Browse Source 
https://git.deuxfleurs.fr/Deuxfleurs/garage/compare/v0.8.0...v0.8.1

Fix tests by adding cacert

Use garage version 0_8 by default for nixos tests

Use same rust feature set as upstream for release binary and tests:
https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.8.1/nix/compile.nix#L181-L192
https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.8.1/default.nix#L40-L52
This commit is contained in:
teutat3s 2023-02-28 17:56:58 +01:00
parent 4a6cd14f37
commit 78286a06b0
No known key found for this signature in database
GPG Key ID: 18DAE600A6BBE705
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/garage/default.nix
View File

@ -49,5 +49,5 @@ in
})
{}
[
"0_8_0"
"0_8"
]

29
pkgs/tools/filesystems/garage/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf
, testers, Security, garage, nixosTests }:
, cacert, testers, Security, garage, nixosTests }:
let
generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
pname = "garage";
@ -21,6 +21,10 @@ let
openssl
] ++ lib.optional stdenv.isDarwin Security;
checkInputs = [
cacert
];
OPENSSL_NO_VENDOR = true;
# See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.7.2/default.nix#L84-L98
@ -36,11 +40,12 @@ let
"telemetry-otlp"
"lmdb"
"sqlite"
"consul-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/
# but in buildFeatures only for version 0.8+, where it's enabled by default.
# See: https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/
checkFeatures = [
"k2v"
"kubernetes-discovery"
@ -48,12 +53,14 @@ let
(lib.optional (lib.versionAtLeast version "0.8") [
"bundled-libs"
"sled"
"metrics"
"telemetry-otlp"
"lmdb"
"sqlite"
]);
# Workaround until upstream fixes integration test race condition
# https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/528
dontUseCargoParallelTests = true;
passthru = nixosTests.garage;
meta = {
@ -80,15 +87,13 @@ in
garage_0_7 = garage_0_7_3;
garage_0_8_0 = generic {
version = "0.8.0";
sha256 = "sha256-c2RhHfg0+YV2E9Ckl1YSc+0nfzbHPIt0JgtT0DND9lA=";
cargoSha256 = "sha256-vITXckNOiJbMuQW6/8p7dsZThkjxg/zUy3AZBbn33no=";
# On x86_64-darwin, tests are failing.
broken = stdenv.isDarwin && stdenv.isx86_64;
garage_0_8_1 = generic {
version = "0.8.1";
sha256 = "sha256-lpNp/jw4YaczG3NM3pVWR0cZ8u/KBQCWvvfAswO4+Do=";
cargoSha256 = "sha256-TXHSAnttXfxoFLOP+vsd86O8sVoyrSkadij26cF4aXI=";
};
garage_0_8 = garage_0_8_0;
garage_0_8 = garage_0_8_1;
garage = garage_0_8;
}

2
pkgs/top-level/all-packages.nix
View File

@ -7591,7 +7591,7 @@ with pkgs;
})
garage
garage_0_7 garage_0_8
garage_0_7_3 garage_0_8_0;
garage_0_7_3 garage_0_8_1;
garmin-plugin = callPackage ../applications/misc/garmin-plugin {};