indi-full: Indi 3rdparty refactor #306650
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Result of 56 packages built:
|
returntoreality
force-pushed
the
indi-3rdparty-refactor
branch
from
f946db2
to
74734db
Compare
sheepforce
approved these changes
Apr 25, 2024
|
Thanks! Regarding the r-ryantm bot, I don't think it fixes it. I think indilib needs a |
returntoreality
force-pushed
the
indi-3rdparty-refactor
branch
2 times, most recently
from
df3225f
to
06334a1
Compare
Aleksanaa
changed the title
returntoreality
force-pushed
the
indi-3rdparty-refactor
branch
from
06334a1
to
177878a
Compare
|
I think it can be merged now, I rebased it to the current master. |
returntoreality
force-pushed
the
indi-3rdparty-refactor
branch
2 times, most recently
from
8fd25c0
to
997dd7c
Compare
sheepforce
reviewed
Jun 17, 2024
JohnRTitor
reviewed
Jun 23, 2024
returntoreality
force-pushed
the
indi-3rdparty-refactor
branch
2 times, most recently
from
f3bbf21
to
10e2a61
Compare
sheepforce
suggested changes
Aug 5, 2024
There was a problem hiding this comment.
This looks like a very good idea overall, thank you!
Two (hopefully) minor things left:
- There is a merge conflict to be resolved
- It fails on aarch64-linux as it tries to compile with Raspberry Pi GPIO support. Ofborg has the error log here https://logs.ofborg.org/?key=nixos/nixpkgs.306650&attempt_id=c546a1ea-0537-4f2e-b08c-f8d3dd622a59 and it looks like
pigpiod_if2.his missing. I'm not sure whether this is because the builder is not a RPi or if there is actually a dependency not declared?
I think we should merge this, after these two are resolved :)
returntoreality
force-pushed
the
indi-3rdparty-refactor
branch
4 times, most recently
from
59c4f2d
to
74fdd39
Compare
JohnRTitor
reviewed
Aug 17, 2024
returntoreality
force-pushed
the
indi-3rdparty-refactor
branch
from
74fdd39
to
331793a
Compare
This splits the 3rdparty drivers into seperate packages as recommended by upstream. This also allows to build a indi-full equivalent with only the needed drivers. Also add indi-full-nonfree with all the nonfree drivers. And remove them from indi-full.
returntoreality
force-pushed
the
indi-3rdparty-refactor
branch
from
331793a
to
d2367c3
Compare
|
Thanks for the reviews!
This is solved now, moved the changelog entry to a random position so hopefully it won't have a conflict anytime soon.
I disabled the driver, this apparently relies on the pigpio library/service which is not avalable in nixpkgs currently.
That would be great! |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/4464 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
This is refactoring the indi 3rdparty drivers into their own derivations instead of having the firmware and 3rdparty derivations. This also sets the architecture support for each driver and assign the correct licences (before the unfree binary blobs from the 3rdparty repo were not marked as unfree). indi-full is now containing only free drivers and there is a new indi-full-nonfree which also contains the nonfree drivers.
I also added myself to the maintainers.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.