Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,25 @@

hsPkgs = pkgs.haskellPackages.extend (self: super: rec {
granite = self.callCabal2nix "granite" granitePkg { };
dataframe-fastcsv = self.callCabal2nix "dataframe-fastcsv" ./dataframe-fastcsv {
inherit parallel;
};
dataframe = self.callCabal2nix "dataframe" ./. {
inherit granite;
};
parallel = super.parallel_3_3_0_0;
});
in
{
packages = {
default = hsPkgs.dataframe;
dataframe = hsPkgs.dataframe;
dataframe-fastcsv = hsPkgs.dataframe-fastcsv;
};

devShells.default = hsPkgs.shellFor {
packages = ps: [ (ps.callCabal2nix "dataframe" ./. { }) ];
nativeBuildInputs = with pkgs; [
packages = ps: [ ps.dataframe ps.dataframe-fastcsv ];
nativeBuildInputs = with hsPkgs; [
ghc
cabal-install
haskell-language-server
Expand Down
6 changes: 4 additions & 2 deletions src/DataFrame/Functions.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE IncoherentInstances #-}
{-# LANGUAGE InstanceSigs #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE MultiParamTypeClasses #-}
Expand Down Expand Up @@ -504,7 +505,8 @@ whenBothPresent f = lift2Decorated (\l r -> f <$> l <*> r) "whenBothPresent" Not

recode ::
forall a b.
(Columnable a, Columnable b) => [(a, b)] -> Expr a -> Expr (Maybe b)
(Columnable a, Columnable b, Show (a, b)) =>
[(a, b)] -> Expr a -> Expr (Maybe b)
recode mapping =
Unary
( MkUnaryOp
Expand All @@ -523,7 +525,7 @@ recodeWithCondition fallback ((cond, value) : rest) expr = ifThenElse (cond expr

recodeWithDefault ::
forall a b.
(Columnable a, Columnable b) => b -> [(a, b)] -> Expr a -> Expr b
(Columnable a, Columnable b, Show (a, b)) => b -> [(a, b)] -> Expr a -> Expr b
recodeWithDefault d mapping =
Unary
( MkUnaryOp
Expand Down
Loading