ntp: 4.2.8 -> 4.2.8p2

+8 -11
+5 -10
pkgs/tools/networking/ntp/default.nix
··· 1 - { stdenv, fetchurl, libcap, autoreconfHook }: 1 + { stdenv, fetchurl, autoreconfHook, libcap ? null }: 2 2 3 3 assert stdenv.isLinux -> libcap != null; 4 4 5 5 stdenv.mkDerivation rec { 6 - name = "ntp-4.2.8"; 6 + name = "ntp-4.2.8p2"; 7 7 8 8 src = fetchurl { 9 9 url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; 10 - sha256 = "1vnqa1542d01xmlkw8f3rq57y360b2j7yxkkg9b11955nvw0v4if"; 10 + sha256 = "0ccv9kh5asxpk7bjn73vwrqimbkbfl743bgx0km47bfajl7bqs8d"; 11 11 }; 12 12 13 - patches = [ ./no-openssl.patch ]; 13 + configureFlags = stdenv.lib.optional (libcap != null) "--enable-linuxcaps"; 14 14 15 - configureFlags = '' 16 - --without-crypto 17 - ${if stdenv.isLinux then "--enable-linuxcaps" else ""} 18 - ''; 19 - 20 - buildInputs = [ autoreconfHook ] ++ stdenv.lib.optional stdenv.isLinux libcap; 15 + buildInputs = [ autoreconfHook libcap ]; 21 16 22 17 postInstall = "rm -rf $out/share/doc"; 23 18
+3 -1
pkgs/top-level/all-packages.nix
··· 2165 2165 2166 2166 ntopng = callPackage ../tools/networking/ntopng { }; 2167 2167 2168 - ntp = callPackage ../tools/networking/ntp { }; 2168 + ntp = callPackage ../tools/networking/ntp { 2169 + libcap = if stdenv.isLinux then libcap else null; 2170 + }; 2169 2171 2170 2172 numdiff = callPackage ../tools/text/numdiff { }; 2171 2173