diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-14 16:26:48 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-14 16:26:48 +0200 |
| commit | 29027fd1e12461fc5ff5722bea79df7ff4299599 (patch) | |
| tree | fec0d7ba9f295be106fcf41759cee8b94d79dc9d /nixos/modules/testing | |
| parent | 4f2aa2f7061984fa7aa21bac92ed5eec3f3daa06 (diff) | |
| download | nixlib-29027fd1e12461fc5ff5722bea79df7ff4299599.tar nixlib-29027fd1e12461fc5ff5722bea79df7ff4299599.tar.gz nixlib-29027fd1e12461fc5ff5722bea79df7ff4299599.tar.bz2 nixlib-29027fd1e12461fc5ff5722bea79df7ff4299599.tar.lz nixlib-29027fd1e12461fc5ff5722bea79df7ff4299599.tar.xz nixlib-29027fd1e12461fc5ff5722bea79df7ff4299599.tar.zst nixlib-29027fd1e12461fc5ff5722bea79df7ff4299599.zip | |
Rewrite ‘with pkgs.lib’ -> ‘with lib’
Using pkgs.lib on the spine of module evaluation is problematic because the pkgs argument depends on the result of module evaluation. To prevent an infinite recursion, pkgs and some of the modules are evaluated twice, which is inefficient. Using ‘with lib’ prevents this problem.
Diffstat (limited to 'nixos/modules/testing')
| -rw-r--r-- | nixos/modules/testing/service-runner.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/testing/test-instrumentation.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix index 6f17ed77dad9..dfe8b430e045 100644 --- a/nixos/modules/testing/service-runner.nix +++ b/nixos/modules/testing/service-runner.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: -with pkgs.lib; +with lib; let diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 28494e1c7b2a..7b4e5a8cac06 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -1,9 +1,9 @@ # This module allows the test driver to connect to the virtual machine # via a root shell attached to port 514. -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: -with pkgs.lib; +with lib; let kernel = config.boot.kernelPackages.kernel; in |