From 943592f69850fd07dd2422da062b1c1ebc45974d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 31 Jan 2018 14:02:19 -0500 Subject: Add setFunctionArgs lib function. Among other things, this will allow *2nix tools to output plain data while still being composable with the traditional callPackage/.override interfaces. --- nixos/tests/make-test.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/tests/make-test.nix') diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix index f3e26aa7e74d..1b571a008e0f 100644 --- a/nixos/tests/make-test.nix +++ b/nixos/tests/make-test.nix @@ -2,4 +2,4 @@ f: { system ? builtins.currentSystem, ... } @ args: with import ../lib/testing.nix { inherit system; }; -makeTest (if builtins.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) +makeTest (if lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) -- cgit 1.4.1 From 2a09b4275c353bde6ee72d126cd0e99834dcf66e Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 2 Feb 2018 17:44:08 +0100 Subject: nixos/tests/make-test.nix: Fix eval error Regression introduced by 943592f69850fd07dd2422da062b1c1ebc45974d. The lib attribute isn't in scope here, so we need to use pkgs.lib instead for isFunction. Signed-off-by: aszlig Cc: @shlevy --- nixos/tests/make-test.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/tests/make-test.nix') diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix index 1b571a008e0f..ee4ba310ad50 100644 --- a/nixos/tests/make-test.nix +++ b/nixos/tests/make-test.nix @@ -2,4 +2,4 @@ f: { system ? builtins.currentSystem, ... } @ args: with import ../lib/testing.nix { inherit system; }; -makeTest (if lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) +makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) -- cgit 1.4.1