diff options
| -rw-r--r-- | pkgs/os-specific/linux/iptables/1.4.0.nix | 30 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/iptables/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 17 insertions, 32 deletions
diff --git a/pkgs/os-specific/linux/iptables/1.4.0.nix b/pkgs/os-specific/linux/iptables/1.4.0.nix deleted file mode 100644 index 04858c5c3cc..00000000000 --- a/pkgs/os-specific/linux/iptables/1.4.0.nix +++ /dev/null @@ -1,30 +0,0 @@ -args : with args; with builderDefs {src="";} null; - let localDefs = builderDefs (rec { - src = /* put a fetchurl here */ - fetchurl { - url = http://www.netfilter.org/projects/iptables/files/iptables-1.4.0.tar.bz2; - sha256 = "0ljxbvdlg5mfxk0y00dr0qvsri1d495ci1pr8hrzga766n09g6px"; - }; - - buildInputs = []; - configureFlags = []; - makeFlags = [ - " KERNEL_DIR=${kernelHeaders} " - ]; - preBuild = FullDepEntry ('' - sed -e 's@/usr/local@'$out'@' -i Makefile Rules.make - '') ["doUnpack" "minInit"]; - }) null; /* null is a terminator for sumArgs */ - in with localDefs; -stdenv.mkDerivation rec { - name = "iptables-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs - [preBuild doMakeInstall doForceShare doPropagate]); - meta = { - description = " - IPtables Linux firewall. -"; - inherit src; - }; -} diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix new file mode 100644 index 00000000000..89566ab1bb4 --- /dev/null +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "iptables-1.4.1.1"; + + src = fetchurl { + url = http://www.netfilter.org/projects/iptables/files/iptables-1.4.1.1.tar.bz2; + sha256 = "10mmf0d2gpshhi5a73z1y14wdh7pdk3hvn78ps5i37qayv6irqgr"; + }; + + meta = { + description = "A program to configure the Linux IP packet filtering ruleset"; + homepage = http://www.netfilter.org/projects/iptables/index.html; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96f020d0c83..be33d2b2b05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4823,8 +4823,8 @@ let pkgs = rec { kernelHeaders = stdenv.gcc.libc.kernelHeaders; }; - iptables = composedArgsAndFun (selectVersion ../os-specific/linux/iptables "1.4.0") { - inherit builderDefs kernelHeaders; + iptables = import ../os-specific/linux/iptables { + inherit fetchurl stdenv; }; ipw2200fw = import ../os-specific/linux/firmware/ipw2200 { |