colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #299254 from NickCao/stratis

Browse Source 
stratisd: 3.6.5 -> 3.6.6
This commit is contained in:
Nick Cao 2024-03-28 09:49:00 -04:00 committed by GitHub
commit e836af2f6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/tools/filesystems/stratisd/default.nix
View File

@ -27,30 +27,30 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stratisd"; pname = "stratisd";
version = "3.6.5"; version = "3.6.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stratis-storage"; owner = "stratis-storage";
repo = pname; repo = pname;
rev = "refs/tags/stratisd-v${version}"; rev = "refs/tags/stratisd-v${version}";
hash = "sha256-qgf5Q2MAY8PAYlplvTX+YjYfDFLfddpyIG4S/IIYbsU="; hash = "sha256-zksMYPvbFKKYaLqdZql56D5rG+IBDMBJTTQK1RMyj4Q=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit pname version src; inherit pname version src;
hash = "sha256-Bu87uHEcMKB+TX8gWHD1vRazOkqJSZKQcsPiaKXrGFE="; hash = "sha256-red7cjNwZrhQzfvh6Lev5CPWj8QihuVr7fIiHo9D3Jg=";
}; };
postPatch = '' postPatch = ''
substituteInPlace udev/61-stratisd.rules \ substituteInPlace udev/61-stratisd.rules \
--replace stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \ --replace-fail stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \
--replace stratis-str-cmp "$out/lib/udev/stratis-str-cmp" --replace-fail stratis-str-cmp "$out/lib/udev/stratis-str-cmp"
substituteInPlace systemd/stratis-fstab-setup \ substituteInPlace systemd/stratis-fstab-setup \
--replace stratis-min "$out/bin/stratis-min" \ --replace-fail stratis-min "$out/bin/stratis-min" \
--replace systemd-ask-password "${systemd}/bin/systemd-ask-password" \ --replace-fail systemd-ask-password "${systemd}/bin/systemd-ask-password" \
--replace sleep "${coreutils}/bin/sleep" \ --replace-fail sleep "${coreutils}/bin/sleep" \
--replace udevadm "${systemd}/bin/udevadm" --replace-fail udevadm "${systemd}/bin/udevadm"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
mkdir -p "$initrd/lib/systemd/system" mkdir -p "$initrd/lib/systemd/system"
substitute "$out/lib/dracut/modules.d/90stratis/stratisd-min.service" \ substitute "$out/lib/dracut/modules.d/90stratis/stratisd-min.service" \
"$initrd/lib/systemd/system/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" mkdir -p "$initrd/lib/udev/rules.d"
cp udev/61-stratisd.rules "$initrd/lib/udev/rules.d" cp udev/61-stratisd.rules "$initrd/lib/udev/rules.d"
rm -r "$out/lib/dracut" rm -r "$out/lib/dracut"