commit a09d6bc43d6a5e18d84cf5cdb5278889f117c4fb · pyrox.dev/nixpkgs

+1 -1

nixos/tests/stratis/encryption.nix

···

       30
       30
        
               machine.succeed("stratis pool rebind keyring  testpool testkey2")

     

       31
       31
        
               # test restarting encrypted pool

     

       32
       32
        
               machine.succeed("stratis pool stop  --name testpool")

     

       33
       33
       -
               machine.succeed("stratis pool start --name testpool --unlock-method keyring")

     

       33
       33
       +
               machine.succeed("stratis pool start --name testpool --unlock-method any")

     

       34
       34
        
             '';

     

       35
       35
        
         }

     

       36
       36
        
       )

+7 -5

pkgs/by-name/st/stratis-cli/package.nix

···

       7
       7
        
       

     

       8
       8
        
       python3Packages.buildPythonApplication rec {

     

       9
       9
        
         pname = "stratis-cli";

     

       10
       10
       -
         version = "3.7.0";

     

       10
       10
       +
         version = "3.8.1";

     

       11
       11
        
         pyproject = true;

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "stratis-storage";

     

       15
       15
       -
           repo = pname;

     

       15
       15
       +
           repo = "stratis-cli";

     

       16
       16
        
           tag = "v${version}";

     

       17
       17
       -
           hash = "sha256-F/RP/bWf2fV1IvNbrkYX3d94om1kACNe+oJI8pXM5P4=";

     

       17
       17
       +
           hash = "sha256-zyby53QEC9txH/EP0plV4vUg9fRV6tZJtdQEWQ2iKCA=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         nativeBuildInputs = with python3Packages; [

     

       20
       20
       +
         build-system = with python3Packages; [

     

       21
       21
        
           setuptools

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
       -
         propagatedBuildInputs = with python3Packages; [

     

       24
       24
       +
         dependencies = with python3Packages; [

     

       25
       25
        
           dbus-client-gen

     

       26
       26
        
           dbus-python-client-gen

     

       27
       27
        
           justbytes

     
···

       41
       41
        
         ];

     

       42
       42
        
       

     

       43
       43
        
         pythonImportsCheck = [ "stratis_cli" ];

     

       44
       44
       +
       

     

       45
       45
       +
         env.STRATIS_STRICT_POOL_FEATURES = "1"; # required for unit tests

     

       44
       46
        
       

     

       45
       47
        
         passthru.tests = nixosTests.stratis;

     

       46
       48

+4 -4

pkgs/by-name/st/stratisd/package.nix

···

       29
       29
        
       

     

       30
       30
        
       stdenv.mkDerivation rec {

     

       31
       31
        
         pname = "stratisd";

     

       32
       32
       -
         version = "3.7.3";

     

       32
       32
       +
         version = "3.8.1";

     

       33
       33
        
       

     

       34
       34
        
         src = fetchFromGitHub {

     

       35
       35
        
           owner = "stratis-storage";

     

       36
       36
       -
           repo = pname;

     

       36
       36
       +
           repo = "stratisd";

     

       37
       37
        
           tag = "stratisd-v${version}";

     

       38
       38
       -
           hash = "sha256-W8ssLTFU36t6iLrt9S9V8qcN7EP4IsL7VbhNPLpftio=";

     

       38
       38
       +
           hash = "sha256-vYqvYC3r1TQ62YtMJYOx8bRxFJOam5ntbOS+FJZL/gQ=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       42
       42
        
           inherit src;

     

       43
       43
       -
           hash = "sha256-blhB+UfvG22Xe2O0csZ00/jgnVcLTUIkDJG5P22mffQ=";

     

       43
       43
       +
           hash = "sha256-B3n9Ot4CFcVL/R2wHPuDIPBca/5pb2VgcuP1pxnnUrA=";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
        
         postPatch = ''