Commit 787c1deb authored by sternenseemann's avatar sternenseemann
Browse files

haskell.compiler.ghc98: 9.8.2 -> 9.8.3

parent 7453f4ab
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
import ./common-hadrian.nix rec {
  version = "9.8.3";
  sha256 = "99e40d729ec8831a633b75fd85d65dd10e31a0133dec9d198d686a273679ab70";
}
+25 −2
Original line number Diff line number Diff line
@@ -382,7 +382,25 @@ in {
      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
      llvmPackages = pkgs.llvmPackages_15;
    };
    ghc98 = compiler.ghc982;
    ghc983 = callPackage ../development/compilers/ghc/9.8.3.nix {
      bootPkgs =
        # For GHC 9.6 no armv7l bindists are available.
        if stdenv.buildPlatform.isAarch32 then
          bb.packages.ghc963
        else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then
          bb.packages.ghc963
        else
          bb.packages.ghc963Binary;
      inherit (buildPackages.python3Packages) sphinx;
      # Need to use apple's patched xattr until
      # https://github.com/xattr/xattr/issues/44 and
      # https://github.com/xattr/xattr/issues/55 are solved.
      inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
      # Support range >= 11 && < 16
      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
      llvmPackages = pkgs.llvmPackages_15;
    };
    ghc98 = compiler.ghc983;
    ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix {
      bootPkgs =
        # For GHC 9.6 no armv7l bindists are available.
@@ -571,7 +589,12 @@ in {
      ghc = bh.compiler.ghc982;
      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
    };
    ghc98 = packages.ghc982;
    ghc983 = callPackage ../development/haskell-modules {
      buildHaskellPackages = bh.packages.ghc983;
      ghc = bh.compiler.ghc983;
      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
    };
    ghc98 = packages.ghc983;
    ghc9101 = callPackage ../development/haskell-modules {
      buildHaskellPackages = bh.packages.ghc9101;
      ghc = bh.compiler.ghc9101;
+4 −3
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ let
    ghc966
    ghc981
    ghc982
    ghc983
    ghc9101
  ];

@@ -464,8 +465,8 @@ let
              ;
            };

            haskell.packages.native-bignum.ghc982 = {
              inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc982)
            haskell.packages.native-bignum.ghc983 = {
              inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc983)
                hello
                random
                QuickCheck
@@ -723,7 +724,7 @@ let
        constituents = accumulateDerivations [
          jobs.pkgsStatic.haskell.packages.native-bignum.ghc948 # non-hadrian
          jobs.pkgsStatic.haskellPackages
          jobs.pkgsStatic.haskell.packages.native-bignum.ghc982
          jobs.pkgsStatic.haskell.packages.native-bignum.ghc983
        ];
      };
    }