From 01839ab67e532db7c7d5fad044d944698c297f37 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 12 Mar 2025 21:59:32 -0400 Subject: [PATCH 1/5] stratisd: 3.7.3 -> 3.8.0 Diff: https://github.com/stratis-storage/stratisd/compare/refs/tags/stratisd-v3.7.3...stratisd-v3.8.0 --- pkgs/by-name/st/stratisd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/stratisd/package.nix b/pkgs/by-name/st/stratisd/package.nix index 1b8259928646..03a8079215c5 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.0"; src = fetchFromGitHub { owner = "stratis-storage"; - repo = pname; + repo = "stratisd"; tag = "stratisd-v${version}"; - hash = "sha256-W8ssLTFU36t6iLrt9S9V8qcN7EP4IsL7VbhNPLpftio="; + hash = "sha256-58Lh5W0ZDb5ST7kFeEYnblZu1pRJyVBfCVJi9y62q3U="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-blhB+UfvG22Xe2O0csZ00/jgnVcLTUIkDJG5P22mffQ="; + hash = "sha256-LeYZyjxImbNHOT1fffBeHnhEs+ZeFnLmBv/96nqg92c="; }; postPatch = '' From bd4266a607c027fdfd520d2da06628e0ebe2d8e4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 12 Mar 2025 22:07:31 -0400 Subject: [PATCH 2/5] stratis-cli: 3.7.0 -> 3.8.0 Diff: https://github.com/stratis-storage/stratis-cli/compare/refs/tags/v3.7.0...v3.8.0 --- pkgs/by-name/st/stratis-cli/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/st/stratis-cli/package.nix b/pkgs/by-name/st/stratis-cli/package.nix index d38088428f79..9f31590abc0d 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.0"; pyproject = true; src = fetchFromGitHub { owner = "stratis-storage"; - repo = pname; + repo = "stratis-cli"; tag = "v${version}"; - hash = "sha256-F/RP/bWf2fV1IvNbrkYX3d94om1kACNe+oJI8pXM5P4="; + hash = "sha256-hbkklUX8QHGl9O+0Bcem6nbwyp6jbzFz5YtArh0W0oE="; }; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ dbus-client-gen dbus-python-client-gen justbytes From 475dd3fe95fe54aa790ebfc7c9beff49626c3dea Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 12 Mar 2025 22:32:37 -0400 Subject: [PATCH 3/5] nixos/stratis: fix test --- nixos/tests/stratis/encryption.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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") ''; } ) From 6b73c05fa43fdb03c338a86613f2f8c319a60933 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 12 May 2025 19:39:45 -0400 Subject: [PATCH 4/5] stratisd: 3.8.0 -> 3.8.1 Diff: https://github.com/stratis-storage/stratisd/compare/refs/tags/stratisd-v3.8.0...refs/tags/stratisd-v3.8.1 --- pkgs/by-name/st/stratisd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stratisd/package.nix b/pkgs/by-name/st/stratisd/package.nix index 03a8079215c5..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.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "stratis-storage"; repo = "stratisd"; tag = "stratisd-v${version}"; - hash = "sha256-58Lh5W0ZDb5ST7kFeEYnblZu1pRJyVBfCVJi9y62q3U="; + hash = "sha256-vYqvYC3r1TQ62YtMJYOx8bRxFJOam5ntbOS+FJZL/gQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-LeYZyjxImbNHOT1fffBeHnhEs+ZeFnLmBv/96nqg92c="; + hash = "sha256-B3n9Ot4CFcVL/R2wHPuDIPBca/5pb2VgcuP1pxnnUrA="; }; postPatch = '' From 227cc6ec73285aee55c41472c3158c7743923aeb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 12 May 2025 19:41:26 -0400 Subject: [PATCH 5/5] stratis-cli: 3.8.0 -> 3.8.1 Diff: https://github.com/stratis-storage/stratis-cli/compare/refs/tags/v3.8.0...refs/tags/v3.8.1 --- pkgs/by-name/st/stratis-cli/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stratis-cli/package.nix b/pkgs/by-name/st/stratis-cli/package.nix index 9f31590abc0d..d63f3e442dd0 100644 --- a/pkgs/by-name/st/stratis-cli/package.nix +++ b/pkgs/by-name/st/stratis-cli/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "stratis-cli"; - version = "3.8.0"; + version = "3.8.1"; pyproject = true; src = fetchFromGitHub { owner = "stratis-storage"; repo = "stratis-cli"; tag = "v${version}"; - hash = "sha256-hbkklUX8QHGl9O+0Bcem6nbwyp6jbzFz5YtArh0W0oE="; + hash = "sha256-zyby53QEC9txH/EP0plV4vUg9fRV6tZJtdQEWQ2iKCA="; }; build-system = with python3Packages; [ @@ -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; {