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: 362ac95d6400
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ea5e68b2418
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 12, 2018

  1. ip2unix: 1.1.1 -> 1.2.0 

    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>
    @aszlig
    aszlig committed Nov 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    aszlig
    GPG key ID: 684089CE67EBB691
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2ea5e68 View commit details
Showing with 18 additions and 5 deletions.
  1. +18 −5 pkgs/tools/networking/ip2unix/default.nix
23 changes: 18 additions & 5 deletions pkgs/tools/networking/ip2unix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,40 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, libyamlcpp, systemd
, asciidoctor, python3Packages
, python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl
, libxml2, docbook5
}:

stdenv.mkDerivation rec {
name = "ip2unix-${version}";
version = "1.1.1";
version = "1.2.0";

src = fetchFromGitHub {
owner = "nixcloud";
repo = "ip2unix";
rev = "v${version}";
sha256 = "0lw4f1p1frfpf5l7faqdd80d6pi9g5sx7g3wpmig9sa50k6pmc0v";
sha256 = "0blrhcmska06ydkl15jjgblygkwrimdnbaq3hhifgmffymfk2652";
};

nativeBuildInputs = [
meson ninja pkgconfig asciidoctor
python3Packages.pytest python3Packages.pytest-timeout
meson ninja pkgconfig asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl
libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout
];

buildInputs = [ libyamlcpp systemd ];

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 = {
homepage = https://github.com/nixcloud/ip2unix;
description = "Turn IP sockets into Unix domain sockets";