Author: simons
Date: Fri Aug 12 00:18:56 2011
New Revision: 28500
URL: https://svn.nixos.org/websvn/nix/?rev=28500&sc=1
Log:
The 'random' library is no longer a core library in GHC 7.2.1. For older
versions of the compiler, haskell-packages.nix provides a null attribute.
Modified:
nixpkgs/trunk/pkgs/applications/version-management/darcs/darcs-2.nix
nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/Crypto/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.20.2.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.22.3.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/MissingH/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/MonadRandom/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/RSA/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/cprng-aes/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/gitit/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-util.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hint/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/mime-mail/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/numeric-prelude/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/pwstore-fast/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/random-shuffle/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/random-source/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/salvia/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/testpack/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
nixpkgs/trunk/pkgs/games/MazesOfMonad/default.nix
nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.10.2.nix
nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.6.2.nix
nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.8.0.nix
nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.8.2.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/version-management/darcs/darcs-2.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/darcs/darcs-2.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/applications/version-management/darcs/darcs-2.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,6 +1,6 @@
{ cabal, curl, HTTP, extensibleExceptions, hashedStorage, haskeline
-, html, mmap, mtl, network, parsec, regexCompat, tar, terminfo
-, text, zlib
+, html, mmap, mtl, network, parsec, random, regexCompat, tar
+, terminfo, text, zlib
}:
cabal.mkDerivation (self: {
@@ -11,7 +11,7 @@
isExecutable = true;
buildDepends = [
HTTP extensibleExceptions hashedStorage haskeline html mmap mtl
- network parsec regexCompat tar terminfo text zlib
+ network parsec random regexCompat tar terminfo text zlib
];
extraLibraries = [ curl ];
meta = {
Modified:
nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,4 +1,5 @@
-{ cabal, X11, X11Xft, extensibleExceptions, mtl, utf8String, xmonad
+{ cabal, X11, X11Xft, extensibleExceptions, mtl, random, utf8String
+, xmonad
}:
cabal.mkDerivation (self: {
@@ -6,7 +7,7 @@
version = "0.9.2";
sha256 = "06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p";
buildDepends = [
- X11 X11Xft extensibleExceptions mtl utf8String xmonad
+ X11 X11Xft extensibleExceptions mtl random utf8String xmonad
];
meta = {
homepage = "http://xmonad.org/";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/Crypto/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/Crypto/default.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/Crypto/default.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,4 +1,4 @@
-{ cabal, HUnit, QuickCheck }:
+{ cabal, HUnit, QuickCheck, random }:
cabal.mkDerivation (self: {
pname = "Crypto";
@@ -6,7 +6,7 @@
sha256 = "02wi8lyi27i8cdj8vclrl7vcng38srdzz9qpqwsc4y4lmvgg82br";
isLibrary = true;
isExecutable = true;
- buildDepends = [ HUnit QuickCheck ];
+ buildDepends = [ HUnit QuickCheck random ];
meta = {
description = "Collects together existing Haskell cryptographic functions
into a package";
license = "unknown";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,4 +1,5 @@
-{ cabal, bktrees, extensibleExceptions, fgl, graphviz, pandoc, time
+{ cabal, bktrees, extensibleExceptions, fgl, graphviz, pandoc
+, random, time
}:
cabal.mkDerivation (self: {
@@ -6,7 +7,7 @@
version = "0.11.0.0";
sha256 = "1aplfd0qp7ypr9rh4v4x5g8f4b0d1w0dcgz7hgjm9haqcsv37a79";
buildDepends = [
- bktrees extensibleExceptions fgl graphviz pandoc time
+ bktrees extensibleExceptions fgl graphviz pandoc random time
];
meta = {
description = "Graph-Theoretic Analysis library";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.20.2.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.20.2.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.20.2.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,4 +1,4 @@
-{ cabal, polyparse }:
+{ cabal, polyparse, random }:
cabal.mkDerivation (self: {
pname = "HaXml";
@@ -6,7 +6,7 @@
sha256 = "05kmr2ablinnrg3x1xr19g5kzzby322lblvcvhwbkv26ajwi0b63";
isLibrary = true;
isExecutable = true;
- buildDepends = [ polyparse ];
+ buildDepends = [ polyparse random ];
meta = {
homepage = "http://www.cs.york.ac.uk/fp/HaXml/";;
description = "Utilities for manipulating XML documents";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.22.3.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.22.3.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.22.3.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,4 +1,4 @@
-{ cabal, polyparse }:
+{ cabal, polyparse, random }:
cabal.mkDerivation (self: {
pname = "HaXml";
@@ -6,7 +6,7 @@
sha256 = "10gbax7nih45ck5fg056gnfgzr7zyndxpvdhvx3af2wnrmilkcbh";
isLibrary = true;
isExecutable = true;
- buildDepends = [ polyparse ];
+ buildDepends = [ polyparse random ];
meta = {
homepage = "http://www.cs.york.ac.uk/fp/HaXml/";;
description = "Utilities for manipulating XML documents";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/MissingH/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/MissingH/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/MissingH/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,4 +1,5 @@
-{ cabal, HUnit, hslogger, mtl, network, parsec, regexCompat }:
+{ cabal, HUnit, hslogger, mtl, network, parsec, random, regexCompat
+}:
cabal.mkDerivation (self: {
pname = "MissingH";
@@ -6,7 +7,9 @@
sha256 = "2d566511e8a347189cf864188d97f8406c6958c6f0a6fcf8cb1593c6bae13dbf";
isLibrary = true;
isExecutable = true;
- buildDepends = [ HUnit hslogger mtl network parsec regexCompat ];
+ buildDepends = [
+ HUnit hslogger mtl network parsec random regexCompat
+ ];
meta = {
homepage = "http://software.complete.org/missingh";;
description = "Large utility library";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/MonadRandom/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/MonadRandom/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/MonadRandom/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,10 +1,10 @@
-{ cabal, mtl }:
+{ cabal, mtl, random }:
cabal.mkDerivation (self: {
pname = "MonadRandom";
version = "0.1.6";
sha256 = "1429w2h66sf0cw992xj4w9clapcqgpdzmh80as7zxf8l87rarqqp";
- buildDepends = [ mtl ];
+ buildDepends = [ mtl random ];
meta = {
description = "Random-number generation monad";
license = "unknown";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, random }:
cabal.mkDerivation (self: {
pname = "QuickCheck";
version = "1.2.0.0";
sha256 = "21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed";
+ buildDepends = [ random ];
meta = {
homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";;
description = "Automatic testing of Haskell programs";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, random }:
cabal.mkDerivation (self: {
pname = "QuickCheck";
version = "1.2.0.1";
sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld";
+ buildDepends = [ random ];
meta = {
homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";;
description = "Automatic testing of Haskell programs";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,10 +1,10 @@
-{ cabal, extensibleExceptions, mtl }:
+{ cabal, extensibleExceptions, mtl, random }:
cabal.mkDerivation (self: {
pname = "QuickCheck";
version = "2.1.0.3";
sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1";
- buildDepends = [ extensibleExceptions mtl ];
+ buildDepends = [ extensibleExceptions mtl random ];
meta = {
homepage = "http://www.cs.chalmers.se/~koen";;
description = "Automatic testing of Haskell programs";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,10 +1,10 @@
-{ cabal, extensibleExceptions, mtl }:
+{ cabal, extensibleExceptions, mtl, random }:
cabal.mkDerivation (self: {
pname = "QuickCheck";
version = "2.1.1.1";
sha256 = "626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9";
- buildDepends = [ extensibleExceptions mtl ];
+ buildDepends = [ extensibleExceptions mtl random ];
meta = {
homepage = "http://www.cse.chalmers.se/~koen";;
description = "Automatic testing of Haskell programs";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,10 +1,10 @@
-{ cabal, extensibleExceptions, mtl }:
+{ cabal, extensibleExceptions, mtl, random }:
cabal.mkDerivation (self: {
pname = "QuickCheck";
version = "2.4.0.1";
sha256 = "1x7jc2svpxbll8qkrbswh5q59sqcjf2v5a6jnqslf5gwr5qpq18r";
- buildDepends = [ extensibleExceptions mtl ];
+ buildDepends = [ extensibleExceptions mtl random ];
meta = {
homepage = "http://code.haskell.org/QuickCheck";;
description = "Automatic testing of Haskell programs";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/RSA/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/RSA/default.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/RSA/default.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,4 +1,4 @@
-{ cabal, SHA, binary, pureMD5 }:
+{ cabal, SHA, binary, pureMD5, random }:
cabal.mkDerivation (self: {
pname = "RSA";
@@ -6,7 +6,7 @@
sha256 = "1d0birzvapcsgay0wwh5v9mcd77sghj1bps9ws04ww9ga97gyp0l";
isLibrary = true;
isExecutable = true;
- buildDepends = [ SHA binary pureMD5 ];
+ buildDepends = [ SHA binary pureMD5 random ];
meta = {
description = "Implementation of RSA, using the padding schemes of PKCS#1
v2.1.";
license = self.stdenv.lib.licenses.bsd3;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,7 +1,7 @@
{ cabal, RSA, SHA, aeson, attoparsec, base64Bytestring
, blazeBuilder, caseInsensitive, enumerator, failure
-, httpEnumerator, httpTypes, network, tagsoup, text, time, tls
-, transformers, xmlEnumerator
+, httpEnumerator, httpTypes, network, random, tagsoup, text, time
+, tls, transformers, xmlEnumerator
}:
cabal.mkDerivation (self: {
@@ -11,7 +11,7 @@
buildDepends = [
RSA SHA aeson attoparsec base64Bytestring blazeBuilder
caseInsensitive enumerator failure httpEnumerator httpTypes network
- tagsoup text time tls transformers xmlEnumerator
+ random tagsoup text time tls transformers xmlEnumerator
];
meta = {
homepage = "http://github.com/snoyberg/authenticate/tree/master";;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/clientsession/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,4 +1,4 @@
-{ cabal }:
+{ cabal, random }:
cabal.mkDerivation (self: {
pname = "clientsession";
@@ -6,6 +6,7 @@
sha256 = "0h92jjkhldn7f9b78cajfda8rprsj5scdsyl3pjpzicpvvy9g00y";
isLibrary = true;
isExecutable = true;
+ buildDepends = [ random ];
meta = {
homepage = "http://github.com/snoyberg/clientsession/tree/master";;
description = "Store session data in a cookie";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/cprng-aes/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/cprng-aes/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cprng-aes/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,10 +1,10 @@
-{ cabal, cereal, cryptoApi, cryptocipher }:
+{ cabal, cereal, cryptoApi, cryptocipher, random }:
cabal.mkDerivation (self: {
pname = "cprng-aes";
version = "0.2.1";
sha256 = "0q6qkvha7cckz3zjnzfsrx298arzbdavy1f73hygrd8f7n74442j";
- buildDepends = [ cereal cryptoApi cryptocipher ];
+ buildDepends = [ cereal cryptoApi cryptocipher random ];
meta = {
homepage = "http://github.com/vincenthz/hs-cprng-aes";;
description = "Crypto Pseudo Random Number Generator using AES in counter
mode";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/gitit/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/gitit/default.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/gitit/default.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,8 +1,8 @@
{ cabal, ConfigFile, HStringTemplate, HTTP, SHA, cgi, feed
, filestore, ghcPaths, happstackServer, happstackUtil
, highlightingKate, hslogger, json, mtl, network, pandoc
-, pandocTypes, parsec, recaptcha, safe, syb, time, url, utf8String
-, xhtml, xml, xssSanitize, zlib
+, pandocTypes, parsec, random, recaptcha, safe, syb, time, url
+, utf8String, xhtml, xml, xssSanitize, zlib
}:
cabal.mkDerivation (self: {
@@ -14,8 +14,8 @@
buildDepends = [
ConfigFile HStringTemplate HTTP SHA cgi feed filestore ghcPaths
happstackServer happstackUtil highlightingKate hslogger json mtl
- network pandoc pandocTypes parsec recaptcha safe syb time url
- utf8String xhtml xml xssSanitize zlib
+ network pandoc pandocTypes parsec random recaptcha safe syb time
+ url utf8String xhtml xml xssSanitize zlib
];
meta = {
homepage = "http://github.com/jgm/gitit/tree/master";;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-util.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-util.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-util.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,5 +1,5 @@
-{ cabal, extensibleExceptions, hslogger, mtl, network, parsec, time
-, unixCompat
+{ cabal, extensibleExceptions, hslogger, mtl, network, parsec
+, random, time, unixCompat
}:
cabal.mkDerivation (self: {
@@ -9,7 +9,8 @@
isLibrary = true;
isExecutable = true;
buildDepends = [
- extensibleExceptions hslogger mtl network parsec time unixCompat
+ extensibleExceptions hslogger mtl network parsec random time
+ unixCompat
];
meta = {
homepage = "http://happstack.com";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hint/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hint/default.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hint/default.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,5 +1,5 @@
{ cabal, MonadCatchIOMtl, extensibleExceptions, ghcMtl, ghcPaths
-, haskellSrc, mtl, utf8String
+, haskellSrc, mtl, random, utf8String
}:
cabal.mkDerivation (self: {
@@ -8,7 +8,7 @@
sha256 = "1qm74hjz8cxypvavcw7s094zg9ic3r1ll2lj3y159ipc79cw2sn1";
buildDepends = [
MonadCatchIOMtl extensibleExceptions ghcMtl ghcPaths haskellSrc mtl
- utf8String
+ random utf8String
];
meta = {
homepage = "http://projects.haskell.org/hint";;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, random }:
cabal.mkDerivation (self: {
pname = "mersenne-random-pure64";
version = "0.2.0.3";
sha256 = "0cyjfdl17n5al04vliykx0m7zncqh3201vn9b9fqfqqpmm61grqz";
+ buildDepends = [ random ];
meta = {
homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";;
description = "Generate high quality pseudorandom numbers purely using a
Mersenne Twister";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/mime-mail/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/mime-mail/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/mime-mail/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,10 +1,10 @@
-{ cabal, blazeBuilder, dataenc, text }:
+{ cabal, blazeBuilder, dataenc, random, text }:
cabal.mkDerivation (self: {
pname = "mime-mail";
version = "0.3.0.2";
sha256 = "0jbhkghzj2wn1200917lr5vjx50maakakl3asfz6x1chprbqkdsx";
- buildDepends = [ blazeBuilder dataenc text ];
+ buildDepends = [ blazeBuilder dataenc random text ];
meta = {
homepage = "http://github.com/snoyberg/mime-mail";;
description = "Compose MIME email messages";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/numeric-prelude/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/numeric-prelude/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/numeric-prelude/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,4 +1,5 @@
-{ cabal, QuickCheck, nonNegative, parsec, storableRecord, utilityHt
+{ cabal, QuickCheck, nonNegative, parsec, random, storableRecord
+, utilityHt
}:
cabal.mkDerivation (self: {
@@ -8,7 +9,7 @@
isLibrary = true;
isExecutable = true;
buildDepends = [
- QuickCheck nonNegative parsec storableRecord utilityHt
+ QuickCheck nonNegative parsec random storableRecord utilityHt
];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,5 +1,5 @@
-{ cabal, HTTP, extensibleExceptions, mtl, network, parsec, syb
-, texmath, utf8String, xhtml, xml, zipArchive
+{ cabal, HTTP, extensibleExceptions, mtl, network, parsec, random
+, syb, texmath, utf8String, xhtml, xml, zipArchive
}:
cabal.mkDerivation (self: {
@@ -9,8 +9,8 @@
isLibrary = true;
isExecutable = true;
buildDepends = [
- HTTP extensibleExceptions mtl network parsec syb texmath utf8String
- xhtml xml zipArchive
+ HTTP extensibleExceptions mtl network parsec random syb texmath
+ utf8String xhtml xml zipArchive
];
meta = {
homepage = "http://johnmacfarlane.net/pandoc";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,6 +1,6 @@
{ cabal, HTTP, base64Bytestring, citeprocHs, dlist
, extensibleExceptions, json, mtl, network, pandocTypes, parsec
-, syb, tagsoup, texmath, utf8String, xhtml, xml, zipArchive
+, random, syb, tagsoup, texmath, utf8String, xhtml, xml, zipArchive
}:
cabal.mkDerivation (self: {
@@ -11,8 +11,8 @@
isExecutable = true;
buildDepends = [
HTTP base64Bytestring citeprocHs dlist extensibleExceptions json
- mtl network pandocTypes parsec syb tagsoup texmath utf8String xhtml
- xml zipArchive
+ mtl network pandocTypes parsec random syb tagsoup texmath
+ utf8String xhtml xml zipArchive
];
meta = {
homepage = "http://johnmacfarlane.net/pandoc";;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/pwstore-fast/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pwstore-fast/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pwstore-fast/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,10 +1,10 @@
-{ cabal, base64Bytestring, cryptohash }:
+{ cabal, base64Bytestring, cryptohash, random }:
cabal.mkDerivation (self: {
pname = "pwstore-fast";
version = "2.1";
sha256 = "1gslxmipv3khv6fp6k62ip7fjn0jchzkhsqcdd8yrrkk8pdqdkya";
- buildDepends = [ base64Bytestring cryptohash ];
+ buildDepends = [ base64Bytestring cryptohash random ];
meta = {
homepage = "https://github.com/PeterScott/pwstore";;
description = "Secure password storage";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/random-shuffle/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/random-shuffle/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/random-shuffle/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, random }:
cabal.mkDerivation (self: {
pname = "random-shuffle";
version = "0.0.2";
sha256 = "1csq0ffsqbbv6ymf707nzfb7c9bmykwk9bcgj21mxmh6khlqn9jp";
+ buildDepends = [ random ];
meta = {
description = "Random shuffle implementation";
license = self.stdenv.lib.licenses.bsd3;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/random-source/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/random-source/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/random-source/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,5 +1,5 @@
{ cabal, flexibleDefaults, mersenneRandomPure64, mtl, mwcRandom
-, stateref, syb
+, random, stateref, syb
}:
cabal.mkDerivation (self: {
@@ -7,7 +7,8 @@
version = "0.3";
sha256 = "08nj7mq8gjj9rv1zmkr2m30z295k5b352103wb1ag1ryw5wyzg1n";
buildDepends = [
- flexibleDefaults mersenneRandomPure64 mtl mwcRandom stateref syb
+ flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref
+ syb
];
meta = {
homepage = "https://github.com/mokus0/random-fu";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/salvia/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/salvia/default.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/salvia/default.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,6 +1,6 @@
{ cabal, MaybeTTransformers, fclabels, monadsFd, network, pureMD5
-, safe, salviaProtocol, split, stm, text, threadmanager, time
-, transformers, utf8String
+, random, safe, salviaProtocol, split, stm, text, threadmanager
+, time, transformers, utf8String
}:
cabal.mkDerivation (self: {
@@ -8,7 +8,7 @@
version = "1.0.0";
sha256 = "d1be63e3eb7cb071e8e339d730692b3ce52576e513f718b89a194b17878496e1";
buildDepends = [
- MaybeTTransformers fclabels monadsFd network pureMD5 safe
+ MaybeTTransformers fclabels monadsFd network pureMD5 random safe
salviaProtocol split stm text threadmanager time transformers
utf8String
];
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,4 +1,5 @@
-{ cabal, QuickCheck, deepseq, extensibleExceptions, testFramework
+{ cabal, QuickCheck, deepseq, extensibleExceptions, random
+, testFramework
}:
cabal.mkDerivation (self: {
@@ -6,7 +7,7 @@
version = "0.2.7";
sha256 = "065nazli8vh9dz8xi71gwzlwy81anfd471jhz6hv3m893cc9vvx8";
buildDepends = [
- QuickCheck deepseq extensibleExceptions testFramework
+ QuickCheck deepseq extensibleExceptions random testFramework
];
meta = {
homepage = "http://batterseapower.github.com/test-framework/";;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,10 +1,12 @@
-{ cabal, QuickCheck, extensibleExceptions, testFramework }:
+{ cabal, QuickCheck, extensibleExceptions, random, testFramework }:
cabal.mkDerivation (self: {
pname = "test-framework-quickcheck2";
version = "0.2.10";
sha256 = "12c37m74idjydxshgms9ib9ii2rpvy4647kra2ards1w2jmnr6w3";
- buildDepends = [ QuickCheck extensibleExceptions testFramework ];
+ buildDepends = [
+ QuickCheck extensibleExceptions random testFramework
+ ];
meta = {
homepage = "http://batterseapower.github.com/test-framework/";;
description = "QuickCheck2 support for the test-framework package";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/test-framework/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,5 +1,5 @@
{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname
-, regexPosix, time, xml
+, random, regexPosix, time, xml
}:
cabal.mkDerivation (self: {
@@ -9,8 +9,8 @@
isLibrary = true;
isExecutable = true;
buildDepends = [
- ansiTerminal ansiWlPprint extensibleExceptions hostname regexPosix
- time xml
+ ansiTerminal ansiWlPprint extensibleExceptions hostname random
+ regexPosix time xml
];
meta = {
homepage = "http://batterseapower.github.com/test-framework/";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/testpack/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/testpack/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/testpack/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,10 +1,10 @@
-{ cabal, HUnit, QuickCheck, mtl }:
+{ cabal, HUnit, QuickCheck, mtl, random }:
cabal.mkDerivation (self: {
pname = "testpack";
version = "2.1.0";
sha256 = "8128f3a409855fca1d431391b2cbf6a9f4dec32dd6f26825960b936fe578c476";
- buildDepends = [ HUnit QuickCheck mtl ];
+ buildDepends = [ HUnit QuickCheck mtl random ];
meta = {
homepage =
"http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack";;
description = "Test Utililty Pack for HUnit and QuickCheck";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,7 +1,7 @@
{ cabal, SHA, aeson, authenticate, blazeHtml, controlMonadAttempt
, hamlet, httpEnumerator, mimeMail, persistent, persistentTemplate
-, pureMD5, text, transformers, wai, webRoutesQuasi, yesodCore
-, yesodForm, yesodJson, yesodPersistent
+, pureMD5, random, text, transformers, wai, webRoutesQuasi
+, yesodCore, yesodForm, yesodJson, yesodPersistent
}:
cabal.mkDerivation (self: {
@@ -10,9 +10,9 @@
sha256 = "1vf02kgm3pcak4igvp8009lgv8i8bir272byw0ma2mg6bl0sgyvl";
buildDepends = [
SHA aeson authenticate blazeHtml controlMonadAttempt hamlet
- httpEnumerator mimeMail persistent persistentTemplate pureMD5 text
- transformers wai webRoutesQuasi yesodCore yesodForm yesodJson
- yesodPersistent
+ httpEnumerator mimeMail persistent persistentTemplate pureMD5
+ random text transformers wai webRoutesQuasi yesodCore yesodForm
+ yesodJson yesodPersistent
];
meta = {
homepage = "http://www.yesodweb.com/";;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,7 +1,7 @@
{ cabal, blazeBuilder, blazeHtml, caseInsensitive, cereal
, clientsession, cookie, enumerator, failure, hamlet, httpTypes
-, monadControl, parsec, text, time, transformers, wai, waiExtra
-, webRoutesQuasi
+, monadControl, parsec, random, text, time, transformers, wai
+, waiExtra, webRoutesQuasi
}:
cabal.mkDerivation (self: {
@@ -12,8 +12,8 @@
isExecutable = true;
buildDepends = [
blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie
- enumerator failure hamlet httpTypes monadControl parsec text time
- transformers wai waiExtra webRoutesQuasi
+ enumerator failure hamlet httpTypes monadControl parsec random text
+ time transformers wai waiExtra webRoutesQuasi
];
meta = {
homepage = "http://www.yesodweb.com/";;
Modified: nixpkgs/trunk/pkgs/games/MazesOfMonad/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/games/MazesOfMonad/default.nix Fri Aug 12 00:18:40
2011 (r28499)
+++ nixpkgs/trunk/pkgs/games/MazesOfMonad/default.nix Fri Aug 12 00:18:56
2011 (r28500)
@@ -1,4 +1,4 @@
-{ cabal, HUnit, mtl, regexPosix, time }:
+{ cabal, HUnit, mtl, random, regexPosix, time }:
cabal.mkDerivation (self: {
pname = "MazesOfMonad";
@@ -6,7 +6,7 @@
sha256 = "1zk6bckll03b40iq8z13753glkmcan6439w8cc6rn5h2fhp189v9";
isLibrary = false;
isExecutable = true;
- buildDepends = [ HUnit mtl regexPosix time ];
+ buildDepends = [ HUnit mtl random regexPosix time ];
meta = {
description = "Console-based Role Playing Game";
license = self.stdenv.lib.licenses.bsd3;
Modified: nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.10.2.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.10.2.nix
Fri Aug 12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.10.2.nix
Fri Aug 12 00:18:56 2011 (r28500)
@@ -1,4 +1,4 @@
-{ cabal, HTTP, network, time, zlib }:
+{ cabal, HTTP, network, random, time, zlib }:
cabal.mkDerivation (self: {
pname = "cabal-install";
@@ -6,7 +6,7 @@
sha256 = "05gmgxdlymp66c87szx1vq6hlraispdh6pm0n85s74yihjwwhmv3";
isLibrary = false;
isExecutable = true;
- buildDepends = [ HTTP network time zlib ];
+ buildDepends = [ HTTP network random time zlib ];
meta = {
homepage = "http://www.haskell.org/cabal/";;
description = "The command-line interface for Cabal and Hackage";
Modified: nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.6.2.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.6.2.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.6.2.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,4 +1,4 @@
-{ cabal, HTTP, network, zlib }:
+{ cabal, HTTP, network, random, zlib }:
cabal.mkDerivation (self: {
pname = "cabal-install";
@@ -6,7 +6,7 @@
sha256 = "d8ea91bd0a2a624ab1cf52ddfe48cef02b532bb5e2fcda3fd72ca51efc04b41a";
isLibrary = false;
isExecutable = true;
- buildDepends = [ HTTP network zlib ];
+ buildDepends = [ HTTP network random zlib ];
meta = {
homepage = "http://www.haskell.org/cabal/";;
description = "The command-line interface for Cabal and Hackage";
Modified: nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.8.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.8.0.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.8.0.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,4 +1,4 @@
-{ cabal, HTTP, network, time, zlib }:
+{ cabal, HTTP, network, random, time, zlib }:
cabal.mkDerivation (self: {
pname = "cabal-install";
@@ -6,7 +6,7 @@
sha256 = "6d16618ff454f8d732cad64a53b767b5b6bb95ba4970b260a40e8f467035493c";
isLibrary = false;
isExecutable = true;
- buildDepends = [ HTTP network time zlib ];
+ buildDepends = [ HTTP network random time zlib ];
meta = {
homepage = "http://www.haskell.org/cabal/";;
description = "The command-line interface for Cabal and Hackage";
Modified: nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.8.2.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.8.2.nix Fri Aug
12 00:18:40 2011 (r28499)
+++ nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.8.2.nix Fri Aug
12 00:18:56 2011 (r28500)
@@ -1,4 +1,4 @@
-{ cabal, HTTP, network, time, zlib }:
+{ cabal, HTTP, network, random, time, zlib }:
cabal.mkDerivation (self: {
pname = "cabal-install";
@@ -6,7 +6,7 @@
sha256 = "8f896ab46ec6c578f620ce4150f7cd04a2088be793113b33cc570b13b6b86e0b";
isLibrary = false;
isExecutable = true;
- buildDepends = [ HTTP network time zlib ];
+ buildDepends = [ HTTP network random time zlib ];
meta = {
homepage = "http://www.haskell.org/cabal/";;
description = "The command-line interface for Cabal and Hackage";
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Aug 12 00:18:40
2011 (r28499)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Aug 12 00:18:56
2011 (r28500)
@@ -141,7 +141,7 @@
syb = self.syb_0_3_3; # 7.2 ok, 7.3 ok
xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
- HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 fails
+ HTTP = self.HTTP_4000_1_1; # 7.2 ok, 7.3 fails
deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
text = self.text_0_11_1_5; # 7.2 ok, 7.3 fails
transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
