Skip to content

Comments

meld: pull upstream fix for meson-0.60#164948

Merged
AndersonTorres merged 1 commit intoNixOS:masterfrom
trofi:fix-meld-for-meson-0.60
Mar 20, 2022
Merged

meld: pull upstream fix for meson-0.60#164948
AndersonTorres merged 1 commit intoNixOS:masterfrom
trofi:fix-meld-for-meson-0.60

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Mar 20, 2022 •
edited
Loading

Without the change build fails as:

> data/meson.build:34:0: ERROR: Function does not take positional arguments.
Description of changes
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.

@trofi
meld: pull upstream fix for meson-0.60
c4c64b6 
Without the change build fails as:

    > data/meson.build:34:0: ERROR: Function does not take positional arguments.
@trofi trofi mentioned this pull request Mar 20, 2022
Merged
13 tasks
@ofborg ofborg bot requested review from jtojnar and mimame March 20, 2022 09:12
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 20, 2022
bobby285271
bobby285271 approved these changes Mar 20, 2022
View reviewed changes
Copy link
Member

@bobby285271 bobby285271 left a comment

Choose a reason for hiding this comment

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

Tested building with meson 0.61

@AndersonTorres AndersonTorres merged commit 7e1810c into NixOS:master Mar 20, 2022
@trofi trofi deleted the fix-meld-for-meson-0.60 branch March 21, 2022 07:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bobby285271 bobby285271 bobby285271 approved these changes

@mimame mimame Awaiting requested review from mimame

@jtojnar jtojnar Awaiting requested review from jtojnar

+1 more reviewer

@AndersonTorres AndersonTorres AndersonTorres approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@trofi @AndersonTorres @bobby285271