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

[20.09] kdeFrameworks.plasma-framework: aligned with QtQuick 2.12 #101078

Merged
merged 1 commit into from Oct 20, 2020

Conversation

@jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 19, 2020

Motivation for this change

A less invasive remedy for #98536

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.
@jonringer jonringer requested a review from ttuegel as a code owner Oct 19, 2020
Aligned plasma-framework with qt5.12
see #98536
@jonringer
Copy link
Contributor Author

@jonringer jonringer commented Oct 19, 2020

Selection_045

@jonringer jonringer changed the title kdeFrameworks.plasma-framework: aligned with QtQuick 2.12 [20.09] kdeFrameworks.plasma-framework: aligned with QtQuick 2.12 Oct 19, 2020
# see https://github.com/NixOS/nixpkgs/issues/98536
postPatch = ''
substituteInPlace src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml \
--replace "import QtQuick 2.14" "import QtQuick 2.12"

This comment has been minimized.

@knedlsepp

knedlsepp Oct 19, 2020
Member

Not really qualified to review this, but I'm pretty interested:

  • Where does the 2.14 come from?
  • Where does the 2.12 come from?
  • Will this break on the next libsForQt5 = libsForQt512 and libsForQt5 = libsForQt514 bump?
  • Should this be parametrized on some ${qt5.base.version} to be more future proof?

This comment has been minimized.

@jonringer

jonringer Oct 19, 2020
Author Contributor

Where does the 2.14 come from?

It's what the upstream plasma-frameworks expects

Where does the 2.12 come from?

I got that from other applications which were working

Will this break on the next libsForQt5 = libsForQt512 and libsForQt5 = libsForQt514 bump?

This is specifically for the 20.09 release, those are unlikely to be bumped.
But it's just the version of the widget, so I don't think this will be too "harmful"

Should this be parametrized on some ${qt5.base.version} to be more future proof?

AFAIK, these are looked up at runtime, and us needing to use the 5.12 qt libraries is where this mismatch comes from. However, using a "previous" version of the widget seems to be harmless

Copy link
Member

@ttuegel ttuegel left a comment

Great catch, thanks!

@jonringer jonringer merged commit e3c3fb2 into NixOS:release-20.09 Oct 20, 2020
18 of 19 checks passed
18 of 19 checks passed
@github-actions
action
Details
@ofborg
kdeFrameworks.plasma-framework, kdeFrameworks.plasma-framework.passthru.tests on x86_64-darwin
Details
@ofborg
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions
Wait for ofborg
Details
@ofborg
grahamcofborg-eval ^.^!
Details
@ofborg
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f868c68"; rev="f868c68bba38be9fdb7447d45eedae3fbd80f2c1"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f868c68"; rev="f868c68bba38be9fdb7447d45eedae3fbd80f2c1"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f868c68"; rev="f868c68bba38be9fdb7447d45eedae3fbd80f2c1"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f868c68"; rev="f868c68bba38be9fdb7447d45eedae3fbd80f2c1"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f868c68"; rev="f868c68bba38be9fdb7447d45eedae3fbd80f2c1"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f868c68"; rev="f868c68bba38be9fdb7447d45eedae3fbd80f2c1"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f868c68"; rev="f868c68bba38be9fdb7447d45eedae3fbd80f2c1"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ofborg
kdeFrameworks.plasma-framework, kdeFrameworks.plasma-framework.passthru.tests on aarch64-linux Success
Details
@ofborg
kdeFrameworks.plasma-framework, kdeFrameworks.plasma-framework.passthru.tests on x86_64-linux Success
Details
@jonringer jonringer deleted the jonringer:fix-plasma-framework branch Oct 21, 2020
@nixos-discourse
Copy link

@nixos-discourse nixos-discourse commented Oct 21, 2020

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/go-no-go-meeting-nixos-20-09-nightingale/9169/24

@nixos-discourse
Copy link

@nixos-discourse nixos-discourse commented Oct 25, 2020

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/what-should-stable-nixos-prioritize/9646/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants