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

ip2unix: 1.1.1 -> 1.2.0

Browse Source 
Upstream changes:

  - Fixed: Don't fail when building the manual with AsciiDoc and xmllint.
  - Fixed: Some long options (--rule, --rules-file and --rules-data) were
           ignored.
  - Fixed: Manpage formatting is now more consistent.
  - Added: A new --version command line argument for showing version
           information.

With the new upstream release recommending to use AsciiDoc to generate
the manpage, I also switched to AsciiDoc instead of Asciidoctor. The
resulting manpage looks better in some ways (for example when definition
lists are used).

I also added an installCheckPhase to ensure that the manpage exists in
the resulting store path.

Signed-off-by: aszlig <aszlig@nix.build>
This commit is contained in:
aszlig 2018-11-12 15:40:41 +01:00
parent 362ac95d64
commit 2ea5e68b24
No known key found for this signature in database
GPG Key ID: 684089CE67EBB691
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/tools/networking/ip2unix/default.nix
View File

@ -1,27 +1,40 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, libyamlcpp, systemd { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, libyamlcpp, systemd
, asciidoctor, python3Packages , python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl
, libxml2, docbook5
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ip2unix-${version}"; name = "ip2unix-${version}";
version = "1.1.1"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nixcloud"; owner = "nixcloud";
repo = "ip2unix"; repo = "ip2unix";
rev = "v${version}"; rev = "v${version}";
sha256 = "0lw4f1p1frfpf5l7faqdd80d6pi9g5sx7g3wpmig9sa50k6pmc0v"; sha256 = "0blrhcmska06ydkl15jjgblygkwrimdnbaq3hhifgmffymfk2652";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig asciidoctor meson ninja pkgconfig asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl
python3Packages.pytest python3Packages.pytest-timeout libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout
]; ];
buildInputs = [ libyamlcpp systemd ]; buildInputs = [ libyamlcpp systemd ];
doCheck = true; doCheck = true;
doInstallCheck = true;
installCheckPhase = ''
found=0
for man in "$out/share/man/man1"/ip2unix.1*; do
test -s "$man" && found=1
done
if [ $found -ne 1 ]; then
echo "ERROR: Manual page hasn't been generated." >&2
exit 1
fi
'';
meta = { meta = {
homepage = https://github.com/nixcloud/ip2unix; homepage = https://github.com/nixcloud/ip2unix;
description = "Turn IP sockets into Unix domain sockets"; description = "Turn IP sockets into Unix domain sockets";