summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge pull request #67389 from jtojnar/xdg-user-dirsJan Tojnar2019-08-24
|\ | | | | Allow changing xdg-user-dirs with environment.etc
| * nixos/environment: prepend /etc/xdg to XDG_CONFIG_DIRSJan Tojnar2019-08-24
| | | | | | | | | | | | | | | | | | | | Previously, we were only adding profile-relative paths to XDG_CONFIG_DIRS variable. That required very ugly hacks like https://github.com/NixOS/nixpkgs/issues/33282#issuecomment-524550842 to be able to configure XDG stuff. Now, we are prepending the variable with /etc/xdg, allowing us to simply use `environment.etc."xdg/…"` options.
* | Merge pull request #67351 from worldofpeace/fix-vte-prompt-commandworldofpeace2019-08-24
|\ \ | | | | | | nixos/vte: ensure bash vte snippet appears first
| * | nixos/vte: ensure bash vte snippet appears firstworldofpeace2019-08-23
| | | | | | | | | | | | Fixes #67312
* | | Merge pull request #31064 from disassembler/release-manager-docsSamuel Leathers2019-08-24
|\ \ \ | | | | | | | | nixos docs: add release manager section
| * | | nixos docs: add release manager sectionSamuel Leathers2019-08-23
| | | |
* | | | Merge pull request #65706 from aanderse/phpfpmAaron Andersen2019-08-24
|\ \ \ \ | | | | | | | | | | nixos/phpfpm: module cleanup
| * | | | 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 option
| * | | | libvirtd: add onBoot optionAlexander Bakker2019-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new ``onBoot`` option that allows specifying the action taken on guests when the host boots. Specifying "start" ensures all guests that were running prior to shutdown are started, regardless of their autostart settings. Specifying "ignore" will make libvirtd ignore such guests. Any guest marked as autostart will still be automatically started by libvirtd.
* | | | | Merge pull request #67225 from matthewbauer/tramp-zshrc-fixMatthew Bauer2019-08-23
|\ \ \ \ \ | | | | | | | | | | | | nixos/zsh: Fix tramp support
| * | | | | nixos/zsh: Fix tramp supportMatthew Bauer2019-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a long time, TRAMP has not worked with ZSH NixOS servers. I thought I fixed this in 0740f57e63af61694d14796286cb9204, but now realize that was only half the problem. For TRAMP to start working again ‘unsetopt zle’ was needed, otherwise the connection would hang. In addition, I have a few more settings added that can apparenty interfere with these settings.
* | | | | | Merge pull request #67318 from jtojnar/gnome-photosJan Tojnar2019-08-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | gnome-photos: 3.32.0 → 3.32.1
| * | | | | | 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.4
| | * | | | usbguard-nox: init at 0.7.4Ivan Kozik2019-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just usbguard without the Qt GUI that brings in Qt dependencies. Remove pandoc to reduce closure size. The usbguard build appears to use it only for spell checking. Remove asciidoctor because 0.7.1 switched to asciidoc. But don't add a dependency on asciidoc, because that causes the build fails on external DTDs.
| * | | | | Merge pull request #66215 from ajs124/ejabberd/19.08Lassulus2019-08-23
| |\ \ \ \ \ | | | | | | | | | | | | | | ejabberd: 19.05 -> 19.08
| | * | | | | nixos/ejabberd: fix test for new releaseajs1242019-08-20
| | | | | | |
| * | | | | | Merge pull request #67213 from mmahut/jormungandrMarek Mahut2019-08-23
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | nixos: adding jormungandr service
| | * | | | | | 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 option
| | * | | | | | nixos/containers: add unprivileged optionNikita Uvarov2019-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #57083.
| * | | | | | | Merge pull request #67308 from jtojnar/libxmlb-0.1.11Jan Tojnar2019-08-23
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | libxmlb: 0.1.10 → 0.1.11
| | * | | | | | 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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | trezord: adding emulator support (plus test)
| | * | | | | tests: adding trezordMarek Mahut2019-08-16
| | | | | | |
| | * | | | | trezord: adding emultor supportMarek Mahut2019-08-16
| | | | | | |
| * | | | | | nixos/mate: enable vte integrationworldofpeace2019-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Default terminal is mate-terminal which uses vte.
| * | | | | | nixos/pantheon: enable vte integrationworldofpeace2019-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Default terminal is elementary-terminal which uses vte.
| * | | | | | Merge pull request #66990 from worldofpeace/gnome-vte-configworldofpeace2019-08-21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | nixos/gnome-terminal: init
| | * | | | | | nixos/gnome-terminal: initworldofpeace2019-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module obsoletes services.gnome3.gnome-terminal-server as that's a confusing option for users, and sounds internal. It's much simpler to have a gnome-terminal module.
| | * | | | | | nixos/vte: initworldofpeace2019-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module correctly includes the vte.sh script required for vte terminals like gnome-terminal to show the CWD in the window title and preserved across instances. This is achieved with the options: * programs.bash.vteIntegration * programs.zsh.vteIntegration as it's best to keep this configuration unguarded by gnome3.enable to support other vte terminals (such as elementary-terminal). Note the distinction between Zsh and Bash doesn't include a different script, as this script only supports those two shells.
| * | | | | | | Merge pull request #67179 from uvNikita/containers/fix-imperativeSarah Brofeldt2019-08-21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | nixos/containers: fix imperative containers
| | * | | | | | | nixos/containers: fix imperative containersNikita Uvarov2019-08-21
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | Fixes #67174.
| * | | | | | | Merge pull request #67071 from jtojnar/fontconfig-harmonizationJan Tojnar2019-08-21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | nixos/fontconfig: harmonize with penultimate
| | * | | | | | | nixos/fontconfig: harmonize commentsJan Tojnar2019-08-20
| | | | | | | | |
| | * | | | | | | nixos/fontconfig: harmonize file namesJan Tojnar2019-08-20
| | | | | | | | |
| | * | | | | | | nixos/fontconfig: harmonize folder variablesJan Tojnar2019-08-20
| | | | | | | | |