diff options
Diffstat (limited to 'nix/utils')
-rw-r--r-- | nix/utils/default.nix | 16 | ||||
-rw-r--r-- | nix/utils/tests/default.nix | 11 |
2 files changed, 0 insertions, 27 deletions
diff --git a/nix/utils/default.nix b/nix/utils/default.nix index a29f346519b8..0c6c88fafd5a 100644 --- a/nix/utils/default.nix +++ b/nix/utils/default.nix @@ -43,21 +43,6 @@ let else builtins.throw "Don't know how to get (base)name of " + lib.generators.toPretty { } p; - /* Retrieves the drvPath attribute from a given derivation, but ensures that - the resulting string only depends on the `.drv` file in the nix store and - not on its realised outputs as well. - - Type: drv -> string - */ - onlyDrvPath = drv: - let - inherit (drv) drvPath; - unsafeDrvPath = builtins.unsafeDiscardStringContext drvPath; - in - builtins.appendContext unsafeDrvPath { - ${unsafeDrvPath} = { path = true; }; - }; - /* Query the type of a path exposing the same information as would be by `builtins.readDir`, but for a single, specific target path. @@ -167,7 +152,6 @@ in { inherit storePathName - onlyDrvPath pathType isDirectory isRegularFile diff --git a/nix/utils/tests/default.nix b/nix/utils/tests/default.nix index d5159a8433b4..344a1771d7d9 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 ] |