Merge pull request #247949 from sternenseemann/ghc-9.4.6

haskellPackages.ghc: 9.4.5 -> 9.4.6
This commit is contained in:
maralorn 2023-08-08 16:49:59 +02:00 committed by GitHub
commit d0cdaabcf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -331,7 +331,7 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12;
}; };
ghc94 = compiler.ghc945; ghc94 = compiler.ghc946;
ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix { ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix {
bootPkgs = bootPkgs =
# For GHC 9.2 no armv7l bindists are available. # For GHC 9.2 no armv7l bindists are available.
@ -497,7 +497,7 @@ in {
ghc = bh.compiler.ghc946; ghc = bh.compiler.ghc946;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
}; };
ghc94 = packages.ghc945; ghc94 = packages.ghc946;
ghc962 = callPackage ../development/haskell-modules { ghc962 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc962; buildHaskellPackages = bh.packages.ghc962;
ghc = bh.compiler.ghc962; ghc = bh.compiler.ghc962;