Navigation Menu

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

Jump to bottom

highlight: fix cross-platform build #97004

Merged
merged 2 commits into from Oct 16, 2021
Merged

highlight: fix cross-platform build #97004

merged 2 commits into from Oct 16, 2021

Conversation

kampka
Copy link
Contributor

@kampka kampka commented Sep 3, 2020

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@kampka kampka added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Sep 3, 2020
@kampka
Copy link
Contributor Author

kampka commented Sep 3, 2020

@GrahamcOfBorg build highlight
@GrahamcOfBorg build pkgsCross.aarch64-multiplatform.highlight

@kampka kampka requested a review from alyssais September 3, 2020 09:47
@SuperSandro2000
Copy link
Member

Please target master and fix the merge conflict.

@stale
Copy link

stale bot commented Jul 21, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 21, 2021
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 16, 2021
@Artturin
Copy link
Member

Fixed the merge conflict and fixed a compression impurity

@Artturin Artturin changed the base branch from staging to master October 16, 2021 20:38
@ofborg ofborg bot requested a review from WilliButz October 16, 2021 20:45
@Artturin Artturin merged commit fb8eb7e into NixOS:master Oct 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alyssais alyssais Awaiting requested review from alyssais

@WilliButz WilliButz Awaiting requested review from WilliButz

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kampka @SuperSandro2000 @Artturin