From 621a3a56ebf5db7ff21feb47b0e490de0f8a3d8a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 28 Sep 2025 16:26:23 +0200 Subject: [PATCH] haskellPackages.mkDerivation: convert any/all cabal files to unix nls In general, `pname` SHOULD be the same as the Cabal package name in Haskell updates, but things work fine without this in many cases (e.g. when only building executables), so we need to preserve this. Since Cabal only allows a single .cabal file per directory, we can just process *.cabal. --- 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 d1ef4e81e213..c4ba748515d8 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -607,7 +607,7 @@ lib.fix ( cp ${newCabalFile} ${pname}.cabal '' + lib.optionalString (!dontConvertCabalFileToUnix) '' - sed -i '${pname}.cabal' -e 's/\r$//' + sed -i -e 's/\r$//' *.cabal '' + prePatch;