From d8ba36e42dce3efb53806b0d9cbb00ff278c1192 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 15 Mar 2025 15:07:35 +0530 Subject: [PATCH] linuxPackages.r8125: cleanup switch to finalAttrs replace -> replace-fail sha256 -> hash Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/os-specific/linux/r8125/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix index 71d34528657d..4c1bb97e719d 100644 --- a/pkgs/os-specific/linux/r8125/default.nix +++ b/pkgs/os-specific/linux/r8125/default.nix @@ -5,7 +5,7 @@ kernel, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "r8125"; version = "9.015.00"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "debian"; repo = "r8125"; - rev = "upstream/${version}"; - sha256 = "sha256-RA7rvvF2Ngeu+hSACBbKfAJgLbPqhaXG14DH2NmztTE="; + tag = "upstream/${finalAttrs.version}"; + hash = "sha256-RA7rvvF2Ngeu+hSACBbKfAJgLbPqhaXG14DH2NmztTE="; }; hardeningDisable = [ "pic" ]; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; preBuild = '' - substituteInPlace src/Makefile --replace "BASEDIR :=" "BASEDIR ?=" - substituteInPlace src/Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install" + substituteInPlace src/Makefile --replace-fail "BASEDIR :=" "BASEDIR ?=" + substituteInPlace src/Makefile --replace-fail "modules_install" "INSTALL_MOD_PATH=$out modules_install" ''; makeFlags = [ @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.peelz ]; }; -} +})