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

pkg-config, pkgconf: Misc fixes #88518

Merged
merged 7 commits into from May 21, 2020
Merged

Conversation

@Ericson2314
Copy link
Member

Ericson2314 commented May 21, 2020

Motivation for this change

See each commit for details. Most importantly this fixes builds using pkg-config-provided macros, like libarchive.

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.
Ericson2314 added 4 commits May 21, 2020
This is good practice, and will help with tests. Wrapper adjust to match
bintools-wrapper re these new outputs.
This fixes libarchive, and probably numerous other builds.
@Ericson2314 Ericson2314 changed the title pkg-config: Misc fixes pkg-config, pkgconf: Misc fixes May 21, 2020
Ericson2314 added 3 commits May 21, 2020
This is much better because then we can freely keep the comments up to
date without causing mass rebuilds.

Someday, somebody should make the same change with `cc-wrapper` and
`bintools-wrapper`.
@ofborg ofborg bot requested review from edolstra, lovek323, np, andir and zaninime May 21, 2020
@Ericson2314 Ericson2314 force-pushed the Ericson2314:fix-pkg-config branch from 8295532 to 7e9d807 May 21, 2020
@Ericson2314
Copy link
Member Author

Ericson2314 commented May 21, 2020

OK not sure why that one ofborg job is stalled, I built everything locally.

@Ericson2314 Ericson2314 merged commit eae4f22 into NixOS:staging May 21, 2020
17 of 18 checks passed
17 of 18 checks passed
pkg-config, pkg-config.passthru.tests, pkgconf, pkgconf.passthru.tests on x86_64-darwin
Details
pkg-config.passthru.tests, pkgconf.passthru.tests on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e9d807"; rev="7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e9d807"; rev="7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e9d807"; rev="7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e9d807"; rev="7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e9d807"; rev="7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e9d807"; rev="7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e9d807"; rev="7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
pkg-config, pkg-config.passthru.tests, pkgconf, pkgconf.passthru.tests on aarch64-linux Success
Details
pkg-config, pkg-config.passthru.tests, pkgconf, pkgconf.passthru.tests on x86_64-linux Success
Details
@Ericson2314 Ericson2314 deleted the Ericson2314:fix-pkg-config branch May 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.