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

osm2pgsql: use libs from NixPkgs instead of vendored ones #91743

Merged
merged 4 commits into from Jun 29, 2020

Conversation

@das-g
Copy link
Member

das-g commented Jun 28, 2020

osm2pgsql "vendors" (i.e. contains in its own repo the source of) two libraries we have in NixPkgs and would build against and use these bundled versions by default:

  • libosmium
  • protozero

These changes makes osm2pgsql compile against and use the respective libraries from NixPkgs instead. Further, I'm adding myself as an additional maintainer.

Motivation for this change

This avoids having to build libosmium and protozero as part of osm2pgsql when already-built store paths can be used instead.

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.

Result of nixpkgs-review 1

1 package built:
- osm2pgsql
@danieldk danieldk force-pushed the das-g:osm2pgsql-with-libs-from-nixpkgs branch from 16df9e8 to 928faf2 Jun 29, 2020
Copy link
Member

danieldk left a comment

LGTM. I lowercased nixpkgs in the commit messages.

Result of nixpkgs-review pr 91743 1

1 package built:
- osm2pgsql

Will merge when ofborg is happy.

@danieldk danieldk merged commit bcdf475 into NixOS:master Jun 29, 2020
16 checks passed
16 checks passed
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="928faf2"; rev="928faf2b6356599c7bbb862ae8f5a22fb4f5d840"; } ./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="928faf2"; rev="928faf2b6356599c7bbb862ae8f5a22fb4f5d840"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="928faf2"; rev="928faf2b6356599c7bbb862ae8f5a22fb4f5d840"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="928faf2"; rev="928faf2b6356599c7bbb862ae8f5a22fb4f5d840"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="928faf2"; rev="928faf2b6356599c7bbb862ae8f5a22fb4f5d840"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="928faf2"; rev="928faf2b6356599c7bbb862ae8f5a22fb4f5d840"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="928faf2"; rev="928faf2b6356599c7bbb862ae8f5a22fb4f5d840"; } ./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
osm2pgsql, osm2pgsql.passthru.tests on aarch64-linux Success
Details
osm2pgsql, osm2pgsql.passthru.tests on x86_64-linux Success
Details
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.