From fca19d72bcd49e351ab13180a9a7f1fa97b7c329 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 12 Sep 2025 13:30:06 +0200 Subject: [PATCH] tests.haskell.shellFor: use srcOnly to extract pkgs This ensures patches and Hackage revisions are applied to the base tarball which may be necessary in order for the packages to build in the shell environment. --- pkgs/test/haskell/shellFor/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index e91649233c91..c6dda7e16962 100644 --- a/pkgs/test/haskell/shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -1,6 +1,7 @@ { lib, writeText, + srcOnly, haskellPackages, cabal-install, }: @@ -20,9 +21,9 @@ sourceRoot=$(pwd)/scratch mkdir -p "$sourceRoot" cd "$sourceRoot" - tar -xf ${haskellPackages.constraints.src} - tar -xf ${haskellPackages.cereal.src} - cp ${writeText "cabal.project" "packages: constraints* cereal*"} cabal.project + cp -r "${srcOnly haskellPackages.constraints}" constraints + cp -r "${srcOnly haskellPackages.cereal}" cereal + cp ${writeText "cabal.project" "packages: constraints cereal"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d)