diff options
| author | Shea Levy <shea@shealevy.com> | 2014-05-05 14:58:51 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-07-02 12:28:18 -0400 |
| commit | b3cfb9084b3860852581be235aea90540a5302d4 (patch) | |
| tree | 06cf1333ae7d60f25bd23866dbaec17b148a15dd /nixos/modules/installer | |
| parent | 80709b141ca82d5afe3874f50b822db3409bed4e (diff) | |
| download | nixpkgs-b3cfb9084b3860852581be235aea90540a5302d4.tar nixpkgs-b3cfb9084b3860852581be235aea90540a5302d4.tar.gz nixpkgs-b3cfb9084b3860852581be235aea90540a5302d4.tar.bz2 nixpkgs-b3cfb9084b3860852581be235aea90540a5302d4.tar.lz nixpkgs-b3cfb9084b3860852581be235aea90540a5302d4.tar.xz nixpkgs-b3cfb9084b3860852581be235aea90540a5302d4.tar.zst nixpkgs-b3cfb9084b3860852581be235aea90540a5302d4.zip | |
Get all lib functions from lib, not pkgs.lib, in modules
Diffstat (limited to 'nixos/modules/installer')
4 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index c274970c553..c2a11a1a8b3 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix @@ -152,7 +152,7 @@ in # default root password is empty. services.openssh.enable = true; - jobs.openssh.startOn = pkgs.lib.mkOverride 50 ""; + jobs.openssh.startOn = lib.mkOverride 50 ""; boot.loader.grub.enable = false; boot.loader.generationsDir.enable = false; diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix index 0357bf80196..1156003d3f4 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix @@ -109,7 +109,7 @@ in # not be started by default on the installation CD because the # default root password is empty. services.openssh.enable = true; - jobs.openssh.startOn = pkgs.lib.mkOverride 50 ""; + jobs.openssh.startOn = lib.mkOverride 50 ""; # To be able to use the systemTarball to catch troubles. boot.crashDump = { diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 3626308bff8..2ed70c1daa9 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -165,7 +165,7 @@ in # not be started by default on the installation CD because the # default root password is empty. services.openssh.enable = true; - jobs.openssh.startOn = pkgs.lib.mkOverride 50 ""; + jobs.openssh.startOn = lib.mkOverride 50 ""; # cpufrequtils fails to build on non-pc powerManagement.enable = false; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index f7fac75eb06..39da2f1f0be 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -1,7 +1,7 @@ # This module generates nixos-install, nixos-rebuild, # nixos-generate-config, etc. -{ config, pkgs, modulesPath, ... }: +{ config, pkgs, modulesPath, lib, ... }: let @@ -65,7 +65,7 @@ let test -e "$out/chrome/content/jquery-1.5.2.js" || cp -f "$jquery" "$out/chrome/content/jquery-1.5.2.js" ''; - gui = pkgs.lib.cleanSource "${modulesPath}/../gui"; + gui = lib.cleanSource "${modulesPath}/../gui"; jquery = pkgs.fetchurl { url = http://code.jquery.com/jquery-1.5.2.min.js; sha256 = "8f0a19ee8c606b35a10904951e0a27da1896eafe33c6e88cb7bcbe455f05a24a"; |