Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
base: aaeaa6d1c605
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: bea326e8de42
Choose a head ref
  • 20 commits
  • 10 files changed
  • 8 contributors

Commits on Feb 5, 2019

  1. 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.
    @ToxicFrog
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    c02564e View commit details
    Browse the repository at this point in the history

  2. 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.
    @ToxicFrog
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    c74abf7 View commit details
    Browse the repository at this point in the history

  3. 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.
    @ToxicFrog
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    0c3208a View commit details
    Browse the repository at this point in the history

  4. 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.
    @ToxicFrog
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    b5b82b2 View commit details
    Browse the repository at this point in the history

  5. 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.
    @ToxicFrog
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    6c90785 View commit details
    Browse the repository at this point in the history

  6. 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.
    @ToxicFrog
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    c4437fe View commit details
    Browse the repository at this point in the history

  7. nixos/munin: add types to Munin options 

    Some options were missing their types.
    @ToxicFrog
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    e7c1449 View commit details
    Browse the repository at this point in the history

  8. 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.)
    @ToxicFrog
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    ace4855 View commit details
    Browse the repository at this point in the history

  9. munin: 2.0.37 -> 2.0.43 

    Also creates the RELEASE file in preBuild so that munin knows its own
version number at runtime.
    @ToxicFrog
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    85cdd06 View commit details
    Browse the repository at this point in the history

  10. ranger: add pillow dependency 

    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
    @jlesquembre
    jlesquembre committed Feb 5, 2019
    Copy the full SHA
    3aca219 View commit details
    Browse the repository at this point in the history

  11. minio: 2019-01-23T23-18-58Z -> 2019-01-31T00-31-19Z

    @flokli
    flokli committed Feb 5, 2019
    Copy the full SHA
    1699411 View commit details
    Browse the repository at this point in the history

  12. minio-client: 2018-12-27T00-37-49Z -> 2019-01-30T19-57-22Z

    @flokli
    flokli committed Feb 5, 2019
    Copy the full SHA
    d60c38a View commit details
    Browse the repository at this point in the history

  13. minio: add test to nixos/tests/all-tests.nix

    @flokli
    flokli committed Feb 5, 2019
    Copy the full SHA
    400aa7b View commit details
    Browse the repository at this point in the history

  14. idrisPackages.tparsec: 2018-11-09 -> 2018-12-21

    @tg-x
    tg-x committed Feb 5, 2019
    Copy the full SHA
    50087e0 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #55277 from flokli/minio-2019-01-13 

    Minio updates
    @flokli
    flokli committed Feb 5, 2019
    Copy the full SHA
    8d8e568 View commit details
    Browse the repository at this point in the history

  16. singularity: 2.6.0 -> 2.6.1

    @scalavision @veprbl
    scalavision authored and veprbl committed Feb 5, 2019
    Copy the full SHA
    f392a07 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #55281 from tg-x/tparsec-2018-12-21 

    idrisPackages.tparsec: 2018-11-09 -> 2018-12-21
    @infinisil
    infinisil committed Feb 5, 2019
    Copy the full SHA
    140a648 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #51980 from ToxicFrog/munin-plugins 

    nixos/munin: New options (and some bugfixes) for service configuration
    @infinisil
    infinisil committed Feb 5, 2019
    Copy the full SHA
    dfce20e View commit details
    Browse the repository at this point in the history

  19. Merge pull request #55270 from jlesquembre/ranger-images 

    ranger: add pillow dependency
    @Ma27
    Ma27 committed Feb 5, 2019
    Copy the full SHA
    812d74c View commit details
    Browse the repository at this point in the history

  20. 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
    @r-ryantm @benley
    r-ryantm authored and benley committed Feb 5, 2019
    Copy the full SHA
    bea326e View commit details
    Browse the repository at this point in the history