summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* tree-wide: Switch from gnome3.maintainers to lib.teams.gnomeJan Tojnar2020-04-01
* Merge branch 'master' into staging-nextJan Tojnar2020-03-31
|\
| * Merge pull request #83732 from jansol/xowJan Tojnar2020-03-31
| |\
| | * xow: 0.2 -> 0.4Jan Solanti2020-03-31
| | * xow: init at 0.2Philipp Middendorf2020-03-30
| * | Merge pull request #83765 from Izorkin/mariadb-testFlorian Klink2020-03-31
| |\ \
| | * | nixos/mysql: add test mariadb with rocksdb pluginIzorkin2020-03-31
| | * | nixos/mysql: add test mariadb with tokudb pluginIzorkin2020-03-30
| | |/
| * | Merge pull request #74379 from bachp/gitlab-runner-reloadFlorian Klink2020-03-31
| |\ \
| | * | nixos/gitlab-runner: reload on config changeBen Gamari2019-11-27
| * | | Merge pull request #83704 from Ma27/acme-containerMaximilian Bosch2020-03-31
| |\ \ \
| | * | | nixos/acme: don't depend on multi-user.target inside a containerMaximilian Bosch2020-03-29
| * | | | Merge pull request #83768 from mmahut/magic-wormhole-mailbox-serverMarek Mahut2020-03-31
| |\ \ \ \
| | * | | | nixos/tests: add magic-wormhole-mailbox-serverMarek Mahut2020-03-30
| | * | | | nixos/magic-wormhole-mailbox-server: initMarek Mahut2020-03-30
| | | |_|/ | | |/| |
| * | | | Merge pull request #77478 from artemist/nixos-factorioDmitry Kalinkin2020-03-30
| |\ \ \ \
| | * | | | nixos/factorio: add extraSettings and package optionsArtemis Tosini2020-01-10
| * | | | | Merge pull request #81161 from wedens/libvirt-6.0.0Robin Gloster2020-03-30
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | libvirt: fix escapeShellArg usageRobin Gloster2020-03-30
| | * | | | nixos/scripted-networking: fix bridge setup when libvirtd uses socket activationvolth2020-03-15
| | * | | | libvirt: 6.0.0 -> 6.1.0, fix modulevolth2020-03-15
| * | | | | nixos/azure: clarify how users work in basic exampleCole Mickens2020-03-29
| * | | | | nixos/azure: upload-image.sh cleanup $1 handlingCole Mickens2020-03-29
| * | | | | nixos/azure: upload-image names the image betterCole Mickens2020-03-29
| * | | | | nixos/azure: simplify example imageCole Mickens2020-03-29
| * | | | | azure: init nixos/maintainers/scripts/azure-newCole Mickens2020-03-29
| * | | | | azure: boot.growPartition = trueCole Mickens2020-03-29
| * | | | | nixos/azure: add diskSize module optionCole Mickens2020-03-29
| * | | | | Merge pull request #83653 from nlewo/nextcloud-firstrunwizardMaximilian Bosch2020-03-29
| |\ \ \ \ \
| | * | | | | nixos/nextcloud: add bcmap, mp4 and webm in nginx configurationAntoine Eiche2020-03-29
| * | | | | | Merge pull request #83633 from zarelit/fix_literalExampleMaximilian Bosch2020-03-29
| |\ \ \ \ \ \
| | * | | | | | nixos/network-interfaces: fix examples typesDavid Costa2020-03-29
| * | | | | | | nixos/gerrit: stop setting jvmPackage (#83696)Florian Klink2020-03-29
| * | | | | | | Merge pull request #83660 from Emantor/fix/system-duplicate-lineFlorian Klink2020-03-29
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/systemd: remove one DefaultBlockIOAccountingRouven Czerwinski2020-03-29
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #83637 from romildo/desktopManager.desktopNamesworldofpeace2020-03-29
| |\ \ \ \ \ \ \
| | * | | | | | | nixos.xfce: set desktopNamesJosé Romildo Malaquias2020-03-28
| | * | | | | | | nixos.display-managers: use new attribute for desktop namesJosé Romildo Malaquias2020-03-28
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #83598 from mmilata/test-driver-delete-vdectlFlorian Klink2020-03-29
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | test-driver.py: use temporary dir for vde1.ctlMartin Milata2020-03-29
| * | | | | | | Merge pull request #82784 from davidak/fpmAaron Andersen2020-03-28
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/phpfpm: add example to socketdavidak2020-03-17
| * | | | | | | | nixos/tests/mongodb: also test mongodb-3_4Maximilian Bosch2020-03-29
* | | | | | | | | Merge branch 'master' into staging-nextJan Tojnar2020-03-29
|\| | | | | | | |
| * | | | | | | | nixos/nginx: fix evalJan Tojnar2020-03-29
| * | | | | | | | Merge pull request #83600 from Ma27/hydra-two-stage-deployGraham Christensen2020-03-28
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | hydra: 2020-02-06 -> 2020-03-{24,27}Maximilian Bosch2020-03-28
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #83425 from xfix/mark-hibernation-test-as-broken-on-aarchworldofpeace2020-03-28
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/tests/hibernate: disable for platforms other than x86_64Konrad Borowski2020-03-28
| * | | | | | | | Merge pull request #83473 from doronbehar/update-connmanworldofpeace2020-03-28
| |\ \ \ \ \ \ \ \