summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #121119 from SuperSandro2000/remove-gnidorahSandro2021-05-17
|\
| * treewide: remove gnidorahSandro Jäckel2021-04-30
* | treewide: remove nand0p as maintainerMartin Weinelt2021-05-17
* | Merge pull request #85073 from hyperfekt/systemd-pstoreFlorian Klink2021-05-17
|\ \
| * | nixos/systemd: enable systemd-pstore.servicehyperfekt2021-05-09
| * | nixos/filesystems: mount persistent storage to /sys/fs/pstorehyperfekt2021-05-09
* | | Merge pull request #122647 from onny/caddyAaron Andersen2021-05-16
|\ \ \
| * | | caddy: support user and group optionsJonas Heinrich2021-05-15
* | | | Merge pull request #122458 from serokell/team-serokellRobert Hensing2021-05-16
|\ \ \ \
| * | | | maintainers: add serokell team, move various packages to itYorick van Pelt2021-05-08
* | | | | nixos/containerd: StartLimit* options must be in the unit-sectionJohan Thomsen2021-05-17
* | | | | nixos/containerd: sanitize StateDirectory and RuntimeDirectoryJohan Thomsen2021-05-17
* | | | | Merge branch 'master' into staging-nextJan Tojnar2021-05-16
|\ \ \ \ \
| * \ \ \ \ Merge #123049: nixos/tests/minecraft-server: fix on i686Vladimír Čunát2021-05-16
| |\ \ \ \ \
| | * | | | | nixos/tests/minecraft-server: fix build on i686Milan Pässler2021-05-15
* | | | | | | Merge master into staging-nextgithub-actions[bot]2021-05-16
|\| | | | | |
| * | | | | | nixos/sway: Update the module documentationMichael Weiss2021-05-15
* | | | | | | Merge master into staging-nextgithub-actions[bot]2021-05-15
|\| | | | | |
| * | | | | | Merge pull request #123034 from primeos/sway-simplify-screen-sharingMichael Weiss2021-05-15
| |\ \ \ \ \ \
| | * | | | | | sway: Simplify screen sharingMichael Weiss2021-05-14
| | |/ / / / /
| * | | | | | nixos/factorio: update admin settingJonathan Ringer2021-05-15
* | | | | | | Merge master into staging-nextgithub-actions[bot]2021-05-15
|\| | | | | |
| * | | | | | Merge pull request #122658 from aanderse/httpd-reloadAaron Andersen2021-05-14
| |\ \ \ \ \ \
| | * | | | | | nixos/httpd: provide a stable path stable path to the configuration file for ...Aaron Andersen2021-05-11
| * | | | | | | Merge pull request #122255 from aanderse/kodiAaron Andersen2021-05-14
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | kodi: 19.0 -> 19.1Aaron Andersen2021-05-08
* | | | | | | | Merge branch 'master' into staging-nextVladimír Čunát2021-05-14
|\| | | | | | |
| * | | | | | | Merge pull request #120440 from dotlambda/radicale-settingsRobert Schütz2021-05-14
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/radicale: harden systemd unitRobert Schütz2021-05-04
| | * | | | | | | nixos/radicale: add settings optionRobert Schütz2021-05-04
| * | | | | | | | Merge pull request #122877 from primeos/nixos-tests-sway-gpg-agent-pinentryMichael Weiss2021-05-14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/tests/sway: test GPG's pinentry pop-upMichael Weiss2021-05-13
| * | | | | | | | | Merge pull request #91663 from mweinelt/kea-exporterWilliButz2021-05-14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | nixos/tests/prometheus-exporters.kea: initMartin Weinelt2021-05-14
| | * | | | | | | | | nixos/prometheus-kea-exporter: initMartin Weinelt2021-05-12
| * | | | | | | | | | nix: 2.3.10 -> 2.3.11Eelco Dolstra2021-05-14
| * | | | | | | | | | Revert "Revert "Revert "nix: 2.3.10 -> 2.3.11"""Alyssa Ross2021-05-14
| * | | | | | | | | | Revert "Revert "nix: 2.3.10 -> 2.3.11""Eelco Dolstra2021-05-14
| * | | | | | | | | | Revert "nix: 2.3.10 -> 2.3.11"Alyssa Ross2021-05-14
| * | | | | | | | | | nix: 2.3.10 -> 2.3.11Eelco Dolstra2021-05-14
| * | | | | | | | | | nixos/tests/dendrite: init (#121777)Michael Lingelbach2021-05-14
* | | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2021-05-14
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #110435 from superloach/patch-2Samuel Dionne-Riel2021-05-13
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | nixos/modules: add "sdhci_pci" to availableKernelModulesTerra Brown2021-01-21
| * | | | | | | | | | | nixos/zfs: Add defaultText for 'boot.zfs.package'-option (#122002)Jens Nolte2021-05-13
| * | | | | | | | | | | Merge pull request #122637 from mayflower/prometheus-2.26.0Maximilian Bosch2021-05-13
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | prometheus-exporter tests: fix eval/deprecationRobin Gloster2021-05-11
| | * | | | | | | | | | | prometheus-collectd-exporter: fix options for new versionRobin Gloster2021-05-11
| | * | | | | | | | | | | prometheus-bind-exporter: fix options for new versionRobin Gloster2021-05-11
| | * | | | | | | | | | | prometheus-rspamd-exporter: fix for new json exporter syntaxRobin Gloster2021-05-11