Unverified Commit 05861d5f authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #221135 from teutat3s/garage-0.8.2 

garage: 0.8.1 -> 0.8.2
parents cf37f5df 12ebd64d

pkgs/tools/filesystems/garage/default.nix

+6 −10
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ let 


    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.8.2/nix/compile.nix#L192-L198

    # on version changes for checking if changes are required here

    buildFeatures = [

      "kubernetes-discovery"
@@ -57,10 +57,6 @@ let 
      "sqlite"

    ]);



    # Workaround until upstream fixes integration test race condition

    # https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/528

    dontUseCargoParallelTests = true;



    passthru = nixosTests.garage;



    meta = {
@@ -87,13 +83,13 @@ in 


    garage_0_7 = garage_0_7_3;



    garage_0_8_1 = generic {

      version = "0.8.1";

      sha256 = "sha256-lpNp/jw4YaczG3NM3pVWR0cZ8u/KBQCWvvfAswO4+Do=";

      cargoSha256 = "sha256-TXHSAnttXfxoFLOP+vsd86O8sVoyrSkadij26cF4aXI=";

    garage_0_8_2 = generic {

      version = "0.8.2";

      sha256 = "sha256-IlDWbNWI1yXvPPF3HIqQvo79M2FQCtoX1wRLJrDbd9k=";

      cargoSha256 = "sha256-6l4tDBMcOvckTkEO05rman4hHlmVbBt1nCeX5/dETKk=";

    };



    garage_0_8 = garage_0_8_1;

    garage_0_8 = garage_0_8_2;



    garage = garage_0_8;

  }

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -7663,7 +7663,7 @@ with pkgs; 
  })

    garage

      garage_0_7 garage_0_8

      garage_0_7_3 garage_0_8_1;

      garage_0_7_3 garage_0_8_2;















  garmin-plugin = callPackage ../applications/misc/garmin-plugin { };