commit 11882a0bde778e813c79b8d17c033f3ddf13a8f1 · pyrox.dev/nixpkgs

+2 -2

pkgs/top-level/haskell-packages.nix

···

       185
       185
        
             buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;

     

       186
       186
        
             llvmPackages = pkgs.llvmPackages_12;

     

       187
       187
        
           };

     

       188
       188
       -
           ghc92 = ghc925;

     

       188
       188
       +
           ghc92 = ghc924;

     

       189
       189
        
           ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix {

     

       190
       190
        
             bootPkgs =

     

       191
       191
        
               # Building with 9.2 is broken due to

     
···

       360
       360
        
             ghc = bh.compiler.ghc925;

     

       361
       361
        
             compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };

     

       362
       362
        
           };

     

       363
       363
       -
           ghc92 = ghc925;

     

       363
       363
       +
           ghc92 = ghc924;

     

       364
       364
        
           ghc942 = callPackage ../development/haskell-modules {

     

       365
       365
        
             buildHaskellPackages = bh.packages.ghc942;

     

       366
       366
        
             ghc = bh.compiler.ghc942;

+9 -3

pkgs/top-level/release-haskell.nix

···

       52
       52
        
           ghc884

     

       53
       53
        
           ghc8107

     

       54
       54
        
           ghc902

     

       55
       55
       +
           ghc924

     

       55
       56
        
           ghc925

     

       56
       57
        
           ghc942

     

       57
       58
        
           ghc943

     
···

       334
       335
        
                     ;

     

       335
       336
        
                   };

     

       336
       337
        
       

     

       337
       337
       -
                   haskell.packages.native-bignum.ghc925 = {

     

       338
       338
       -
                     inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc925)

     

       338
       338
       +
                   haskell.packages.native-bignum.ghc924 = {

     

       339
       339
       +
                     inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924)

     

       339
       340
        
                       hello

     

       340
       341
        
                       lens

     

       341
       342
        
                       random

     
···

       366
       367
        
               compilerNames.ghc884

     

       367
       368
        
               compilerNames.ghc8107

     

       368
       369
        
               compilerNames.ghc902

     

       370
       370
       +
               compilerNames.ghc924

     

       369
       371
        
               compilerNames.ghc925

     

       370
       372
        
               # https://github.com/ndmitchell/hlint/issues/1413

     

       371
       373
        
             ];

     
···

       393
       395
        
             weeder = [

     

       394
       396
        
               compilerNames.ghc8107

     

       395
       397
        
               compilerNames.ghc902

     

       398
       398
       +
               compilerNames.ghc924

     

       396
       399
        
               compilerNames.ghc925

     

       397
       400
        
             ];

     

       398
       401
        
             purescript = [

     

       402
       402
       +
               compilerNames.ghc924

     

       399
       403
        
               compilerNames.ghc925

     

       400
       404
        
             ];

     

       401
       405
        
             purescript-cst = [

     
···

       470
       474
        
                 jobs.pkgsMusl.haskell.compiler.ghc884

     

       471
       475
        
                 jobs.pkgsMusl.haskell.compiler.ghc8107

     

       472
       476
        
                 jobs.pkgsMusl.haskell.compiler.ghc902

     

       477
       477
       +
                 jobs.pkgsMusl.haskell.compiler.ghc924

     

       473
       478
        
                 jobs.pkgsMusl.haskell.compiler.ghc925

     

       474
       479
        
                 jobs.pkgsMusl.haskell.compiler.ghcHEAD

     

       475
       480
        
                 jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107

     

       476
       481
        
                 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902

     

       482
       482
       +
                 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924

     

       477
       483
        
                 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc925

     

       478
       484
        
                 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD

     

       479
       485
        
               ];

     
···

       490
       496
        
               };

     

       491
       497
        
               constituents = accumulateDerivations [

     

       492
       498
        
                 jobs.pkgsStatic.haskellPackages

     

       493
       493
       -
                 jobs.pkgsStatic.haskell.packages.native-bignum.ghc925

     

       499
       499
       +
                 jobs.pkgsStatic.haskell.packages.native-bignum.ghc924

     

       494
       500
        
               ];

     

       495
       501
        
             };

     

       496
       502
        
           }