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.

Sign up for GitHub

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

Jump to bottom

meta.pkgConfigModules: Init convention #214304

Merged
merged 2 commits into from
Feb 6, 2023
Merged

meta.pkgConfigModules: Init convention #214304

merged 2 commits into from
Feb 6, 2023

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Feb 3, 2023 •
edited by roberth
Loading

Description of changes

See docs.

Follow-up work:

  • Existing packages should be converted

  • defaultPkgConfigPackages should assert on meta.pkgConfigModules and let tests.pkg-config alone test the build results.

CC @roberth @sternenseemann

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.05 Release Notes (or backporting 22.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

This was referenced Feb 3, 2023
Merged
Closed
@roberth roberth mentioned this pull request Feb 3, 2023
Merged
13 tasks
@Ericson2314 Ericson2314 force-pushed the pkg-config-meta branch 2 times, most recently from d1617dd to c443ac2 Compare February 3, 2023 13:32
roberth
roberth reviewed Feb 3, 2023
View reviewed changes
doc/languages-frameworks/pkg-config.section.md Outdated Show resolved Hide resolved
doc/languages-frameworks/pkg-config.section.md Outdated Show resolved Hide resolved
doc/languages-frameworks/pkg-config.section.md Outdated Show resolved Hide resolved
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Feb 3, 2023
@Ericson2314 @roberth
meta.pkgConfigModules: Init convention
6e4a1b1 
See docs.

Follow-up work:

- Existing packages should be converted

- `defaultPkgConfigPackages` should assert on `meta.pkgConfigModules`
  and let `tests.pkg-config` alone test the build results.

CC @sternenseemann

Co-authored-by: Robert Hensing <[email protected]>
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Feb 3, 2023
@mweinelt mweinelt added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 5, 2023
@Ericson2314 Ericson2314 merged commit 6d0b308 into NixOS:master Feb 6, 2023
@Ericson2314 Ericson2314 deleted the pkg-config-meta branch February 6, 2023 16:44
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/2023-01-06-nixpkgs-architecture-team-meeting-28/25262/1

This was referenced Feb 7, 2023
Open
Merged
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/adding-pkg-config-metadata-to-nixpkgs-packages/25281/1

SuperSandro2000
SuperSandro2000 reviewed Feb 7, 2023
View reviewed changes
doc/languages-frameworks/pkg-config.section.md
stdenv.mkDerivation (finalAttrs: {
...

nativeBuildInputs = [ pkg-config validatePkgConfig ];
Copy link
Member

@SuperSandro2000 SuperSandro2000 Feb 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Is the plan to drop the validation config hook in the future?

Why isn't the hook always called if we have the meta attribute? In case it breaks we could easily turn it off with another one.

Also why isn't it called validatePkgConfigHook? People are used to that hooks are called automatically and would think they need to call some script here.

Copy link
Member Author

Choose a reason for hiding this comment

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

That hook predates this work. We were just documenting it.

Ericson2314 added a commit to obsidiansystems/nixpkgs that referenced this pull request Feb 7, 2023
@Ericson2314
treewide: Add meta.pkgConfigModules to a few packages
f0636c6 
Picking up where NixOS#214304 left off.
@roberth roberth mentioned this pull request Feb 7, 2023
Open
gador pushed a commit to gador/nixpkgs that referenced this pull request Feb 13, 2023
@Ericson2314 @gador
treewide: Add meta.pkgConfigModules to a few packages
059f4b4 
Picking up where NixOS#214304 left off.
@bgamari bgamari mentioned this pull request Sep 18, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@roberth roberth roberth approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@piegamesde piegamesde Awaiting requested review from piegamesde

Assignees
No one assigned
Labels
6.topic: stdenv Standard environment 8.has: documentation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Ericson2314 @nixos-discourse @roberth @SuperSandro2000 @mweinelt