Skip to content

Comments

qt6: use makeScopeWithSplicing#265524

Merged
Artturin merged 4 commits intoNixOS:masterfrom
Artturin:usemakescopew
Nov 24, 2023
Merged

qt6: use makeScopeWithSplicing#265524
Artturin merged 4 commits intoNixOS:masterfrom
Artturin:usemakescopew

Conversation

@Artturin
Copy link
Member

@Artturin Artturin commented Nov 4, 2023 •
edited
Loading

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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.

@Artturin Artturin requested review from a user, K900 and NickCao November 4, 2023 21:23
@Artturin Artturin mentioned this pull request Nov 4, 2023
Closed
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 4, 2023
@ghost ghost mentioned this pull request Nov 5, 2023
Merged
13 tasks
@Artturin Artturin marked this pull request as ready for review November 11, 2023 19:54
@Artturin Artturin added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Nov 11, 2023
@Artturin Artturin force-pushed the usemakescopew branch 2 times, most recently from 08562b0 to 0c96185 Compare November 11, 2023 20:22
Artturin
Artturin commented Nov 11, 2023
View reviewed changes
pkgs/top-level/qt6-packages.nix Outdated
Copy link
Member Author

@Artturin Artturin Nov 11, 2023

Choose a reason for hiding this comment

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

We did a similar thing with qt5 #245905

@ghost
Copy link

ghost commented Nov 12, 2023 •
edited by ghost
Loading

I'm having trouble testing this in my tree.

There's probably something in master that it needs, but I'm stuck on staging until it merges back.

As soon as #263535 merge happens I will rebase to master and test this.

@Artturin
Copy link
Member Author

Artturin commented Nov 12, 2023 •
edited
Loading

I'm having trouble testing this in my tree.

There's probably something in master that it needs, but I'm stuck on staging until it merges back.

As soon as #263535 merge happens I will rebase to master and test this.

I didn't build anything, only made sure it evals. what package are you having an issue with?

master is in staging https://github.com/NixOS/nixpkgs/actions/workflows/periodic-merge-6h.yml

@ghost
Copy link

ghost commented Nov 13, 2023 •
edited by ghost
Loading

master is in staging https://github.com/NixOS/nixpkgs/actions/workflows/periodic-merge-6h.yml

Yeah but since I'm stuck on staging every rebase is a mass-rebuild. So I don't rebase often.

Once staging (and the commits on staging that I currently need) merges back to master I can resume my usual rebase-every-few-days.

We've been in "staging will merge back to master in the next day or two" for like a week now. The merge always seems to be a day or two away, so I just keep waiting for it.

@Artturin
Copy link
Member Author

Artturin commented Nov 13, 2023

master is in staging https://github.com/NixOS/nixpkgs/actions/workflows/periodic-merge-6h.yml

Yeah but since I'm stuck on staging every rebase is a mass-rebuild. So I don't rebase often.

Once staging (and the commits on staging that I currently need) merges back to master I can resume my usual rebase-every-few-days.

We've been in "staging will merge back to master in the next day or two" for like a week now. The merge always seems to be a day or two away, so I just keep waiting for it.

👍

The reason -next hasn't been merged is because the build farm is starved of aarch64-linux and there was a necessary darwin fix merged from staging to -next.

The staging and infrastructure rooms on matrix have relevant discussions

@Artturin Artturin force-pushed the usemakescopew branch 2 times, most recently from c8e0b62 to 2399fa1 Compare November 15, 2023 15:07
@Artturin
qt6: use makeScopeWithSplicing
1231b72
@Artturin
qt6: dont use with self
65874cc 
improves cross-compilation support

matches qt5 set
@Artturin
qt6Packages: use makeScopeWithSplicing
6e2e325 
23.11 has a warning for `overrideScope'` in `makeScope` itself
@Artturin
libsForQt5: change comment
410cd59 
It wouldn't work that way, idk why I thought it would.

23.11 has a warning for `overrideScope'` in `makeScope` itself
@Artturin Artturin merged commit 81ca4c3 into NixOS:master Nov 24, 2023
@Artturin Artturin deleted the usemakescopew branch November 24, 2023 14:29
ShamrockLee
ShamrockLee reviewed Dec 19, 2023
View reviewed changes
pkgs/development/libraries/qt-6/default.nix
} ./hooks/qmake-hook.sh;
} ./hooks/qmake-hook.sh) { };
} // lib.optionalAttrs config.allowAliases {
# Convert to a throw on 03-01-2023 and backport the change.
Copy link
Contributor

@ShamrockLee ShamrockLee Dec 19, 2023

Choose a reason for hiding this comment

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

Not sure when is exactly 03-01-2023, but isn't it already passed?

Copy link
Member Author

@Artturin Artturin Dec 20, 2023

Choose a reason for hiding this comment

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

Meant 2024 :P

I have it in my calendar so no need to fix the typo

@SuperSandro2000 SuperSandro2000 mentioned this pull request May 28, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ShamrockLee ShamrockLee ShamrockLee left review comments

@K900 K900 Awaiting requested review from K900

@NickCao NickCao Awaiting requested review from NickCao

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Artturin @ShamrockLee