Skip to content
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.

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

Move poetryOverrides to lib #10

Merged
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
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
...
} @ inputs: let
no_system_outputs = {
poetryOverrides = import ./poetryOverrides.nix;
lib.poetryOverrides = import ./lib/poetryOverrides.nix;
};

all_system_outputs = flake-utils.lib.eachDefaultSystem (system: let
Expand Down
13 changes: 11 additions & 2 deletions poetryOverrides.nix → lib/poetryOverrides.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,18 @@
preferWheel = true;
};
libcst = prev.libcst.override {
# Missing rustc/cargo etc.
# buildInputs = (old.buildInputs or []) ++ [ final.setuptools-rust ];
preferWheel = true;
# }).overridePythonAttrs ( old: {
# # This fix is incomplete, and appears to be due to the issue here:
# # https://github.com/nix-community/poetry2nix/issues/413
# # https://github.com/nix-community/poetry2nix/issues/442
# buildInputs = (old.buildInputs or []) ++ [
# pkgs.rustc
# pkgs.cargo
# # pkgs.rustPlatform.cargoSetupHook
# final.setuptools-rust
# ];
# });
};
isort = prev.isort.override {
# Some problem building due to a malformed semantic version string.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/python_ot/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
...
}: let
poetry2nix = inputs.poetry2nix.lib.mkPoetry2Nix {inherit pkgs;};
poetryOverrides = inputs.self.poetryOverrides {inherit pkgs;};
poetryOverrides = inputs.self.lib.poetryOverrides {inherit pkgs;};
in
poetry2nix.mkPoetryEnv {
projectDir = ./.;
Expand Down