Merge pull request #867 from alexfmpe/nixpkgs-20.09

Nixpkgs 20.09

Author: Ericson2314

ChangeLog.md

@@ -2,6 +2,10 @@
 
 This project's release branch is `master`. This log is written from the perspective of the release branch: when changes hit `master`, they are considered released.
 
+## Unreleased
+
+* Update reflex-platform to v0.9.0.0
+
 ## v0.9.3.0 - 2021-12-30
 
 * Update reflex-platform to v0.8.0.3

dep/reflex-platform/github.json

@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-platform",
-  "branch": "nixpkgs-20.03",
+  "branch": "release/0.9.0.0",
   "private": false,
-  "rev": "52e00a07baccac3171dea0e237e74444bbf07ef4",
-  "sha256": "00a5kg0apf08sa54vf4rk4zjl9yq994pdckjkz4113kbsh2hbyan"
+  "rev": "e8e56516b1df0c6e7024bc0e690f54fcddf79a19",
+  "sha256": "0xb2hdps7bsyd6y84if3317w9fbcpcjh4whrvrhz6mskcw069xjp"
 }

haskell-overlays/misc-deps.nix

@@ -9,6 +9,13 @@ let
 in
 
 {
+  # Actually broken in current nixpkgs master due to MonadFail changes
+  git = haskellLib.markUnbroken super.git;
+
+  # hpack requires cabal >= 3.0 but the ghc865 package set builds it with 2.4 by default
+  hpack = super.hpack.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
+
+
   regex-base = self.callHackage "regex-base" "0.94.0.0" {};
   regex-posix = self.callHackage "regex-posix" "0.96.0.0" {};
   regex-tdfa = self.callHackage "regex-tdfa" "1.3.1.0" {};

lib/command/src/Obelisk/Command/Preprocessor.hs

@@ -10,7 +10,7 @@ import Data.List (intersperse, isPrefixOf, sortOn)
 import Data.Maybe (fromMaybe)
 import qualified Data.Text.Lazy.Builder as TL
 import qualified Data.Text.Lazy.Encoding as TL
-import Distribution.Compiler (CompilerFlavor (..))
+import Distribution.Compiler (CompilerFlavor (..), perCompilerFlavorToList)
 import Language.Haskell.Extension (Extension (..), Language(..))
 import System.Directory (canonicalizePath)
 import System.IO (IOMode (..), hPutStrLn, stderr, withFile)
@@ -88,7 +88,9 @@ generateHeader origPath packageInfo =
     ghcOptList
       = filter (not . isPrefixOf "-O")
       $ fromMaybe []
-      $ lookup GHC (_cabalPackageInfo_compilerOptions packageInfo)
+      $ lookup GHC
+      $ perCompilerFlavorToList
+      $ _cabalPackageInfo_compilerOptions packageInfo
     optList = _cabalPackageInfo_cppOptions packageInfo <> ghcOptList
 
 lineNumberPragma :: FilePath -> TL.Builder

lib/command/src/Obelisk/Command/Run.hs

@@ -43,9 +43,9 @@ import Data.Time.Clock (getCurrentTime)
 import Data.Time.Format (formatTime, defaultTimeLocale)
 import Data.Traversable (for)
 import Debug.Trace (trace)
-import Distribution.Compiler (CompilerFlavor(..))
-import Distribution.PackageDescription.Parsec (parseGenericPackageDescription)
-import Distribution.Parsec.ParseResult (runParseResult)
+import Distribution.Compiler (CompilerFlavor(..), PerCompilerFlavor)
+import Distribution.PackageDescription.Parsec (parseGenericPackageDescription, runParseResult)
+import Distribution.Parsec.Warning (PWarning)
 import Distribution.Pretty (prettyShow)
 import Distribution.Simple.Compiler (PackageDB (GlobalPackageDB))
 import Distribution.Simple.Configure (configCompilerEx, getInstalledPackages)
@@ -54,14 +54,15 @@ import Distribution.Simple.Program.Db (defaultProgramDb)
 import qualified Distribution.System as Dist
 import Distribution.Types.BuildInfo (buildable, cppOptions, defaultExtensions, defaultLanguage, hsSourceDirs, options, targetBuildDepends)
 import Distribution.Types.CondTree (simplifyCondTree)
-import Distribution.Types.Dependency (Dependency (..), depPkgName)
-import Distribution.Types.GenericPackageDescription (ConfVar (Arch, Impl, OS), condLibrary)
+import Distribution.Types.ConfVar (ConfVar (Arch, Impl, OS))
+import Distribution.Types.Dependency (Dependency (..), depPkgName, depVerRange)
+import Distribution.Types.GenericPackageDescription (condLibrary)
 import Distribution.Types.InstalledPackageInfo (compatPackageKey)
 import Distribution.Types.Library (libBuildInfo)
+import Distribution.Types.LibraryName (LibraryName(..))
 import Distribution.Types.PackageName (mkPackageName)
 import Distribution.Types.VersionRange (anyVersion)
 import Distribution.Utils.Generic (toUTF8BS, readUTF8File)
-import qualified Distribution.Parsec.Common as Dist
 import qualified Distribution.Verbosity as Verbosity (silent)
 import qualified Hpack.Config as Hpack
 import qualified Hpack.Render as Hpack
@@ -103,7 +104,7 @@ data CabalPackageInfo = CabalPackageInfo
     -- ^ List of globally enable extensions of the library component
   , _cabalPackageInfo_defaultLanguage :: Maybe Language
     -- ^ List of globally set languages of the library component
-  , _cabalPackageInfo_compilerOptions :: [(CompilerFlavor, [String])]
+  , _cabalPackageInfo_compilerOptions :: PerCompilerFlavor [String]
     -- ^ List of compiler-specific options (e.g., the "ghc-options" field of the cabal file)
   , _cabalPackageInfo_cppOptions :: [String]
     -- ^ List of CPP (C Preprocessor) options (e.g. the "cpp-options" field of the cabal file)
@@ -338,7 +339,7 @@ parseCabalPackage dir = parseCabalPackage' dir >>= \case
 parseCabalPackage'
   :: (MonadIO m)
   => FilePath -- ^ Package directory
-  -> m (Either T.Text (Maybe ([Dist.PWarning], CabalPackageInfo)))
+  -> m (Either T.Text (Maybe ([PWarning], CabalPackageInfo)))
 parseCabalPackage' pkg = runExceptT $ do
   (cabalContents, packageFile, packageName) <- guessCabalPackageFile pkg >>= \case
     Left GuessPackageFileError_NotFound -> throwError $ "No .cabal or package.yaml file found in " <> T.pack pkg
@@ -383,7 +384,7 @@ parseCabalPackage' pkg = runExceptT $ do
         }
     Right Nothing -> pure Nothing
     Left (_, errors) ->
-      throwError $ T.pack $ "Failed to parse " <> packageFile <> ":\n" <> unlines (map show errors)
+      throwError $ T.pack $ "Failed to parse " <> packageFile <> ":\n" <> unlines (map show $ toList errors)
 
 parsePackagesOrFail :: (MonadObelisk m, Foldable f) => f FilePath -> m (NE.NonEmpty CabalPackageInfo)
 parsePackagesOrFail dirs' = do
@@ -502,9 +503,9 @@ getGhciSessionSettings (toList -> packageInfos) pathBase useRelativePaths = do
       map (dependencyPackageId installedPackageIndex) $
           filter ((`notElem` packageNames) . depPkgName) $
           concatMap _cabalPackageInfo_buildDepends packageInfos <>
-            [Dependency (mkPackageName "obelisk-run") anyVersion]
+            [Dependency (mkPackageName "obelisk-run") anyVersion (Set.singleton LMainLibName)]
     dependencyPackageId installedPackageIndex dep =
-      case lookupDependency installedPackageIndex dep of
+      case lookupDependency installedPackageIndex (depPkgName dep) (depVerRange dep) of
         ((_version,installedPackageInfo:_) :_) ->
           compatPackageKey installedPackageInfo
         _ -> error $ "Couldn't resolve dependency for " <> prettyShow dep