diff --git a/nixos/tests/stratis/encryption.nix b/nixos/tests/stratis/encryption.nix index 719d8dd25841..583c881ecaac 100644 --- a/nixos/tests/stratis/encryption.nix +++ b/nixos/tests/stratis/encryption.nix @@ -30,7 +30,7 @@ import ../make-test-python.nix ( machine.succeed("stratis pool rebind keyring testpool testkey2") # test restarting encrypted pool machine.succeed("stratis pool stop --name testpool") - machine.succeed("stratis pool start --name testpool --unlock-method keyring") + machine.succeed("stratis pool start --name testpool --unlock-method any") ''; } ) diff --git a/pkgs/by-name/st/stratis-cli/package.nix b/pkgs/by-name/st/stratis-cli/package.nix index d38088428f79..d63f3e442dd0 100644 --- a/pkgs/by-name/st/stratis-cli/package.nix +++ b/pkgs/by-name/st/stratis-cli/package.nix @@ -7,21 +7,21 @@ python3Packages.buildPythonApplication rec { pname = "stratis-cli"; - version = "3.7.0"; + version = "3.8.1"; pyproject = true; src = fetchFromGitHub { owner = "stratis-storage"; - repo = pname; + repo = "stratis-cli"; tag = "v${version}"; - hash = "sha256-F/RP/bWf2fV1IvNbrkYX3d94om1kACNe+oJI8pXM5P4="; + hash = "sha256-zyby53QEC9txH/EP0plV4vUg9fRV6tZJtdQEWQ2iKCA="; }; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ dbus-client-gen dbus-python-client-gen justbytes @@ -42,6 +42,8 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "stratis_cli" ]; + env.STRATIS_STRICT_POOL_FEATURES = "1"; # required for unit tests + passthru.tests = nixosTests.stratis; meta = with lib; { diff --git a/pkgs/by-name/st/stratisd/package.nix b/pkgs/by-name/st/stratisd/package.nix index 1b8259928646..2b88e75a6bba 100644 --- a/pkgs/by-name/st/stratisd/package.nix +++ b/pkgs/by-name/st/stratisd/package.nix @@ -29,18 +29,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.7.3"; + version = "3.8.1"; src = fetchFromGitHub { owner = "stratis-storage"; - repo = pname; + repo = "stratisd"; tag = "stratisd-v${version}"; - hash = "sha256-W8ssLTFU36t6iLrt9S9V8qcN7EP4IsL7VbhNPLpftio="; + hash = "sha256-vYqvYC3r1TQ62YtMJYOx8bRxFJOam5ntbOS+FJZL/gQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-blhB+UfvG22Xe2O0csZ00/jgnVcLTUIkDJG5P22mffQ="; + hash = "sha256-B3n9Ot4CFcVL/R2wHPuDIPBca/5pb2VgcuP1pxnnUrA="; }; postPatch = ''