Merge remote-tracking branch 'origin/master' into staging

pkgs/tools/system/rsyslog/default.nix

@@ -1,14 +1,14 @@
-{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd}:
+{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd, liblogging}:
 
 stdenv.mkDerivation {
-  name = "rsyslog-7.4.7";
+  name = "rsyslog-7.6.3";
 
   src = fetchurl {
-    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.4.7.tar.gz;
-    sha256 = "5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21";
+    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz;
+    sha256 = "1v7mi2jjyn3awrfxqvd3mg64m5r027dgpbzd511mlvlbbw1mjcq1";
   };
 
-  buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd];
+  buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd liblogging];
 
   preConfigure = ''
      export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system"

pkgs/tools/system/sizes/default.nix

@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, cmdargs, deepseq, dlist, lens, parallelIo, regexPosix
 , systemFileio, systemFilepath, text
 }:

pkgs/tools/system/symlinks/default.nix

@@ -0,0 +1,27 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "symlinks-${version}";
+  version = "1.4";
+
+  src = fetchurl {
+    url = "http://www.ibiblio.org/pub/Linux/utils/file/${name}.tar.gz";
+    sha256 = "1683psyi8jwq6anhnkwwyaf7pfksf19v04fignd6vi52s2fnifxh";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man
+    cp symlinks $out/bin/
+    cp symlinks.8 $out/share/man/
+  '';
+
+  # No license is mentioned in the code but
+  # http://www.ibiblio.org/pub/Linux/utils/file/symlinks.lsm
+  # and other package managers list it as
+  # "(c) Mark Lord, freely distributable"
+  meta = with stdenv.lib; {
+    description = "A symbolic link maintenance utility";
+    maintainers = [ maintainers.goibhniu ];
+  };
+}

pkgs/tools/system/syslog-ng-incubator/default.nix

@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, glib, syslogng
+, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc }:
+
+stdenv.mkDerivation rec {
+  name = "syslog-ng-incubator-${version}";
+
+  version = "0.3.1";
+
+  src = fetchurl {
+    url = "https://github.com/balabit/syslog-ng-incubator/archive/${name}.tar.gz";
+    sha256 = "0zr0vlp7cq3qfhqhalf7rdyd54skswxnc9j9wi8sfmz3psy3vd4y";
+  };
+
+  buildInputs = [
+    autoconf automake libtool pkgconfig glib syslogng eventlog perl python
+    yacc riemann_c_client libivykis protobufc
+  ];
+
+  preConfigure = "autoreconf -i";
+
+  configureFlags = [
+    "--without-ivykis"
+    "--with-riemann"
+    "--with-module-dir=$(out)/lib/syslog-ng"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/balabit/syslog-ng-incubator";
+    description = "A collection of tools and modules for syslog-ng";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.rickynils ];
+    platforms = platforms.linux;
+  };
+}