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

Revert "Many minor fixes to get things building after recent compiler changes".

Browse Source 
This reverts the Haskell part of commit 326ca0f6900142b1, because these changes
broke the 'scientific' build with GHC 7.4.2.
This commit is contained in:
Peter Simons 2014-08-11 14:48:35 +02:00
parent bc941ecf0b
commit 59e15fe815
3 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/libraries/haskell/aeson/0.7.0.6.nix
View File

@ -1,28 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
, mtl, QuickCheck, scientific, syb, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, text, time
, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "aeson";
version = "0.7.0.6";
sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
buildDepends = [
attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
text time unorderedContainers vector
];
testDepends = [
attoparsec HUnit QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 text time unorderedContainers vector
];
meta = {
homepage = "https://github.com/bos/aeson";
description = "Fast JSON parsing and encoding";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

6
pkgs/top-level/haskell-defaults.nix
View File

@ -27,13 +27,13 @@
}; };
ghc763Prefs = self : super : ghc783Prefs self super // { ghc763Prefs = self : super : ghc783Prefs self super // {
aeson = self.aeson_0_7_0_6; aeson = self.aeson_0_7_0_4;
ariadne = super.ariadne.override { ariadne = super.ariadne.override {
haskellNames = self.haskellNames.override { haskellNames = self.haskellNames.override {
haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; }; haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; };
}; };
}; };
attoparsec = self.attoparsec_0_11_3_4; attoparsec = self.attoparsec_0_11_3_1;
binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_1; }; binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_1; };
bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_1; }; }; bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_1; }; };
criterion = super.criterion.override { criterion = super.criterion.override {
@ -50,7 +50,7 @@
distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; }; distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; };
networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; };
distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; };
scientific = self.scientific_0_3_3_0; scientific = self.scientific_0_2_0_2;
singletons = null; # requires base >= 4.7 singletons = null; # requires base >= 4.7
transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x
zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x

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

@ -142,7 +142,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
AES = callPackage ../development/libraries/haskell/AES {}; AES = callPackage ../development/libraries/haskell/AES {};
aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; };
aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; };
aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; }; aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; };
aeson = self.aeson_0_8_0_0; aeson = self.aeson_0_8_0_0;