diff options
Diffstat (limited to 'pkgs/tools/filesystems/stratisd/default.nix')
-rw-r--r-- | pkgs/tools/filesystems/stratisd/default.nix | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 84a066e838e5..d299a1dc93ff 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , rustPlatform , cargo , rustc @@ -28,38 +27,19 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-Wu3SkuHyMCBape+pMymQntXRtdMIlF5wz75kKxaZlms="; + hash = "sha256-0zSMFjAzTtTmpSCqlIq5GXk3/AhlhtECFZXmo6xcjWA="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; - outputHashes = { - "loopdev-0.4.0" = "sha256-YS0hqxphxbbImT/mn/XBzkgabK2kbIym5VqG3XDVAx8="; - }; }; - patches = [ - # Can be removed with the next release after v. 3.6.3 - (fetchpatch { - name = "remove-unused-imports.patch"; - url = "https://github.com/stratis-storage/stratisd/commit/78440de6e6ed8eab5ddd25dbdfb7804d0698f2a2.patch"; - hash = "sha256-RW2nyAWaoIbqrgbhCApQsMXkJWtWoOWL3VO7fIImJgY="; - }) - - # Can be removed with the next release after v. 3.6.3 - (fetchpatch { - name = "flag-import-not-used-in-build-as-test-only.patch"; - url = "https://github.com/stratis-storage/stratisd/commit/0d1c67f71338d0ee6c1e6aa06f7fd6264ce9a4c5.patch"; - hash = "sha256-6Nb8izUqYUirjy0dTFhITxoM/AKoChoc0w6Qm9K6+7I="; - }) - ]; - postPatch = '' substituteInPlace udev/61-stratisd.rules \ --replace stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \ @@ -116,10 +96,10 @@ stdenv.mkDerivation rec { # remove files for supporting dracut postInstall = '' mkdir -p "$initrd/bin" - cp "dracut/90stratis/stratis-rootfs-setup" "$initrd/bin" + cp "$out/lib/dracut/modules.d/90stratis/stratis-rootfs-setup" "$initrd/bin" mkdir -p "$initrd/lib/systemd/system" - substitute "dracut/90stratis/stratisd-min.service" "$initrd/lib/systemd/system/stratisd-min.service" \ - --replace /usr "$out" \ + substitute "$out/lib/dracut/modules.d/90stratis/stratisd-min.service" \ + "$initrd/lib/systemd/system/stratisd-min.service" \ --replace mkdir "${coreutils}/bin/mkdir" mkdir -p "$initrd/lib/udev/rules.d" cp udev/61-stratisd.rules "$initrd/lib/udev/rules.d" @@ -127,7 +107,9 @@ stdenv.mkDerivation rec { rm -r "$out/lib/systemd/system-generators" ''; - passthru.tests = nixosTests.stratis; + passthru.tests = nixosTests.stratis // { + inherit (nixosTests.installer-systemd-stage-1) stratisRoot; + }; meta = with lib; { description = "Easy to use local storage management for Linux"; |