Nikolay Amiantov
d9aafc885f
Merge branch 'early-kbd' into staging
2016-07-13 03:56:07 +03:00
Nikolay Amiantov
9e48baa716
kbd service: add support for early loading of fonts and keymaps
2016-07-08 20:44:01 +03:00
Nikolay Amiantov
803b1eedd6
kbd service: add system-wise console resources
2016-07-08 20:44:01 +03:00
Nikolay Amiantov
5622226d5b
kbd service: drop a comment now when we do restart vconsole setup
2016-07-08 20:44:01 +03:00
Nikolay Amiantov
6c11d9dd55
kbd service: add system-wise console resources
2016-07-08 12:52:39 +03:00
Nikolay Amiantov
489bbf0609
kbd service: drop a comment now when we do restart vconsole setup
2016-07-03 03:28:29 +03:00
Scott Olson
6d5ed7d971
Make fileSystems example literal.
...
This fixes the attribute names showing up unquoted in the options documentation.
2016-06-19 01:21:22 -06:00
Eelco Dolstra
c726773f26
cpufreq: Fix "sh: modprobe: command not found"
2016-05-24 21:48:42 +02:00
Franz Pletz
e16851b900
networking module: Add some missing literalExample
2016-04-25 18:15:52 +02:00
Svein Ove Aas
f03dc59803
zfs: Update devNodes description
2016-04-15 17:25:32 +01:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Eelco Dolstra
b250ac9290
Remove setting non-existent sysctl options
...
(cherry picked from commit 1010ced00c
2016-03-15 17:44:30 +01:00
Rickard Nilsson
6ff5821be6
nixos/filesystems: Fix fs options type error
2016-03-14 17:24:36 +01:00
Nikolay Amiantov
1111f73dde
sw-raid: rename mdadmShutdown
...
See aac666e302
2016-03-09 21:06:27 +03:00
kklas
aac666e302
sw-raid: make mdmon start from initrd
...
Also add required systemd services for starting/stopping mdmon.
Closes #13447 .
abbradar: fixed `mdadmShutdown` service name according to de facto conventions.
2016-03-09 21:03:49 +03:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Eelco Dolstra
928035378d
Fix typo
2016-02-12 14:35:40 +01:00
Nikolay Amiantov
7ab80e8f79
kbd module: don't setup vconsoles if we are in a container
2016-02-10 13:38:27 +03:00
Aneesh Agrawal
3c5fca9618
filesystems: use list of strings for fs options
...
Allow usage of list of strings instead of a comma-separated string
for filesystem options. Deprecate the comma-separated string style
with a warning message; convert this to a hard error after 16.09.
15.09 was just released, so this provides a deprecation period during
the 16.03 release.
closes #10518
Signed-off-by: Robin Gloster <mail@glob.in>
2016-02-06 19:48:30 +00:00
Eelco Dolstra
b21ef9c9e6
Don't include wireless-tools/iw/rfkill when wireless is disabled
...
This is mostly to get rid of some useless stuff in VMs/containers.
2016-02-01 18:19:23 +01:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Thomas Strobel
a04a7272aa
Add missing 'type', 'defaultText' and 'literalExample' in module definitions
...
- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
2016-01-17 19:41:23 +01:00
rnhmjoj
641a951c61
i18n: Fix vconsole colorscheme generation
...
Close #12442 .
abbradar: remove trailing spaces.
2016-01-17 20:24:45 +03:00
Pascal Wittmann
009f944b9f
Merge pull request #12315 from tlevine/trackpoint-typo
...
trackpoint: fix typo in trackpoint speed description
2016-01-11 07:44:52 +01:00
Thomas Levine
2d6ebc9189
trackpoint: fix typo in configuration description
...
I fixed a typo in the description for hardware.trackpoint.speed.
2016-01-11 04:12:04 +00:00
Robin Gloster
88292fdf09
jobs -> systemd.services
2016-01-07 06:39:06 +00:00
William A. Kennington III
ce8c8f1e1b
Merge pull request #11890 from Baughn/zfs
...
zfs:Add option for zpool import -d, and set it to /dev/disk/by-id.
2016-01-05 14:37:19 -08:00
Tobias Geerinckx-Rice
82419575aa
btrfsProgs -> canonical btrfs-progs
2016-01-03 20:38:44 +01:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Timofei Kushnir
5925f9f709
Network script module fix
2015-12-25 03:43:49 +03:00
Svein Ove Aas
7688206a0b
zfs:Change default for -d to /dev/disk/by-id
2015-12-23 00:33:06 +01:00
Svein Ove Aas
9a82dd87f7
zfs:Add zfs.devNodes option for zpool import -d
2015-12-23 00:32:25 +01:00
Svein Ove Aas
7e86e9a048
zfs:Always import from /dev/disk/by-id
2015-12-12 20:32:38 +00:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Nikolay Amiantov
f3e8bb780c
nixos/kbd: make systemd-vconsole-setup work with KMS
2015-12-03 22:54:24 +03:00
Luca Bruno
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
Kovacsics Robert (NixOS)
912f60c1e7
Revert part of #9982 to be in line with #9925
...
When creating PR #9982 , I undid a line of PR #9925 , that was some
cleanups and fixes, so this undoes that damage.
2015-11-26 14:40:31 +00:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Jaka Hudoklin
22c61d3bfc
Merge pull request #10218 from offlinehacker/nixos/format_options
...
add support for auto format, format options
2015-11-18 22:33:01 +01:00
Domen Kožar
0567714b99
Merge pull request #10610 from joachifm/scsi-link-pm
...
nixos: set scsi link power policy using udev
2015-11-16 13:21:36 +01:00
William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
rnhmjoj
2a0f9d40ff
i18n: add color scheme option ( close #9626 )
2015-11-09 14:53:59 +01:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Joachim Fasting
7b2b366552
nixos: set scsi link power policy using udev
...
Also improve option type checking by enumerating valid policy names.
2015-10-25 19:38:53 +01:00
Nikolay Amiantov
de8b8b35a4
nixos/swap: refactor, add randomEncryption option
2015-10-20 15:56:12 +03:00
William A. Kennington III
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
Robbin C
528ebb4e5e
Fix typo in nixos/modules/tasks/filesystems/nfs.nix.
...
statd should be cfg.statd.
2015-10-14 08:48:34 +08:00
Thomas Strobel
acb1b3cdd0
networking module: wlanInterfaces: fix file name of udev rules
2015-10-06 20:12:39 +02:00
