continuwuation/continuwuity
continuwuation/continuwuity
15
86
Fork 98
Code Issues 127 Pull requests 18 Releases 28 Packages 3 Activity Actions 10

fix: nix devShell fixups #1397

Manually merged
Jade merged 2 commits from kraem/continuwuity:fix/nix_env_fixups into main 2026-04-08 14:24:28 +00:00
Conversation 15 Commits 2 Files changed 1 +6
kraem commented 2026-02-16 21:07:20 +00:00
Contributor
Copy link

This pull request fixes some issues found with the nix devShell:

  • use the nightly cargo fmt from the rust toolchain specified (i still haven't fixed prefligit running with cargo +nightly fmt where +fmt is rustup specific)
  • provide missing libraries in LD_LIBRARY_PATH to successfully run cargo test

I'm guessing @aviac wants to review these changes? :)

Pull request checklist:

  • This pull request targets the main branch, and the branch is named something other than
    main.
  • I have written an appropriate pull request title and my description is clear.
  • I understand I am responsible for the contents of this pull request.
  • I have followed the contributing guidelines:
<!-- In order to help reviewers know what your pull request does at a glance, you should ensure that 1. Your PR title is a short, single sentence describing what you changed 2. You have described in more detail what you have changed, why you have changed it, what the intended effect is, and why you think this will be beneficial to the project. If you have made any potentially strange/questionable design choices, but didn't feel they'd benefit from code comments, please don't mention them here - after opening your pull request, go to "files changed", and click on the "+" symbol in the line number gutter, and attach comments to the lines that you think would benefit from some clarification. --> This pull request fixes some issues found with the nix devShell: - use the nightly cargo fmt from the rust toolchain specified (i still haven't fixed prefligit running with `cargo +nightly fmt `where +fmt is rustup specific) - provide missing libraries in LD_LIBRARY_PATH to successfully run `cargo test` I'm guessing @aviac wants to review these changes? :) <!-- Example: This pull request allows us to warp through time and space ten times faster than before by double-inverting the warp drive with hyperheated jump fluid, both making the drive faster and more efficient. This resolves the common issue where we have to wait more than 10 milliseconds to engage, use, and disengage the warp drive when travelling between galaxies. --> <!-- Closes: #... --> <!-- Fixes: #... --> <!-- Uncomment the above line(s) if your pull request fixes an issue or closes another pull request by superseding it. Replace `#...` with the issue/pr number, such as `#123`. --> **Pull request checklist:** <!-- You need to complete these before your PR can be considered. If you aren't sure about some, feel free to ask for clarification in #dev:continuwuity.org. --> - [x] This pull request targets the `main` branch, and the branch is named something other than `main`. - [x] I have written an appropriate pull request title and my description is clear. - [x] I understand I am responsible for the contents of this pull request. - I have followed the [contributing guidelines][c1]: - [x] My contribution follows the [code style][c2], if applicable. - [x] I ran [pre-commit checks][c1pc] before opening/drafting this pull request. - [x] I have [tested my contribution][c1t] (or proof-read it for documentation-only changes) myself, if applicable. This includes ensuring code compiles. - [x] My commit messages follow the [commit message format][c1cm] and are descriptive. - [-] I have written a [news fragment][n1] for this PR, if applicable<!--(can be done after hitting open!)-->. <!-- Notes on these requirements: - While not required, we encourage you to sign your commits with GPG or SSH to attest the authenticity of your changes. - While we allow LLM-assisted contributions, we do not appreciate contributions that are low quality, which is typical of machine-generated contributions that have not had a lot of love and care from a human. Please do not open a PR if all you have done is asked ChatGPT to tidy up the codebase with a +-100,000 diff. - In the case of code style violations, reviewers may leave review comments/change requests indicating what the ideal change would look like. For example, a reviewer may suggest you lower a log level, or use `match` instead of `if/else` etc. - In the case of code style violations, pre-commit check failures, minor things like typos/spelling errors, and in some cases commit format violations, reviewers may modify your branch directly, typically by making changes and adding a commit. Particularly in the latter case, a reviewer may rebase your commits to squash "spammy" ones (like "fix", "fix", "actually fix"), and reword commit messages that don't satisfy the format. - Pull requests MUST pass the `Checks` CI workflows to be capable of being merged. This can only be bypassed in exceptional circumstances. If your CI flakes, let us know in matrix:r/dev:continuwuity.org. - Pull requests have to be based on the latest `main` commit before being merged. If the main branch changes while you're making your changes, you should make sure you rebase on main before opening a PR. Your branch will be rebased on main before it is merged if it has fallen behind. - We typically only do fast-forward merges, so your entire commit log will be included. Once in main, it's difficult to get out cleanly, so put on your best dress, smile for the cameras! --> [c1]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md [c2]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/docs/development/code_style.mdx [c1pc]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#pre-commit-checks [c1t]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#running-tests-locally [c1cm]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#commit-messages [n1]: https://towncrier.readthedocs.io/en/stable/tutorial.html#creating-news-fragments
benbot commented 2026-02-16 21:35:07 +00:00
Contributor
Copy link

FWIW, i also have some devshell fixes in my PR
#1326/files

FWIW, i also have some devshell fixes in my PR https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1326/files#diff-917482f5520ddb3e4c6a82c53ddc9874c40ae054
kraem commented 2026-02-17 07:44:00 +00:00
Author
Contributor
Copy link

@benbot wrote in #1397 (comment):

FWIW, i also have some devshell fixes in my PR #1326/files

i see. i'll comment on your new pr.

@benbot wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1397#issuecomment-24352: > FWIW, i also have some devshell fixes in my PR #1326/files i see. i'll comment on your new pr.
benbot commented 2026-02-18 15:23:38 +00:00
Contributor
Copy link

Hey @kraem (going to continue convo here since it seems like we're going to close my other PR in favor of this one), so i know we needed some of those packages in the LD_LIBRARY_PATH. IIRC it was when I tried running cargo test

When i get off work later I'll double check which ones I needed.

Hey @kraem (going to continue convo here since it seems like we're going to close my other PR in favor of this one), so i know we needed _some_ of those packages in the `LD_LIBRARY_PATH`. IIRC it was when I tried running `cargo test` When i get off work later I'll double check which ones I needed.
benbot commented 2026-02-18 16:03:47 +00:00
Contributor
Copy link

oh!

i found a thing about crane!
https://crane.dev/local_development.html

we should be able to just grab the exact packages we use to build and put them in the devShell!

oh! i found a thing about crane! https://crane.dev/local_development.html we should be able to just grab the exact packages we use to build and put them in the devShell!
kraem commented 2026-02-19 21:46:25 +00:00
Author
Contributor
Copy link

@benbot wrote in #1397 (comment):

oh!

i found a thing about crane! https://crane.dev/local_development.html

we should be able to just grab the exact packages we use to build and put them in the devShell!

good catch.

maybe we could just combine the dev-toolchain (to get cargo fmt nightly) we're creating with fenix and deps we're creating with crane.

honestly i feel like the nix exprs to create the packages and dev env is unnecessarily complex and split up in to a bit too many places.

edit:

i just took a stab at this and i can't get conduwuit-all-features-deps to build, which we'd need to get everything we'd need using cranes inputsFrom and clean out the locally (for the devShell) defined rocksdbAllFeatures

@benbot wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1397#issuecomment-24502: > oh! > > i found a thing about crane! https://crane.dev/local_development.html > > we should be able to just grab the exact packages we use to build and put them in the devShell! good catch. maybe we could just combine the `dev-toolchain` (to get cargo fmt nightly) we're creating with fenix and `deps` we're creating with crane. honestly i feel like the nix exprs to create the packages and dev env is unnecessarily complex and split up in to a bit too many places. edit: i just took a stab at this and i can't get conduwuit-all-features-deps to build, which we'd need to get everything we'd need using cranes `inputsFrom` and clean out the locally (for the devShell) defined `rocksdbAllFeatures`
Jade commented 2026-02-19 23:50:28 +00:00
Owner
Copy link

all-features fould be using the feature full rather than literally all features because some features are mutually incompatible and some require weird flags like http3

all-features fould be using the feature full rather than literally all features because some features are mutually incompatible and some require weird flags like http3
benbot commented 2026-02-20 04:51:06 +00:00
Contributor
Copy link

@kraem wrote in #1397 (comment):

@benbot wrote in #1397 (comment):

oh!
i found a thing about crane! https://crane.dev/local_development.html
we should be able to just grab the exact packages we use to build and put them in the devShell!

good catch.

maybe we could just combine the dev-toolchain (to get cargo fmt nightly) we're creating with fenix and deps we're creating with crane.

honestly i feel like the nix exprs to create the packages and dev env is unnecessarily complex and split up in to a bit too many places.

edit:

i just took a stab at this and i can't get conduwuit-all-features-deps to build, which we'd need to get everything we'd need using cranes inputsFrom and clean out the locally (for the devShell) defined rocksdbAllFeatures

Why doesn't it build? What's the error?
For me, i still needed to set the library paths and include jemalloc

@kraem wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1397#issuecomment-24599: > @benbot wrote in #1397 (comment): > > > oh! > > i found a thing about crane! https://crane.dev/local_development.html > > we should be able to just grab the exact packages we use to build and put them in the devShell! > > good catch. > > maybe we could just combine the `dev-toolchain` (to get cargo fmt nightly) we're creating with fenix and `deps` we're creating with crane. > > honestly i feel like the nix exprs to create the packages and dev env is unnecessarily complex and split up in to a bit too many places. > > edit: > > i just took a stab at this and i can't get conduwuit-all-features-deps to build, which we'd need to get everything we'd need using cranes `inputsFrom` and clean out the locally (for the devShell) defined `rocksdbAllFeatures` Why doesn't it build? What's the error? For me, i still needed to set the library paths and include jemalloc
Jade force-pushed fix/nix_env_fixups from cfe555c47c
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m49s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m57s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 12m35s
Details
to f19c1fdc2f
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m24s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m40s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 25m22s
Details
2026-02-23 15:31:43 +00:00 Compare
Jade commented 2026-02-23 15:32:29 +00:00
Owner
Copy link

Is this OK to merge?

Is this OK to merge?
kraem commented 2026-02-23 17:26:02 +00:00
Author
Contributor
Copy link

@Jade wrote in #1397 (comment):

Is this OK to merge?

i can try my previous attempt again using inputsFrom now that #1422 is merged when i'm not afk

@Jade wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1397#issuecomment-24896: > Is this OK to merge? i can try my previous attempt again using `inputsFrom` now that https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1422 is merged when i'm not afk
Aranjedeath commented 2026-02-27 19:12:44 +00:00
Owner
Copy link

@kraem wrote in #1397 (comment):

@Jade wrote in #1397 (comment):

Is this OK to merge?

i can try my previous attempt again using inputsFrom now that #1422 is merged when i'm not afk

perfect -- ping us here or in the development matrix room when ready :)

@kraem wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1397#issuecomment-24937: > @Jade wrote in #1397 (comment): > > > Is this OK to merge? > > i can try my previous attempt again using `inputsFrom` now that #1422 is merged when i'm not afk perfect -- ping us here or in the development matrix room when ready :)
Henry-Hiles commented 2026-03-24 13:23:08 +00:00
Contributor
Copy link

@kraem Hey, how's it going, have you ran into any issues?

@kraem Hey, how's it going, have you ran into any issues?
Aviac reviewed 2026-03-24 14:15:39 +00:00
nix/shells/default.nix
@ -25,2 +25,4 @@
self'.packages.dev-toolchain
];
env.LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ];
env.LD_LIBRARY_PATH = lib.makeLibraryPath [
Aviac commented 2026-03-24 14:15:39 +00:00
Member
Copy link

Could you try doing this here instead?

codeberg.org/Aviac/codeberg-cli@f9906e080d/nix/packages/berg.nix (L25-L26)

I've had a conversation once with a nixpkgs maintainer about stuff like this and the rpath patching via RUSTFLAGS is less intrusive than settings LD_LIBRARY_PATH which might apply to more things than just in the environment than just the target package.

Maybe it doesn't work out in the end, then LD_LIBRARY_PATH should be fine I guess

Could you try doing this here instead? https://codeberg.org/Aviac/codeberg-cli/src/commit/f9906e080d835cf5a67c1f553e1bda21fe0a403c/nix/packages/berg.nix#L25-L26 I've had a conversation once with a nixpkgs maintainer about stuff like this and the rpath patching via RUSTFLAGS is less intrusive than settings LD_LIBRARY_PATH which might apply to more things than just in the environment than just the target package. Maybe it doesn't work out in the end, then LD_LIBRARY_PATH should be fine I guess
Henry-Hiles commented 2026-03-31 21:41:42 +00:00
Contributor
Copy link

@kraem Hey, I did some of this now in #1596, I put you as Co-Authored-By in the devshell commit, let me know if this isn't okay. Thanks!

@kraem Hey, I did some of this now in #1596, I put you as Co-Authored-By in the devshell commit, let me know if this isn't okay. Thanks!
kraem commented 2026-04-02 12:29:38 +00:00
Author
Contributor
Copy link

sorry about the mia.

@Henry-Hiles yeah sure :)

sorry about the mia. @Henry-Hiles yeah sure :)
Henry-Hiles commented 2026-04-08 14:12:54 +00:00
Contributor
Copy link

This can now be closed, it's been added in #1596 :)

This can now be closed, it's been added in #1596 :)
Jade manually merged commit c278663f65 into main 2026-04-08 14:24:28 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Blocked
This pull request or issue is currently blocked from being merged/closed

  
Bug
Something isn't working as intended

  
Changelog
Added
 Changelog entry added

  
Changelog
Missing
 No changelog when one is needed

  
Changelog
None
 Changelog is unnecesary for this change

  
Cherry-picking
Commits picked from other conduit projects

  
Database
This requires or includes changes to the database

  
Dependencies
Something dependency related

  
Dependencies/Renovate
Automatic dependency upgrades by Renovate

  
Difficulty
Easy
 Low difficulty to implement - touches few parts of the codebase, low complexity

  
Difficulty
Hard
 High difficulty to implement - touches many parts of the codebase, high complexity

  
Difficulty
Medium
 Medium difficulty to implement - touches more parts of the codebase, higher complexity

  
Documentation
Improvements or additions to documentation

  
Enhancement
New feature or request

  
Good first issue
Good for newcomers

  
Help wanted
Additional eyes and keyboards are required for this one

  
Inherited
Issues that have been inhereted from the project pre-fork

  
Matrix/Administration
Features pertaining to homeserver administration

  
Matrix/Appservices
Features pertaining to the appservice API

  
Matrix/Auth
Features pertaining to authentication

  
Matrix/Client
Features pertaining to client-to-server interactions

  
Matrix/Core
Issues relating to core matrix functionality, such as state resolution and PDU formats

  
Matrix/E2EE
Issues related to end to end encryption

  
Matrix/Federation
Features pertaining to server-to-server interactions

  
Matrix/Hydra
Issues related to room version 12 and related changes (temporary label)

  
Matrix/MSC
Features pertaining to unstable matrix features

  
Matrix/Media
Features pertaining to media interactions

  
Matrix/T&S
Changes or issues related to trust & safety tooling

  
Merge
This PR is ready to be merged

  
Merge/Manual
This PR should be manually merged

  
Merge/Squash
This PR should be squashed when it is merged

  
Meta
Related to housekeeping, maintenance, or other repo-meta.

  
Meta/CI
Issues related to CI changes

  
Meta/Packaging
Packaging

  
Priority
Blocking
 This issue is blocking the next release

  
Priority
High
 This issue is very important

  
Priority
Low
 This issue is of a rather low priority

  
Security
This item is related to general security

  
Status
Confirmed
 This issue has enough information and is confirmed

  
Status
Duplicate
 This issue or pull request already exists

  
Status
Invalid
 This issue doesn't seem right

  
Status
Needs Investigation
 This issue needs further investigation

  
Support
Questions or support requests

  
Wont fix
This will not be worked on

  
old/ci/cd
Ci/CD

Archived

  
old/rust
Pull requests that update Rust code

Archived

No labels
Blocked
Bug
Changelog
Added
Changelog
Missing
Changelog
None
Cherry-picking
Database
Dependencies
Dependencies/Renovate
Difficulty
Easy
Difficulty
Hard
Difficulty
Medium
Documentation
Enhancement
Good first issue
Help wanted
Inherited
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Core
Matrix/E2EE
Matrix/Federation
Matrix/Hydra
Matrix/MSC
Matrix/Media
Matrix/T&S
Merge
Merge/Manual
Merge/Squash
Meta
Meta/CI
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Support
Wont fix
old/ci/cd
old/rust
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
6 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
continuwuation/continuwuity!1397
No description provided.