Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge master into staging-next | github-actions[bot] | 2021-02-15 |
|\ | |||
| * | Merge pull request #113108 from Ma27/nextcloud-acme | Maximilian Bosch | 2021-02-15 |
| |\ | |||
| | * | nixos/nextcloud: fix regex to not return 404 on ACME challenges | Maximilian Bosch | 2021-02-14 |
| * | | Merge pull request #113187 from Ma27/nextcloud-dav | Maximilian Bosch | 2021-02-15 |
| |\ \ | |||
| | * | | nixos/nextcloud: redirect /.well-known/*dav to https url | Maximilian Bosch | 2021-02-15 |
* | | | | Merge master into staging-next | github-actions[bot] | 2021-02-15 |
|\| | | | |||
| * | | | Merge pull request #110627 from 4z3/use-real-user-name-for-per-user-packages | Lassulus | 2021-02-15 |
| |\ \ \ | |||
| | * | | | nixos/users: use proper name for per-user packages | tv | 2021-01-23 |
| * | | | | nixos/mastodon: fix mastodon-init-db script | Izorkin | 2021-02-15 |
| * | | | | nixos/mastodon: optimize permissions | Izorkin | 2021-02-15 |
| * | | | | nixos/mastodon: use unix socket to default | Izorkin | 2021-02-15 |
| * | | | | nixos/mastodon: add option trustedProxy | Izorkin | 2021-02-15 |
| | |/ / | |/| | | |||
* | | | | Merge master into staging-next | github-actions[bot] | 2021-02-15 |
|\| | | | |||
| * | | | Merge pull request #111695 from jansol/xow | Aaron Andersen | 2021-02-14 |
| |\ \ \ | |||
| | * | | | xow: fix service | Jan Solanti | 2021-02-03 |
* | | | | | Merge master into staging-next | github-actions[bot] | 2021-02-14 |
|\| | | | | |||
| * | | | | Fix typo in the GitLab smtp auth options docs | Jean-Paul Calderone | 2021-02-14 |
| * | | | | Merge pull request #112746 from mkg20001/qemu-extra-disks | Maciej Krüger | 2021-02-14 |
| |\ \ \ \ | |||
| | * | | | | nixosTests.*: update to use virtualisation.fileSystems | Maciej Krüger | 2021-02-14 |
| | * | | | | qemu-vm: add virtualisation.fileSystems to allow extra vm mounts | Maciej Krüger | 2021-02-11 |
* | | | | | | Merge master into staging-next | github-actions[bot] | 2021-02-14 |
|\| | | | | | |||
| * | | | | | nixos/switcheroo-control: add to modules-list.nix (#113052) | pasqui23 | 2021-02-14 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'master' into staging-next | Martin Weinelt | 2021-02-14 |
|\| | | | | |||
| * | | | | nixos/podman: install systemd files | zowoq | 2021-02-14 |
* | | | | | Merge master into staging-next | github-actions[bot] | 2021-02-13 |
|\| | | | | |||
| * | | | | Merge pull request #112801 from erosennin/prosody-tests | Ninjatrappeur | 2021-02-13 |
| |\ \ \ \ | |||
| | * | | | | nixos/prosody: fix broken tests | Andrey Golovizin | 2021-02-12 |
| | |/ / / | |||
| * | | | | nixos/jitsi-videobridge: add apis option (#112960) | Milan | 2021-02-13 |
* | | | | | Merge master into staging-next | github-actions[bot] | 2021-02-13 |
|\| | | | | |||
| * | | | | Merge pull request #107394 from yorickvP/beam-nox | Jörg Thalheim | 2021-02-13 |
| |\ \ \ \ | |||
| | * | | | | beam-packages: move wxSupport arg up to package set, add beam_nox | Yorick van Pelt | 2021-01-24 |
* | | | | | | Merge master into staging-next | github-actions[bot] | 2021-02-13 |
|\| | | | | | |||
| * | | | | | Merge pull request #112819 (mkIf in systemd units) | aszlig | 2021-02-13 |
| |\ \ \ \ \ | |||
| | * | | | | | nixos/systemd-lib: allow mkIf in unitOption | Jan Beinke | 2021-02-11 |
| | | |/ / / | | |/| | | | |||
* | | | | | | Merge master into staging-next | github-actions[bot] | 2021-02-13 |
|\| | | | | | |||
| * | | | | | treewide: update 21.03 to 21.05 | Luke Granger-Brown | 2021-02-12 |
| * | | | | | nixos/mastodon: set environment for mastodon-init-dirs (#112917) | erictapen | 2021-02-12 |
* | | | | | | Merge master into staging-next | github-actions[bot] | 2021-02-12 |
|\| | | | | | |||
| * | | | | | nixos/mastodon: init | Milan Pässler | 2021-02-12 |
* | | | | | | Merge master into staging-next | github-actions[bot] | 2021-02-12 |
|\| | | | | | |||
| * | | | | | Merge pull request #112019 from 7c6f434c/fix-service-runner | Michael Raskin | 2021-02-12 |
| |\ \ \ \ \ | |||
| | * | | | | | nixos/service-runner: fix evaluation | Michael Raskin | 2021-02-05 |
| * | | | | | | nixos/captive-browser: make it work without a fixed interface | Peter Hoeg | 2021-02-12 |
* | | | | | | | Merge master into staging-next | github-actions[bot] | 2021-02-12 |
|\| | | | | | | |||
| * | | | | | | Merge pull request #108511 from nagy/apache-lua-path-fix | Mario Rodas | 2021-02-11 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | nixos/httpd: fix lua paths | Daniel Nagy | 2021-02-11 |
* | | | | | | | | Merge master into staging-next | github-actions[bot] | 2021-02-12 |
|\| | | | | | | | |||
| * | | | | | | | Merge pull request #112660 from turion/dev_test_vscodium | Kevin Cox | 2021-02-11 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| | * | | | | | | tests/vscodium: Fix race condition | Manuel Bärenz | 2021-02-10 |
| | |/ / / / / | |||
* | | | | | | | Merge master into staging-next | github-actions[bot] | 2021-02-11 |
|\| | | | | | |