summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge master into staging-nextgithub-actions[bot]2021-02-15
|\
| * Merge pull request #113108 from Ma27/nextcloud-acmeMaximilian Bosch2021-02-15
| |\
| | * nixos/nextcloud: fix regex to not return 404 on ACME challengesMaximilian Bosch2021-02-14
| * | Merge pull request #113187 from Ma27/nextcloud-davMaximilian Bosch2021-02-15
| |\ \
| | * | nixos/nextcloud: redirect /.well-known/*dav to https urlMaximilian Bosch2021-02-15
* | | | Merge master into staging-nextgithub-actions[bot]2021-02-15
|\| | |
| * | | Merge pull request #110627 from 4z3/use-real-user-name-for-per-user-packagesLassulus2021-02-15
| |\ \ \
| | * | | nixos/users: use proper name for per-user packagestv2021-01-23
| * | | | nixos/mastodon: fix mastodon-init-db scriptIzorkin2021-02-15
| * | | | nixos/mastodon: optimize permissionsIzorkin2021-02-15
| * | | | nixos/mastodon: use unix socket to defaultIzorkin2021-02-15
| * | | | nixos/mastodon: add option trustedProxyIzorkin2021-02-15
| | |/ / | |/| |
* | | | Merge master into staging-nextgithub-actions[bot]2021-02-15
|\| | |
| * | | Merge pull request #111695 from jansol/xowAaron Andersen2021-02-14
| |\ \ \
| | * | | xow: fix serviceJan Solanti2021-02-03
* | | | | Merge master into staging-nextgithub-actions[bot]2021-02-14
|\| | | |
| * | | | Fix typo in the GitLab smtp auth options docsJean-Paul Calderone2021-02-14
| * | | | Merge pull request #112746 from mkg20001/qemu-extra-disksMaciej Krüger2021-02-14
| |\ \ \ \
| | * | | | nixosTests.*: update to use virtualisation.fileSystemsMaciej Krüger2021-02-14
| | * | | | qemu-vm: add virtualisation.fileSystems to allow extra vm mountsMaciej Krüger2021-02-11
* | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-14
|\| | | | |
| * | | | | nixos/switcheroo-control: add to modules-list.nix (#113052)pasqui232021-02-14
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into staging-nextMartin Weinelt2021-02-14
|\| | | |
| * | | | nixos/podman: install systemd fileszowoq2021-02-14
* | | | | Merge master into staging-nextgithub-actions[bot]2021-02-13
|\| | | |
| * | | | Merge pull request #112801 from erosennin/prosody-testsNinjatrappeur2021-02-13
| |\ \ \ \
| | * | | | nixos/prosody: fix broken testsAndrey Golovizin2021-02-12
| | |/ / /
| * | | | nixos/jitsi-videobridge: add apis option (#112960)Milan2021-02-13
* | | | | Merge master into staging-nextgithub-actions[bot]2021-02-13
|\| | | |
| * | | | Merge pull request #107394 from yorickvP/beam-noxJörg Thalheim2021-02-13
| |\ \ \ \
| | * | | | beam-packages: move wxSupport arg up to package set, add beam_noxYorick van Pelt2021-01-24
* | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-13
|\| | | | |
| * | | | | Merge pull request #112819 (mkIf in systemd units)aszlig2021-02-13
| |\ \ \ \ \
| | * | | | | nixos/systemd-lib: allow mkIf in unitOptionJan Beinke2021-02-11
| | | |/ / / | | |/| | |
* | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-13
|\| | | | |
| * | | | | treewide: update 21.03 to 21.05Luke Granger-Brown2021-02-12
| * | | | | nixos/mastodon: set environment for mastodon-init-dirs (#112917)erictapen2021-02-12
* | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-12
|\| | | | |
| * | | | | nixos/mastodon: initMilan Pässler2021-02-12
* | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-12
|\| | | | |
| * | | | | Merge pull request #112019 from 7c6f434c/fix-service-runnerMichael Raskin2021-02-12
| |\ \ \ \ \
| | * | | | | nixos/service-runner: fix evaluationMichael Raskin2021-02-05
| * | | | | | nixos/captive-browser: make it work without a fixed interfacePeter Hoeg2021-02-12
* | | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-12
|\| | | | | |
| * | | | | | Merge pull request #108511 from nagy/apache-lua-path-fixMario Rodas2021-02-11
| |\ \ \ \ \ \
| | * | | | | | nixos/httpd: fix lua pathsDaniel Nagy2021-02-11
* | | | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-12
|\| | | | | | |
| * | | | | | | Merge pull request #112660 from turion/dev_test_vscodiumKevin Cox2021-02-11
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | tests/vscodium: Fix race conditionManuel Bärenz2021-02-10
| | |/ / / / /
* | | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-11
|\| | | | | |