7 files changed, 70 insertions, 37 deletions
diff --git a/pkgs/os-specific/linux/alsa/1.0.14.nix b/pkgs/os-specific/linux/alsa/1.0.14.nix
new file mode 100644
index 00000000000..c7799af559a
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa/1.0.14.nix
@@ -0,0 +1,14 @@
+args: with args;
+
+rec {
+  alsaLib = (import ./common.nix) {
+    aName = "lib";
+    sha256 = "18xhm53adgss20jnva2nfl9gk46kb5an6ah820pazqn0ykd97rh1";
+  } args;
+
+  alsaUtils = (import ./common.nix) {
+    aName = "utils";
+    sha256 = "1jx5bwa8abx7aih4lymx4bnrmyip2yb0rp1mza97wpni1q7n6z9h";
+    buildInputs = [alsaLib ncurses gettext];
+  } args;
+}
diff --git a/pkgs/os-specific/linux/alsa/1.0.16.nix b/pkgs/os-specific/linux/alsa/1.0.16.nix
new file mode 100644
index 00000000000..5cac6f268aa
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa/1.0.16.nix
@@ -0,0 +1,14 @@
+args: with args;
+
+rec {
+  alsaLib = (import ./common.nix) {
+    aName = "lib";
+    sha256 = "1k96razf5h7blidh5ib54plcrfnbysvwm7vhvz28b4cy20zv66df";
+  } args;
+
+  alsaUtils = (import ./common.nix) {
+    aName = "utils";
+    sha256 = "10bj4pw2hp3f6qzkxsrlnvsxjlpqha696fn10gzdnnzym072skzb";
+    buildInputs = [alsaLib ncurses gettext];
+  } args;
+}
diff --git a/pkgs/os-specific/linux/alsa/common.nix b/pkgs/os-specific/linux/alsa/common.nix
new file mode 100644
index 00000000000..218a4b91c8e
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa/common.nix
@@ -0,0 +1,13 @@
+{aName, sha256, buildInputs ? [], propagatedBuildInputs ? [] } :
+args: with args; stdenv.mkDerivation rec {
+  name = "alsa-" + aName + "-" + version;
+
+  src = fetchurl {
+    url = "ftp://ftp.alsa-project.org/pub/" + aName + "/" + name + ".tar.bz2";
+    inherit sha256;
+  };
+
+  inherit buildInputs propagatedBuildInputs;
+
+  meta = { homepage = http://www.alsa-project.org; };
+}
diff --git a/pkgs/os-specific/linux/alsa/library/default.nix b/pkgs/os-specific/linux/alsa/library/default.nix
deleted file mode 100644
index 6ab8143c7ab..00000000000
--- a/pkgs/os-specific/linux/alsa/library/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "alsa-lib-1.0.14";
-  src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.14.tar.bz2;
-	sha256 = "18xhm53adgss20jnva2nfl9gk46kb5an6ah820pazqn0ykd97rh1";
-  };
-
-  meta = {
-	  homepage = http://www.alsa-project.org;
-  };
-}
diff --git a/pkgs/os-specific/linux/alsa/utils/default.nix b/pkgs/os-specific/linux/alsa/utils/default.nix
deleted file mode 100644
index 658d8d8e9f7..00000000000
--- a/pkgs/os-specific/linux/alsa/utils/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, alsaLib, ncurses, gettext}:
-
-stdenv.mkDerivation {
-  name = "alsa-utils-1.0.14";
-  src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.14.tar.bz2;
-    sha256 = "1jx5bwa8abx7aih4lymx4bnrmyip2yb0rp1mza97wpni1q7n6z9h";
-  };
-  buildInputs = [alsaLib ncurses gettext];
-
-  meta = {
-	  homepage = http://www.alsa-project.org;
-  };
-}
diff --git a/pkgs/os-specific/linux/iptables/1.4.0.nix b/pkgs/os-specific/linux/iptables/1.4.0.nix
new file mode 100644
index 00000000000..ba4fbd06db8
--- /dev/null
+++ b/pkgs/os-specific/linux/iptables/1.4.0.nix
@@ -0,0 +1,29 @@
+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.
+";
+  };
+}
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
deleted file mode 100644
index 606cf7796f9..00000000000
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "iptables-1.3.7";
-  src = fetchurl {
-    url = http://www.netfilter.org/projects/iptables/files/iptables-1.3.7.tar.bz2;
-    sha256 = "00nffc03akgm5p0skz90nl29h5d8b9fjc0d9lhipkbwy0ahcw00f";
-  };
-  preBuild = "makeFlagsArray=(PREFIX=$out)";
-}