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

Nix update and cleanups #83

Merged
merged 6 commits into from
Jan 4, 2024
Merged

Nix update and cleanups #83

merged 6 commits into from
Jan 4, 2024

Conversation

nbdd0121
Copy link
Contributor

@nbdd0121 nbdd0121 commented Dec 22, 2023

Depends on #85

Copy link
Contributor

@hcallahan-lowrisc hcallahan-lowrisc left a comment

Choose a reason for hiding this comment

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

One comment, rest LGTM 👍

flake.nix Outdated
@@ -45,15 +42,12 @@
# riscv-arch = "rv32imc";
# };

pythonEnv = pkgs.python3.withPackages (
Copy link
Contributor

Choose a reason for hiding this comment

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

To me it makes more sense to assemble python environments on a per-project basis, pulling in patched versions of dependencies from lowrisc-nix when needed. I don't really see the point of keeping the env itself in the common repo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have converted the env to use poetry

flake.nix Outdated Show resolved Hide resolved
flake.nix Outdated Show resolved Hide resolved
flake.nix Outdated
Comment on lines 122 to 123
if [ -z "$DIRENV_IN_ENVRC" ]; then
cat <<'EOF'
Copy link
Contributor

Choose a reason for hiding this comment

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

Indentation look strange?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Bash heredoc doesn't support indentation

* Removed verilator overlay. It's sufficient to add the dependencies to buildInputs
* Remove unneeded comment and code
* Use toolchain from lowrisc-nix
@nbdd0121 nbdd0121 merged commit 7abf2d6 into lowRISC:main Jan 4, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants