summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #67389 from jtojnar/xdg-user-dirsJan Tojnar2019-08-24
|\
| * nixos/environment: prepend /etc/xdg to XDG_CONFIG_DIRSJan Tojnar2019-08-24
* | Merge pull request #67351 from worldofpeace/fix-vte-prompt-commandworldofpeace2019-08-24
|\ \
| * | nixos/vte: ensure bash vte snippet appears firstworldofpeace2019-08-23
* | | Merge pull request #31064 from disassembler/release-manager-docsSamuel Leathers2019-08-24
|\ \ \
| * | | nixos docs: add release manager sectionSamuel Leathers2019-08-23
* | | | Merge pull request #65706 from aanderse/phpfpmAaron Andersen2019-08-24
|\ \ \ \
| * | | | nixos/phpfpm: deprecate extraConfig options in favor of settings optionsAaron Andersen2019-08-23
| * | | | nixos/phpfpm: Use systemd's RuntimeDirectoryAaron Andersen2019-08-23
| * | | | nixos/phpfpm: add user and group option to each poolAaron Andersen2019-08-23
| * | | | nixos/phpfpm: add socket option to replace the listen optionAaron Andersen2019-08-23
| * | | | nixos/phpfpm: merge pool-options.nix into default.nixAaron Andersen2019-08-23
| * | | | nixos/phpfpm: deprecate poolConfigs optionAaron Andersen2019-08-23
| |/ / /
* | | | Merge pull request #67356 from alexbakker/libvirt-onbootMarek Mahut2019-08-24
|\ \ \ \
| * | | | libvirtd: add onBoot optionAlexander Bakker2019-08-23
* | | | | 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