diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-29 14:48:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-29 14:48:22 -0500 |
| commit | 6583ec598b912191206cbb61ed8a444f9334088f (patch) | |
| tree | 4453a722ccd7eb86278bb05114a9b1e3882c15f3 /pkgs/tools/networking | |
| parent | d7e563779184a832ca371ca964b7b690e63c11ab (diff) | |
| parent | c2148482c2b4d479017d94c5e8b80bdc9bdb9a03 (diff) | |
| download | nixlib-6583ec598b912191206cbb61ed8a444f9334088f.tar nixlib-6583ec598b912191206cbb61ed8a444f9334088f.tar.gz nixlib-6583ec598b912191206cbb61ed8a444f9334088f.tar.bz2 nixlib-6583ec598b912191206cbb61ed8a444f9334088f.tar.lz nixlib-6583ec598b912191206cbb61ed8a444f9334088f.tar.xz nixlib-6583ec598b912191206cbb61ed8a444f9334088f.tar.zst nixlib-6583ec598b912191206cbb61ed8a444f9334088f.zip | |
Merge pull request #39634 from matthewbauer/remove-openbsd-netcat
Replace netcat-openbsd with libressl
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/netcat-openbsd/default.nix | 51 | ||||
| -rw-r--r-- | pkgs/tools/networking/netcat/default.nix (renamed from pkgs/tools/networking/netcat-gnu/default.nix) | 0 |
2 files changed, 0 insertions, 51 deletions
diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix deleted file mode 100644 index 1a79e17c6598..000000000000 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}: - -stdenv.mkDerivation rec { - version = "1.190"; - 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 = "0dp571m42zc7wvb9bf4hz5a08rcc5fknf0gdp98yq19c754c9k38"; - }) - (fetchurl { - url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; - sha256 = "0plgrri85sghzn499jzd9d3h7w61ksqj0amkwmcah8dmfkp7jrgv"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libbsd ]; - - sourceRoot = name; - - prePatch = '' - for i in $(cat ../debian/patches/series); do - patch -p1 < "../debian/patches/$i" - done - ''; - - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/musl.git/plain/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch?id=4a5864922232c7df550c21f2a7b77fe6f8ffc6d6"; - sha256 = "1cgqb6fxas5yiwf26hq57v627hhmcskl5j6rx30090ha2ksjqyvr"; - }) - ]; - - 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; { - homepage = https://packages.debian.org/netcat-openbsd; - description = "TCP/IP swiss army knife, OpenBSD variant"; - platforms = platforms.linux; - maintainers = with maintainers; [ willibutz ]; - }; - -} diff --git a/pkgs/tools/networking/netcat-gnu/default.nix b/pkgs/tools/networking/netcat/default.nix index 47ec804e5d48..47ec804e5d48 100644 --- a/pkgs/tools/networking/netcat-gnu/default.nix +++ b/pkgs/tools/networking/netcat/default.nix |