summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge staging-next into stagingFrederik Rietdijk2019-12-05
|\
| * Merge pull request #72734 from nyanloutre/zfs_zed_config_moduleSilvan Mosberger2019-12-05
| |\
| | * nixos/zfs: Adding ZED configuration optionsnyanloutre2019-12-04
| * | Merge pull request #73968 from mat8913/upower-config-masterworldofpeace2019-12-05
| |\ \
| | * | upower: load config from /etcMatthew Harm Bekkema2019-12-04
| | * | nixos/upower: Allow customization of UPower.confMatthew Harm Bekkema2019-12-04
| * | | Merge pull request #73097 from andrew-d/andrew/gvisor-reduxFlorian Klink2019-12-05
| |\ \ \
| | * | | nixosTests.gvisor: add test for gvisor and gvisor as a Docker runtimeAndrew Dunham2019-12-03
| * | | | Merge pull request #74753 from mmilata/moinmoin-python-testMarek Mahut2019-12-05
| |\ \ \ \
| | * | | | nixosTests.moinmoin: port to pythonMartin Milata2019-12-01
| * | | | | Merge pull request #74992 from rnhmjoj/maintainersMaximilian Bosch2019-12-04
| |\ \ \ \ \
| | * | | | | nixos: add myself to maintainersrnhmjoj2019-12-04
| * | | | | | remove vulgarity from wordpress nixos moduleJason Samsa2019-12-04
| |/ / / / /
| * | | | | nixosTests.openldap: port test to pythonJacek Galowicz2019-12-04
| * | | | | nixosTests.ldap: port integration test to pythonJacek Galowicz2019-12-04
| * | | | | Merge pull request #74898 from tfc/nixos-test-retryFlorian Klink2019-12-04
| |\ \ \ \ \
| | * | | | | nixos/pam-oath-login: Port test to pythonJacek Galowicz2019-12-03
| | * | | | | nixos/test: Use retry() in all looping functions that need timeoutsJacek Galowicz2019-12-03
| * | | | | | Merge pull request #74866 from x123/x123-test-tiddlywikiFlorian Klink2019-12-04
| |\ \ \ \ \ \
| | * | | | | | remove duplicate test in tiddlywikix1232019-12-03
| | * | | | | | nixos/tests/tiddlywiki: port to pythonx1232019-12-03
| * | | | | | | Merge pull request #74913 from paumr/masterFlorian Klink2019-12-04
| |\ \ \ \ \ \ \
| | * | | | | | | improved nginx.basicAuthFile descriptionpaumr2019-12-03
| * | | | | | | | Merge pull request #74938 from x123/x123-i3wm-test-to-pythonFlorian Klink2019-12-04
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/tests/i3wm: port to pythonx1232019-12-03
| * | | | | | | | | Merge pull request #74082 from flokli/nixos-test-port-gocdFlorian Klink2019-12-04
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | nixosTests.gocd-agent: mark as brokenFlorian Klink2019-12-04
| | * | | | | | | | nixosTests.gocd-server: port to pythonFlorian Klink2019-12-02
| | * | | | | | | | nixosTest.gocd-agent: port to pythonFlorian Klink2019-12-02
* | | | | | | | | | Merge branch 'staging-next' into stagingJan Tojnar2019-12-03
|\| | | | | | | | |
| * | | | | | | | | Tweag releaase notesEelco Dolstra2019-12-03
| * | | | | | | | | Merge pull request #74850 from davidak/PRETTY_NAMEEelco Dolstra2019-12-03
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | nixos/version: PRETTY_NAME in /etc/os-release uses the release now instead of...davidak2019-12-02
| * | | | | | | | | Merge pull request #66089 from servalcatty/v2rayMario Rodas2019-12-03
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | v2ray: fixups and change to `buildGoModule`Serval2019-11-28
| | * | | | | | | | v2ray: add v2ray serviceServal2019-11-21
| * | | | | | | | | Merge pull request #74839 from raboof/installNetworkingNoteFlorian Klink2019-12-02
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Spell out you need to enable wifi explicitly at install timeArnout Engelen2019-12-02
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | nixos/tests/xrdp: port to pythonx1232019-12-02
| * | | | | | | | Merge pull request #74759 from mmilata/openarena-python-testFlorian Klink2019-12-02
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixosTests.openarena: port to pythonMartin Milata2019-12-01
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #74762 from mmilata/mediawiki-python-testFlorian Klink2019-12-02
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixosTests.mediawiki: port to pythonMartin Milata2019-12-01
| | |/ / / / / / /
| * | | | | | | | Merge pull request #74764 from mmilata/radicale-python-testFlorian Klink2019-12-02
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | nixosTests.radicale: port to pythonMartin Milata2019-12-01
| | |/ / / / / /
| * | | | | | | Merge pull request #74838 from jtojnar/pantheon-debugworldofpeace2019-12-02
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | nixos/pantheon fix GNOME_SESSION_DEBUG conflictJan Tojnar2019-12-02
| | |/ / / / /
| * | | | | | rl-2003: mention the removal of dump1090's internal web serverDaniël de Kok2019-12-02
| * | | | | | nixosTests.matomo: port to python (#74756)Jörg Thalheim2019-12-02
| |\ \ \ \ \ \
| | * | | | | | nixosTests.matomo: port to pythonMartin Milata2019-12-01
| | |/ / / / /