summary refs log tree commit diff
path: root/nixos/modules/services
Commit message (Expand)AuthorAge
* Merge branch 'master' into stagingLuca Bruno2014-11-10
|\
| * Merge pull request #4282 from sztupi/crashplanMichael Raskin2014-11-09
| |\
| | * crashplan: nixos module for backup serviceAttila Sztupak2014-09-26
| * | i2pd: added package, serviceEdward Tjörnhammar2014-11-09
| * | cjdns: service tweaks, new NixOS testEmery Hemingway2014-11-08
| * | xfce4-volumed: add package (close #4628)Nikolay Amiantov2014-11-08
| * | Merge pull request #4823 from abbradar/synaptics-fixAristid Breitkreuz2014-11-08
| |\ \
| | * | synaptics: fix tapButtons settingNikolay Amiantov2014-11-04
| * | | Merge pull request #4859 from abbradar/git-daemonAristid Breitkreuz2014-11-08
| |\ \ \
| | * | | nixos/git-daemon: fix 'exportAll' optionNikolay Amiantov2014-11-07
| | * | | nixos/git-daemon: add 'user' and 'group' optionsNikolay Amiantov2014-11-07
| | * | | nixos/git-daemon: add typesNikolay Amiantov2014-11-07
| | |/ /
| * | | Merge pull request #4891 from pSub/prefer-xresourcesDomen Kožar2014-11-08
| |\ \ \
| | * | | Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670Pascal Wittmann2014-11-08
* | | | | Merge branch 'master' into stagingLuca Bruno2014-11-08
|\| | | |
| * | | | quassel: make a proper systemd unit (also properly works in containers now)Aristid Breitkreuz2014-11-08
| |/ / /
| * | | Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""Rickard Nilsson2014-11-06
| * | | Fixes to Apache 2.4 configurationRickard Nilsson2014-11-06
| * | | apache-httpd: Make 2.4 the defaultEelco Dolstra2014-11-06
| * | | thermald needs dbus config files to runEvgeny Egorochkin2014-11-06
* | | | Merge recent master into stagingVladimír Čunát2014-11-05
|\| | |
| * | | nixos/graphite: fix user creationJaka Hudoklin2014-11-04
| * | | nixos/transmission: Start after local-fs.targetRicardo M. Correia2014-11-04
| * | | Merge pull request #4801 from robberer/pkgs/zabbix-serverlethalman2014-11-04
| |\ \ \
| | * | | zabbix-server: add extraConfig optionLongrin Wischnewski2014-11-03
| * | | | Revert "syslog-ng: Update from 3.5.6 to 3.6.1"William A. Kennington III2014-11-02
| |/ / /
* | | | Merge remote-tracking branch 'origin/master' into staging.Peter Simons2014-11-02
|\| | |
| * | | nixos/modules/services/monitoring/graphite.nix: strip trailing whitespacePeter Simons2014-11-02
| * | | nixos/modules/services/monitoring/graphite.nix: don't create graphite user un...Peter Simons2014-11-02
| |/ /
| * | gitolite: add dataDirNikolay Amiantov2014-11-02
| * | Merge pull request #4750 from abbradar/nix-maxcoreslethalman2014-11-01
| |\ \
| | * | nix-daemon: add maxCores optionNikolay Amiantov2014-11-01
| * | | nixos/nat: Fix override so that sysctls are properly preservedWilliam A. Kennington III2014-10-31
* | | | Merge remote-tracking branch 'origin/master' into staging.Peter Simons2014-10-31
|\| | |
| * | | Merge pull request #4746 from abbradar/synaptics-fingersPeter Simons2014-10-31
| |\ \ \ | | |/ / | |/| |
| | * | synaptics: add fingersMap optionNikolay Amiantov2014-10-31
| | * | synaptics: add types to optionsNikolay Amiantov2014-10-31
| * | | rsnapshot: add git version & make it configurable in the nixos moduleAristid Breitkreuz2014-10-27
| * | | xsession: Start the right pulseaudio binaryKirill Elagin2014-10-27
| * | | syslog-ng: Update from 3.5.6 to 3.6.1Rickard Nilsson2014-10-27
| * | | Merge pull request #4506 from cstrahan/logstash-configlethalman2014-10-26
| |\ \ \
| | * | | logstash service: make log verbosity configurable.Charles Strahan2014-10-13
| * | | | Merge pull request #4640 from lethalman/installer-iconsAristid Breitkreuz2014-10-25
| |\ \ \ \
| | * | | | kde installer: Add gparted, nixos manual and konsole in the desktopLuca Bruno2014-10-23
* | | | | | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-10-24
|\| | | | |
| * | | | | gnome3: Add cantarell fonts. Closes #4633Luca Bruno2014-10-24
| * | | | | Merge pull request #4553 from ehmry/polipoDomen Kožar2014-10-23
| |\ \ \ \ \
| | * | | | | drop permission prestart from polipo service moduleEmery Hemingway2014-10-16
| * | | | | | Merge pull request #4614 from geerds/kde4-plasma-nmThomas Tuegel2014-10-22
| |\ \ \ \ \ \
| | * | | | | | kde4: Use plasma-nm instead of knetworkmanagerJascha Geerds2014-10-22
| | | |/ / / / | | |/| | | |