-
-
Notifications
You must be signed in to change notification settings - Fork 104
Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: aaeaa6d1c605
head repository: NixOS/nixpkgs-channels
compare: bea326e8de42
- 20 commits
- 10 files changed
- 8 contributors
Commits on Feb 5, 2019
-
nixos/munin: fix documentation links
Since this module was written, Munin has moved their documentation from munin-monitoring.org/wiki to guide.munin-monitoring.org. Most of the links were broken, and the ones that weren't went to "please use the new site" pages.
Configuration menu - View commit details
-
Copy full SHA for c02564e - Browse repository at this point
Copy the full SHA c02564eView commit details -
nixos/munin: add extraPluginConfig option
This lets you specify additional plugin-specific configuration to go in plugin-conf.d, and complements the extraConfig and extraGlobalConfig options.
Configuration menu - View commit details
-
Copy full SHA for c74abf7 - Browse repository at this point
Copy the full SHA c74abf7View commit details -
nixos/munin: add disabledPlugins option
This is just a set of globs to remove from the active plugins directory after autoconfiguration is complete. I also removed the hard-coded disabling of "diskstats", since it seems to work just fine now.
Configuration menu - View commit details
-
Copy full SHA for 0c3208a - Browse repository at this point
Copy the full SHA 0c3208aView commit details -
nixos/munin: require DejaVu fonts if enabled
munin-graph is hardcoded to use DejaVu Mono for the graph legends; if it can't find it, there's no guarantee it finds a monospaced font at all, and if it can't find a monospaced font the legends come out badly misformatted.
Configuration menu - View commit details
-
Copy full SHA for b5b82b2 - Browse repository at this point
Copy the full SHA b5b82b2View commit details -
nixos/munin: add extraPlugins and extraAutoPlugins options [#17895]
extraAutoPlugins lets you list plugins and plugin directories to be autoconfigured, and extraPlugins lets you enable plugins on a one-by-one basis. This can be used to enable plugins from contrib (although you'll need to download and check out contrib yourself, then point these options at it), or plugins you've written yourself.
Configuration menu - View commit details
-
Copy full SHA for 6c90785 - Browse repository at this point
Copy the full SHA 6c90785View commit details -
nixos/munin: add extraCSS option
This permits custom styling of the generated HTML without needing to build your own Munin package from source. Also comes with an example that works as a passable dark theme for Munin.
Configuration menu - View commit details
-
Copy full SHA for c4437fe - Browse repository at this point
Copy the full SHA c4437feView commit details -
nixos/munin: add types to Munin options
Some options were missing their types.
Configuration menu - View commit details
-
Copy full SHA for e7c1449 - Browse repository at this point
Copy the full SHA e7c1449View commit details -
nixos/munin: enable munin_update and disable munin_stats
munin_update relies on a stats file that exists, but isn't found in the default location on NixOS; the appropriate plugin configuration is added. munin_stats relies on munin-cron writing a logfile, which the NixOS build of munin does not. (This is probably fixable in the munin package, but I don't have time to dig into that right now.)
Configuration menu - View commit details
-
Copy full SHA for ace4855 - Browse repository at this point
Copy the full SHA ace4855View commit details -
Also creates the RELEASE file in preBuild so that munin knows its own version number at runtime.
Configuration menu - View commit details
-
Copy full SHA for 85cdd06 - Browse repository at this point
Copy the full SHA 85cdd06View commit details -
Pillow is required to display images with kitty terminal To test it, add these 2 lines to your rc.conf: set preview_images true set preview_images_method kitty
Configuration menu - View commit details
-
Copy full SHA for 3aca219 - Browse repository at this point
Copy the full SHA 3aca219View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1699411 - Browse repository at this point
Copy the full SHA 1699411View commit details -
Configuration menu - View commit details
-
Copy full SHA for d60c38a - Browse repository at this point
Copy the full SHA d60c38aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 400aa7b - Browse repository at this point
Copy the full SHA 400aa7bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 50087e0 - Browse repository at this point
Copy the full SHA 50087e0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8d8e568 - Browse repository at this point
Copy the full SHA 8d8e568View commit details -
Configuration menu - View commit details
-
Copy full SHA for f392a07 - Browse repository at this point
Copy the full SHA f392a07View commit details -
Merge pull request #55281 from tg-x/tparsec-2018-12-21
idrisPackages.tparsec: 2018-11-09 -> 2018-12-21
Configuration menu - View commit details
-
Copy full SHA for 140a648 - Browse repository at this point
Copy the full SHA 140a648View commit details -
Merge pull request #51980 from ToxicFrog/munin-plugins
nixos/munin: New options (and some bugfixes) for service configuration
Configuration menu - View commit details
-
Copy full SHA for dfce20e - Browse repository at this point
Copy the full SHA dfce20eView commit details -
Merge pull request #55270 from jlesquembre/ranger-images
ranger: add pillow dependency
Configuration menu - View commit details
-
Copy full SHA for 812d74c - Browse repository at this point
Copy the full SHA 812d74cView commit details -
latte-dock: 0.8.4 -> 0.8.5 (#55254)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/latte-dock/versions
Configuration menu - View commit details
-
Copy full SHA for bea326e - Browse repository at this point
Copy the full SHA bea326eView commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff aaeaa6d1c605...bea326e8de42