From 5ebeca32d419ecfa76324cc3f254751d2d0ec0e5 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:02:53 +0200 Subject: [PATCH] haskell.compiler.ghc947: drop Latest 9.4.x minor release is 9.4.8, which is also in Stackage 21.25. Thus, dropping according to the GHC Deprecation Policy. (cherry picked from commit a24e99ea74e19eed447af06037fd499fd4a4c122) --- pkgs/development/compilers/ghc/9.4.7.nix | 6 ------ pkgs/top-level/haskell-packages.nix | 24 ------------------------ pkgs/top-level/release-haskell.nix | 2 -- 3 files changed, 32 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.4.7.nix diff --git a/pkgs/development/compilers/ghc/9.4.7.nix b/pkgs/development/compilers/ghc/9.4.7.nix deleted file mode 100644 index 2be8c9f092fb..000000000000 --- a/pkgs/development/compilers/ghc/9.4.7.nix +++ /dev/null @@ -1,6 +0,0 @@ -# DO NOT port this expression to hadrian. It is not possible to build a GHC -# cross compiler with 9.4.* and hadrian. -import ./common-make-native-bignum.nix { - version = "9.4.7"; - sha256 = "06775a52b4d13ac09edc6dabc299fd11e59d8886bbcae450af367baee2684c8f"; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 38a85aa064f1..0193d81cca4c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -158,25 +158,6 @@ in llvmPackages = pkgs.llvmPackages_12; }; ghc92 = compiler.ghc928; - ghc947 = callPackage ../development/compilers/ghc/9.4.7.nix { - bootPkgs = - # Building with 9.2 is broken due to - # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - - # No suitable bindists for powerpc64le - if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc902 - else - bb.packages.ghc902Binary; - 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 && < 14 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; - llvmPackages = pkgs.llvmPackages_12; - }; ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix { bootPkgs = # Building with 9.2 is broken due to @@ -561,11 +542,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; ghc92 = packages.ghc928; - ghc947 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc947; - ghc = bh.compiler.ghc947; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; - }; ghc948 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc948; ghc = bh.compiler.ghc948; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 13d5f02fbae6..de24217db4c4 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -66,7 +66,6 @@ let ghc8107 ghc902 ghc928 - ghc947 ghc948 ghc963 ghc964 @@ -590,7 +589,6 @@ let compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc928 - compilerNames.ghc947 compilerNames.ghc948 ] released; Cabal_3_10_3_0 = lib.subtractLists [