Merge staging-next into staging

2019-07-03 08:59:42 +02:00
parent d41bc0ff56 3ad01beda7
commit 25a77b7210
411 changed files with 4314 additions and 2253 deletions
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "nmon-${version}";
-  version = "16j";
+  version = "16k";

  src = fetchurl {
    url = "mirror://sourceforge/nmon/lmon${version}.c";
-    sha256 = "05a6yc1w421r30qg32a8j0wajjv2ff1mwwsrariv3fz3ng4phf5s";
+    sha256 = "17nbxrnl7kqiaaxn2hwyi65gphbl3wybbyp9vri2q5ifdis3ssib";
  };

  buildInputs = [ ncurses ];