Skip to content
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
base: 446fec8c2dda
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d72c4791bc47
Choose a head ref
  • 10 commits
  • 11 files changed
  • 9 contributors

Commits on Dec 30, 2019

  1. nagios: various improvements 

    * structured config for main config file allows to launch nagios in
debug mode without having to write the whole config file by hand
* build time syntax check
* all options have types, one more example
* I find it misleading that the main nagios config file is linked in
/etc but that if you change the link in /etc/ and restart nagios, it
has no effect. Have nagios use /etc/nagios.cfg
* fix paths in example nagios config files, which allows to reuse it:
  services.nagios.objectDefs =
   (map (x: "${pkgs.nagios}/etc/objects/${x}.cfg")
   [ "templates" "timeperiods" "commands" ]) ++ [ ./main.cfg ]
* for the above reason, add mailutils to default plugins

Co-Authored-By: Aaron Andersen <aaron@fosslib.net>
    @aanderse @symphorien
    2 people authored and symphorien committed Dec 30, 2019
    Copy the full SHA
    be25e45 View commit details
    Browse the repository at this point in the history

  2. nagios: add nixos test

    @symphorien
    symphorien committed Dec 30, 2019
    Copy the full SHA
    cb38bf3 View commit details
    Browse the repository at this point in the history

  3. gradle: 5.6.1 -> 5.6.4

    @ktor
    ktor committed Dec 30, 2019
    Copy the full SHA
    5f182a9 View commit details
    Browse the repository at this point in the history

  4. shorewall: init at 5.2.3.3 

    nixos/shorewall: init
    @ryantm
    Julien Moutinho authored and ryantm committed Dec 30, 2019
    Copy the full SHA
    56a73df View commit details
    Browse the repository at this point in the history

  5. Merge pull request #46131 from ju1m/shorewall 

    shorewall: init at 5.2.3.3
    @ryantm
    ryantm committed Dec 30, 2019
    Copy the full SHA
    3a644e3 View commit details
    Browse the repository at this point in the history

  6. Bochs: quote homepage URL in order to suit the new standards

    @AndersonTorres
    AndersonTorres committed Dec 30, 2019
    Copy the full SHA
    a36e54d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #76712 from AndersonTorres/update/bochs 

    Bochs: quote homepage URL in order to suit the new standards
    @AndersonTorres
    AndersonTorres committed Dec 30, 2019
    Copy the full SHA
    a9eb3ee View commit details
    Browse the repository at this point in the history

  8. Merge pull request #76711 from ktor/master 

    gradle: 5.6.1 -> 5.6.4
    @NeQuissimus
    NeQuissimus committed Dec 30, 2019
    Copy the full SHA
    d835f22 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #76551 from symphorien/nagios2 

    nagios: various improvements
    @aanderse
    aanderse committed Dec 30, 2019
    Copy the full SHA
    66bf754 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin' into staging-next

    Jonathan Ringer committed Dec 30, 2019
    Copy the full SHA
    d72c479 View commit details
    Browse the repository at this point in the history