From 00975280f169b1e7be00c426ad96203a2f0798cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 18 Jan 2018 11:59:16 +0000 Subject: [PATCH] netcat-openbsd: 1.130 -> 1.187 fixes #34002 --- .../tools/networking/netcat-openbsd/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 7c22891ab7a..8c924701377 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, pkgconfig, libbsd}: stdenv.mkDerivation rec { - version = "1.130"; - deb-version = "${version}-3"; + version = "1.187"; + deb-version = "${version}-1"; name = "netcat-openbsd-${version}"; srcs = [ (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz"; - sha256 = "0nqy14yvclgzs98gv0fwp6jlfpfy2kk367zka648jiqbbl30awpx"; + sha256 = "0sxsxl7n7hnxz931jqsp86cdwiq2lm4h3w0i2a67935pki924gxw"; }) (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; - sha256 = "0f9409vjm6v8a7m1zf5sr7wj6v5v8414i5vvxx1r45c11h69hh9a"; + sha256 = "0jwbdis6avxdjzg8bcab1bdz296rkzzkdlv50fr3q0277fxjs49q"; }) ]; @@ -20,11 +20,18 @@ stdenv.mkDerivation rec { buildInputs = [ libbsd ]; sourceRoot = name; - patches = [ "../debian/patches/*.patch" ]; + + prePatch = '' + for i in $(cat ../debian/patches/series); do + patch -p1 < "../debian/patches/$i" + done + ''; installPhase = '' + runHook preInstall install -Dm0755 nc $out/bin/nc install -Dm0644 nc.1 $out/share/man/man1/nc.1 + runHook postInstall ''; meta = with stdenv.lib; {