on master help sign in
Improve how obelisk-run is made available to run cmd

* Removes redundant obelisk-run dependency on frontend * Fixes bug with workOnMulti * Fixes mobile builds

commit86b650bcfe0791aab496576cce93d5ee9261ae11 authorLuigy Leon <luigy@outlook.com> dateThu 17 May 2018, 22:36 (8 years ago) parent5fc8dde
3 files changed+4−8
default.nix+1−2 dep/reflex-platform/github.json+3−3 skeleton/frontend/frontend.cabal−3
default.nix+1−2
@@ -254,10 +254,9 @@ rec {
254254 combinedPackages = predefinedPackages // packages;
255255 projectOverrides = self: super: {
256256 ${staticName} = dontHaddock (self.callCabal2nix "static" assets.haskellManifest {});
257− frontend = if self.ghc.isGhcjs or false then super.frontend.override { obelisk-run = null; } else super.frontend;
257+ ${backendName} = addBuildDepend super.${backendName} self.obelisk-run;
258258 };
259259 totalOverrides = composeExtensions (composeExtensions defaultHaskellOverrides projectOverrides) overrides;
260− ghcDevPackages = ["obelisk-run-frontend"];
261260 in {
262261 overrides = totalOverrides;
263262 packages = combinedPackages;
dep/reflex-platform/github.json+3−3
@@ -1,7 +1,7 @@
11{
22 "owner": "reflex-frp",
33 "repo": "reflex-platform",
4− "branch": "expose-ghcjs-externs-js",
5− "rev": "0e2bf510ea89cdb916e3db91d695602ed8aa8f7b",
6− "sha256": "11yg0c6fd0cfh17n1mp64l40mb5cqr13g8190q0b66nwqswlqyx9"
4+ "branch": "project-shell-fix",
5+ "rev": "15a283f10ccba36d679907a61fd831442fa3fb55",
6+ "sha256": "154jqqmjxkxd0advwmmjimasf697p9sgizldqil1r989zz31az53"
77}
skeleton/frontend/frontend.cabal−3
@@ -10,9 +10,6 @@ library
1010 , reflex-dom
1111 , static
1212 , text
13− if !impl(ghcjs)
14− build-depends: obelisk-run
15−
1613 exposed-modules:
1714 Frontend
1815 ghc-options: -Wall