From 21d520fbf202e84c80e32afc6b1377974335e4e4 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 12 Oct 2023 00:32:31 +0200 Subject: [PATCH] tests.nixpkgs-check-by-name: Minor Nix refactor --- pkgs/test/nixpkgs-check-by-name/src/eval.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.nix b/pkgs/test/nixpkgs-check-by-name/src/eval.nix index 7c0ae755215a..378ecef46b57 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.nix +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.nix @@ -39,14 +39,18 @@ let overlays = [ callPackageOverlay ]; }; - attrInfo = attr: { + attrInfo = attr: + let + value = pkgs.${attr}; + in + { # These names are used by the deserializer on the Rust side call_package_path = - if pkgs.${attr} ? _callPackagePath && builtins.isPath pkgs.${attr}._callPackagePath then - toString pkgs.${attr}._callPackagePath + if value ? _callPackagePath && builtins.isPath value._callPackagePath then + toString value._callPackagePath else null; - is_derivation = pkgs.lib.isDerivation pkgs.${attr}; + is_derivation = pkgs.lib.isDerivation value; }; attrInfos = builtins.listToAttrs (map (name: {