diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-10 00:10:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-10 00:10:28 +0000 |
commit | 966cf602cc24b4eb5b51aa734fc3244774c606c2 (patch) | |
tree | b93dacec564b611345c8c59a5e6de36d12c8f654 /lib | |
parent | 86e22e8560980064a8dc860e5415c4b121d94c25 (diff) | |
parent | b20f90e94001f58571067ac1c49b71d1eb73bd52 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'lib')
-rw-r--r-- | lib/attrsets.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix index a88947b458588..c0d3ede73d0e6 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -327,7 +327,7 @@ rec { isDerivation "foobar" => false */ - isDerivation = x: isAttrs x && x ? type && x.type == "derivation"; + isDerivation = x: x.type or null == "derivation"; /* Converts a store path to a fake derivation. */ toDerivation = path: |