From 9d693c2e4ef725109c637c26b70d49e47f0a8612 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Jan 2012 10:52:04 +0000 Subject: [PATCH] haskell-cmdargs: added version 0.9.2 svn path=/nixpkgs/trunk/; revision=31929 --- .../haskell/cmdargs/{default.nix => 0.8.nix} | 0 .../libraries/haskell/cmdargs/0.9.2.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 ++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) rename pkgs/development/libraries/haskell/cmdargs/{default.nix => 0.8.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/cmdargs/0.9.2.nix diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/0.8.nix similarity index 100% rename from pkgs/development/libraries/haskell/cmdargs/default.nix rename to pkgs/development/libraries/haskell/cmdargs/0.8.nix diff --git a/pkgs/development/libraries/haskell/cmdargs/0.9.2.nix b/pkgs/development/libraries/haskell/cmdargs/0.9.2.nix new file mode 100644 index 00000000000..7024b08a672 --- /dev/null +++ b/pkgs/development/libraries/haskell/cmdargs/0.9.2.nix @@ -0,0 +1,20 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "cmdargs"; + version = "0.9.2"; + sha256 = "1c0xy4g9b5jqy51qhgq7djafqz27z6q7ya31pgy186pfgl7604kr"; + 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/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3885912106e..1898229ec8a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -531,7 +531,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); clientsession = callPackage ../development/libraries/haskell/clientsession {}; - cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; + 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; cmdlib = callPackage ../development/libraries/haskell/cmdlib {}; @@ -830,7 +832,9 @@ 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 {}; + hledgerLib = callPackage ../development/libraries/haskell/hledger-lib { + cmdargs = self.cmdargs_0_8; + }; hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {}; hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; hledgerInterest = callPackage ../applications/office/hledger-interest {};