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

Add --no-interpret hint to ob shell #784

Merged
merged 6 commits into from
May 11, 2022
Merged

Add --no-interpret hint to ob shell #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7850207
Add hint to use --no-interpret with ob shell
tomsmalley Jul 10, 2020
832fc38
Always display ob shell hint
tomsmalley Jul 10, 2020
fd0ae3c
Merge branch 'develop' into ts-ob-shell-hint
ali-abrar Feb 3, 2021
7048967
Merge remote-tracking branch 'origin/develop' into ts-ob-shell-hint
augyg May 5, 2022
534858c
mentioned --no-interpret hint in ChangeLog.md
augyg May 10, 2022
c580e6b
Merge branch 'develop' into ts-ob-shell-hint
madeline-os May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ This project's release branch is `master`. This log is written from the perspect

* nixpkgs-overlays
* Remove override of acme module that pinned it to the version in nixpkgs-20.03. This is used for automatic https certificate provisioning.
* Add routeLinkAttr to Obelisk.Route.Frontend
* CLI
* [#784](https://github.com/obsidiansystems/obelisk/pull/784): hint for users to take advantage of ob shell --no-interpret option for thunks
* obelisk-route
* [#915](https://github.com/obsidiansystems/obelisk/pull/915): Add routeLinkAttr to Obelisk.Route.Frontend. This allows the creation of route links with additional, user-specified attributes.

## v1.0.0.0 - 2022-01-04

Expand Down
3 changes: 2 additions & 1 deletion lib/command/src/Obelisk/Command.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,8 @@ ob = \case
thunks = _thunkOption_thunks to
ObCommand_Repl interpretPathsList -> withInterpretPaths interpretPathsList runRepl
ObCommand_Watch interpretPathsList -> withInterpretPaths interpretPathsList runWatch
ObCommand_Shell (ShellOpts shellAttr interpretPathsList cmd) -> withInterpretPaths interpretPathsList $ \root interpretPaths ->
ObCommand_Shell (ShellOpts shellAttr interpretPathsList cmd) -> withInterpretPaths interpretPathsList $ \root interpretPaths -> do
putLog Notice "Hint: use '--no-interpret path/to/dependency' to force building an unpacked dependency and include it in this shell."
nixShellForInterpretPaths False shellAttr root interpretPaths cmd -- N.B. We do NOT bash escape here; we want to run the command as-is
ObCommand_Doc shellAttr pkgs -> withInterpretPaths [] $ \root interpretPaths ->
nixShellForInterpretPaths True shellAttr root interpretPaths $ Just $ haddockCommand pkgs
Expand Down