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

Merge pull request #95922 from primeos/iputils

Browse Source 
iputils: 20190709 -> 20200821
This commit is contained in:
Linus Heckemann 2020-08-22 09:51:23 +02:00 committed by GitHub
commit 98679187d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns , meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns
, libcap, nettle, libidn2, systemd , libcap, systemd, libidn2
}: }:
with stdenv.lib; with stdenv.lib;
let let
version = "20190709"; version = "20200821";
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";
@ -19,13 +19,13 @@ in stdenv.mkDerivation rec {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "s${version}"; rev = "s${version}";
sha256 = "04bp4af15adp79ipxmiakfp0ij6hx5qam266flzbr94pr8z8l693"; sha256 = "1jhbcz75a4ij1myyyi110ma1d8d5hpm3scz9pyw7js6qym50xvh4";
}; };
mesonFlags = mesonFlags = [
[ "-DUSE_CRYPTO=nettle"
"-DBUILD_RARPD=true" "-DBUILD_RARPD=true"
"-DBUILD_TRACEROUTE6=true" "-DBUILD_TRACEROUTE6=true"
"-DBUILD_TFTPD=true"
"-DNO_SETCAP_OR_SUID=true" "-DNO_SETCAP_OR_SUID=true"
"-Dsystemdunitdir=etc/systemd/system" "-Dsystemdunitdir=etc/systemd/system"
] ]
@ -33,12 +33,13 @@ in stdenv.mkDerivation rec {
++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false";
nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ];
buildInputs = [ libcap nettle systemd ] buildInputs = [ libcap systemd ]
++ optional (!stdenv.hostPlatform.isMusl) libidn2; ++ optional (!stdenv.hostPlatform.isMusl) libidn2;
meta = { meta = {
homepage = "https://github.com/iputils/iputils";
description = "A set of small useful utilities for Linux networking"; description = "A set of small useful utilities for Linux networking";
inherit (src.meta) homepage;
changelog = "https://github.com/iputils/iputils/releases/tag/s${version}";
license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ]; license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ primeos lheckemann ]; maintainers = with maintainers; [ primeos lheckemann ];