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

Use nix #614

Closed
wants to merge 6 commits into from
Closed

Use nix #614

wants to merge 6 commits into from

Conversation

AndreyMlashkin
Copy link
Contributor

No description provided.

@AndreyMlashkin AndreyMlashkin marked this pull request as draft July 1, 2024 10:07
@AndreyMlashkin AndreyMlashkin force-pushed the use_nix branch 4 times, most recently from c0a8c53 to a0d813c Compare July 5, 2024 09:13
flake.nix Outdated Show resolved Hide resolved
flake.nix Outdated Show resolved Hide resolved
flake.nix Outdated Show resolved Hide resolved
flake.nix Show resolved Hide resolved
@NilFoundation NilFoundation deleted a comment from AndreyMlashkin Jul 5, 2024
flake.nix Outdated Show resolved Hide resolved
flake.nix Outdated Show resolved Hide resolved
flake.nix Outdated Show resolved Hide resolved
flake.nix Outdated Show resolved Hide resolved
.github/workflows/nix_build_linux.yml Outdated Show resolved Hide resolved
.github/workflows/nix_build_linux.yml Show resolved Hide resolved
.github/workflows/nix_build_linux.yml Show resolved Hide resolved
cmake/modules Outdated Show resolved Hide resolved
flake.nix Outdated Show resolved Hide resolved
flake.nix Show resolved Hide resolved
flake.nix Show resolved Hide resolved
flake.nix Outdated Show resolved Hide resolved
flake.nix Outdated Show resolved Hide resolved
.github/workflows/build_macos.yml Outdated Show resolved Hide resolved
bin/assigner/CMakeLists.txt Outdated Show resolved Hide resolved
@AndreyMlashkin AndreyMlashkin force-pushed the use_nix branch 4 times, most recently from 5288fba to e919736 Compare July 8, 2024 11:09
.github/workflows/release_linux.yml Show resolved Hide resolved
bin/recursive_gen/CMakeLists.txt Outdated Show resolved Hide resolved
Comment on lines 49 to 48
${CMAKE_SOURCE_DIR}/libs/assigner/include
${CMAKE_SOURCE_DIR}/libs/transpiler/include
Copy link
Contributor

Choose a reason for hiding this comment

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

The same

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Contributor

Choose a reason for hiding this comment

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

libs/transpiler/include still remains

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've tried removing it, it seems, it does not export the targets the right way.

${CMAKE_CURRENT_SOURCE_DIR}/../../libs/circifier/utils/bazel/llvm-project-overlay/llvm/include
${CMAKE_SOURCE_DIR}/libs/circifier/llvm/include
${CMAKE_SOURCE_DIR}/libs/circifier/utils/bazel/llvm-project-overlay/llvm/include
${CMAKE_SOURCE_DIR}/libs/assigner/include
Copy link
Contributor

Choose a reason for hiding this comment

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

The same

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Contributor

Choose a reason for hiding this comment

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

libs/assigner/include still remains

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've tried removing it, it seems, it does not export the targets the right way.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, it is not enough just to remove it. But you can restore crypto3::assigner and crypto3::transpiler as it was at lines 55-56 of the previous version of the file. It is basically the same way as you have just fixed bin/recursive_gen/CMakeLists.txt, so I am almost sure that it would work.

Copy link

@akokoshn akokoshn Jul 17, 2024

Choose a reason for hiding this comment

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

Let's try use interface libraries: crypto3::assigner and crypto3::transpiler.
Sound like quick change. If doesn't works - keep as is

tests/cpp/CMakeLists.txt Show resolved Hide resolved
tests/cpp/CMakeLists.txt Outdated Show resolved Hide resolved
zkllvm.nix Show resolved Hide resolved
flake.nix Show resolved Hide resolved
@AndreyMlashkin AndreyMlashkin force-pushed the use_nix branch 2 times, most recently from 4d8469b to a0cc252 Compare July 9, 2024 14:37
CMakeLists.txt Show resolved Hide resolved
flake.nix Show resolved Hide resolved
flake.nix Outdated Show resolved Hide resolved
flake.nix Show resolved Hide resolved
zkllvm.nix Outdated Show resolved Hide resolved
zkllvm.nix Show resolved Hide resolved
@AndreyMlashkin AndreyMlashkin force-pushed the use_nix branch 3 times, most recently from 07c8201 to 1bd3267 Compare July 9, 2024 14:54
CMakeLists.txt Outdated Show resolved Hide resolved
@akokoshn akokoshn self-requested a review July 17, 2024 13:03
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.

7 participants