obsidiansystems · ymeister · Aug 7, 2024 · Aug 7, 2024 · Aug 8, 2024 · Aug 8, 2024
diff --git a/.gitignore b/.gitignore
@@ -14,5 +14,5 @@ cabal.project.local
 **/ghcid-output.txt
 
 # HLS specific files
-lib/cabal.project
+#lib/cabal.project
 lib/cabal.project.local
diff --git a/all-tests.nix b/all-tests.nix
@@ -5,7 +5,7 @@ let
   nginxRoot = "/run/nginx";
   obelisk = import ./default.nix {};
   # Get NixOS a pre-release 20.03 that contains the python based tests and recursive nix
-  pkgs = import (builtins.fetchTarball https://github.com/nixos/nixpkgs/archive/3de5266.tar.gz) {};
+  pkgs = import (builtins.fetchTarball https://github.com/nixos/nixpkgs/archive/3de5266b255cf3bd41438d2cfb0698420a33302e.tar.gz) {};
   sshKeys = import (pkgs.path + /nixos/tests/ssh-keys.nix) pkgs;
   make-test = import (pkgs.path + /nixos/tests/make-test-python.nix);
   obelisk-everywhere = (import ./all-builds.nix { inherit supportedSystems; }).x86_64-linux.cache;

diff --git a/dep/nix-thunk/github.json b/dep/nix-thunk/github.json
@@ -3,6 +3,6 @@
   "repo": "nix-thunk",
   "branch": "master",
   "private": false,
-  "rev": "2b65d2cbf83e77a90b4103418d037ba5b0b32e77",
-  "sha256": "07pr014iifyy1xaiqamkx78xfszr67g8kzysmzgzms0a4470k1i9"
+  "rev": "682327c1f7859eaa34a7863bc3b8cccce3f5d038",
+  "sha256": "0d7yibmqbgw02xl7lb3m75pg8ih4mxwy1hk4mra2fvfx6nbhv442"
 }
diff --git a/lib/asset/manifest/obelisk-asset-manifest.cabal b/lib/asset/manifest/obelisk-asset-manifest.cabal
@@ -24,6 +24,7 @@ library
     , filepath
     , template-haskell
     , text
+    , th-abstraction >= 0.6
     , transformers
     , unix-compat
     , vector
@@ -39,6 +40,9 @@ library
     -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O2
     -fno-warn-unused-do-bind -funbox-strict-fields -fprof-auto-calls
 
+  if arch(javascript)
+    buildable: False
+
 executable obelisk-asset-manifest-generate
   default-language: Haskell2010
   hs-source-dirs: src-bin

diff --git a/lib/asset/manifest/src/Obelisk/Asset/Promoted.hs b/lib/asset/manifest/src/Obelisk/Asset/Promoted.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE KindSignatures #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskellQuotes #-}
+
 module Obelisk.Asset.Promoted
   ( writeStaticProject
   , declareStatic
@@ -12,6 +13,7 @@ import Obelisk.Asset.Gather
 import Data.Foldable
 import Language.Haskell.TH (pprint)
 import Language.Haskell.TH.Syntax hiding (lift)
+import Language.Haskell.TH.Datatype.TyVarBndr (kindedTVFlag)
 import GHC.TypeLits
 import Data.Sequence (Seq)
 import qualified Data.Sequence as Seq
@@ -88,7 +90,7 @@ staticClass = do
   let n x = Name (OccName x) NameS
       className = n "StaticFile"
       methodName = n "hashedPath"
-      cls = ClassD [] className [KindedTV (n "s") (ConT ''Symbol)] [] [SigD methodName (ConT ''Text)]
+      cls = ClassD [] className [kindedTVFlag (n "s") BndrReq (ConT ''Symbol)] [] [SigD methodName (ConT ''Text)]
   tell $ Seq.singleton cls
   return $ StaticContext
     { _staticContext_className = className

diff --git a/lib/asset/manifest/src/Obelisk/Asset/TH.hs b/lib/asset/manifest/src/Obelisk/Asset/TH.hs
@@ -86,4 +86,4 @@ staticAssetWorker root staticOut fp = do
   exists <- runIO $ doesFileExist $ staticOut </> fp
   when (not exists) $
     fail $ "The file " <> fp <> " was not found in " <> staticOut
-  returnQ $ LitE $ StringL $ root </> fp
+  return $ LitE $ StringL $ root </> fp
diff --git a/lib/asset/serve-snap/obelisk-asset-serve-snap.cabal b/lib/asset/serve-snap/obelisk-asset-serve-snap.cabal
@@ -33,3 +33,6 @@ library
   ghc-options:
     -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O2
     -fno-warn-unused-do-bind -funbox-strict-fields -fprof-auto-calls
+
+  if arch(javascript)
+    buildable: False
diff --git a/lib/backend/obelisk-backend.cabal b/lib/backend/obelisk-backend.cabal
@@ -28,3 +28,6 @@ library
                  universe
   exposed-modules: Obelisk.Backend
   ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
+
+  if arch(javascript)
+    buildable: False
diff --git a/lib/backend/src/Obelisk/Backend.hs b/lib/backend/src/Obelisk/Backend.hs
@@ -10,6 +10,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+
 module Obelisk.Backend
   ( Backend (..)
   , BackendConfig (..)
@@ -45,15 +46,20 @@ module Obelisk.Backend
 import Control.Monad.Fail (MonadFail)
 import Data.Monoid ((<>))
 #endif
-#endif
-
+#if __GLASGOW_HASKELL__ >= 906
 import Control.Monad
+import Control.Monad.IO.Class
+#else
 import Control.Monad.Except
+#endif
+#endif
+
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as BSC8
 import Data.Default (Default (..))
 import Data.Dependent.Sum
 import Data.Functor.Identity
+import Data.Kind (Type)
 import Data.Map (Map)
 import qualified Data.Map as Map
 import Data.Text (Text)
@@ -202,7 +208,7 @@ data StaticAssets = StaticAssets
   }
   deriving (Show, Read, Eq, Ord)
 
-data GhcjsAppRoute :: (* -> *) -> * -> * where
+data GhcjsAppRoute :: (Type -> Type) -> Type -> Type where
   GhcjsAppRoute_App :: appRouteComponent a -> GhcjsAppRoute appRouteComponent a
   GhcjsAppRoute_Resource :: GhcjsAppRoute appRouteComponent [Text]
 

diff --git a/lib/cabal.dependencies.project b/lib/cabal.dependencies.project
@@ -0,0 +1,32 @@
+index-state: 2024-08-04T00:00:00Z
+allow-newer: all
+
+constraints:
+    hnix-store-core < 0.7
+  , hnix-store-remote < 0.7
+
+source-repository-package
+  type: git
+  location: https://github.com/ymeister/splitmix.git
+  tag: fe4d9e4ec01ba7caf8053d6888ec2e7f89fad874
+  --sha256: 19fbwcmdmb9w34cp19r2j4qywhnjmxxdv4rwci29pzbvgbnnjdia
+
+if !arch(javascript)
+  source-repository-package
+    type: git
+    location: https://github.com/ymeister/hs-git.git
+    tag: 4534c4589fc63d76d4a28f4ca9d810bea021964b
+    --sha256: 12c4llylc5zls85x11inkxdwllbps77pvwyji7jv9a8c069fg6sf
+
+  source-repository-package
+    type: git
+    location: https://github.com/mpickering/haskell-filesystem.git
+    tag: 2eb26717e986442796d703a80869e6826a10191e
+    subdir: system-fileio system-filepath
+    --sha256: sha256-VDShV+gkVUooMy1OtxrFfZrTAVVhWN/Ffjd6Qq0kHNM=
+
+  source-repository-package
+    type: git
+    location: https://github.com/ymeister/unix-compat.git
+    tag: 339649401c876ca1f76c6f94d6b099c8c47fa9e2
+    --sha256: 0j85q0mqg929nlz9ks6jaxz54pkvifpmldsvqjcz4bv6wml8m3wd
diff --git a/lib/cabal.project b/lib/cabal.project
@@ -0,0 +1,23 @@
+if arch(javascript)
+  packages:
+    ./executable-config/inject
+    ./executable-config/lookup
+    ./frontend
+    ./route
+    ./tabulation
+else
+  packages:
+    ./asset/manifest
+    ./asset/serve-snap
+    ./backend
+    ./command
+    ./executable-config/inject
+    ./executable-config/lookup
+    ./frontend
+    ./route
+    ./run
+    ./selftest
+    ./snap-extras
+    ./tabulation
+
+import: cabal.dependencies.project
diff --git a/lib/command/obelisk-command.cabal b/lib/command/obelisk-command.cabal
@@ -24,7 +24,7 @@ library
     , git
     , github
     , here
-    , hnix
+    , hnix >=0.5
     , hpack
     , io-streams
     , lens
@@ -39,6 +39,7 @@ library
     , optparse-applicative
     , placeholders
     , prettyprinter
+    , prettyprinter-compat-ansi-wl-pprint
     , process
     , reflex
     , reflex-fsnotify
@@ -55,7 +56,7 @@ library
     , yaml
     , nix-thunk
     , cli-extras
-    
+
   exposed-modules:
     Obelisk.App
     Obelisk.Command
@@ -68,6 +69,9 @@ library
     Obelisk.Command.Preprocessor
   ghc-options: -Wall
 
+  if arch(javascript)
+    buildable: False
+
 executable ob
   main-is: src-bin/ob.hs
   build-depends: base, obelisk-command

diff --git a/lib/command/src/Obelisk/App.hs b/lib/command/src/Obelisk/App.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE ConstraintKinds #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
@@ -9,11 +10,11 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE PackageImports #-}
+
 module Obelisk.App where
 
 import Control.Lens
 import Control.Monad.Catch (MonadCatch, MonadMask, MonadThrow)
-import Control.Monad.Fail (MonadFail)
 import Control.Monad.Reader (MonadIO, ReaderT (..), ask, runReaderT)
 import Control.Monad.Writer (WriterT)
 import Control.Monad.State (StateT)
@@ -25,16 +26,14 @@ import Control.Monad.Log (MonadLog)
 import Cli.Extras.Types
 import "nix-thunk" Nix.Thunk (NixThunkError)
 
+#if !MIN_VERSION_base(4,18,0)
+import Control.Monad.Fail (MonadFail)
+#endif
+
 import Cli.Extras
-  ( CliConfig
-  , CliLog
-  , CliThrow
-  , CliT (..)
-  , ProcessFailure
+  ( ProcessFailure
   , AsProcessFailure (..)
   , AsUnstructuredError (..)
-  , HasCliConfig
-  , Output
   , runCli
   )
 

diff --git a/lib/command/src/Obelisk/Command.hs b/lib/command/src/Obelisk/Command.hs
@@ -1,10 +1,12 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE PackageImports #-}
+
 module Obelisk.Command where
 
 import Control.Monad.IO.Class (MonadIO, liftIO)
@@ -16,17 +18,22 @@ import qualified Data.List.NonEmpty as NonEmpty
 import qualified Data.Map as Map
 import qualified Data.Text as T
 import Data.Traversable (for)
+import GHC.IO.Encoding.Types (textEncodingName)
+import Network.Socket (PortNumber)
 import Options.Applicative
-import Options.Applicative.Help.Pretty (text, (<$$>))
 import System.Directory
 import System.Environment
 import System.FilePath
 import System.Exit
 import qualified System.Info
 import System.IO (hIsTerminalDevice, Handle, stdout, stderr, hGetEncoding, hSetEncoding, mkTextEncoding)
-import GHC.IO.Encoding.Types (textEncodingName)
 import System.Process (rawSystem)
-import Network.Socket (PortNumber)
+
+#if MIN_VERSION_optparse_applicative(0,18,0)
+import Text.PrettyPrint.ANSI.Leijen (text, (<$$>))
+#else
+import Options.Applicative.Help.Pretty (text, (<$$>))
+#endif
 
 import Obelisk.App
 import Obelisk.Command.Deploy
@@ -288,17 +295,11 @@ interpretOpts :: Parser [(FilePath, Interpret)]
 interpretOpts = many
     (   (, Interpret_Interpret) <$>
           strOption (common <> long "interpret" <> help
-            "Don't pre-build packages found in DIR when constructing the package database. The default behavior is \
-            \'--interpret <project-root>', which will load everything which is unpacked into GHCi. \
-            \ Use --interpret and --no-interpret multiple times to add or remove multiple trees \
-            \ from the environment. Settings for right-most directories will \
-            \ override settings for any identical directories given earlier."
+            "Don't pre-build packages found in DIR when constructing the package database. The default behavior is '--interpret <project-root>', which will load everything which is unpacked into GHCi. Use --interpret and --no-interpret multiple times to add or remove multiple trees from the environment. Settings for right-most directories will override settings for any identical directories given earlier."
           )
     <|> (, Interpret_NoInterpret) <$>
           strOption (common <> long "no-interpret" <> help
-            "Make packages found in DIR available in the package database (but only when they are used dependencies). \
-            \ This will build the packages in DIR before loading GHCi. \
-            \See help for --interpret for how the two options are related."
+            "Make packages found in DIR available in the package database (but only when they are used dependencies). This will build the packages in DIR before loading GHCi. See help for --interpret for how the two options are related."
           )
     )
   where

diff --git a/lib/command/src/Obelisk/Command/Deploy.hs b/lib/command/src/Obelisk/Command/Deploy.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
@@ -7,6 +8,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE PackageImports #-}
 {-# LANGUAGE ViewPatterns #-}
+
 {-|
    Description:
    Implementation of the CLI deploy commands. Deployment is done by intializing
@@ -16,7 +18,6 @@
 -}
 module Obelisk.Command.Deploy where
 
-import Control.Applicative (liftA2)
 import Control.Lens
 import Control.Monad
 import Control.Monad.Catch (Exception (displayException), MonadThrow, bracket, throwM, try)
@@ -47,12 +48,17 @@ import qualified Nix.Expr.Shorthands as Nix
 import Prettyprinter (layoutCompact)
 import Prettyprinter.Render.String (renderString)
 
+#if !MIN_VERSION_base(4,18,0)
+import Control.Applicative (liftA2)
+#endif
+
 import Obelisk.App (MonadObelisk, wrapNixThunkError)
 import Obelisk.Command.Nix
 import Obelisk.Command.Project
 import Obelisk.Command.Utils
 
 import "nix-thunk" Nix.Thunk
+import "nix-thunk" Nix.Thunk.Internal (prettyReadThunkError)
 import Cli.Extras
 
 -- | Options passed to the `init` verb
@@ -178,7 +184,7 @@ deployPush deployPath builders = do
       checkGitCleanStatus srcPath True >>= \case
         True -> wrapNixThunkError $ packThunk (ThunkPackConfig False (ThunkConfig Nothing)) srcPath
         False -> failWith $ T.pack $ "ob deploy push: ensure " <> srcPath <> " has no pending changes and latest is pushed upstream."
-    Left err -> failWith $ "ob deploy push: couldn't read src thunk: " <> T.pack (show err)
+    Left err -> failWith $ "ob deploy push: couldn't read src thunk: " <> prettyReadThunkError err
   let version = show . _thunkRev_commit $ _thunkPtr_rev thunkPtr
   let moduleFile = deployPath </> "module.nix"
   moduleFileExists <- liftIO $ doesFileExist moduleFile

diff --git a/lib/command/src/Obelisk/Command/Nix.hs b/lib/command/src/Obelisk/Command/Nix.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE ConstraintKinds #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
@@ -8,6 +9,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
+
 module Obelisk.Command.Nix
   ( Arg (..)
   , NixBuildConfig (..)
@@ -46,9 +48,12 @@ import Data.Bool (bool)
 import Data.Default
 import Data.List (intercalate)
 import Data.Maybe
-import Data.Monoid ((<>))
 import qualified Data.Text as T
 
+#if !MIN_VERSION_base(4,18,0)
+import Data.Monoid ((<>))
+#endif
+
 import Obelisk.App (MonadObelisk)
 import Cli.Extras