summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into openssl-1.1Robin Gloster2019-08-21
|\
| * Merge pull request #66492 from aanderse/extra-subservice-cleanupAaron Andersen2019-08-20
| |\
| | * nixos/mantisbt: drop unmaintained moduleAaron Andersen2019-08-15
| | * nixos/systemhealth: drop unmaintained moduleAaron Andersen2019-08-15
| | * nixos/tests/subversion: drop unreferenced/unmaintained testAaron Andersen2019-08-15
| | * nixos/tests/php-pcre: replace usage of deprecated services.httpd.extraSubserv...Aaron Andersen2019-08-15
| | * nixos/awstats: replace usage of deprecated services.httpd.extraSubservicesAaron Andersen2019-08-15
| * | Merge pull request #67109 from 1000101/masterMarek Mahut2019-08-20
| |\ \
| | * | trezord: add docsJan Hrnko2019-08-20
| * | | Merge pull request #66992 from oxij/nixos/fix-zsh-promptMatthew Bauer2019-08-20
| |\ \ \
| | * | | nixos: zsh: setopt prompt_sp to workaround a zsh bugJan Malakhovski2019-08-19
| * | | | nixos/pantheon: use qt5 module for adwaita-qtworldofpeace2019-08-20
| * | | | Merge pull request #66392 from worldofpeace/qt-theme/moduleworldofpeace2019-08-20
| |\ \ \ \
| | * | | | nixos/qt5: initworldofpeace2019-08-20
| * | | | | Merge pull request #66291 from reanimus/roon-no-dynamicSilvan Mosberger2019-08-20
| |\ \ \ \ \
| | * | | | | roon-server: add back state directoryAlex Guzman2019-08-09
| | * | | | | [roon-server] Use non-deprecated string typeAlex Guzman2019-08-09
| | * | | | | [roon-server] don't create user if user changes defaultsAlex Guzman2019-08-07
| | * | | | | [roon-server] make roon user a system userAlex Guzman2019-08-07
| | * | | | | roon-server: let nix assign idsAlex Guzman2019-08-07
| | * | | | | roon-server: Add actual user pipingAlex Guzman2019-08-07
| | * | | | | roon-server: disable DynamicUserAlex Guzman2019-08-07
| * | | | | | Merge pull request #63150 from Izorkin/prosody-testMatthieu Coudron2019-08-20
| |\ \ \ \ \ \
| | * | | | | | prosody: fix work after update luadbi packagesIzorkin2019-08-20
| | * | | | | | nixos/tests/prosodyMysql: add check work prosody with MySQL databaseIzorkin2019-08-20
| | * | | | | | nixos/tests/prosody: checking work prosody through local networkIzorkin2019-08-20
| | * | | | | | nixos/tests: move ejabberd and prosody test to xmpp folderIzorkin2019-08-20
| * | | | | | | Merge pull request #66736 from markuskowa/upd-glusterMichael Raskin2019-08-20
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/glusterfs: add testMarkus Kowalewski2019-08-18
| * | | | | | | | Merge pull request #58207 from teto/kernelPackages_checkMatthieu Coudron2019-08-20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | boot.kernelPackages: check for conflictsMatthieu Coudron2019-08-10
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #66956 from worldofpeace/cleanup-gvfs-envarsworldofpeace2019-08-19
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | nixos/lxqt: use gvfs moduleworldofpeace2019-08-19
| | * | | | | | | nixos/xfce: use gvfs moduleworldofpeace2019-08-19
| | * | | | | | | nixos/mate: don't set GiO_EXTRA_MODULESworldofpeace2019-08-19
| | * | | | | | | nixos/pantheon: don't set GIO_EXTRA_MODULESworldofpeace2019-08-19
| | * | | | | | | nixos/gnome3: don't set GIO_EXTRA_MODULESworldofpeace2019-08-19
| | * | | | | | | nixos/gvfs: set GIO_EXTRA_MODULESworldofpeace2019-08-19
| | * | | | | | | nixos/gvfs: add package optionworldofpeace2019-08-19
| | * | | | | | | nixos/gvfs: move out of GNOMEworldofpeace2019-08-19
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #64407 from dasJ/icingaweb-testMarek Mahut2019-08-19
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/icingaweb: Fix module path; Add testJanne Heß2019-07-07
| * | | | | | | | Merge pull request #63973 from apvodney/masterMarek Mahut2019-08-19
| |\ \ \ \ \ \ \ \
| | * | | | | | | | u9fs service: start after network.targetAaron Vodney2019-06-30
| | |/ / / / / / /
| * | | | | | | | Merge pull request #65995 from danderson/masterMarek Mahut2019-08-19
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/sshguard: create ipsets before starting, and clean up after stopping.David Anderson2019-08-04
| * | | | | | | | | Merge pull request #66271 from vdot0x23/patch-1Marek Mahut2019-08-19
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | nixos/stubby: Clearer wording for upstreamServersvdot0x232019-08-07
| * | | | | | | | | | Merge pull request #66687 from joachifm/feat/hardened-nixos-revert-graphene-m...Marek Mahut2019-08-19
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Revert "nixos/hardened: use graphene-hardened malloc by default"Joachim Fasting2019-08-15
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |