From c784cdce237e7c35685a0dd0a03828fd7262573e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 8 Oct 2024 15:32:28 -0400 Subject: [PATCH 1/2] stratisd: 3.6.8 -> 3.7.1 Diff: https://github.com/stratis-storage/stratisd/compare/refs/tags/stratisd-v3.6.8...stratisd-v3.7.1 --- pkgs/tools/filesystems/stratisd/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index d6f532643d00..3ae78968bfb8 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -12,6 +12,7 @@ , cryptsetup , util-linux , lvm2 +, python3 , systemd , xfsprogs , thin-provisioning-tools @@ -27,18 +28,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.6.8"; + version = "3.7.1"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-cYd2oy9reY8eWSdO98cVcz6/Z+MS26NY4U3UNVfMdbg="; + hash = "sha256-JevVIyNNkRuG1aH9yuBKwVlOgS67jJSoJDZQvpLsy/4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-1KzOKo5Q1uBqO3aCBYUJJxla4873AzrwoFPaNpKKFJU="; + hash = "sha256-n8gF8WuHwwPxZAggkJckBxfvb0r+jJDuTcj7KXjg4/Y="; }; postPatch = '' @@ -53,6 +54,8 @@ stdenv.mkDerivation rec { --replace-fail udevadm "${systemd}/bin/udevadm" ''; + strictDeps = true; + nativeBuildInputs = [ rustPlatform.cargoSetupHook rustPlatform.bindgenHook @@ -71,6 +74,7 @@ stdenv.mkDerivation rec { util-linux systemd lvm2 + (python3.withPackages (ps: [ ps.dbus-python ])) ]; outputs = [ "out" "initrd" ]; From 216e46107b4ca6676fdb51828a3cbc30ead6947c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 8 Oct 2024 15:36:23 -0400 Subject: [PATCH 2/2] stratis-cli: 3.6.2 -> 3.7.0 Diff: https://github.com/stratis-storage/stratis-cli/compare/refs/tags/v3.6.2...v3.7.0 --- pkgs/tools/filesystems/stratis-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/tools/filesystems/stratis-cli/default.nix index 4de51f0ff8d3..799a481339d5 100644 --- a/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/pkgs/tools/filesystems/stratis-cli/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "stratis-cli"; - version = "3.6.2"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-f2Bjv7Z7+FZejS5plUGKTlGUixgF2pGN1SeszTDh4Ko="; + hash = "sha256-F/RP/bWf2fV1IvNbrkYX3d94om1kACNe+oJI8pXM5P4="; }; nativeBuildInputs = with python3Packages; [