Unverified Commit 5e25ffd5 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #218843 from teutat3s/garage-0.8.1

parents a8cfd275 78286a06

nixos/tests/garage/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -49,5 +49,5 @@ in 
  })

  {}

  [

    "0_8_0"

    "0_8"

  ]

pkgs/tools/filesystems/garage/default.nix

+17 −12
Original line number Diff line number Diff line 
{ 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;

  }

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -7653,7 +7653,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 { };