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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qgroundcontrol: some small improvements #339867

Merged
merged 7 commits into from
Sep 15, 2024

Conversation

Pandapip1
Copy link
Contributor

Description of changes

See commit history for changes

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.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@Pandapip1
Copy link
Contributor Author

I dunno why nixpkgs-vet is failing. nix build .#qgroundcontrol runs just fine on my machine.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Sep 5, 2024
@Pandapip1
Copy link
Contributor Author

Resolved by making another change.

@Lassulus
Copy link
Member

Lassulus commented Sep 6, 2024

needs a rebase now

@Pandapip1
Copy link
Contributor Author

Rebased.

@Lassulus
Copy link
Member

error: evaluation aborted with the following error message: 'lib.customisation.callPackageWith: Function called without required argument "qmake" at /ofborg/checkout/2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-4/pkgs/by-name/qg/qgroundcontrol/package.nix:15, did you mean "bmake", "cmake" or "imake"?'

@Pandapip1
Copy link
Contributor Author

Pandapip1 commented Sep 13, 2024

Whoops, I pushed an outdated copy at some point. Fixing...

EDIT: Whoops, never mind, I forgot to git add my changes to QGC in the latest commit. It should be fixed now.

@Lassulus Lassulus merged commit 948d8ea into NixOS:master Sep 15, 2024
24 of 25 checks passed
@Pandapip1 Pandapip1 deleted the move-qgc-into-by-name branch September 15, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants