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.

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

Disable nix on windows (#3600) #3833

Merged
merged 3 commits into from
Feb 1, 2018
Merged

Disable nix on windows (#3600) #3833

merged 3 commits into from
Feb 1, 2018

Conversation

mgsloan
Copy link
Contributor

@mgsloan mgsloan commented Jan 31, 2018

  • Any changes that could be relevant to users have been recorded in the ChangeLog.md
  • The documentation has been updated, if necessary.

This change is untested because I do not have convenient access to a windows box. However, the change is trivial, it should work fine.

@mgsloan mgsloan requested a review from snoyberg January 31, 2018 22:36
@mgsloan mgsloan force-pushed the disable-nix-on-windows-3600 branch 2 times, most recently from e0fab20 to 5f3e232 Compare February 1, 2018 02:13
@@ -32,6 +34,12 @@ nixOptsFromMonoid NixOptsMonoid{..} os = do
nixShellOptions = fromFirst [] nixMonoidShellOptions
++ prefixAll (T.pack "-I") (fromFirst [] nixMonoidPath)
nixAddGCRoots = fromFirst False nixMonoidAddGCRoots
nixEnable <-
if nixEnable0 && osIsWindows
Copy link
Contributor

Choose a reason for hiding this comment

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

I can't say exactly what strikes me about this, but I find this code particularly elegant.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks! :)

@mgsloan mgsloan merged commit 479cbde into master Feb 1, 2018
@mihaimaruseac mihaimaruseac deleted the disable-nix-on-windows-3600 branch July 30, 2018 03:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants