From 3bc7ad5378e6aaf050d34a8eb54d8964e4165fc3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 10 Aug 2021 08:27:52 +0000 Subject: [PATCH] lvm2: remove probably-unnecessary Musl patch e606e4d6a92 ("lvm2: musl patches from alpine") added all these patches from Alpine to fix Musl builds, but one doesn't actually seem related to Musl. The Alpine issue[1] that led to its introduction links to a Gentoo issue[2] about the same thing on Glibc. We shouldn't be applying a fix for a non-libc-specific bug only to Musl builds, and if this was going to be an issue for us we'd expect to have seen it on Glibc by now. It's more likely that it's been fixed in the meantime. [1]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/3107 [2]: https://bugs.gentoo.org/335492 --- pkgs/os-specific/linux/lvm2/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 2e52e49639e2..4c07c0f74776 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -79,11 +79,6 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; }) - (fetchpatch { - name = "mlockall-default-config.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; - sha256 = "1ivbj3sphgf8n1ykfiv5rbw7s8dgnj5jcr9jl2v8cwf28lkacw5l"; - }) ]; doCheck = false; # requires root