summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge pull request #44441 from mnacamura/shell-aliasesSilvan Mosberger2018-10-13
|\ | | | | environment.shellAliases: change default behavior
| * nixos/shells: enable to nullify already defined aliasesMitsuhiro Nakamura2018-10-14
| |
| * nixos/shells: programs.*sh.shellAliases override environment.shellAliasesMitsuhiro Nakamura2018-10-14
| |
| * nixos/shells: do not override user-defined shell aliasesMitsuhiro Nakamura2018-10-14
| |
* | Merge pull request #47691 from florianjacob/matomo-choose-packageYegor Timoshenko2018-10-13
|\ \ | | | | | | nixos/matomo: introduce services.matomo.package option
| * | nixos/matomo: introduce services.matomo.package optionFlorian Jacob2018-10-13
| | |
* | | Merge pull request #47696 from Ma27/dont-run-thefuck-on-bashYegor Timoshenko2018-10-13
|\ \ \ | | | | | | | | nixos/thefuck: don't run thefuck on `environment.shellInit'
| * | | nixos/thefuck: don't run thefuck on `environment.shellInit'Maximilian Bosch2018-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The init script slightly differs depending on which shell is in use. So for bash it should be in the interactiveShellInit as well. In this case we don't need a mkIf as `bash` is enabled by default on NixOS.
* | | | Merge pull request #48307 from delroth/prom-torAlexey Shmalko2018-10-13
|\ \ \ \ | | | | | | | | | | prometheus-tor-exporter: init at 0.3
| * | | | prometheus-tor-exporter: init at 0.3Pierre Bourdon2018-10-13
| | | | | | | | | | | | | | | | | | | | Upstream: https://github.com/atx/prometheus-tor_exporter
* | | | | Merge pull request #48292 from jslight90/gitlabJörg Thalheim2018-10-13
|\ \ \ \ \ | |/ / / / |/| | | | nixos/gitlab: add custom hooks directory for gitlab-shell
| * | | | add custom hooks directory to gitlab-shellJeff Slight2018-10-12
| | | | | | | | | | | | | | | | | | | | Add custom_hooks_dir to gitlab-shell yml config file.
* | | | | nixos/qemu-guest-agent: pkgs.{kvm -> qemu} (#48293)volth2018-10-13
| | | | | | | | | | | | | | | there is no top-level pkgs.kvm
* | | | | Merge pull request #48248 from volth/environment.extraSetupJörg Thalheim2018-10-12
|\ \ \ \ \ | | | | | | | | | | | | use buildPackages in environment.extraSetup
| * | | | | use buildPackages in environment.extraSetupvolth2018-10-12
| | |_|_|/ | |/| | |
* | | | | Merge pull request #48272 from avnik/fix/rmilterJörg Thalheim2018-10-12
|\ \ \ \ \ | |_|/ / / |/| | | | nixos/rmilter: don't enable by default, if rspamd enabled
| * | | | nixos/rmilter: don't enable by default, if rspamd enabledAlexander V. Nikolaev2018-10-12
| | | | |
* | | | | Merge pull request #42562 from ambrop72/gdk-pixbuf-fixJan Tojnar2018-10-12
|\ \ \ \ \ | | | | | | | | | | | | Use a NixOS module for generating the gdk-pixbuf loaders cache.
| * | | | | Use a NixOS module for generating the gdk-pixbuf loaders cache.Ambroz Bizjak2018-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue #33231 and makes it possible to enable Plasma and KDE at the same time. Previously, this worked like this: - The gdk-pixbuf package comes with a cache file covering the modules bundled with gdk-pixbuf. - The librsvg package comes with a cache covering modules from gdk-pixbuf as well as librsvg. - plasma5 and xfce modules set the environment variable GDK_PIXBUF_MODULE_FILE to the one from librsvg, so that SVG was supported in addition to the formats supported by gdk-pixbuf. However if both were enabled a configuration conflict would result (despite setting to the same value). While this sort of worked (ignoring the conflict which perhaps could be hacked around), it is unscalable and a hack, as there would be a real problem when one wanted to add a third package that supports additional image formats. A new NixOS module (gdk-pixbuf) is added with a configuration option (modulePackages) that other modules use to request specific packages to be included in the loaders cache. When any package is present in the list, the module generates a system-wide loaders cache which includes the requested packages (and always gdk-pixbuf itself), and sets the environment variable GDK_PIXBUF_MODULE_FILE to point to the generated cache file. The plasma5 and xfce modules are updated to add librsvg to modulePackages instead of setting GDK_PIXBUF_MODULE_FILE. Note that many packages create wrappers that set GDK_PIXBUF_MODULE_FILE, some directly to the one from librsvg. Therefore this change does not change the existing hack in the librsvg package which ensures that file is generated. This change aims only to solve the conflict in the global environent variable configuration.
* | | | | | Merge pull request #48245 from volth/patch-258Jörg Thalheim2018-10-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | bootStage1: fix cross build
| * | | | | | bootStage1: fix cross build (@matthewbauer's solution)volth2018-10-12
| | | | | | |
| * | | | | | bootStage1: fix cross buildvolth2018-10-12
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #45890 from lopsided98/buildbot-python3Silvan Mosberger2018-10-12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | buildbot: Python 3 support and other improvements
| * | | | | buildbot: add Python 3 supportBen Wolsieffer2018-10-11
| | | | | |
* | | | | | Merge pull request #48229 from lopsided98/luks-ssh-fixFranz Pletz2018-10-11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | nixos: initrd/luks: fix detection of devices by UUID
| * | | | | nixos: initrd/luks: fix detection of devices by UUIDBen Wolsieffer2018-10-11
| | | | | |
| * | | | | nixos: initrd/luks: make script indentation consistentBen Wolsieffer2018-10-11
| | | | | |
* | | | | | Merge pull request #46041 from nh2/issue-46038-nix-daemon-ssh-pathSilvan Mosberger2018-10-11
|\ \ \ \ \ \ | | | | | | | | | | | | | | nix-daemon service: Ensure `ssh` is on PATH. Fixes #46038.
| * | | | | | nix-daemon service: Ensure `ssh` is on PATH. Fixes #46038.Niklas Hambüchen2018-09-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced in commit 700e21d6dac4683ef40f20127a6eb2a74b9bd8c6 nix needs ssh on path for the SSH substituter functionality, not only the distributed builds functionality. Signed-off-by: Niklas Hambüchen <mail@nh2.me>
* | | | | | | Merge pull request #47902 from pvgoran/correct-mkEnableOption-usesSilvan Mosberger2018-10-11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | nixos: correct improper uses of mkEnableOption, clarify service descr…
| * | | | | | | nixos: correct improper uses of mkEnableOption, clarify service descriptionsPavel Goran2018-10-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several service definitions used `mkEnableOption` with text starting with "Whether to", which produced funny option descriptions like "Whether to enable Whether to run the rspamd daemon..". This commit corrects this, and adds short descriptions of services to affected service definitions.
* | | | | | | | Merge pull request #48026 from mnacamura/fish-escapeshellargSilvan Mosberger2018-10-11
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | nixos/fish: use 'escapeShellArg' for shell aliases
| * | | | | | | nixos/fish: use 'escapeShellArg' for shell aliasesMitsuhiro Nakamura2018-10-08
| | | | | | | |
* | | | | | | | Merge pull request #48189 from aanderse/redmineMichael Raskin2018-10-11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | redmine: refactor, cleanup, bug fix, and add functionality
| * | | | | | | | switched from builtins.fetchurl to pkgs.fetchurlAaron Andersen2018-10-11
| | | | | | | | |
| * | | | | | | | quoting stateDir path in case it includes spacesAaron Andersen2018-10-11
| | | | | | | | |
| * | | | | | | | added test to nixos/release.nix so it will be run on hydraAaron Andersen2018-10-10
| | | | | | | | |
| * | | | | | | | redmine: refactor, cleanup, bug fix, and add functionalityAaron Andersen2018-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added package option to specify which version of redmine - added themes option back in to allow specifying redmine themes - added plugins option back in to allow specifying redmine plugins - added database.socket option to allow mysql unix socket authentication - added port option to allow specifying the port rails runs on - cleaned up Gemfile so it is much less hacky - switched to ruby version 2.4 by default as suggested by documentation http://www.redmine.org/projects/redmine/wiki/redmineinstall#Installing-Redmine - fixed an annoyance (bug) in the service causing recursive symlinks - fixed ownership bug on log files generated by redmine - updates reflecting renames in nixos options - added a nixos test
* | | | | | | | | nixos/nextcloud: add poolConfig option (#48094)Victor SENE2018-10-11
| | | | | | | | |
* | | | | | | | | Merge pull request #48055 from WilliButz/add-exporter-testsFranz Pletz2018-10-11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | nixos/tests: add test for prometheus exporters
| * | | | | | | | | nixos/tests: add test for prometheus exportersWilliButz2018-10-08
| | | | | | | | | |
| * | | | | | | | | nixos/prometheus-exporters: fix unapplied service configWilliButz2018-10-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit, the default values for `Restart`, `PrivateTmp` and `WorkingDirectory` were falsely ignored. I also added myself as maintainer.
| * | | | | | | | | nixos/prometheus-varnish-exporter: avoid crash on restartWilliButz2018-10-08
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #47252 from xeji/p/fix-47210xeji2018-10-11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | nixos/network-interfaces-scripted: fix a container networking bug
| * | | | | | | | | nixos/network-interfaces-scripted: fix container networking bugUli Baum2018-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a bridge interface was reconfigured, running containers using this bridge lost connectivity: restarting network-addresses-brN.service triggered a restart of network-setup.service via a "partOf" relationship introduced in 07e0c0e0a2f237639600f2a0d62f6eac748b1e6e. This in turn restarted brN-netdev.service. The bridge was thus destroyed and recreated with the same name but a new interface id, causing attached veth interfaces to lose their connection. This change removes the "partOf" relationship between network-setup.service and network-addresses-brN.service for all bridges.
* | | | | | | | | | cups-googlecloudprint: init at 20160502obadz2018-10-11
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | nixos/display-managers/startx: init (#47773)xeji2018-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dummy display manager that allows running X as a normal user. The X server is started manually from a vt using `startx`. Session startup commands must be provided by the user in ~/.xinitrc, which is NOT automatically generated.
* | | | | | | | | nixos/tests: fix non-determinism for goodWilliButz2018-10-10
| | | | | | | | |
* | | | | | | | | Merge pull request #48098 from peterhoeg/f/optiPeter Hoeg2018-10-10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | nix-optimise: do not run in container
| * | | | | | | | | nix-optimise: do not run in containerPeter Hoeg2018-04-27
| | | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-22 10:18:34 +0000