Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-02-28 16:32:57 +00:00
parent 8615f026a4 a9d24cedeb
commit 3b4765c9e5
302 changed files with 13274 additions and 2727 deletions
@@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null;
 stdenv.mkDerivation rec {
  name = "chrony-${version}";

-  version = "2.2";
+  version = "2.3";

  src = fetchurl {
    url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "1194maargy4hpl2a3vy5mbrrswzajjdn92p4w17gbb9vlq7q5zfk";
+    sha256 = "1cncjapm98hv1nyrqlanjpz8k5ny6rp4vnf0gjl0zyqj619gpgsq";
  };

  buildInputs = [ readline texinfo nss nspr ] ++ stdenv.lib.optional stdenv.isLinux libcap;