commit 05861d5f7babb7559f7aa85a3e20aec7728d55d0 · pyrox.dev/nixpkgs

+6 -10

pkgs/tools/filesystems/garage/default.nix

···

       27
       27
        
       

     

       28
       28
        
           OPENSSL_NO_VENDOR = true;

     

       29
       29
        
       

     

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

     

       30
       30
       +
           # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.8.2/nix/compile.nix#L192-L198

     

       31
       31
        
           # on version changes for checking if changes are required here

     

       32
       32
        
           buildFeatures = [

     

       33
       33
        
             "kubernetes-discovery"

     
···

       57
       57
        
             "sqlite"

     

       58
       58
        
           ]);

     

       59
       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
       -
       

     

       64
       60
        
           passthru = nixosTests.garage;

     

       65
       61
        
       

     

       66
       62
        
           meta = {

     
···

       87
       83
        
       

     

       88
       84
        
           garage_0_7 = garage_0_7_3;

     

       89
       85
        
       

     

       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=";

     

       86
       86
       +
           garage_0_8_2 = generic {

     

       87
       87
       +
             version = "0.8.2";

     

       88
       88
       +
             sha256 = "sha256-IlDWbNWI1yXvPPF3HIqQvo79M2FQCtoX1wRLJrDbd9k=";

     

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

     

       94
       90
        
           };

     

       95
       91
        
       

     

       96
       96
       -
           garage_0_8 = garage_0_8_1;

     

       92
       92
       +
           garage_0_8 = garage_0_8_2;

     

       97
       93
        
       

     

       98
       94
        
           garage = garage_0_8;

     

       99
       95
        
         }

+1 -1

pkgs/top-level/all-packages.nix

···

       7663
       7663
        
         })

     

       7664
       7664
        
           garage

     

       7665
       7665
        
             garage_0_7 garage_0_8

     

       7666
       7666
       -
             garage_0_7_3 garage_0_8_1;

     

       7666
       7666
       +
             garage_0_7_3 garage_0_8_2;

     

       7667
       7667
        
       

     

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

     

       7669
       7669