summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #68218 from worldofpeace/cups-pk/no-auth-wheelworldofpeace2019-09-09
|\
| * nixos/cupsd: passwordless admin for wheel with polkitworldofpeace2019-09-06
* | Merge pull request #68310 from rnhmjoj/xkbLinus Heckemann2019-09-09
|\ \
| * | nixos/doc: inform users of startx about `-xkbdir` argument neededrnhmjoj2019-09-08
| * | nixos/xserver: export configuration with startx and extra layoutsrnhmjoj2019-09-08
* | | Merge staging-next into stagingFrederik Rietdijk2019-09-09
|\ \ \
| * \ \ Merge pull request #68244 from NixOS/staging-nextFrederik Rietdijk2019-09-09
| |\ \ \
| * \ \ \ Merge pull request #67241 from kcalvinalvin/cmtSilvan Mosberger2019-09-08
| |\ \ \ \
| | * | | | nixos/cmt: add cmt moduleCalvin Kim2019-09-08
* | | | | | treewide: remove redundant quotesvolth2019-09-08
* | | | | | Merge staging-next into stagingFrederik Rietdijk2019-09-08
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge master into staging-nextFrederik Rietdijk2019-09-08
| |\| | | |
| | * | | | Merge pull request #68308 from srhb/rerec-utilsSarah Brofeldt2019-09-08
| | |\ \ \ \
| | | * | | | nixos/lib/utils: Make the set recursive again, unbreak evalSarah Brofeldt2019-09-08
* | | | | | | Merge branch 'staging-next' into stagingVladimír Čunát2019-09-08
|\| | | | | |
| * | | | | | Merge master into staging-nextFrederik Rietdijk2019-09-08
| |\| | | | |
| | * | | | | Merge pull request #68037 from dtzWill/update/upower-0.99.11worldofpeace2019-09-08
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | nixos/upower: drop resumeCommands hackworldofpeace2019-09-08
| | | * | | | nixos/upower: drop custom unitworldofpeace2019-09-08
| | | * | | | nixos/upower: don't use activation script to create statedirworldofpeace2019-09-08
| | * | | | | deluge service: fix my bad conflict resolution from f21211ebfVladimír Čunát2019-09-08
| | * | | | | Merge pull request #66274 from talyz/gitlabFlorian Klink2019-09-07
| | |\ \ \ \ \
| | | * | | | | nixos/gitlab: Extract arbitrary secrets from extraConfigtalyz2019-09-06
| | | * | | | | nixos/utils: Handle arbitrary secrets in JSON output filestalyz2019-09-06
| | | * | | | | nixos/gitlab: Use postgresql module options to provision local dbtalyz2019-09-06
| | | * | | | | nixos/gitlab: Add support for storing secrets in filestalyz2019-09-06
| | | * | | | | nixos/gitlab: Fix missing ca_file for SMTPtalyz2019-09-06
| | * | | | | | postgresql_9_4: Remove packageadisbladis2019-09-07
| | | |_|_|/ / | | |/| | | |
| | * | | | | nixos/kibana: Filter empty listsadisbladis2019-09-07
* | | | | | | nixos/tests/login: fix the seat test by loading sound driversAndreas Rammhold2019-09-08
* | | | | | | nixos/networkd: continue supporting 99-main with wildcard interface matchAndreas Rammhold2019-09-08
|/ / / / / /
* | | | | | Merge branch 'master' into staging-nextJan Tojnar2019-09-07
|\| | | | |
| * | | | | Merge pull request #68243 from mmahut/jormungandrMarek Mahut2019-09-07
| |\ \ \ \ \
| | * | | | | nixos/jormungandr: adding RUST_BACKTRACE until service is stableMarek Mahut2019-09-07
* | | | | | | Merge master into staging-nextFrederik Rietdijk2019-09-07
|\| | | | | |
| * | | | | | Merge pull request #68213 from worldofpeace/ead/fixworldofpeace2019-09-07
| |\ \ \ \ \ \
| | * | | | | | nixos/iwd: add tmpfiles rule for ead serviceworldofpeace2019-09-06
| * | | | | | | iso-image-kde: Disable synapticsadisbladis2019-09-07
| * | | | | | | Merge pull request #68182 from worldofpeace/chrome-gnome-shellworldofpeace2019-09-07
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | nixos/gnome3: enable chrome-gnome-shelllworldofpeace2019-09-05
| | * | | | | | nixos/chrome-gnome-shell: enable in firefoxworldofpeace2019-09-05
| | |/ / / / /
| * | | | | | Merge pull request #66405 from NeQuissimus/virtualbox_6_0_10Florian Klink2019-09-06
| |\ \ \ \ \ \
| | * | | | | | tests/virtualbox: Clean up unnecessary things.Ambroz Bizjak2019-09-05
| * | | | | | | Merge pull request #68233 from worldofpeace/plasma5-enable-libinputworldofpeace2019-09-06
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/plasma5: enable libinputworldofpeace2019-09-06
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #67917 from worldofpeace/lightdm-pam-gnome-keyringworldofpeace2019-09-06
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/lightdm: fix pam rulesworldofpeace2019-09-06
| | |/ / / / / /
* | | | | | | | Merge staging into staging-nextFrederik Rietdijk2019-09-06
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'staging-next' into stagingJan Tojnar2019-09-06
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'staging-next' into stagingJan Tojnar2019-09-06
| |\ \ \ \ \ \ \ \