Skip to content

libsForQt5: fix mistake#267503

Merged
Artturin merged 1 commit intoNixOS:masterfrom
Artturin:fixmistake
Nov 14, 2023
Merged

libsForQt5: fix mistake#267503
Artturin merged 1 commit intoNixOS:masterfrom
Artturin:fixmistake

Conversation

@Artturin
Copy link
Member

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.

Copy link
Member

@andrevmatos andrevmatos left a comment

Choose a reason for hiding this comment

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

nixos-unstable-small is currently broken by this (plasma5Packages doesn't contain several required members, like plasma5), and the fix works

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 14, 2023
@Artturin
Copy link
Member Author

Artturin commented Nov 14, 2023

nixos-unstable-small is currently broken by this (plasma5Packages doesn't contain several required members, like plasma5), and the fix works

These changes shouldn't affect non-cross

plasma5Packages.plasma5 exists on nixos-unstable-small

@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 14, 2023
@andrevmatos
Copy link
Member

Hmm, may be something weird on my flake setup then, or with some change on master but not yet on unstable-small (had to bump lock to apply this). Either way, it now works for me. Thanks

@Artturin Artturin merged commit 60f10be into NixOS:master Nov 14, 2023
@Artturin Artturin deleted the fixmistake branch November 14, 2023 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants