summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge branch 'master' into staging-nextMartin Weinelt2021-06-22
|\
| * Merge pull request #127628 from blaggacao/da/fix-constant-nixos-revisionRobert Hensing2021-06-21
| |\
| | * nixosTest: Force system.nixos.revision constantDavid Arnold2021-06-21
| * | doc: point out that nixos-21.05 has gnuradio 3.9Bjørn Forsman2021-06-21
| * | Merge pull request #92378 from jnetod/zfs-smb-share-fixJörg Thalheim2021-06-21
| |\ \
| | * | Update nixos/tests/zfs.nixJörg Thalheim2021-06-18
| | * | nixos/zfs: add tests for sambaJörg Thalheim2021-06-11
| * | | Merge pull request #127545 from liff/antlr/v4-is-defaultSandro2021-06-20
| |\ \ \
| | * | | antlr: make 4.8 defaultOlli Helenius2021-06-20
| * | | | doc: fix link to kodi-19.0 announcementBjørn Forsman2021-06-20
| * | | | Merge pull request #126284 from aanderse/zabbix-user-paramsSandro2021-06-20
| |\ \ \ \
| | * | | | zabbixAgent: add bash to $PATHAaron Andersen2021-06-08
| * | | | | Merge pull request #127063 from talyz/fail2ban-restartSandro2021-06-20
| |\ \ \ \ \
| | * | | | | nixos/fail2ban: Remove `reloadIfChanged = true`talyz2021-06-16
* | | | | | | Merge master into staging-nextgithub-actions[bot]2021-06-20
|\| | | | | |
| * | | | | | nixos/jitsi-meet: update nixos testsillustris2021-06-20
| * | | | | | nixos/jitsi-meet: include jitsi prosody plugins in prosody extraPluginPathsillustris2021-06-20
| * | | | | | nixos/jitsi-meet: Update jitsi prosody configsillustris2021-06-20
| | |_|/ / / | |/| | | |
* | | | | | Merge master into staging-nextgithub-actions[bot]2021-06-19
|\| | | | |
| * | | | | Merge pull request #127127 from mweinelt/home-assistantMartin Weinelt2021-06-18
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | nixos/home-assistant: update hardeningMartin Weinelt2021-06-16
* | | | | | Merge master into staging-nextgithub-actions[bot]2021-06-18
|\| | | | |
| * | | | | Merge pull request #127309 from jakobrs/nixos-normalise-nullKim Lindberger2021-06-18
| |\ \ \ \ \
| | * | | | | nixos/lib: Handle null `device` correctlyjakobrs2021-06-18
| * | | | | | Merge pull request #125598 from zowoq/podmanadisbladis2021-06-18
| |\ \ \ \ \ \
| | * | | | | | nixos/podman/tests: add workaround for broken importzowoq2021-06-18
| * | | | | | | nixos/test-driver: Fix passing passthru attributeaszlig2021-06-18
* | | | | | | | Merge master into staging-nextgithub-actions[bot]2021-06-18
|\| | | | | | |
| * | | | | | | nixos/doc: Synchronize the Markdown generator with NixpkgsJan Tojnar2021-06-18
* | | | | | | | Merge staging-next into staginggithub-actions[bot]2021-06-16
|\| | | | | | |
| * | | | | | | Merge pull request #125973 from blaggacao/nixos-test-ref/02-normalise-test-dr...Jacek Galowicz2021-06-16
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/tests/test-driver: cleanup nix expressionDavid Arnold2021-06-13
| * | | | | | | | Merge pull request #124566 from mweinelt/synapse-jemallocSandro2021-06-16
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | nixos/matrix-synapse: allow preloading jemallocMartin Weinelt2021-06-03
* | | | | | | | | Merge branch 'staging-next' into stagingJan Tojnar2021-06-16
|\| | | | | | | |
| * | | | | | | | nixos/grafana: Change services.grafana.provision.datasources.*.type to be ope...Erik Skytthe2021-06-16
| * | | | | | | | Merge pull request #126785 from oxzi/ucarp-1.5.2markuskowa2021-06-16
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | nixos/test/ucarp: initAlvar Penning2021-06-15
| | * | | | | | | nixos/ucarp: initAlvar Penning2021-06-15
| * | | | | | | | Merge pull request #127025 (fix overlayfs test)aszlig2021-06-16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/tests/overlayfs: Use individual commandsaszlig2021-06-16
| | * | | | | | | | nixos/tests/overlayfs: Fix erroneous backslashesaszlig2021-06-16
| * | | | | | | | | Merge pull request #126307 from ratsclub/dotnetPackages-cleanupSandro2021-06-16
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | nixos/dotnetPackages: remove packagesVictor Freire2021-06-14
| * | | | | | | | | | Merge pull request #126874 from legendofmiracles/espanso-cleanupSandro2021-06-16
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | espanso: add runtime dependencies correctly, nixos/espanso remove path hacklegendofmiracles2021-06-14
| | |/ / / / / / / /
| * | | | | | | | | nixos/solanum: implement reload and allow config changesMartin Weinelt2021-06-16
| * | | | | | | | | Merge pull request #125011 from Xe/Xe/solanum-motdMartin Weinelt2021-06-16
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | solanum: fix MOTDChristine Dodrill2021-05-30
| * | | | | | | | | | Merge pull request #126922 from hercules-ci/ssh-keys-exampleRobert Hensing2021-06-15
| |\ \ \ \ \ \ \ \ \ \