From d7b739d9a5197b006a281c429f710da790d2c6c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 2 Feb 2012 10:37:45 +0000
Subject: [PATCH] haskell-cmdargs: deleted obsolete 0.8 version

svn path=/nixpkgs/trunk/; revision=31966
---
 .../libraries/haskell/cmdargs/0.8.nix         | 20 -------------------
 .../cmdargs/{0.9.2.nix => default.nix}        |  0
 pkgs/top-level/haskell-packages.nix           |  8 ++------
 3 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/cmdargs/0.8.nix
 rename pkgs/development/libraries/haskell/cmdargs/{0.9.2.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/cmdargs/0.8.nix b/pkgs/development/libraries/haskell/cmdargs/0.8.nix
deleted file mode 100644
index 4e8b236464a6..000000000000
--- a/pkgs/development/libraries/haskell/cmdargs/0.8.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "cmdargs";
-  version = "0.8";
-  sha256 = "0yhjg6rck1aj8gq07i9dcfxyjffxlr4lxnir2brkyahpfx5iyw9k";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/cmdargs/";
-    description = "Command line argument processing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cmdargs/0.9.2.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/cmdargs/0.9.2.nix
rename to pkgs/development/libraries/haskell/cmdargs/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1898229ec8af..3885912106e9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -531,9 +531,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   clientsession = callPackage ../development/libraries/haskell/clientsession {};
 
-  cmdargs_0_8 = callPackage ../development/libraries/haskell/cmdargs/0.8.nix {};
-  cmdargs_0_9_2 = callPackage ../development/libraries/haskell/cmdargs/0.9.2.nix {};
-  cmdargs = self.cmdargs_0_9_2;
+  cmdargs = callPackage ../development/libraries/haskell/cmdargs {};
 
   cmdlib = callPackage ../development/libraries/haskell/cmdlib {};
 
@@ -832,9 +830,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   hjsmin = callPackage ../development/libraries/haskell/hjsmin {};
 
   hledger = callPackage ../development/libraries/haskell/hledger {};
-  hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {
-    cmdargs = self.cmdargs_0_8;
-  };
+  hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {};
   hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {};
   hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {};
   hledgerInterest = callPackage ../applications/office/hledger-interest {};