From ce1f654219fe8826e7be9c33ba89c0c7dfcc447a Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 27 Aug 2006 18:57:12 +0000
Subject: [PATCH] new popt library. Versions > 1.7 are only distributed from
 within the RPM tarball, so I extracted it manually and put it on losser...not
 good.

svn path=/nixpkgs/trunk/; revision=6277
---
 pkgs/development/libraries/popt/default.nix     | 13 +------------
 pkgs/development/libraries/popt/popt-1.10.6.nix | 12 ++++++++++++
 pkgs/development/libraries/popt/popt-1.7.nix    | 12 ++++++++++++
 3 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/libraries/popt/popt-1.10.6.nix
 create mode 100644 pkgs/development/libraries/popt/popt-1.7.nix

diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 1170760c828b..3ce48f5b200c 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -1,12 +1 @@
-{stdenv, fetchurl, gettext}:
-
-assert gettext != null;
-
-stdenv.mkDerivation {
-  name = "popt-1.7";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz;
-    md5 = "5988e7aeb0ae4dac8d83561265984cc9";
-  };
-  buildInputs = [gettext];
-}
+import ./popt-1.7.nix
diff --git a/pkgs/development/libraries/popt/popt-1.10.6.nix b/pkgs/development/libraries/popt/popt-1.10.6.nix
new file mode 100644
index 000000000000..0a7fd3f8d5a4
--- /dev/null
+++ b/pkgs/development/libraries/popt/popt-1.10.6.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, gettext}:
+
+assert gettext != null;
+
+stdenv.mkDerivation {
+  name = "popt-1.10.6";
+  src = fetchurl {
+    url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/popt-1.10.6.tar.gz;
+    md5 = "76b4bbcda13eb7fa86b9af893c648202";
+  };
+  buildInputs = [gettext];
+}
diff --git a/pkgs/development/libraries/popt/popt-1.7.nix b/pkgs/development/libraries/popt/popt-1.7.nix
new file mode 100644
index 000000000000..1170760c828b
--- /dev/null
+++ b/pkgs/development/libraries/popt/popt-1.7.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, gettext}:
+
+assert gettext != null;
+
+stdenv.mkDerivation {
+  name = "popt-1.7";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz;
+    md5 = "5988e7aeb0ae4dac8d83561265984cc9";
+  };
+  buildInputs = [gettext];
+}