From ef2d9b7ffad0facb5e39278f538b050e357c2086 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:06:43 +0200 Subject: [PATCH] haskell.compiler.ghc965: drop Latest 9.6.x minor release is 9.6.7, which is also in Stackage 22.44. Thus, dropping according to the GHC Deprecation Policy. --- pkgs/development/compilers/ghc/9.6.5.nix | 4 ---- pkgs/top-level/haskell-packages.nix | 23 ----------------------- pkgs/top-level/release-haskell.nix | 1 - 3 files changed, 28 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.6.5.nix diff --git a/pkgs/development/compilers/ghc/9.6.5.nix b/pkgs/development/compilers/ghc/9.6.5.nix deleted file mode 100644 index 0f1ac5022f8b..000000000000 --- a/pkgs/development/compilers/ghc/9.6.5.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix { - version = "9.6.5"; - sha256 = "87b389924f98c1a26c205122757338c8dab33ad1fcf670faa22622742432b93c"; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8deef7d3ad70..f5c2508b4d66 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -198,24 +198,6 @@ in buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc965 = callPackage ../development/compilers/ghc/9.6.5.nix { - bootPkgs = - # For GHC 9.2 no armv7l bindists are available. - if stdenv.buildPlatform.isAarch32 then - bb.packages.ghc928 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc928 - else - bb.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 >= 11 && < 16 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; - llvmPackages = pkgs.llvmPackages_15; - }; ghc966 = callPackage ../development/compilers/ghc/9.6.6.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -537,11 +519,6 @@ in ghc = bh.compiler.ghc963; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc965 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc965; - ghc = bh.compiler.ghc965; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; - }; ghc966 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc966; ghc = bh.compiler.ghc966; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 05e6006e56c8..8e9a5f788d72 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -68,7 +68,6 @@ let ghc928 ghc948 ghc963 - ghc965 ghc966 ghc967 ghc981