Merge remote-tracking branch 'origin/qa' into ls-selftest-ux-improvement
commit5b645da47b5a5feba62f4722362099af3c4ce317
authorElliot Cameron <eacameron@gmail.com>
dateThu 30 Jan 2020, 17:34 (7 years ago)
parente0c4860256428d
ChangeLog.md+1−1
@@ -5,7 +5,7 @@ This project's release branch is `master`. This log is written from the perspect
55## Unreleased
66
77* Add `Obelisk.Route.(?/)`, a convenience function for constructing routes nested in `Maybe`. ([#457](https://github.com/obsidiansystems/obelisk/pull/457))
8−* Add local packages from the Nix `project { packages }` option to the GHCi config, so that they are auto-reloaded with `ob run`. ([#489](https://github.com/obsidiansystems/obelisk/pull/489))
8+* Add local unpacked packages to the `ob run` and `ob repl` sessions. Any `.cabal` or hpack package inside the current obelisk project will be loaded into the session. For `ob run` this means the test server will automatically reload when you save a source file in any of those packages. For `ob repl` it means that `:r` will reload changes to any of those packages. There are some edge cases where this integration is still rough. Report any issues you encounter. ([#489](https://github.com/obsidiansystems/obelisk/pull/489))
99
1010## v0.4.0.0 - 2020-01-10
1111
default.nix+1−1
@@ -325,7 +325,7 @@ in rec {
325325 } // self.userSettings.ios;
326326 };
327327
328− shells-ghc = builtins.attrNames self.shellPackages;
328+ shells-ghc = builtins.attrNames (self.predefinedPackages // self.shellPackages);
329329
330330 shells-ghcjs = [
331331 self.frontendName