From b1acf7bab9ab67a0dcb32a15119f5154bbcb2e11 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 20 Jun 2024 16:04:52 +0200 Subject: [PATCH] Revert "tests.haskell.cabalSdist.localFromCabalSdist: prevent unnecessary rebuilds" This reverts commit 81c06bc6094a3a637c90e1ad57616caf2f137a07. Reason for revert: This change breaks the `tests.haskell.cabalSdist.assumptionLocalHasDirectReference` test which relies on checking for the test source store path in the resulting derivation files. 81c06bc6094a3a637c90e1ad57616caf2f137a07 did not account for this in the change (though it should be possible). --- pkgs/test/haskell/cabalSdist/local/generated.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/test/haskell/cabalSdist/local/generated.nix b/pkgs/test/haskell/cabalSdist/local/generated.nix index f6463e762ddd..bfa299962bcb 100644 --- a/pkgs/test/haskell/cabalSdist/local/generated.nix +++ b/pkgs/test/haskell/cabalSdist/local/generated.nix @@ -3,14 +3,7 @@ mkDerivation { pname = "local"; version = "0.1.0.0"; - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./app - ./CHANGELOG.md - ./local.cabal - ]; - }; + src = ./.; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ];