diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-01-31 16:12:22 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-02-01 02:45:44 +0300 |
| commit | 469546f46e75754f91308e472be1e733fe62a851 (patch) | |
| tree | 614e6cdca9a8404e9489ac1d743d312c911ae697 /pkgs/os-specific/linux/tcp-wrappers | |
| parent | 6991e7930ec20f5d34a091b9166e5ff32d7b3816 (diff) | |
| download | nixpkgs-469546f46e75754f91308e472be1e733fe62a851.tar nixpkgs-469546f46e75754f91308e472be1e733fe62a851.tar.gz nixpkgs-469546f46e75754f91308e472be1e733fe62a851.tar.bz2 nixpkgs-469546f46e75754f91308e472be1e733fe62a851.tar.lz nixpkgs-469546f46e75754f91308e472be1e733fe62a851.tar.xz nixpkgs-469546f46e75754f91308e472be1e733fe62a851.tar.zst nixpkgs-469546f46e75754f91308e472be1e733fe62a851.zip | |
tcp_wrappers: 7.6 -> 7.6.q
Diffstat (limited to 'pkgs/os-specific/linux/tcp-wrappers')
| -rw-r--r-- | pkgs/os-specific/linux/tcp-wrappers/default.nix | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index eb50fc0abce..105a4cacd82 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -1,40 +1,30 @@ { fetchurl, stdenv }: -stdenv.mkDerivation { - name = "tcp-wrappers-7.6"; +stdenv.mkDerivation rec { + name = "tcp-wrappers-${version}"; + version = "7.6.q"; src = fetchurl { - url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs.orig.tar.gz; - sha256 = "0k68ziinx6biwar5lcb9jvv0rp6b3vmj6861n75bvrz4w1piwkdp"; + url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}.orig.tar.gz"; + sha256 = "0p9ilj4v96q32klavx0phw9va21fjp8vpk11nbh6v2ppxnnxfhwm"; }; - patches = [ - (fetchurl { - url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs-13.diff.gz; - sha256 = "071ir20rh8ckhgrc0y99wgnlbqjgkprf0qwbv84lqw5i6qajbcnh"; - }) - ]; + debian = fetchurl { + url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}-24.debian.tar.xz"; + sha256 = "1kgax35rwaj5q8nf8fw60aczvxj99h2jjp7iv1f82y85yz9x0ak7"; + }; prePatch = '' - cd upstream/tarballs - tar xzvf * - cd tcp_wrappers_7.6 + tar -xaf $debian + shopt -s extglob + patches="$(echo debian/patches/!(series)) $patches" ''; - postPatch = '' - for patch in debian/patches/*; do - echo "applying Debian patch \`$(basename $patch)'..." - patch --batch -p1 < $patch - done - ''; - - buildPhase = '' - make REAL_DAEMON_DIR="$out/sbin" linux - ''; + makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; installPhase = '' - mkdir -p "$out/sbin" - cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin" + mkdir -p "$out/bin" + cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/bin" mkdir -p "$out/lib" cp -v shared/lib*.so* "$out/lib" @@ -42,7 +32,6 @@ stdenv.mkDerivation { mkdir -p "$out/include" cp -v *.h "$out/include" - mkdir -p "$out/man" for i in 3 5 8; do mkdir -p "$out/man/man$i" |