From 5f4c5c106acaf8abf368478d14cfd2281f66541d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 29 Feb 2012 17:24:31 +0000 Subject: [PATCH] haskell-stm: updated to version 2.3 svn path=/nixpkgs/trunk/; revision=32700 --- pkgs/development/libraries/haskell/stm/2.3.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/stm/2.3.nix diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix new file mode 100644 index 00000000000..7057ede7052 --- /dev/null +++ b/pkgs/development/libraries/haskell/stm/2.3.nix @@ -0,0 +1,16 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "stm"; + version = "2.3"; + sha256 = "1321l1qkmvnqdw73i21jnh2b8c1iw1mxjbp23hmqdvljjb9mlzsm"; + meta = { + description = "Software Transactional Memory"; + 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 8c4e652b34e..00217ee68ad 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -148,7 +148,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexBase = self.regexBase_0_93_2; # 7.4.1 ok regexCompat = self.regexCompat_0_93_1; # 7.4.1 ok regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok - stm = self.stm_2_2_0_1; # 7.4.1 ok + stm = self.stm_2_3; # 7.4.1 ok syb = self.syb_0_3_6; # 7.4.1 ok xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok zlib = self.zlib_0_5_3_3; # 7.4.1 ok @@ -1287,7 +1287,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stm_2_1_1_2 = callPackage ../development/libraries/haskell/stm/2.1.1.2.nix {}; stm_2_1_2_1 = callPackage ../development/libraries/haskell/stm/2.1.2.1.nix {}; stm_2_2_0_1 = callPackage ../development/libraries/haskell/stm/2.2.0.1.nix {}; - stm = self.stm_2_1_1_2; + stm_2_3 = callPackage ../development/libraries/haskell/stm/2.3.nix {}; + stm = self.stm_2_3; storableComplex = callPackage ../development/libraries/haskell/storable-complex {};