* Remove a bunch of unused Nix expressions.

svn path=/nixpkgs/trunk/; revision=6716

3 files changed, 20 insertions, 41 deletions

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 9d4090eb5e8fc..12ebf6a96462a 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1 +1,20 @@
-import ./libxml2-2.6.26.nix
+{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
+
+assert zlib != null;
+assert pythonSupport -> python != null;
+
+stdenv.mkDerivation {
+  name = "libxml2-2.6.26";
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.26.tar.gz;
+    md5 = "2d8d3805041edab967368b497642f981";
+  };
+
+  python = if pythonSupport then python else null;
+  inherit pythonSupport zlib;
+
+  buildInputs =  if pythonSupport then [python] else [];
+  propagatedBuildInputs = [zlib];
+}
diff --git a/pkgs/development/libraries/libxml2/libxml2-2.6.23.nix b/pkgs/development/libraries/libxml2/libxml2-2.6.23.nix
deleted file mode 100644
index fbd59629cd927..0000000000000
--- a/pkgs/development/libraries/libxml2/libxml2-2.6.23.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
-
-assert zlib != null;
-assert pythonSupport -> python != null;
-
-stdenv.mkDerivation {
-  name = "libxml2-2.6.23";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.23.tar.gz;
-    md5 = "0f37385e3ad73cc94db43d6873f4fc3b";
-  };
-
-  python = if pythonSupport then python else null;
-  inherit pythonSupport zlib;
-
-  buildInputs =  if pythonSupport then [python] else [];
-  propagatedBuildInputs = [zlib];
-}
diff --git a/pkgs/development/libraries/libxml2/libxml2-2.6.26.nix b/pkgs/development/libraries/libxml2/libxml2-2.6.26.nix
deleted file mode 100644
index 12ebf6a96462a..0000000000000
--- a/pkgs/development/libraries/libxml2/libxml2-2.6.26.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
-
-assert zlib != null;
-assert pythonSupport -> python != null;
-
-stdenv.mkDerivation {
-  name = "libxml2-2.6.26";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.26.tar.gz;
-    md5 = "2d8d3805041edab967368b497642f981";
-  };
-
-  python = if pythonSupport then python else null;
-  inherit pythonSupport zlib;
-
-  buildInputs =  if pythonSupport then [python] else [];
-  propagatedBuildInputs = [zlib];
-}