about summary refs log tree commit diff
path: root/nixos/modules
Commit message (Expand)AuthorAge
* Merge staging-next into stagingFrederik Rietdijk2019-02-21
|\
| * Merge pull request #45670 from johanot/kubernetes-1.11Franz Pletz2019-02-20
| |\
| | * nixos/kubernetes: fix flannel and kubelet startupJaka Hudoklin2019-02-21
| | * nixos/kubernetes: bootstrap docker without networkingFranz Pletz2019-02-20
| | * nixos/kubernetes: use system.path to handle dependency on flannel subnet.envJohan Thomsen2019-02-20
| | * nixos/kubernetes: let flannel use kubernetes as storage backendJohan Thomsen2019-02-20
| | * nixos/kubernetes: CoreDNS privileges has to be assigned by addon manager boot...Johan Thomsen2019-02-20
| | * nixos/kubernetes: use the certmgr-selfsigned variantJohan Thomsen2019-02-20
| | * nixos/kubernetes: major module refactorJohan Thomsen2019-02-20
| * | Merge pull request #56046 from callahad/boltTor Hedin Brønner2019-02-20
| |\ \ | | |/ | |/|
| | * nixos/gnome3: enable bolt by defaultDan Callahan2019-02-19
| | * nixos/bolt: init at 0.7Dan Callahan2019-02-19
| * | nixos/httpd: update documentation to reflect changes from https://github.com/...aanderse2019-02-20
| * | Merge branch 'staging-next'Vladimír Čunát2019-02-20
| |\ \
| | * \ Merge branch 'master' into staging-nextVladimír Čunát2019-02-19
| | |\ \
| | * \ \ Merge master into staging-nextFrederik Rietdijk2019-02-18
| | |\ \ \
| | * \ \ \ Merge branch 'master' into staging-nextVladimír Čunát2019-02-17
| | |\ \ \ \
| * | \ \ \ \ Merge pull request #56062 from elseym/jackett-moduleElis Hirwing2019-02-20
| |\ \ \ \ \ \
| | * | | | | | jackett module: add more options and refactorelseym2019-02-19
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #56061 from elseym/radarr-moduleElis Hirwing2019-02-20
| |\ \ \ \ \ \
| | * | | | | | radarr module: add more options and refactorelseym2019-02-19
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #47334 from bfortz/autojumpDomen Kožar2019-02-20
| |\ \ \ \ \ \
| | * | | | | | autojump: autoload when programs.autojump.enable is set.Bernard Fortz2018-09-26
| | * | | | | | autodump: pulling package when programs.autojump.enable is trueBernard Fortz2018-09-25
| | * | | | | | autojump: creates links required by oh-my-zsh for autojump.Bernard Fortz2018-09-25
| * | | | | | | Merge pull request #54917 from peterhoeg/f/vmwarePeter Hoeg2019-02-20
| |\ \ \ \ \ \ \
| | * | | | | | | vmware: move from servers to virtualisation where it belongsPeter Hoeg2018-05-28
| * | | | | | | | Merge pull request #56076 from telotortium/patch-1Florian Klink2019-02-20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | tt-rss: Fix syntax error in config.php DB_PASS fieldRobert Irelan2019-02-19
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #56072 from bgamari/gitlab-database-configFlorian Klink2019-02-20
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | nixos/gitlab: Introduce database pool size optionBen Gamari2019-02-19
| * | | | | | | | Merge pull request #56001 from johanot/coredns-1.3.1-dashboard-1.10.1Sarah Brofeldt2019-02-19
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | nixos/kubernetes: dashboard 1.8.3 -> 1.10.1Johan Thomsen2019-02-18
| | * | | | | | | nixos/kubernetes: coredns 1.2.5 -> 1.3.1Johan Thomsen2019-02-18
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | 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