From 19ddb1466e09cbac4f288c1f26a7b23584cf7447 Mon Sep 17 00:00:00 2001 From: sterni Date: Tue, 8 Nov 2022 10:04:27 +0000 Subject: revert(nix/utils): onlyDrvPath to get the drvPath w/o the outputs This reverts commit 6813598c17959862734e5878d745e7dd8a197717. Reason for revert: This function is a re-implementation of builtins.unsafeDiscardOutputDependency which I missed at the time. Change-Id: I5bb52bfd5e8d51defaf90ee795b0fe99be84f6db Reviewed-on: https://cl.tvl.fyi/c/depot/+/7265 Tested-by: BuildkiteCI Reviewed-by: tazjin --- nix/utils/tests/default.nix | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'nix/utils/tests/default.nix') diff --git a/nix/utils/tests/default.nix b/nix/utils/tests/default.nix index d5159a8433..344a1771d7 100644 --- a/nix/utils/tests/default.nix +++ b/nix/utils/tests/default.nix @@ -15,7 +15,6 @@ let isSymlink pathType storePathName - onlyDrvPath ; assertUtilsPred = msg: act: exp: [ @@ -92,19 +91,9 @@ let (storePathName cleanedSource) cleanedSource.name) ]; - - onlyDrvPathTests = it "correctly updates the string context of drvPath" [ - (assertEq "onlyDrvPath only produces path dependencies" - (builtins.all - (dep: dep.path or false) - (builtins.attrValues - (builtins.getContext (onlyDrvPath depot.tools.cheddar)))) - true) - ]; in runTestsuite "nix.utils" [ pathPredicates storePathNameTests - onlyDrvPathTests ] -- cgit 1.4.1