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
@@ -3,11 +3,11 @@
 assert stdenv.isLinux -> libcap != null;

 stdenv.mkDerivation rec {
-  name = "ntp-4.2.8p4";
+  name = "ntp-4.2.8p6";

  src = fetchurl {
    url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "1fgxbhv0wyiivi6kh5zpzrd0yqmc48z7d3zmjspw9lj84mbn2s8d";
+    sha256 = "0j509gd0snj8dq15rhfv2v4wisfaabya1gmgqslk1kisawf0wgaq";
  };

  configureFlags = [