commit 98d30160b437c5d6f6d9338e565e1f47a3ebda14 · pyrox.dev/nixpkgs

+2 -3

nixos/tests/stratis/encryption.nix

···

       26
       26
        
               # test rebinding encrypted pool

     

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

     

       28
       28
        
               # test restarting encrypted pool

     

       29
       29
       -
               uuid = machine.succeed("stratis pool list | grep -oE '[0-9a-fA-F-]{36}'").rstrip('\n')

     

       30
       30
       -
               machine.succeed(" stratis pool stop   testpool")

     

       31
       31
       -
               machine.succeed(f"stratis pool start  {uuid}   --unlock-method keyring")

     

       29
       29
       +
               machine.succeed("stratis pool stop   testpool")

     

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

     

       32
       31
        
             '';

     

       33
       32
        
         })

+3 -3

pkgs/tools/filesystems/stratis-cli/default.nix

···

       6
       6
        
       

     

       7
       7
        
       python3Packages.buildPythonApplication rec {

     

       8
       8
        
         pname = "stratis-cli";

     

       9
       9
       -
         version = "3.3.0";

     

       9
       9
       +
         version = "3.4.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "stratis-storage";

     

       13
       13
        
           repo = pname;

     

       14
       14
       -
           rev = "refs/tags/v${version}";

     

       15
       15
       -
           hash = "sha256-tS9kjXE7wn5j13PO8c3C98MpFbgmR4le/PNKoXKPKQg=";

     

       14
       14
       +
           rev = "v${version}";

     

       15
       15
       +
           hash = "sha256-kB8saMgNIoDCXhxCPG1Mwj7dxrev82leoewajA5g9IM=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = with python3Packages; [

+3 -4

pkgs/tools/filesystems/stratisd/default.nix

···

       24
       24
        
       

     

       25
       25
        
       stdenv.mkDerivation rec {

     

       26
       26
        
         pname = "stratisd";

     

       27
       27
       -
         version = "3.3.0";

     

       27
       27
       +
         version = "3.4.0";

     

       28
       28
        
       

     

       29
       29
        
         src = fetchFromGitHub {

     

       30
       30
        
           owner = "stratis-storage";

     

       31
       31
        
           repo = pname;

     

       32
       32
        
           rev = "v${version}";

     

       33
       33
       -
           hash = "sha256-6CCSs359gPwUMQ2SFpxaWHXCjqqgIbvCaPL2zLuYRKg=";

     

       33
       33
       +
           hash = "sha256-SHrD9zzGLGSlsf4UOqp4Xday6IDnryVDHIVRiPbE5CM=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       37
       37
        
           inherit src;

     

       38
       38
       -
           hash = "sha256-9nE/SFGv1tYyGDdemCahxHlRnLms3eK0r4XQMhQBjSQ=";

     

       38
       38
       +
           hash = "sha256-lkuFWVmO+qw2ZXbCwdhU5OpRZy589QKnudgNVTgsJhI=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         postPatch = ''

     
···

       70
       70
        
         EXECUTABLES_PATHS = lib.makeBinPath ([

     

       71
       71
        
           xfsprogs

     

       72
       72
        
           thin-provisioning-tools

     

       73
       73
       -
           udev

     

       74
       73
        
         ] ++ lib.optionals clevisSupport [

     

       75
       74
        
           clevis

     

       76
       75
        
           jose