From eba8b5d8b22a06469aecbc29d4465ced4a6f8325 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 26 Mar 2024 13:17:15 -0400 Subject: [PATCH 1/2] stratisd: 3.6.5 -> 3.6.6 Diff: https://github.com/stratis-storage/stratisd/compare/refs/tags/stratisd-v3.6.5...stratisd-v3.6.6 --- pkgs/tools/filesystems/stratisd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index ebe7c9f14ba8..7582d40b8f3f 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -27,18 +27,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.6.5"; + version = "3.6.6"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-qgf5Q2MAY8PAYlplvTX+YjYfDFLfddpyIG4S/IIYbsU="; + hash = "sha256-zksMYPvbFKKYaLqdZql56D5rG+IBDMBJTTQK1RMyj4Q="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-Bu87uHEcMKB+TX8gWHD1vRazOkqJSZKQcsPiaKXrGFE="; + hash = "sha256-red7cjNwZrhQzfvh6Lev5CPWj8QihuVr7fIiHo9D3Jg="; }; postPatch = '' From 5c773ed76decaa6b16d726c0ee8cddd1d9147bbb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 26 Mar 2024 13:21:20 -0400 Subject: [PATCH 2/2] stratisd: use --replace-fail flag on substitute{,InPlace} --- pkgs/tools/filesystems/stratisd/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 7582d40b8f3f..0f585f631878 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -43,14 +43,14 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace udev/61-stratisd.rules \ - --replace stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \ - --replace stratis-str-cmp "$out/lib/udev/stratis-str-cmp" + --replace-fail stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \ + --replace-fail stratis-str-cmp "$out/lib/udev/stratis-str-cmp" substituteInPlace systemd/stratis-fstab-setup \ - --replace stratis-min "$out/bin/stratis-min" \ - --replace systemd-ask-password "${systemd}/bin/systemd-ask-password" \ - --replace sleep "${coreutils}/bin/sleep" \ - --replace udevadm "${systemd}/bin/udevadm" + --replace-fail stratis-min "$out/bin/stratis-min" \ + --replace-fail systemd-ask-password "${systemd}/bin/systemd-ask-password" \ + --replace-fail sleep "${coreutils}/bin/sleep" \ + --replace-fail udevadm "${systemd}/bin/udevadm" ''; nativeBuildInputs = [ @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { mkdir -p "$initrd/lib/systemd/system" substitute "$out/lib/dracut/modules.d/90stratis/stratisd-min.service" \ "$initrd/lib/systemd/system/stratisd-min.service" \ - --replace mkdir "${coreutils}/bin/mkdir" + --replace-fail mkdir "${coreutils}/bin/mkdir" mkdir -p "$initrd/lib/udev/rules.d" cp udev/61-stratisd.rules "$initrd/lib/udev/rules.d" rm -r "$out/lib/dracut"