commit 2029027d8883ab22e3044a71a4a33cc7a0beaf2e · pyrox.dev/nixpkgs

+1 -1

pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix

···

       41
       41
        
         unix = null;

     

       42
       42
        
       

     

       43
       43
        
         # These packages are core libraries in GHC 7.10.x, but not here.

     

       44
       44
       -
         binary = self.binary_0_8_2_0;

     

       44
       44
       +
         binary = self.binary_0_8_2_1;

     

       45
       45
        
         deepseq = self.deepseq_1_3_0_1;

     

       46
       46
        
         haskeline = self.haskeline_0_7_2_1;

     

       47
       47
        
         hoopl = self.hoopl_3_10_2_0;

+1 -1

pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix

···

       42
       42
        
         xhtml = self.xhtml_3000_2_1;

     

       43
       43
        
       

     

       44
       44
        
         # https://github.com/haskell/cabal/issues/2322

     

       45
       45
       -
         Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_2_0; process = self.process_1_2_3_0; };

     

       45
       45
       +
         Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_2_1; process = self.process_1_2_3_0; };

     

       46
       46
        
       

     

       47
       47
        
         # Newer versions don't compile.

     

       48
       48
        
         Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;

+2 -2

pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix

···

       41
       41
        
         xhtml = self.xhtml_3000_2_1;

     

       42
       42
        
       

     

       43
       43
        
         # https://github.com/haskell/cabal/issues/2322

     

       44
       44
       -
         Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; };

     

       44
       44
       +
         Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_1; };

     

       45
       45
        
       

     

       46
       46
        
         # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.

     

       47
       47
       -
         cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; });

     

       47
       47
       +
         cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_1; });

     

       48
       48
        
       

     

       49
       49
        
         # https://github.com/tibbe/hashable/issues/85

     

       50
       50
        
         hashable = dontCheck super.hashable;

+2 -2

pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix

···

       40
       40
        
         xhtml = self.xhtml_3000_2_1;

     

       41
       41
        
       

     

       42
       42
        
         # https://github.com/haskell/cabal/issues/2322

     

       43
       43
       -
         Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; };

     

       43
       43
       +
         Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_1; };

     

       44
       44
        
       

     

       45
       45
        
         # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.

     

       46
       46
       -
         cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; });

     

       46
       46
       +
         cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_1; });

     

       47
       47
        
       

     

       48
       48
        
         # https://github.com/tibbe/hashable/issues/85

     

       49
       49
        
         hashable = dontCheck super.hashable;