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

corrected postgresql support for gdal 3.0+ #80127

Merged
merged 4 commits into from Feb 15, 2020
Merged

Conversation

brano543
Copy link
Contributor

@brano543 brano543 commented Feb 14, 2020

Motivation for this change

Configure parameters for PostgreSQL support in GDAL has changes since 3.0, see OSGeo/gdal#1657.

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.

Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Could you also rebase the pull request such that it forms clearly labelled atomic commits? For example:

  • gdal: Clean up formatting
  • gdal: Fix finding postgresql after 3.0 update
  • gdal: Port to Python 3

"--with-expat=${expat.dev}"
"--with-jpeg=${libjpeg.dev}"
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
"--with-png=${libpng.dev}" # optional
"--with-poppler=${poppler.dev}" # optional
"--with-libz=${zlib.dev}" # optional
"--with-pg=${postgresql}/bin/pg_config"
"--with-pg=yes" # since gdal 3.0 doesn't use ${postgresql}/bin/pg_config
Copy link
Contributor

Choose a reason for hiding this comment

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

There was some weird spacing.

Suggested change
"--with-pg=yes" # since gdal 3.0 doesn't use ${postgresql}/bin/pg_config
"--with-pg=yes" # since gdal 3.0 doesn't use ${postgresql}/bin/pg_config

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For my local development I am using nixfmt (https://github.com/serokell/nixfmt), but I didn't want to change the whole file. Reading all of your comments seems like it is inevitable. I will do the adjustments tomorrow.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Took me a lot of time. I had to actually undo all the commits and make it a new as the plugin I was using in VSCode was adding strange comments. Now it should be OK and all commits make sense.

pkgs/development/libraries/gdal/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/gdal/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/gdal/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/gdal/default.nix Outdated Show resolved Hide resolved
@brano543 brano543 reopened this Feb 15, 2020
@danbst danbst merged commit 4c90625 into NixOS:master Feb 15, 2020
@danbst
Copy link
Contributor

danbst commented Feb 15, 2020

thanks for your time!, so clear much ❤️
tested it builds and postgis test runs

@brano543
Copy link
Contributor Author

You are welcome. Thank you for dedicating time to this project. I really like it :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants