Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement top-level __findFile. #319

Merged
merged 2 commits into from
May 21, 2018
Merged

Implement top-level __findFile. #319

merged 2 commits into from
May 21, 2018

Conversation

drets
Copy link
Contributor

@drets drets commented May 20, 2018

Fixes #248.

@drets drets force-pushed the findFile branch 2 times, most recently from 991d8e5 to 3c8c90e Compare May 20, 2018 22:28
jwiegley
jwiegley approved these changes May 21, 2018
View reviewed changes
src/Nix/Builtins.hs
@@ -325,7 +326,7 @@ unsafeGetAttrPos x y = x >>= \x' -> y >>= \y' -> case (x', y') of
(NVStr key _, NVSet _ apos) -> case M.lookup key apos of
Nothing -> pure $ nvConstant NNull
Just delta -> toValue delta
(x, y) -> throwError $ ErrorCall $ "Invalid types for builtin.unsafeGetAttrPos: "
(x, y) -> throwError $ ErrorCall $ "Invalid types for builtins.unsafeGetAttrPos: "
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A man after my own heart. :)

@jwiegley jwiegley merged commit 2828d32 into haskell-nix:master May 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwiegley jwiegley jwiegley approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@drets @jwiegley