commit 50a00d8692c0253cc75a3dc0bfc46a88d98f1b8c · pyrox.dev/nixpkgs

+15

pkgs/development/compilers/ghc/9.0.2-binary.nix

···

       11
       11
        
         numactl,

     

       12
       12
        
         libffi,

     

       13
       13
        
         llvmPackages,

     

       14
       14
       +
         replaceVarsWith,

     

       14
       15
        
         coreutils,

     

       15
       16
        
         targetPackages,

     

       16
       17
        
       

     
···

       214
       215
        
           coreutils # for cat

     

       215
       216
        
         ]

     

       216
       217
        
         ++ lib.optionals useLLVM [

     

       218
       218
       +
           # Allow the use of newer LLVM versions; see the script for details.

     

       219
       219
       +
           (replaceVarsWith {

     

       220
       220
       +
             name = "subopt";

     

       221
       221
       +
             src = ./subopt.bash;

     

       222
       222
       +
             dir = "bin";

     

       223
       223
       +
             isExecutable = true;

     

       224
       224
       +
             preBuild = ''

     

       225
       225
       +
               name=opt

     

       226
       226
       +
             '';

     

       227
       227
       +
             replacements = {

     

       228
       228
       +
               inherit (stdenv) shell;

     

       229
       229
       +
               opt = lib.getExe' llvmPackages.llvm "opt";

     

       230
       230
       +
             };

     

       231
       231
       +
           })

     

       217
       232
        
           (lib.getBin llvmPackages.llvm)

     

       218
       233
        
         ]

     

       219
       234
        
         # On darwin, we need unwrapped bintools as well (for otool)

+3 -7

pkgs/development/compilers/ghc/9.2.4-binary.nix

···

       10
       10
        
         libiconv,

     

       11
       11
        
         numactl,

     

       12
       12
        
         libffi,

     

       13
       13
       -
         llvmPackages,

     

       14
       13
        
         coreutils,

     

       15
       14
        
         targetPackages,

     

       16
       15
        
       

     
···

       193
       192
        
             ) binDistUsed.archSpecificLibraries

     

       194
       193
        
           )).nixPackage;

     

       195
       194
        
       

     

       196
       196
       -
         useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; });

     

       197
       197
       -
       

     

       198
       195
        
         libPath = lib.makeLibraryPath (

     

       199
       196
        
           # Add arch-specific libraries.

     

       200
       197
        
           map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries

     
···

       207
       204
        
           targetPackages.stdenv.cc.bintools

     

       208
       205
        
           coreutils # for cat

     

       209
       206
        
         ]

     

       210
       210
       -
         ++ lib.optionals useLLVM [

     

       211
       211
       -
           (lib.getBin llvmPackages.llvm)

     

       212
       212
       -
         ]

     

       213
       207
        
         # On darwin, we need unwrapped bintools as well (for otool)

     

       214
       208
        
         ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [

     

       215
       209
        
           targetPackages.stdenv.cc.bintools.bintools

     

       216
       210
        
         ];

     

       217
       211
        
       

     

       218
       212
        
       in

     

       213
       213
       +
       

     

       214
       214
       +
       assert import ./common-have-ncg.nix { inherit lib stdenv version; };

     

       219
       215
        
       

     

       220
       216
        
       stdenv.mkDerivation {

     

       221
       217
        
         inherit version;

     
···

       470
       466
        
           targetPrefix = "";

     

       471
       467
        
           enableShared = true;

     

       472
       468
        
       

     

       473
       473
       -
           inherit llvmPackages;

     

       469
       469
       +
           llvmPackages = null;

     

       474
       470
        
       

     

       475
       471
        
           # Our Cabal compiler name

     

       476
       472
        
           haskellCompilerName = "ghc-${version}";

+3 -7

pkgs/development/compilers/ghc/9.6.3-binary.nix

···

       10
       10
        
         libiconv,

     

       11
       11
        
         numactl,

     

       12
       12
        
         libffi,

     

       13
       13
       -
         llvmPackages,

     

       14
       13
        
         coreutils,

     

       15
       14
        
         targetPackages,

     

       16
       15
        
       

     
···

       192
       191
        
             ) binDistUsed.archSpecificLibraries

     

       193
       192
        
           )).nixPackage;

     

       194
       193
        
       

     

       195
       195
       -
         useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; });

     

       196
       196
       -
       

     

       197
       194
        
         libPath = lib.makeLibraryPath (

     

       198
       195
        
           # Add arch-specific libraries.

     

       199
       196
        
           map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries

     
···

       206
       203
        
           targetPackages.stdenv.cc.bintools

     

       207
       204
        
           coreutils # for cat

     

       208
       205
        
         ]

     

       209
       209
       -
         ++ lib.optionals useLLVM [

     

       210
       210
       -
           (lib.getBin llvmPackages.llvm)

     

       211
       211
       -
         ]

     

       212
       206
        
         # On darwin, we need unwrapped bintools as well (for otool)

     

       213
       207
        
         ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [

     

       214
       208
        
           targetPackages.stdenv.cc.bintools.bintools

     

       215
       209
        
         ];

     

       216
       210
        
       

     

       217
       211
        
       in

     

       212
       212
       +
       

     

       213
       213
       +
       assert import ./common-have-ncg.nix { inherit lib stdenv version; };

     

       218
       214
        
       

     

       219
       215
        
       stdenv.mkDerivation {

     

       220
       216
        
         inherit version;

     
···

       449
       445
        
           targetPrefix = "";

     

       450
       446
        
           enableShared = true;

     

       451
       447
        
       

     

       452
       452
       -
           inherit llvmPackages;

     

       448
       448
       +
           llvmPackages = null;

     

       453
       449
        
       

     

       454
       450
        
           # Our Cabal compiler name

     

       455
       451
        
           haskellCompilerName = "ghc-${version}";

+3 -7

pkgs/development/compilers/ghc/9.8.4-binary.nix

···

       9
       9
        
         libiconv,

     

       10
       10
        
         numactl,

     

       11
       11
        
         libffi,

     

       12
       12
       -
         llvmPackages,

     

       13
       12
        
         coreutils,

     

       14
       13
        
         targetPackages,

     

       15
       14
        
       

     
···

       206
       205
        
             ) binDistUsed.archSpecificLibraries

     

       207
       206
        
           )).nixPackage;

     

       208
       207
        
       

     

       209
       209
       -
         useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; });

     

       210
       210
       -
       

     

       211
       208
        
         libPath = lib.makeLibraryPath (

     

       212
       209
        
           # Add arch-specific libraries.

     

       213
       210
        
           map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries

     
···

       220
       217
        
           targetPackages.stdenv.cc.bintools

     

       221
       218
        
           coreutils # for cat

     

       222
       219
        
         ]

     

       223
       223
       -
         ++ lib.optionals useLLVM [

     

       224
       224
       -
           (lib.getBin llvmPackages.llvm)

     

       225
       225
       -
         ]

     

       226
       220
        
         # On darwin, we need unwrapped bintools as well (for otool)

     

       227
       221
        
         ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [

     

       228
       222
        
           targetPackages.stdenv.cc.bintools.bintools

     

       229
       223
        
         ];

     

       230
       224
        
       

     

       231
       225
        
       in

     

       226
       226
       +
       

     

       227
       227
       +
       assert import ./common-have-ncg.nix { inherit lib stdenv version; };

     

       232
       228
        
       

     

       233
       229
        
       stdenv.mkDerivation {

     

       234
       230
        
         inherit version;

     
···

       464
       460
        
           targetPrefix = "";

     

       465
       461
        
           enableShared = true;

     

       466
       462
        
       

     

       467
       467
       -
           inherit llvmPackages;

     

       463
       463
       +
           llvmPackages = null;

     

       468
       464
        
       

     

       469
       465
        
           # Our Cabal compiler name

     

       470
       466
        
           haskellCompilerName = "ghc-${version}";

+80

pkgs/development/compilers/ghc/subopt.bash

···

       1
       1
       +
       #!@shell@

     

       2
       2
       +
       

     

       3
       3
       +
       # This script wraps the LLVM `opt(1)` executable and maps the options

     

       4
       4
       +
       # passed by old versions of GHC to the equivalents passed by newer

     

       5
       5
       +
       # versions that support recent versions of LLVM.

     

       6
       6
       +
       #

     

       7
       7
       +
       # It achieves the same effect as the following GHC change externally:

     

       8
       8
       +
       # <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8999>.

     

       9
       9
       +
       #

     

       10
       10
       +
       # This is used solely for bootstrapping newer GHCs from the GHC 9.0.2

     

       11
       11
       +
       # binary on AArch64, as that is the only architecture supported by that

     

       12
       12
       +
       # binary distribution that requires LLVM, and our later binary packages

     

       13
       13
       +
       # all use the native code generator for all supported platforms.

     

       14
       14
       +
       #

     

       15
       15
       +
       # No attempt is made to support custom LLVM optimization flags, or the

     

       16
       16
       +
       # undocumented flag to disable TBAA, or avoid

     

       17
       17
       +
       # <https://gitlab.haskell.org/ghc/ghc/-/issues/23870>, as these are not

     

       18
       18
       +
       # required to bootstrap GHC and at worst will produce an error message.

     

       19
       19
       +
       #

     

       20
       20
       +
       # It is called `subopt` to reflect the fact that it uses `opt(1)` as a

     

       21
       21
       +
       # subprocess, and the fact that the GHC build system situation

     

       22
       22
       +
       # requiring this hack is suboptimal.

     

       23
       23
       +
       

     

       24
       24
       +
       set -e

     

       25
       25
       +
       

     

       26
       26
       +
       expect() {

     

       27
       27
       +
         if [[ $1 != $2 ]]; then

     

       28
       28
       +
           printf >&2 'subopt: got %q; expected %q\n' "$1" "$2"

     

       29
       29
       +
           return 2

     

       30
       30
       +
         fi

     

       31
       31
       +
       }

     

       32
       32
       +
       

     

       33
       33
       +
       if [[ $NIX_DEBUG -ge 1 ]]; then

     

       34
       34
       +
         printf >&2 'subopt: before:'

     

       35
       35
       +
         printf >&2 ' %q' "$@"

     

       36
       36
       +
         printf >&2 '\n'

     

       37
       37
       +
       fi

     

       38
       38
       +
       

     

       39
       39
       +
       args=()

     

       40
       40
       +
       

     

       41
       41
       +
       while [[ $# -gt 0 ]]; do

     

       42
       42
       +
         case "$1" in

     

       43
       43
       +
           -enable-new-pm=0)

     

       44
       44
       +
             shift 1

     

       45
       45
       +
             ;;

     

       46
       46
       +
           -mem2reg)

     

       47
       47
       +
             expect "$2" -globalopt

     

       48
       48
       +
             expect "$3" -lower-expect

     

       49
       49
       +
             expect "$4" -enable-tbaa

     

       50
       50
       +
             expect "$5" -tbaa

     

       51
       51
       +
             args+=('-passes=function(require<tbaa>),function(mem2reg),globalopt,function(lower-expect)')

     

       52
       52
       +
             shift 5

     

       53
       53
       +
             ;;

     

       54
       54
       +
           -O1)

     

       55
       55
       +
             expect "$2" -globalopt

     

       56
       56
       +
             expect "$3" -enable-tbaa

     

       57
       57
       +
             expect "$4" -tbaa

     

       58
       58
       +
             args+=('-passes=default<O1>')

     

       59
       59
       +
             shift 4

     

       60
       60
       +
             ;;

     

       61
       61
       +
           -O2)

     

       62
       62
       +
             expect "$2" -enable-tbaa

     

       63
       63
       +
             expect "$3" -tbaa

     

       64
       64
       +
             args+=('-passes=default<O2>')

     

       65
       65
       +
             shift 3

     

       66
       66
       +
             ;;

     

       67
       67
       +
           *)

     

       68
       68
       +
             args+=("$1")

     

       69
       69
       +
             shift 1

     

       70
       70
       +
             ;;

     

       71
       71
       +
         esac

     

       72
       72
       +
       done

     

       73
       73
       +
       

     

       74
       74
       +
       if [[ $NIX_DEBUG -ge 1 ]]; then

     

       75
       75
       +
         printf >&2 'subopt: after:'

     

       76
       76
       +
         printf >&2 ' %q' "${args[@]}"

     

       77
       77
       +
         printf >&2 '\n'

     

       78
       78
       +
       fi

     

       79
       79
       +
       

     

       80
       80
       +
       exec @opt@ "${args[@]}"

+5 -10

pkgs/top-level/haskell-packages.nix

···

       70
       70
        
             bb = pkgsBuildBuild.haskell;

     

       71
       71
        
           in

     

       72
       72
        
           {

     

       73
       73
       +
             # Required to bootstrap 9.4.8.

     

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

     

       74
       74
       -
               llvmPackages = pkgs.llvmPackages_12;

     

       75
       75
       +
               llvmPackages = pkgs.llvmPackages_20;

     

       75
       76
        
             };

     

       76
       77
        
       

     

       77
       77
       -
             ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix {

     

       78
       78
       -
               llvmPackages = pkgs.llvmPackages_12;

     

       79
       79
       -
             };

     

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

     

       80
       79
        
       

     

       81
       81
       -
             ghc963Binary = callPackage ../development/compilers/ghc/9.6.3-binary.nix {

     

       82
       82
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       83
       83
       -
             };

     

       80
       80
       +
             ghc963Binary = callPackage ../development/compilers/ghc/9.6.3-binary.nix { };

     

       84
       81
        
       

     

       85
       85
       -
             ghc984Binary = callPackage ../development/compilers/ghc/9.8.4-binary.nix {

     

       86
       86
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       87
       87
       -
             };

     

       82
       82
       +
             ghc984Binary = callPackage ../development/compilers/ghc/9.8.4-binary.nix { };

     

       88
       83
        
       

     

       89
       84
        
             ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix {

     

       90
       85
        
               bootPkgs =