Skip to content

digikam: 7.3.0 -> 7.4.0#151388

Merged
bobby285271 merged 1 commit intoNixOS:masterfrom
austinbutler:digikam-740
Dec 22, 2021
Merged

digikam: 7.3.0 -> 7.4.0#151388
bobby285271 merged 1 commit intoNixOS:masterfrom
austinbutler:digikam-740

Conversation

@austinbutler
Copy link
Member

@austinbutler austinbutler commented Dec 20, 2021 •
edited
Loading

Motivation for this change

7.3.0 doesn't build on master currently, fails at akonadi-contacts I believe.

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.

@austinbutler
Copy link
Member Author

austinbutler commented Dec 20, 2021

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

1 package built:
  • digikam

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Dec 20, 2021
@ivankovnatsky
Copy link
Contributor

ivankovnatsky commented Dec 20, 2021

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

1 package built:
  • digikam

austinbutler
austinbutler commented Dec 20, 2021
View reviewed changes
pkgs/applications/graphics/digikam/default.nix Outdated
Copy link
Member Author

@austinbutler austinbutler Dec 20, 2021

Choose a reason for hiding this comment

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

The manual states: All Qt packages must include wrapQtAppsHook in nativeBuildInputs, or you must explicitly set dontWrapQtApps.

Copy link
Member Author

@austinbutler austinbutler Dec 20, 2021

Choose a reason for hiding this comment

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

That said it seems to function fine without this, so I'm kind of posing this as a question actually.

Copy link
Member

@bobby285271 bobby285271 Dec 21, 2021

Choose a reason for hiding this comment

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

Seems that the app has been wrapped already, so should be fine not to add this.

Copy link
Member Author

@austinbutler austinbutler Dec 21, 2021

Choose a reason for hiding this comment

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

Went ahead and reverted this part.

@austinbutler
Copy link
Member Author

austinbutler commented Dec 20, 2021

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

1 package built:
  • digikam

@austinbutler austinbutler requested a review from ttuegel December 20, 2021 20:50
fabianhjr
fabianhjr approved these changes Dec 21, 2021
View reviewed changes
Copy link
Member

@fabianhjr fabianhjr left a comment

Choose a reason for hiding this comment

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

Bump builds and runs; 👍

@bobby285271 bobby285271 merged commit 7827393 into NixOS:master Dec 22, 2021
@austinbutler austinbutler deleted the digikam-740 branch December 22, 2021 20:02
@dotlambda dotlambda mentioned this pull request Dec 23, 2021
Closed
54 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bobby285271 bobby285271 bobby285271 left review comments

@fabianhjr fabianhjr fabianhjr approved these changes

@ttuegel ttuegel Awaiting requested review from ttuegel

+1 more reviewer

@ivankovnatsky ivankovnatsky ivankovnatsky approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@austinbutler @ivankovnatsky @fabianhjr @bobby285271