stratisd: 3.8.6 -> 3.9.3 (#566045)

nixos/modules/system/boot/stratisroot.nix

@@ -34,6 +34,7 @@ in
           thin_repair = "${pkgs."thin-provisioning-tools"}/bin/thin_repair";
           thin_metadata_size = "${pkgs."thin-provisioning-tools"}/bin/thin_metadata_size";
           stratis-min = "${pkgs.stratisd}/bin/stratis-min";
+          cryptsetup = "${pkgs.cryptsetup}/bin/cryptsetup";
         };
         services = lib.attrsets.mapAttrs' (mountPoint: fileSystem: {
           name = "stratis-setup-${fileSystem.stratis.poolUuid}";

nixos/tests/installer.nix

@@ -1861,7 +1861,7 @@ in
     createPartitions = ''
       installer.succeed(
         "sgdisk --zap-all /dev/vda",
-        "sgdisk --new=1:0:+100M --typecode=0:ef00 /dev/vda", # /boot
+        "sgdisk --new=1:0:+200M --typecode=0:ef00 /dev/vda", # /boot
         "sgdisk --new=2:0:+1G --typecode=0:8200 /dev/vda", # swap
         "sgdisk --new=3:0:+5G --typecode=0:8300 /dev/vda", # /
         "udevadm settle",

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

@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "stratis-cli";
-  version = "3.8.3";
+  version = "3.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = "stratis-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wkFInG/sbHxyi5UIjIANxsTd9BrIHuyAfYG4DvqLsmU=";
+    hash = "sha256-XrzTFkr/VHP4eJts6wu6RhKaaMaqHWVQWHesbDSjx6A=";
   };
 
   build-system = with python3Packages; [
@@ -37,13 +37,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   disabledTestPaths = [
     # tests below require dbus daemon
-    "tests/whitebox/integration"
+    "tests/integration"
   ];
 
   pythonImportsCheck = [ "stratis_cli" ];
 
-  env.STRATIS_STRICT_POOL_FEATURES = "1"; # required for unit tests
-
   passthru.tests = nixosTests.stratis;
 
   meta = {

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

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   rustPlatform,
   cargo,
   rustc,
@@ -31,28 +30,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "stratisd";
-  version = "3.8.6";
+  version = "3.9.3";
 
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = "stratisd";
     tag = "stratisd-v${finalAttrs.version}";
-    hash = "sha256-Kky/6sgvA8NDDGLQLS3sjPJWTCxkoTP/ow+netnK6tY=";
+    hash = "sha256-8PZiJgecssQYTSBnCj2mumUqdTZPouRRB0sW4pVrQAU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-zA+GEKmg5iV1PaGh0yjNb4h52PH7PwpN53xLV8P9Gac=";
+    hash = "sha256-tkHxokc289mgczrJWlKIQVdkNeqhGV2d68t9uJZG2oI=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "0001-fixes_for_rust_1_9_2";
-      url = "https://github.com/stratis-storage/stratisd/commit/d65c3b7a7f9d7a332b4c59089b8fa96ff1fefb45.patch";
-      sha256 = "sha256-cNbx9+JgQgyO+o5YX7sLDe64qNWfpDr5itux+LZSgxs=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace udev/61-stratisd.rules \
       --replace-fail stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \
@@ -98,12 +89,12 @@ stdenv.mkDerivation (finalAttrs: {
     [
       xfsprogs
       thin-provisioning-tools
+      cryptsetup
     ]
     ++ lib.optionals clevisSupport [
       clevis
       jose
       jq
-      cryptsetup
       curl
       tpm2-tools
       coreutils