Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Aycan iRiCAN 2014-08-07 18:52:42 +03:00
commit 15e26a68dc
3 changed files with 34 additions and 0 deletions

View file

@ -0,0 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, mtl }:
cabal.mkDerivation (self: {
pname = "sodium";
version = "0.10.0.2";
sha256 = "0rm1blh0br4gdnqb6ixvql6nrxzcjxjkwp4lmqmsisa2b68gbzqy";
buildDepends = [ mtl ];
meta = {
description = "Sodium Reactive Programming (FRP) System";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, random, time }:
cabal.mkDerivation (self: {
pname = "xorshift";
version = "2.0.1";
sha256 = "1pgkcnsgir8ci3hm3s5w3lk5dy7219242g9njx9cxb1m1cz5v5rf";
buildDepends = [ random time ];
meta = {
description = "Haskell implementation of the xorshift random generator";
license = self.stdenv.lib.licenses.lgpl2;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -2149,6 +2149,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
socketIo = callPackage ../development/libraries/haskell/socket-io {};
sodium = callPackage ../development/libraries/haskell/sodium {};
sparse = callPackage ../development/libraries/haskell/sparse {};
spawn = callPackage ../development/libraries/haskell/spawn {};
@ -2703,6 +2705,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
xorshift = callPackage ../development/libraries/haskell/xorshift {};
xournalParser = callPackage ../development/libraries/haskell/xournal-parser {};
xournalTypes = callPackage ../development/libraries/haskell/xournal-types {};