diff --git a/pkgs/development/compilers/ghc/9.10.2.nix b/pkgs/development/compilers/ghc/9.10.2.nix deleted file mode 100644 index 96e251654429..000000000000 --- a/pkgs/development/compilers/ghc/9.10.2.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix { - version = "9.10.2"; - sha256 = "55fd40a005575ac6b33ea928beda81e8c56ffea354b6ac474ee9f9911f23a8de"; -} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 8f2541bea009..482c2a630c4e 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -304,7 +304,7 @@ ] # Unreleased or still in-progress upstream cross fixes - ++ lib.optionals (lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.15") [ + ++ lib.optionals (lib.versionAtLeast version "9.10" && lib.versionOlder version "9.15") [ # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13919 (fetchpatch { name = "include-modern-utimbuf.patch"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a5adeb6cab59..ad82a4609e4f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -144,23 +144,6 @@ in inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; - ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix { - bootPkgs = - if - stdenv.buildPlatform.isPower64 - && stdenv.buildPlatform.isBigEndian - && pkgs.stdenv.hostPlatform.isAbiElfv1 - then - # No bindist, "borrowing" the GHC from Debian - bb.packages.ghc966DebianBinary - else if stdenv.buildPlatform.isi686 then - bb.packages.ghc967 - else - bb.packages.ghc984Binary; - inherit (buildPackages.python3Packages) sphinx; - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - inherit buildTargetLlvmPackages llvmPackages; - }; ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix { bootPkgs = if @@ -295,11 +278,6 @@ in ghc = bh.compiler.ghc984; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; }; - ghc9102 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc9102; - ghc = bh.compiler.ghc9102; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { }; - }; ghc9103 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc9103; ghc = bh.compiler.ghc9103;