Skip to content

Qt 5.15.10#248362

Merged
K900 merged 2 commits intoNixOS:staging-nextfrom
K900:qt-5.15.10
Aug 11, 2023
Merged

Qt 5.15.10#248362
K900 merged 2 commits intoNixOS:staging-nextfrom
K900:qt-5.15.10

Conversation

@K900
Copy link
Copy Markdown
Contributor

@K900 K900 commented Aug 10, 2023 •
edited
Loading

Description of changes

New patchset release, with bonus crimes removal now that Hydra's size limit is bigger.

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/)
  • 23.11 Release Notes (or backporting 23.05 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
  • Fits CONTRIBUTING.md.

@K900 K900 requested a review from ttuegel as a code owner August 10, 2023 14:18
@github-actions github-actions bot added the 6.topic: qt/kde Object-oriented framework for GUI creation label Aug 10, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Aug 10, 2023
@K900 K900 changed the base branch from staging to staging-next August 11, 2023 11:21
@K900 K900 merged commit 488ba85 into NixOS:staging-next Aug 11, 2023
@github-actions github-actions bot mentioned this pull request Aug 11, 2023
Merged
1 task
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Aug 11, 2023

Successfully created backport PR for staging-23.05:

@trofi
Copy link
Copy Markdown
Contributor

trofi commented Aug 13, 2023

Bisect says e9b3961 broke qt5.qtscript on staging-next as:

$ nix build --no-link -f. -L qt5.qtscript
qtscript> qmakePrePhase
qtscript> qtPreHook
qtscript> unpacking sources
qtscript> unpacking source archive /nix/store/87mjcxm5f22nb2i85rr9r3bqjlvvh89n-qtscript-4f8c35a
qtscript> source root is qtscript-4f8c35a
qtscript> patching sources
qtscript> applying patch /nix/store/qb3s26cvz21y87izab28454qh0k8y42k-qtscript.patch
qtscript> patching file src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
qtscript> updateAutotoolsGnuConfigScriptsPhase
qtscript> configuring
qtscript> fixQtBuiltinPaths: Fixing Qt builtin paths in `./examples/script/qstetrix/qstetrix.pro'...
qtscript> fixQtBuiltinPaths: Fixing Qt builtin paths in `./examples/script/qsdbg/qsdbg.pro'...
qtscript> fixQtBuiltinPaths: Fixing Qt builtin paths in `./examples/script/qscript/qscript.pro'...
qtscript> fixQtBuiltinPaths: Fixing Qt builtin paths in `./examples/script/marshal/marshal.pro'...
qtscript> fixQtBuiltinPaths: Fixing Qt builtin paths in `./examples/script/helloscript/helloscript.pro'...
qtscript> fixQtBuiltinPaths: Fixing Qt builtin paths in `./examples/script/defaultprototypes/defaultprototypes.pro'...
qtscript> fixQtBuiltinPaths: Fixing Qt builtin paths in `./examples/script/customclass/customclass.pro'...
qtscript> fixQtBuiltinPaths: Fixing Qt builtin paths in `./examples/script/context2d/context2d.pro'...
qtscript> fixQtBuiltinPaths: Fixing Qt builtin paths in `./examples/script/calculator/calculator.pro'...
qtscript> error: could not find version 5.15.10 in .qmake.conf
qtscript> hint: check .qmake.conf and update the package version in Nixpkgs
error: builder for '/nix/store/a7wx340h66bw40vi8vkicr7bvlzh5z6j-qtscript-5.15.10.drv' failed with exit code 1;

@K900
Copy link
Copy Markdown
Contributor Author

K900 commented Aug 13, 2023

They have an annoying habit of not increasing the version when there are not actual changes. Pushed a fix in 13bd5d4.

@vcunat
Copy link
Copy Markdown
Member

vcunat commented Aug 17, 2023

Backported, builds again: https://hydra.nixos.org/build/231756093

@K900 K900 deleted the qt-5.15.10 branch July 27, 2025 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees

No one assigned

Labels

6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@K900 @trofi @vcunat