commit 921f5db2989cb95dc5b24bb75fb74f7b7f54e535 · pyrox.dev/nixpkgs

-2

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

···

       13
       13
        
       

     

       14
       14
        
       self: super: {

     

       15
       15
        
       

     

       16
       16
       -
         llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

     

       17
       17
       -
       

     

       18
       16
        
         # Disable GHC 9.0.x core libraries.

     

       19
       17
        
         array = null;

     

       20
       18
        
         base = null;

-2

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

···

       16
       16
        
       in

     

       17
       17
        
       

     

       18
       18
        
       {

     

       19
       19
       -
         llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

     

       20
       20
       -
       

     

       21
       19
        
         # Disable GHC core libraries

     

       22
       20
        
         array = null;

     

       23
       21
        
         base = null;

-2

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

···

       16
       16
        
       with haskellLib;

     

       17
       17
        
       

     

       18
       18
        
       {

     

       19
       19
       -
         llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

     

       20
       20
       -
       

     

       21
       19
        
         # Disable GHC core libraries

     

       22
       20
        
         array = null;

     

       23
       21
        
         base = null;

-2

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

···

       6
       6
        
       in

     

       7
       7
        
       

     

       8
       8
        
       self: super: {

     

       9
       9
       -
         llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

     

       10
       10
       -
       

     

       11
       9
        
         # Disable GHC core libraries

     

       12
       10
        
         array = null;

     

       13
       11
        
         base = null;

-2

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

···

       13
       13
        
       

     

       14
       14
        
       self: super: {

     

       15
       15
        
       

     

       16
       16
       -
         llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

     

       17
       17
       -
       

     

       18
       16
        
         # Disable GHC 9.2.x core libraries.

     

       19
       17
        
         array = null;

     

       20
       18
        
         base = null;

-2

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

···

       6
       6
        
       

     

       7
       7
        
       with haskellLib;

     

       8
       8
        
       self: super: {

     

       9
       9
       -
         llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

     

       10
       10
       -
       

     

       11
       9
        
         # Disable GHC core libraries.

     

       12
       10
        
         array = null;

     

       13
       11
        
         base = null;

-2

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

···

       16
       16
        
       in

     

       17
       17
        
       

     

       18
       18
        
       {

     

       19
       19
       -
         llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

     

       20
       20
       -
       

     

       21
       19
        
         # Disable GHC core libraries

     

       22
       20
        
         array = null;

     

       23
       21
        
         base = null;

-2

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

···

       18
       18
        
       

     

       19
       19
        
       {

     

       20
       20
        
       

     

       21
       21
       -
         llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

     

       22
       22
       -
       

     

       23
       21
        
         # Disable GHC core libraries.

     

       24
       22
        
         array = null;

     

       25
       23
        
         base = null;

+1 -1

pkgs/development/haskell-modules/make-package-set.nix

···

       734
       734
        
         */

     

       735
       735
        
         forceLlvmCodegenBackend = overrideCabal (drv: {

     

       736
       736
        
           configureFlags = drv.configureFlags or [ ] ++ [ "--ghc-option=-fllvm" ];

     

       737
       737
       -
           buildTools = drv.buildTools or [ ] ++ [ self.llvmPackages.llvm ];

     

       737
       737
       +
           buildTools = drv.buildTools or [ ] ++ [ self.ghc.llvmPackages.llvm ];

     

       738
       738
        
         });

     

       739
       739
        
       }

+2 -2

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

···

       44
       44
        
       #   fi

     

       45
       45
        
       

     

       46
       46
        
       let

     

       47
       47
       -
         inherit (haskellPackages) llvmPackages ghc;

     

       47
       47
       +
         inherit (haskellPackages) ghc;

     

       48
       48
        
       

     

       49
       49
        
         hoogleWithPackages' = if withHoogle then hoogleWithPackages selectPackages else null;

     

       50
       50
        
       

     
···

       71
       71
        
         # CLang is needed on Darwin for -fllvm to work:

     

       72
       72
        
         # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm

     

       73
       73
        
         llvm = lib.makeBinPath (

     

       74
       74
       -
           [ llvmPackages.llvm ] ++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang

     

       74
       74
       +
           [ ghc.llvmPackages.llvm ] ++ lib.optional stdenv.targetPlatform.isDarwin ghc.llvmPackages.clang

     

       75
       75
        
         );

     

       76
       76
        
       in

     

       77
       77