From 7892062e3c6e5580086c386b632e17337d77c766 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 7 Aug 2011 19:33:34 +0000 Subject: [PATCH] haskell-vty: updated to version 4.7.0.4 The old version is still around, because hledger-vty won't accept the latest one. Note that previously the vty was build with 'mtl' overridden to 'mtl2'. I dropped that override, because it seems to have become be unnecessary. If anyone is aware of a hidden reason why that mtl2 must be set explicitly, please let me know. svn path=/nixpkgs/trunk/; revision=28258 --- .../haskell/vty/{default.nix => 4.6.0.4.nix} | 0 .../libraries/haskell/vty/4.7.0.4.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 10 ++++++---- 3 files changed, 24 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/vty/{default.nix => 4.6.0.4.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/vty/4.7.0.4.nix diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/4.6.0.4.nix similarity index 100% rename from pkgs/development/libraries/haskell/vty/default.nix rename to pkgs/development/libraries/haskell/vty/4.6.0.4.nix diff --git a/pkgs/development/libraries/haskell/vty/4.7.0.4.nix b/pkgs/development/libraries/haskell/vty/4.7.0.4.nix new file mode 100644 index 000000000000..1ec655a6ad0d --- /dev/null +++ b/pkgs/development/libraries/haskell/vty/4.7.0.4.nix @@ -0,0 +1,18 @@ +{cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String, + vector} : + +cabal.mkDerivation (self : { + pname = "vty"; + version = "4.7.0.4"; + sha256 = "1rwki3ch1r3dqzb1cxmzxn05k49ams64licl0silbhsj3qibbj53"; + propagatedBuildInputs = [ + deepseq mtl parallel parsec terminfo utf8String vector + ]; + meta = { + homepage = "https://github.com/coreyoconnor/vty"; + description = "A simple terminal access library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.stdenv.lib.platforms.haskellPlatforms; + maintainers = [ self.stdenv.lib.maintainers.simons ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d62c85577095..0178eb1fbfac 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -666,7 +666,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hledger = callPackage ../development/libraries/haskell/hledger {}; hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; - hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {}; + hledgerVty = callPackage ../development/libraries/haskell/hledger-vty { + vty = self.vty_4_6_0_4; + }; hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; HList = callPackage ../development/libraries/haskell/HList {}; @@ -1108,9 +1110,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; - vty = callPackage ../development/libraries/haskell/vty { - mtl = self.mtl2; - }; + vty_4_6_0_4 = callPackage ../development/libraries/haskell/vty/4.6.0.4.nix {}; + vty_4_7_0_4 = callPackage ../development/libraries/haskell/vty/4.7.0.4.nix {}; + vty = self.vty_4_7_0_4; wai = callPackage ../development/libraries/haskell/wai {};