stratisd: fix build due to unused imports
With `rustc` 1.75, many rust project that use `#[deny(warnings)]` stopped building due to unused imports that didn't trigger build failures before for some reason. `stratisd` now also fails to build because of a couple of those, but they have already been fixed upstream in the following two commits: -78440de6e6
-0d1c67f713
In the meantime until a new version of `stratisd` is released, this change pulls in those two changes via `fetchpatch`. Co-authored-by: Nick Cao <nickcao@nichi.co>
This commit is contained in:
parent
64cab3aa8d
commit
ebf324e464
@ -1,6 +1,7 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, cargo
|
, cargo
|
||||||
, rustc
|
, rustc
|
||||||
@ -43,6 +44,22 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
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 = ''
|
postPatch = ''
|
||||||
substituteInPlace udev/61-stratisd.rules \
|
substituteInPlace udev/61-stratisd.rules \
|
||||||
--replace stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \
|
--replace stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \
|
||||||
|
Loading…
Reference in New Issue
Block a user