Skip to content

Commit a09d6bc

Browse files
authored
stratisd: 3.7.3 -> 3.8.0 (#389415)
2 parents c0e7f06 + 227cc6e commit a09d6bc

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

nixos/tests/stratis/encryption.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import ../make-test-python.nix (
3030
machine.succeed("stratis pool rebind keyring testpool testkey2")
3131
# test restarting encrypted pool
3232
machine.succeed("stratis pool stop --name testpool")
33-
machine.succeed("stratis pool start --name testpool --unlock-method keyring")
33+
machine.succeed("stratis pool start --name testpool --unlock-method any")
3434
'';
3535
}
3636
)

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77

88
python3Packages.buildPythonApplication rec {
99
pname = "stratis-cli";
10-
version = "3.7.0";
10+
version = "3.8.1";
1111
pyproject = true;
1212

1313
src = fetchFromGitHub {
1414
owner = "stratis-storage";
15-
repo = pname;
15+
repo = "stratis-cli";
1616
tag = "v${version}";
17-
hash = "sha256-F/RP/bWf2fV1IvNbrkYX3d94om1kACNe+oJI8pXM5P4=";
17+
hash = "sha256-zyby53QEC9txH/EP0plV4vUg9fRV6tZJtdQEWQ2iKCA=";
1818
};
1919

20-
nativeBuildInputs = with python3Packages; [
20+
build-system = with python3Packages; [
2121
setuptools
2222
];
2323

24-
propagatedBuildInputs = with python3Packages; [
24+
dependencies = with python3Packages; [
2525
dbus-client-gen
2626
dbus-python-client-gen
2727
justbytes
@@ -42,6 +42,8 @@ python3Packages.buildPythonApplication rec {
4242

4343
pythonImportsCheck = [ "stratis_cli" ];
4444

45+
env.STRATIS_STRICT_POOL_FEATURES = "1"; # required for unit tests
46+
4547
passthru.tests = nixosTests.stratis;
4648

4749
meta = with lib; {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929

3030
stdenv.mkDerivation rec {
3131
pname = "stratisd";
32-
version = "3.7.3";
32+
version = "3.8.1";
3333

3434
src = fetchFromGitHub {
3535
owner = "stratis-storage";
36-
repo = pname;
36+
repo = "stratisd";
3737
tag = "stratisd-v${version}";
38-
hash = "sha256-W8ssLTFU36t6iLrt9S9V8qcN7EP4IsL7VbhNPLpftio=";
38+
hash = "sha256-vYqvYC3r1TQ62YtMJYOx8bRxFJOam5ntbOS+FJZL/gQ=";
3939
};
4040

4141
cargoDeps = rustPlatform.fetchCargoVendor {
4242
inherit src;
43-
hash = "sha256-blhB+UfvG22Xe2O0csZ00/jgnVcLTUIkDJG5P22mffQ=";
43+
hash = "sha256-B3n9Ot4CFcVL/R2wHPuDIPBca/5pb2VgcuP1pxnnUrA=";
4444
};
4545

4646
postPatch = ''

0 commit comments

Comments
 (0)