public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iputils: 20190324 -> 20190515

Browse Source 
This is mainly a bug fix release [0].

File changes:
-etc/systemd/system/rdisc@.service
+etc/systemd/system/rdisc.service

nix path-info -S:
20190324: 41055576
20190515: 41055584

[0]: https://github.com/iputils/iputils/releases/tag/s20190515
This commit is contained in:
Michael Weiss 2019-05-15 23:33:04 +02:00
parent d0ea2df4fb
commit 989787b5e6
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/os-specific/linux/iputils/default.nix
View File

@ -6,7 +6,7 @@
with stdenv.lib; with stdenv.lib;
let let
time = "20190324"; time = "20190515";
# ninfod probably could build on cross, but the Makefile doesn't pass --host # ninfod probably could build on cross, but the Makefile doesn't pass --host
# etc to the sub configure... # etc to the sub configure...
withNinfod = stdenv.hostPlatform == stdenv.buildPlatform; withNinfod = stdenv.hostPlatform == stdenv.buildPlatform;
@ -21,19 +21,19 @@ in stdenv.mkDerivation {
owner = "iputils"; owner = "iputils";
repo = "iputils"; repo = "iputils";
rev = "s${time}"; rev = "s${time}";
sha256 = "0b755gv3370c0rrphx14mrsqjb396zqnsm9lsws842a4k4zrqmvi"; sha256 = "1k2wzgk0d47d1g9k8c1a5l24ml8h8xxz1vrs0vfbyxr7qghdhn4i";
}; };
# ninfod cannot be build with nettle yet: # ninfod cannot be build with nettle yet:
patches = patches =
[ ./build-ninfod-with-openssl.patch [ ./build-ninfod-with-openssl.patch
(fetchpatch { # tracepath: fix musl build, again (fetchpatch { # build-sys/doc: Fix the dependency on xsltproc
url = "https://github.com/iputils/iputils/commit/c9aca1b53324bcd1b5a2de5c645813f80eccd016.patch"; url = "https://github.com/iputils/iputils/commit/3b013f271931c3fe771e5a2c591f35d617de90f3.patch";
sha256 = "0faqgkqbi57cyx1zgzzy6xgd24xr0iawix7mjs47j92ra9gw90cz"; sha256 = "0ilhlgiqdflry7km3ik8i4h1yymm5f5zmwyl5r029q7x1p8kinfw";
}) })
(fetchpatch { # doc: Use namespace correctly (fetchpatch { # build-sys: Make setcap really optional
url = "https://github.com/iputils/iputils/commit/c503834519d21973323980850431101f90e663ef.patch"; url = "https://github.com/iputils/iputils/commit/473be6467f995865244e7e68b2fa587a4ee79551.patch";
sha256 = "1yp6b6403ddccbhfzsb36cscxd36d4xb8syc1g02a18xkswiwf09"; sha256 = "0781147qaf0jwa177jbmh474r8hqs0jwgi5vgx9csb43jzdm8hqf";
}) })
]; ];
@ -41,13 +41,14 @@ in stdenv.mkDerivation {
[ "-DUSE_CRYPTO=nettle" [ "-DUSE_CRYPTO=nettle"
"-DBUILD_RARPD=true" "-DBUILD_RARPD=true"
"-DBUILD_TRACEROUTE6=true" "-DBUILD_TRACEROUTE6=true"
"-DNO_SETCAP_OR_SUID=true"
"-Dsystemdunitdir=etc/systemd/system" "-Dsystemdunitdir=etc/systemd/system"
] ]
++ optional (!withNinfod) "-DBUILD_NINFOD=false" ++ optional (!withNinfod) "-DBUILD_NINFOD=false"
# Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111):
++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false";
nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns libcap ]; nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ];
buildInputs = [ libcap nettle systemd ] buildInputs = [ libcap nettle systemd ]
++ optional (!stdenv.hostPlatform.isMusl) libidn2 ++ optional (!stdenv.hostPlatform.isMusl) libidn2
++ optional withNinfod openssl; # TODO: Build with nettle ++ optional withNinfod openssl; # TODO: Build with nettle