summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge staging-next into stagingFrederik Rietdijk2019-08-31
|\
| * Merge master into staging-nextFrederik Rietdijk2019-08-31
| |\
| | * Merge pull request #65283 from averelld/add-x2goserver-moduleSilvan Mosberger2019-08-31
| | |\
| | | * x2goserver: add moduleAverell Dalton2019-08-30
| | * | Merge pull request #67758 from etu/init-usbtopAaron Andersen2019-08-31
| | |\ \
| | | * | nixos/usbtop: Add module to install usbtop and to enable kernel moduleElis Hirwing2019-08-30
| * | | | Merge remote-tracking branch 'upstream/master' into staging-nextSamuel Leathers2019-08-31
| |\| | |
| | * | | Merge pull request #67777 from mmahut/altcoinsMarek Mahut2019-08-31
| | |\ \ \
| | | * | | nixos/{namecoind,bitcoind}: removing the altcoin prefixMarek Mahut2019-08-31
* | | | | | Merge staging-next into stagingFrederik Rietdijk2019-08-31
|\| | | | |
| * | | | | Merge master into staging-nextFrederik Rietdijk2019-08-31
| |\| | | |
| | * | | | nixos/tests/systemd: Fix x-initrd-mount flakiness (#67798)aszlig2019-08-31
| | * | | | Merge pull request #63773 from flokli/installation-device-fixesFlorian Klink2019-08-31
| | |\ \ \ \
| | | * | | | nixos/doc/clone-config.xml: add line about installation media = installation ...Florian Klink2019-08-19
| | | * | | | nixos/doc: update installation-device.nixFlorian Klink2019-08-19
| | | * | | | sd-image.nix: set installer.cloneConfig to falseFlorian Klink2019-08-19
| | | * | | | nixos/installation-device.nix: explain sshd usageFlorian Klink2019-08-19
| | * | | | | nixos/fontconfig-penultimate: disable by defaultworldofpeace2019-08-30
| | * | | | | nixos/release-notes: fix indentationedef2019-08-30
| | | |_|_|/ | | |/| | |
| | * | | | nixos/mailman: decouple the mailman module from the postfix modulePeter Simons2019-08-30
| | | |/ / | | |/| |
| | * | | Merge pull request #66301 from adisbladis/emacspackages-deprecated-dropadisbladis2019-08-30
| | |\ \ \
| | | * | | emacsPackages: Drop old emacsPackages (non-NG) setsadisbladis2019-08-30
| | * | | | nixos/mailman: don't reserve a static uid in the systemPeter Simons2019-08-30
| | * | | | Merge pull request #67702 from mweinelt/pr/fwupd-cfg.packageworldofpeace2019-08-30
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | nixos/fwupd: add package optionMartin Weinelt2019-08-29
| | * | | | nixos/redis: move 'redis_init.service' into the preStart hook of 'redis.service'Peter Simons2019-08-30
| | * | | | nixos/mailman: cosmeticPeter Simons2019-08-30
| | * | | | Merge pull request #67708 from peti/t/mailmanPeter Simons2019-08-30
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | mailman: add NixOS module to install and deploy the mailing list serverPeter Simons2019-08-29
| | * | | | Merge pull request #67728 from kisik21/bash-module-emacs-eterm-remote-prompt-fixMatthew Bauer2019-08-29
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | nixos/bash: Improve Emacs detection for PS1Vika2019-08-30
| | | |/ /
| | * / / rl-1909.xml: fix XML syntax error that broke the NixOS manualPeter Simons2019-08-29
| | |/ /
| | * | Fix letsencrypt (#60219)Arian van Putten2019-08-29
| | * | Merge pull request #66922 from davidak/netdata_enableCgroupAccountingFlorian Klink2019-08-29
| | |\ \
| | | * | netdata: enable cgroup accountingdavidak2019-08-19
| | * | | Merge pull request #67606 from endocrimes/r-vault-1.2.2Jaka Hudoklin2019-08-29
| | |\ \ \
| | | * | | vault: add raft backend to vault serviceDanielle Lancashire2019-08-28
| | * | | | nixos/gitlab-runner: add missing HOME to environment (#67450)Pascal Bach2019-08-28
| | * | | | Merge pull request #67626 from worldofpeace/xfce4-14-docworldofpeace2019-08-28
| | |\ \ \ \
| | | * | | | rl-1909: add note about Xfce 4.14worldofpeace2019-08-28
| | | |/ / /
| | * | | | Merge pull request #64738 from rnhmjoj/magneticoSilvan Mosberger2019-08-28
| | |\ \ \ \
| | | * | | | nixos/magnetico: add testrnhmjoj2019-08-28
| | | * | | | nixos/magnetico: init servicernhmjoj2019-08-28
| | * | | | | Merge pull request #65661 from davidak/containersSilvan Mosberger2019-08-28
| | |\ \ \ \ \
| | | * | | | | nixos-containers: add TimeoutStartSec optiondavidak2019-08-28
| | * | | | | | Merge pull request #67260 from pstch/fix/xsession-allow-session-choiceMatthew Bauer2019-08-28
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | nixos/x11: provide selected session to custom sessionHugo Geoffroy2019-08-28
| | * | | | | | Merge pull request #67394 from Ma27/drop-keys.target-dependencyLinus Heckemann2019-08-28
| | |\ \ \ \ \ \
| | | * | | | | | nixos/treewide: drop dependencies to `keys.target`Maximilian Bosch2019-08-27
| | * | | | | | | Merge pull request #67487 from dasJ/suspend-then-hibernatePeter Hoeg2019-08-28
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |