From fbf36403ef09e65f77546935f50ee539749cd9b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Aug 2011 15:59:03 +0000 Subject: [PATCH] haskell-packages.nix: updated HaXml to version 1.22.3 svn path=/nixpkgs/trunk/; revision=28154 --- .../libraries/haskell/HaXml/{1.22.2.nix => 1.22.3.nix} | 10 ++-------- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) rename pkgs/development/libraries/haskell/HaXml/{1.22.2.nix => 1.22.3.nix} (58%) diff --git a/pkgs/development/libraries/haskell/HaXml/1.22.2.nix b/pkgs/development/libraries/haskell/HaXml/1.22.3.nix similarity index 58% rename from pkgs/development/libraries/haskell/HaXml/1.22.2.nix rename to pkgs/development/libraries/haskell/HaXml/1.22.3.nix index 03fa18245514..5d0a9163e641 100644 --- a/pkgs/development/libraries/haskell/HaXml/1.22.2.nix +++ b/pkgs/development/libraries/haskell/HaXml/1.22.3.nix @@ -2,15 +2,9 @@ cabal.mkDerivation (self : { pname = "HaXml"; - version = "1.22.2"; - sha256 = "8d4706430a1bdd1cb09e6e346f108a24c8d420d0240b2706633b9e949e67b355"; + version = "1.22.3"; + sha256 = "10gbax7nih45ck5fg056gnfgzr7zyndxpvdhvx3af2wnrmilkcbh"; propagatedBuildInputs = [polyparse]; - /* Avoid the following error: - - src/Text/XML/HaXml/Schema/Schema.hs:50:21: - parse error on input `{- | t -> s -}' - */ - noHaddock = true; meta = { description = "Haskell utilities for parsing, filtering, transforming and generating XML documents."; platforms = self.stdenv.lib.platforms.haskellPlatforms; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3057e868d4c8..77f53401856a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -593,10 +593,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HaXml_1_13_3 = callPackage ../development/libraries/haskell/HaXml/1.13.3.nix {}; HaXml_1_20_2 = callPackage ../development/libraries/haskell/HaXml/1.20.2.nix {}; - HaXml_1_22_2 = callPackage ../development/libraries/haskell/HaXml/1.22.2.nix {}; + HaXml_1_22_3 = callPackage ../development/libraries/haskell/HaXml/1.22.3.nix {}; HaXml113 = self.HaXml_1_13_3; HaXml120 = self.HaXml_1_20_2; - HaXml122 = self.HaXml_1_22_2; + HaXml123 = self.HaXml_1_22_3; HaXml = self.HaXml120; HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {};