summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge master into staging-nextgithub-actions[bot]2021-09-18
|\
| * Merge pull request #120087 from figsoda/xdg-mimefigsoda2021-09-17
| |\
| | * nixos/xdg/mime: add config for associationsfigsoda2021-09-12
| * | Merge pull request #138281 from NinjaTrappeur/massimo-zaniboni-masterNinjatrappeur2021-09-17
| |\ \
| | * | nixos-docs: improved the installation instructions of PleromaMassimo Zaniboni2021-09-17
* | | | Merge master into staging-nextgithub-actions[bot]2021-09-17
|\| | |
| * | | Merge pull request #137484 from i-do-cpp/add-disableInstallerTools-testRobert Hensing2021-09-17
| |\ \ \ | | |/ / | |/| |
| | * | installers/tools: add test for system.disableInstallerTools optioni-do-cpp2021-09-15
* | | | Merge remote-tracking branch 'upstream/staging' into staging-nextLuke Granger-Brown2021-09-17
|\ \ \ \ | |/ / / |/| | |
| * | | Merge staging-next into staginggithub-actions[bot]2021-09-17
| |\ \ \
| * \ \ \ Merge staging-next into staginggithub-actions[bot]2021-09-17
| |\ \ \ \
| * \ \ \ \ Merge staging-next into staginggithub-actions[bot]2021-09-16
| |\ \ \ \ \
| * \ \ \ \ \ Merge staging-next into staginggithub-actions[bot]2021-09-16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge staging-next into staginggithub-actions[bot]2021-09-16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge staging-next into staginggithub-actions[bot]2021-09-16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge staging-next into staginggithub-actions[bot]2021-09-15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge staging-next into staginggithub-actions[bot]2021-09-15
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Merge staging-next into staginggithub-actions[bot]2021-09-14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge staging-next into staginggithub-actions[bot]2021-09-14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge staging-next into staginggithub-actions[bot]2021-09-13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #131618 from andir/systemdv249Florian Klink2021-09-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | nixos/tests/prometheus: wait for influxdb exporter before queringAndreas Rammhold2021-09-12
| | * | | | | | | | | | | | | nixos/tests/herbstluftwm: fix timeout that was given in secondsAndreas Rammhold2021-09-12
| | * | | | | | | | | | | | | systemd: 247.6 -> 249.4Andreas Rammhold2021-09-12
| * | | | | | | | | | | | | | Merge staging-next into staginggithub-actions[bot]2021-09-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge staging-next into staginggithub-actions[bot]2021-09-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge staging-next into staginggithub-actions[bot]2021-09-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge staging-next into staginggithub-actions[bot]2021-09-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rl-2111: add bash default upgrade to version 5happysalada2021-09-12
* | | | | | | | | | | | | | | | | | nixos/wordpress: caddy supportJonas Heinrich2021-09-17
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #137336 from dsg22/feature-libinput-expose-transformatrion...figsoda2021-09-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | nixos/libinput: Add transformation matrix optionDavíð Steinn Geirsson2021-09-11
* | | | | | | | | | | | | | | | | Merge pull request #138160 from jansol/masterJan Tojnar2021-09-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | pipewire: 0.3.35 -> 0.3.36Jan Solanti2021-09-16
* | | | | | | | | | | | | | | | | | Merge pull request #137013 from mkenigs/rm-runInMachineRobert Hensing2021-09-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | nixos/testing: remove unused function runInMachineMatthew Kenigsberg2021-09-08
* | | | | | | | | | | | | | | | | | | Merge pull request #138051 from ehmry/tox-bootstrapdSandro2021-09-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | nixos/tox-bootstrapd: use DynamicUserEmery Hemingway2021-09-15
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #138056 from NixOS/SuperSandro2000-patch-1Timothy DeHerrera2021-09-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | nixos/documentation: use full option namesSandro2021-09-15
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #137533 from jansol/masterJan Tojnar2021-09-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | pipewire: 0.3.34 -> 0.3.35Jan Solanti2021-09-12
* | | | | | | | | | | | | | | | Merge pull request #138025 from NixOS/home-assistantMartin Weinelt2021-09-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | nixos/home-assistant: allow serial access for usb discovery and zwave_jsMartin Weinelt2021-09-16
* | | | | | | | | | | | | | | | Merge pull request #136471 from Artturin/tmpontmpfssizeArtturi2021-09-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | nixos/tmp: add tmpOnTmpfsSizeArtturin2021-09-08
* | | | | | | | | | | | | | | | nixos/lock-kernel-modules: use `udevadm settle`rnhmjoj2021-09-15
| |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | nixos/gitlab: Enable roation of log filesLara2021-09-15
* | | | | | | | | | | | | | | Merge pull request #134302 from rnhmjoj/gdm-no-udev-settleMichele Guerini Rocco2021-09-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | nixos/gdm: remove udev-settle dependencyrnhmjoj2021-08-16