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: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix #109887

Merged
merged 8 commits into from Jan 19, 2021
Merged

treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix #109887

merged 8 commits into from Jan 19, 2021

Conversation

jonringer
Copy link
Contributor

Motivation for this change

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.

cc @siraben @SuperSandro2000

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.

@jonringer
Copy link
Contributor Author

I'm going to ignore the white space check, because I value my sanity when editing 1717 files

@jonringer jonringer marked this pull request as draft January 19, 2021 03:47
@jonringer
Copy link
Contributor Author

whitespace PR: #109911

@jonringer jonringer force-pushed the alias-pkgconfig branch 2 times, most recently from 196cf4d to e46f82d Compare January 19, 2021 07:56
@jonringer
Copy link
Contributor Author

last two failures are from from not meeting requireFile requirements

https://github.com/NixOS/nixpkgs/pull/109887

1 package marked as broken and skipped:
rapcad

2 packages failed to build:
houdini quartus-prime-lite

46 packages built:
appimage-run arduino-ci arduino-cli bitscope.chart bitscope.console bitscope.display bitscope.dso bitscope.logic bitscope.meter bitscope.proto bitscope.server blas-reference clonehero cloudcompare conda dropbox dropbox-cli esphome fahclient flutter flutter-beta flutter-dev hover left4gore-bin libsForQt5.dxflib libsForQt512.dxflib libsForQt514.dxflib libtensorflow-bin lightworks mate.caja-dropbox pkgconfig pkgconfigUpstream platformio plex python37Packages.fenics python37Packages.goocalendar python38Packages.fenics python38Packages.goocalendar python39Packages.fenics python39Packages.goocalendar radare2-cutter saga sidequest tryton vmware-horizon-client zulip

Jonathan Ringer added 5 commits January 19, 2021 00:18
@jonringer
houdini: remove hydra platforms as src cannot be fetched
468c1a0
@jonringer
quartus-prime-lite: remove hydraPlatforms
07f320c
@jonringer
cd-hit: remove non-existent package
8304cfe
@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
cinnamon.cinnamon-screensaver: fix libgnomekbd alias
2befb3c
@jonringer
Copy link
Contributor Author

this is annoying, running ofborg locally with allowAliases = false; causes alias issues which aren't related to the PR

@jonringer
Copy link
Contributor Author

once ofborg passes, I'm merging

@jonringer
Copy link
Contributor Author

alright, I think this is in good enough shape. Merging as I want to go to bed, and need to wake up in ~5 hours

@jonringer jonringer merged commit e2fcf81 into NixOS:master Jan 19, 2021
@SuperSandro2000
Copy link
Member

I hope I do not merge a PR which introduces new build failures by using old ofborg evals.

@SFrijters SFrijters mentioned this pull request Jan 19, 2021
Merged
10 tasks
@jonringer jonringer deleted the alias-pkgconfig branch January 19, 2021 14:47
@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/1

@bobby285271 bobby285271 mentioned this pull request Aug 18, 2021
Closed
11 tasks
@Zaubentrucker Zaubentrucker mentioned this pull request Apr 7, 2024
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hmenke hmenke hmenke approved these changes

@siraben siraben siraben approved these changes

@adisbladis adisbladis Awaiting requested review from adisbladis adisbladis is a code owner

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@FRidh FRidh Awaiting requested review from FRidh

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

@kalbasit kalbasit Awaiting requested review from kalbasit kalbasit is a code owner

@Lassulus Lassulus Awaiting requested review from Lassulus Lassulus is a code owner

@LnL7 LnL7 Awaiting requested review from LnL7

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@mmahut mmahut Awaiting requested review from mmahut mmahut is a code owner

@peti peti Awaiting requested review from peti

@Profpatsch Profpatsch Awaiting requested review from Profpatsch Profpatsch is a code owner

@RaghavSood RaghavSood Awaiting requested review from RaghavSood RaghavSood is a code owner

@stigtsp stigtsp Awaiting requested review from stigtsp stigtsp is a code owner

@teto teto Awaiting requested review from teto teto is a code owner

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice thoughtpolice is a code owner

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

@zowoq zowoq Awaiting requested review from zowoq zowoq is a code owner

@mkg20001 mkg20001 Awaiting requested review from mkg20001 mkg20001 is a code owner

Assignees
No one assigned
Labels
6.topic: cinnamon 6.topic: emacs 6.topic: golang 6.topic: haskell 6.topic: lua 6.topic: nixos 6.topic: python 6.topic: qt/kde 6.topic: rust 6.topic: vim 8.has: clean-up 8.has: documentation 8.has: module (update) 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jonringer @siraben @SuperSandro2000 @nixos-discourse @hmenke