diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2021-07-23 11:03:00 +0200 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2021-07-24 15:12:42 +0200 |
commit | aa760facf3dd47b3c7419a9746bbc5799ec6747e (patch) | |
tree | 81c28a68a35064152789dbe8657f7ef94d59dade /pkgs/os-specific/linux | |
parent | 1b3ba289b2a03748d0a8b790c82b638b73a7dd01 (diff) | |
download | nixpkgs-aa760facf3dd47b3c7419a9746bbc5799ec6747e.tar nixpkgs-aa760facf3dd47b3c7419a9746bbc5799ec6747e.tar.gz nixpkgs-aa760facf3dd47b3c7419a9746bbc5799ec6747e.tar.bz2 nixpkgs-aa760facf3dd47b3c7419a9746bbc5799ec6747e.tar.lz nixpkgs-aa760facf3dd47b3c7419a9746bbc5799ec6747e.tar.xz nixpkgs-aa760facf3dd47b3c7419a9746bbc5799ec6747e.tar.zst nixpkgs-aa760facf3dd47b3c7419a9746bbc5799ec6747e.zip |
iputils: 20210202 -> 20210722
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/iputils/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 495860ef576..c949069885d 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns , libcap, libidn2 +, iproute2 , apparmorRulesFromClosure }: let - version = "20210202"; + version = "20210722"; sunAsIsLicense = { fullName = "AS-IS, SUN MICROSYSTEMS license"; url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; @@ -18,11 +19,20 @@ in stdenv.mkDerivation rec { owner = pname; repo = pname; rev = version; - sha256 = "08j2hfgnfh31vv9rn1ml7090j2lsvm9wdpdz13rz60rmyzrx9dq3"; + sha256 = "139fyifsjm0i012rhcx3ra3pxx2wxh77dfd551d8lgiv2mqd742j"; }; + postPatch = lib.optionalString (!doCheck) '' + # There isn't a Meson option for this yet: + sed -i '/##### TESTS #####/q' ping/meson.build + ''; + outputs = ["out" "apparmor"]; + # We don't have the required permissions inside the build sandbox: + # /build/source/build/ping/ping: socket: Operation not permitted + doCheck = false; + mesonFlags = [ "-DBUILD_RARPD=true" "-DBUILD_TRACEROUTE6=true" @@ -37,6 +47,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] ++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2; + checkInputs = [ iproute2 ]; + postInstall = '' mkdir $apparmor cat >$apparmor/bin.ping <<EOF |