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.

Sign up for GitHub

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

Jump to bottom

lomiri: init basic development stuff #236282

Merged
merged 11 commits into from
Jul 5, 2023
Merged

lomiri: init basic development stuff #236282

merged 11 commits into from
Jul 5, 2023

Conversation

OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented Jun 6, 2023 •
edited
Loading

Description of changes

Working towards #99090, in more digestible steps than last time. This one is abit bigger, but the followups can be done more or less package-by-package with all of these present.

  • create a maintainers team & package scope for Lomiri
    • if anyone wishes to join, add yourself and/or let me know 🙂
  • init Lomiri-belonging things
    • cmake-extras: A set of CMake modules commonly used by Lomiri packages
    • lomiri-api: An API for integrating with the Lomiri shell
    • gmenuharness: A library to test GLib GMenuModels
  • init some non-Lomiri things that are commonly used to drive tests

The last 2 commits I still need to test on my system with all the Lomiri stuff, just threw them in here so those packages are less stale on arrival.

Working fine, keeping them in.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.05 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
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Jun 6, 2023
@OPNA2608 OPNA2608 force-pushed the init/dbus-testers branch 3 times, most recently from f121f97 to c0df77e Compare June 6, 2023 22:51
@OPNA2608 OPNA2608 marked this pull request as ready for review June 7, 2023 10:13
@OPNA2608 OPNA2608 force-pushed the init/dbus-testers branch 4 times, most recently from 25a0c7b to 5b11225 Compare June 15, 2023 17:11
@OPNA2608 OPNA2608 force-pushed the init/dbus-testers branch from 5b11225 to e6e16bb Compare June 18, 2023 21:59
@nixos-discourse
Copy link

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/2343

SuperSandro2000
SuperSandro2000 reviewed Jun 19, 2023
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

not sure on the package set if it is done correct for cross

@OPNA2608 OPNA2608 force-pushed the init/dbus-testers branch from e6e16bb to 4a01040 Compare June 19, 2023 19:54
@OPNA2608
Copy link
Contributor Author

OPNA2608 commented Jun 19, 2023 •
edited
Loading

I'm not sure if the package set is correctly written to support cross either, the approach was taken from the Deepin / DDE set. But most of the packages in it will use our qtbase where cross is borked anyway: #227900

@OPNA2608 OPNA2608 requested a review from SuperSandro2000 June 20, 2023 07:11
@OPNA2608
lomiri.cmake-extras: Change QML module installation path
d32d5d5 
We sometimes place QML modules into the bin output of derivations. Using CMAKE_INSTALL_BINDIR and backtracking from it
will ensure that the modules will end up under the bin output prefix, if it is enabled.
@OPNA2608
Copy link
Contributor Author

@SuperSandro2000 Is the uncertainty about the package set's cross-buildability a blocker for you (and thus blocked by qtbase itself having borked cross) or is there anything else you'd like me to change?

@OPNA2608
Copy link
Contributor Author

OPNA2608 commented Jul 2, 2023

@SuperSandro2000 I've tried locally adding something to the package set that doesn't need Qt & building it with --argstr crossSystem aarch64-linux and that works fine, so I think the package set is done correct for cross. Bump.

This was referenced Jul 3, 2023
Merged
Merged
Merged
@OPNA2608 @wineee
lomiri.cmake-extras: Change default QML location back to CMAKE_INSTAL…
437e8e0 
…L_PREFIX


Going `${CMAKE_INSTALL_BINDIR}/../` looks weird. Derivations that want them in a non-`out` output can just set the `QMLFILES_DESTINATION` CMake flag as needed.

Co-authored-by: rewine <[email protected]>
@OPNA2608 OPNA2608 requested a review from wineee July 5, 2023 11:35
@SuperSandro2000
Copy link
Member

@SuperSandro2000 Is the uncertainty about the package set's cross-buildability a blocker for you (and thus blocked by qtbase itself having borked cross) or is there anything else you'd like me to change?

Na, I was just curious and wanted to let you know that I do not know.

@SuperSandro2000 SuperSandro2000 merged commit b0e1167 into NixOS:master Jul 5, 2023
@SuperSandro2000
Copy link
Member

If we missed something especially cross related we can fix that in another PR to not delay this one any longer.

@OPNA2608 OPNA2608 mentioned this pull request Oct 13, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@wineee wineee Awaiting requested review from wineee

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@OPNA2608 @nixos-discourse @SuperSandro2000 @wineee