diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,9 @@ # Revision history for reflex-ghci +## 0.1.5.1 + +* Extend version bounds to support reflex 0.8 + ## 0.1.5.0 * Fix various circumstances under which reflex-ghci would hang due to failure to properly parse GHCi output or failure to detect filesystem changes (the latter particularly on macOS) diff --git a/reflex-ghci.cabal b/reflex-ghci.cabal --- a/reflex-ghci.cabal +++ b/reflex-ghci.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: reflex-ghci -version: 0.1.5.0 +version: 0.1.5.1 synopsis: A GHCi widget library for use in reflex applications description: Run GHCi from within a Reflex FRP () application and interact with it using a functional reactive interface. @@ -31,7 +31,7 @@ , filepath >= 1.4 && < 1.5 , fsnotify >= 0.3 && < 0.4 , process >= 1.6 && < 1.7 - , reflex >= 0.7.1.0 && < 0.8 + , reflex >= 0.7.1.0 && < 0.9 , reflex-fsnotify >= 0.2 && < 0.3 , reflex-process >= 0.3 && < 0.4 , regex-tdfa >= 1.2.3 && < 1.4 diff --git a/tests/exe-pkg/dist-newstyle/build/x86_64-linux/ghc-8.6.5/tests-0.1.0.0/x/tests/build/tests/autogen/Paths_tests.hs b/tests/exe-pkg/dist-newstyle/build/x86_64-linux/ghc-8.6.5/tests-0.1.0.0/x/tests/build/tests/autogen/Paths_tests.hs deleted file mode 100644 --- a/tests/exe-pkg/dist-newstyle/build/x86_64-linux/ghc-8.6.5/tests-0.1.0.0/x/tests/build/tests/autogen/Paths_tests.hs +++ /dev/null @@ -1,50 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE NoRebindableSyntax #-} -{-# OPTIONS_GHC -fno-warn-missing-import-lists #-} -module Paths_tests ( - version, - getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, - getDataFileName, getSysconfDir - ) where - -import qualified Control.Exception as Exception -import Data.Version (Version(..)) -import System.Environment (getEnv) -import Prelude - -#if defined(VERSION_base) - -#if MIN_VERSION_base(4,0,0) -catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a -#else -catchIO :: IO a -> (Exception.Exception -> IO a) -> IO a -#endif - -#else -catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a -#endif -catchIO = Exception.catch - -version :: Version -version = Version [0,1,0,0] [] -bindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath - -bindir = "/home/ali/.cabal/bin" -libdir = "/home/ali/.cabal/lib/x86_64-linux-ghc-8.6.5/tests-0.1.0.0-inplace-tests" -dynlibdir = "/home/ali/.cabal/lib/x86_64-linux-ghc-8.6.5" -datadir = "/home/ali/.cabal/share/x86_64-linux-ghc-8.6.5/tests-0.1.0.0" -libexecdir = "/home/ali/.cabal/libexec/x86_64-linux-ghc-8.6.5/tests-0.1.0.0" -sysconfdir = "/home/ali/.cabal/etc" - -getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath -getBinDir = catchIO (getEnv "tests_bindir") (\_ -> return bindir) -getLibDir = catchIO (getEnv "tests_libdir") (\_ -> return libdir) -getDynLibDir = catchIO (getEnv "tests_dynlibdir") (\_ -> return dynlibdir) -getDataDir = catchIO (getEnv "tests_datadir") (\_ -> return datadir) -getLibexecDir = catchIO (getEnv "tests_libexecdir") (\_ -> return libexecdir) -getSysconfDir = catchIO (getEnv "tests_sysconfdir") (\_ -> return sysconfdir) - -getDataFileName :: FilePath -> IO FilePath -getDataFileName name = do - dir <- getDataDir - return (dir ++ "/" ++ name) diff --git a/tests/lib-pkg-err/dist-newstyle/build/x86_64-linux/ghc-8.6.5/test-pkg2-0.1.0.0/build/autogen/Paths_test_pkg2.hs b/tests/lib-pkg-err/dist-newstyle/build/x86_64-linux/ghc-8.6.5/test-pkg2-0.1.0.0/build/autogen/Paths_test_pkg2.hs deleted file mode 100644 --- a/tests/lib-pkg-err/dist-newstyle/build/x86_64-linux/ghc-8.6.5/test-pkg2-0.1.0.0/build/autogen/Paths_test_pkg2.hs +++ /dev/null @@ -1,50 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE NoRebindableSyntax #-} -{-# OPTIONS_GHC -fno-warn-missing-import-lists #-} -module Paths_test_pkg2 ( - version, - getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, - getDataFileName, getSysconfDir - ) where - -import qualified Control.Exception as Exception -import Data.Version (Version(..)) -import System.Environment (getEnv) -import Prelude - -#if defined(VERSION_base) - -#if MIN_VERSION_base(4,0,0) -catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a -#else -catchIO :: IO a -> (Exception.Exception -> IO a) -> IO a -#endif - -#else -catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a -#endif -catchIO = Exception.catch - -version :: Version -version = Version [0,1,0,0] [] -bindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath - -bindir = "/home/ali/.cabal/bin" -libdir = "/home/ali/.cabal/lib/x86_64-linux-ghc-8.6.5/test-pkg2-0.1.0.0-inplace" -dynlibdir = "/home/ali/.cabal/lib/x86_64-linux-ghc-8.6.5" -datadir = "/home/ali/.cabal/share/x86_64-linux-ghc-8.6.5/test-pkg2-0.1.0.0" -libexecdir = "/home/ali/.cabal/libexec/x86_64-linux-ghc-8.6.5/test-pkg2-0.1.0.0" -sysconfdir = "/home/ali/.cabal/etc" - -getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath -getBinDir = catchIO (getEnv "test_pkg2_bindir") (\_ -> return bindir) -getLibDir = catchIO (getEnv "test_pkg2_libdir") (\_ -> return libdir) -getDynLibDir = catchIO (getEnv "test_pkg2_dynlibdir") (\_ -> return dynlibdir) -getDataDir = catchIO (getEnv "test_pkg2_datadir") (\_ -> return datadir) -getLibexecDir = catchIO (getEnv "test_pkg2_libexecdir") (\_ -> return libexecdir) -getSysconfDir = catchIO (getEnv "test_pkg2_sysconfdir") (\_ -> return sysconfdir) - -getDataFileName :: FilePath -> IO FilePath -getDataFileName name = do - dir <- getDataDir - return (dir ++ "/" ++ name) diff --git a/tests/lib-pkg/dist-newstyle/build/x86_64-linux/ghc-8.6.5/test-pkg2-0.1.0.0/build/autogen/Paths_test_pkg2.hs b/tests/lib-pkg/dist-newstyle/build/x86_64-linux/ghc-8.6.5/test-pkg2-0.1.0.0/build/autogen/Paths_test_pkg2.hs deleted file mode 100644 --- a/tests/lib-pkg/dist-newstyle/build/x86_64-linux/ghc-8.6.5/test-pkg2-0.1.0.0/build/autogen/Paths_test_pkg2.hs +++ /dev/null @@ -1,50 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE NoRebindableSyntax #-} -{-# OPTIONS_GHC -fno-warn-missing-import-lists #-} -module Paths_test_pkg2 ( - version, - getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, - getDataFileName, getSysconfDir - ) where - -import qualified Control.Exception as Exception -import Data.Version (Version(..)) -import System.Environment (getEnv) -import Prelude - -#if defined(VERSION_base) - -#if MIN_VERSION_base(4,0,0) -catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a -#else -catchIO :: IO a -> (Exception.Exception -> IO a) -> IO a -#endif - -#else -catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a -#endif -catchIO = Exception.catch - -version :: Version -version = Version [0,1,0,0] [] -bindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath - -bindir = "/home/ali/.cabal/bin" -libdir = "/home/ali/.cabal/lib/x86_64-linux-ghc-8.6.5/test-pkg2-0.1.0.0-inplace" -dynlibdir = "/home/ali/.cabal/lib/x86_64-linux-ghc-8.6.5" -datadir = "/home/ali/.cabal/share/x86_64-linux-ghc-8.6.5/test-pkg2-0.1.0.0" -libexecdir = "/home/ali/.cabal/libexec/x86_64-linux-ghc-8.6.5/test-pkg2-0.1.0.0" -sysconfdir = "/home/ali/.cabal/etc" - -getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath -getBinDir = catchIO (getEnv "test_pkg2_bindir") (\_ -> return bindir) -getLibDir = catchIO (getEnv "test_pkg2_libdir") (\_ -> return libdir) -getDynLibDir = catchIO (getEnv "test_pkg2_dynlibdir") (\_ -> return dynlibdir) -getDataDir = catchIO (getEnv "test_pkg2_datadir") (\_ -> return datadir) -getLibexecDir = catchIO (getEnv "test_pkg2_libexecdir") (\_ -> return libexecdir) -getSysconfDir = catchIO (getEnv "test_pkg2_sysconfdir") (\_ -> return sysconfdir) - -getDataFileName :: FilePath -> IO FilePath -getDataFileName name = do - dir <- getDataDir - return (dir ++ "/" ++ name)