summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge branch 'staging-next' into stagingDmitry Kalinkin2019-09-25
|\
| * Merge branch 'master' into staging-nextDmitry Kalinkin2019-09-25
| |\
| | * Merge pull request #69297 from aanderse/zabbixMarek Mahut2019-09-25
| | |\
| | | * nixos/zabbixServer: move pid file from default (/tmp) to /run/zabbix to avoid...Aaron Andersen2019-09-23
| | * | nixos/rabbitmq: use an attrset for example configItemsedef2019-09-25
| | * | Merge pull request #69398 from Evils-Devils/fancontrolmarkuskowa2019-09-25
| | |\ \
| | | * | Update nixos/modules/services/hardware/fancontrol.nixEvils-Devils2019-09-25
| | | * | Update nixos/modules/services/hardware/fancontrol.nixEvils-Devils2019-09-25
| | | * | fancontrol: load config from configuration.nixEvils2019-09-25
| | | * | Update nixos/modules/services/hardware/fancontrol.nixEvils-Devils2019-09-25
| | | * | fancontrol: more cleanupEvils2019-09-25
| | | * | update cfg to match section changeEvils2019-09-25
| | | * | Update nixos/modules/services/hardware/fancontrol.nixEvils-Devils2019-09-25
| | | * | fancontrol service initEvils2019-09-25
| | * | | Merge pull request #67232 from ck3d/container-useHostResolvConfFranz Pletz2019-09-25
| | |\ \ \
| | | * | | nixos: deactivate immutablity for /var/empty in containerChristian Kögler2019-09-13
| | | * | | nixos: added installation doc for nspawn containerChristian Kögler2019-09-13
| | | * | | nixos-install: ensure activation script is always calledChristian Kögler2019-09-13
| | | * | | nixos: added machinectl testChristian Kögler2019-09-13
| | | * | | container config: better default in case of resolvedChristian Kögler2019-09-13
| | * | | | nixos/pymks: log to journalPeter Hoeg2019-09-25
| | * | | | Merge pull request #69300 from peterhoeg/f/ha2Peter Hoeg2019-09-25
| | |\ \ \ \
| | | * | | | home-assistant: set capabilities for bluetoothPeter Hoeg2019-09-23
| | | | |_|/ | | | |/| |
| | * | | | Merge pull request #69346 from rvolosatovs/fix/systemd-dhcpRobin Gloster2019-09-24
| | |\ \ \ \
| | | * | | | nixos/network: replace deprecated DHCP=both by DHCP=yesRoman Volosatovs2019-09-24
| | | | |_|/ | | | |/| |
| | * | | | nixos/gitlab: Update release notes and documentation (#69313)Florian Klink2019-09-24
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | nixos/gitlab: Document the restriction introduced on statePathtalyz2019-09-23
| | | * | | nixos/gitlab: Mention secret option transition in release notestalyz2019-09-23
* | | | | | Merge branch 'staging-next' into stagingVladimír Čunát2019-09-24
|\| | | | |
| * | | | | Merge branch 'master' into staging-nextVladimír Čunát2019-09-24
| |\| | | |
| | * | | | Merge pull request #68946 from volth/escapeJörg Thalheim2019-09-24
| | |\ \ \ \
| | | * | | | nixos/matomo: fix escapevolth2019-09-17
| | | * | | | nixos/tt-rss: fix string escapevolth2019-09-17
| | | * | | | nixos/restya-board: fix string escapevolth2019-09-17
| | | * | | | nixos/matomo: fix string escapevolth2019-09-17
| | | * | | | nixos/prosody: fix escapevolth2019-09-17
| | | * | | | nixos/graphite: fix escapevolth2019-09-17
| | | * | | | nixos/less: fix escapevolth2019-09-17
| | | * | | | nixos/rspamd: fix fancy unicode quotevolth2019-09-16
| | * | | | | Merge pull request #67748 from typetetris/yubico-local-authJörg Thalheim2019-09-24
| | |\ \ \ \ \
| | | * | | | | yubico-pam: make local authentication possibleEric Wolf2019-08-30
| | * | | | | | nixos/postgresql-wal-receiver: remove restart limit (#67857)Notkea2019-09-23
| | | |_|/ / / | | |/| | | |
| | * | | | | Merge pull request #68970 from teto/rngdRobin Gloster2019-09-23
| | |\ \ \ \ \
| | | * | | | | qemu-guest: allow to override security.rngdMatthieu Coudron2019-09-18
| | * | | | | | nixos/systemd: pick more upstream tmpfiles confsFranz Pletz2019-09-23
| | | |_|_|/ / | | |/| | | |
| | * | | | | nixos/gitlab: Add gnutar and gzip to gitlab-sidekiq's path (#68908)Florian Klink2019-09-23
| | |\ \ \ \ \
| | | * | | | | nixos/gitlab: Add gnutar and gzip to gitlab-sidekiq's pathtalyz2019-09-17
| | * | | | | | Merge pull request #69260 from volth/patch-369Peter Hoeg2019-09-23
| | |\ \ \ \ \ \
| | | * | | | | | nixos/mailcatcher: add bind capabilitiesvolth2019-09-22
| | * | | | | | | Merge pull request #15560 from peterhoeg/nm_dnsdhcpPeter Hoeg2019-09-23
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |