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/hardware | |
| parent | 4f2aa2f7061984fa7aa21bac92ed5eec3f3daa06 (diff) | |
| download | nixpkgs-29027fd1e12461fc5ff5722bea79df7ff4299599.tar nixpkgs-29027fd1e12461fc5ff5722bea79df7ff4299599.tar.gz nixpkgs-29027fd1e12461fc5ff5722bea79df7ff4299599.tar.bz2 nixpkgs-29027fd1e12461fc5ff5722bea79df7ff4299599.tar.lz nixpkgs-29027fd1e12461fc5ff5722bea79df7ff4299599.tar.xz nixpkgs-29027fd1e12461fc5ff5722bea79df7ff4299599.tar.zst nixpkgs-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/hardware')
| -rw-r--r-- | nixos/modules/hardware/all-firmware.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/hardware/cpu/amd-microcode.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/hardware/cpu/intel-microcode.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/hardware/network/b43.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/hardware/pcmcia.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/hardware/video/bumblebee.nix | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 027dd827b4d..3820a95b12e 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: -with pkgs.lib; +with lib; { diff --git a/nixos/modules/hardware/cpu/amd-microcode.nix b/nixos/modules/hardware/cpu/amd-microcode.nix index 5720a63834f..86a3df5da21 100644 --- a/nixos/modules/hardware/cpu/amd-microcode.nix +++ b/nixos/modules/hardware/cpu/amd-microcode.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: -with pkgs.lib; +with lib; { diff --git a/nixos/modules/hardware/cpu/intel-microcode.nix b/nixos/modules/hardware/cpu/intel-microcode.nix index 9046ddf83bb..800c391b293 100644 --- a/nixos/modules/hardware/cpu/intel-microcode.nix +++ b/nixos/modules/hardware/cpu/intel-microcode.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: -with pkgs.lib; +with lib; { diff --git a/nixos/modules/hardware/network/b43.nix b/nixos/modules/hardware/network/b43.nix index 03f81f92ef0..e63f2d04d1a 100644 --- a/nixos/modules/hardware/network/b43.nix +++ b/nixos/modules/hardware/network/b43.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: -with pkgs.lib; +with lib; let kernelVersion = config.boot.kernelPackages.kernel.version; in diff --git a/nixos/modules/hardware/pcmcia.nix b/nixos/modules/hardware/pcmcia.nix index 20684656750..d7d002ae6c8 100644 --- a/nixos/modules/hardware/pcmcia.nix +++ b/nixos/modules/hardware/pcmcia.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: -with pkgs.lib; +with lib; let diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 504da2cde85..f06139adc44 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -1,7 +1,7 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: let kernel = config.boot.kernelPackages; in -with pkgs.lib; +with lib; { |