nix: Make project config consistent

.gitignore

@@ -28,7 +28,6 @@ dataframe_benchmark/
 bin/
 coverage-html
 .DS_Store
-flake.lock
 tags
 __pycache__
 venv
@@ -45,4 +44,4 @@ Cargo.lock
 # (transient; the committed *.db fixtures themselves stay tracked).
 *.db-wal
 *.db-shm
-*.db-journal
+*.db-journal

cabal.project.ci

@@ -1,6 +1,7 @@
 packages:
     .
     dataframe-core
+    dataframe-expr-serializer
     dataframe-parsing
     dataframe-operations
     dataframe-csv

dataframe-operations/src/DataFrame/Monad.hs

@@ -114,7 +114,7 @@ instance Functor Pipeline where
     fmap f (Pipeline g) = Pipeline $ \n -> let (n', w, a) = g n in (n', w, f a)
 
 instance Applicative Pipeline where
-    pure x = Pipeline (, [], x)
+    pure x = Pipeline (,[],x)
     Pipeline gf <*> Pipeline gx = Pipeline $ \n ->
         let (n1, w1, f) = gf n
             (n2, w2, x) = gx n1
@@ -128,7 +128,7 @@ instance Monad Pipeline where
 
 -- | Derive a column under an explicit name, returning a reference to it.
 letAs :: (Columnable a) => T.Text -> Expr a -> Pipeline (Expr a)
-letAs nm e = Pipeline (, [(nm, UExpr e)], Col nm)
+letAs nm e = Pipeline (,[(nm, UExpr e)],Col nm)
 
 -- | Derive a column under a fresh generated name.
 letExpr :: (Columnable a) => Expr a -> Pipeline (Expr a)
@@ -138,8 +138,11 @@ letExpr e = Pipeline $ \n ->
 instance Show (Pipeline (Expr a)) where
     show p =
         let (_, steps, res) = unPipeline p 0
-         in concatMap (\(nm, UExpr e) -> T.unpack nm ++ " = " ++ prettyPrint e ++ "\n") steps
-                ++ "return " ++ prettyPrint res
+         in concatMap
+                (\(nm, UExpr e) -> T.unpack nm ++ " = " ++ prettyPrint e ++ "\n")
+                steps
+                ++ "return "
+                ++ prettyPrint res
 
 -- | Number of column derivations the pipeline performs.
 pipelineSteps :: Pipeline a -> Int
@@ -151,7 +154,8 @@ toFrameM p =
     let (_, steps, res) = unPipeline p 0
      in mapM_ (\(nm, UExpr e) -> void (deriveM nm e)) steps >> pure res
 
--- | Run a pipeline over a frame: derive its columns and return the result
--- expression (a reference to the final column) and the resulting frame.
+{- | Run a pipeline over a frame: derive its columns and return the result
+expression (a reference to the final column) and the resulting frame.
+-}
 runPipeline :: DataFrame -> Pipeline (Expr a) -> (Expr a, DataFrame)
 runPipeline df = runFrameM df . toFrameM

examples/examples.cabal

@@ -142,7 +142,7 @@ executable examples
                       cassava >= 0.1 && < 1,
                       containers >= 0.6.7 && < 0.9,
                       directory >= 1.3.0.0 && < 2,
-                      granite ^>= 0.6,
+                      granite >= 0.6 && < 1,
                       hashable >= 1.2 && < 2,
                       hasktorch,
                       http-conduit,