Merge branch 'master' of github.com:NixOS/nixpkgs

This commit is contained in:
Sander van der Burg 2013-06-10 11:41:27 +02:00
commit ae5b6de50f
4 changed files with 9 additions and 10 deletions

View File

@ -2,10 +2,9 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "accelerate"; pname = "accelerate";
version = "0.13.0.2"; version = "0.13.0.4";
sha256 = "1xcgcr3wrvvckjhxbr80567gmg6rx9ks7rl4jcr6c6mdv6svx4jb"; sha256 = "1rhbvzgafw3cx2wi4zfil4nxcziqpbh20q3nafck30q2xvrwkmwm";
buildDepends = [ fclabels hashable hashtables ]; buildDepends = [ fclabels hashable hashtables ];
noHaddock = true;
meta = { meta = {
homepage = "https://github.com/AccelerateHS/accelerate/"; homepage = "https://github.com/AccelerateHS/accelerate/";
description = "An embedded language for accelerated array processing"; description = "An embedded language for accelerated array processing";

View File

@ -2,12 +2,12 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "contravariant"; pname = "contravariant";
version = "0.4"; version = "0.4.1";
sha256 = "1nqslc9vcx6v6c33fn7mvb1xhr33yl3ja92p788zx8z1drx9cqc3"; sha256 = "0alzl47lqzw9fqjqxdfy40f1aynd8mc00b2h7fj2ch0zq82hm85q";
buildDepends = [ tagged transformers transformersCompat ]; buildDepends = [ tagged transformers transformersCompat ];
meta = { meta = {
homepage = "http://github.com/ekmett/contravariant/"; homepage = "http://github.com/ekmett/contravariant/";
description = "Haskell 98 contravariant functors"; description = "Contravariant functors";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
}; };

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "entropy"; pname = "entropy";
version = "0.2.2"; version = "0.2.2.1";
sha256 = "1zri5qs19cbz9ydbh076q6834pspf2gqn06ssz4hsq6j65cnd9x2"; sha256 = "1yl1gmkmbalm27pjlpm9nhsbxpvxl8w7p8psq5apyrbdqnv9yhbg";
meta = { meta = {
homepage = "https://github.com/TomMD/entropy"; homepage = "https://github.com/TomMD/entropy";
description = "A platform independent entropy source"; description = "A platform independent entropy source";

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "ghc-vis"; pname = "ghc-vis";
version = "0.7.0.1"; version = "0.7.1";
sha256 = "0k6pm1lqmcmgdqzcdbygdyg6bgx4k0gi77k1mxwprgr9vv3ly26w"; sha256 = "05j3yw1276wvy4va7r7pbnvhjg1k1mxzp4baxcb9jlb5dxfh0daa";
buildDepends = [ buildDepends = [
cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
transformers xdot transformers xdot