summary refs log tree commit diff
path: root/nixos/modules
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-21
|\
| * nixos/gitea: Add options to enable a timer with optional intervalElis Hirwing2018-05-20
| * nixos/gitea: Allow customizing derivation to useElis Hirwing2018-05-20
* | Merge branch 'master' into stagingVladimír Čunát2018-05-20
|\|
| * Merge pull request #40801 from xeji/test/dnscrypt-proxySamuel Leathers2018-05-19
| |\
| | * nixos/dnscrypt-proxy: fix apparmor profile and testUli Baum2018-05-20
| * | nixos/cjdns: fix service for i686 (#40740)xeji2018-05-20
| |/
| * Merge pull request #40744 from kirelagin/wireguard-darwinJörg Thalheim2018-05-19
| |\
| | * wireguard: Enable tools on other platformsKirill Elagin2018-05-19
* | | Merge branch 'master' into stagingRobert Schütz2018-05-19
|\| |
| * | Revert "zsh: move setEnvironment stuff to zprofile"Gregor Kleen2018-05-19
| |/
* | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-18
|\|
| * nixos/xss-lock: add module (#40619)Maximilian Bosch2018-05-18
| * Remove all references to absent nixos-prepare-rootPhilippe Grégoire2018-05-18
* | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-05-18
|\|
| * nixos/nginx: emphasize that useACMEHost does not create certsJan Tojnar2018-05-17
* | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-16
|\|
| * sysprof: 1.2.0 -> 3.28.1Andreas Rammhold2018-05-16
| * Merge pull request #39615 from jtojnar/gdm-waylandJan Tojnar2018-05-16
| |\
| | * gnome3.gdm: allow choosing user account without GNOMEJan Tojnar2018-05-16
| * | Add stubby resolver daemon service module (#38667)baroncharlus2018-05-16
| * | Merge pull request #40223 from jD91mZM2/shouldnt-we-just-use-the-pam-environm...Matthew Justin Bauer2018-05-16
| |\ \
| | * | zsh: move setEnvironment stuff to zprofilejD91mZM22018-05-09
| * | | Merge pull request #40581 from peterhoeg/p/sedutilPeter Hoeg2018-05-16
| |\ \ \
| | * | | nixos sedutil: module for setting up kernel parametersPeter Hoeg2018-03-19
* | | | | 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