From d2932ad0bec5aa30ea088206ff3e04541b751a88 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Apr 2023 16:26:57 +0200 Subject: [PATCH] Revert "Filter tests/nixos from source" This reverts commit 80f9231b69916100f622008f490ec6813fcd994b because it causes a divergence in the source tree used for the Nix build between hydra.nixos.org and Nix. --- flake.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 58376760b..71f62704a 100644 --- a/flake.nix +++ b/flake.nix @@ -320,18 +320,12 @@ }; let canRunInstalled = currentStdenv.buildPlatform.canExecute currentStdenv.hostPlatform; - - sourceByRegexInverted = rxs: origSrc: final.lib.cleanSourceWith { - filter = (path: type: - let relPath = final.lib.removePrefix (toString origSrc + "/") (toString path); - in ! lib.any (re: builtins.match re relPath != null) rxs); - src = origSrc; - }; in currentStdenv.mkDerivation (finalAttrs: { name = "nix-${version}"; inherit version; - src = sourceByRegexInverted [ "tests/nixos/.*" "tests/installer/.*" ] self; + src = self; + VERSION_SUFFIX = versionSuffix; outputs = [ "out" "dev" "doc" ];