summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge master into staging-nextgithub-actions[bot]2021-06-26
|\
| * Merge pull request #128150 from scvalex/etcd-passthru-testNiklas Hambüchen2021-06-26
| |\
| | * etcd: fix old aliased package name to make tests passAlexandru Scvortov2021-06-25
* | | Merge branch 'master' into staging-nextRobert Schütz2021-06-26
|\| |
| * | Merge pull request #128082 from flokli/sdcard-firmware-partition-offsetFlorian Klink2021-06-25
| |\ \
| | * | nixos/sdcard: make firmware partition offset configurableFlorian Klink2021-06-25
| | |/
| * | Merge pull request #128079 from flokli/serial-getty-keep-baudFlorian Klink2021-06-25
| |\ \ | | |/ | |/|
| | * nixos/getty: add missing --keep-baudFlorian Klink2021-06-25
| * | Merge pull request #127941 from liff/libwnck/3-is-defaultSandro2021-06-25
| |\ \
| | * | libwnck: make 3.36.0 defaultOlli Helenius2021-06-24
* | | | Merge master into staging-nextgithub-actions[bot]2021-06-25
|\| | |
| * | | Merge pull request #128055 from Synthetica9/sway-check-quitMichael Weiss2021-06-25
| |\ \ \
| | * | | nixos/tests/sway: add check that sway quitsPatrick Hilhorst2021-06-25
| * | | | Merge pull request #128048 from dali99/add-txredisapi-synapseMaximilian Bosch2021-06-25
| |\ \ \ \
| | * | | | pythonPackages.txredisapi: Add unit testDaniel Olsen2021-06-24
| * | | | | Merge pull request #127824 from yu-re-ka/feature/gitlab-14-0-0Florian Klink2021-06-25
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | nixos/gitlab: require at least postgresql 12Yureka2021-06-25
| | | |/ / | | |/| |
* | | | | Merge branch 'master' into staging-nextRobert Schütz2021-06-25
|\| | | |
| * | | | release notes: Mention consul breaking changesNiklas Hambüchen2021-06-24
| * | | | Merge pull request #127085 from minijackson/xdg-desktop-portal-wlr-0.4.0-and-...Jan Tojnar2021-06-25
| |\ \ \ \
| | * | | | nixos/manual: mention xdg.portal.wlr module in WaylandMinijackson2021-06-20
| | * | | | nixos/xdg/portal/wlr: initMinijackson2021-06-20
| * | | | | Merge pull request #128057 from nh2/nixos-manual-xkb-layouts-fixesNiklas Hambüchen2021-06-25
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | manual: Fix missing semicolon in custom keyboard layout exampleNiklas Hambüchen2021-06-25
| * | | | | sway: 1.6 -> 1.6.1Michael Weiss2021-06-24
| | |_|/ / | |/| | |
* | | | | Merge master into staging-nextgithub-actions[bot]2021-06-24
|\| | | |
| * | | | Merge pull request #127554 from mweinelt/babelMartin Weinelt2021-06-23
| |\ \ \ \
| | * | | | nixos/babeld: update hardeningMartin Weinelt2021-06-20
| * | | | | doc: cleanup documentation relating to release notesRyan Mulligan2021-06-23
| | |_|_|/ | |/| | |
* | | | | Merge master into staging-nextgithub-actions[bot]2021-06-23
|\| | | |
| * | | | Merge pull request #127734 from blaggacao/da/convert-rel-notes-md-2105Ryan Mulligan2021-06-23
| |\ \ \ \
| | * | | | docs: nixos release notes to CommonMark (2105)David Arnold2021-06-23
| * | | | | nixos/sway: Drop rxvt-unicode from the extraPackages defaultMichael Weiss2021-06-23
* | | | | | Merge master into staging-nextgithub-actions[bot]2021-06-23
|\| | | | |
| * | | | | Merge pull request #126656 from jwoudenberg/add-system76-powerSandro2021-06-23
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | system76-power: init at 1.1.16Jasper Woudenberg2021-06-13
* | | | | | Merge master into staging-nextgithub-actions[bot]2021-06-23
|\| | | | |
| * | | | | Merge pull request #100255 from nh2/sshd-default-log-level-infoNiklas Hambüchen2021-06-23
| |\ \ \ \ \
| | * | | | | sshd service: Default to INFO logLevel (upstream default).Niklas Hambüchen2021-06-23
| * | | | | | Merge pull request #127166 from nh2/xserver-config-mkAfter-docsNiklas Hambüchen2021-06-23
| |\ \ \ \ \ \
| | * | | | | | services.xorg.config: Extend docsNiklas Hambüchen2021-06-17
| * | | | | | | Merge pull request #127157 from nh2/xserver-readable-config-indentationNiklas Hambüchen2021-06-23
| |\ \ \ \ \ \ \
| | * | | | | | | xserver: Generate readable config indentationNiklas Hambüchen2021-06-17
| | |/ / / / / /
* | | | | | | | Merge branch 'master' into staging-nextMartin Weinelt2021-06-22
|\| | | | | | |
| * | | | | | | Merge pull request #127783 from rnhmjoj/sshfs-docRyan Mulligan2021-06-22
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | nixos/doc: add section on sshfs file systemsrnhmjoj2021-06-22
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #127599 from Ma27/bump-privacyideaSandro2021-06-22
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | privacyIDEA: 3.5.2 -> 3.6Maximilian Bosch2021-06-22
| * | | | | | Merge pull request #127134 from blaggacao/da/convert-rel-notes-mdRyan Mulligan2021-06-22
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | docs: nixos release notes (w/o 2105 - separate PR)David Arnold2021-06-22