A few additional fixes, still not building

alexfmpe · May 26, 2023 · 739b14c · 739b14c
1 parent 5bea905
commit 739b14c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/reflex-dom/reflex-dom.cabal b/reflex-dom/reflex-dom.cabal
@@ -74,7 +74,7 @@ library
     base >= 4.7 && < 4.15,
     bytestring == 0.10.*,
     reflex >= 0.8 && < 1,
-    reflex-dom-core >= 0.6.1.0 && <0.8,
+    reflex-dom-core >= 0.6.1.0 && <0.9,
     text == 1.2.*
   if !impl(ghcjs)
     if flag(use-warp)

diff --git a/release.nix b/release.nix
@@ -31,13 +31,13 @@ let
             } {};
             reflex = self.callHackageDirect {
               pkg = "reflex";
-              ver = "0.8.2.1";
-              sha256 = "10d1qkqwaqp9zaswmziaqgz60ifg5383d2i2ml2cqccn8943h26b";
+              ver = "0.9.0.1";
+              sha256 = "sha256-HhBBElxwfzGt1tOMCtYLT9Ody9mvaDb2ppuy3qFWLPs=";
             } {};
             patch = self.callHackageDirect {
               pkg = "patch";
-              ver = "0.0.7.0";
-              sha256 = "0yr2hk3fpwjxi1z0n384k3aq9b3z00c02bbwqybcj3n20l4k17l6";
+              ver = "0.0.8.2";
+              sha256 = "sha256-7+dwuBNo33XPsBo5DhFD4oyKBWrOvTHUyA6RJyHGH5g=";
             } {};
           })
           # Use this package's source for reflex

diff --git a/test/reflex-dom-reexports.hs b/test/reflex-dom-reexports.hs
@@ -5,6 +5,7 @@ module Main where
 
 import Control.Monad (when)
 import Data.List (intercalate)
+import qualified Data.List.NonEmpty as NE
 import Data.Maybe (fromMaybe, isNothing, mapMaybe)
 import qualified Data.Set as Set
 import Distribution.Compiler (CompilerFlavor(GHC))
@@ -75,4 +76,4 @@ parseCabalExports file = do
       let (_, lib) = simplifyCondTree evalConfVar condLib
       in (exposedModules lib, reexportedModules lib)
     Right Nothing -> error $ "Haskell package has no library component: " <> file
-    Left (_, errors) -> error $ "Failed to parse " <> file <> ":\n" <> unlines (map show errors)
+    Left (_, errors) -> error $ "Failed to parse " <> file <> ":\n" <> unlines (map show (NE.toList errors))