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

[19.09] gdal: 3.0.1 -> 3.0.3 #79257

Merged
merged 1 commit into from Feb 5, 2020
Merged

Conversation

@das-g
Copy link
Member

@das-g das-g commented Feb 5, 2020

Update GDAL/OGR to 3.0.3

(cherry picked from commit e8aa909)

001.3_0_1.darwin.patch isn't needed anymore, because the change it made is part of the QGIS 3.0.3 code: OSGeo/gdal@db66632

CVE-2019-17545.patch isn't needed anymore, because the change it made (OSGeo/gdal@148115f) is part of the QGIS 3.0.3 code.

Motivation for this change

(Backport of #78774)

GDAL/OGR 3.0.3 contains bugfixes to be shipped with QGIS 3.10.2 (#78755)

See mailing list post about lib versions in QGIS and blog post recommending to upgrade QGIS.

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 LC_ALL=C.utf-8 nix run nixpkgs.nixpkgs-review -c nixpkgs-review rev -b release-19.09 931c6103f1e6ae874ab52f203389479cffef64e9 (output see below
  • 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.
Output of nixpkgs-review rev
(click to expand)
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs release-19.09:refs/nixpkgs-review/0
From https://github.com/NixOS/nixpkgs
 + 2ec5c4adf9e...4e3aa3de412 release-19.09 -> refs/nixpkgs-review/0  (forced update)
$ git worktree add /home/das-g/.cache/nixpkgs-review/rev-931c6103f1e6ae874ab52f203389479cffef64e9-1/nixpkgs 4e3aa3de412249ac422272d7ee9193934e6a958f
Preparing worktree (detached HEAD 4e3aa3de412)
HEAD is now at 4e3aa3de412 Merge pull request #79225 from primeos/signal-desktop-backport
$ nix-env -f /home/das-g/.cache/nixpkgs-review/rev-931c6103f1e6ae874ab52f203389479cffef64e9-1/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit 931c6103f1e6ae874ab52f203389479cffef64e9
Updating 4e3aa3de412..931c6103f1e
Fast-forward
 pkgs/development/libraries/gdal/001.3_0_1.darwin.patch | 29 -----------------------------
 pkgs/development/libraries/gdal/default.nix            | 14 ++------------
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/development/libraries/gdal/001.3_0_1.darwin.patch
$ nix-env -f /home/das-g/.cache/nixpkgs-review/rev-931c6103f1e6ae874ab52f203389479cffef64e9-1/nixpkgs -qaP --xml --out-path --show-trace --meta
$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/das-g/.cache/nixpkgs-review/rev-931c6103f1e6ae874ab52f203389479cffef64e9-1/build.nix
[28 built, 537 copied (3877.8 MiB), 741.2 MiB DL]
21 package built:
gdal grass libLAS mapnik mysqlWorkbench openorienteering-mapper postgis postgresql11Packages.postgis python27Packages.cartopy python27Packages.python-mapnik python27Packages.tilestache python27Packages.worldengine python37Packages.cartopy python37Packages.gdal python37Packages.python-mapnik python37Packages.worldengine qgis qgis-unwrapped qlandkartegt qmapshack saga

$ nix-shell /home/das-g/.cache/nixpkgs-review/rev-931c6103f1e6ae874ab52f203389479cffef64e9-1/shell.nix
these paths will be fetched (0.05 MiB download, 0.28 MiB unpacked):
  /nix/store/5h35s50503spks8gkxdv3kk4szz8vx9g-bash-interactive-4.4-p23-dev
copying path '/nix/store/5h35s50503spks8gkxdv3kk4szz8vx9g-bash-interactive-4.4-p23-dev' from 'https://cache.nixos.org'...

[nix-shell:~/.cache/nixpkgs-review/rev-931c6103f1e6ae874ab52f203389479cffef64e9-1]$
@das-g
Copy link
Member Author

@das-g das-g commented Feb 5, 2020

/cc derivation maintainer @MarcWeber,
whom I can't select as reviewer (probably because he's not part of the NixOS organization on GitHub?)

@lsix
Copy link
Member

@lsix lsix commented Feb 5, 2020

Rebuilt locally, all good.

@lsix lsix merged commit 8e46ed8 into NixOS:release-19.09 Feb 5, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
gdal on aarch64-linux Success
Details
gdal on x86_64-linux Success
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="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
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
@das-g das-g mentioned this pull request Mar 24, 2020
4 of 6 tasks complete
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.