about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2021-05-16Merge branch 'master' into staging-nextJan Tojnar1-1/+1
2021-05-16Merge #123049: nixos/tests/minecraft-server: fix on i686Vladimír Čunát1-1/+1
2021-05-16Merge master into staging-nextgithub-actions[bot]1-8/+13
2021-05-15nixos/sway: Update the module documentationMichael Weiss1-8/+13
2021-05-15Merge master into staging-nextgithub-actions[bot]2-2/+15
2021-05-15Merge pull request #123034 from primeos/sway-simplify-screen-sharingMichael Weiss1-1/+3
2021-05-15nixos/factorio: update admin settingJonathan Ringer1-1/+12
2021-05-15Merge master into staging-nextgithub-actions[bot]2-8/+10
2021-05-14Merge pull request #122658 from aanderse/httpd-reloadAaron Andersen1-7/+9
2021-05-14Merge pull request #122255 from aanderse/kodiAaron Andersen1-1/+1
2021-05-15nixos/tests/minecraft-server: fix build on i686Milan Pässler1-1/+1
2021-05-14sway: Simplify screen sharingMichael Weiss1-1/+3
2021-05-14Merge branch 'master' into staging-nextVladimír Čunát10-175/+456
2021-05-14Merge pull request #120440 from dotlambda/radicale-settingsRobert Schütz3-171/+248
2021-05-14Merge pull request #122877 from primeos/nixos-tests-sway-gpg-agent-pinentryMichael Weiss1-0/+14
2021-05-14Merge pull request #91663 from mweinelt/kea-exporterWilliButz3-0/+90
2021-05-14nix: 2.3.10 -> 2.3.11Eelco Dolstra1-4/+4
2021-05-14nixos/tests/prometheus-exporters.kea: initMartin Weinelt1-0/+51
2021-05-14Revert "Revert "Revert "nix: 2.3.10 -> 2.3.11"""Alyssa Ross1-4/+4
2021-05-14Revert "Revert "nix: 2.3.10 -> 2.3.11""Eelco Dolstra1-4/+4
2021-05-14Revert "nix: 2.3.10 -> 2.3.11"Alyssa Ross1-4/+4
2021-05-14nix: 2.3.10 -> 2.3.11Eelco Dolstra1-4/+4
2021-05-14nixos/tests/dendrite: init (#121777)Michael Lingelbach2-0/+100
2021-05-14Merge master into staging-nextgithub-actions[bot]8-24/+44
2021-05-13Merge pull request #110435 from superloach/patch-2Samuel Dionne-Riel1-0/+3
2021-05-13nixos/zfs: Add defaultText for 'boot.zfs.package'-option (#122002)Jens Nolte1-0/+1
2021-05-13Merge pull request #122637 from mayflower/prometheus-2.26.0Maximilian Bosch4-20/+20
2021-05-13Merge pull request #122627 from primeos/nixos-tests-signal-desktop-db-encryptionMichael Weiss1-2/+14
2021-05-13nixos/tests/signal-desktop: test if the SQLite DB is (un)encryptedMichael Weiss1-2/+14
2021-05-13nixos/tests/sway: test GPG's pinentry pop-upMichael Weiss1-0/+14
2021-05-13Merge pull request #122605 from primeos/nixos-sway-extend-default-configurationMichael Weiss1-2/+6
2021-05-13Merge master into staging-nextgithub-actions[bot]2-3/+3
2021-05-13mkShell: introduce packages argument (#122180)Jonas Chevalier1-1/+1
2021-05-13nixos/docker: fix evaluation when NAT is enabled tooLuke Granger-Brown1-2/+2
2021-05-12nixos/prometheus-kea-exporter: initMartin Weinelt2-0/+39
2021-05-12Merge master into staging-nextgithub-actions[bot]1-1/+22
2021-05-12nixos/mirakurun: add polkit rule for smart card access (#122066)midchildan1-1/+22
2021-05-12Merge master into staging-nextgithub-actions[bot]1-0/+1
2021-05-11nixos/httpd: provide a stable path stable path to the configuration file for ...Aaron Andersen1-7/+9
2021-05-12Merge pull request #122438 from xaverdh/linux-5.12davidak1-0/+1
2021-05-11prometheus-exporter tests: fix eval/deprecationRobin Gloster1-3/+3
2021-05-11prometheus-collectd-exporter: fix options for new versionRobin Gloster1-9/+9
2021-05-11prometheus-bind-exporter: fix options for new versionRobin Gloster1-6/+6
2021-05-11prometheus-rspamd-exporter: fix for new json exporter syntaxRobin Gloster1-1/+1
2021-05-11nixos/sway: Extend the default configuration for NixOSMichael Weiss1-2/+6
2021-05-11Merge master into staging-nextgithub-actions[bot]1-2/+8
2021-05-11nixos/tor: fix HidServAuth (#122439)Tom1-2/+8
2021-05-11Merge master into staging-nextgithub-actions[bot]1-7/+17
2021-05-11Merge pull request #122423 from Izorkin/update-netdataJörg Thalheim1-7/+17
2021-05-10prometheus-json-exporter: 0.2.0 -> 0.3.0Robin Gloster1-1/+1