Merge #148726: tcptrack: fix build with ncurses-6.3

+14 -4
+14 -4
pkgs/development/tools/misc/tcptrack/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, ncurses, libpcap }: 1 + { lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "tcptrack"; 5 - version = "1.4.3"; 5 + version = "unstable-2017-04-29"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "bchretien"; 9 9 repo = "tcptrack"; 10 - rev = "d05fe08154ff1e46578e92be49e4cfa2c6543283"; 11 - sha256 = "08lh3l67wn4kq9q0nfspc7rj0jvp9dzwjgxpvqliwcif8cy5mi45"; 10 + rev = "2b096ac103af2884bbd7648cff8adcbadbda9394"; 11 + sha256 = "0084g9s0ynv1az67j08q9nz4p07bqqz9k6w5lprzj3ljlh0x10gj"; 12 12 }; 13 + 14 + patches = [ 15 + # Fix pending upstream inclusion for ncurses-6.3 support: 16 + # https://github.com/bchretien/tcptrack/pull/10 17 + (fetchpatch { 18 + name = "ncurses-6.3.patch"; 19 + url = "https://github.com/bchretien/tcptrack/commit/409007afbce8ec5a81312a2a4123dd83b62b4494.patch"; 20 + sha256 = "00641jyr52ksww5bbzvxlprmbb36jnvzg2w1aj1jgnm75jiajcfc"; 21 + }) 22 + ]; 13 23 14 24 buildInputs = [ ncurses libpcap ]; 15 25