summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge master into staging-nextgithub-actions[bot]2021-09-14
|\
| * Merge pull request #133166 from symphorien/nonogroupGuillaume Girol2021-09-13
| |\
| | * nixos/tests/caddy.nix: fix evalGuillaume Girol2021-09-12
| | * nixos: add release notes about users.users.name.groupGuillaume Girol2021-09-12
| | * nixos: define the primary group of users where neededGuillaume Girol2021-09-12
| | * nixos/users-groups: don't default users.users.<name>.group to nogroupGuillaume Girol2021-09-03
* | | Merge remote-tracking branch 'origin/master' into staging-nextJonathan Ringer2021-09-13
|\| |
| * | Merge pull request #125404 from talyz/parsedmarcKim Lindberger2021-09-13
| |\ \
| | * | nixos/parsedmarc: Add manual entry and release notetalyz2021-09-13
| | * | nixos/parsedmarc: Add testtalyz2021-09-13
| | * | nixos/parsedmarc: Add NixOS moduletalyz2021-09-13
| | * | nixos/elasticsearch: Wait for elasticsearch to start up properlytalyz2021-09-13
| * | | nixos/top-level: fix crossAlyssa Ross2021-09-13
| |/ /
* | | Merge master into staging-nextgithub-actions[bot]2021-09-13
|\| |
| * | Merge pull request #136109 from john-consumable/masterSandro2021-09-13
| |\ \
| | * | nixos/datadog-agent: Note breaking changes in release notes.John Soo2021-09-11
| | * | nixos/datadog-agent: Update process collection binary.John Soo2021-09-11
| | * | datadog-agent: Add release note entry.John Soo2021-09-11
| * | | nixos/kernel: add 5.14 to kernel test-suiteMaximilian Bosch2021-09-12
| * | | Merge pull request #66415 from ToxicFrog/crossfireSandro2021-09-12
| |\ \ \
| | * | | nixos/deliantra-server: add settings module for Deliantra MMORPG serverB. Kelly2021-08-28
| | * | | nixos/crossfire-server: add settings module for Crossfire MMORPG serverB. Kelly2021-08-28
| * | | | Merge pull request #137132 from Ma27/pi-sudoMaximilian Bosch2021-09-12
| |\ \ \ \
| | * | | | nixos/privacyidea: use `sudo(8)` that's configured via the moduleMaximilian Bosch2021-09-08
* | | | | | Merge master into staging-nextgithub-actions[bot]2021-09-12
|\| | | | |
| * | | | | Merge pull request #135751 from zhaofengli/promtail-allow-positions-fileMaximilian Bosch2021-09-12
| |\ \ \ \ \
| | * | | | | nixos/promtail: Allow write access to positions file if not in CacheDirectoryZhaofeng Li2021-08-25
| * | | | | | Merge pull request #136615 from teto/lua-flatMatthieu Coudron2021-09-12
| |\ \ \ \ \ \
| | * | | | | | lua: add LUA_PATH changes to release notesMatthieu Coudron2021-09-12
| * | | | | | | treewide: remove danieldk as maintainer from a set of packagesDaniël de Kok2021-09-12
| * | | | | | | nixos/rabbitmq: clean-up after f091420c1d194ad398142959266f18493da1ff83ajs1242021-09-12
* | | | | | | | Merge master into staging-nextgithub-actions[bot]2021-09-12
|\| | | | | | |
| * | | | | | | Merge pull request #137444 from SuperSandro2000/wicdSandro2021-09-12
| |\ \ \ \ \ \ \
| | * | | | | | | treewide: yank wicd as it is abandonedSandro Jäckel2021-09-11
* | | | | | | | | Merge master into staging-nextgithub-actions[bot]2021-09-12
|\| | | | | | | |
| * | | | | | | | Merge pull request #137082 from bobby285271/markdownJörg Thalheim2021-09-12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos: nixos/doc/manual/installation/installing.xml to CommonMarkBobby Rong2021-09-12
| | * | | | | | | | nixos: nixos/doc/manual/development/writing-modules.xml to CommonMarkBobby Rong2021-09-08
| | * | | | | | | | nixos: nixos/doc/manual/configuration/profiles.xml to CommonMarkBobby Rong2021-09-08
| | * | | | | | | | nixos: nixos/doc/manual/configuration/networking.xml to CommonMarkBobby Rong2021-09-08
| | * | | | | | | | nixos: nixos/doc/manual/configuration/file-systems.xml to CommonMarkBobby Rong2021-09-08
| | * | | | | | | | nixos: nixos/doc/manual/configuration/package-mgmt.xml to CommonMarkBobby Rong2021-09-08
| | * | | | | | | | nixos: nixos/doc/manual/devlopment/nixos-tests.xml to CommonMarkBobby Rong2021-09-08
| | * | | | | | | | nixos: nixos/doc/manual/configuration/config-syntax.xml to CommonMarkBobby Rong2021-09-08
| | * | | | | | | | nixos: nixos/doc/manual/configuration/declarative-packages.xml to CommonMarkBobby Rong2021-09-08
| | * | | | | | | | nixos: nixos/doc/manual/administration/troubleshooting.xml to CommonMarkBobby Rong2021-09-08
| | * | | | | | | | nixos: nixos/doc/manual/administration/containers.xml to CommonMarkBobby Rong2021-09-08
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | nixos/kubernetes: add cni-plugin-flannel to kubelet.cni.packageszowoq2021-09-12
* | | | | | | | | Merge master into staging-nextgithub-actions[bot]2021-09-12
|\| | | | | | | |
| * | | | | | | | Merge pull request #137325 from figsoda/git-moduleTimothy DeHerrera2021-09-11
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |