about summary refs log tree commit diff
path: root/nixos/modules
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'NixOS/master' into stagingMatthew Bauer2019-02-18
|\
| * nixos/ssh: apply options after extraConfigKai Wohlfahrt2019-02-18
| * Merge pull request #55410 from aanderse/apache-defaultsSilvan Mosberger2019-02-18
| |\
| | * nixos/httpd: don't advertise phpAaron Andersen2019-02-07
| | * nixos/httpd: disable HTTP TRACE method by defaultAaron Andersen2019-02-07
| | * nixos/httpd: disable TLSv1 by default for better securityAaron Andersen2019-02-07
| * | Merge pull request #55766 from Lucus16/bump-quasselSilvan Mosberger2019-02-18
| |\ \
| | * | nixos/quassel: Add support for certificate fileLars Jellema2019-02-14
| * | | Merge branch 'master' into headphonesrembo102019-02-18
| |\ \ \
| | * \ \ Merge pull request #55955 from rnhmjoj/diodRyan Mulligan2019-02-17
| | |\ \ \
| | | * | | nixos/diod: fix permissionsrnhmjoj2019-02-17
| | * | | | Merge branch 'master' into singularityJustin Bedő2019-02-17
| | |\ \ \ \
| | | * \ \ \ Merge pull request #55957 from dasJ/icingaweb2-moduleRyan Mulligan2019-02-17
| | | |\ \ \ \
| | | | * | | | nixos/icingaweb2: Init the moduleJanne Heß2019-02-17
| | | | |/ / /
| | | * | | | Merge pull request #55922 from tek/masterRyan Mulligan2019-02-17
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | nixos/tt-rss: fix syntax error in pre-start scriptTorsten Schmits2019-02-17
| | | * | | | Merge pull request #55920 from matix2267/logind-lid-switch-external-powerRyan Mulligan2019-02-16
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | nixos/logind: Add option for HandleLidSwitchExternalPowerMateusz Gołębiewski2019-02-16
| | | | |/ /
| | | * | | Merge pull request #55351 from timor/kio-extras-man-protocolThomas Tuegel2019-02-16
| | | |\ \ \
| | | | * | | kio-extras: enable man protocoltimor2019-02-06
| | * | | | | nixos/singularity: fix singularity outputJörg Thalheim2019-01-31
| | * | | | | nixos/singularity: fix indentationJörg Thalheim2019-01-31
| | * | | | | singularity: update module to correctly wrap suid binaryJustin Bedo2019-01-31
| * | | | | | headphones: init at 0.5.19rembo102018-09-16
* | | | | | | Merge staging-next into stagingFrederik Rietdijk2019-02-16
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge master into staging-nextFrederik Rietdijk2019-02-16
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge pull request #55742 from aanderse/php-fpmJan Tojnar2019-02-16
| | |\ \ \ \ \ \
| | | * | | | | | nixos/phpfpm: allow configuring php.ini files per-poolAaron Andersen2019-02-13
| | * | | | | | | docs: give matomo an IDGraham Christensen2019-02-15
| | * | | | | | | Merge pull request #55649 from johanot/flannel-with-kubernetes-backendJaka Hudoklin2019-02-15
| | |\ \ \ \ \ \ \
| | | * | | | | | | nixos/flannel: node name needs to be configured for flannel to work with kube...Johan Thomsen2019-02-13
| | | * | | | | | | nixos/flannel: add options to configure kubernetes as config backend for flannelJohan Thomsen2019-02-12
| | * | | | | | | | Merge pull request #55667 from amazari/masterPeter Hoeg2019-02-15
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | zoneminder: fix build issue when using createLocally databaseAlexandre Mazari2019-02-12
| | | |/ / / / / / /
| | * | | | | | | | Merge pull request #55517 from florianjacob/cups-fix-ssl-dirSilvan Mosberger2019-02-14
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | nixos/cups: Fix Unable to encrypt connection:Florian Jacob2019-02-14
| | * | | | | | | | | Merge pull request #55301 from telotortium/tt-rss_disable_automatic_updatesSilvan Mosberger2019-02-14
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Remove option config.services.tt-rss.checkForUpdates (forced to false)Robert Irelan2019-02-05
| | * | | | | | | | | | Merge pull request #55540 from florianjacob/matomoSilvan Mosberger2019-02-14
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | nixos/matomo: 3.8.0 introduces matomo.{php,js} filesFlorian Jacob2019-02-11
| | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge pull request #47747 from florianjacob/matomo-archive-processing-serviceSilvan Mosberger2019-02-14
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | nixos/matomo: rename matomo_setup_update to matomo-setup-updateFlorian Jacob2018-12-09
| | | * | | | | | | | | | nixos/matomo: add automatic archive processingFlorian Jacob2018-12-09
| | * | | | | | | | | | | Merge pull request #55515 from rycee/wpa_supplicant_citerefentrySilvan Mosberger2019-02-14
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | nixos/wpa_supplicant: use `<citerefentry>`Robert Helgesson2019-02-10
| | | | |/ / / / / / / / | | | |/| | | | | | | |
* | | | | | | | | | | | Merge master into stagingFrederik Rietdijk2019-02-14
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #55138 from oxij/tree/random-fixesMichael Raskin2019-02-13
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | nixos: rippled: fix typeJan Malakhovski2019-02-03
| | * | | | | | | | | | | nixos: version: cleanup a bitJan Malakhovski2019-02-03
| | * | | | | | | | | | | nixos: rippled: fix indentJan Malakhovski2019-02-03