Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 62bbc2abc1f3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a5a93e6873e0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 29, 2020

  1. gdal: 3.0.1 -> 3.0.3 

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

See https://lists.osgeo.org/pipermail/qgis-developer/2020-January/060056.html
and https://blog.qgis.org/2020/01/24/public-service-announcement-update-to-the-latest-point-release-now/
    @das-g
    das-g committed Jan 29, 2020
    Copy the full SHA
    e8aa909 View commit details

Commits on Jan 31, 2020

  1. Merge pull request #78774 from das-g/gdal-3.0.3 

    gdal: 3.0.1 -> 3.0.3
    @lsix
    lsix authored Jan 31, 2020
    Copy the full SHA
    a5a93e6 View commit details
Showing with 2 additions and 41 deletions.
  1. +0 −29 pkgs/development/libraries/gdal/001.3_0_1.darwin.patch
  2. +2 −12 pkgs/development/libraries/gdal/default.nix
29 changes: 0 additions & 29 deletions pkgs/development/libraries/gdal/001.3_0_1.darwin.patch
View file

This file was deleted.

14 changes: 2 additions & 12 deletions pkgs/development/libraries/gdal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,27 +9,17 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "gdal";
version = "3.0.1";
version = "3.0.3";

src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
rev = "v${version}";
sha256 = "04rraqhygv8b8fy87qvdhkgx87whby9n98p3gxqr7kdrfymwnh8l";
sha256 = "1rbyxmgmp27a5wvm4g70jr79bazhdl8q9rcch2b78m73njdv73xa";
};

sourceRoot = "source/gdal";

patches = [
./001.3_0_1.darwin.patch
(fetchpatch {
name = "CVE-2019-17545.patch";
url = "https://github.com/OSGeo/gdal/commit/148115fcc40f1651a5d15fa34c9a8c528e7147bb.patch";
stripLen = 1;
sha256 = "0hai59hhvrci9xwjw4lp3wc1brn00imngmqrbbs8v9yr3b0fzbgs";
})
];

nativeBuildInputs = [ autoreconfHook ];

buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite