Merge branch 'master.upstream' into staging.upstream

pkgs/tools/X11/xdg-utils/default.nix

@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     for item in $out/bin/*; do
       substituteInPlace $item --replace "cut " "${coreutils}/bin/cut "
       substituteInPlace $item --replace "sed " "${gnused}/bin/sed "
-      substituteInPlace $item --replace "grep " "${gnugrep}/bin/grep "
       substituteInPlace $item --replace "egrep " "${gnugrep}/bin/egrep "
+      sed -i $item -e "s#[^e]grep #${gnugrep}/bin/grep #g" # Don't replace 'egrep'
       substituteInPlace $item --replace "which " "${which}/bin/which "
       substituteInPlace $item --replace "/usr/bin/file" "${file}/bin/file"
     done

pkgs/tools/compression/lz4/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, valgrind }:
 
-let version = "130"; in
+let version = "131"; in
 stdenv.mkDerivation rec {
   name = "lz4-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1050hwnbqyz2m26vayv942dh92689qp73chrbnqlg8awhlb5kyi5";
+    sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2";
     rev = "r${version}";
     repo = "lz4";
     owner = "Cyan4973";

pkgs/tools/filesystems/btrfsprogs/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
-let version = "4.0.1"; in
+let version = "4.1"; in
 
 stdenv.mkDerivation (rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1jwk0bnb4nvhw6b7i9mw5wkvqc6igx99qqg8zwpaj5nxkvki0bic";
+    sha256 = "1s5pzvi30mivxgbkx7nbqn38pfiw20rdnd6xiqsyfj7rpffzzimb";
   };
 
   buildInputs = [

pkgs/tools/filesystems/glusterfs/default.nix

@@ -17,11 +17,15 @@ let
     autoconf automake libtool pkgconfig zlib libaio libxml2
     acl sqlite liburcu attr
   ];
+  # Some of the headers reference acl
+  propagatedBuildInputs = [
+    acl
+  ];
 in
 stdenv.mkDerivation
 rec {
   inherit (s) name version;
-  inherit buildInputs;
+  inherit buildInputs propagatedBuildInputs;
 
   preConfigure = ''
     ./autogen.sh

pkgs/tools/filesystems/reiserfsprogs/default.nix

@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libuuid ];
 
+  NIX_CFLAGS_COMPILE = "-std=gnu90";
+
   meta = {
     inherit version;
     homepage = http://www.namesys.com/;

pkgs/tools/misc/bmon/default.nix

@@ -3,18 +3,15 @@
 
 stdenv.mkDerivation rec {
   name = "bmon-${version}";
-  version = "3.6";
+  version = "3.7";
 
   src = fetchFromGitHub {
     owner = "tgraf";
     repo = "bmon";
     rev = "v${version}";
-    sha256 = "16qwazays2j448kmfckv6wvh4rhmhc9q4vp1s75hm9z02cmhvk8q";
+    sha256 = "0rh0r8gabcsqq3d659yqk8nz6y4smsi7p1vwa2v584m2l2d0rqd6";
   };
 
-  # https://github.com/tgraf/bmon/pull/24#issuecomment-98068887
-  postPatch = "sed '1i#include <net/if.h>' -i src/in_netlink.c";
-
   buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ];
 
   preConfigure = "sh ./autogen.sh";

pkgs/tools/misc/memtest86+/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     fi
   '';
 
-  NIX_CFLAGS_COMPILE = "-I.";
+  NIX_CFLAGS_COMPILE = "-I. -std=gnu90";
 
   buildFlags = "memtest.bin";
 

pkgs/tools/misc/screen/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, pam ? null }:
 
 stdenv.mkDerivation rec {
-  name = "screen-4.3.0";
+  name = "screen-4.3.1";
 
   src = fetchurl {
     url = "mirror://gnu/screen/${name}.tar.gz";
-    sha256 = "0ilccnwszaxr9wbrx0swh4fisha2rj2jiq76fwqikmv0rjdyhr2i";
+    sha256 = "0qwxd4axkgvxjigz9xs0kcv6qpfkrzr2gm43w9idx0z2mvw4jh7s";
   };
 
   preConfigure = ''

pkgs/tools/networking/keepalived/default.nix

@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, openssl, net_snmp, libnl }:
+
+stdenv.mkDerivation rec {
+  name = "keepalived-1.2.18";
+
+  src = fetchurl {
+    url = "http://keepalived.org/software/${name}.tar.gz";
+    sha256 = "07l1ywg44zj2s3wn9mh6y7qbcc0cgp6q1q39hnm0c5iv5izakkg5";
+  };
+
+  buildInputs = [ openssl net_snmp libnl ];
+
+  postPatch = ''
+    sed -i 's,$(DESTDIR)/usr/share,$out/share,g' Makefile.in
+  '';
+
+  # It doesn't know about the include/libnl<n> directory
+  NIX_CFLAGS_COMPILE="-I${libnl}/include/libnl3";
+  NIX_LDFLAGS="-lnl-3 -lnl-genl-3";
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--enable-snmp"
+    "--enable-sha1"
+  ];
+
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://keepalived.org;
+    description = "routing software written in C";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}

pkgs/tools/networking/netsniff-ng/default.nix

@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-18-g9977ec6"; in
+let version = "0.5.9-21-g8c75168"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "9977ec6012452bfc5053dbc90aed53f55064c86b";
-    sha256 = "1ww0pm3v9wphjzfanswx2przps33v26q38alxljigj5cigh8ffms";
+    rev = "8c75168ed5005f70955dd4ade93dec6abf481852";
+    sha256 = "10awwwmpm555wl1z07pz20cq1lsy37r36m0aamck9ri5vyq6fdzw";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

pkgs/tools/networking/tinc/pre.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tinc-1.1pre-2015-05-15";
+  name = "tinc-1.1pre-2015-06-20";
 
   src = fetchgit {
     url = "git://tinc-vpn.org/tinc";
-    rev = "613c121cdceec0199dc4d056857be021ed1d21de";
-    sha256 = "1l99bvqmb35hwb63fcy9gbjxasxnrgqw3i9f14f26dq3sz2j035l";
+    rev = "ebffa40aa7832459f63801e3a91cc741e6b339a8";
+    sha256 = "0yp40n5cgfadd7lmi28qv7cf5s14qqw5ga76y5xd0fjpacv6akcp";
   };
 
   buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ];

pkgs/tools/security/signing-party/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # no check rule
 
   meta = {
-    description = "PGP Tools is a collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc.";
+    description = "A collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc";
     homepage = http://pgp-tools.alioth.debian.org;
     platforms = gnupg.meta.platforms;
     license = stdenv.lib.licenses.gpl2;