Skip to content

Improve nix flake #200

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 4 commits into from
Apr 27, 2026
Merged

Improve nix flake #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ab8e9b
nix: Update hash of granite in flake.nix
jisantuc Apr 27, 2026
42058e5
nix: Remove unnecessary dependencies
jisantuc Apr 27, 2026
927aa0a
nix: Include dataframe-persistent in output packages
jisantuc Apr 27, 2026
2af0b43
nix: Make dataframe-persistent file a regular file
jisantuc Apr 27, 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
1 change: 0 additions & 1 deletion dataframe-persistent/LICENSE
View file
Open in desktop
Copy link
Copy Markdown
Contributor Author

@jisantuc jisantuc Apr 27, 2026

Choose a reason for hiding this comment

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

This is a little confusing. I updated the LICENSE in dataframe-persistent from a link to the dataframe license to a regular file containing the text of the dataframe license. That was important for callCabal2Nix reasons.

However, I'm not sure it was a valid thing to do -- dataframe-persistent claims to be licensed as GPL-3.0-or-later. dataframe claims to be licensed under the MIT license. I'm pretty sure those aren't the same license, but in the repo the two libraries shared the same license text.

This file was deleted.

20 changes: 20 additions & 0 deletions dataframe-persistent/LICENSE
View file
Open in desktop
Copy link
Copy Markdown
Contributor Author

@jisantuc jisantuc Apr 27, 2026

Choose a reason for hiding this comment

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

This is a little confusing. I updated the LICENSE in dataframe-persistent from a link to the dataframe license to a regular file containing the text of the dataframe license. That was important for callCabal2Nix reasons.

However, I'm not sure it was a valid thing to do -- dataframe-persistent claims to be licensed as GPL-3.0-or-later. dataframe claims to be licensed under the MIT license. I'm pretty sure those aren't the same license, but in the repo the two libraries shared the same license text.

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Copyright (c) 2026 Michael Chavinda

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15 changes: 6 additions & 9 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,22 @@
repo = "granite";
owner = "mchav";
rev = "main";
hash = "sha256-ypDiV99w2J8q7XcMpFWkv0kEm2dtWZduWIkAsuXDHEo=";
hash = "sha256-Z/o8gxMOBltKiaL0NEjMUyOvUljRvKErWeM6Ul3GM9k=";
};

hsPkgs = pkgs.haskellPackages.extend (self: super: rec {
hsPkgs = pkgs.haskellPackages.extend (self: super: {
granite = self.callCabal2nix "granite" granitePkg { };
dataframe-fastcsv = self.callCabal2nix "dataframe-fastcsv" ./dataframe-fastcsv {
inherit parallel;
Copy link
Copy Markdown
Contributor Author

@jisantuc jisantuc Apr 27, 2026

Choose a reason for hiding this comment

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

It was apparently unnecessary to pass these deps explicitly, since the dependencies are already present in the packages defined here

};
dataframe = self.callCabal2nix "dataframe" ./. {
inherit granite;
};
parallel = super.parallel_3_3_0_0;
dataframe-fastcsv = self.callCabal2nix "dataframe-fastcsv" ./dataframe-fastcsv { };
dataframe-persistent = self.callCabal2nix "dataframe-fastcsv" ./dataframe-persistent { };
dataframe = self.callCabal2nix "dataframe" ./. { };
});
in
{
packages = {
default = hsPkgs.dataframe;
dataframe = hsPkgs.dataframe;
dataframe-fastcsv = hsPkgs.dataframe-fastcsv;
dataframe-persistent = hsPkgs.dataframe-persistent;
};

devShells.default = hsPkgs.shellFor {
Expand Down
Loading