commit 88de1ef84a200ac7c54373b7f7e33ad1d77ffa57 · pyrox.dev/nixpkgs

+1 -1

doc/languages-frameworks/haskell.section.md

···

       779
       779
        
       

     

       780
       780
        
       ```nix

     

       781
       781
        
       haskellPackages.haskell-ci.overrideScope (self: super: {

     

       782
       782
       -
         Cabal = self.Cabal_3_14_1_1;

     

       782
       782
       +
         Cabal = self.Cabal_3_14_2_0;

     

       783
       783
        
       })

     

       784
       784
        
       ```

     

       785
       785

+6 -6

pkgs/development/haskell-modules/configuration-common.nix

···

       34
       34
        
             Cabal-syntax = self.Cabal-syntax_3_12_1_0;

     

       35
       35
        
           }

     

       36
       36
        
         );

     

       37
       37
       -
         Cabal_3_14_1_1 =

     

       37
       37
       +
         Cabal_3_14_2_0 =

     

       38
       38
        
           overrideCabal

     

       39
       39
        
             (drv: {

     

       40
       40
        
               # Revert increased lower bound on unix since we have backported

     
···

       47
       47
        
             })

     

       48
       48
        
             (

     

       49
       49
        
               doDistribute (

     

       50
       50
       -
                 super.Cabal_3_14_1_1.override {

     

       51
       51
       -
                   Cabal-syntax = self.Cabal-syntax_3_14_1_0;

     

       50
       50
       +
                 super.Cabal_3_14_2_0.override {

     

       51
       51
       +
                   Cabal-syntax = self.Cabal-syntax_3_14_2_0;

     

       52
       52
        
                 }

     

       53
       53
        
               )

     

       54
       54
        
             );

     

       55
       55
        
       

     

       56
       56
        
         # Needs matching version of Cabal

     

       57
       57
        
         Cabal-hooks = super.Cabal-hooks.override {

     

       58
       58
       -
           Cabal = self.Cabal_3_14_1_1;

     

       58
       58
       +
           Cabal = self.Cabal_3_14_2_0;

     

       59
       59
        
         };

     

       60
       60
        
       

     

       61
       61
        
         # cabal-install needs most recent versions of Cabal and Cabal-syntax,

     
···

       67
       67
        
               cabalInstallOverlay =

     

       68
       68
        
                 cself: csuper:

     

       69
       69
        
                 lib.optionalAttrs (lib.versionOlder self.ghc.version "9.12") {

     

       70
       70
       -
                   Cabal = cself.Cabal_3_14_1_1;

     

       71
       71
       -
                   Cabal-syntax = cself.Cabal-syntax_3_14_1_0;

     

       70
       70
       +
                   Cabal = cself.Cabal_3_14_2_0;

     

       71
       71
       +
                   Cabal-syntax = cself.Cabal-syntax_3_14_2_0;

     

       72
       72
        
                 };

     

       73
       73
        
             in

     

       74
       74
        
             {

+1 -1

pkgs/development/tools/haskell/hadrian/make-hadrian.nix

···

       64
       64
        
         }

     

       65
       65
        
         // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") {

     

       66
       66
        
           # See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c

     

       67
       67
       -
           Cabal = bootPkgs.Cabal_3_14_1_1;

     

       67
       67
       +
           Cabal = bootPkgs.Cabal_3_14_2_0;

     

       68
       68
        
         }

     

       69
       69
        
       )

+1 -1

pkgs/top-level/release-haskell.nix

···

       574
       574
        
               compilerNames.ghc9122

     

       575
       575
        
             ] released;

     

       576
       576
        
             Cabal_3_12_1_0 = released;

     

       577
       577
       -
             Cabal_3_14_1_1 = released;

     

       577
       577
       +
             Cabal_3_14_2_0 = released;

     

       578
       578
        
             cabal2nix = released;

     

       579
       579
        
             cabal2nix-unstable = released;

     

       580
       580
        
             funcmp = released;