Author: simons
Date: Mon May 7 09:36:49 2012
New Revision: 34003
URL: https://nixos.org/websvn/nix/?rev=34003&sc=1
Log:
Updated Haskell packages.
- abstract-deque: added version 0.1.5
- abstract-par: added version 0.3
- bits-atomic: added version 0.1.3
- blaze-builder-conduit: updated to version 0.4.0.2
- IORefCAS: added version 0.2
- MemoTrie: updated to version 0.4.12
- monad-par: added version 0.3
- monad-par-extras: added version 0.3
- repa: updated to version 3.1.4.2
- texmath: updated to version 0.6.0.6
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/IORefCAS/
nixpkgs/trunk/pkgs/development/libraries/haskell/IORefCAS/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/abstract-deque/
nixpkgs/trunk/pkgs/development/libraries/haskell/abstract-deque/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/abstract-par/
nixpkgs/trunk/pkgs/development/libraries/haskell/abstract-par/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/bits-atomic/
nixpkgs/trunk/pkgs/development/libraries/haskell/bits-atomic/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par-extras/
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par-extras/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
- copied, changed from r34002,
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par/0.3.nix
- copied, changed from r34002,
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/repa/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/texmath/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/IORefCAS/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/IORefCAS/default.nix
Mon May 7 09:36:49 2012 (r34003)
@@ -0,0 +1,13 @@
+{ cabal, bitsAtomic }:
+
+cabal.mkDerivation (self: {
+ pname = "IORefCAS";
+ version = "0.2";
+ sha256 = "18hyy3jqr9yky5r873816fqnywrwba90sq6zx61i2vkqlfbll1k9";
+ buildDepends = [ bitsAtomic ];
+ meta = {
+ description = "Atomic compare and swap for IORefs and STRefs";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix
Mon May 7 02:06:29 2012 (r34002)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix
Mon May 7 09:36:49 2012 (r34003)
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, void }:
cabal.mkDerivation (self: {
pname = "MemoTrie";
- version = "0.4.11";
- sha256 = "0wlrsz9bsb7lkw1ja8x8jbm1v7558fg8npas1rnc5ikgfi0szzw4";
+ version = "0.4.12";
+ sha256 = "0wjpfy1vlk3fjbdj924viv1wji28kx3w9hsaz7hd0gfs77y9vjza";
+ buildDepends = [ void ];
meta = {
homepage = "http://haskell.org/haskellwiki/MemoTrie";;
description = "Trie-based memo functions";
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/abstract-deque/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/abstract-deque/default.nix
Mon May 7 09:36:49 2012 (r34003)
@@ -0,0 +1,14 @@
+{ cabal, HUnit, IORefCAS }:
+
+cabal.mkDerivation (self: {
+ pname = "abstract-deque";
+ version = "0.1.5";
+ sha256 = "1zp19kq3m72nx7rr00yyq8iwia4abg4x9kw4d5s5k0srp5f9fn3q";
+ buildDepends = [ HUnit IORefCAS ];
+ meta = {
+ description = "Abstract, parameterized interface to mutable Deques";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/abstract-par/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/abstract-par/default.nix
Mon May 7 09:36:49 2012 (r34003)
@@ -0,0 +1,14 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+ pname = "abstract-par";
+ version = "0.3";
+ sha256 = "1accd14hkpcvlfiv85swliyyrw9xm1dbkyn4vn2p5nf1h6js67xw";
+ buildDepends = [ deepseq ];
+ meta = {
+ homepage = "https://github.com/simonmar/monad-par";;
+ description = "Type classes generalizing the functionality of the
'monad-par' library";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/bits-atomic/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/bits-atomic/default.nix
Mon May 7 09:36:49 2012 (r34003)
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "bits-atomic";
+ version = "0.1.3";
+ sha256 = "13fbakkwcdk63dm7r0mcsanm5mijp73c7x1kxpay2f03rxb39b70";
+ isLibrary = true;
+ isExecutable = true;
+ meta = {
+ description = "Atomic bit operations on memory locations for low-level
synchronization";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
Mon May 7 02:06:29 2012 (r34002)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
Mon May 7 09:36:49 2012 (r34003)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-builder-conduit";
- version = "0.4.0.1";
- sha256 = "059i7k49vpwsd7dlm4di4k5xhiparq71h8qagssw8a4nsk9jglvp";
+ version = "0.4.0.2";
+ sha256 = "0wblkvh1v7275n1i66xmm3kg57i21s8m2sfwfnjarwbcjqbgrjih";
buildDepends = [ blazeBuilder conduit text transformers ];
meta = {
homepage = "http://github.com/snoyberg/conduit";;
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par-extras/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par-extras/default.nix
Mon May 7 09:36:49 2012 (r34003)
@@ -0,0 +1,16 @@
+{ cabal, abstractPar, cereal, deepseq, mtl, random, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "monad-par-extras";
+ version = "0.3";
+ sha256 = "1nrxzqswb265slxq4dhm6bav7zb4zglbrh99w5x6hwx6drgsw10d";
+ buildDepends = [
+ abstractPar cereal deepseq mtl random transformers
+ ];
+ meta = {
+ homepage = "https://github.com/simonmar/monad-par";;
+ description = "Combinators and extra features for Par monads";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix (from
r34002, nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par/0.3.nix (from
r34002, nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par/default.nix
Mon May 7 02:06:29 2012 (r34002, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/monad-par/0.3.nix Mon May
7 09:36:49 2012 (r34003)
@@ -1,10 +1,15 @@
-{ cabal, deepseq, HUnit }:
+{ cabal, abstractDeque, abstractPar, deepseq, monadParExtras, mtl
+, mwcRandom, parallel
+}:
cabal.mkDerivation (self: {
pname = "monad-par";
- version = "0.1.0.3";
- sha256 = "1c0yclil152hv06c2sbgam9amd63nnzh7a4xsnxb05wgy93qs2mg";
- buildDepends = [ deepseq HUnit ];
+ version = "0.3";
+ sha256 = "19vzz8qhv8z84grcb4myivmmaj0sn7rm956nqxv5dh2l8c279zsd";
+ buildDepends = [
+ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
+ parallel
+ ];
meta = {
homepage = "https://github.com/simonmar/monad-par";;
description = "A library for parallel programming based on a monad";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/repa/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/repa/default.nix Mon May
7 02:06:29 2012 (r34002)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/repa/default.nix Mon May
7 09:36:49 2012 (r34003)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa";
- version = "3.1.3.3";
- sha256 = "108zifbgngwd5a3bkvkm4sh2nhds748wqk227mcsxcw9y085da0f";
+ version = "3.1.4.2";
+ sha256 = "08vrrhaqhk03mmc2zddj4mm9dci9q7wkxwc3ilrh1p9q4j6r53qs";
buildDepends = [ QuickCheck vector ];
meta = {
homepage = "http://repa.ouroborus.net";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/texmath/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/texmath/default.nix
Mon May 7 02:06:29 2012 (r34002)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/texmath/default.nix
Mon May 7 09:36:49 2012 (r34003)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "texmath";
- version = "0.6.0.5";
- sha256 = "08zryp5y2llhzwbp93wbm37c1lykqgrbq8h23bv39ql8idpym0wq";
+ version = "0.6.0.6";
+ sha256 = "0wxpz9vsgi4lfgjz5w96pn2r2jdflkvb4yd06nxshimxdr51974k";
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec syb xml ];
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon May 7 02:06:29
2012 (r34002)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon May 7 09:36:49
2012 (r34003)
@@ -211,6 +211,7 @@
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal =
self.Cabal_1_14_0; };
+ monadPar = self.monadPar_0_1_0_3;
};
haskellPlatform_2011_4_0_0 =
@@ -254,6 +255,7 @@
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal =
self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
+ monadPar = self.monadPar_0_1_0_3;
};
haskellPlatform_2011_2_0_1 =
@@ -297,6 +299,7 @@
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal =
self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
+ monadPar = self.monadPar_0_1_0_3;
};
haskellPlatform_2011_2_0_0 =
@@ -336,6 +339,7 @@
haskellPlatform = self.haskellPlatform_2010_2_0_0;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal =
self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
+ monadPar = self.monadPar_0_1_0_3;
deepseq = self.deepseq_1_1_0_2;
# deviating from Haskell platform here, to make some packages (notably
statistics) compile
};
@@ -376,6 +380,7 @@
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
deepseq = self.deepseq_1_1_0_2;
+ monadPar = self.monadPar_0_1_0_3;
# deviating from Haskell platform here, to make some packages (notably
statistics) compile
};
@@ -418,6 +423,7 @@
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal =
self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
deepseq = self.deepseq_1_1_0_2;
+ monadPar = self.monadPar_0_1_0_3;
# deviating from Haskell platform here, to make some packages (notably
statistics) compile
};
@@ -433,6 +439,10 @@
ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
+ abstractDeque = callPackage ../development/libraries/haskell/abstract-deque
{};
+
+ abstractPar = callPackage ../development/libraries/haskell/abstract-par {};
+
aeson = callPackage ../development/libraries/haskell/aeson {};
alternativeIo = callPackage ../development/libraries/haskell/alternative-io
{};
@@ -482,6 +492,8 @@
bitmap = callPackage ../development/libraries/haskell/bitmap {};
+ bitsAtomic = callPackage ../development/libraries/haskell/bits-atomic {};
+
bktrees = callPackage ../development/libraries/haskell/bktrees {};
blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};
@@ -934,6 +946,8 @@
ioChoice = callPackage ../development/libraries/haskell/io-choice {};
+ IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};
+
ioStorage = callPackage ../development/libraries/haskell/io-storage {};
irc = callPackage ../development/libraries/haskell/irc {
@@ -1003,7 +1017,11 @@
monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
- monadPar = callPackage ../development/libraries/haskell/monad-par {};
+ monadPar_0_1_0_3 = callPackage
../development/libraries/haskell/monad-par/0.1.0.3.nix {};
+ monadPar_0_3 = callPackage
../development/libraries/haskell/monad-par/0.3.nix {};
+ monadPar = self.monadPar_0_3;
+
+ monadParExtras = callPackage
../development/libraries/haskell/monad-par-extras {};
monadPeel = callPackage ../development/libraries/haskell/monad-peel {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
