diff --git a/nixos/tests/stratis/encryption.nix b/nixos/tests/stratis/encryption.nix index 3faa3171843f..a555ff8a8e85 100644 --- a/nixos/tests/stratis/encryption.nix +++ b/nixos/tests/stratis/encryption.nix @@ -26,8 +26,7 @@ import ../make-test-python.nix ({ pkgs, ... }: # test rebinding encrypted pool machine.succeed("stratis pool rebind keyring testpool testkey2") # test restarting encrypted pool - uuid = machine.succeed("stratis pool list | grep -oE '[0-9a-fA-F-]{36}'").rstrip('\n') - machine.succeed(" stratis pool stop testpool") - machine.succeed(f"stratis pool start {uuid} --unlock-method keyring") + machine.succeed("stratis pool stop testpool") + machine.succeed("stratis pool start --name testpool --unlock-method keyring") ''; }) diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/tools/filesystems/stratis-cli/default.nix index 066bc0b0d1d7..23b1601a8502 100644 --- a/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/pkgs/tools/filesystems/stratis-cli/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "stratis-cli"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-tS9kjXE7wn5j13PO8c3C98MpFbgmR4le/PNKoXKPKQg="; + rev = "v${version}"; + hash = "sha256-kB8saMgNIoDCXhxCPG1Mwj7dxrev82leoewajA5g9IM="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 68023a1265e7..3b6b3d8bafd3 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -24,18 +24,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-6CCSs359gPwUMQ2SFpxaWHXCjqqgIbvCaPL2zLuYRKg="; + hash = "sha256-SHrD9zzGLGSlsf4UOqp4Xday6IDnryVDHIVRiPbE5CM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-9nE/SFGv1tYyGDdemCahxHlRnLms3eK0r4XQMhQBjSQ="; + hash = "sha256-lkuFWVmO+qw2ZXbCwdhU5OpRZy589QKnudgNVTgsJhI="; }; postPatch = '' @@ -70,7 +70,6 @@ stdenv.mkDerivation rec { EXECUTABLES_PATHS = lib.makeBinPath ([ xfsprogs thin-provisioning-tools - udev ] ++ lib.optionals clevisSupport [ clevis jose