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

Pantheon: prepare for meson 0.61 #154837

Merged
merged 11 commits into from
Jan 17, 2022
Merged

Conversation

bobby285271
Copy link
Member

@bobby285271 bobby285271 commented Jan 13, 2022

Motivation for this change

I am not sure whether upstream will make some release for these fixes before elementary OS 7 so I opened this just to make sure if someone wants to bump meson, it won't break Pantheon. To build Pantheon with meson 0.61, apply this patch on top of this PR.

Packages mostly fails with "Function does not take positional arguments" when using meson 0.61. As what upstream change says, i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61, and actually this has been marked as deprecated in 0.60. So it is still a good idea to fetch these fixes in advance.

To make sure at least nixosTests.pantheon passes:

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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: pantheon The Pantheon desktop environment label Jan 13, 2022
@ofborg ofborg bot requested review from davidak and ethancedwards8 January 13, 2022 04:32
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Jan 13, 2022
@NickCao
Copy link
Member

NickCao commented Jan 13, 2022

With one last patch applied on elementary-screenshot, the test passed.

@bobby285271 bobby285271 marked this pull request as ready for review January 13, 2022 06:14
@bobby285271
Copy link
Member Author

bobby285271 commented Jan 13, 2022

@ofborg test pantheon
@ofborg build pantheon.elementary-music pantheon.elementary-camera pantheon.elementary-mail pantheon.elementary-terminal pantheon.elementary-shortcut-overlay pantheon.elementary-code pantheon.elementary-greeter pantheon.switchboard pantheon.elementary-capnet-assist pantheon.elementary-files pantheon.elementary-screenshot

i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
@bobby285271
Copy link
Member Author

Result of nixpkgs-review pr 154837 run on x86_64-linux 1

1 package marked as broken and skipped:
  • pantheon.elementary-screenshot-tool
33 packages built:
  • pantheon-tweaks
  • pantheon.elementary-camera
  • pantheon.elementary-capnet-assist
  • pantheon.elementary-code
  • pantheon.elementary-files
  • pantheon.elementary-greeter
  • pantheon.elementary-mail
  • pantheon.elementary-music
  • pantheon.elementary-screenshot
  • pantheon.elementary-shortcut-overlay
  • pantheon.elementary-terminal
  • pantheon.switchboard
  • pantheon.switchboard-plug-a11y
  • pantheon.switchboard-plug-about
  • pantheon.switchboard-plug-applications
  • pantheon.switchboard-plug-bluetooth
  • pantheon.switchboard-plug-datetime
  • pantheon.switchboard-plug-display
  • pantheon.switchboard-plug-keyboard
  • pantheon.switchboard-plug-mouse-touchpad
  • pantheon.switchboard-plug-network
  • pantheon.switchboard-plug-notifications
  • pantheon.switchboard-plug-onlineaccounts
  • pantheon.switchboard-plug-pantheon-shell
  • pantheon.switchboard-plug-power
  • pantheon.switchboard-plug-printers
  • pantheon.switchboard-plug-security-privacy
  • pantheon.switchboard-plug-sharing
  • pantheon.switchboard-plug-sound
  • pantheon.switchboard-plug-wacom
  • pantheon.switchboard-with-plugs
  • pantheon.wingpanel-applications-menu
  • pantheon.wingpanel-with-indicators

@bobby285271 bobby285271 merged commit 467dd2d into NixOS:master Jan 17, 2022
@bobby285271 bobby285271 deleted the pantheon-meson branch January 17, 2022 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: pantheon The Pantheon desktop environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants