Skip to content

Fix nix and non-nix builds #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mchav merged 2 commits into from
Mar 5, 2026
+11 −7
Merged

Fix nix and non-nix builds #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b01556b
nix: Provide granite as override
jisantuc Mar 3, 2026
6780713
fix: Remove unused import and missing symbol export
jisantuc Mar 5, 2026
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
13 changes: 11 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,18 @@
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
granitePkg = pkgs.fetchFromGitHub {
repo = "granite";
owner = "mchav";
rev = "main";
hash = "sha256-ypDiV99w2J8q7XcMpFWkv0kEm2dtWZduWIkAsuXDHEo=";
};

hsPkgs = pkgs.haskellPackages.extend (self: super: {
dataframe = self.callCabal2nix "dataframe" ./. { };
hsPkgs = pkgs.haskellPackages.extend (self: super: rec {
granite = self.callCabal2nix "granite" granitePkg { };
dataframe = self.callCabal2nix "dataframe" ./. {
inherit granite;
};
});
in
{
Expand Down
3 changes: 0 additions & 3 deletions src/DataFrame/Typed.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,6 @@ module DataFrame.Typed (
-- * Constraints
KnownSchema (..),
AllKnownSymbol (..),

-- * Pipe operator
(|>),
) where

import Prelude hiding (drop, filter, take)
Expand Down
2 changes: 0 additions & 2 deletions src/DataFrame/Typed/Operations.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,8 @@

-- * Vertical merge
append,

) where

import Data.Function ((&))
import Data.Proxy (Proxy (..))
import qualified Data.Text as T
import qualified Data.Vector as V
Expand Down Expand Up @@ -216,7 +214,7 @@
forall name a cols.
( KnownSymbol name
, Columnable a
, (Maybe a) ~ Lookup name cols

Check warning on line 217 in src/DataFrame/Typed/Operations.hs

View workflow job for this annotation

GitHub Actions / hlint 

Suggestion in impute in module DataFrame.Typed.Operations: Redundant bracket ▫︎ Found: "(Maybe a) ~ Lookup name cols" ▫︎ Perhaps: "Maybe a ~ Lookup name cols"
) =>
a ->
TypedDataFrame cols ->
Expand Down