Defer to reflex-platform overrides; Fixes for mobile exe-config

default.nix

@@ -32,24 +32,13 @@ let
       # Fix misc upstream packages
       (self: super: let
         pkgs = self.callPackage ({ pkgs }: pkgs) {};
-        universeRepo = hackGet ./dep/universe;
       in {
         hnix = pkgs.haskell.lib.dontCheck (self.callCabal2nix "hnix" (pkgs.fetchFromGitHub {
           owner = "haskell-nix";
           repo = "hnix";
           rev = "42afdc21da5d9e076eab57eaa42bfdde938192b8";
           sha256 = "0psw384dx9bw2dp93xrzw8rd9amvcwgzn64jzzwby7sfspj6k349";
         }) {});
-        universe = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe" {};
-        universe-base = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-base" {};
-        universe-dependent-sum = pkgs.haskell.lib.doJailbreak (self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-dependent-sum" {});
-        universe-instances-extended = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-instances-extended" {};
-        universe-reverse-instances = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-reverse-instances" {};
-        universe-instances-base = self.callCabal2nixWithOptions "universe" universeRepo "--subpath deprecated/universe-instances-base" {};
-        constraints-extras = self.callCabal2nix "constraints-extras" (hackGet ./dep/constraints-extras) {};
-        dependent-map = self.callCabal2nix "dependent-map" (hackGet ./dep/dependent-map) {};
-        dependent-sum = self.callCabal2nixWithOptions "dependent-sum" (hackGet ./dep/dependent-sum) "--subpath dependent-sum" {};
-        dependent-sum-template = self.callCabal2nixWithOptions "dependent-sum-template" (hackGet ./dep/dependent-sum) "--subpath dependent-sum-template" {};
       })
 
       pkgs.obeliskExecutableConfig.haskellOverlay

dep/reflex-platform/github.json

@@ -2,6 +2,6 @@
   "owner": "reflex-frp",
   "repo": "reflex-platform",
   "branch": "cg-bump-reflex-dom",
-  "rev": "bb1de76a4ec855b6d8147acc4abc47a470ccd84a",
-  "sha256": "1insdz8m5a5dswflpcxn7hch1wvbxm58fzrbl41ifj66zqg7c34c"
+  "rev": "7ecb4c255bb053a7a4796ffd6331cdbe210de91c",
+  "sha256": "1mngxa24cfpvxxq4hgh77nw36vny4abl5wi2xmlwpkk25wzm0h0x"
 }

lib/executable-config/lookup/obelisk-executable-config-lookup.cabal

@@ -7,7 +7,7 @@ library
   exposed-modules: Obelisk.ExecutableConfig.Lookup, Obelisk.Configs
   if os(ios)
     hs-source-dirs: src-ios, src
-    other-modules: Obelisk.ExecutableConfig.Internal.ConfigDirectory
+    other-modules: Obelisk.Configs.Internal.Directory
     build-depends: jsaddle-wkwebview
     build-depends: directory
   else
@@ -23,6 +23,7 @@ library
         build-depends: ghcjs-dom
       else
         hs-source-dirs: src-other, src
+        other-modules: Obelisk.Configs.Internal.Directory
         build-depends: directory
 
   build-depends:

lib/executable-config/lookup/src-ios/Obelisk/ExecutableConfig/Lookup.hs

@@ -1,14 +1,15 @@
 {-# LANGUAGE LambdaCase #-}
 module Obelisk.ExecutableConfig.Lookup where
 
+import Data.ByteString (ByteString)
 import Data.Map (Map)
 import Data.Text (Text)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
 import Language.Javascript.JSaddle.WKWebView
 import System.FilePath.Posix
 
-import Obelisk.ExecutableConfig.Internal.ConfigDirectory
+import Obelisk.Configs.Internal.Directory
 
 getConfigs :: IO (Map Text ByteString)
 getConfigs = mainBundleResourcePath >>= \case

lib/executable-config/lookup/src-other/Obelisk/ExecutableConfig/Lookup.hs

@@ -12,21 +12,7 @@ import System.Directory
 import System.FilePath
 import Control.Monad
 
+import Obelisk.Configs.Internal.Directory
+
 getConfigs :: IO (Map Text ByteString)
 getConfigs = getConfigsFromDirectory "config"
-  where
-    getConfigsFromDirectory :: FilePath -> IO (Map Text ByteString)
-    getConfigsFromDirectory base = do
-      doesDirectoryExist base >>= \case
-        True -> do
-          ps <- listDirectory base
-          fmap mconcat $ forM ps $ \p -> do
-            subdirConfigs <- getConfigsFromDirectory $ base </> p
-            pure $ Map.mapKeys (T.pack . (p </>) . T.unpack) subdirConfigs
-        False -> do
-          doesFileExist base >>= \case
-            True -> do
-              f <- BS.readFile base
-              pure $ Map.singleton "" f
-            False -> do
-              pure mempty

lib/executable-config/lookup/src/Obelisk/Configs/Internal/Directory.hs

@@ -0,0 +1,21 @@
+{-# LANGUAGE LambdaCase #-}
+module Obelisk.Configs.Internal.Directory where
+
+import Data.ByteString (ByteString)
+import Data.Text (Text)
+
+getConfigsFromDirectory :: FilePath -> IO (Map Text ByteString)
+getConfigsFromDirectory base = do
+  doesDirectoryExist base >>= \case
+    True -> do
+      ps <- listDirectory base
+      fmap mconcat $ forM ps $ \p -> do
+        subdirConfigs <- getConfigsFromDirectory $ base </> p
+        pure $ Map.mapKeys (T.pack . (p </>) . T.unpack) subdirConfigs
+    False -> do
+      doesFileExist base >>= \case
+        True -> do
+          f <- BS.readFile base
+          pure $ Map.singleton "" f
+        False -> do
+          pure mempty