diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 19e62bd4a2f7..2081ba8eacc2 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.35"; - hash = "sha256-6/KLNCdTXitavZmRzYObYWIqDb+4yG3w968fadyqg3E="; + version = "2.03.37"; + hash = "sha256-sCZWzDmi+GpwLEMtqw0DF+EhEfyp1iOhjxucP4e4ggA="; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index c357a3e7ebdc..24cd4b41192f 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -143,8 +143,6 @@ stdenv.mkDerivation rec { } )) ./fix-stdio-usage.patch - # https://gitlab.com/lvmteam/lvm2/-/merge_requests/33 - ./fix-manpage-reproducibility.patch ]; doCheck = false; # requires root diff --git a/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch b/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch deleted file mode 100644 index 1e687f3630cc..000000000000 --- a/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 950f219ed287358df8c128f7e22989177a8de47c -Author: Arnout Engelen -Date: Mon Aug 25 15:55:44 2025 +0200 - - man: simplify vmautoactivation(7) - - Previously this was hard-coded to: "Autoactivation commands use a number - of temp files in /run/lvm (with the expectation that /run is cleared - between boots.)" - - Since c1bfc8737f08bf7558b2d788e9756f895cd9eaaa it was made more generic, - but on some systems this logic leads to "Autoactivation commands use a - number of temp files in /run/lvm (with the expectation that /var/run - is cleared between boots)." which I'd say adds more confusion than it - solves. - -diff --git a/man/lvmautoactivation.7_main b/man/lvmautoactivation.7_main -index e55943b29..9d429055c 100644 ---- a/man/lvmautoactivation.7_main -+++ b/man/lvmautoactivation.7_main -@@ -175,9 +175,7 @@ is reserved for udev output.) - . - Autoactivation commands use a number of temp files in - .I #DEFAULT_RUN_DIR# --(with the expectation that --.I #DEFAULT_PID_DIR# --is cleared between boots). -+(with the expectation that it is cleared between boots). - . - .TP - .B pvs_online