about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #85815 from arianvp/fix-85800Florian Klink2020-04-23
|\
| * nixos/datadog-agent: Fix restartTriggersArian van Putten2020-04-23
| * nixos/networkd: Fix restartTriggersArian van Putten2020-04-23
* | Merge master into staging-nextFrederik Rietdijk2020-04-23
|\ \
| * \ Merge pull request #80103 from tfc/port-systemd-confinement-testFlorian Klink2020-04-23
| |\ \
| | * | nixosTests.systemd-confinement: Port to PythonJacek Galowicz2020-02-27
| * | | nixos/manual: fix buildPiotr Bogdan2020-04-22
| | |/ | |/|
* | | Merge master into staging-nextFrederik Rietdijk2020-04-22
|\| |
| * | Merge pull request #79840 from knl/update-oauth2_proxy-to-5.0.0Bas van Dijk2020-04-22
| |\ \
| | * | oauth2_proxy: Update NixOS moduleNikola Knezevic2020-04-20
| * | | Merge pull request #85746 from iblech/patch-11Jörg Thalheim2020-04-22
| |\ \ \
| | * | | nixos-containers: add docs about nested containersIngo Blechschmidt2020-04-22
| * | | | nixosTests.redmine: Port to pythonJacek Galowicz2020-04-22
| |/ / /
| * | | Merge pull request #85402 from jtojnar/httpd-phpJan Tojnar2020-04-22
| |\ \ \
| | * | | nixos/httpd: remove unnecessary overrideJan Tojnar2020-04-17
| | * | | nixosTests.php.fpm: Clean up to match httpd testJan Tojnar2020-04-17
| | * | | nixosTests.php.pcre: Clean upJan Tojnar2020-04-17
| | * | | nixosTests.php.httpd: initJan Tojnar2020-04-17
| | * | | nixos/httpd: Use extensions from php packageJan Tojnar2020-04-17
| * | | | Fix typos (#85693)Alexandre Esteves2020-04-22
| * | | | Merge pull request #85710 from worldofpeace/gnome-iso-wayland-defaultworldofpeace2020-04-21
| |\ \ \ \
| | * | | | installation-cd-graphical-gnome: don't run xorg defaultworldofpeace2020-04-21
| * | | | | Update link in /etc/os-release (#85723)davidak2020-04-22
| * | | | | rl-2003: Update the release documentationIsmaël Bouya2020-04-21
| * | | | | Merge pull request #85604 from adisbladis/podman-moduleadisbladis2020-04-21
| |\ \ \ \ \
| | * | | | | nixos.virtualisation.containers: Init common /etc/containers configuration mo...adisbladis2020-04-21
| | * | | | | nixos.virtualisation: Move containers.nix to nixos-containers.nixadisbladis2020-04-21
| | * | | | | nixos/podman: Add maintainer team & add myself to podman teamadisbladis2020-04-21
| | * | | | | nixos/virtualisation.podman: Init moduleadisbladis2020-04-21
| * | | | | | Merge pull request #85598 from danderson/tailscale-fix-cachedirFlorian Klink2020-04-21
| |\ \ \ \ \ \
| | * | | | | | nixos/tailscale: set a CacheDir in the systemd unit.David Anderson2020-04-20
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #85708 from Beskhue/fix-documentationFlorian Klink2020-04-21
| |\ \ \ \ \ \
| | * | | | | | nixos/phpfpm: fix erroneous pools exampleThomas Churchman2020-04-21
| * | | | | | | Merge pull request #73505 from tomfitzhenry/networkd-dhcp-server-testFlorian Klink2020-04-21
| |\ \ \ \ \ \ \
| | * | | | | | | systemd-networkd: add DHCPServer testTom Fitzhenry2020-04-22
| | |/ / / / / /
| * | | | / / / nixos/manual: fix buildworldofpeace2020-04-21
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #85692 from nh2/systemd-update-default-rate-limitFlorian Klink2020-04-21
| |\ \ \ \ \ \
| | * | | | | | journald service: Increase default rate limit 1000 -> 10000.Niklas Hambüchen2020-04-21
* | | | | | | | Merge master into staging-nextFrederik Rietdijk2020-04-21
|\| | | | | | |
| * | | | | | | Merge pull request #85643 from petabyteboy/feature/generate-configworldofpeace2020-04-21
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/tools: adapt for renamed console optionsMilan Pässler2020-04-21
| * | | | | | | | Merge pull request #85685 from nh2/remove-unused-allSupportedNixpkgsDomen Kožar2020-04-21
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | release-combined: Remove unused value `allSupportedNixpkgs`.Niklas Hambüchen2020-04-21
| | | |/ / / / / | | |/| | | | |
| * | | | | | | treewide: add bool type to enable options, or make use of mkEnableOptionDominik Xaver Hörl2020-04-21
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge staging-next into stagingFrederik Rietdijk2020-04-21
|\| | | | | |
| * | | | | | Merge pull request #83769 from dadada/nixos/dokuwiki-multi-serverMarek Mahut2020-04-20
| |\ \ \ \ \ \
| | * | | | | | nixos/dokuwiki: change default of aclFile and usersFiledadada2020-04-18
| | * | | | | | nixos/dokuwiki: modify usersFile and aclFiledadada2020-04-18
| | * | | | | | nixos/dokuwiki: dokuwiki userdadada2020-04-18
| | * | | | | | nixos/dokuwiki: add option disableActionsdadada2020-04-18