Merging against master - updating smokingpig, rebase was going to be messy

pkgs/servers/monitoring/nagios/plugins/official-2.x.nix

@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, openssh }:
+{ stdenv, fetchurl, openssh, openssl }:
 
 stdenv.mkDerivation rec {
   name = "nagios-plugins-${version}";
-  version = "2.1.4";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "http://nagios-plugins.org/download/${name}.tar.gz";
-    sha256 = "146hrpcwciz0niqsv4k5yvkhaggs9mr5v02xnnxp5yp0xpdbama3";
+    sha256 = "074yia04py5y07sbgkvri10dv8nf41kqq1x6kmwqcix5vvm9qyy3";
   };
 
   # !!! Awful hack. Grrr... this of course only works on NixOS.
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   postInstall = "ln -s libexec $out/bin";
 
   # !!! make openssh a runtime dependency only
-  buildInputs = [ openssh ];
+  buildInputs = [ openssh openssl ];
 
   meta = {
     description = "Official plugins for Nagios";