summary refs log tree commit diff
path: root/pkgs/os-specific/linux/tcp-wrappers/default.nix
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2017-02-03 20:14:00 +0300
committerNikolay Amiantov <ab@fmap.me>2017-02-03 21:13:36 +0300
commitede8adc441242805b343a75dfefa09a9893e2be1 (patch)
tree6bb19f454c7e09a0f54109bc231f98cad004f384 /pkgs/os-specific/linux/tcp-wrappers/default.nix
parent3c05174f070ad818b2ce8683d008dd755dade9c8 (diff)
downloadnixpkgs-ede8adc441242805b343a75dfefa09a9893e2be1.tar
nixpkgs-ede8adc441242805b343a75dfefa09a9893e2be1.tar.gz
nixpkgs-ede8adc441242805b343a75dfefa09a9893e2be1.tar.bz2
nixpkgs-ede8adc441242805b343a75dfefa09a9893e2be1.tar.lz
nixpkgs-ede8adc441242805b343a75dfefa09a9893e2be1.tar.xz
nixpkgs-ede8adc441242805b343a75dfefa09a9893e2be1.tar.zst
nixpkgs-ede8adc441242805b343a75dfefa09a9893e2be1.zip
tcp_wrappers: 7.6.q -> 7.6.q-26
I've accidentially taken old Debian patchset. Maybe this also helps with Darwin failures.
Diffstat (limited to 'pkgs/os-specific/linux/tcp-wrappers/default.nix')
-rw-r--r--pkgs/os-specific/linux/tcp-wrappers/default.nix16
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 105a4cacd82..850fbe9f449 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -1,23 +1,25 @@
 { fetchurl, stdenv }:
 
-stdenv.mkDerivation rec {
+let
+  vanillaVersion = "7.6.q";
+  patchLevel = "26";
+in stdenv.mkDerivation rec {
   name = "tcp-wrappers-${version}";
-  version = "7.6.q";
+  version = "${vanillaVersion}-${patchLevel}";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}.orig.tar.gz";
+    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${vanillaVersion}.orig.tar.gz";
     sha256 = "0p9ilj4v96q32klavx0phw9va21fjp8vpk11nbh6v2ppxnnxfhwm";
   };
 
   debian = fetchurl {
-    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}-24.debian.tar.xz";
-    sha256 = "1kgax35rwaj5q8nf8fw60aczvxj99h2jjp7iv1f82y85yz9x0ak7";
+    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}.debian.tar.xz";
+    sha256 = "1dcdhi9lwzv7g19ggwxms2msq9fy14rl09rjqb10hwv0jix7z8j8";
   };
 
   prePatch = ''
     tar -xaf $debian
-    shopt -s extglob
-    patches="$(echo debian/patches/!(series)) $patches"
+    patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches"
   '';
 
   makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ];