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

lib.gvariant: make the tests really work #256743

Merged
merged 1 commit into from
Sep 28, 2023
Merged

Conversation

linsui
Copy link
Contributor

@linsui linsui commented Sep 22, 2023

Description of changes

#234615 (comment)

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.

@linsui linsui requested a review from jtojnar September 22, 2023 18:42
@github-actions github-actions bot added 6.topic: module system About "NixOS" module system internals 6.topic: lib The Nixpkgs function library labels Sep 22, 2023
@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 Sep 22, 2023
mkMerge [
{ bool = true; }
examples = with lib.gvariant;
lib.mkMerge [
Copy link
Member

@jtojnar jtojnar Sep 22, 2023

Choose a reason for hiding this comment

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

Since we are no longer testing the merging functionality, we can just drop the mkMerge and use a single big attribute.

Ideally, we would keep testing merging though (especially for arrays and dictionaries). Even nicer would be also testing the failures to merge but that is harder.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I removed it. Maybe we can add some tests for mkMerge in the future.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 23, 2023
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 24, 2023
@jtojnar jtojnar merged commit a50cea8 into NixOS:master Sep 28, 2023
6 checks passed
@jtojnar
Copy link
Member

jtojnar commented Sep 28, 2023

Thanks.

@linsui linsui deleted the gvariant branch September 28, 2023 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: lib The Nixpkgs function library 6.topic: module system About "NixOS" module system internals 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
Development

Successfully merging this pull request may close these issues.

4 participants