From 9471e692403aa4a27baf815f5f97e8564ffb85b3 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li <44064051+ShamrockLee@users.noreply.github.com> Date: Wed, 8 Mar 2023 22:30:09 +0000 Subject: [PATCH] xrootd: use fixed-point style mkDerivation Make passthru.tests follow finalPackage --- pkgs/tools/networking/xrootd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 69313eabb8bf..8f16a14e501e 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -22,14 +22,14 @@ , externalEtc ? "/etc" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xrootd"; version = "5.5.2"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-2zVCOcjL8TUbo38Dx7W8431ziouzuAdCfogsIMSOOmQ="; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "man" ]; passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { - test-runner = callPackage ./test-runner.nix { }; + test-runner = callPackage ./test-runner.nix { xrootd = finalAttrs.finalPackage; }; }; nativeBuildInputs = [ @@ -100,4 +100,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ ShamrockLee ]; }; -} +})