about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #85781 from blitz/spike-testJacek Galowicz2020-04-25
|\
| * spike: add test to nixosTestsJulian Stecklina2020-04-22
* | Merge pull request #85813 from johnae/fix-k3s-systemd-unitslewo2020-04-25
|\ \
| * | The systemd unit for k3s should differ between agents and serversJohn Axel Eriksson2020-04-23
* | | Revert "ibus: fix dconf db installation"worldofpeace2020-04-24
* | | Merge pull request #85892 from symphorien/ibus-dbworldofpeace2020-04-24
|\ \ \
| * | | nixos/tests/ibus: fix testSymphorien Gibol2020-04-24
| * | | ibus: fix installation of dconf databaseSymphorien Gibol2020-04-24
* | | | Merge pull request #84242 from gnidorah/qtworldofpeace2020-04-24
|\ \ \ \
| * | | | nixos/qt5: support adwaita-dark themegnidorah2020-04-05
* | | | | nixos/cri-o: share registries with nixos/containerszowoq2020-04-24
* | | | | nixos/podman: Add rootless containers to testadisbladis2020-04-24
* | | | | Merge pull request #85894 from zowoq/podman-crioadisbladis2020-04-24
|\ \ \ \ \
| * | | | | nixos/cri-o: update maintainerszowoq2020-04-24
* | | | | | nixos/containers: move libpod to nixos/podmanzowoq2020-04-24
|/ / / / /
* | | | | Merge pull request #85832 from benley/benley/grub-serialFlorian Klink2020-04-23
|\ \ \ \ \
| * | | | | installer test: Fix grub extraConfig syntaxBenjamin Staffin2020-04-22
* | | | | | Merge pull request #85735 from nh2/journald-storage-limit-logsFlorian Klink2020-04-23
|\ \ \ \ \ \
| * | | | | | journald service: Add helpful comments about the journal getting fullNiklas Hambüchen2020-04-23
* | | | | | | Merge pull request #85822 from zowoq/cni-collisionadisbladis2020-04-23
|\ \ \ \ \ \ \
| * | | | | | | nixos/podman: remove cni-plugins from environment.systemPackageszowoq2020-04-23
| * | | | | | | nixos/cri-o: remove cni-plugins from environment.systemPackageszowoq2020-04-23
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 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