git.iko.soy/obelisk
on master help sign in
Defer to reflex-platform overrides; Fixes for mobile exe-config
commit7dd157baaa2ea9ae6199bb076cf18eb55219e33c authorAli Abrar <aliabrar@gmail.com> dateSat 15 Jun 2019, 09:05 (7 years ago) parent37c84d6
14 files changed+29−87
compare with master
unifiedsplit
default.nix−11 dep/constraints-extras/default.nix−7 dep/constraints-extras/github.json−7 dep/dependent-map/default.nix−7 dep/dependent-map/github.json−7 dep/dependent-sum/default.nix−7 dep/dependent-sum/github.json−7 dep/reflex-platform/github.json+2−2 dep/universe/default.nix−7 dep/universe/github.json−7 lib/executable-config/lookup/obelisk-executable-config-lookup.cabal+2−1 lib/executable-config/lookup/src-ios/Obelisk/ExecutableConfig/Lookup.hs+2−1 lib/executable-config/lookup/src-other/Obelisk/ExecutableConfig/Lookup.hs+2−16 lib/executable-config/lookup/src/Obelisk/Configs/Internal/Directory.hs+21
default.nix−11
@@ -32,7 +32,6 @@ let
3232 # Fix misc upstream packages
3333 (self: super: let
3434 pkgs = self.callPackage ({ pkgs }: pkgs) {};
35− universeRepo = hackGet ./dep/universe;
3635 in {
3736 hnix = pkgs.haskell.lib.dontCheck (self.callCabal2nix "hnix" (pkgs.fetchFromGitHub {
3837 owner = "haskell-nix";
@@ -40,16 +39,6 @@ let
4039 rev = "42afdc21da5d9e076eab57eaa42bfdde938192b8";
4140 sha256 = "0psw384dx9bw2dp93xrzw8rd9amvcwgzn64jzzwby7sfspj6k349";
4241 }) {});
43− universe = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe" {};
44− universe-base = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-base" {};
45− universe-dependent-sum = pkgs.haskell.lib.doJailbreak (self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-dependent-sum" {});
46− universe-instances-extended = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-instances-extended" {};
47− universe-reverse-instances = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-reverse-instances" {};
48− universe-instances-base = self.callCabal2nixWithOptions "universe" universeRepo "--subpath deprecated/universe-instances-base" {};
49− constraints-extras = self.callCabal2nix "constraints-extras" (hackGet ./dep/constraints-extras) {};
50− dependent-map = self.callCabal2nix "dependent-map" (hackGet ./dep/dependent-map) {};
51− dependent-sum = self.callCabal2nixWithOptions "dependent-sum" (hackGet ./dep/dependent-sum) "--subpath dependent-sum" {};
52− dependent-sum-template = self.callCabal2nixWithOptions "dependent-sum-template" (hackGet ./dep/dependent-sum) "--subpath dependent-sum-template" {};
5342 })
5443
5544 pkgs.obeliskExecutableConfig.haskellOverlay
dep/constraints-extras/default.nixdeleted−7
@@ -1,7 +0,0 @@
1−# DO NOT HAND-EDIT THIS FILE
2−import ((import <nixpkgs> {}).fetchFromGitHub (
3− let json = builtins.fromJSON (builtins.readFile ./github.json);
4− in { inherit (json) owner repo rev sha256;
5− private = json.private or false;
6− }
7−))
dep/constraints-extras/github.jsondeleted−7
@@ -1,7 +0,0 @@
1−{
2− "owner": "obsidiansystems",
3− "repo": "constraints-extras",
4− "branch": "develop",
5− "rev": "30f10c03dd96e50c089f0613f99951805bff7397",
6− "sha256": "196b8kbcp744gqhh964m54vw4cdg15p6lc7cm2vxbh15cbqdz7ir"
7−}
dep/dependent-map/default.nixdeleted−7
@@ -1,7 +0,0 @@
1−# DO NOT HAND-EDIT THIS FILE
2−import ((import <nixpkgs> {}).fetchFromGitHub (
3− let json = builtins.fromJSON (builtins.readFile ./github.json);
4− in { inherit (json) owner repo rev sha256;
5− private = json.private or false;
6− }
7−))
dep/dependent-map/github.jsondeleted−7
@@ -1,7 +0,0 @@
1−{
2− "owner": "obsidiansystems",
3− "repo": "dependent-map",
4− "branch": "no-tag-classes",
5− "rev": "a9a438b1fd974891e4ed57cbd43e305cf7c759a9",
6− "sha256": "1g5zyz8rna57g585xrix1ica33865dw7x1kmxwcdh21pp1mqxzn2"
7−}
dep/dependent-sum/default.nixdeleted−7
@@ -1,7 +0,0 @@
1−# DO NOT HAND-EDIT THIS FILE
2−import ((import <nixpkgs> {}).fetchFromGitHub (
3− let json = builtins.fromJSON (builtins.readFile ./github.json);
4− in { inherit (json) owner repo rev sha256;
5− private = json.private or false;
6− }
7−))
dep/dependent-sum/github.jsondeleted−7
@@ -1,7 +0,0 @@
1−{
2− "owner": "obsidiansystems",
3− "repo": "dependent-sum",
4− "branch": "aa-bump-constraints-extras",
5− "rev": "69127f57533e7e58c54c2f9ca19b0b45946d6cc7",
6− "sha256": "112cknyz9dl3xbzx715bkhcy0l5z0v98rf06xf70b0fzsgfw68ws"
7−}
dep/reflex-platform/github.json+2−2
@@ -2,6 +2,6 @@
22 "owner": "reflex-frp",
33 "repo": "reflex-platform",
44 "branch": "cg-bump-reflex-dom",
5− "rev": "bb1de76a4ec855b6d8147acc4abc47a470ccd84a",
6− "sha256": "1insdz8m5a5dswflpcxn7hch1wvbxm58fzrbl41ifj66zqg7c34c"
5+ "rev": "7ecb4c255bb053a7a4796ffd6331cdbe210de91c",
6+ "sha256": "1mngxa24cfpvxxq4hgh77nw36vny4abl5wi2xmlwpkk25wzm0h0x"
77}
dep/universe/default.nixdeleted−7
@@ -1,7 +0,0 @@
1−# DO NOT HAND-EDIT THIS FILE
2−import ((import <nixpkgs> {}).fetchFromGitHub (
3− let json = builtins.fromJSON (builtins.readFile ./github.json);
4− in { inherit (json) owner repo rev sha256;
5− private = json.private or false;
6− }
7−))
dep/universe/github.jsondeleted−7
@@ -1,7 +0,0 @@
1−{
2− "owner": "dmwit",
3− "repo": "universe",
4− "branch": "master",
5− "rev": "a0ef0ec6fd0750725a7e63734829b44f54cfcbe2",
6− "sha256": "10cdjh42k9kzbwdvvl7hv9v1mnlx06swhl8y8zsqjd0rpnabfpm2"
7−}
lib/executable-config/lookup/obelisk-executable-config-lookup.cabal+2−1
@@ -7,7 +7,7 @@ library
77 exposed-modules: Obelisk.ExecutableConfig.Lookup, Obelisk.Configs
88 if os(ios)
99 hs-source-dirs: src-ios, src
10− other-modules: Obelisk.ExecutableConfig.Internal.ConfigDirectory
10+ other-modules: Obelisk.Configs.Internal.Directory
1111 build-depends: jsaddle-wkwebview
1212 build-depends: directory
1313 else
@@ -23,6 +23,7 @@ library
2323 build-depends: ghcjs-dom
2424 else
2525 hs-source-dirs: src-other, src
26+ other-modules: Obelisk.Configs.Internal.Directory
2627 build-depends: directory
2728
2829 build-depends:
lib/executable-config/lookup/src-ios/Obelisk/ExecutableConfig/Lookup.hs+2−1
@@ -1,6 +1,7 @@
11{-# LANGUAGE LambdaCase #-}
22module Obelisk.ExecutableConfig.Lookup where
33
4+import Data.ByteString (ByteString)
45import Data.Map (Map)
56import Data.Text (Text)
67import qualified Data.Text as T
@@ -8,7 +9,7 @@ import qualified Data.Text.Encoding as T
89import Language.Javascript.JSaddle.WKWebView
910import System.FilePath.Posix
1011
11−import Obelisk.ExecutableConfig.Internal.ConfigDirectory
12+import Obelisk.Configs.Internal.Directory
1213
1314getConfigs :: IO (Map Text ByteString)
1415getConfigs = mainBundleResourcePath >>= \case
lib/executable-config/lookup/src-other/Obelisk/ExecutableConfig/Lookup.hs+2−16
@@ -12,21 +12,7 @@ import System.Directory
1212import System.FilePath
1313import Control.Monad
1414
15+import Obelisk.Configs.Internal.Directory
16+
1517getConfigs :: IO (Map Text ByteString)
1618getConfigs = getConfigsFromDirectory "config"
17− where
18− getConfigsFromDirectory :: FilePath -> IO (Map Text ByteString)
19− getConfigsFromDirectory base = do
20− doesDirectoryExist base >>= \case
21− True -> do
22− ps <- listDirectory base
23− fmap mconcat $ forM ps $ \p -> do
24− subdirConfigs <- getConfigsFromDirectory $ base </> p
25− pure $ Map.mapKeys (T.pack . (p </>) . T.unpack) subdirConfigs
26− False -> do
27− doesFileExist base >>= \case
28− True -> do
29− f <- BS.readFile base
30− pure $ Map.singleton "" f
31− False -> do
32− pure mempty
lib/executable-config/lookup/src/Obelisk/Configs/Internal/Directory.hsnew file+21
@@ -0,0 +1,21 @@
1+{-# LANGUAGE LambdaCase #-}
2+module Obelisk.Configs.Internal.Directory where
3+
4+import Data.ByteString (ByteString)
5+import Data.Text (Text)
6+
7+getConfigsFromDirectory :: FilePath -> IO (Map Text ByteString)
8+getConfigsFromDirectory base = do
9+ doesDirectoryExist base >>= \case
10+ True -> do
11+ ps <- listDirectory base
12+ fmap mconcat $ forM ps $ \p -> do
13+ subdirConfigs <- getConfigsFromDirectory $ base </> p
14+ pure $ Map.mapKeys (T.pack . (p </>) . T.unpack) subdirConfigs
15+ False -> do
16+ doesFileExist base >>= \case
17+ True -> do
18+ f <- BS.readFile base
19+ pure $ Map.singleton "" f
20+ False -> do
21+ pure mempty