Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7205c1ee3e60
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c4eff69dcad8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 26, 2019

  1. iputils: 20180629 -> 20190324

    Important changes:
    - Two files where removed in [0]:
      - bin/ipg
      - share/man/man8/pg3.8.gz
    - The build system changed from Autotools to Meson.
    - New: systemd units and Japanese translations
    - "It is probable that within in many many changes a regression may have
      slipped in" [1]
    
    [0]: iputils/iputils@45a1d39
    [1]: https://github.com/iputils/iputils/releases/tag/s20190324
    
    Co-authored-by: Will Dietz <github@wdtz.org>
    primeos and dtzWill committed Mar 26, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    callahad Dan Callahan
    Copy the full SHA
    b6e50e4 View commit details

Commits on Mar 27, 2019

  1. Merge pull request #58215 from primeos/iputils

    iputils: 20180629 -> 20190324
    primeos authored Mar 27, 2019
    Copy the full SHA
    c4eff69 View commit details
Showing with 42 additions and 55 deletions.
  1. +13 −0 pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch
  2. +29 −55 pkgs/os-specific/linux/iputils/default.nix
13 changes: 13 additions & 0 deletions pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/ninfod/meson.build b/ninfod/meson.build
index ea7ec1b..fada05b 100644
--- a/ninfod/meson.build
+++ b/ninfod/meson.build
@@ -10,7 +10,7 @@ ninfod_sources = files('''
ninfod_name.c
'''.split())
executable('ninfod', [ninfod_sources, git_version_h],
- dependencies : [cap_dep, crypto_dep, rt_dep, threads],
+ dependencies : [cap_dep, dependency('openssl'), rt_dep, threads],
link_with : [libcommon],
include_directories : inc,
install: true,
84 changes: 29 additions & 55 deletions pkgs/os-specific/linux/iputils/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, fetchpatch
, libxslt, docbook_xsl, docbook_xml_dtd_44
, libcap, nettle, libidn2, openssl
, meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns
, libcap, nettle, libidn2, openssl, systemd
}:

with stdenv.lib;

let
time = "20180629";
time = "20190324";
# ninfod probably could build on cross, but the Makefile doesn't pass --host
# etc to the sub configure...
withNinfod = stdenv.hostPlatform == stdenv.buildPlatform;
@@ -21,63 +21,37 @@ in stdenv.mkDerivation {
owner = "iputils";
repo = "iputils";
rev = "s${time}";
sha256 = "19rpl48pjgmyqlm4h7sml5gy7yg4cxciadxcs24q1zj40c05jls0";
sha256 = "0b755gv3370c0rrphx14mrsqjb396zqnsm9lsws842a4k4zrqmvi";
};

patches = [
(fetchpatch {
name = "dont-hardcode-the-location-of-xsltproc.patch";
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 = ''
substituteInPlace doc/custom-man.xsl \
--replace "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
for xmlFile in doc/*.xml; do
substituteInPlace $xmlFile \
--replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd"
done
'';

# Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111
makeFlags = optional stdenv.hostPlatform.isMusl "USE_IDN=no";

nativeBuildInputs = [ libxslt.bin ];
buildInputs = [ libcap nettle ]
# ninfod cannot be build with nettle yet:
patches =
[ ./build-ninfod-with-openssl.patch
(fetchpatch { # tracepath: fix musl build, again
url = "https://github.com/iputils/iputils/commit/c9aca1b53324bcd1b5a2de5c645813f80eccd016.patch";
sha256 = "0faqgkqbi57cyx1zgzzy6xgd24xr0iawix7mjs47j92ra9gw90cz";
})
(fetchpatch { # doc: Use namespace correctly
url = "https://github.com/iputils/iputils/commit/c503834519d21973323980850431101f90e663ef.patch";
sha256 = "1yp6b6403ddccbhfzsb36cscxd36d4xb8syc1g02a18xkswiwf09";
})
];

mesonFlags =
[ "-DUSE_CRYPTO=nettle"
"-DBUILD_RARPD=true"
"-DBUILD_TRACEROUTE6=true"
"-Dsystemdunitdir=etc/systemd/system"
]
++ optional (!withNinfod) "-DBUILD_NINFOD=false"
# Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111):
++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false";

nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns libcap ];
buildInputs = [ libcap nettle systemd ]
++ optional (!stdenv.hostPlatform.isMusl) libidn2
++ optional withNinfod openssl; # TODO: Build with nettle

buildFlags = "man all" + optionalString withNinfod " ninfod";

installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/man/man8
for tool in arping clockdiff ping rarpd rdisc tftpd tracepath traceroute6; do
cp $tool $out/bin/
cp doc/$tool.8 $out/share/man/man8/
done
# TODO: Requires kernel module pg3
cp ipg $out/bin/
cp doc/pg3.8 $out/share/man/man8/
'' + optionalString withNinfod ''
cp ninfod/ninfod $out/bin/
cp doc/ninfod.8 $out/share/man/man8/
'';

meta = {
homepage = https://github.com/iputils/iputils;
description = "A set of small useful utilities for Linux networking";