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

csound-qt 0.9.6-beta2 -> 0.9.6-beta3, plus python-qt include changes #56050

Merged
merged 2 commits into from
Mar 10, 2019
Merged

csound-qt 0.9.6-beta2 -> 0.9.6-beta3, plus python-qt include changes #56050

merged 2 commits into from
Mar 10, 2019

Conversation

hlolli
Copy link
Member

@hlolli hlolli commented Feb 19, 2019

Motivation for this change

to my surprise csound-qt didn't actually install properly, so I changed some qmake paths and bumped the version. I changed which source files are added to include in python-qt, I can seperate this into two PR's if that's urgent.

Things done

Bumped and added new qtlib dep (xmlpatterns).

  • [ x ] Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • [ x ] 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 nox --run "nox-review wip"
  • [ x ] 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Feb 19, 2019
@hlolli hlolli mentioned this pull request Feb 21, 2019
Merged
veprbl
veprbl reviewed Mar 7, 2019
View reviewed changes
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/applications/audio/csound/csound-qt/examplepath.patch Outdated Show resolved Hide resolved
pkgs/applications/audio/csound/csound-qt/examplepath.patch Outdated
<< "/../../qutecsound/src/Examples/"
- << "~/.local/share/qutecsound/Examples/" << "/usr/share/qutecsound/Examples/";
+ << "~/.local/share/qutecsound/Examples/" << "/usr/share/qutecsound/Examples/"
+ << qApp->applicationDirPath() + "/../share/csoundqt/Examples/";
Copy link
Member

Choose a reason for hiding this comment

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

Do you mind sending this patch upstream also?

Copy link
Member Author

Choose a reason for hiding this comment

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

That's already done and merged CsoundQt/CsoundQt#268

Copy link
Member

Choose a reason for hiding this comment

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

Can you then please use fetchpatch to acquire the patch from the upstream commit:
https://github.com/CsoundQt/CsoundQt/commit/09f2d515bff638cbcacb450979d66e273a59fdec.diff

Copy link
Member Author

Choose a reason for hiding this comment

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

Didn't know about fetchpatch, thanks for letting me know, also read that it's the recommended way.

pkgs/applications/audio/csound/csound-qt/rtmidipath.patch Show resolved Hide resolved
@hlolli
Copy link
Member Author

hlolli commented Mar 8, 2019

@veprbl you want me to squash and/or resolve the conflicts?

@GrahamcOfBorg GrahamcOfBorg added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 8, 2019
@veprbl
Copy link
Member

veprbl commented Mar 8, 2019

@hlolli definitely resolve conflicts (preferably via rebase) and feel free to squash.

@hlolli hlolli force-pushed the csound-qt-update branch from 875812e to b75042b Compare March 9, 2019 18:39
@GrahamcOfBorg GrahamcOfBorg removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 9, 2019
@veprbl
Copy link
Member

veprbl commented Mar 10, 2019

@GrahamcOfBorg build csound-qt python-qt

@veprbl veprbl merged commit db66867 into NixOS:master Mar 10, 2019
@veprbl
Copy link
Member

veprbl commented Mar 10, 2019

Thanks!

@hlolli
Copy link
Member Author

hlolli commented Mar 14, 2019

This is not being built on Hydra? I'm trying to understand why it keeps attempting to build aplha2

@hlolli
Copy link
Member Author

hlolli commented Mar 14, 2019

Ah sorry

https://hydra.nixos.org/build/90579703

nevermind

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@symphorien symphorien symphorien left review comments

@veprbl veprbl veprbl left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hlolli @veprbl @symphorien @GrahamcOfBorg