about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2021-02-15Merge staging-next into staginggithub-actions[bot]1-3/+3
2021-02-15Merge master into staging-nextgithub-actions[bot]1-3/+3
2021-02-15Merge pull request #113108 from Ma27/nextcloud-acmeMaximilian Bosch1-1/+1
2021-02-15Merge pull request #113187 from Ma27/nextcloud-davMaximilian Bosch1-2/+2
2021-02-15Merge staging-next into staginggithub-actions[bot]2-42/+66
2021-02-15Merge master into staging-nextgithub-actions[bot]2-42/+66
2021-02-15Merge pull request #110627 from 4z3/use-real-user-name-for-per-user-packagesLassulus1-1/+1
2021-02-15nixos/mastodon: fix mastodon-init-db scriptIzorkin1-1/+1
2021-02-15nixos/mastodon: optimize permissionsIzorkin1-32/+25
2021-02-15nixos/mastodon: use unix socket to defaultIzorkin1-8/+27
2021-02-15nixos/mastodon: add option trustedProxyIzorkin1-0/+12
2021-02-15nixos/nextcloud: redirect /.well-known/*dav to https urlMaximilian Bosch1-2/+2
2021-02-15Merge staging-next into staginggithub-actions[bot]1-0/+3
2021-02-15Merge master into staging-nextgithub-actions[bot]1-0/+3
2021-02-14Merge pull request #111695 from jansol/xowAaron Andersen1-0/+3
2021-02-14Merge staging-next into staginggithub-actions[bot]16-17/+20
2021-02-14Merge master into staging-nextgithub-actions[bot]16-17/+20
2021-02-14Fix typo in the GitLab smtp auth options docsJean-Paul Calderone1-1/+1
2021-02-14Merge pull request #112746 from mkg20001/qemu-extra-disksMaciej Krüger15-16/+19
2021-02-14nixosTests.*: update to use virtualisation.fileSystemsMaciej Krüger14-15/+15
2021-02-14nixos/nextcloud: fix regex to not return 404 on ACME challengesMaximilian Bosch1-1/+1
2021-02-14Merge staging-next into staginggithub-actions[bot]2-0/+11
2021-02-14Merge master into staging-nextgithub-actions[bot]1-0/+1
2021-02-14nixos/switcheroo-control: add to modules-list.nix (#113052)pasqui231-0/+1
2021-02-14Merge branch 'master' into staging-nextMartin Weinelt1-0/+10
2021-02-14nixos/podman: install systemd fileszowoq1-0/+10
2021-02-13Merge staging-next into staginggithub-actions[bot]3-4/+36
2021-02-13Merge master into staging-nextgithub-actions[bot]3-4/+36
2021-02-13Merge pull request #112801 from erosennin/prosody-testsNinjatrappeur2-3/+25
2021-02-13nixos/jitsi-videobridge: add apis option (#112960)Milan1-1/+11
2021-02-13Merge staging-next into staginggithub-actions[bot]1-0/+1
2021-02-13Merge master into staging-nextgithub-actions[bot]1-0/+1
2021-02-13Merge pull request #107394 from yorickvP/beam-noxJörg Thalheim1-0/+1
2021-02-13Merge staging-next into staginggithub-actions[bot]1-2/+4
2021-02-13Merge master into staging-nextgithub-actions[bot]1-2/+4
2021-02-13Merge pull request #112819 (mkIf in systemd units)aszlig1-2/+4
2021-02-13Merge staging-next into staginggithub-actions[bot]8-13/+24
2021-02-13Merge master into staging-nextgithub-actions[bot]8-13/+24
2021-02-12treewide: update 21.03 to 21.05Luke Granger-Brown7-13/+23
2021-02-12nixos/mastodon: set environment for mastodon-init-dirs (#112917)erictapen1-0/+1
2021-02-12Merge staging-next into staginggithub-actions[bot]2-0/+542
2021-02-12Merge master into staging-nextgithub-actions[bot]2-0/+542
2021-02-12nixos/mastodon: initMilan Pässler2-0/+542
2021-02-12Merge staging-next into staginggithub-actions[bot]2-43/+47
2021-02-12Merge master into staging-nextgithub-actions[bot]2-43/+47
2021-02-12Merge pull request #111786 from flokli/systemd-247.3Florian Klink1-11/+1
2021-02-12Merge pull request #112019 from 7c6f434c/fix-service-runnerMichael Raskin1-2/+2
2021-02-12nixos/captive-browser: make it work without a fixed interfacePeter Hoeg1-41/+45
2021-02-12Merge master into staging-nextgithub-actions[bot]1-4/+8
2021-02-12nixos/prosody: fix broken testsAndrey Golovizin2-3/+25