Merge pull request #263240 from NickCao/stratis

stratisd: 3.5.9 -> 3.6.0, stratis-cli: 3.5.3 -> 3.6.0

authored by Nick Cao and committed by GitHub f5680882 eff98026

+148 -178
+2 -2
nixos/tests/stratis/encryption.nix
··· 26 # test rebinding encrypted pool 27 machine.succeed("stratis pool rebind keyring testpool testkey2") 28 # test restarting encrypted pool 29 - machine.succeed("stratis pool stop testpool") 30 - machine.succeed("stratis pool start --name testpool --unlock-method keyring") 31 ''; 32 })
··· 26 # test rebinding encrypted pool 27 machine.succeed("stratis pool rebind keyring testpool testkey2") 28 # test restarting encrypted pool 29 + machine.succeed("stratis pool stop --name testpool") 30 + machine.succeed("stratis pool start --name testpool --unlock-method keyring") 31 ''; 32 })
+6 -6
pkgs/tools/filesystems/stratis-cli/default.nix
··· 6 7 python3Packages.buildPythonApplication rec { 8 pname = "stratis-cli"; 9 - version = "3.5.3"; 10 format = "pyproject"; 11 12 src = fetchFromGitHub { 13 owner = "stratis-storage"; 14 repo = pname; 15 rev = "v${version}"; 16 - hash = "sha256-YoPi2AtP6qZPMrlxbDAD0sDEKrSBHLLRcHbNLxlXXCk="; 17 }; 18 19 propagatedBuildInputs = with python3Packages; [ 20 - psutil 21 - python-dateutil 22 - wcwidth 23 - justbytes 24 dbus-client-gen 25 dbus-python-client-gen 26 packaging 27 ]; 28 29 nativeCheckInputs = with python3Packages; [
··· 6 7 python3Packages.buildPythonApplication rec { 8 pname = "stratis-cli"; 9 + version = "3.6.0"; 10 format = "pyproject"; 11 12 src = fetchFromGitHub { 13 owner = "stratis-storage"; 14 repo = pname; 15 rev = "v${version}"; 16 + hash = "sha256-mLmjMofdr0U+Bfnkde7lJqPXkd1ICPYdlcsOm2nOcQA="; 17 }; 18 19 propagatedBuildInputs = with python3Packages; [ 20 dbus-client-gen 21 dbus-python-client-gen 22 + justbytes 23 packaging 24 + psutil 25 + python-dateutil 26 + wcwidth 27 ]; 28 29 nativeCheckInputs = with python3Packages; [
+136 -166
pkgs/tools/filesystems/stratisd/Cargo.lock
··· 3 version = 3 4 5 [[package]] 6 - name = "addr2line" 7 - version = "0.20.0" 8 - source = "registry+https://github.com/rust-lang/crates.io-index" 9 - checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" 10 - dependencies = [ 11 - "gimli", 12 - ] 13 - 14 - [[package]] 15 - name = "adler" 16 - version = "1.0.2" 17 - source = "registry+https://github.com/rust-lang/crates.io-index" 18 - checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" 19 - 20 - [[package]] 21 name = "aho-corasick" 22 version = "1.0.2" 23 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 92 93 [[package]] 94 name = "assert_cmd" 95 - version = "2.0.12" 96 source = "registry+https://github.com/rust-lang/crates.io-index" 97 - checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" 98 dependencies = [ 99 "anstyle", 100 "bstr", ··· 113 114 [[package]] 115 name = "async-trait" 116 - version = "0.1.72" 117 source = "registry+https://github.com/rust-lang/crates.io-index" 118 - checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" 119 dependencies = [ 120 "proc-macro2", 121 "quote", ··· 127 version = "1.1.0" 128 source = "registry+https://github.com/rust-lang/crates.io-index" 129 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" 130 - 131 - [[package]] 132 - name = "backtrace" 133 - version = "0.3.68" 134 - source = "registry+https://github.com/rust-lang/crates.io-index" 135 - checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" 136 - dependencies = [ 137 - "addr2line", 138 - "cc", 139 - "cfg-if 1.0.0", 140 - "libc", 141 - "miniz_oxide", 142 - "object", 143 - "rustc-demangle", 144 - ] 145 146 [[package]] 147 name = "bindgen" 148 - version = "0.63.0" 149 source = "registry+https://github.com/rust-lang/crates.io-index" 150 - checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" 151 dependencies = [ 152 - "bitflags 1.3.2", 153 "cexpr", 154 "clang-sys", 155 "lazy_static", ··· 160 "regex", 161 "rustc-hash", 162 "shlex", 163 - "syn 1.0.109", 164 ] 165 166 [[package]] ··· 186 187 [[package]] 188 name = "bitflags" 189 - version = "2.3.3" 190 source = "registry+https://github.com/rust-lang/crates.io-index" 191 - checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" 192 193 [[package]] 194 name = "block-buffer" ··· 201 202 [[package]] 203 name = "bstr" 204 - version = "1.6.0" 205 source = "registry+https://github.com/rust-lang/crates.io-index" 206 - checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" 207 dependencies = [ 208 "memchr", 209 "regex-automata", 210 "serde", 211 ] ··· 274 275 [[package]] 276 name = "clap" 277 - version = "4.3.19" 278 source = "registry+https://github.com/rust-lang/crates.io-index" 279 - checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" 280 dependencies = [ 281 "clap_builder", 282 ] 283 284 [[package]] 285 name = "clap_builder" 286 - version = "4.3.19" 287 source = "registry+https://github.com/rust-lang/crates.io-index" 288 - checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" 289 dependencies = [ 290 "anstream", 291 "anstyle", 292 "clap_lex", 293 "strsim", 294 ] ··· 313 314 [[package]] 315 name = "cpufeatures" 316 - version = "0.2.9" 317 source = "registry+https://github.com/rust-lang/crates.io-index" 318 - checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" 319 dependencies = [ 320 "libc", 321 ] ··· 373 374 [[package]] 375 name = "devicemapper" 376 - version = "0.33.5" 377 source = "registry+https://github.com/rust-lang/crates.io-index" 378 - checksum = "75a9fd602a98d192f7662a1f4c4cf6920a1b454c3a9e724f6490cf8e30910114" 379 dependencies = [ 380 - "bitflags 1.3.2", 381 "devicemapper-sys", 382 "env_logger", 383 "lazy_static", ··· 391 392 [[package]] 393 name = "devicemapper-sys" 394 - version = "0.1.5" 395 source = "registry+https://github.com/rust-lang/crates.io-index" 396 - checksum = "f0b0f9d16560f830ae6e90b769017333c4561d2c84f39e7aa7d935d2e7bcbc4c" 397 dependencies = [ 398 "bindgen", 399 - "nix 0.26.2", 400 ] 401 402 [[package]] ··· 423 424 [[package]] 425 name = "either" 426 - version = "1.9.0" 427 source = "registry+https://github.com/rust-lang/crates.io-index" 428 - checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" 429 430 [[package]] 431 name = "env_logger" ··· 474 475 [[package]] 476 name = "fastrand" 477 - version = "2.0.0" 478 source = "registry+https://github.com/rust-lang/crates.io-index" 479 - checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" 480 481 [[package]] 482 name = "float-cmp" ··· 604 ] 605 606 [[package]] 607 - name = "gimli" 608 - version = "0.27.3" 609 - source = "registry+https://github.com/rust-lang/crates.io-index" 610 - checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" 611 - 612 - [[package]] 613 name = "glob" 614 version = "0.3.1" 615 source = "registry+https://github.com/rust-lang/crates.io-index" 616 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" 617 618 [[package]] 619 name = "hermit-abi" ··· 651 ] 652 653 [[package]] 654 name = "iocuddle" 655 version = "0.1.1" 656 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 658 659 [[package]] 660 name = "is-terminal" 661 - version = "0.4.9" 662 source = "registry+https://github.com/rust-lang/crates.io-index" 663 - checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" 664 dependencies = [ 665 - "hermit-abi", 666 "rustix", 667 "windows-sys", 668 ] ··· 687 688 [[package]] 689 name = "itoa" 690 - version = "1.0.9" 691 source = "registry+https://github.com/rust-lang/crates.io-index" 692 - checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" 693 694 [[package]] 695 name = "js-sys" ··· 714 715 [[package]] 716 name = "libblkid-rs" 717 - version = "0.3.0" 718 source = "registry+https://github.com/rust-lang/crates.io-index" 719 - checksum = "de9a402d7e440c9f84431b566cbc523140e9354610a4dca35aa7b927400cb040" 720 dependencies = [ 721 "either", 722 "libblkid-rs-sys", ··· 726 727 [[package]] 728 name = "libblkid-rs-sys" 729 - version = "0.1.5" 730 source = "registry+https://github.com/rust-lang/crates.io-index" 731 - checksum = "52ee2322d6a28f5672b3d8640fb672c9dbe89e6f1135eb0721eb6ba4e7315ac3" 732 dependencies = [ 733 "bindgen", 734 "cc", ··· 736 737 [[package]] 738 name = "libc" 739 - version = "0.2.147" 740 source = "registry+https://github.com/rust-lang/crates.io-index" 741 - checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" 742 743 [[package]] 744 name = "libcryptsetup-rs" 745 - version = "0.8.0" 746 source = "registry+https://github.com/rust-lang/crates.io-index" 747 - checksum = "54de25d80cf59c099a01fc9939251bbf8021c131adf97beb7d57c094b16ed474" 748 dependencies = [ 749 - "bitflags 1.3.2", 750 "either", 751 "lazy_static", 752 "libc", 753 "libcryptsetup-rs-sys", 754 "pkg-config", 755 "semver", 756 "serde_json", ··· 759 760 [[package]] 761 name = "libcryptsetup-rs-sys" 762 - version = "0.2.4" 763 source = "registry+https://github.com/rust-lang/crates.io-index" 764 - checksum = "d7c355c283a470a1a09924182b3606999786979697753df3c2206948dcd8f4eb" 765 dependencies = [ 766 "bindgen", 767 "cc", ··· 827 828 [[package]] 829 name = "linux-raw-sys" 830 - version = "0.4.3" 831 source = "registry+https://github.com/rust-lang/crates.io-index" 832 - checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" 833 834 [[package]] 835 name = "log" ··· 840 [[package]] 841 name = "loopdev" 842 version = "0.4.0" 843 - source = "git+https://github.com/mulkieran/loopdev?branch=bump-bindgen-reduce-version#f780d0e873960e0eeb997e2bda106d1e30c3afd0" 844 dependencies = [ 845 "bindgen", 846 "errno 0.2.8", ··· 869 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" 870 871 [[package]] 872 - name = "miniz_oxide" 873 - version = "0.7.1" 874 - source = "registry+https://github.com/rust-lang/crates.io-index" 875 - checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" 876 - dependencies = [ 877 - "adler", 878 - ] 879 - 880 - [[package]] 881 name = "mio" 882 version = "0.8.8" 883 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 933 934 [[package]] 935 name = "num-traits" 936 - version = "0.2.16" 937 source = "registry+https://github.com/rust-lang/crates.io-index" 938 - checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" 939 dependencies = [ 940 "autocfg", 941 "libm", ··· 943 944 [[package]] 945 name = "num_cpus" 946 - version = "1.16.0" 947 source = "registry+https://github.com/rust-lang/crates.io-index" 948 - checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" 949 dependencies = [ 950 - "hermit-abi", 951 "libc", 952 ] 953 954 [[package]] 955 - name = "object" 956 - version = "0.31.1" 957 - source = "registry+https://github.com/rust-lang/crates.io-index" 958 - checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" 959 - dependencies = [ 960 - "memchr", 961 - ] 962 - 963 - [[package]] 964 name = "once_cell" 965 version = "1.18.0" 966 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 974 975 [[package]] 976 name = "pin-project-lite" 977 - version = "0.2.10" 978 source = "registry+https://github.com/rust-lang/crates.io-index" 979 - checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" 980 981 [[package]] 982 name = "pin-utils" ··· 1070 1071 [[package]] 1072 name = "quote" 1073 - version = "1.0.32" 1074 source = "registry+https://github.com/rust-lang/crates.io-index" 1075 - checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" 1076 dependencies = [ 1077 "proc-macro2", 1078 ] ··· 1127 1128 [[package]] 1129 name = "regex" 1130 - version = "1.9.1" 1131 source = "registry+https://github.com/rust-lang/crates.io-index" 1132 - checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" 1133 dependencies = [ 1134 "aho-corasick", 1135 "memchr", 1136 - "regex-automata", 1137 - "regex-syntax 0.7.4", 1138 ] 1139 1140 [[package]] 1141 name = "regex-automata" 1142 - version = "0.3.3" 1143 source = "registry+https://github.com/rust-lang/crates.io-index" 1144 - checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" 1145 - dependencies = [ 1146 - "aho-corasick", 1147 - "memchr", 1148 - "regex-syntax 0.7.4", 1149 - ] 1150 1151 [[package]] 1152 name = "regex-syntax" ··· 1156 1157 [[package]] 1158 name = "regex-syntax" 1159 - version = "0.7.4" 1160 source = "registry+https://github.com/rust-lang/crates.io-index" 1161 - checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" 1162 1163 [[package]] 1164 name = "retry" 1165 version = "1.3.1" 1166 source = "registry+https://github.com/rust-lang/crates.io-index" 1167 checksum = "ac95c60a949a63fd2822f4964939662d8f2c16c4fa0624fd954bc6e703b9a3f6" 1168 - dependencies = [ 1169 - "rand", 1170 - ] 1171 - 1172 - [[package]] 1173 - name = "rpassword" 1174 - version = "5.0.1" 1175 - source = "registry+https://github.com/rust-lang/crates.io-index" 1176 - checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" 1177 - dependencies = [ 1178 - "libc", 1179 - "winapi", 1180 - ] 1181 - 1182 - [[package]] 1183 - name = "rustc-demangle" 1184 - version = "0.1.23" 1185 - source = "registry+https://github.com/rust-lang/crates.io-index" 1186 - checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" 1187 1188 [[package]] 1189 name = "rustc-hash" ··· 1193 1194 [[package]] 1195 name = "rustix" 1196 - version = "0.38.4" 1197 source = "registry+https://github.com/rust-lang/crates.io-index" 1198 - checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" 1199 dependencies = [ 1200 - "bitflags 2.3.3", 1201 "errno 0.3.1", 1202 "libc", 1203 "linux-raw-sys", 1204 "windows-sys", ··· 1218 1219 [[package]] 1220 name = "ryu" 1221 - version = "1.0.15" 1222 source = "registry+https://github.com/rust-lang/crates.io-index" 1223 - checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" 1224 1225 [[package]] 1226 name = "semver" 1227 - version = "1.0.18" 1228 source = "registry+https://github.com/rust-lang/crates.io-index" 1229 - checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" 1230 1231 [[package]] 1232 name = "serde" 1233 - version = "1.0.175" 1234 source = "registry+https://github.com/rust-lang/crates.io-index" 1235 - checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" 1236 1237 [[package]] 1238 name = "serde_derive" ··· 1247 1248 [[package]] 1249 name = "serde_json" 1250 - version = "1.0.103" 1251 source = "registry+https://github.com/rust-lang/crates.io-index" 1252 - checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" 1253 dependencies = [ 1254 "itoa", 1255 "ryu", ··· 1309 1310 [[package]] 1311 name = "stratisd" 1312 - version = "3.5.9" 1313 dependencies = [ 1314 "assert_cmd", 1315 "assert_matches", ··· 1332 "libblkid-rs", 1333 "libc", 1334 "libcryptsetup-rs", 1335 "libmount", 1336 "libudev", 1337 "log", ··· 1344 "rand", 1345 "regex", 1346 "retry", 1347 - "rpassword", 1348 "serde", 1349 "serde_derive", 1350 "serde_json", 1351 "sha2", 1352 "stratisd_proc_macros", 1353 "tempfile", 1354 "tokio", 1355 "uuid", 1356 ] ··· 1394 1395 [[package]] 1396 name = "tempfile" 1397 - version = "3.7.0" 1398 source = "registry+https://github.com/rust-lang/crates.io-index" 1399 - checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" 1400 dependencies = [ 1401 "cfg-if 1.0.0", 1402 "fastrand", 1403 "redox_syscall", ··· 1415 ] 1416 1417 [[package]] 1418 name = "termtree" 1419 version = "0.4.1" 1420 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1422 1423 [[package]] 1424 name = "tokio" 1425 - version = "1.29.1" 1426 source = "registry+https://github.com/rust-lang/crates.io-index" 1427 - checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" 1428 dependencies = [ 1429 "autocfg", 1430 - "backtrace", 1431 "libc", 1432 "mio", 1433 "num_cpus", ··· 1463 1464 [[package]] 1465 name = "unicode-ident" 1466 - version = "1.0.11" 1467 source = "registry+https://github.com/rust-lang/crates.io-index" 1468 - checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" 1469 1470 [[package]] 1471 name = "utf8parse" ··· 1475 1476 [[package]] 1477 name = "uuid" 1478 - version = "1.4.1" 1479 source = "registry+https://github.com/rust-lang/crates.io-index" 1480 - checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" 1481 dependencies = [ 1482 "getrandom", 1483 "serde", ··· 1615 1616 [[package]] 1617 name = "windows-targets" 1618 - version = "0.48.1" 1619 source = "registry+https://github.com/rust-lang/crates.io-index" 1620 - checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" 1621 dependencies = [ 1622 "windows_aarch64_gnullvm", 1623 "windows_aarch64_msvc",
··· 3 version = 3 4 5 [[package]] 6 name = "aho-corasick" 7 version = "1.0.2" 8 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 77 78 [[package]] 79 name = "assert_cmd" 80 + version = "2.0.11" 81 source = "registry+https://github.com/rust-lang/crates.io-index" 82 + checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" 83 dependencies = [ 84 "anstyle", 85 "bstr", ··· 98 99 [[package]] 100 name = "async-trait" 101 + version = "0.1.68" 102 source = "registry+https://github.com/rust-lang/crates.io-index" 103 + checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" 104 dependencies = [ 105 "proc-macro2", 106 "quote", ··· 112 version = "1.1.0" 113 source = "registry+https://github.com/rust-lang/crates.io-index" 114 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" 115 116 [[package]] 117 name = "bindgen" 118 + version = "0.68.1" 119 source = "registry+https://github.com/rust-lang/crates.io-index" 120 + checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" 121 dependencies = [ 122 + "bitflags 2.4.0", 123 "cexpr", 124 "clang-sys", 125 "lazy_static", ··· 130 "regex", 131 "rustc-hash", 132 "shlex", 133 + "syn 2.0.29", 134 ] 135 136 [[package]] ··· 156 157 [[package]] 158 name = "bitflags" 159 + version = "2.4.0" 160 source = "registry+https://github.com/rust-lang/crates.io-index" 161 + checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" 162 163 [[package]] 164 name = "block-buffer" ··· 171 172 [[package]] 173 name = "bstr" 174 + version = "1.5.0" 175 source = "registry+https://github.com/rust-lang/crates.io-index" 176 + checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" 177 dependencies = [ 178 "memchr", 179 + "once_cell", 180 "regex-automata", 181 "serde", 182 ] ··· 245 246 [[package]] 247 name = "clap" 248 + version = "4.3.5" 249 source = "registry+https://github.com/rust-lang/crates.io-index" 250 + checksum = "2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc" 251 dependencies = [ 252 "clap_builder", 253 ] 254 255 [[package]] 256 name = "clap_builder" 257 + version = "4.3.5" 258 source = "registry+https://github.com/rust-lang/crates.io-index" 259 + checksum = "2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae" 260 dependencies = [ 261 "anstream", 262 "anstyle", 263 + "bitflags 1.3.2", 264 "clap_lex", 265 "strsim", 266 ] ··· 285 286 [[package]] 287 name = "cpufeatures" 288 + version = "0.2.8" 289 source = "registry+https://github.com/rust-lang/crates.io-index" 290 + checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" 291 dependencies = [ 292 "libc", 293 ] ··· 345 346 [[package]] 347 name = "devicemapper" 348 + version = "0.34.0" 349 source = "registry+https://github.com/rust-lang/crates.io-index" 350 + checksum = "9ff98688149bf6128f259f0009f98eb8ad82584aa0aae143081fdfde513d3d13" 351 dependencies = [ 352 + "bitflags 2.4.0", 353 "devicemapper-sys", 354 "env_logger", 355 "lazy_static", ··· 363 364 [[package]] 365 name = "devicemapper-sys" 366 + version = "0.2.0" 367 source = "registry+https://github.com/rust-lang/crates.io-index" 368 + checksum = "734fba4d2e6b551396439ea7dd4f56980b11bb096bbf505d4a259943b228367b" 369 dependencies = [ 370 "bindgen", 371 ] 372 373 [[package]] ··· 394 395 [[package]] 396 name = "either" 397 + version = "1.8.1" 398 source = "registry+https://github.com/rust-lang/crates.io-index" 399 + checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" 400 401 [[package]] 402 name = "env_logger" ··· 445 446 [[package]] 447 name = "fastrand" 448 + version = "1.9.0" 449 source = "registry+https://github.com/rust-lang/crates.io-index" 450 + checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" 451 + dependencies = [ 452 + "instant", 453 + ] 454 455 [[package]] 456 name = "float-cmp" ··· 578 ] 579 580 [[package]] 581 name = "glob" 582 version = "0.3.1" 583 source = "registry+https://github.com/rust-lang/crates.io-index" 584 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" 585 + 586 + [[package]] 587 + name = "hermit-abi" 588 + version = "0.2.6" 589 + source = "registry+https://github.com/rust-lang/crates.io-index" 590 + checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" 591 + dependencies = [ 592 + "libc", 593 + ] 594 595 [[package]] 596 name = "hermit-abi" ··· 628 ] 629 630 [[package]] 631 + name = "instant" 632 + version = "0.1.12" 633 + source = "registry+https://github.com/rust-lang/crates.io-index" 634 + checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" 635 + dependencies = [ 636 + "cfg-if 1.0.0", 637 + ] 638 + 639 + [[package]] 640 + name = "io-lifetimes" 641 + version = "1.0.11" 642 + source = "registry+https://github.com/rust-lang/crates.io-index" 643 + checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" 644 + dependencies = [ 645 + "hermit-abi 0.3.2", 646 + "libc", 647 + "windows-sys", 648 + ] 649 + 650 + [[package]] 651 name = "iocuddle" 652 version = "0.1.1" 653 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 655 656 [[package]] 657 name = "is-terminal" 658 + version = "0.4.7" 659 source = "registry+https://github.com/rust-lang/crates.io-index" 660 + checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" 661 dependencies = [ 662 + "hermit-abi 0.3.2", 663 + "io-lifetimes", 664 "rustix", 665 "windows-sys", 666 ] ··· 685 686 [[package]] 687 name = "itoa" 688 + version = "1.0.6" 689 source = "registry+https://github.com/rust-lang/crates.io-index" 690 + checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" 691 692 [[package]] 693 name = "js-sys" ··· 712 713 [[package]] 714 name = "libblkid-rs" 715 + version = "0.3.1" 716 source = "registry+https://github.com/rust-lang/crates.io-index" 717 + checksum = "0b43fd7c0de11a5209aff91fb625c118fc15173ae3dd0ac11e8f61a1b4d1a863" 718 dependencies = [ 719 "either", 720 "libblkid-rs-sys", ··· 724 725 [[package]] 726 name = "libblkid-rs-sys" 727 + version = "0.2.0" 728 source = "registry+https://github.com/rust-lang/crates.io-index" 729 + checksum = "163068067b2faf263fb2fc3daff137b45608ee185044ca849dc41438aa38e23a" 730 dependencies = [ 731 "bindgen", 732 "cc", ··· 734 735 [[package]] 736 name = "libc" 737 + version = "0.2.149" 738 source = "registry+https://github.com/rust-lang/crates.io-index" 739 + checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" 740 741 [[package]] 742 name = "libcryptsetup-rs" 743 + version = "0.9.1" 744 source = "registry+https://github.com/rust-lang/crates.io-index" 745 + checksum = "73d2aa26d63e5289d6fac1e7e0be2e248ded9b5dfb3e2c345820d060c537d4b6" 746 dependencies = [ 747 + "bitflags 2.4.0", 748 "either", 749 "lazy_static", 750 "libc", 751 "libcryptsetup-rs-sys", 752 + "log", 753 "pkg-config", 754 "semver", 755 "serde_json", ··· 758 759 [[package]] 760 name = "libcryptsetup-rs-sys" 761 + version = "0.3.0" 762 source = "registry+https://github.com/rust-lang/crates.io-index" 763 + checksum = "20fc299fd05078d353a895d940fc463d1008d94258fc8096c095467549324707" 764 dependencies = [ 765 "bindgen", 766 "cc", ··· 826 827 [[package]] 828 name = "linux-raw-sys" 829 + version = "0.3.8" 830 source = "registry+https://github.com/rust-lang/crates.io-index" 831 + checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" 832 833 [[package]] 834 name = "log" ··· 839 [[package]] 840 name = "loopdev" 841 version = "0.4.0" 842 + source = "git+https://github.com/mulkieran/loopdev?branch=bump-bindgen-reduce-version-0.68.1#63e6105d5599d9df00041de873d7fc91f53b9f20" 843 dependencies = [ 844 "bindgen", 845 "errno 0.2.8", ··· 868 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" 869 870 [[package]] 871 name = "mio" 872 version = "0.8.8" 873 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 923 924 [[package]] 925 name = "num-traits" 926 + version = "0.2.15" 927 source = "registry+https://github.com/rust-lang/crates.io-index" 928 + checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" 929 dependencies = [ 930 "autocfg", 931 "libm", ··· 933 934 [[package]] 935 name = "num_cpus" 936 + version = "1.15.0" 937 source = "registry+https://github.com/rust-lang/crates.io-index" 938 + checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" 939 dependencies = [ 940 + "hermit-abi 0.2.6", 941 "libc", 942 ] 943 944 [[package]] 945 name = "once_cell" 946 version = "1.18.0" 947 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 955 956 [[package]] 957 name = "pin-project-lite" 958 + version = "0.2.9" 959 source = "registry+https://github.com/rust-lang/crates.io-index" 960 + checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" 961 962 [[package]] 963 name = "pin-utils" ··· 1051 1052 [[package]] 1053 name = "quote" 1054 + version = "1.0.28" 1055 source = "registry+https://github.com/rust-lang/crates.io-index" 1056 + checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" 1057 dependencies = [ 1058 "proc-macro2", 1059 ] ··· 1108 1109 [[package]] 1110 name = "regex" 1111 + version = "1.8.4" 1112 source = "registry+https://github.com/rust-lang/crates.io-index" 1113 + checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" 1114 dependencies = [ 1115 "aho-corasick", 1116 "memchr", 1117 + "regex-syntax 0.7.2", 1118 ] 1119 1120 [[package]] 1121 name = "regex-automata" 1122 + version = "0.1.10" 1123 source = "registry+https://github.com/rust-lang/crates.io-index" 1124 + checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" 1125 1126 [[package]] 1127 name = "regex-syntax" ··· 1131 1132 [[package]] 1133 name = "regex-syntax" 1134 + version = "0.7.2" 1135 source = "registry+https://github.com/rust-lang/crates.io-index" 1136 + checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" 1137 1138 [[package]] 1139 name = "retry" 1140 version = "1.3.1" 1141 source = "registry+https://github.com/rust-lang/crates.io-index" 1142 checksum = "ac95c60a949a63fd2822f4964939662d8f2c16c4fa0624fd954bc6e703b9a3f6" 1143 1144 [[package]] 1145 name = "rustc-hash" ··· 1149 1150 [[package]] 1151 name = "rustix" 1152 + version = "0.37.20" 1153 source = "registry+https://github.com/rust-lang/crates.io-index" 1154 + checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" 1155 dependencies = [ 1156 + "bitflags 1.3.2", 1157 "errno 0.3.1", 1158 + "io-lifetimes", 1159 "libc", 1160 "linux-raw-sys", 1161 "windows-sys", ··· 1175 1176 [[package]] 1177 name = "ryu" 1178 + version = "1.0.13" 1179 source = "registry+https://github.com/rust-lang/crates.io-index" 1180 + checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" 1181 1182 [[package]] 1183 name = "semver" 1184 + version = "1.0.17" 1185 source = "registry+https://github.com/rust-lang/crates.io-index" 1186 + checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" 1187 1188 [[package]] 1189 name = "serde" 1190 + version = "1.0.188" 1191 source = "registry+https://github.com/rust-lang/crates.io-index" 1192 + checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" 1193 + dependencies = [ 1194 + "serde_derive", 1195 + ] 1196 1197 [[package]] 1198 name = "serde_derive" ··· 1207 1208 [[package]] 1209 name = "serde_json" 1210 + version = "1.0.97" 1211 source = "registry+https://github.com/rust-lang/crates.io-index" 1212 + checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" 1213 dependencies = [ 1214 "itoa", 1215 "ryu", ··· 1269 1270 [[package]] 1271 name = "stratisd" 1272 + version = "3.6.0" 1273 dependencies = [ 1274 "assert_cmd", 1275 "assert_matches", ··· 1292 "libblkid-rs", 1293 "libc", 1294 "libcryptsetup-rs", 1295 + "libcryptsetup-rs-sys", 1296 "libmount", 1297 "libudev", 1298 "log", ··· 1305 "rand", 1306 "regex", 1307 "retry", 1308 "serde", 1309 "serde_derive", 1310 "serde_json", 1311 "sha2", 1312 "stratisd_proc_macros", 1313 "tempfile", 1314 + "termios", 1315 "tokio", 1316 "uuid", 1317 ] ··· 1355 1356 [[package]] 1357 name = "tempfile" 1358 + version = "3.6.0" 1359 source = "registry+https://github.com/rust-lang/crates.io-index" 1360 + checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" 1361 dependencies = [ 1362 + "autocfg", 1363 "cfg-if 1.0.0", 1364 "fastrand", 1365 "redox_syscall", ··· 1377 ] 1378 1379 [[package]] 1380 + name = "termios" 1381 + version = "0.3.3" 1382 + source = "registry+https://github.com/rust-lang/crates.io-index" 1383 + checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" 1384 + dependencies = [ 1385 + "libc", 1386 + ] 1387 + 1388 + [[package]] 1389 name = "termtree" 1390 version = "0.4.1" 1391 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1393 1394 [[package]] 1395 name = "tokio" 1396 + version = "1.28.2" 1397 source = "registry+https://github.com/rust-lang/crates.io-index" 1398 + checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" 1399 dependencies = [ 1400 "autocfg", 1401 "libc", 1402 "mio", 1403 "num_cpus", ··· 1433 1434 [[package]] 1435 name = "unicode-ident" 1436 + version = "1.0.9" 1437 source = "registry+https://github.com/rust-lang/crates.io-index" 1438 + checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" 1439 1440 [[package]] 1441 name = "utf8parse" ··· 1445 1446 [[package]] 1447 name = "uuid" 1448 + version = "1.3.4" 1449 source = "registry+https://github.com/rust-lang/crates.io-index" 1450 + checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" 1451 dependencies = [ 1452 "getrandom", 1453 "serde", ··· 1585 1586 [[package]] 1587 name = "windows-targets" 1588 + version = "0.48.0" 1589 source = "registry+https://github.com/rust-lang/crates.io-index" 1590 + checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" 1591 dependencies = [ 1592 "windows_aarch64_gnullvm", 1593 "windows_aarch64_msvc",
+4 -4
pkgs/tools/filesystems/stratisd/default.nix
··· 28 29 stdenv.mkDerivation rec { 30 pname = "stratisd"; 31 - version = "3.5.9"; 32 33 src = fetchFromGitHub { 34 owner = "stratis-storage"; 35 repo = pname; 36 rev = "refs/tags/stratisd-v${version}"; 37 - hash = "sha256-E4bBrbkqEh2twolPIHpHxphMG3bnDj0tjEBUWhrwL+M="; 38 }; 39 40 cargoDeps = rustPlatform.importCargoLock { 41 lockFile = ./Cargo.lock; 42 outputHashes = { 43 - "loopdev-0.4.0" = "sha256-nV52zjsg5u6++J8CdN2phii8AwjHg1uap2lt+U8obDQ="; 44 }; 45 }; 46 ··· 78 79 outputs = [ "out" "initrd" ]; 80 81 - EXECUTABLES_PATHS = lib.makeBinPath ([ 82 xfsprogs 83 thin-provisioning-tools 84 ] ++ lib.optionals clevisSupport [
··· 28 29 stdenv.mkDerivation rec { 30 pname = "stratisd"; 31 + version = "3.6.0"; 32 33 src = fetchFromGitHub { 34 owner = "stratis-storage"; 35 repo = pname; 36 rev = "refs/tags/stratisd-v${version}"; 37 + hash = "sha256-IDCAhAioFFN4FqgdB6Bp38RG1G3n3NWQTIxK4/1TTFs="; 38 }; 39 40 cargoDeps = rustPlatform.importCargoLock { 41 lockFile = ./Cargo.lock; 42 outputHashes = { 43 + "loopdev-0.4.0" = "sha256-YS0hqxphxbbImT/mn/XBzkgabK2kbIym5VqG3XDVAx8="; 44 }; 45 }; 46 ··· 78 79 outputs = [ "out" "initrd" ]; 80 81 + env.EXECUTABLES_PATHS = lib.makeBinPath ([ 82 xfsprogs 83 thin-provisioning-tools 84 ] ++ lib.optionals clevisSupport [