From cb7163d8f334bbf39e37bfaf14f5473dc79833f8 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 21 Nov 2025 19:14:23 +0100 Subject: [PATCH] haskellPackages.cabalSdist: remove ghc workaround The workaround added in https://github.com/NixOS/nixpkgs/pull/187726 for https://github.com/haskell/cabal/issues/8352 is no longer needed. cabal-install 3.8.1.0 introduced a regression where `cabal sdist` required GHC to be in PATH. This was fixed in cabal-install 3.10.1.0 (https://github.com/haskell/cabal/pull/8358), and nixpkgs now uses cabal-install 3.16.0.0. tests.haskell.cabalSdist passes. --- pkgs/development/haskell-modules/make-package-set.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 01d434a658ae..36d0fe878970 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -674,10 +674,6 @@ package-set { inherit pkgs lib callPackage; } self inherit src; nativeBuildInputs = [ buildHaskellPackages.cabal-install - - # TODO after https://github.com/haskell/cabal/issues/8352 - # remove ghc - self.ghc ]; dontUnpack = false; }