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

treewide: pkgconfig -> pkg-config #109595

Merged
merged 8 commits into from
Jan 17, 2021
Merged

treewide: pkgconfig -> pkg-config #109595

merged 8 commits into from
Jan 17, 2021

Conversation

siraben
Copy link
Member

@siraben siraben commented Jan 17, 2021

Motivation for this change

pkg-config is the preferred naming.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@siraben
Copy link
Member Author

siraben commented Jan 17, 2021

Goal is rebuild 0.

@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 8.has: documentation This PR adds or changes documentation labels Jan 17, 2021
@siraben siraben requested a review from mkg20001 as a code owner January 17, 2021 02:22
@ofborg ofborg bot added 6.topic: cinnamon Desktop environment 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: pantheon The Pantheon desktop environment 6.topic: xfce The Xfce Desktop Environment labels Jan 17, 2021
@ofborg ofborg bot added 6.topic: printing 6.topic: python 6.topic: vim 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 and removed 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 Jan 17, 2021
jonringer
jonringer reviewed Jan 17, 2021
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

do you mind undoing the changes to pkgs/tools/misc/microplane/deps.nix , I think the new line is causing the three re-builds

Otherwise LGTM

@jonringer
Copy link
Contributor

actually, the builds were quite fast. Going to merge this before it bit rots

jonringer
jonringer reviewed Jan 17, 2021
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 109595 run on x86_64-linux 1

3 packages built:
  • microplane
  • solfege
  • spacevim

@jonringer jonringer merged commit bd42003 into NixOS:master Jan 17, 2021
@siraben
Copy link
Member Author

siraben commented Jan 17, 2021

deps.nix is probably autogenerated, so this change should be harmless.

@siraben
Copy link
Member Author

siraben commented Jan 17, 2021 •
edited
Loading

Remaining progress:

$ for i in pkgs/*; do printf "%s %s\n" "$i" "$(rg 'pkgconfig' "$i" | wc -l)"; done | sort -r -n -k 2
pkgs/development 2135
pkgs/applications 1036
pkgs/servers 638
pkgs/tools 520
pkgs/os-specific 238
pkgs/top-level 73
pkgs/build-support 28
pkgs/desktops 11
pkgs/misc 9
pkgs/games 4
pkgs/test 0
pkgs/stdenv 0
pkgs/shells 0
pkgs/pkgs-lib 0
pkgs/data 0
pkgs/common-updater 0

@siraben siraben deleted the remove-pkgconfig branch January 17, 2021 07:51
@jonringer
Copy link
Contributor

thanks for doing this :). It was getting tiring to say "please use pkg-config, I know there's several thousand instances of pkgconfig used, but please trust me it's there for historical reasons"

@SuperSandro2000
Copy link
Member

thanks for doing this :). It was getting tiring to say "please use pkg-config, I know there's several thousand instances of pkgconfig used, but please trust me it's there for historical reasons"

Same for me. Especially if people get pissed about it.

@SuperSandro2000 SuperSandro2000 mentioned this pull request Jan 17, 2021
Merged
10 tasks
jonringer added a commit to jonringer/nixpkgs that referenced this pull request Jan 19, 2021
@jonringer
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
7593e81 
continuation of NixOS#109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
jonringer added a commit that referenced this pull request Jan 19, 2021
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
9bb3fcc 
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/pkgconfig-alias-has-been-officially-aliased/11066/2

balodja added a commit to balodja/nixpkgs that referenced this pull request May 12, 2021
@balodja
openmodelica: now coherent with NixOS#89731 and NixOS#109595
c44bb3c
balodja added a commit to balodja/nixpkgs that referenced this pull request Jul 23, 2021
@balodja
openmodelica: 1.13.0 -> 1.17.0 with lots of other changes
d34ec19 
Most of them are:
* separate packages for different openmodelica components,
* qt4 -> qt5,
* patches to instruct the OMEdit wrapper with stdenv executables
  location,
* adoption of NixOS#89731 and NixOS#109595,
* openblas -> blas, lapack according to NixOS#83888,
* parallel building,
* getting rid of spurious build phases,
* correct the license,
* cross-compilation,
* forcing compiler to clang++ according to OM build recommendations,
* drop of pangox_compat according to NixOS#75909 and NixOS#76412,
* better dependencies, and more.
balodja added a commit to balodja/nixpkgs that referenced this pull request Jul 24, 2021
@balodja
openmodelica: 1.9.3 -> 1.17.0 with lots of changes
5c8561f 
Co-authored-by: Jaakko Luttinen <jaakko.luttinen@iki.fi>

Most of changes are:
* separate packages for different openmodelica components,
* qt4 -> qt5,
* patches to instruct the OMEdit wrapper with stdenv executables
  location,
* adoption of NixOS#89731 and NixOS#109595,
* openblas -> blas, lapack according to NixOS#83888,
* parallel building,
* getting rid of spurious build phases,
* correct the license,
* cross-compilation,
* forcing compiler to clang++ according to OM build recommendations,
* drop of pangox_compat according to NixOS#75909 and NixOS#76412,
* better dependencies, and more.
@2xsaiko 2xsaiko mentioned this pull request Nov 1, 2022
Merged
@rizo rizo mentioned this pull request Feb 8, 2024
Closed
@octvs octvs mentioned this pull request Feb 26, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@mkg20001 mkg20001 Awaiting requested review from mkg20001

@FRidh FRidh Awaiting requested review from FRidh

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees
No one assigned
Labels
6.topic: cinnamon Desktop environment 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: pantheon The Pantheon desktop environment 6.topic: printing 6.topic: python 6.topic: vim 6.topic: xfce The Xfce Desktop Environment 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@siraben @jonringer @SuperSandro2000 @nixos-discourse