diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-02-03 21:02:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 21:02:06 +0100 |
| commit | 25e3e66b652f39cadad08f2f2aadbe7b2f8211b7 (patch) | |
| tree | a7e1186d3834ff646deba4d45bbe910a66810acf | |
| parent | 571eb109965ed3f0629d7a0f07e6885e3faee956 (diff) | |
| download | nixpkgs-25e3e66b652f39cadad08f2f2aadbe7b2f8211b7.tar nixpkgs-25e3e66b652f39cadad08f2f2aadbe7b2f8211b7.tar.gz nixpkgs-25e3e66b652f39cadad08f2f2aadbe7b2f8211b7.tar.bz2 nixpkgs-25e3e66b652f39cadad08f2f2aadbe7b2f8211b7.tar.lz nixpkgs-25e3e66b652f39cadad08f2f2aadbe7b2f8211b7.tar.xz nixpkgs-25e3e66b652f39cadad08f2f2aadbe7b2f8211b7.tar.zst nixpkgs-25e3e66b652f39cadad08f2f2aadbe7b2f8211b7.zip | |
iputils: 20200821 -> 20210202 (#111645)
| -rw-r--r-- | pkgs/os-specific/linux/iputils/default.nix | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 0079aa79a22..56942d6d420 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,12 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns , libcap, libidn2 }: -with lib; - let - version = "20200821"; + version = "20210202"; sunAsIsLicense = { fullName = "AS-IS, SUN MICROSYSTEMS license"; url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; @@ -18,18 +16,10 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "s${version}"; - sha256 = "1jhbcz75a4ij1myyyi110ma1d8d5hpm3scz9pyw7js6qym50xvh4"; + rev = version; + sha256 = "08j2hfgnfh31vv9rn1ml7090j2lsvm9wdpdz13rz60rmyzrx9dq3"; }; - patches = [ - # Proposed upstream patch to reduce dependency on systemd: https://github.com/iputils/iputils/pull/297 - (fetchpatch { - url = "https://github.com/iputils/iputils/commit/13d6aefd57fd471ecad06e19073dcc44608dff5e.patch"; - sha256 = "1n62zxmzp7hgz9qapbbpqv3fxqvc3qyd2a73jhp357x6by84kj49"; - }) - ]; - mesonFlags = [ "-DBUILD_RARPD=true" "-DBUILD_TRACEROUTE6=true" @@ -39,13 +29,13 @@ in stdenv.mkDerivation rec { "-DINSTALL_SYSTEMD_UNITS=true" ] # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): - ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; + ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] - ++ optional (!stdenv.hostPlatform.isMusl) libidn2; + ++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2; - meta = { + meta = with lib; { description = "A set of small useful utilities for Linux networking"; inherit (src.meta) homepage; changelog = "https://github.com/iputils/iputils/releases/tag/s${version}"; |