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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

monado: Add missing package in buildInputs and alphabetize #298083

Merged
merged 1 commit into from
Mar 26, 2024

Conversation

Pandapip1
Copy link
Contributor

@Pandapip1 Pandapip1 commented Mar 22, 2024

Description of changes

libXext was included in the function inputs, but was not included in the actual inputs. Additionally, a couple packages were out of order.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • [ x Fits CONTRIBUTING.md.

Add a 馃憤 reaction to pull requests you find important.

@prusnak
Copy link
Member

prusnak commented Mar 22, 2024

in the function inputs

Please also sort the function inputs the same way (only the ones that are used for buildInputs)

@Pandapip1
Copy link
Contributor Author

@prusnak ready for re-review

@prusnak
Copy link
Member

prusnak commented Mar 22, 2024

@prusnak ready for re-review

  • cjson is not where it should be in function inputs
  • wayland-protocols and wayland-scanners are swapped in buildInputs
  • SDL2 is not sorted in neither function inputs and buildInputs

Also when you are done with these changes, please squash all commits into a single one

Thanks!

@Pandapip1
Copy link
Contributor Author

Done!

@Pandapip1
Copy link
Contributor Author

CC @prusnak

@prusnak prusnak merged commit e80d1b6 into NixOS:master Mar 26, 2024
23 checks passed
@Pandapip1 Pandapip1 deleted the patch-1 branch March 27, 2024 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants