From d9757d4fe3a38b642e800bc4caca1288a8fdec86 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 28 Sep 2025 16:30:38 +0200 Subject: [PATCH] haskellPackages.mkDerivation: jailbreak any/all cabal files Since Cabal only allows a single cabal file per directory, we can just jailbreak *.cabal which works even if the user doesn't have set pname to match the cabal file name (which they SHOULD do, though). The only remaining reference to ${pname}.cabal in the revision handling code is fine since we know the proper name of the cabal file from Hackage in that case. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index c4ba748515d8..31634958f546 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -614,7 +614,7 @@ lib.fix ( postPatch = optionalString jailbreak '' echo "Run jailbreak-cabal to lift version restrictions on build inputs." - ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal + ${jailbreak-cabal}/bin/jailbreak-cabal *.cabal '' + postPatch;