diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
commit | 375bc8def7c17506bc10f3b6193635f05d5ccc40 (patch) | |
tree | 6af7662b245e7998bd18ae20d9e74922c489fb6d /nixos/modules/tasks | |
parent | 2f75c6845981b38a698cf1a9f620145877c80956 (diff) | |
parent | 7f9ccc628403ed88844a4436da3b2944be5560a4 (diff) | |
download | nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.gz nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.bz2 nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.lz nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.xz nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.zst nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.zip |
Merge staging into closure-size
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r-- | nixos/modules/tasks/filesystems.nix | 4 | ||||
-rw-r--r-- | nixos/modules/tasks/filesystems/cifs.nix | 2 | ||||
-rw-r--r-- | nixos/modules/tasks/filesystems/ntfs.nix | 11 | ||||
-rw-r--r-- | nixos/modules/tasks/network-interfaces-scripted.nix | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index c6f2f072352e..ce8d6079faac 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -137,9 +137,7 @@ in # Add the mount helpers to the system path so that `mount' can find them. system.fsPackages = [ pkgs.dosfstools ]; - environment.systemPackages = - [ pkgs.ntfs3g pkgs.fuse ] - ++ config.system.fsPackages; + environment.systemPackages = [ pkgs.fuse ] ++ config.system.fsPackages; environment.etc.fstab.text = let diff --git a/nixos/modules/tasks/filesystems/cifs.nix b/nixos/modules/tasks/filesystems/cifs.nix index 3932b5c9acf9..a928fcae415f 100644 --- a/nixos/modules/tasks/filesystems/cifs.nix +++ b/nixos/modules/tasks/filesystems/cifs.nix @@ -11,7 +11,7 @@ in { config = { - system.fsPackages = [ pkgs.cifs_utils ]; + system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs_utils ]; boot.initrd.availableKernelModules = mkIf inInitrd [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ]; diff --git a/nixos/modules/tasks/filesystems/ntfs.nix b/nixos/modules/tasks/filesystems/ntfs.nix new file mode 100644 index 000000000000..c40d2a1a80bc --- /dev/null +++ b/nixos/modules/tasks/filesystems/ntfs.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + config = mkIf (any (fs: fs == "ntfs" || fs == "ntfs-3g") config.boot.supportedFilesystems) { + + system.fsPackages = [ pkgs.ntfs3g ]; + + }; +} diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index fd545a723e76..328d94cbb05c 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -107,7 +107,7 @@ in ips = interfaceIps i; in nameValuePair "network-addresses-${i.name}" - { description = "Addresss configuration of ${i.name}"; + { description = "Address configuration of ${i.name}"; wantedBy = [ "network-interfaces.target" ]; before = [ "network-interfaces.target" ]; bindsTo = [ (subsystemDevice i.name) ]; |