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

Moved package overrides from haskell-packages.nix to haskell-defaults.nix.

Browse Source
This commit is contained in:
Aycan iRiCAN 2014-06-21 17:44:29 +03:00
parent e9385023d7
commit 88050e4a41
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,11 @@
haddock = self.haddock_2_13_2;
modularArithmetic = null; # requires base >= 4.7
pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; };
rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_1; };
networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; };
networkTransportTcp = super.networkTransportTcp.override { binary = self.binary_0_7_2_1; };
distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; };
distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; };
singletons = null; # requires base >= 4.7
vty_5_1_0 = super.vty_5_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; };
transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x

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

@ -635,13 +635,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
distributedStatic = callPackage ../development/libraries/haskell/distributed-static {
binary = self.binary_0_7_2_1;
};
distributedStatic = callPackage ../development/libraries/haskell/distributed-static {};
distributedProcess = callPackage ../development/libraries/haskell/distributed-process {
binary = self.binary_0_7_2_1;
};
distributedProcess = callPackage ../development/libraries/haskell/distributed-process {};
distributive = callPackage ../development/libraries/haskell/distributive {};
@ -1579,13 +1575,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
networkSimple = callPackage ../development/libraries/haskell/network-simple { };
networkTransport = callPackage ../development/libraries/haskell/network-transport {
binary = self.binary_0_7_2_1;
};
networkTransport = callPackage ../development/libraries/haskell/network-transport {};
networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {
binary = self.binary_0_7_2_1;
};
networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {};
networkTransportTests = callPackage ../development/libraries/haskell/network-transport-tests {};
@ -1844,9 +1836,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {};
rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic {
binary = self.binary_0_7_2_1;
};
rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic {};
ranges = callPackage ../development/libraries/haskell/ranges {};