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

Update qtbase mac patches for 5.12.6 #74911

Merged
merged 1 commit into from Dec 3, 2019

Conversation

@lavoiesl
Copy link
Contributor

lavoiesl commented Dec 3, 2019

Motivation for this change

qtbase was updated to 5.12.6 in #73562, but the patch for macOS wasn't regenerated, causing the build to fail.

Fixes: #74770

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 nix-review --run "nix-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.
Notify maintainers

cc @dtzWill
cc @ttuegel
cc @Ericson2314
cc @vcunat

qtbase was updated to 5.12.6 in #73562,
but the patch for macOS wasn't regenerated, causing the build to fail.
@veprbl

This comment has been minimized.

Copy link
Member

veprbl commented Dec 3, 2019

@GrahamcOfBorg build qt5.qmake
@GrahamcOfBorg build qt5.qtbase
@GrahamcOfBorg build qt5.qtcharts
@GrahamcOfBorg build qt5.qtconnectivity
@GrahamcOfBorg build qt5.qtdeclarative
@GrahamcOfBorg build qt5.qtdoc
@GrahamcOfBorg build qt5.qtgraphicaleffects
@GrahamcOfBorg build qt5.qtimageformats
@GrahamcOfBorg build qt5.qtlocation
@GrahamcOfBorg build qt5.qtmacextras
@GrahamcOfBorg build qt5.qtmultimedia
@GrahamcOfBorg build qt5.qtquickcontrols
@GrahamcOfBorg build qt5.qtquickcontrols2
@GrahamcOfBorg build qt5.qtscript
@GrahamcOfBorg build qt5.qtsensors
@GrahamcOfBorg build qt5.qtserialport
@GrahamcOfBorg build qt5.qtsvg
@GrahamcOfBorg build qt5.qttools
@GrahamcOfBorg build qt5.qttranslations
@GrahamcOfBorg build qt5.qtvirtualkeyboard
@GrahamcOfBorg build qt5.qtwayland
@GrahamcOfBorg build qt5.qtwebchannel
@GrahamcOfBorg build qt5.qtwebengine
@GrahamcOfBorg build qt5.qtwebkit
@GrahamcOfBorg build qt5.qtwebsockets
@GrahamcOfBorg build qt5.qtx11extras
@GrahamcOfBorg build qt5.qtxmlpatterns

@veprbl
veprbl approved these changes Dec 3, 2019
@veprbl veprbl merged commit f27b686 into NixOS:master Dec 3, 2019
94 checks passed
94 checks passed
qt5.qtmacextras on aarch64-linux No attempt
Details
qt5.qtmacextras on x86_64-linux No attempt
Details
qt5.qtwayland on x86_64-darwin No attempt
Details
qt5.qtwebengine on x86_64-darwin Failure
Details
qt5.qtwebkit on x86_64-darwin Timed out, unknown build status
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
qt5.qmake on aarch64-linux Success
Details
qt5.qmake on x86_64-darwin Success
Details
qt5.qmake on x86_64-linux Success
Details
qt5.qtbase on aarch64-linux Success
Details
qt5.qtbase on x86_64-darwin Success
Details
qt5.qtbase on x86_64-linux Success
Details
qt5.qtcharts on aarch64-linux Success
Details
qt5.qtcharts on x86_64-darwin Success
Details
qt5.qtcharts on x86_64-linux Success
Details
qt5.qtconnectivity on aarch64-linux Success
Details
qt5.qtconnectivity on x86_64-darwin Success
Details
qt5.qtconnectivity on x86_64-linux Success
Details
qt5.qtdeclarative on aarch64-linux Success
Details
qt5.qtdeclarative on x86_64-darwin Success
Details
qt5.qtdeclarative on x86_64-linux Success
Details
qt5.qtdoc on aarch64-linux Success
Details
qt5.qtdoc on x86_64-darwin Success
Details
qt5.qtdoc on x86_64-linux Success
Details
qt5.qtgraphicaleffects on aarch64-linux Success
Details
qt5.qtgraphicaleffects on x86_64-darwin Success
Details
qt5.qtgraphicaleffects on x86_64-linux Success
Details
qt5.qtimageformats on aarch64-linux Success
Details
qt5.qtimageformats on x86_64-darwin Success
Details
qt5.qtimageformats on x86_64-linux Success
Details
qt5.qtlocation on aarch64-linux Success
Details
qt5.qtlocation on x86_64-darwin Success
Details
qt5.qtlocation on x86_64-linux Success
Details
qt5.qtmacextras on x86_64-darwin Success
Details
qt5.qtmultimedia on aarch64-linux Success
Details
qt5.qtmultimedia on x86_64-darwin Success
Details
qt5.qtmultimedia on x86_64-linux Success
Details
qt5.qtquickcontrols on aarch64-linux Success
Details
qt5.qtquickcontrols on x86_64-darwin Success
Details
qt5.qtquickcontrols on x86_64-linux Success
Details
qt5.qtquickcontrols2 on aarch64-linux Success
Details
qt5.qtquickcontrols2 on x86_64-darwin Success
Details
qt5.qtquickcontrols2 on x86_64-linux Success
Details
qt5.qtscript on aarch64-linux Success
Details
qt5.qtscript on x86_64-darwin Success
Details
qt5.qtscript on x86_64-linux Success
Details
qt5.qtsensors on aarch64-linux Success
Details
qt5.qtsensors on x86_64-darwin Success
Details
qt5.qtsensors on x86_64-linux Success
Details
qt5.qtserialport on aarch64-linux Success
Details
qt5.qtserialport on x86_64-darwin Success
Details
qt5.qtserialport on x86_64-linux Success
Details
qt5.qtsvg on aarch64-linux Success
Details
qt5.qtsvg on x86_64-darwin Success
Details
qt5.qtsvg on x86_64-linux Success
Details
qt5.qttools on aarch64-linux Success
Details
qt5.qttools on x86_64-darwin Success
Details
qt5.qttools on x86_64-linux Success
Details
qt5.qttranslations on aarch64-linux Success
Details
qt5.qttranslations on x86_64-darwin Success
Details
qt5.qttranslations on x86_64-linux Success
Details
qt5.qtvirtualkeyboard on aarch64-linux Success
Details
qt5.qtvirtualkeyboard on x86_64-darwin Success
Details
qt5.qtvirtualkeyboard on x86_64-linux Success
Details
qt5.qtwayland on aarch64-linux Success
Details
qt5.qtwayland on x86_64-linux Success
Details
qt5.qtwebchannel on aarch64-linux Success
Details
qt5.qtwebchannel on x86_64-darwin Success
Details
qt5.qtwebchannel on x86_64-linux Success
Details
qt5.qtwebengine on aarch64-linux Success
Details
qt5.qtwebengine on x86_64-linux Success
Details
qt5.qtwebkit on aarch64-linux Success
Details
qt5.qtwebkit on x86_64-linux Success
Details
qt5.qtwebsockets on aarch64-linux Success
Details
qt5.qtwebsockets on x86_64-darwin Success
Details
qt5.qtwebsockets on x86_64-linux Success
Details
qt5.qtx11extras on aarch64-linux Success
Details
qt5.qtx11extras on x86_64-darwin Success
Details
qt5.qtx11extras on x86_64-linux Success
Details
qt5.qtxmlpatterns on aarch64-linux Success
Details
qt5.qtxmlpatterns on x86_64-darwin Success
Details
qt5.qtxmlpatterns on x86_64-linux Success
Details
@lavoiesl lavoiesl deleted the Shopify:seb-qtbase-5.12.6-mac branch Dec 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.