qt: bring back QML import patch in 5.14 #95772

JJJollyjim · 2020-08-18T22:21:03Z

Motivation for this change

This was missed in the 5.12 -> 5.14 update process.

Resolves #95636

It's a pretty big rebuild, but it's a pretty big bug: not sure whether that means it should be against staging or master?

Things done

This was missed in the 5.12 -> 5.14 update process. Resolves NixOS#95636

JJJollyjim · 2020-08-18T22:24:32Z

cc @petabyteboy

ghost · 2020-08-18T23:34:56Z

Thanks a lot for the fix! I'm now testing it.

This was missed in the 5.12 -> 5.14 update process. Resolves NixOS#95636 (cherry picked from commit 4cb5383)

## Motivation Dependencies should be up to date. ## Changelog for unstable: Commits: [NixOS/nixpkgs@1e3f09fe...bd0e645f](NixOS/nixpkgs@1e3f09f...bd0e645) * [`06d0a781`](NixOS/nixpkgs@06d0a78) gocode-gomod: 2019-03-27 -> 1.0.0 * [`3d093cbb`](NixOS/nixpkgs@3d093cb) alda: init at 1.4.2 * [`19321f38`](NixOS/nixpkgs@19321f3) orcania: 2.1.0 -> 2.1.1 * [`519798cb`](NixOS/nixpkgs@519798c) syncplay: 1.6.4a -> 1.6.5 * [`2698b4b5`](NixOS/nixpkgs@2698b4b) perlPackages.Dotenv: init at 0.002 * [`38db4a92`](NixOS/nixpkgs@38db4a9) protonvpn-cli: replace old protonvpn-cli with protonvpn-cli-ng * [`b488383c`](NixOS/nixpkgs@b488383) protonvpn-gui: init at 2.1.1 * [`d7dd1232`](NixOS/nixpkgs@d7dd123) steam-runtime: 0.20200604.0 -> 0.20200720.0 * [`e827315a`](NixOS/nixpkgs@e827315) libsForQt5.vlc: 3.0.11 -> 3.0.11.1 * [`d1a1a7f5`](NixOS/nixpkgs@d1a1a7f) maintainer: add elkowar * [`354642d7`](NixOS/nixpkgs@354642d) mu: 1.4.12 -> 1.4.13 * [`ca64913f`](NixOS/nixpkgs@ca64913) rss-bridge: init at 2020-02-26 * [`9aaf34bd`](NixOS/nixpkgs@9aaf34b) nixos/rss-bridge: init * [`53cdb95d`](NixOS/nixpkgs@53cdb95) crda: fix cross compilation * [`eabbf3d8`](NixOS/nixpkgs@eabbf3d) direwolf 1.4 -> 1.5 * [`bc47c4c2`](NixOS/nixpkgs@bc47c4c) psrecord: 1.1 -> 1.2 * [`22abe320`](NixOS/nixpkgs@22abe32) nixos/transmission: handle watch-dir as incomplete-dir * [`4cfcd2f9`](NixOS/nixpkgs@4cfcd2f) binwalk-full: add matplotlib module * [`6a71fd34`](NixOS/nixpkgs@6a71fd3) jellyfin: 10.5.5 -> 10.6.2 * [`ce9f0c42`](NixOS/nixpkgs@ce9f0c4) nixos/jellyfin: added a package option to the options section, defaults to using the default jellyfin package if nixos version is 20.09 or greater, otherwise will default to using the new jellyfin_10_5 derivation for older systems. * [`cea5c7f9`](NixOS/nixpkgs@cea5c7f) cargo-release: fix darwin build * [`cf71eed0`](NixOS/nixpkgs@cf71eed) bgnet: 3.0.21 -> 3.1.2 * [`39cd8e3b`](NixOS/nixpkgs@39cd8e3) idris2: 0.2.0 -> 0.2.1 * [`1e7278c7`](NixOS/nixpkgs@1e7278c) broot: 0.19.4 -> 0.20.0 * [`fafbfd23`](NixOS/nixpkgs@fafbfd2) fhs-userenv-bubblewrap: start with build-fhs-userenv * [`2ddb43ec`](NixOS/nixpkgs@2ddb43e) fhs-userenv-bubblewrap: change to using bubblewrap over chrootenv * [`2da4f24e`](NixOS/nixpkgs@2da4f24) fhs-userenv-bubblewrap: bind mount parts of host etc directly * [`8c91b3c5`](NixOS/nixpkgs@8c91b3c) fhs-userenv-bubblewrap: bind mount host's devfs * [`b7c09b50`](NixOS/nixpkgs@b7c09b5) steam: use buildFHSUserEnvBubblewrap * [`46d8f1a8`](NixOS/nixpkgs@46d8f1a) lutris: use buildFHSUserEnvBubblewrap * [`3f5157f1`](NixOS/nixpkgs@3f5157f) android-studio: use buildFHSUserEnvBubblewrap * [`ee803f30`](NixOS/nixpkgs@ee803f3) nixpkgs-fmt: 0.9.0 -> 1.0.0 * [`b1d86d0e`](NixOS/nixpkgs@b1d86d0) build-fhs-user-env-bubblewrap: consistent camelCase * [`d2abb868`](NixOS/nixpkgs@d2abb86) slurm: 19.05.7.1 -> 20.02.0.1 * [`17635369`](NixOS/nixpkgs@1763536) slurm: 20.02.0.1 -. 20.02.3.1 * [`f01e33e7`](NixOS/nixpkgs@f01e33e) slurm: 20.02.3.1 -> 20.02.4.1 * [`36a6c0a1`](NixOS/nixpkgs@36a6c0a) tflint: 0.18.0 -> 0.19.0 * [`44a8c33e`](NixOS/nixpkgs@44a8c33) john: ship internal perl modules * [`1d51b526`](NixOS/nixpkgs@1d51b52) nixos/fonts/fontconfig-penultimate: remove module * [`119401d8`](NixOS/nixpkgs@119401d) fontconfig-penultimate: remove package * [`f6c3d4f7`](NixOS/nixpkgs@f6c3d4f) transmission: fix BindReadOnlyPaths= * [`0c690524`](NixOS/nixpkgs@0c69052) rust-analyzer: 2020-08-10 -> 2020-08-17 * [`6e34cdad`](NixOS/nixpkgs@6e34cda) aisleriot: 3.22.9 -> 3.22.11 * [`9fb2c88d`](NixOS/nixpkgs@9fb2c88) source-han-*: reduce closure size by 2x * [`92b4e00f`](NixOS/nixpkgs@92b4e00) llvm_10: disable failing test on 32-bit ARM * [`7f31fe9e`](NixOS/nixpkgs@7f31fe9) vampire: 4.4 -> 4.5.1 * [`01ff24f1`](NixOS/nixpkgs@01ff24f) element-web: 1.7.3 -> 1.7.4 * [`2cb4d192`](NixOS/nixpkgs@2cb4d19) element-desktop: 1.7.3 -> 1.7.4 * [`2efb6ad0`](NixOS/nixpkgs@2efb6ad) cargo-crev: 0.16.1 -> 0.17.0 * [`5454cf20`](NixOS/nixpkgs@5454cf2) licenses: add BlueOak-1.0.0 * [`a470a23a`](NixOS/nixpkgs@a470a23) python3Packages.finalfusion: init at 0.7.1 * [`2d72eaf6`](NixOS/nixpkgs@2d72eaf) python3Packages.canonicaljson: 1.1.4 -> 1.3.0 * [`53dc9e81`](NixOS/nixpkgs@53dc9e8) matrix-synapse: 1.18.0 -> 1.19.0 * [`93e72929`](NixOS/nixpkgs@93e7292) doc/python: add pytestCheckHook section * [`233dc9c7`](NixOS/nixpkgs@233dc9c) doc/python: Add pythonImportsCheck mention * [`8425726f`](NixOS/nixpkgs@8425726) nixos/fontconfig: fix 50-user.conf handling * [`6f4a508a`](NixOS/nixpkgs@6f4a508) squashfs-tools-ng: 1.0.0 -> 1.0.1 * [`7d9c49f8`](NixOS/nixpkgs@7d9c49f) maintainers: 0x4A6F -> _0x4A6F * [`0052523a`](NixOS/nixpkgs@0052523) maintainers: 1000101 -> _1000101 * [`17f765b6`](NixOS/nixpkgs@17f765b) maintainers: add note about underscore prefix for handles * [`d5700d62`](NixOS/nixpkgs@d5700d6) lib/modules: Fix nonexistant option error * [`b2ad9bff`](NixOS/nixpkgs@b2ad9bf) kapitonov-plugins-pack: init at 1.2.1 (NixOS/nixpkgs#85496) * [`9e3b2a9a`](NixOS/nixpkgs@9e3b2a9) freqtweak: init at unstable-2019-08-03 (NixOS/nixpkgs#82825) * [`14ecb033`](NixOS/nixpkgs@14ecb03) uhhyou.lv2: init at unstable-2020-07-31 (NixOS/nixpkgs#89171) * [`0dc28e44`](NixOS/nixpkgs@0dc28e4) smimesign: 0.0.13 -> 0.1.0 * [`2d101df1`](NixOS/nixpkgs@2d101df) vimPlugins.vim-smoothie: init at 2019-12-02 * [`770acba6`](NixOS/nixpkgs@770acba) vimPlugins.vim-carbon-now-sh: init at 2019-02-14 * [`eddeae23`](NixOS/nixpkgs@eddeae2) vimPlugins.vim-matchup: init at 2020-08-16 * [`16286434`](NixOS/nixpkgs@1628643) factorio: update all x86_64 versions to 1.0.0 * [`670c094a`](NixOS/nixpkgs@670c094) pythonPackages.aiojobs: init at 0.2.2 * [`8336ba38`](NixOS/nixpkgs@8336ba3) virt-manager-qt: 0.70.91 -> 0.71.95 * [`262be88e`](NixOS/nixpkgs@262be88) qt5ct: 1.0 -> 1.1 * [`83a1f0ac`](NixOS/nixpkgs@83a1f0a) maintainers: remove unneeded quotes from handles * [`7550aab3`](NixOS/nixpkgs@7550aab) azure-cli: lessen number of overrides * [`dca51dc3`](NixOS/nixpkgs@dca51dc) buildFHSUserEnvChrootenv: rename to buildFHSUserEnvChroot * [`8a9f58a3`](NixOS/nixpkgs@8a9f58a) python3Packages.dask: ignore flaky test * [`e0c07bc2`](NixOS/nixpkgs@e0c07bc) gocode-gomod: add vendorSha256 * [`edb74a6b`](NixOS/nixpkgs@edb74a6) scheme-manpages: 2020-05-17 -> 2020-08-14 * [`b7e0beb3`](NixOS/nixpkgs@b7e0beb) nnn: 3.3 -> 3.4 * [`34310d17`](NixOS/nixpkgs@34310d1) buildpack: 0.7.0 -> 0.13.0 * [`2fbddb0c`](NixOS/nixpkgs@2fbddb0) nixos/test-instrumentation: properly import `options` for `qemu`-check * [`9ce2c380`](NixOS/nixpkgs@9ce2c38) mattermost: 5.25.0 -> 5.25.3 * [`1cdddfef`](NixOS/nixpkgs@1cdddfe) oh-my-zsh: 2020-08-06 -> 2020-08-17 * [`bae91fb6`](NixOS/nixpkgs@bae91fb) jenkins: 2.235.3 -> 2.235.5 * [`392ca2ce`](NixOS/nixpkgs@392ca2c) linuxPackages.rtl8192eu: 4.4.1.20190319 -> 4.4.1.20200620 * [`f85c04ab`](NixOS/nixpkgs@f85c04a) nixpkgs-fmt: 0.9.0 -> 1.0.0 * [`fa30c9ab`](NixOS/nixpkgs@fa30c9a) lib/modules: improve error-message for undeclared options if prefix contains no options * [`f9b57fd6`](NixOS/nixpkgs@f9b57fd) NixOS/nixpkgs#95747: fix build of GHC 8.10.2 * [`0a84375d`](NixOS/nixpkgs@0a84375) linux: 5.8-rc7 -> 5.9-rc1 * [`416cfc71`](NixOS/nixpkgs@416cfc7) pipr: init at 0.0.12 * [`9b55e5bf`](NixOS/nixpkgs@9b55e5b) python3Packages.spacy_models: use pythonImportCheck * [`fb7acacd`](NixOS/nixpkgs@fb7acac) python3Packages.spacy: add passthru test * [`e3193c9c`](NixOS/nixpkgs@e3193c9) mycrypto: init at 1.7.11 * [`1ce7c5af`](NixOS/nixpkgs@1ce7c5a) mycrypto: fix icon * [`726bf83f`](NixOS/nixpkgs@726bf83) mycrypto: 1.7.11 -> 1.7.12 * [`c8e727c7`](NixOS/nixpkgs@c8e727c) Revert "Merge NixOS/nixpkgs#94880: thunderbird: enable branding by default" * [`bc472f8d`](NixOS/nixpkgs@bc472f8) python3Packages.maxminddb: 1.5.4 -> 2.0.2 * [`e157891b`](NixOS/nixpkgs@e157891) pythonPackages.mocket: init at 3.8.7 * [`d33659e9`](NixOS/nixpkgs@d33659e) python3Packages.geoip2: 3.0.0 -> 4.0.2 * [`2addc088`](NixOS/nixpkgs@2addc08) python3Packages.sopel: 7.0.5 -> 7.0.6 * [`e5a097a8`](NixOS/nixpkgs@e5a097a) pythonPackages.coloredlogs: remove obsolete patch * [`4cb53831`](NixOS/nixpkgs@4cb5383) qt: bring back QML import patch in 5.14 (NixOS/nixpkgs#95772) * [`7c93f85b`](NixOS/nixpkgs@7c93f85) genpass: fix darwin build * [`a3278c29`](NixOS/nixpkgs@a3278c2) rescuetime: 2.15.0.1 -> 2.16.0.1 * [`4645e5fe`](NixOS/nixpkgs@4645e5f) rescuetime: 2.16.0.1 -> 2.16.2.1 * [`59d48ade`](NixOS/nixpkgs@59d48ad) coqPackages.coq-ext-lib: 0.11.1 → 0.11.2 * [`6a1d98ec`](NixOS/nixpkgs@6a1d98e) coqPackages.simple-io: enable for Coq 8.12 * [`6f83faf7`](NixOS/nixpkgs@6f83faf) coqPackages.QuickChick: 1.3.1 → 1.3.2, 1.4.0 * [`fca712bf`](NixOS/nixpkgs@fca712b) dbeaver: 7.1.4 -> 7.1.5 * [`873cca6e`](NixOS/nixpkgs@873cca6) obsidian: 0.7.3 -> 0.8.2 * [`4e5a9e52`](NixOS/nixpkgs@4e5a9e5) pdfpc: 4.3.4 → 4.4.0 * [`1b719290`](NixOS/nixpkgs@1b71929) finalfusion-utils: 0.11.2 -> 0.12.0 * [`ae993f33`](NixOS/nixpkgs@ae993f3) hikari: 2.1.1 -> 2.1.2 * [`19d9c7b9`](NixOS/nixpkgs@19d9c7b) strawberry: 0.6.13 -> 0.7.2 * [`9dac2627`](NixOS/nixpkgs@9dac262) homeassistant: 0.114.0 -> 0.114.2 * [`7b86674f`](NixOS/nixpkgs@7b86674) mozwire: init at 0.4.1 * [`12a9e5f6`](NixOS/nixpkgs@12a9e5f) maintainers: add nilsirl * [`ea3072f6`](NixOS/nixpkgs@ea3072f) linux: 4.19.139 -> 4.19.140 * [`afe457db`](NixOS/nixpkgs@afe457d) linux: 5.4.58 -> 5.4.59 * [`f36489b7`](NixOS/nixpkgs@f36489b) linux: 5.7.15 -> 5.7.16 * [`423361a6`](NixOS/nixpkgs@423361a) oh-my-zsh: 2020-08-17 -> 2020-08-18 * [`465985bd`](NixOS/nixpkgs@465985b) glances: 3.1.4.1 -> 3.1.5 * [`f13d9521`](NixOS/nixpkgs@f13d952) androidenv: fix convert files not quoting urls * [`b7f3c994`](NixOS/nixpkgs@b7f3c99) python-osc: update to version 0.170.0

qt: bring back QML import patch in 5.14

ae4d4ba

This was missed in the 5.12 -> 5.14 update process. Resolves NixOS#95636

JJJollyjim requested a review from ttuegel as a code owner August 18, 2020 22:21

ghost merged commit 4cb5383 into NixOS:master Aug 19, 2020

jerith666 pushed a commit to jerith666/nixpkgs that referenced this pull request Aug 19, 2020

qt: bring back QML import patch in 5.14 (NixOS#95772)

ad69227

This was missed in the 5.12 -> 5.14 update process. Resolves NixOS#95636 (cherry picked from commit 4cb5383)

github-actions bot mentioned this pull request Aug 21, 2020

niv unstable: update 1e3f09fe -> bd0e645f pbogdan/shell-cmd#9

Merged

github-actions bot mentioned this pull request Aug 21, 2020

niv unstable: update 1e3f09fe -> bd0e645f pbogdan/nix-hie#94

Merged

github-actions bot mentioned this pull request Aug 21, 2020

niv unstable: update 1e3f09fe -> bd0e645f pbogdan/tag#32

Merged

github-actions bot mentioned this pull request Aug 21, 2020

niv unstable: update 1e3f09fe -> bd0e645f pbogdan/nvs#48

Merged

github-actions bot mentioned this pull request Aug 21, 2020

niv unstable: update 1e3f09fe -> bd0e645f pbogdan/nix-nerd-fonts#40

Merged

ghost mentioned this pull request Aug 30, 2020

qt5: 5.14.2 -> 5.15.0 #96619

Closed

10 tasks

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

qt: bring back QML import patch in 5.14 #95772

qt: bring back QML import patch in 5.14 #95772

JJJollyjim commented Aug 18, 2020 •

edited

JJJollyjim commented Aug 18, 2020

ghost commented Aug 18, 2020

qt: bring back QML import patch in 5.14 #95772

qt: bring back QML import patch in 5.14 #95772

Conversation

JJJollyjim commented Aug 18, 2020 • edited

Motivation for this change

Things done

JJJollyjim commented Aug 18, 2020

ghost commented Aug 18, 2020

JJJollyjim commented Aug 18, 2020 •

edited