about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2024-06-20 16:04:52 +0200
committersternenseemann <sternenseemann@systemli.org>2024-06-21 18:06:15 +0200
commitb1acf7bab9ab67a0dcb32a15119f5154bbcb2e11 (patch)
treecc5fc65baba0e6ec8b2fe6bae25a405d3aa10d56
parentd6ebba3ab8a6667f4465223266717747cfc19d64 (diff)
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).
-rw-r--r--pkgs/test/haskell/cabalSdist/local/generated.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/test/haskell/cabalSdist/local/generated.nix b/pkgs/test/haskell/cabalSdist/local/generated.nix
index f6463e762dddc..bfa299962bcb4 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 ];