Merge branch 'glibc-2.22' into staging

I'm running whole my working notebook on 2.22 without any problems.
I don't expect any significant issues.

1 files changed, 10 insertions, 6 deletions

diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
index ad40b57f8a60..c12ca525294c 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -2,21 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "rmilter-${version}";
-  version = "1.6.7";
+  version = "1.7.3";
+
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rmilter";
     rev = version;
-    sha256 = "1syviydlv4m1isl0r52sk4s0a75fyk788j1z3yvfzzf1hga333gn";
+    sha256 = "04xalaxq5xgg5ls0f4ayp8yhzdfq5gqjb8qwfyha3mrx4dqrgh7s";
   };
 
   nativeBuildInputs = [ bison cmake flex ];
-  buildInputs = [ libmilter openssl pcre opendkim];
+  buildInputs = [ libmilter openssl pcre opendkim ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/vstakhov/rmilter";
-    license = licenses.bsd2; 
-    description = "server, used to integrate rspamd and milter compatible MTA, for example postfix or sendmail";
-    maintainers = maintainers.avnik;
+    license = licenses.bsd2;
+    description = ''
+      Daemon to integrate rspamd and milter compatible MTA, for example
+      postfix or sendmail
+    '';
+    maintainers = with maintainers; [ avnik fpletz ];
   };
 }