swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #218843 from teutat3s/garage-0.8.1

Browse source
This commit is contained in:
Sandro 2023-03-13 22:23:53 +01:00 committed by GitHub
parent a8cfd27522 78286a06b0
commit 5e25ffd594
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 { lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf
, testers, Security, garage, nixosTests }: , cacert, testers, Security, garage, nixosTests }:
let let
generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage { generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
pname = "garage"; pname = "garage";
@ -21,6 +21,10 @@ let
openssl openssl
] ++ lib.optional stdenv.isDarwin Security; ] ++ lib.optional stdenv.isDarwin Security;
checkInputs = [
cacert
];
OPENSSL_NO_VENDOR = true; OPENSSL_NO_VENDOR = true;
# See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.7.2/default.nix#L84-L98 # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.7.2/default.nix#L84-L98
@ -36,11 +40,12 @@ let
"telemetry-otlp" "telemetry-otlp"
"lmdb" "lmdb"
"sqlite" "sqlite"
"consul-discovery"
]); ]);
# To make integration tests pass, we include the optional k2v feature here, # To make integration tests pass, we include the optional k2v feature here,
# but not in buildFeatures. See: # but in buildFeatures only for version 0.8+, where it's enabled by default.
# https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/ # See: https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/
checkFeatures = [ checkFeatures = [
"k2v" "k2v"
"kubernetes-discovery" "kubernetes-discovery"
@ -48,12 +53,14 @@ let
(lib.optional (lib.versionAtLeast version "0.8") [ (lib.optional (lib.versionAtLeast version "0.8") [
"bundled-libs" "bundled-libs"
"sled" "sled"
"metrics"
"telemetry-otlp"
"lmdb" "lmdb"
"sqlite" "sqlite"
]); ]);
# Workaround until upstream fixes integration test race condition
# https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/528
dontUseCargoParallelTests = true;
passthru = nixosTests.garage; passthru = nixosTests.garage;
meta = { meta = {
@ -80,15 +87,13 @@ in
garage_0_7 = garage_0_7_3; garage_0_7 = garage_0_7_3;
garage_0_8_0 = generic { garage_0_8_1 = generic {
version = "0.8.0"; version = "0.8.1";
sha256 = "sha256-c2RhHfg0+YV2E9Ckl1YSc+0nfzbHPIt0JgtT0DND9lA="; sha256 = "sha256-lpNp/jw4YaczG3NM3pVWR0cZ8u/KBQCWvvfAswO4+Do=";
cargoSha256 = "sha256-vITXckNOiJbMuQW6/8p7dsZThkjxg/zUy3AZBbn33no="; cargoSha256 = "sha256-TXHSAnttXfxoFLOP+vsd86O8sVoyrSkadij26cF4aXI=";
# On x86_64-darwin, tests are failing.
broken = stdenv.isDarwin && stdenv.isx86_64;
}; };
garage_0_8 = garage_0_8_0; garage_0_8 = garage_0_8_1;
garage = garage_0_8; garage = garage_0_8;
} }

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

@ -7653,7 +7653,7 @@ with pkgs;
}) })
garage garage
garage_0_7 garage_0_8 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 { }; garmin-plugin = callPackage ../applications/misc/garmin-plugin { };