summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-01-18 15:29:59 +0000
committerGitHub <noreply@github.com>2018-01-18 15:29:59 +0000
commit3b21d4d4bcdad86f01f87811066a5d44639321da (patch)
treef3c2ea93ecf154eabc11bc9b3689965d77add712
parentf040f64636551a059b3201aec892d7fa4daa121e (diff)
parent00975280f169b1e7be00c426ad96203a2f0798cf (diff)
downloadnixlib-3b21d4d4bcdad86f01f87811066a5d44639321da.tar
nixlib-3b21d4d4bcdad86f01f87811066a5d44639321da.tar.gz
nixlib-3b21d4d4bcdad86f01f87811066a5d44639321da.tar.bz2
nixlib-3b21d4d4bcdad86f01f87811066a5d44639321da.tar.lz
nixlib-3b21d4d4bcdad86f01f87811066a5d44639321da.tar.xz
nixlib-3b21d4d4bcdad86f01f87811066a5d44639321da.tar.zst
nixlib-3b21d4d4bcdad86f01f87811066a5d44639321da.zip
Merge pull request #34004 from Mic92/netcat
netcat-openbsd: 1.130 -> 1.187
-rw-r--r--pkgs/tools/networking/netcat-openbsd/default.nix17
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix
index 7c22891ab7a3..8c9247013778 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; {