From e608384d5330440876e3860e6ffc0c6808263dc5 Mon Sep 17 00:00:00 2001 From: Manuel Frischknecht Date: Fri, 19 Apr 2024 14:57:37 +0200 Subject: [PATCH] vendor-reset: unstable-2021-02-16 -> unstable-2024-04-16 The `vendor-reset` Linux kernel module stopped building as of kernel versions 6.8.1 because `strlcopy` has been removed. An upstream patch fixed this by replacing the only callsite with `strscpy` [^1]. As the patch has already been merged into `master`, I updated the nix package to the latest trunk commit and labeled the version as `unstable-2024-04-16`. Since the only patch specified in the package has already been merged in late 2022 [^2], we can remove that one as well. [^1]: https://github.com/gnif/vendor-reset/pull/79 [^2]: https://github.com/gnif/vendor-reset/pull/58 --- pkgs/os-specific/linux/vendor-reset/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index f4430f3224ae..73a76a8aded0 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -2,24 +2,15 @@ stdenv.mkDerivation rec { pname = "vendor-reset"; - version = "unstable-2021-02-16-${kernel.version}"; + version = "unstable-2024-04-16-${kernel.version}"; src = fetchFromGitHub { owner = "gnif"; repo = "vendor-reset"; - rev = "225a49a40941e350899e456366265cf82b87ad25"; - sha256 = "sha256-xa7P7+mRk4FVgi+YYCcsFLfyNqPmXvy3xhGoTDVqPxw="; + rev = "084881c6e9e11bdadaf05798e669568848e698a3"; + hash = "sha256-Klu2uysbF5tH7SqVl815DwR7W+Vx6PyVDDLwoMZiqBI="; }; - patches = [ - # Fix build with Linux 5.18. - # https://github.com/gnif/vendor-reset/pull/58 - (fetchpatch { - url = "https://github.com/gnif/vendor-reset/commit/5bbffcd6fee5348e8808bdbfcb5b21d455b02f55.patch"; - sha256 = "sha256-L1QxVpcZAVYiaMFCBfL2EJgeMyOR8sDa1UqF1QB3bns="; - }) - ]; - nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ];