diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-04-04 00:39:06 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-04-04 00:39:06 +0200 |
| commit | 23e84aadf1abb91291ac84f4b950e4e1f2e85c7f (patch) | |
| tree | 08cc48a709bd68cac7004a947607aa3135889432 | |
| parent | 94b1c61bd615a46411a80f07e6c88d504f592ed4 (diff) | |
Remove references to pkgs.lib within modules.
We now no longer can (or even should) refer to pkgs.lib within modules since the merge of the module system improvements in NixOS/nixpkgs@889f72b. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | machines/aszlig/arilou.nix | 4 | ||||
| -rw-r--r-- | machines/aszlig/tishtushi.nix | 4 | ||||
| -rw-r--r-- | modules/user/aszlig/services/i3/conky.nix | 4 | ||||
| -rw-r--r-- | modules/user/aszlig/services/i3/default.nix | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/machines/aszlig/arilou.nix b/machines/aszlig/arilou.nix index 94efda36..96edf39c 100644 --- a/machines/aszlig/arilou.nix +++ b/machines/aszlig/arilou.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let rootUUID = "e9c95c74-e4cf-41f6-bb45-baf8dd579217"; diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix index 9e674709..81fbbf37 100644 --- a/machines/aszlig/tishtushi.nix +++ b/machines/aszlig/tishtushi.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let rootUUID = "e33a3dda-a87d-473b-b113-37783aa35667"; diff --git a/modules/user/aszlig/services/i3/conky.nix b/modules/user/aszlig/services/i3/conky.nix index 5d626025..129890c4 100644 --- a/modules/user/aszlig/services/i3/conky.nix +++ b/modules/user/aszlig/services/i3/conky.nix @@ -1,6 +1,6 @@ -{ pkgs ? import <nixpkgs> {}, timeout ? 300 }: +{ pkgs ? import <nixpkgs> {}, lib ? import <nixpkgs/lib>, timeout ? 300 }: -with pkgs.lib; +with lib; let baseConfig = pkgs.writeText "conkyrc" '' diff --git a/modules/user/aszlig/services/i3/default.nix b/modules/user/aszlig/services/i3/default.nix index 6064ec99..7b578026 100644 --- a/modules/user/aszlig/services/i3/default.nix +++ b/modules/user/aszlig/services/i3/default.nix @@ -37,7 +37,7 @@ let defaultWorkspaces = listToAttrs (imap mkDefaultWorkspace wsNumberSymbols); conky = import ./conky.nix { - inherit pkgs; + inherit pkgs lib; timeout = cfg.networkTimeout; }; |