summary refs log tree commit diff
path: root/nixos/modules
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-05-16
|\
| * Merge pull request #39978 from hedning/plymouth-quit-waitMatthew Justin Bauer2018-05-15
| |\
| | * nixos/plymouth: multi-user.target wants plymouth-quit-wait.serviceTor Hedin Brønner2018-05-04
| * | Merge pull request #39536 from teto/iprouteMatthew Justin Bauer2018-05-15
| |\ \
| | * | iproute2: module to create rt_table file & coMatthieu Coudron2018-05-15
| * | | module-list: add youtrack module to listYorick2018-05-15
| * | | Merge pull request #33371 from jtojnar/flatpakJan Tojnar2018-05-15
| |\ \ \
| | * | | nixos/flatpak: add docsJan Tojnar2018-05-15
| | * | | nixos/flatpak: allow specifying extra portalsJan Tojnar2018-05-15
| | * | | nixos/systemd-lib: fix conflict with dbus.service.d directoryJan Tojnar2018-05-15
| | * | | nixos/flatpak: initJan Tojnar2018-05-15
| | |/ /
| * | | nexus: fix setup and nixos test (#40522)Maximilian Bosch2018-05-15
* | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-14
|\| | |
| * | | nixos/tests: prevent stateVersion warnings in evalUli Baum2018-05-15
* | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-14
|\| | |
| * | | nixos: stumpwm: switch from package marked as broken to working quicklisp pac...Arcadio Rubio García2018-05-14
* | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-14
|\| | |
| * | | nixos/tests: set default stateVersion in test VMsUli Baum2018-05-14
| * | | Merge pull request #40373 from xeji/fix-mesos-testxeji2018-05-13
| |\ \ \
| | * | | nixos/mesos-slave: start after dockerUli Baum2018-05-11
| * | | | Merge pull request #40416 from oxij/os/fix-some-typesxeji2018-05-13
| |\ \ \ \
| | * | | | nixos: systemd.services.*.environment: fix typeJan Malakhovski2018-05-13
| | * | | | nixos: services.xserver.desktopManager.xterm.enable: fix typeJan Malakhovski2018-05-13
* | | | | | Merge master into stagingFrederik Rietdijk2018-05-13
|\| | | | |
| * | | | | stage-1: remove tuxonice handlingYegor Timoshenko2018-05-13
| * | | | | nixos: version: produce a warning when no `system.nixos.stateVersion` is expl...Jan Malakhovski2018-05-12
| * | | | | nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1Jan Malakhovski2018-05-12
| |/ / / /
* | | | | Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into stagingJohn Ericson2018-05-13
|\| | | |
| * | | | manual: Clarify that limits.conf doesn't apply to systemd services. (#40267)Niklas Hambüchen2018-05-12
| * | | | Fix kernel crash caused by absent root deviceIhor Antonov2018-05-12
| |/ / /
* | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-11
|\| | |
| * | | Merge pull request #39681 from pstn/gnunet-serviceRobert Schütz2018-05-11
| |\ \ \
| | * | | nixos/gnunet: create switch for package.Philipp Steinpass2018-05-11
| * | | | hostapd: remove assertion (allow 5GHz channels)Yegor Timoshenko2018-05-11
| |/ / /
* | | | Merge master into stagingFrederik Rietdijk2018-05-10
|\| | |
| * | | nixos/dovecot: Fix usage of dhparams optionaszlig2018-05-10
| * | | nixos/testing: Fix output of systemd messagesaszlig2018-05-10
| * | | Merge pull request #39099 from teto/qemu_agentxeji2018-05-10
| |\ \ \
| | * | | qemu-guest-agent: init moduleMatthieu Coudron2018-04-27
| * | | | Merge pull request #39671 from johanot/keepalived-vrrpInstanceTrackingSarah Brofeldt2018-05-09
| |\ \ \ \
| | * | | | nixos/keepalived: Implemented vrrp-instance tracking scripts and interfaces.Johan Thomsen2018-05-08
* | | | | | Merge master into stagingFrederik Rietdijk2018-05-09
|\| | | | |
| * | | | | Merge pull request #40052 from flokli/input_leds-docMatthew Justin Bauer2018-05-09
| |\ \ \ \ \
| | * | | | | modules/system/boot/luksroot: remove comment about input_leds for caps lockFlorian Klink2018-05-07
| * | | | | | base profile: add mkpasswd to system packagesNikolay Amiantov2018-05-09
| | |_|_|/ / | |/| | | |
* | | | | | Merge remote-tracking branch 'upstream/master' into stagingMatthew Bauer2018-05-08
|\| | | | |
| * | | | | nginx module: add upstream extraConfigNikolay Amiantov2018-05-08
| * | | | | dovecot2: added ssl_dh using security.dhparamsJoachim Schiele2018-05-08
| * | | | | NetworkManager: add noDns optionjD91mZM22018-05-08
| | |/ / / | |/| | |
| * | | | Merge pull request #39526 (improve dhparams)aszlig2018-05-08
| |\ \ \ \