MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

iputils: 20200821 -> 20210202 (#111645)

Browse source
This commit is contained in:
Michael Weiss 2021-02-03 21:02:06 +01:00 committed by GitHub
parent 571eb10996
commit 25e3e66b65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/os-specific/linux/iputils/default.nix
View file

@ -1,12 +1,10 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch { lib, stdenv, fetchFromGitHub
, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns , meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns
, libcap, libidn2 , libcap, libidn2
}: }:
with lib;
let let
version = "20200821"; version = "20210202";
sunAsIsLicense = { sunAsIsLicense = {
fullName = "AS-IS, SUN MICROSYSTEMS license"; fullName = "AS-IS, SUN MICROSYSTEMS license";
url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c";
@ -18,18 +16,10 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "s${version}"; rev = version;
sha256 = "1jhbcz75a4ij1myyyi110ma1d8d5hpm3scz9pyw7js6qym50xvh4"; 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 = [ mesonFlags = [
"-DBUILD_RARPD=true" "-DBUILD_RARPD=true"
"-DBUILD_TRACEROUTE6=true" "-DBUILD_TRACEROUTE6=true"
@ -39,13 +29,13 @@ in stdenv.mkDerivation rec {
"-DINSTALL_SYSTEMD_UNITS=true" "-DINSTALL_SYSTEMD_UNITS=true"
] ]
# 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"; ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false";
nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ];
buildInputs = [ libcap ] 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"; description = "A set of small useful utilities for Linux networking";
inherit (src.meta) homepage; inherit (src.meta) homepage;
changelog = "https://github.com/iputils/iputils/releases/tag/s${version}"; changelog = "https://github.com/iputils/iputils/releases/tag/s${version}";