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/tasks/filesystems | |
| parent | 80709b141ca82d5afe3874f50b822db3409bed4e (diff) | |
| download | nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.gz nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.bz2 nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.lz nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.xz nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.zst nixlib-b3cfb9084b3860852581be235aea90540a5302d4.zip | |
Get all lib functions from lib, not pkgs.lib, in modules
Diffstat (limited to 'nixos/modules/tasks/filesystems')
| -rw-r--r-- | nixos/modules/tasks/filesystems/f2fs.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/tasks/filesystems/unionfs-fuse.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix index 8655107360c1..1ed7b1b6a62e 100644 --- a/nixos/modules/tasks/filesystems/f2fs.nix +++ b/nixos/modules/tasks/filesystems/f2fs.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems; diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix index 177c97f85c78..5b7777180568 100644 --- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix +++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix @@ -1,8 +1,8 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { - config = pkgs.lib.mkMerge [ - (pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) { + config = lib.mkMerge [ + (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) { boot.initrd.kernelModules = [ "fuse" ]; boot.initrd.extraUtilsCommands = '' @@ -17,7 +17,7 @@ ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin ''; }) - (pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) { + (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) { system.fsPackages = [ pkgs.unionfs-fuse ]; }) ]; |