fix: Clean up/fix nix assets #885
No reviewers
nex
transgwender
Labels
No labels
Bug
Cherry-picking
Database
Dependencies
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/Federation
Matrix/MSC
Matrix/Media
Meta
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Wont fix
old/ci/cd
old/rust
No milestone
No project
No assignees
5 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: continuwuation/continuwuity#885
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "Shuroii/continuwuity:the-nix-story"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
This PR:
nix/files usingnixpkgs fmtnixfmtthe-nix-storyto fix: Flakefix: Flaketo chore: Clean up/fix nix assetschore: Clean up/fix nix assetsto WIP: chore: Clean up/fix nix assets265cb5703ftoe9bc416b29Do we use squash commits or merges? Might need to clean up the commits if the latter is true.
WIP: chore: Clean up/fix nix assetsto chore: Clean up/fix nix assetsWe usually try to rebase & fast-forward, but squash in exceptional circumstances
Want me to compact my commits into one, then? Or do something else? I should've probably made formatting the files a separate commit.
You didn't change any code, so this entire thing could probably just be a
stylecommit. If you want I can just squash merge and override the commit title, saves you the troubleI did change some parts of the Nix code, which is responsible for allowing the people that import this flake into their NixOS configuration (or similar) to build and run continuwuity. RocksDB wasn't correctly building and I removed a whole bunch of unused packages (OCI containers, mdbook, etc).
Making it a
fixcommit also works, but I feel likestyleis wrong here.Oh okay my mistake, I only skimmed for
.rschanges lmao. Can merge as a fix if that's proper.I need to figure out what's causing CI to explode first, I literally don't have the option to merge until preflight is green
Yep, take your time.
Found what's causing CI to fail
@ -170,0 +109,4 @@#postPatch = ''# Fix gcc-13 build failures due to missing <cstdint> and# <system_error> includes, fixed upstyream sice 8.xWhoops, slipped by me. That's from nixpkgs.
Gonna fix that.
chore: Clean up/fix nix assetsto fix: Clean up/fix nix assetsHmm, I seem to encounter an error while building RocksDB while using this branch:
Is that something related to this PR? iirc some hash mismatch was mentioned in the main room at some point, idk if it's related
I'll see if I can build musl binaries on NixOS. Only tried the output of
nix buildto verify that it worked, which just builds the default output. Hash mismatch is also fixed in this PR but that's not related to this error; RocksDB just fails to build on musl.FWIW, big formatting commits should be their own commits separate to any changes so they can be added to the git-blame-ignore-revs. Not important when you're rewriting all formatted code in the tho, don't worry about it here
I don't have a great way of testing if it builds, but I did fix the current issue. @nex could you please check if it builds on your system now?
Still fails to compile for
nix build .#static-x86_64-linux-muslRe:
Can we please try to fix up the commits here a bit anyways. It's really hard to review both of the commits with formatting in them and I can't really be sure that nothing slipped through >.<
Difftastic does help with noisy diffs @Aviac, unfortunately, I can't get forgejo to use it.
5dba10af21to065b724341I cleaned up the commits (largely, I think the style commits could be merged into one but I don't know how to do that easily so I'm not gonna touch it) and am now investigating the build issue again.
I don't have my rig until the start of next week, so if someone else could review that'd be grand as I don't have the compute to test
Ran a build on my mac. I have no idea what I'm doing, I just ran
nix buildat the root. I get:But it seems to build successfully! Or at least it exited without erroring.
side note: What is nix even doing half the time? Saying it's compiling dependencies whilst using like one core 😭
Thanks for cleaning it up. Let me know if I can help you with the musl builds (they are still failing Jade (at least for me))
If you give me a specific command to run I can do that tomorrow morning. I haven't used nix before 😅
You can try
nix build .#static-x86_64-linux-muslalthough I don't know if and how that works on darwin nix. I have no experience with nix on MacOS ^^'Well, different error
ZSH⠀> nix build .#static-x86_64-linux-musl error: Cannot build '/nix/store/yhrfv2z3isfgc4z2mg0mf4dn1xs5pjx4-liburing-static-x86_64-unknown-linux-musl-2.11.drv'. Reason: builder failed with exit code 2. Output paths: /nix/store/nfyfyaclzcsqb32xc766x3cgg2pgh9as-liburing-static-x86_64-unknown-linux-musl-2.11-dev /nix/store/r7kgmd6k85nxj74gd88vki2adz931bhr-liburing-static-x86_64-unknown-linux-musl-2.11-debug /nix/store/yffbd24cxy68mr4ajddjj65nq7xap927-liburing-static-x86_64-unknown-linux-musl-2.11 /nix/store/z57shnrf834l071gib4nk9fqkh5kriz9-liburing-static-x86_64-unknown-linux-musl-2.11-man Last 25 log lines: > install -D -m 644 include/liburing.h /nix/store/nfyfyaclzcsqb32xc766x3cgg2pgh9as-liburing-static-x86_64-unknown-linux-musl-2.11-dev/include/liburing.h > install -D -m 644 include/liburing/compat.h /nix/store/nfyfyaclzcsqb32xc766x3cgg2pgh9as-liburing-static-x86_64-unknown-linux-musl-2.11-dev/include/liburing/compat.h > install -D -m 644 include/liburing/barrier.h /nix/store/nfyfyaclzcsqb32xc766x3cgg2pgh9as-liburing-static-x86_64-unknown-linux-musl-2.11-dev/include/liburing/barrier.h > install -D -m 644 include/liburing/io_uring_version.h /nix/store/nfyfyaclzcsqb32xc766x3cgg2pgh9as-liburing-static-x86_64-unknown-linux-musl-2.11-dev/include/liburing/io_uring_version.h > install -D -m 644 liburing.a /nix/store/yffbd24cxy68mr4ajddjj65nq7xap927-liburing-static-x86_64-unknown-linux-musl-2.11/lib/liburing.a > install -D -m 644 liburing-ffi.a /nix/store/yffbd24cxy68mr4ajddjj65nq7xap927-liburing-static-x86_64-unknown-linux-musl-2.11/lib/liburing-ffi.a > install -D -m 755 liburing.so.2.11 /nix/store/yffbd24cxy68mr4ajddjj65nq7xap927-liburing-static-x86_64-unknown-linux-musl-2.11/lib/liburing.so.2.11 > install -D -m 755 liburing-ffi.so.2.11 /nix/store/yffbd24cxy68mr4ajddjj65nq7xap927-liburing-static-x86_64-unknown-linux-musl-2.11/lib/liburing-ffi.so.2.11 > ln -sf liburing.so.2.11 /nix/store/yffbd24cxy68mr4ajddjj65nq7xap927-liburing-static-x86_64-unknown-linux-musl-2.11/lib/liburing.so.2 > ln -sf liburing.so.2.11 /nix/store/yffbd24cxy68mr4ajddjj65nq7xap927-liburing-static-x86_64-unknown-linux-musl-2.11/lib/liburing.so > ln -sf liburing-ffi.so.2.11 /nix/store/yffbd24cxy68mr4ajddjj65nq7xap927-liburing-static-x86_64-unknown-linux-musl-2.11/lib/liburing-ffi.so.2 > ln -sf liburing-ffi.so.2.11 /nix/store/yffbd24cxy68mr4ajddjj65nq7xap927-liburing-static-x86_64-unknown-linux-musl-2.11/lib/liburing-ffi.so > make[1]: Leaving directory '/private/tmp/nix-build-liburing-static-x86_64-unknown-linux-musl-2.11.drv-0/source/src' > install -D -m 644 liburing.pc /nix/store/yffbd24cxy68mr4ajddjj65nq7xap927-liburing-static-x86_64-unknown-linux-musl-2.11/lib/pkgconfig/liburing.pc > install -D -m 644 liburing-ffi.pc /nix/store/yffbd24cxy68mr4ajddjj65nq7xap927-liburing-static-x86_64-unknown-linux-musl-2.11/lib/pkgconfig/liburing-ffi.pc > install -m 755 -d /nix/store/z57shnrf834l071gib4nk9fqkh5kriz9-liburing-static-x86_64-unknown-linux-musl-2.11-man/share/man/man2 > install -m 644 man/*.2 /nix/store/z57shnrf834l071gib4nk9fqkh5kriz9-liburing-static-x86_64-unknown-linux-musl-2.11-man/share/man/man2 > install -m 755 -d /nix/store/z57shnrf834l071gib4nk9fqkh5kriz9-liburing-static-x86_64-unknown-linux-musl-2.11-man/share/man/man3 > install -m 644 man/*.3 /nix/store/z57shnrf834l071gib4nk9fqkh5kriz9-liburing-static-x86_64-unknown-linux-musl-2.11-man/share/man/man3 > install: cannot stat 'man/IO_URING_CHECK_VERSION.3': Too many levels of symbolic links > install: cannot stat 'man/IO_URING_VERSION_MAJOR.3': Too many levels of symbolic links > install: cannot stat 'man/IO_URING_VERSION_MINOR.3': Too many levels of symbolic links > install: cannot stat 'man/io_uring_major_version.3': Too many levels of symbolic links > install: cannot stat 'man/io_uring_minor_version.3': Too many levels of symbolic links > make: *** [Makefile:55: install] Error 1 For full logs, run: nix log /nix/store/yhrfv2z3isfgc4z2mg0mf4dn1xs5pjx4-liburing-static-x86_64-unknown-linux-musl-2.11.drv error: Cannot build '/nix/store/57nlm53y519xw261zz9jcdsvxy5jpglh-conduwuit-static-x86_64-unknown-linux-musl-0.5.0-rc.6.drv'. Reason: 1 dependency failed. Output paths: /nix/store/07jg2gdds5ayib7lzs4cm1miq88h2223-conduwuit-static-x86_64-unknown-linux-musl-0.5.0-rc.6Ok, I'm out of my depth now when it comes to fixing the build issue on musl. Can anyone try to reproduce it on main with just the cargo hash changed? I'd like to know if it was my PR that broke it or if it simply never worked to begin with.
I get the same issue as my last post when building from #891 - I think this is just Nix being unable to cross-build
I don't currently have a linux system with nix to test with right now
Yeah, I run into a different issue each time, I don't think it's related to this PR.
In that case I'll get this merged today
If I may, Im do have a nix linux x86 right now, so I can test with building this
I just built from this, and it works successfully
Drop-in works fine on my x86-linux nixos server
065b724341toe6b1de763ce6b1de763ctob5bf68b8c8