public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-aeson-0.7.x: fix build with older versions of ByteString

Browse Source 
Closes <https://github.com/bos/aeson/issues/185>.
Closes <https://github.com/ekmett/lens/issues/397>.
This commit is contained in:
Peter Simons 2014-02-19 16:29:01 +01:00
parent 40b8b3206e
commit 5306d974ce
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
View File

@ -1,6 +1,7 @@
{ cabal, attoparsec, deepseq, dlist, hashable, HUnit, mtl { cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
, QuickCheck, scientific, syb, testFramework, testFrameworkHunit , mtl, QuickCheck, scientific, syb, testFramework
, testFrameworkQuickcheck2, text, time, unorderedContainers, vector , testFrameworkHunit, testFrameworkQuickcheck2, text, time
, unorderedContainers, vector
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
@ -8,8 +9,8 @@ cabal.mkDerivation (self: {
version = "0.7.0.1"; version = "0.7.0.1";
sha256 = "17cwclxh2f2m0mvs867lfzrv14gd9grw8a9f8l95j3nd76y58kb3"; sha256 = "17cwclxh2f2m0mvs867lfzrv14gd9grw8a9f8l95j3nd76y58kb3";
buildDepends = [ buildDepends = [
attoparsec deepseq dlist hashable mtl scientific syb text time attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
unorderedContainers vector text time unorderedContainers vector
]; ];
testDepends = [ testDepends = [
attoparsec HUnit QuickCheck testFramework testFrameworkHunit attoparsec HUnit QuickCheck testFramework testFrameworkHunit

4
pkgs/top-level/haskell-packages.nix
View File

@ -527,7 +527,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
adjunctions = callPackage ../development/libraries/haskell/adjunctions {}; adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {}; aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {};
aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {}; aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {
blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null;
};
aeson = self.aeson_0_6_2_1; aeson = self.aeson_0_6_2_1;
aesonLens = callPackage ../development/libraries/haskell/aeson-lens {}; aesonLens = callPackage ../development/libraries/haskell/aeson-lens {};