From b04394616326f1f36bd2a8b2941e9341caf7813f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 13 Mar 2011 11:03:49 +0000 Subject: [PATCH] More Haskell library updates. svn path=/nixpkgs/trunk/; revision=26292 --- .../libraries/haskell/ListLike/default.nix | 12 ++++++++++++ .../libraries/haskell/criterion/default.nix | 9 +++------ .../libraries/haskell/mwc-random/default.nix | 4 ++-- .../libraries/haskell/regular/default.nix | 4 ++-- .../libraries/haskell/statistics/default.nix | 4 ++-- .../libraries/haskell/uu-parsinglib/default.nix | 7 ++++--- .../libraries/haskell/vector-algorithms/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 ++ 8 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/libraries/haskell/ListLike/default.nix diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix new file mode 100644 index 00000000000..83aeeb88f87 --- /dev/null +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -0,0 +1,12 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "ListLike"; + version = "3.0.1"; + sha256 = "1366ipy33fphjjk583c62rsyfwh36i5lbnip1v8r089c9glvwkxf"; + meta = { + description = "Generic support for list-like structures"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index ce6b5d5e2dc..47f34bb441c 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,18 +1,15 @@ {cabal, deepseq, mtl, parallel, parsec, vector, vectorAlgorithms, - mwcRandom, statistics, Chart, dataAccessor}: + mwcRandom, statistics}: cabal.mkDerivation (self : { pname = "criterion"; - version = "0.5.0.5"; - sha256 = "1b1g7a2ip07j0554cj4d0413859fbdkaxpcgq2znjz7wh8z5aabn"; + version = "0.5.0.7"; + sha256 = "1f1vpc3cwvc6wjy7fras5kp1iap8abh6ap3w6pf75qpkbdrcd3dq"; propagatedBuildInputs = [ deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics - Chart dataAccessor ]; - configureFlags = "-fchart"; - meta = { homepage = "http://bitbucket.org/bos/criterion"; description = "Robust, reliable performance measurement and analysis"; diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index 1ac66ca67f2..dfffbe3d818 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "mwc-random"; - version = "0.8.0.2"; - sha256 = "1lry31abyz6wh3x8ipclgkfc889azs7mw2ppp9kpdlx41wbzhdj6"; + version = "0.8.0.3"; + sha256 = "1sjjayfhfkfixcwdp21cfqld9pjikdsvlb956c1a7hcs82b68xp3"; propagatedBuildInputs = [primitive vector]; meta = { description = "Fast, high quality pseudo random number generation"; diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix index 5f939fbd1ea..76ce9ff40d5 100644 --- a/pkgs/development/libraries/haskell/regular/default.nix +++ b/pkgs/development/libraries/haskell/regular/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "regular"; - version = "0.2.4"; - sha256 = "7fcef09b09b2bb8cb32246b96d659f8102fd749b6f064cd7b813835ce947932c"; + version = "0.3.2"; + sha256 = "104rz28a22p5pn3rdzvmh13s1hpr46n463cfaz3w3bj9cimi2rcj"; meta = { description = "Generic programming library for regular datatypes"; license = "BSD"; diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 8ebacb5933b..21635fba601 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "statistics"; - version = "0.8.0.3"; - sha256 = "11b7ai661sm7j4n8wymipzjldshackwgv6kkp6yqrkxzg40xhal9"; + version = "0.8.0.5"; + sha256 = "0rzrx1wjil88ksqk5kmcxm4ypryiy9j1c4qa2s2bs71338hhzpxn"; propagatedBuildInputs = [primitive vector vectorAlgorithms mwcRandom erf]; meta = { diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 26b6176fc6d..5320acd255e 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -1,9 +1,10 @@ -{cabal}: +{cabal, ListLike}: cabal.mkDerivation (self : { pname = "uu-parsinglib"; - version = "2.5.5"; - sha256 = "132f73b11f87a41aad7331b27d0aa5caa7b931381a88d114c91b700096d6c3f4"; + version = "2.7.0.1"; + sha256 = "0x5gggwy3r1v0z5n6jn699bcrb9r9s2gbll5ca6m9hdfxjr3x7k6"; + propagatedBuildInputs = [ListLike]; meta = { description = "New version of the Utrecht University parser combinator library"; }; diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index 49b95384299..5f212e33177 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "vector-algorithms"; - version = "0.3.4"; - sha256 = "19b25myz0lhf010lgajlkz72g3w119x89i097rmbc2y4z1bjgpiv"; + version = "0.4"; + sha256 = "04ig2bx3gm42mwhcz5n8kp9sy33d1hrwm940kfxny74fc06422h8"; propagatedBuildInputs = [primitive vector]; meta = { description = "Efficient algorithms for vector arrays"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a1f8d562736..717b2dc5dc1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -574,6 +574,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network = self.network_2_2_1_7; }; + ListLike = callPackage ../development/libraries/haskell/ListLike {}; + ltk = callPackage ../development/libraries/haskell/ltk {}; maybench = callPackage ../development/libraries/haskell/maybench {};