diff --git a/pkgs/development/compilers/ghc/9.6.1.nix b/pkgs/development/compilers/ghc/9.6.1.nix deleted file mode 100644 index 7e8622f218c..00000000000 --- a/pkgs/development/compilers/ghc/9.6.1.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix rec { - version = "9.6.1"; - sha256 = "fe5ac909cb8bb087e235de97fa63aff47a8ae650efaa37a2140f4780e21f34cb"; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6001039689c..32e1c346a97 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -28,7 +28,6 @@ let "ghc945" "ghc94" "ghc96" - "ghc961" "ghc962" "ghcHEAD" ]; @@ -48,7 +47,6 @@ let "ghc944" "ghc945" "ghc96" - "ghc961" "ghc962" "ghcHEAD" ]; @@ -350,26 +348,6 @@ in { llvmPackages = pkgs.llvmPackages_12; }; ghc94 = ghc945; - ghc961 = callPackage ../development/compilers/ghc/9.6.1.nix { - bootPkgs = - # For GHC 9.2 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc924 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc924 - else if stdenv.isAarch64 then - packages.ghc924BinaryMinimal - else - packages.ghc924Binary; - 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 >= 10 && < 15 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14; - llvmPackages = pkgs.llvmPackages_14; - }; ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -553,11 +531,6 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; ghc94 = ghc945; - ghc961 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc961; - ghc = bh.compiler.ghc961; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; - }; ghc962 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc962; ghc = bh.compiler.ghc962; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 09087a3c73e..6113dcdb121 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -69,7 +69,6 @@ let ghc927 ghc928 ghc945 - ghc961 ghc962 ]; @@ -487,15 +486,12 @@ let Cabal_3_10_1_0 = released; Cabal-syntax_3_10_1_0 = released; cabal2nix = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; cabal2nix-unstable = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; funcmp = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; haskell-language-server = lib.subtractLists [ @@ -503,21 +499,17 @@ let compilerNames.ghc884 ] released; hoogle = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; hlint = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; hpack = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; hsdns = released; jailbreak-cabal = released; language-nix = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; nix-paths = released;