about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-09-24 17:16:30 +0100
committerGitHub <noreply@github.com>2018-09-24 17:16:30 +0100
commite10361b30a214de9236ef3a42a3c25678e37f5c8 (patch)
tree0a1b055378d33b2b4230ea33f7cd5c2daab7000e /pkgs
parent24c58bd1cce6f2e8c15ec1f08537a6572dfc3c23 (diff)
parentd84c6bec29827d614709ce1c0222e3ae297848ae (diff)
downloadnixlib-e10361b30a214de9236ef3a42a3c25678e37f5c8.tar
nixlib-e10361b30a214de9236ef3a42a3c25678e37f5c8.tar.gz
nixlib-e10361b30a214de9236ef3a42a3c25678e37f5c8.tar.bz2
nixlib-e10361b30a214de9236ef3a42a3c25678e37f5c8.tar.lz
nixlib-e10361b30a214de9236ef3a42a3c25678e37f5c8.tar.xz
nixlib-e10361b30a214de9236ef3a42a3c25678e37f5c8.tar.zst
nixlib-e10361b30a214de9236ef3a42a3c25678e37f5c8.zip
Merge pull request #47275 from dtzWill/fix/iputils-musl
iputils: upstream fixes for musl
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/iputils/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index e66dbe41d013..2248f0329c60 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -30,6 +30,16 @@ in stdenv.mkDerivation {
       url = "https://github.com/iputils/iputils/commit/d0ff83e87ea9064d9215a18e93076b85f0f9e828.patch";
       sha256 = "05wrwf0bfmax69bsgzh3b40n7rvyzw097j8z5ix0xsg0kciygjvx";
     })
+    (fetchpatch {
+      name = "add-missing-idn-declarations.patch";
+      url = "https://github.com/iputils/iputils/commit/5007d7067918fb3d950d34c01d059e5222db679a.patch";
+      sha256 = "0dhgxdhjcbb2q6snm3mjp38l066knykmrx4k8rn167cizn7akpdx";
+    })
+    (fetchpatch {
+      name = "fix-ping-idn.patch";
+      url = "https://github.com/iputils/iputils/commit/25899e849aa3abc1ad29ebf0b830262a859eaed5.patch";
+      sha256 = "1bqjcdjjnc2j6indcli7s7gbbhkcaligvh94asixfrmjzkbn533n";
+    })
   ];
 
   prePatch = ''