about summary refs log tree commit diff
path: root/pkgs/applications/gis/qgis
diff options
context:
space:
mode:
authorLancelot SIX <lsix@lancelotsix.com>2019-01-24 22:23:52 +0100
committerLancelot SIX <lsix@lancelotsix.com>2019-01-24 22:23:52 +0100
commit76b1610a35a6fe1082a892afa89345021dbdb475 (patch)
treef859f824aaf887f0c48759f8c494ba8a0bf819e6 /pkgs/applications/gis/qgis
parent12ab4c330373c58284e936798e6db1f5a325d81f (diff)
qgis: 2.18.22 -> 2.18.28
Diffstat (limited to 'pkgs/applications/gis/qgis')
-rw-r--r--pkgs/applications/gis/qgis/default.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index b98d048d0343f..61061a6d6721c 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.18.22";
+  name = "qgis-2.18.28";
 
   buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
     fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig
@@ -35,14 +35,15 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "00b3a2hfn3i7bdx7x96vz2nj0976vpkhid4ss7n8c33fdvw3k82a";
+    sha256 = "18pijqls1isd2bpg0mkrw07jqvdfaiwwb9mvz7p2xrgqcjx7dxsq";
   };
 
   patches = [
-    # https://github.com/qgis/QGIS/pull/7765
+    # already merged upstream in QGIS-3.*, but needs to be backported to QGIS-2
     (fetchpatch {
-      url = "https://github.com/qgis/QGIS/commit/6b61ef361a77f057dc29eb07463007bd9012b253.patch";
-      sha256 = "1xibcahm18n7nxff1xvwwzjf505hvhiw5dk12is7aclv49h0rdf7";
+      url = "https://patch-diff.githubusercontent.com/raw/qgis/QGIS/pull/7263.patch";
+      name = "Ensure_qgis.db_is_writable_when_copied_from_RO_source";
+      sha256 = "19wr2kz0x8x6p2n0ylzd4lqrdmbkxyxr0zpwf2vl9hdp92rdjxbv";
     })
   ];