summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #67225 from matthewbauer/tramp-zshrc-fixMatthew Bauer2019-08-23
|\
| * nixos/zsh: Fix tramp supportMatthew Bauer2019-08-21
* | Merge pull request #67318 from jtojnar/gnome-photosJan Tojnar2019-08-23
|\ \
| * | gnome-photos: add installed testsJan Tojnar2019-08-23
| * | tracker-miners: move from gnome3Jan Tojnar2019-08-23
| * | tracker: move from gnome3Jan Tojnar2019-08-23
| * | gnome-online-accounts: move from gnome3Jan Tojnar2019-08-23
| |/
* | Merge remote-tracking branch 'origin/master' into openssl-1.1Linus Heckemann2019-08-23
|\ \
| * \ Merge pull request #63539 from ivan/usbguard-noxSarah Brofeldt2019-08-23
| |\ \
| | * | usbguard-nox: init at 0.7.4Ivan Kozik2019-06-20
| * | | Merge pull request #66215 from ajs124/ejabberd/19.08Lassulus2019-08-23
| |\ \ \
| | * | | nixos/ejabberd: fix test for new releaseajs1242019-08-20
| * | | | Merge pull request #67213 from mmahut/jormungandrMarek Mahut2019-08-23
| |\ \ \ \
| | * | | | nixos/tests: adding jormungandr service testMarek Mahut2019-08-22
| | * | | | nixos: adding jormungandr serviceMarek Mahut2019-08-22
| * | | | | Revert "nixos/containers: add unprivileged option"Marek Mahut2019-08-23
| * | | | | Merge pull request #67130 from uvNikita/containers/unprivilegedMarek Mahut2019-08-23
| |\ \ \ \ \
| | * | | | | nixos/containers: add unprivileged optionNikita Uvarov2019-08-21
| * | | | | | Merge pull request #67308 from jtojnar/libxmlb-0.1.11Jan Tojnar2019-08-23
| |\ \ \ \ \ \
| | * | | | | | nixos/tests/libxmlb: initJan Tojnar2019-08-23
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge remote-tracking branch 'upstream/master' into openssl-1.1Robin Gloster2019-08-23
|\| | | | | |
| * | | | | | Merge pull request #66722 from mmahut/trezord-emulatorMarek Mahut2019-08-22
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | tests: adding trezordMarek Mahut2019-08-16
| | * | | | | trezord: adding emultor supportMarek Mahut2019-08-16
| * | | | | | nixos/mate: enable vte integrationworldofpeace2019-08-21
| * | | | | | nixos/pantheon: enable vte integrationworldofpeace2019-08-21
| * | | | | | Merge pull request #66990 from worldofpeace/gnome-vte-configworldofpeace2019-08-21
| |\ \ \ \ \ \
| | * | | | | | nixos/gnome-terminal: initworldofpeace2019-08-21
| | * | | | | | nixos/vte: initworldofpeace2019-08-21
| * | | | | | | Merge pull request #67179 from uvNikita/containers/fix-imperativeSarah Brofeldt2019-08-21
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/containers: fix imperative containersNikita Uvarov2019-08-21
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #67071 from jtojnar/fontconfig-harmonizationJan Tojnar2019-08-21
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/fontconfig: harmonize commentsJan Tojnar2019-08-20
| | * | | | | | | nixos/fontconfig: harmonize file namesJan Tojnar2019-08-20
| | * | | | | | | nixos/fontconfig: harmonize folder variablesJan Tojnar2019-08-20
| | * | | | | | | nixos/fontconfig: harmonize indentationJan Tojnar2019-08-20
| | * | | | | | | nixos/fontconfig-penultimate: reorderJan Tojnar2019-08-20
| * | | | | | | | nginx: expose generated config and allow nginx reloads (#57429)Danylo Hlynskyi2019-08-21
| * | | | | | | | Merge pull request #45392 from dguibert/dg/wireguardFlorian Klink2019-08-21
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | systemd-networkd: add testsFélix Baylac-Jacqué2019-08-21
| | * | | | | | | systemd-networkd: add support for wireguard netdev.David Guibert2019-08-21
* | | | | | | | | squid: remove v3, default to v4Robin Gloster2019-08-22
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \