commit 5e25ffd5949b8d29ea94ffc16af4b07a0c77ef68 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/garage/default.nix

+17 -12

pkgs/tools/filesystems/garage/default.nix

···

       1
       1
        
       { lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf

     

       2
       2
       -
       , testers, Security, garage, nixosTests }:

     

       2
       2
       +
       , cacert, testers, Security, garage, nixosTests }:

     

       3
       3
        
       let

     

       4
       4
        
         generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage {

     

       5
       5
        
           pname = "garage";

     
···

       21
       21
        
             openssl

     

       22
       22
        
           ] ++ lib.optional stdenv.isDarwin Security;

     

       23
       23
        
       

     

       24
       24
       +
           checkInputs = [

     

       25
       25
       +
             cacert

     

       26
       26
       +
           ];

     

       27
       27
       +
       

     

       24
       28
        
           OPENSSL_NO_VENDOR = true;

     

       25
       29
        
       

     

       26
       30
        
           # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.7.2/default.nix#L84-L98

     
···

       36
       40
        
             "telemetry-otlp"

     

       37
       41
        
             "lmdb"

     

       38
       42
        
             "sqlite"

     

       43
       43
       +
             "consul-discovery"

     

       39
       44
        
           ]);

     

       40
       45
        
       

     

       41
       46
        
           # To make integration tests pass, we include the optional k2v feature here,

     

       42
       42
       -
           # but not in buildFeatures. See:

     

       43
       43
       -
           # https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/

     

       47
       47
       +
           # but in buildFeatures only for version 0.8+, where it's enabled by default.

     

       48
       48
       +
           # See: https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/

     

       44
       49
        
           checkFeatures = [

     

       45
       50
        
             "k2v"

     

       46
       51
        
             "kubernetes-discovery"

     
···

       48
       53
        
           (lib.optional (lib.versionAtLeast version "0.8") [

     

       49
       54
        
             "bundled-libs"

     

       50
       55
        
             "sled"

     

       51
       51
       -
             "metrics"

     

       52
       52
       -
             "telemetry-otlp"

     

       53
       56
        
             "lmdb"

     

       54
       57
        
             "sqlite"

     

       55
       58
        
           ]);

     

       56
       59
        
       

     

       60
       60
       +
           # Workaround until upstream fixes integration test race condition

     

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

     

       62
       62
       +
           dontUseCargoParallelTests = true;

     

       63
       63
       +
       

     

       57
       64
        
           passthru = nixosTests.garage;

     

       58
       65
        
       

     

       59
       66
        
           meta = {

     
···

       80
       87
        
       

     

       81
       88
        
           garage_0_7 = garage_0_7_3;

     

       82
       89
        
       

     

       83
       83
       -
           garage_0_8_0 = generic {

     

       84
       84
       -
             version = "0.8.0";

     

       85
       85
       -
             sha256 = "sha256-c2RhHfg0+YV2E9Ckl1YSc+0nfzbHPIt0JgtT0DND9lA=";

     

       86
       86
       -
             cargoSha256 = "sha256-vITXckNOiJbMuQW6/8p7dsZThkjxg/zUy3AZBbn33no=";

     

       87
       87
       -
             # On x86_64-darwin, tests are failing.

     

       88
       88
       -
             broken = stdenv.isDarwin && stdenv.isx86_64;

     

       90
       90
       +
           garage_0_8_1 = generic {

     

       91
       91
       +
             version = "0.8.1";

     

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

     

       93
       93
       +
             cargoSha256 = "sha256-TXHSAnttXfxoFLOP+vsd86O8sVoyrSkadij26cF4aXI=";

     

       89
       94
        
           };

     

       90
       95
        
       

     

       91
       91
       -
           garage_0_8 = garage_0_8_0;

     

       96
       96
       +
           garage_0_8 = garage_0_8_1;

     

       92
       97
        
       

     

       93
       98
        
           garage = garage_0_8;

     

       94
       99
        
         }

+1 -1

pkgs/top-level/all-packages.nix

···

       7653
       7653
        
         })

     

       7654
       7654
        
           garage

     

       7655
       7655
        
             garage_0_7 garage_0_8

     

       7656
       7656
       -
             garage_0_7_3 garage_0_8_0;

     

       7656
       7656
       +
             garage_0_7_3 garage_0_8_1;

     

       7657
       7657
        
       

     

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

     

       7659
       7659