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

meson: Add upstream patch to stop failing on skipped tests #95382

Merged
merged 1 commit into from Aug 14, 2020
Merged

meson: Add upstream patch to stop failing on skipped tests #95382

merged 1 commit into from Aug 14, 2020

Conversation

andersk
Copy link
Contributor

@andersk andersk commented Aug 14, 2020 •
edited

Motivation for this change

The nixos-unstable channel is currently blocked by a gjs build failure introduced by the Meson 0.55.0 upgrade (d8ac41f, #93011). Meson now incorrectly treats skipped tests as failed. This is an upstream bug fixed in mesonbuild/meson#7525. Pull in this patch.

See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=966923.

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.

@andersk andersk requested a review from jtojnar August 14, 2020 00:34
jtojnar
jtojnar approved these changes Aug 14, 2020
View reviewed changes
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Looks good.

@jtojnar
Copy link
Contributor

jtojnar commented Aug 14, 2020

Should go to staging or staging-next though. cc @FRidh

@FRidh FRidh changed the base branch from master to staging-next August 14, 2020 06:23
@FRidh FRidh merged commit dbac38c into NixOS:staging-next Aug 14, 2020
@FRidh
Copy link
Member

FRidh commented Aug 14, 2020

I've triggered a Hydra build. By the end of the day it should be good to merge staging-next into master or simply cherry-pick this to master.

@jtojnar jtojnar mentioned this pull request Aug 14, 2020
Closed
@andersk andersk deleted the meson-skip branch December 26, 2022 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar approved these changes

Assignees
No one assigned
Labels
0.kind: bug 1.severity: channel blocker Blocks a channel 10.rebuild-darwin: 0 10.rebuild-linux: 0 11.by: nixpkgs-member
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@andersk @jtojnar @FRidh