commit ac290135eadb4616a188c7a034e4bd48d8aa4834 · pyrox.dev/nixpkgs

pkgs/development/compilers/ghc/common-hadrian.nix

···

       888
       888
        
             timeout = 24 * 3600;

     

       889
       889
        
             platforms = lib.platforms.all;

     

       890
       890
        
             inherit (bootPkgs.ghc.meta) license;

     

       891
       891
       +
             # To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.

     

       892
       892
       +
             broken = useLLVM;

     

       891
       893
        
           };

     

       892
       894
        
       

     

       893
       895
        
           dontStrip = targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm;

pkgs/development/compilers/ghc/common-make-native-bignum.nix

···

       669
       669
        
             timeout = 24 * 3600;

     

       670
       670
        
             platforms = lib.platforms.all;

     

       671
       671
        
             inherit (bootPkgs.ghc.meta) license;

     

       672
       672
       +
             # To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.

     

       673
       673
       +
             broken = useLLVM;

     

       672
       674
        
           };

     

       673
       675
        
       

     

       674
       676
        
         }

+6 -1

pkgs/development/haskell-modules/with-packages-wrapper.nix

···

       182
       182
        
           + postBuild;

     

       183
       183
        
           preferLocalBuild = true;

     

       184
       184
        
           passthru = {

     

       185
       185
       -
             inherit (ghc) version meta targetPrefix;

     

       185
       185
       +
             inherit (ghc) version targetPrefix;

     

       186
       186
        
       

     

       187
       187
        
             hoogle = hoogleWithPackages';

     

       188
       188
        
       

     
···

       202
       202
        
       

     

       203
       203
        
                 Also note that withLLVM has been renamed to useLLVM for consistency with

     

       204
       204
        
                 the GHC Nix expressions.'';

     

       205
       205
       +
           };

     

       206
       206
       +
           pos = __curPos;

     

       207
       207
       +
           meta = ghc.meta // {

     

       208
       208
       +
             # To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.

     

       209
       209
       +
             broken = useLLVM;

     

       205
       210
        
           };

     

       206
       211
        
         }

+13 -28

pkgs/top-level/haskell-packages.nix

···

       48
       48
        
         # Use this rather than `rec { ... }` below for sake of overlays.

     

       49
       49
        
         inherit (pkgs.haskell) compiler packages;

     

       50
       50
        
       

     

       51
       51
       +
         buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_20;

     

       52
       52
       +
         llvmPackages = pkgs.llvmPackages_20;

     

       53
       53
       +
       

     

       51
       54
        
       in

     

       52
       55
        
       {

     

       53
       56
        
         lib = haskellLibUncomposable;

     
···

       72
       75
        
           {

     

       73
       76
        
             # Required to bootstrap 9.4.8.

     

       74
       77
        
             ghc902Binary = callPackage ../development/compilers/ghc/9.0.2-binary.nix {

     

       75
       75
       -
               llvmPackages = pkgs.llvmPackages_20;

     

       78
       78
       +
               inherit llvmPackages;

     

       76
       79
        
             };

     

       77
       80
        
       

     

       78
       81
        
             ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix { };

     
···

       91
       94
        
               # https://github.com/xattr/xattr/issues/44 and

     

       92
       95
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       93
       96
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       94
       94
       -
               # Support range >= 10 && < 14

     

       95
       95
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;

     

       96
       96
       -
               llvmPackages = pkgs.llvmPackages_12;

     

       97
       97
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       97
       98
        
             };

     

       98
       99
        
             ghc94 = compiler.ghc948;

     

       99
       100
        
             ghc963 = callPackage ../development/compilers/ghc/9.6.3.nix {

     
···

       103
       104
        
               # https://github.com/xattr/xattr/issues/44 and

     

       104
       105
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       105
       106
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       106
       106
       -
               # Support range >= 11 && < 16

     

       107
       107
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       108
       108
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       107
       107
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       109
       108
        
             };

     

       110
       109
        
             ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix {

     

       111
       110
        
               bootPkgs = bb.packages.ghc924Binary;

     
···

       114
       113
        
               # https://github.com/xattr/xattr/issues/44 and

     

       115
       114
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       116
       115
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       117
       117
       -
               # Support range >= 11 && < 16

     

       118
       118
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       119
       119
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       116
       116
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       120
       117
        
             };

     

       121
       118
        
             ghc96 = compiler.ghc967;

     

       122
       119
        
             ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix {

     
···

       130
       127
        
               # https://github.com/xattr/xattr/issues/44 and

     

       131
       128
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       132
       129
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       133
       133
       -
               # Support range >= 11 && < 16

     

       134
       134
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       135
       135
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       130
       130
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       136
       131
        
             };

     

       137
       132
        
             ghc98 = compiler.ghc984;

     

       138
       133
        
             ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix {

     
···

       151
       146
        
               # https://github.com/xattr/xattr/issues/44 and

     

       152
       147
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       153
       148
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       154
       154
       -
               # 2023-01-15: Support range >= 11 && < 16

     

       155
       155
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       156
       156
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       149
       149
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       157
       150
        
             };

     

       158
       151
        
             ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix {

     

       159
       152
        
               bootPkgs =

     
···

       171
       164
        
               # https://github.com/xattr/xattr/issues/44 and

     

       172
       165
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       173
       166
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       174
       174
       -
               # 2023-01-15: Support range >= 11 && < 16

     

       175
       175
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       176
       176
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       167
       167
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       177
       168
        
             };

     

       178
       169
        
             ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix {

     

       179
       170
        
               bootPkgs =

     
···

       205
       196
        
               # https://github.com/xattr/xattr/issues/44 and

     

       206
       197
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       207
       198
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       208
       208
       -
               # 2024-12-21: Support range >= 13 && < 20

     

       209
       209
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_19;

     

       210
       210
       -
               llvmPackages = pkgs.llvmPackages_19;

     

       199
       199
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       211
       200
        
             };

     

       212
       201
        
             ghc9122 = callPackage ../development/compilers/ghc/9.12.2.nix {

     

       213
       202
        
               bootPkgs =

     
···

       218
       207
        
               # https://github.com/xattr/xattr/issues/44 and

     

       219
       208
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       220
       209
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       221
       221
       -
               # 2024-12-21: Support range >= 13 && < 20

     

       222
       222
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_19;

     

       223
       223
       -
               llvmPackages = pkgs.llvmPackages_19;

     

       210
       210
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       224
       211
        
             };

     

       225
       212
        
             ghc912 = compiler.ghc9122;

     

       226
       213
        
             ghcHEAD = callPackage ../development/compilers/ghc/head.nix {

     
···

       230
       217
        
               # https://github.com/xattr/xattr/issues/44 and

     

       231
       218
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       232
       219
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       233
       233
       -
               # 2023-01-15: Support range >= 11 && < 16

     

       234
       234
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_18;

     

       235
       235
       -
               llvmPackages = pkgs.llvmPackages_18;

     

       220
       220
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       236
       221
        
             };

     

       237
       222
        
       

     

       238
       223
        
             # Starting from GHC 9, integer-{simple,gmp} is replaced by ghc-bignum