Skip to content

Commit

Permalink
nixos/tests/make-test.nix: Fix eval error
Browse files Browse the repository at this point in the history
Regression introduced by 943592f.

The lib attribute isn't in scope here, so we need to use pkgs.lib
instead for isFunction.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @shlevy
  • Loading branch information
aszlig committed Feb 2, 2018
1 parent 0bfa9a9 commit 2a09b42
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion nixos/tests/make-test.nix
Expand Up @@ -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)

2 comments on commit 2a09b42

@shlevy
Copy link
Member

@shlevy shlevy commented on 2a09b42 Feb 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack, sorry!

@grahamc
Copy link
Member

@grahamc grahamc commented on 2a09b42 Feb 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How can we catch this with OfBorg? I'm surprised we're not already.

Please sign in to comment.