Skip to content

nix: Make project config consistent #204

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 6 commits into from
Jul 9, 2026
Merged

nix: Make project config consistent #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
164ff54
nix: Make project config consistent
jisantuc Jun 6, 2026
e6e831f
Regenerate haskell-ci.yml with flake-locked haskell-ci
jisantuc Jul 6, 2026
789fd16
Pass format check
jisantuc Jul 6, 2026
46c7aaf
Include expr-serializer in cabal.project.ci
jisantuc Jul 6, 2026
eef5f3b
Merge remote-tracking branch 'origin' into nix/js/update-flake
mchav Jul 9, 2026
ae79945
feat: Add manual patch for text
mchav Jul 9, 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
244 changes: 162 additions & 82 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ dataframe_benchmark/
bin/
coverage-html
.DS_Store
flake.lock
tags
__pycache__
venv
Expand All @@ -45,4 +44,4 @@ Cargo.lock
# (transient; the committed *.db fixtures themselves stay tracked).
*.db-wal
*.db-shm
*.db-journal
*.db-journal
1 change: 1 addition & 0 deletions cabal.project.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
packages:
.
dataframe-core
dataframe-expr-serializer
dataframe-parsing
dataframe-operations
dataframe-csv
Expand Down
2 changes: 1 addition & 1 deletion examples/examples.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
194 changes: 194 additions & 0 deletions flake.lock
View file
Open in desktop

@jisantuc jisantuc Jun 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flake.lock tracks hashes of inputs like nixpkgs to make sure people using nix build with the same package sets. It's an essential file to be in version control.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

109 changes: 92 additions & 17 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,124 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
pinch = {
url = "github:abhinav/pinch";
flake = false;
};
network-run = {
url = "github:kazu-yamamoto/network-run";
flake = false;
};
granite = {
url = "github:mchav/granite";
flake = false;
};
haskell-ci-flake = {
url = ./nix/haskell-ci-flake;
};
};

outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
outputs =
inputs@{
self,
nixpkgs,
flake-utils,
...
}:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
granitePkg = pkgs.fetchFromGitHub {
repo = "granite";
owner = "mchav";
rev = "main";
hash = "sha256-Z/o8gxMOBltKiaL0NEjMUyOvUljRvKErWeM6Ul3GM9k=";
};

hsPkgs = pkgs.haskellPackages.extend (self: super: {
granite = self.callCabal2nix "granite" granitePkg { };
dataframe-fastcsv = self.callCabal2nix "dataframe-fastcsv" ./dataframe-fastcsv { };
dataframe-persistent = self.callCabal2nix "dataframe-persistent" ./dataframe-persistent { };
dataframe-hasktorch = self.callCabal2nix "dataframe-hasktorch" ./dataframe-hasktorch { };
dataframe = self.callCabal2nix "dataframe" ./. { };
});
hsPkgs = pkgs.haskellPackages.extend (
self: super: {
haskell-ci = inputs.haskell-ci-flake.packages.${system}.default;
network-run = self.callCabal2nix "network-run" inputs.network-run { };
dataframe-arrow = self.callCabal2nix "dataframe-arrow" ./dataframe-arrow { };
dataframe-core = self.callCabal2nix "dataframe-core" ./dataframe-core { };
dataframe-csv = self.callCabal2nix "dataframe-csv" ./dataframe-csv { };
dataframe-csv-th = self.callCabal2nix "dataframe-csv-th" ./dataframe-csv-th { };
dataframe-expr-serializer =
self.callCabal2nix "dataframe-expr-serializer" ./dataframe-expr-serializer
{ };
dataframe-fastcsv = self.callCabal2nix "dataframe-fastcsv" ./dataframe-fastcsv { };
# dataframe-fusion = self.callCabal2nix "dataframe-fusion" ./dataframe-fusion { };
dataframe-hasktorch = self.callCabal2nix "dataframe-hasktorch" ./dataframe-hasktorch { };
dataframe-huggingface = self.callCabal2nix "dataframe-huggingface" ./dataframe-huggingface { };
dataframe-json = self.callCabal2nix "dataframe-json" ./dataframe-json { };
dataframe-lazy = self.callCabal2nix "dataframe-lazy" ./dataframe-lazy { };
dataframe-learn = self.callCabal2nix "dataframe-learn" ./dataframe-learn {
parallel = pkgs.haskell.lib.dontCheck (self.callHackage "parallel" "3.3.0.0" { });
};
dataframe-operations = self.callCabal2nix "dataframe-operations" ./dataframe-operations { };
dataframe-parquet = self.callCabal2nix "dataframe-parquet" ./dataframe-parquet {
pinch = self.callCabal2nix "pinch" inputs.pinch { };
};
dataframe-parquet-th = self.callCabal2nix "dataframe-parquet-th" ./dataframe-parquet-th { };
dataframe-parsing = self.callCabal2nix "dataframe-parsing" ./dataframe-parsing { };
dataframe-persistent = self.callCabal2nix "dataframe-persistent" ./dataframe-persistent { };
dataframe-th = self.callCabal2nix "dataframe-th" ./dataframe-th { };
dataframe-viz = self.callCabal2nix "dataframe-viz" ./dataframe-viz {
granite = self.callCabal2nix "granite" inputs.granite { };
};
dataframe = self.callCabal2nix "dataframe" ./. { };
}
);
in
{
packages = {
default = hsPkgs.dataframe;
dataframe = hsPkgs.dataframe;
dataframe-arrow = hsPkgs.dataframe-arrow;
dataframe-core = hsPkgs.dataframe-core;
dataframe-csv = hsPkgs.dataframe-csv;
dataframe-csv-th = hsPkgs.dataframe-csv-th;
dataframe-fastcsv = hsPkgs.dataframe-fastcsv;
# dataframe-fusion = hsPkgs.dataframe-fusion;
dataframe-hasktorch = hsPkgs.dataframe-hasktorch;
dataframe-json = hsPkgs.dataframe-json;
dataframe-lazy = hsPkgs.dataframe-lazy;
dataframe-learn = hsPkgs.dataframe-learn;
dataframe-operations = hsPkgs.dataframe-operations;
dataframe-parquet = hsPkgs.dataframe-parquet;
dataframe-parquet-th = hsPkgs.dataframe-parquet-th;
dataframe-parsing = hsPkgs.dataframe-parsing;
dataframe-persistent = hsPkgs.dataframe-persistent;
dataframe-th = hsPkgs.dataframe-th;
dataframe-viz = hsPkgs.dataframe-viz;
};

devShells.default = hsPkgs.shellFor {
packages = ps: [
ps.dataframe
ps.dataframe-arrow
ps.dataframe-core
ps.dataframe-csv
ps.dataframe-csv-th
ps.dataframe-expr-serializer
ps.dataframe-fastcsv
ps.dataframe-persistent
# ps.dataframe-fusion
ps.dataframe-hasktorch
ps.dataframe-huggingface
ps.dataframe-json
ps.dataframe-lazy
ps.dataframe-learn
ps.dataframe-operations
ps.dataframe-parquet
ps.dataframe-parquet-th
ps.dataframe-parsing
ps.dataframe-persistent
ps.dataframe-th
ps.dataframe-viz
];
nativeBuildInputs = with hsPkgs; [
ghc
cabal-install
haskell-language-server
haskell-ci
];
withHoogle = true;
};
});
}
);
}
Loading
Loading