From 4865536f92b40ed1ea672e7abbfed5856a589e34 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 17 Sep 2024 03:32:58 +0200 Subject: [PATCH] pmacct: use finalAttrs.finalPackage --- pkgs/tools/networking/pmacct/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index 542339b05dbb..3cd43ec9a873 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/pkgs/tools/networking/pmacct/default.nix @@ -14,17 +14,16 @@ , withMysql ? true, libmysqlclient, zlib, numactl , gnutlsSupport ? false, gnutls , testers -, pmacct }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.7.9"; pname = "pmacct"; src = fetchFromGitHub { owner = "pmacct"; repo = "pmacct"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-3gV6GUhTQnH09NRIJQI0xBn05Bgo3AJsE2cSxNPXITo="; }; @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optional gnutlsSupport "--enable-gnutls"; passthru.tests = { - version = testers.testVersion { package = pmacct; command = "pmacct -V"; }; + version = testers.testVersion { package = finalAttrs.finalPackage; command = "pmacct -V"; }; }; meta = with lib; { @@ -70,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.unix; }; -} +})